From f2d8e55f6a971474382823bc5d8a8f1157349ce8 Mon Sep 17 00:00:00 2001 From: Markus Sanin Date: Thu, 3 Apr 2025 16:03:27 +0200 Subject: [PATCH 01/10] Deprecate support for ember < 4.12 --- ember-can/package.json | 8 ++++---- ember-can/src/helpers/can.ts | 4 +--- ember-can/src/helpers/cannot.ts | 4 +--- ember-can/src/services/abilities.ts | 2 +- test-app/config/ember-try.js | 30 ----------------------------- 5 files changed, 7 insertions(+), 41 deletions(-) diff --git a/ember-can/package.json b/ember-can/package.json index fcc7af0..72deef1 100644 --- a/ember-can/package.json +++ b/ember-can/package.json @@ -125,9 +125,9 @@ } }, "peerDependencies": { - "@ember/string": "^3.1.1 || ^4.0.0", - "ember-inflector": "^4.0.2 || >=5.0.1", - "ember-source": "^3.28.0 || ^4.0.0 || >=5.0.0", - "ember-resolver": ">= 8.0.0" + "@ember/string": "^4.0.0", + "ember-inflector": ">=5.0.1", + "ember-source": "^4.12.0 || >=5.0.0", + "ember-resolver": ">= 12.0.0" } } diff --git a/ember-can/src/helpers/can.ts b/ember-can/src/helpers/can.ts index 7eb7369..d27587a 100644 --- a/ember-can/src/helpers/can.ts +++ b/ember-can/src/helpers/can.ts @@ -1,9 +1,7 @@ import Helper from '@ember/component/helper'; -import * as s from '@ember/service'; +import { service } from '@ember/service'; import type Ability from '../services/abilities.ts'; -const service = s.service ?? s.inject; - interface CanSignature { Args: { Positional: [abilityString: string, model?: unknown]; diff --git a/ember-can/src/helpers/cannot.ts b/ember-can/src/helpers/cannot.ts index 432834a..62af9cb 100644 --- a/ember-can/src/helpers/cannot.ts +++ b/ember-can/src/helpers/cannot.ts @@ -1,9 +1,7 @@ import Helper from '@ember/component/helper'; -import * as s from '@ember/service'; +import { service } from '@ember/service'; import type Ability from '../services/abilities.ts'; -const service = s.service ?? s.inject; - interface CannotSignature { Args: { Positional: [abilityString: string, model?: unknown]; diff --git a/ember-can/src/services/abilities.ts b/ember-can/src/services/abilities.ts index 3c82dfe..f1cceec 100644 --- a/ember-can/src/services/abilities.ts +++ b/ember-can/src/services/abilities.ts @@ -1,7 +1,7 @@ import Service from '@ember/service'; import Ability from '../ability.ts'; import { assert } from '@ember/debug'; -import { getOwner } from '@ember/application'; +import { getOwner } from '@ember/owner'; import normalizeAbilityString from '../-private/normalize.ts'; export default class AbilitiesService extends Service { diff --git a/test-app/config/ember-try.js b/test-app/config/ember-try.js index c70f8a1..f149571 100644 --- a/test-app/config/ember-try.js +++ b/test-app/config/ember-try.js @@ -7,36 +7,6 @@ module.exports = async function () { return { usePnpm: true, scenarios: [ - { - name: 'ember-lts-3.28', - npm: { - devDependencies: { - '@ember/test-helpers': '^2.9.4', - 'ember-cli': '~4.12.2', - 'ember-qunit': '^6.0.0', - 'ember-resolver': '^8.0.0', - 'ember-source': '~3.28.0', - }, - }, - }, - { - name: 'ember-lts-4.4', - npm: { - devDependencies: { - 'ember-resolver': '^8.0.0', - 'ember-source': '~4.4.0', - }, - }, - }, - { - name: 'ember-lts-4.8', - npm: { - devDependencies: { - 'ember-resolver': '^11.0.0', - 'ember-source': '~4.8.0', - }, - }, - }, { name: 'ember-lts-4.12', npm: { From 69a90a56af6a2aa90566ded426accf226f993fcf Mon Sep 17 00:00:00 2001 From: Markus Sanin Date: Thu, 3 Apr 2025 16:05:36 +0200 Subject: [PATCH 02/10] remove old lts from ci.yml --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9918b27..fcaa02a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,9 +62,6 @@ jobs: fail-fast: false matrix: try-scenario: - - ember-lts-3.28 - - ember-lts-4.4 - - ember-lts-4.8 - ember-lts-4.12 - ember-lts-5.4 - ember-lts-5.8 From 73d63415daac66910958a03d9719c552c7d38615 Mon Sep 17 00:00:00 2001 From: Markus Sanin Date: Thu, 3 Apr 2025 16:10:18 +0200 Subject: [PATCH 03/10] Change peerDependency ember-source --- ember-can/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ember-can/package.json b/ember-can/package.json index 72deef1..0a81cfb 100644 --- a/ember-can/package.json +++ b/ember-can/package.json @@ -127,7 +127,7 @@ "peerDependencies": { "@ember/string": "^4.0.0", "ember-inflector": ">=5.0.1", - "ember-source": "^4.12.0 || >=5.0.0", + "ember-source": ">=4.12.0", "ember-resolver": ">= 12.0.0" } } From c9fd049c1ea5a4a16e1f5d4c3bbdcff93a7b2af1 Mon Sep 17 00:00:00 2001 From: Markus Sanin Date: Thu, 3 Apr 2025 16:12:48 +0200 Subject: [PATCH 04/10] Allow only ember-resolver 13.x+ --- .github/workflows/ci.yml | 1 - ember-can/package.json | 2 +- test-app/config/ember-try.js | 9 --------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fcaa02a..1f12795 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,7 +65,6 @@ jobs: - ember-lts-4.12 - ember-lts-5.4 - ember-lts-5.8 - - ember-resolver-12 - ember-release - ember-beta - ember-canary diff --git a/ember-can/package.json b/ember-can/package.json index 0a81cfb..c091200 100644 --- a/ember-can/package.json +++ b/ember-can/package.json @@ -128,6 +128,6 @@ "@ember/string": "^4.0.0", "ember-inflector": ">=5.0.1", "ember-source": ">=4.12.0", - "ember-resolver": ">= 12.0.0" + "ember-resolver": ">= 13.0.0" } } diff --git a/test-app/config/ember-try.js b/test-app/config/ember-try.js index f149571..023e676 100644 --- a/test-app/config/ember-try.js +++ b/test-app/config/ember-try.js @@ -31,15 +31,6 @@ module.exports = async function () { }, }, }, - { - name: 'ember-resolver-12', - npm: { - devDependencies: { - 'ember-source': '~5.8.0', - 'ember-resolver': '^12.0.0', - }, - }, - }, { name: 'ember-release', npm: { From 48dd85ff5c14355033b0de4b58908fde3116c2b6 Mon Sep 17 00:00:00 2001 From: Markus Sanin Date: Thu, 3 Apr 2025 17:08:17 +0200 Subject: [PATCH 05/10] Update peerDependencies --- ember-can/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ember-can/package.json b/ember-can/package.json index c091200..da1ca9f 100644 --- a/ember-can/package.json +++ b/ember-can/package.json @@ -125,9 +125,9 @@ } }, "peerDependencies": { - "@ember/string": "^4.0.0", - "ember-inflector": ">=5.0.1", - "ember-source": ">=4.12.0", - "ember-resolver": ">= 13.0.0" + "@ember/string": "^3.1.1 || ^4.0.0", + "ember-inflector": "^4.0.2 || >=5.0.1", + "ember-source": "^4.12.0 || >=5.0.0", + "ember-resolver": ">= 8.0.0" } } From 089a5b978a856c87b73e9d49f0ae0fe02a6bc05d Mon Sep 17 00:00:00 2001 From: Markus Sanin Date: Thu, 3 Apr 2025 17:08:38 +0200 Subject: [PATCH 06/10] Fix peerDependencies --- ember-can/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ember-can/package.json b/ember-can/package.json index da1ca9f..c1baa71 100644 --- a/ember-can/package.json +++ b/ember-can/package.json @@ -127,7 +127,7 @@ "peerDependencies": { "@ember/string": "^3.1.1 || ^4.0.0", "ember-inflector": "^4.0.2 || >=5.0.1", - "ember-source": "^4.12.0 || >=5.0.0", + "ember-source": ">=4.12.0", "ember-resolver": ">= 8.0.0" } } From 0c5a14e62303dbad405da8c5711681a6f7a3cc5e Mon Sep 17 00:00:00 2001 From: Markus Sanin Date: Thu, 3 Apr 2025 17:13:21 +0200 Subject: [PATCH 07/10] Update peerDependencies --- ember-can/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ember-can/package.json b/ember-can/package.json index c1baa71..0591a93 100644 --- a/ember-can/package.json +++ b/ember-can/package.json @@ -125,9 +125,9 @@ } }, "peerDependencies": { - "@ember/string": "^3.1.1 || ^4.0.0", - "ember-inflector": "^4.0.2 || >=5.0.1", + "@ember/string": ">=3.0.1", + "ember-inflector": ">=5.0.1", "ember-source": ">=4.12.0", - "ember-resolver": ">= 8.0.0" + "ember-resolver": ">= 10.0.0" } } From cbaa307c8b1300a3aed96c1f30f9bed14f2de9b6 Mon Sep 17 00:00:00 2001 From: Markus Sanin Date: Thu, 3 Apr 2025 17:23:35 +0200 Subject: [PATCH 08/10] Readd ember-resolver tests --- test-app/config/ember-try.js | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/test-app/config/ember-try.js b/test-app/config/ember-try.js index 023e676..d34c976 100644 --- a/test-app/config/ember-try.js +++ b/test-app/config/ember-try.js @@ -31,6 +31,33 @@ module.exports = async function () { }, }, }, + { + name: 'ember-resolver-10', + npm: { + devDependencies: { + 'ember-source': '~4.12.0', + 'ember-resolver': '^10.0.0', + }, + }, + }, + { + name: 'ember-resolver-11', + npm: { + devDependencies: { + 'ember-source': '~4.12.0', + 'ember-resolver': '^11.0.0', + }, + }, + }, + { + name: 'ember-resolver-12', + npm: { + devDependencies: { + 'ember-source': '~5.8.0', + 'ember-resolver': '^12.0.0', + }, + }, + }, { name: 'ember-release', npm: { From 9636c0b248ca0ab24bd534484127b76bc167133e Mon Sep 17 00:00:00 2001 From: Markus Sanin Date: Thu, 3 Apr 2025 17:25:22 +0200 Subject: [PATCH 09/10] Add resolvers in ci.yml --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f12795..2ac7c7a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,6 +65,9 @@ jobs: - ember-lts-4.12 - ember-lts-5.4 - ember-lts-5.8 + - ember-resolver-10 + - ember-resolver-11 + - ember-resolver-12 - ember-release - ember-beta - ember-canary From e1bf99e37284a61611a4fecb58a02d61d067ce35 Mon Sep 17 00:00:00 2001 From: Markus Sanin Date: Thu, 3 Apr 2025 17:30:26 +0200 Subject: [PATCH 10/10] Fix peerDependency issue for old resolver --- test-app/config/ember-try.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test-app/config/ember-try.js b/test-app/config/ember-try.js index d34c976..c7c3e04 100644 --- a/test-app/config/ember-try.js +++ b/test-app/config/ember-try.js @@ -35,6 +35,7 @@ module.exports = async function () { name: 'ember-resolver-10', npm: { devDependencies: { + '@ember/string': '^3.0.1', 'ember-source': '~4.12.0', 'ember-resolver': '^10.0.0', },