diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9918b27..2ac7c7a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,12 +62,11 @@ 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 + - ember-resolver-10 + - ember-resolver-11 - ember-resolver-12 - ember-release - ember-beta diff --git a/ember-can/package.json b/ember-can/package.json index fcc7af0..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-source": "^3.28.0 || ^4.0.0 || >=5.0.0", - "ember-resolver": ">= 8.0.0" + "@ember/string": ">=3.0.1", + "ember-inflector": ">=5.0.1", + "ember-source": ">=4.12.0", + "ember-resolver": ">= 10.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..c7c3e04 100644 --- a/test-app/config/ember-try.js +++ b/test-app/config/ember-try.js @@ -8,56 +8,45 @@ module.exports = async function () { usePnpm: true, scenarios: [ { - name: 'ember-lts-3.28', + name: 'ember-lts-4.12', 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', + 'ember-source': '~4.12.0', }, }, }, { - name: 'ember-lts-4.4', + name: 'ember-lts-5.4', npm: { devDependencies: { - 'ember-resolver': '^8.0.0', - 'ember-source': '~4.4.0', + 'ember-source': '~5.4.0', }, }, }, { - name: 'ember-lts-4.8', + name: 'ember-lts-5.8', npm: { devDependencies: { - 'ember-resolver': '^11.0.0', - 'ember-source': '~4.8.0', + 'ember-source': '~5.8.0', }, }, }, { - name: 'ember-lts-4.12', + name: 'ember-resolver-10', npm: { devDependencies: { + '@ember/string': '^3.0.1', 'ember-source': '~4.12.0', + 'ember-resolver': '^10.0.0', }, }, }, { - name: 'ember-lts-5.4', - npm: { - devDependencies: { - 'ember-source': '~5.4.0', - }, - }, - }, - { - name: 'ember-lts-5.8', + name: 'ember-resolver-11', npm: { devDependencies: { - 'ember-source': '~5.8.0', + 'ember-source': '~4.12.0', + 'ember-resolver': '^11.0.0', }, }, },