From 7405d123029af466cecbcfff889c22f6548f8b17 Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Mon, 23 Apr 2018 22:57:26 +0100 Subject: [PATCH] Bump Ember to 3.1.1 no issue - contains bug fixes for the 3.1.0 release --- ghost/admin/package.json | 2 +- ghost/admin/tests/acceptance/team-test.js | 4 +- ghost/admin/yarn.lock | 46 +++++++++++++++++++---- 3 files changed, 40 insertions(+), 12 deletions(-) diff --git a/ghost/admin/package.json b/ghost/admin/package.json index d7a5b1e4de..0844125413 100644 --- a/ghost/admin/package.json +++ b/ghost/admin/package.json @@ -88,7 +88,7 @@ "ember-route-action-helper": "2.0.6", "ember-simple-auth": "1.6.0", "ember-sinon": "2.1.0", - "ember-source": "3.1.0", + "ember-source": "3.1.1", "ember-svg-jar": "1.1.1", "ember-test-selectors": "0.3.9", "ember-truth-helpers": "2.0.0", diff --git a/ghost/admin/tests/acceptance/team-test.js b/ghost/admin/tests/acceptance/team-test.js index 324d67a8cb..9bd6586302 100644 --- a/ghost/admin/tests/acceptance/team-test.js +++ b/ghost/admin/tests/acceptance/team-test.js @@ -483,9 +483,7 @@ describe('Acceptance: Team', function () { windowProxy.replaceState = originalReplaceState; }); - // TODO: runs into this bug https://github.com/emberjs/ember.js/issues/16541 - // unskip when we upgrade to Ember.js >= 3.1.1 - it.skip('input fields reset and validate correctly', async function () { + it('input fields reset and validate correctly', async function () { // test user name await visit('/team/test-1'); diff --git a/ghost/admin/yarn.lock b/ghost/admin/yarn.lock index a8e5d2d822..938f4e004b 100644 --- a/ghost/admin/yarn.lock +++ b/ghost/admin/yarn.lock @@ -79,7 +79,7 @@ version "0.0.38" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.38.tgz#c1be40aa933723c608820a99a373a16d215a1ca2" -"@types/node@^9.6.0": +"@types/node@*", "@types/node@^9.6.0": version "9.6.6" resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.6.tgz#439b91f9caf3983cad2eef1e11f6bedcbf9431d2" @@ -3368,7 +3368,7 @@ ember-cli-chai@0.5.0: rollup-plugin-commonjs "^8.0.2" rollup-plugin-node-resolve "^3.0.0" -ember-cli-cjs-transform@1.1.1, ember-cli-cjs-transform@^1.1.1: +ember-cli-cjs-transform@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ember-cli-cjs-transform/-/ember-cli-cjs-transform-1.1.1.tgz#79082031fec73885077496e2cd8d481dac79e0d0" dependencies: @@ -3383,6 +3383,21 @@ ember-cli-cjs-transform@1.1.1, ember-cli-cjs-transform@^1.1.1: rollup-plugin-node-resolve "^3.3.0" username "^3.0.0" +ember-cli-cjs-transform@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/ember-cli-cjs-transform/-/ember-cli-cjs-transform-1.2.0.tgz#34a0d2667673caec0248f500a954f45668027e8b" + dependencies: + broccoli-debug "^0.6.4" + broccoli-plugin "^1.3.0" + ember-cli-babel "^6.6.0" + fs-extra "^5.0.0" + hash-for-dep "^1.2.3" + pkg-dir "^2.0.0" + rollup "^0.58.1" + rollup-plugin-commonjs "^9.1.0" + rollup-plugin-node-resolve "^3.3.0" + username "^3.0.0" + ember-cli-code-coverage@0.4.2: version "0.4.2" resolved "https://registry.yarnpkg.com/ember-cli-code-coverage/-/ember-cli-code-coverage-0.4.2.tgz#bd223af453ef0b80e5482cc9958cd9726b5865c7" @@ -3786,7 +3801,7 @@ ember-composable-helpers@2.1.0, ember-composable-helpers@^2.0.1: broccoli-funnel "^1.0.1" ember-cli-babel "^6.6.0" -ember-concurrency@0.8.17, ember-concurrency@^0.8.1, ember-concurrency@^0.8.12: +ember-concurrency@0.8.17: version "0.8.17" resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.8.17.tgz#be47a90342f1960f4f57284c2fe5f7ce2396142a" dependencies: @@ -3794,6 +3809,14 @@ ember-concurrency@0.8.17, ember-concurrency@^0.8.1, ember-concurrency@^0.8.12: ember-cli-babel "^6.8.2" ember-maybe-import-regenerator "^0.1.5" +ember-concurrency@^0.8.1, ember-concurrency@^0.8.12: + version "0.8.18" + resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.8.18.tgz#20a9ac4ced6496ea4ebe52e88f4524a473871396" + dependencies: + babel-core "^6.24.1" + ember-cli-babel "^6.8.2" + ember-maybe-import-regenerator "^0.1.5" + ember-cookies@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/ember-cookies/-/ember-cookies-0.3.0.tgz#f9a23c957bd0e561e6a056e044d95ce2416b64d8" @@ -4167,9 +4190,9 @@ ember-sinon@2.1.0: ember-cli-babel "^6.6.0" sinon "^4.4.5" -ember-source@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.1.0.tgz#21902747801c747b615f60168712968db3b433fc" +ember-source@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.1.1.tgz#9cf95e8a6d7568d60b8eda2aeda17ac8944e654b" dependencies: broccoli-funnel "^2.0.1" broccoli-merge-trees "^2.0.0" @@ -5124,8 +5147,8 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" fsevents@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.0.tgz#e11a5ff285471e4cc43ab9cd09bb7986c565dcdc" + version "1.2.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.2.tgz#4f598f0f69b273188ef4a62ca4e9e08ace314bbf" dependencies: nan "^2.9.2" node-pre-gyp "^0.9.0" @@ -9045,6 +9068,13 @@ rollup@^0.57.1: signal-exit "^3.0.2" sourcemap-codec "^1.4.1" +rollup@^0.58.1: + version "0.58.2" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.58.2.tgz#2feddea8c0c022f3e74b35c48e3c21b3433803ce" + dependencies: + "@types/estree" "0.0.38" + "@types/node" "*" + route-recognizer@^0.2.3: version "0.2.10" resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.2.10.tgz#024b2283c2e68d13a7c7f5173a5924645e8902df"