Skip to content

Remove support for ember < 4.12 #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RobbieTheWagner merged 10 commits into from
Apr 3, 2025
Merged

Remove support for ember < 4.12 #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f2d8e55
Deprecate support for ember < 4.12
mkszepp Apr 3, 2025
69a90a5
remove old lts from ci.yml
mkszepp Apr 3, 2025
73d6341
Change peerDependency ember-source
mkszepp Apr 3, 2025
c9fd049
Allow only ember-resolver 13.x+
mkszepp Apr 3, 2025
48dd85f
Update peerDependencies
mkszepp Apr 3, 2025
089a5b9
Fix peerDependencies
mkszepp Apr 3, 2025
0c5a14e
Update peerDependencies
mkszepp Apr 3, 2025
cbaa307
Readd ember-resolver tests
mkszepp Apr 3, 2025
9636c0b
Add resolvers in ci.yml
mkszepp Apr 3, 2025
e1bf99e
Fix peerDependency issue for old resolver
mkszepp Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions ember-can/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 1 addition & 3 deletions ember-can/src/helpers/can.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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];
Expand Down
4 changes: 1 addition & 3 deletions ember-can/src/helpers/cannot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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];
Expand Down
2 changes: 1 addition & 1 deletion ember-can/src/services/abilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
35 changes: 12 additions & 23 deletions test-app/config/ember-try.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
},
},
Expand Down