From 637fe2e8a5e919425af4e40c55892b6c1a9b6039 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Tue, 21 Jul 2020 11:04:50 -0400 Subject: [PATCH 1/2] Update blueprint dependencies to latest versions. Preparing for 3.20.0 release, updating the app and addon blueprints to the latest release versions of any blueprint dependencies. --- blueprints/app/files/package.json | 16 ++++++++-------- tests/fixtures/addon/defaults/package.json | 14 +++++++------- tests/fixtures/addon/yarn/package.json | 14 +++++++------- tests/fixtures/app/defaults/package.json | 16 ++++++++-------- .../app/embroider-no-welcome/package.json | 16 ++++++++-------- tests/fixtures/app/embroider/package.json | 16 ++++++++-------- tests/fixtures/app/npm/package.json | 16 ++++++++-------- tests/fixtures/app/yarn/package.json | 16 ++++++++-------- 8 files changed, 62 insertions(+), 62 deletions(-) diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json index f1232f4af1..c3c93ed8dc 100644 --- a/blueprints/app/files/package.json +++ b/blueprints/app/files/package.json @@ -28,27 +28,27 @@ "@glimmer/tracking": "^1.0.0", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "ember-auto-import": "^1.5.3", + "ember-auto-import": "^1.6.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^3.2.0", - "ember-cli-babel": "^7.20.5", + "ember-cli-babel": "^7.21.0", "ember-cli-dependency-checker": "^3.2.0", - "ember-cli-htmlbars": "^5.1.2", + "ember-cli-htmlbars": "^5.2.0", "ember-cli-inject-live-reload": "^2.0.2", "ember-cli-sri": "^2.1.1", "ember-cli-uglify": "^3.0.0", - "ember-data": "~3.19.0", + "ember-data": "~3.20.0", "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.1", "ember-load-initializers": "^2.1.1", "ember-maybe-import-regenerator": "^0.1.6", "ember-qunit": "^4.6.0", "ember-resolver": "^8.0.0", - "ember-source": "~3.19.0", - "ember-template-lint": "^2.8.0<% if (welcome) { %>", + "ember-source": "~3.20.1", + "ember-template-lint": "^2.9.1<% if (welcome) { %>", "ember-welcome-page": "^4.0.0<% } %>", - "eslint": "^7.1.0", - "eslint-plugin-ember": "^8.6.0", + "eslint": "^7.5.0", + "eslint-plugin-ember": "^8.9.1", "eslint-plugin-node": "^11.1.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json index 2722ff9fdb..ab0770cf0b 100644 --- a/tests/fixtures/addon/defaults/package.json +++ b/tests/fixtures/addon/defaults/package.json @@ -23,8 +23,8 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "ember-cli-babel": "^7.20.5", - "ember-cli-htmlbars": "^5.1.2" + "ember-cli-babel": "^7.21.0", + "ember-cli-htmlbars": "^5.2.0" }, "devDependencies": { "@ember/optional-features": "^1.3.0", @@ -32,7 +32,7 @@ "@glimmer/tracking": "^1.0.0", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "ember-auto-import": "^1.5.3", + "ember-auto-import": "^1.6.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-inject-live-reload": "^2.0.2", @@ -44,12 +44,12 @@ "ember-maybe-import-regenerator": "^0.1.6", "ember-qunit": "^4.6.0", "ember-resolver": "^8.0.0", - "ember-source": "~3.19.0", + "ember-source": "~3.20.1", "ember-source-channel-url": "^2.0.1", - "ember-template-lint": "^2.8.0", + "ember-template-lint": "^2.9.1", "ember-try": "^1.4.0", - "eslint": "^7.1.0", - "eslint-plugin-ember": "^8.6.0", + "eslint": "^7.5.0", + "eslint-plugin-ember": "^8.9.1", "eslint-plugin-node": "^11.1.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json index 36f978a1c1..79347b3aa9 100644 --- a/tests/fixtures/addon/yarn/package.json +++ b/tests/fixtures/addon/yarn/package.json @@ -23,8 +23,8 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "ember-cli-babel": "^7.20.5", - "ember-cli-htmlbars": "^5.1.2" + "ember-cli-babel": "^7.21.0", + "ember-cli-htmlbars": "^5.2.0" }, "devDependencies": { "@ember/optional-features": "^1.3.0", @@ -32,7 +32,7 @@ "@glimmer/tracking": "^1.0.0", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "ember-auto-import": "^1.5.3", + "ember-auto-import": "^1.6.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-inject-live-reload": "^2.0.2", @@ -44,13 +44,13 @@ "ember-maybe-import-regenerator": "^0.1.6", "ember-qunit": "^4.6.0", "ember-resolver": "^8.0.0", - "ember-source": "~3.19.0", + "ember-source": "~3.20.1", "ember-source-channel-url": "^2.0.1", - "ember-template-lint": "^2.8.0", + "ember-template-lint": "^2.9.1", "ember-try": "^1.4.0", "ember-welcome-page": "^4.0.0", - "eslint": "^7.1.0", - "eslint-plugin-ember": "^8.6.0", + "eslint": "^7.5.0", + "eslint-plugin-ember": "^8.9.1", "eslint-plugin-node": "^11.1.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json index a92111a9e2..5043e63517 100644 --- a/tests/fixtures/app/defaults/package.json +++ b/tests/fixtures/app/defaults/package.json @@ -25,27 +25,27 @@ "@glimmer/tracking": "^1.0.0", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "ember-auto-import": "^1.5.3", + "ember-auto-import": "^1.6.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^3.2.0", - "ember-cli-babel": "^7.20.5", + "ember-cli-babel": "^7.21.0", "ember-cli-dependency-checker": "^3.2.0", - "ember-cli-htmlbars": "^5.1.2", + "ember-cli-htmlbars": "^5.2.0", "ember-cli-inject-live-reload": "^2.0.2", "ember-cli-sri": "^2.1.1", "ember-cli-uglify": "^3.0.0", - "ember-data": "~3.19.0", + "ember-data": "~3.20.0", "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.1", "ember-load-initializers": "^2.1.1", "ember-maybe-import-regenerator": "^0.1.6", "ember-qunit": "^4.6.0", "ember-resolver": "^8.0.0", - "ember-source": "~3.19.0", - "ember-template-lint": "^2.8.0", + "ember-source": "~3.20.1", + "ember-template-lint": "^2.9.1", "ember-welcome-page": "^4.0.0", - "eslint": "^7.1.0", - "eslint-plugin-ember": "^8.6.0", + "eslint": "^7.5.0", + "eslint-plugin-ember": "^8.9.1", "eslint-plugin-node": "^11.1.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json index b149be2bdc..c87ba538c9 100644 --- a/tests/fixtures/app/embroider-no-welcome/package.json +++ b/tests/fixtures/app/embroider-no-welcome/package.json @@ -28,26 +28,26 @@ "@glimmer/tracking": "^1.0.0", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "ember-auto-import": "^1.5.3", + "ember-auto-import": "^1.6.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^3.2.0", - "ember-cli-babel": "^7.20.5", + "ember-cli-babel": "^7.21.0", "ember-cli-dependency-checker": "^3.2.0", - "ember-cli-htmlbars": "^5.1.2", + "ember-cli-htmlbars": "^5.2.0", "ember-cli-inject-live-reload": "^2.0.2", "ember-cli-sri": "^2.1.1", "ember-cli-uglify": "^3.0.0", - "ember-data": "~3.19.0", + "ember-data": "~3.20.0", "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.1", "ember-load-initializers": "^2.1.1", "ember-maybe-import-regenerator": "^0.1.6", "ember-qunit": "^4.6.0", "ember-resolver": "^8.0.0", - "ember-source": "~3.19.0", - "ember-template-lint": "^2.8.0", - "eslint": "^7.1.0", - "eslint-plugin-ember": "^8.6.0", + "ember-source": "~3.20.1", + "ember-template-lint": "^2.9.1", + "eslint": "^7.5.0", + "eslint-plugin-ember": "^8.9.1", "eslint-plugin-node": "^11.1.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json index 9c1ac475e6..1167a623c1 100644 --- a/tests/fixtures/app/embroider/package.json +++ b/tests/fixtures/app/embroider/package.json @@ -28,27 +28,27 @@ "@glimmer/tracking": "^1.0.0", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "ember-auto-import": "^1.5.3", + "ember-auto-import": "^1.6.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^3.2.0", - "ember-cli-babel": "^7.20.5", + "ember-cli-babel": "^7.21.0", "ember-cli-dependency-checker": "^3.2.0", - "ember-cli-htmlbars": "^5.1.2", + "ember-cli-htmlbars": "^5.2.0", "ember-cli-inject-live-reload": "^2.0.2", "ember-cli-sri": "^2.1.1", "ember-cli-uglify": "^3.0.0", - "ember-data": "~3.19.0", + "ember-data": "~3.20.0", "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.1", "ember-load-initializers": "^2.1.1", "ember-maybe-import-regenerator": "^0.1.6", "ember-qunit": "^4.6.0", "ember-resolver": "^8.0.0", - "ember-source": "~3.19.0", - "ember-template-lint": "^2.8.0", + "ember-source": "~3.20.1", + "ember-template-lint": "^2.9.1", "ember-welcome-page": "^4.0.0", - "eslint": "^7.1.0", - "eslint-plugin-ember": "^8.6.0", + "eslint": "^7.5.0", + "eslint-plugin-ember": "^8.9.1", "eslint-plugin-node": "^11.1.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json index 050ea7d6e5..356ee67eca 100644 --- a/tests/fixtures/app/npm/package.json +++ b/tests/fixtures/app/npm/package.json @@ -25,26 +25,26 @@ "@glimmer/tracking": "^1.0.0", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "ember-auto-import": "^1.5.3", + "ember-auto-import": "^1.6.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^3.2.0", - "ember-cli-babel": "^7.20.5", + "ember-cli-babel": "^7.21.0", "ember-cli-dependency-checker": "^3.2.0", - "ember-cli-htmlbars": "^5.1.2", + "ember-cli-htmlbars": "^5.2.0", "ember-cli-inject-live-reload": "^2.0.2", "ember-cli-sri": "^2.1.1", "ember-cli-uglify": "^3.0.0", - "ember-data": "~3.19.0", + "ember-data": "~3.20.0", "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.1", "ember-load-initializers": "^2.1.1", "ember-maybe-import-regenerator": "^0.1.6", "ember-qunit": "^4.6.0", "ember-resolver": "^8.0.0", - "ember-source": "~3.19.0", - "ember-template-lint": "^2.8.0", - "eslint": "^7.1.0", - "eslint-plugin-ember": "^8.6.0", + "ember-source": "~3.20.1", + "ember-template-lint": "^2.9.1", + "eslint": "^7.5.0", + "eslint-plugin-ember": "^8.9.1", "eslint-plugin-node": "^11.1.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json index a92111a9e2..5043e63517 100644 --- a/tests/fixtures/app/yarn/package.json +++ b/tests/fixtures/app/yarn/package.json @@ -25,27 +25,27 @@ "@glimmer/tracking": "^1.0.0", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "ember-auto-import": "^1.5.3", + "ember-auto-import": "^1.6.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^3.2.0", - "ember-cli-babel": "^7.20.5", + "ember-cli-babel": "^7.21.0", "ember-cli-dependency-checker": "^3.2.0", - "ember-cli-htmlbars": "^5.1.2", + "ember-cli-htmlbars": "^5.2.0", "ember-cli-inject-live-reload": "^2.0.2", "ember-cli-sri": "^2.1.1", "ember-cli-uglify": "^3.0.0", - "ember-data": "~3.19.0", + "ember-data": "~3.20.0", "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.1", "ember-load-initializers": "^2.1.1", "ember-maybe-import-regenerator": "^0.1.6", "ember-qunit": "^4.6.0", "ember-resolver": "^8.0.0", - "ember-source": "~3.19.0", - "ember-template-lint": "^2.8.0", + "ember-source": "~3.20.1", + "ember-template-lint": "^2.9.1", "ember-welcome-page": "^4.0.0", - "eslint": "^7.1.0", - "eslint-plugin-ember": "^8.6.0", + "eslint": "^7.5.0", + "eslint-plugin-ember": "^8.9.1", "eslint-plugin-node": "^11.1.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", From 076b9c0e8e4c185f235e3f4c7214126d8806378e Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Tue, 21 Jul 2020 11:48:38 -0400 Subject: [PATCH 2/2] Add embroider fixture files to dev/update-blueprint-dependencies.js --- dev/update-blueprint-dependencies.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev/update-blueprint-dependencies.js b/dev/update-blueprint-dependencies.js index b896ea3b70..2c47c7ea5a 100644 --- a/dev/update-blueprint-dependencies.js +++ b/dev/update-blueprint-dependencies.js @@ -43,6 +43,8 @@ const PACKAGE_FILES = [ 'tests/fixtures/app/defaults/package.json', 'tests/fixtures/app/npm/package.json', 'tests/fixtures/app/yarn/package.json', + 'tests/fixtures/app/embroider/package.json', + 'tests/fixtures/app/embroider-no-welcome/package.json', 'tests/fixtures/addon/defaults/package.json', 'tests/fixtures/addon/yarn/package.json', ];