From 40fe84b7f62210ba1a404f6899f91c19730f8556 Mon Sep 17 00:00:00 2001 From: Jeldrik Hanschke Date: Tue, 19 Nov 2024 13:27:33 +0100 Subject: [PATCH 1/5] support Ember v4 --- .github/workflows/ci.yml | 1 + config/ember-try.js | 8 ++++++++ package.json | 4 ++++ yarn.lock | 5 +++++ 4 files changed, 18 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a8d02a8..c84b7de6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -173,6 +173,7 @@ jobs: [ ember-lts-3.20, ember-lts-3.24, + ember-lts-4.12, ember-release, ember-beta, ember-canary, diff --git a/config/ember-try.js b/config/ember-try.js index 13eb8d86..6c5d2a39 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -23,6 +23,14 @@ module.exports = async function () { }, }, }, + { + name: 'ember-lts-4.12', + npm: { + devDependencies: { + 'ember-source': '~4.12.0', + }, + }, + }, { name: 'ember-release', npm: { diff --git a/package.json b/package.json index bc49605b..38b7b4e3 100644 --- a/package.json +++ b/package.json @@ -52,6 +52,7 @@ }, "devDependencies": { "@ember/optional-features": "^2.0.0", + "@ember/string": "^4.0.0", "@ember/test-helpers": "^2.4.2", "@embroider/test-setup": "^2.0.0", "@glimmer/tracking": "^1.0.4", @@ -118,6 +119,9 @@ "typescript": "^4.4.3", "webpack": "5" }, + "peerDependencies": { + "@ember/string": "^4.0.0" + }, "engines": { "node": "12.* || 14.* || >= 16" }, diff --git a/yarn.lock b/yarn.lock index 162c68ec..bd149189 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1408,6 +1408,11 @@ mkdirp "^1.0.4" silent-error "^1.1.1" +"@ember/string@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@ember/string/-/string-4.0.0.tgz#24fe5cda227c9e6634e6e0b550944a3a13437878" + integrity sha512-IMVyVE72twuAMSYcHzWSgtgYTtzlHlKSGW8vEbztnnmkU6uo7kVHmiqSN9R4RkBhzvh0VD4G76Eph+55t3iNIA== + "@ember/test-helpers@^2.4.2": version "2.8.1" resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.8.1.tgz#20f2e30d48172c2ff713e1db7fbec5352f918d4e" From c2fa85ae94fb4df1e03040b627aa1c5dd3676111 Mon Sep 17 00:00:00 2001 From: Jeldrik Hanschke Date: Tue, 19 Nov 2024 15:34:01 +0100 Subject: [PATCH 2/5] @ember/string v4 is not compatible with Ember < 3.28 --- config/ember-try.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/ember-try.js b/config/ember-try.js index fa63a45f..61321d27 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -11,6 +11,7 @@ module.exports = async function () { name: 'ember-lts-3.20', npm: { devDependencies: { + '@ember/string': '^3.0.0', 'ember-qunit': '6.0.0', 'ember-source': '~3.20.5', }, @@ -20,6 +21,7 @@ module.exports = async function () { name: 'ember-lts-3.24', npm: { devDependencies: { + '@ember/string': '^3.0.0', 'ember-qunit': '6.0.0', 'ember-source': '~3.24.3', }, From a3c70ec1147dc56aedfde6b3c3da984b3f80bc94 Mon Sep 17 00:00:00 2001 From: Jeldrik Hanschke Date: Tue, 26 Nov 2024 11:18:32 +0100 Subject: [PATCH 3/5] add @ember/string as peer dep and run tests for Ember v5 --- .github/workflows/ci.yml | 1 + config/ember-try.js | 8 ++++++++ package.json | 3 +++ 3 files changed, 12 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 721d16be..d8f881df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -173,6 +173,7 @@ jobs: ember-lts-3.20, ember-lts-3.24, ember-lts-4.12, + ember-lts-5.12, # ember-release, # ember-beta, # ember-canary, diff --git a/config/ember-try.js b/config/ember-try.js index 61321d27..060538ea 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -35,6 +35,14 @@ module.exports = async function () { }, }, }, + { + name: 'ember-lts-5.12', + npm: { + devDependencies: { + 'ember-source': '~5.12.0', + }, + }, + }, { name: 'ember-release', npm: { diff --git a/package.json b/package.json index c8e4a8ae..fa2dab54 100644 --- a/package.json +++ b/package.json @@ -119,6 +119,9 @@ "typescript": "^4.4.3", "webpack": "5" }, + "peerDependencies": { + "@ember/string": "^4.0.0" + }, "resolutions": { "@babel/plugin-transform-modules-amd": "7.16.5", "@ember/string": "^4.0.0" From 2c48089e6f9f694ea10d61802961b4303c8282bd Mon Sep 17 00:00:00 2001 From: Jeldrik Hanschke Date: Tue, 26 Nov 2024 11:41:57 +0100 Subject: [PATCH 4/5] ember-resolver v8 is not compatible with Ember v5 --- config/ember-try.js | 1 + 1 file changed, 1 insertion(+) diff --git a/config/ember-try.js b/config/ember-try.js index 060538ea..f8812dcf 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -39,6 +39,7 @@ module.exports = async function () { name: 'ember-lts-5.12', npm: { devDependencies: { + 'ember-resolver': '^12.0.0', 'ember-source': '~5.12.0', }, }, From 9cc84690fef96abb066c2ee674c2a612bb326206 Mon Sep 17 00:00:00 2001 From: Jeldrik Hanschke Date: Fri, 29 Nov 2024 09:53:10 +0100 Subject: [PATCH 5/5] downgrade to @ember/string v3 --- package.json | 4 ++-- yarn.lock | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index fa2dab54..88902adb 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ }, "devDependencies": { "@ember/optional-features": "^2.0.0", - "@ember/string": "^4.0.0", + "@ember/string": "^3.0.0", "@ember/test-helpers": "^2.4.2", "@embroider/test-setup": "^2.0.0", "@glimmer/tracking": "^1.0.4", @@ -120,7 +120,7 @@ "webpack": "5" }, "peerDependencies": { - "@ember/string": "^4.0.0" + "@ember/string": ">= 3.0.0" }, "resolutions": { "@babel/plugin-transform-modules-amd": "7.16.5", diff --git a/yarn.lock b/yarn.lock index d22de96f..e62080a6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -972,6 +972,13 @@ mkdirp "^1.0.4" silent-error "^1.1.1" +"@ember/string@^3.0.0": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@ember/string/-/string-3.1.1.tgz#0a5ac0d1e4925259e41d5c8d55ef616117d47ff0" + integrity sha512-UbXJ+k3QOrYN4SRPHgXCqYIJ+yWWUg1+vr0H4DhdQPTy8LJfyqwZ2tc5uqpSSnEXE+/1KopHBE5J8GDagAg5cg== + dependencies: + ember-cli-babel "^7.26.6" + "@ember/string@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@ember/string/-/string-4.0.0.tgz#24fe5cda227c9e6634e6e0b550944a3a13437878"