From d2f98561006bee84e5bf1047c3b8092f759c6980 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Wed, 1 Dec 2021 21:04:30 +0100 Subject: [PATCH 1/6] Ember: Add `@ember/optional-features` dev dependency --- package.json | 1 + pnpm-lock.yaml | 35 ++++++++++++++++++++++- tests/dummy/config/optional-features.json | 2 ++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 tests/dummy/config/optional-features.json diff --git a/package.json b/package.json index bb8db6f5..afcb4da7 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ }, "devDependencies": { "@babel/core": "7.16.0", + "@ember/optional-features": "2.0.0", "@ember/test-helpers": "2.6.0", "broccoli-stew": "3.0.0", "ember-cli": "3.28.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 37355575..2b4f6ded 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2,6 +2,7 @@ lockfileVersion: 5.3 specifiers: '@babel/core': 7.16.0 + '@ember/optional-features': 2.0.0 '@ember/test-helpers': 2.6.0 broccoli-stew: 3.0.0 calculate-cache-key-for-tree: ^2.0.0 @@ -38,6 +39,7 @@ dependencies: devDependencies: '@babel/core': 7.16.0 + '@ember/optional-features': 2.0.0 '@ember/test-helpers': 2.6.0_@babel+core@7.16.0 broccoli-stew: 3.0.0 ember-cli: 3.28.4 @@ -1189,6 +1191,18 @@ packages: resolution: {integrity: sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==} dev: true + /@ember/optional-features/2.0.0: + resolution: {integrity: sha512-4gkvuGRYfpAh1nwAz306cmMeC1mG7wxZnbsBZ09mMaMX/W7IyKOKc/38JwrDPUFUalmNEM7q7JEPcmew2M3Dog==} + engines: {node: 10.* || 12.* || >= 14} + dependencies: + chalk: 4.1.2 + ember-cli-version-checker: 5.1.2 + glob: 7.2.0 + inquirer: 7.3.3 + mkdirp: 1.0.4 + silent-error: 1.1.1 + dev: true + /@ember/test-helpers/2.6.0_@babel+core@7.16.0: resolution: {integrity: sha512-N5sr3layWk60wB3maCy+/5hFHQRcTh8aqxcZTSs3Od9QkuHdWBtRgMGLP/35mXpJlgWuu3xqLpt6u3dGHc8gCg==} engines: {node: 10.* || 12.* || 14.* || 15.* || >= 16.*} @@ -6500,6 +6514,25 @@ packages: through: 2.3.8 dev: true + /inquirer/7.3.3: + resolution: {integrity: sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==} + engines: {node: '>=8.0.0'} + dependencies: + ansi-escapes: 4.3.2 + chalk: 4.1.2 + cli-cursor: 3.1.0 + cli-width: 3.0.0 + external-editor: 3.1.0 + figures: 3.2.0 + lodash: 4.17.21 + mute-stream: 0.0.8 + run-async: 2.4.1 + rxjs: 6.6.7 + string-width: 4.2.3 + strip-ansi: 6.0.1 + through: 2.3.8 + dev: true + /inquirer/8.1.5: resolution: {integrity: sha512-G6/9xUqmt/r+UvufSyrPpt84NYwhKZ9jLsgMbQzlx804XErNupor8WQdBnBRrXmBfTPpuwf1sV+ss2ovjgdXIg==} engines: {node: '>=8.0.0'} @@ -11102,7 +11135,7 @@ packages: /wide-align/1.1.5: resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==} dependencies: - string-width: 1.0.2 + string-width: 4.2.3 dev: true /widest-line/3.1.0: diff --git a/tests/dummy/config/optional-features.json b/tests/dummy/config/optional-features.json new file mode 100644 index 00000000..2c63c085 --- /dev/null +++ b/tests/dummy/config/optional-features.json @@ -0,0 +1,2 @@ +{ +} From 2f9e6400276612e7d53f0e3e96af684bf68a6e45 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Wed, 1 Dec 2021 21:04:59 +0100 Subject: [PATCH 2/6] Ember: Enable template-only glimmer components --- tests/dummy/config/optional-features.json | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/dummy/config/optional-features.json b/tests/dummy/config/optional-features.json index 2c63c085..23da43d9 100644 --- a/tests/dummy/config/optional-features.json +++ b/tests/dummy/config/optional-features.json @@ -1,2 +1,3 @@ { + "template-only-glimmer-components": true } From 4f5f553caa6617a30f9680ef56eff23e0bf706bd Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Wed, 1 Dec 2021 21:05:13 +0100 Subject: [PATCH 3/6] Ember: Disable jQuery integration --- tests/dummy/config/optional-features.json | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/dummy/config/optional-features.json b/tests/dummy/config/optional-features.json index 23da43d9..14af8a81 100644 --- a/tests/dummy/config/optional-features.json +++ b/tests/dummy/config/optional-features.json @@ -1,3 +1,4 @@ { + "jquery-integration": false, "template-only-glimmer-components": true } From 322d2cb0bd29032d68408478c06f56dff9a60d3d Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Wed, 1 Dec 2021 21:05:25 +0100 Subject: [PATCH 4/6] Ember: Disable application template wrapper --- tests/dummy/config/optional-features.json | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/dummy/config/optional-features.json b/tests/dummy/config/optional-features.json index 14af8a81..77a734e9 100644 --- a/tests/dummy/config/optional-features.json +++ b/tests/dummy/config/optional-features.json @@ -1,4 +1,5 @@ { + "application-template-wrapper": false, "jquery-integration": false, "template-only-glimmer-components": true } From a72768e24cd929411c81bf81416b64500817145e Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Wed, 1 Dec 2021 21:05:36 +0100 Subject: [PATCH 5/6] Ember: Enable async observers --- tests/dummy/config/optional-features.json | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/dummy/config/optional-features.json b/tests/dummy/config/optional-features.json index 77a734e9..b26286e2 100644 --- a/tests/dummy/config/optional-features.json +++ b/tests/dummy/config/optional-features.json @@ -1,5 +1,6 @@ { "application-template-wrapper": false, + "default-async-observers": true, "jquery-integration": false, "template-only-glimmer-components": true } From 8b84baff163e6ae1e991e8d09494598c4708dcda Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Wed, 1 Dec 2021 21:04:00 +0100 Subject: [PATCH 6/6] Ember: Specify `octane` edition compatibility --- package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package.json b/package.json index afcb4da7..53c8c455 100644 --- a/package.json +++ b/package.json @@ -71,6 +71,9 @@ "internal": ":house: Internal" } }, + "ember": { + "edition": "octane" + }, "ember-addon": { "before": [ "ember-cli-htmlbars",