From 59e4a2b589171240a1936563e08ec3d2cb43060b Mon Sep 17 00:00:00 2001 From: Sergey Astapov Date: Mon, 12 Dec 2022 22:03:14 -0500 Subject: [PATCH] Implement RFC #811 `Element Modifiers` --- blueprints/addon/index.js | 4 ++++ blueprints/app/files/package.json | 1 + tests/fixtures/app/defaults/package.json | 1 + tests/fixtures/app/embroider-no-welcome/package.json | 1 + tests/fixtures/app/embroider-yarn/package.json | 1 + tests/fixtures/app/embroider/package.json | 1 + tests/fixtures/app/npm-travis/package.json | 1 + tests/fixtures/app/npm/package.json | 1 + .../app/with-blueprint-override-lint-fail/package.json | 1 + tests/fixtures/app/yarn-travis/package.json | 1 + tests/fixtures/app/yarn/package.json | 1 + 11 files changed, 14 insertions(+) diff --git a/blueprints/addon/index.js b/blueprints/addon/index.js index 457a23eeef..ad3c3aad82 100644 --- a/blueprints/addon/index.js +++ b/blueprints/addon/index.js @@ -66,6 +66,10 @@ module.exports = { delete contents.devDependencies['ember-data']; delete contents.devDependencies['ember-fetch']; + // Per RFC #811, addons should not have this dependency. + // @see https://github.com/emberjs/rfcs/blob/master/text/0811-element-modifiers.md#detailed-design + delete contents.devDependencies['ember-modifier']; + // 100% of addons don't need ember-cli-app-version, make it opt-in instead delete contents.devDependencies['ember-cli-app-version']; diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json index 307110c011..c45ac227bf 100644 --- a/blueprints/app/files/package.json +++ b/blueprints/app/files/package.json @@ -48,6 +48,7 @@ "ember-data": "~4.10.0-beta.2", "ember-fetch": "^8.1.2", "ember-load-initializers": "^2.1.2", + "ember-modifier": "^4.0.0", "ember-page-title": "^7.0.0", "ember-qunit": "^6.0.0", "ember-resolver": "^8.0.3", diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json index f9d3955bb7..9475f489a0 100644 --- a/tests/fixtures/app/defaults/package.json +++ b/tests/fixtures/app/defaults/package.json @@ -42,6 +42,7 @@ "ember-data": "~4.10.0-beta.2", "ember-fetch": "^8.1.2", "ember-load-initializers": "^2.1.2", + "ember-modifier": "^4.0.0", "ember-page-title": "^7.0.0", "ember-qunit": "^6.0.0", "ember-resolver": "^8.0.3", diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json index c20cbab428..8e781fea59 100644 --- a/tests/fixtures/app/embroider-no-welcome/package.json +++ b/tests/fixtures/app/embroider-no-welcome/package.json @@ -45,6 +45,7 @@ "ember-data": "~4.10.0-beta.2", "ember-fetch": "^8.1.2", "ember-load-initializers": "^2.1.2", + "ember-modifier": "^4.0.0", "ember-page-title": "^7.0.0", "ember-qunit": "^6.0.0", "ember-resolver": "^8.0.3", diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json index 93cd34e693..7df0b576f4 100644 --- a/tests/fixtures/app/embroider-yarn/package.json +++ b/tests/fixtures/app/embroider-yarn/package.json @@ -45,6 +45,7 @@ "ember-data": "~4.10.0-beta.2", "ember-fetch": "^8.1.2", "ember-load-initializers": "^2.1.2", + "ember-modifier": "^4.0.0", "ember-page-title": "^7.0.0", "ember-qunit": "^6.0.0", "ember-resolver": "^8.0.3", diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json index 93cd34e693..7df0b576f4 100644 --- a/tests/fixtures/app/embroider/package.json +++ b/tests/fixtures/app/embroider/package.json @@ -45,6 +45,7 @@ "ember-data": "~4.10.0-beta.2", "ember-fetch": "^8.1.2", "ember-load-initializers": "^2.1.2", + "ember-modifier": "^4.0.0", "ember-page-title": "^7.0.0", "ember-qunit": "^6.0.0", "ember-resolver": "^8.0.3", diff --git a/tests/fixtures/app/npm-travis/package.json b/tests/fixtures/app/npm-travis/package.json index 92771d9cff..95fdc63604 100644 --- a/tests/fixtures/app/npm-travis/package.json +++ b/tests/fixtures/app/npm-travis/package.json @@ -42,6 +42,7 @@ "ember-data": "~3.27.1", "ember-fetch": "^8.0.4", "ember-load-initializers": "^2.1.2", + "ember-modifier": "^4.0.0", "ember-maybe-import-regenerator": "^0.1.6", "ember-page-title": "^7.0.0", "ember-qunit": "^5.1.4", diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json index 34d987b581..a696a4c3c2 100644 --- a/tests/fixtures/app/npm/package.json +++ b/tests/fixtures/app/npm/package.json @@ -42,6 +42,7 @@ "ember-data": "~4.10.0-beta.2", "ember-fetch": "^8.1.2", "ember-load-initializers": "^2.1.2", + "ember-modifier": "^4.0.0", "ember-page-title": "^7.0.0", "ember-qunit": "^6.0.0", "ember-resolver": "^8.0.3", diff --git a/tests/fixtures/app/with-blueprint-override-lint-fail/package.json b/tests/fixtures/app/with-blueprint-override-lint-fail/package.json index 6cc607ab40..de24e0c00a 100644 --- a/tests/fixtures/app/with-blueprint-override-lint-fail/package.json +++ b/tests/fixtures/app/with-blueprint-override-lint-fail/package.json @@ -42,6 +42,7 @@ "ember-data": "~3.26.0-beta.0", "ember-fetch": "^8.0.4", "ember-load-initializers": "^2.1.2", + "ember-modifier": "^4.0.0", "ember-page-title": "^7.0.0", "ember-qunit": "^5.1.2", "ember-resolver": "^8.0.2", diff --git a/tests/fixtures/app/yarn-travis/package.json b/tests/fixtures/app/yarn-travis/package.json index f8b6af6205..e6e0dbbc16 100644 --- a/tests/fixtures/app/yarn-travis/package.json +++ b/tests/fixtures/app/yarn-travis/package.json @@ -42,6 +42,7 @@ "ember-data": "~3.27.1", "ember-fetch": "^8.0.4", "ember-load-initializers": "^2.1.2", + "ember-modifier": "^4.0.0", "ember-maybe-import-regenerator": "^0.1.6", "ember-page-title": "^7.0.0", "ember-qunit": "^5.1.4", diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json index f9d3955bb7..9475f489a0 100644 --- a/tests/fixtures/app/yarn/package.json +++ b/tests/fixtures/app/yarn/package.json @@ -42,6 +42,7 @@ "ember-data": "~4.10.0-beta.2", "ember-fetch": "^8.1.2", "ember-load-initializers": "^2.1.2", + "ember-modifier": "^4.0.0", "ember-page-title": "^7.0.0", "ember-qunit": "^6.0.0", "ember-resolver": "^8.0.3",