Skip to content

Commit 96473c4

Browse files
backspacebackspace
authored
Update to Ember 5.4 (#1118)
1 parent 01ec57b commit 96473c4

File tree

78 files changed

+1997
-1580
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+1997
-1580
lines changed

‎.watchmanconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"ignore_dirs": ["tmp", "dist"]
2+
"ignore_dirs": ["dist"]
33
}

‎package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"overrides": {
2222
"@types/eslint": "8.4.1",
2323
"@embroider/util": "1.12.0",
24+
"@glimmer/tracking>@glimmer/validator": "0.84.3",
2425
"jsesc": "^3.0.0",
2526
"ember-modifier": "^4.1.0",
2627
"prettier": "github:cardstack/prettier#glimmer-style-tag-in-template-support"
@@ -45,15 +46,15 @@
4546
"@actions/github": "^4.0.0",
4647
"@babel/core": "^7.24.3",
4748
"@glimmer/component": "^1.1.2",
48-
"@glimmer/tracking": "^1.0.4",
49+
"@glimmer/tracking": "^1.1.2",
4950
"@glint/core": "1.3.0",
5051
"@glint/environment-ember-loose": "1.3.0",
5152
"@glint/environment-ember-template-imports": "1.3.0",
5253
"@typescript-eslint/eslint-plugin": "^5.17.0",
5354
"@typescript-eslint/parser": "^5.17.0",
5455
"ember-cli-htmlbars": "^6.3.0",
5556
"ember-resources": "^6.3.1",
56-
"ember-source": "~4.12.0",
57+
"ember-source": "~5.4.0",
5758
"ember-template-imports": "^3.0.1",
5859
"eslint": "^7.32.0",
5960
"eslint-config-prettier": "^8.4.0",

‎packages/base/cards-grid.gts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { action } from '@ember/object';
2+
import type Owner from '@ember/owner';
23
import { on } from '@ember/modifier';
34
import { restartableTask } from 'ember-concurrency';
45
import {
@@ -176,7 +177,7 @@ class Isolated extends Component<typeof CardsGrid> {
176177
isLoading: boolean;
177178
};
178179

179-
constructor(owner: unknown, args: any) {
180+
constructor(owner: Owner, args: any) {
180181
super(owner, args);
181182
this.liveQuery = getLiveCards(
182183
{

‎packages/base/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"tracked-built-ins": "^2.0.1"
2121
},
2222
"peerDependencies": {
23-
"ember-source": "~4.12.0"
23+
"ember-source": "~5.4.0"
2424
},
2525
"scripts": {}
2626
}

‎packages/base/room.gts

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import {
1919
getCard,
2020
type LooseSingleCardDocument,
2121
} from '@cardstack/runtime-common';
22-
//@ts-expect-error cached type not available yet
2322
import { cached } from '@glimmer/tracking';
2423
import { initSharedState } from './shared-state';
2524
import BooleanField from './boolean';

‎packages/boxel-motion/addon/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
"test": "tests"
1414
},
1515
"scripts": {
16-
"build": "concurrently \"npm:build:*\" --names \"build:\"",
16+
"build": "concurrently \"pnpm:build:*\" --names \"build:\"",
1717
"build:js": "rollup --config",
1818
"build:types": "glint --declaration",
19-
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
20-
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
19+
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
20+
"lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
2121
"lint:glint": "glint",
2222
"lint:hbs": "ember-template-lint .",
2323
"lint:hbs:fix": "ember-template-lint . --fix",
@@ -27,7 +27,7 @@
2727
"rebuild:icons": "node bin/rebuild-icons.mjs",
2828
"rebuild:usage": "node bin/rebuild-usage.mjs",
2929
"prepack": "rollup --config",
30-
"start": "concurrently \"npm:start:*\" --names \"start:\"",
30+
"start": "concurrently \"pnpm:start:*\" --names \"start:\"",
3131
"start:js": "rollup --config --watch --no-watch.clearScreen",
3232
"start:types": "glint --declaration --watch",
3333
"test": "echo 'A v2 addon does not have tests, run tests in test-app'",
@@ -70,7 +70,7 @@
7070
"@typescript-eslint/parser": "^5.48.1",
7171
"babel-plugin-ember-template-compilation": "^2.2.1",
7272
"concurrently": "^8.0.1",
73-
"ember-source": "~4.12.0",
73+
"ember-source": "~5.4.0",
7474
"ember-template-imports": "^3.1.2",
7575
"ember-template-lint": "^5.11.2",
7676
"ember-template-lint-plugin-prettier": "^5.0.0",
@@ -89,7 +89,7 @@
8989
},
9090
"peerDependencies": {
9191
"@glint/environment-ember-loose": "1.3.0",
92-
"ember-source": "^4.0.0",
92+
"ember-source": "^5.4.0",
9393
"typescript": "^5.1.6"
9494
},
9595
"engines": {

‎packages/boxel-motion/addon/src/utils/scheduling.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
22
/* eslint-disable @typescript-eslint/no-explicit-any */
33
import { cancel, schedule } from '@ember/runloop';
4-
import { EmberRunTimer } from '@ember/runloop/types';
4+
import { Timer } from '@ember/runloop';
55

66
const cancellation: WeakMap<
77
Promise<any>,
@@ -16,7 +16,7 @@ export function registerCancellation(
1616
}
1717

1818
export function afterRender() {
19-
let ticket: EmberRunTimer;
19+
let ticket: Timer;
2020
let promise = new Promise((resolve) => {
2121
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
2222
// @ts-ignore

‎packages/boxel-motion/test-app/.ember-cli

-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
{
2-
/**
3-
Ember CLI sends analytics information by default. The data is completely
4-
anonymous, but there are times when you might want to disable this behavior.
5-
6-
Setting `disableAnalytics` to true will prevent any data from being sent.
7-
*/
8-
"disableAnalytics": false,
9-
102
/**
113
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
124
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.

‎packages/boxel-motion/test-app/.eslintignore

-9
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
65
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
126

137
# misc
148
/coverage/
159
!.*
1610
.*/
17-
.eslintcache
1811

1912
# ember-try
2013
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/package.json.ember-try

‎packages/boxel-motion/test-app/.gitignore

+6-9
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
2-
31
# compiled output
42
/dist/
5-
/tmp/
3+
/declarations/
64

75
# dependencies
8-
/bower_components/
96
/node_modules/
107

118
# misc
129
/.env*
1310
/.pnp*
14-
/.sass-cache
1511
/.eslintcache
16-
/connect.lock
1712
/coverage/
18-
/libpeerconnection.log
1913
/npm-debug.log*
2014
/testem.log
2115
/yarn-error.log
2216

2317
# ember-try
2418
/.node_modules.ember-try/
25-
/bower.json.ember-try
19+
/npm-shrinkwrap.json.ember-try
2620
/package.json.ember-try
21+
/package-lock.json.ember-try
22+
/yarn.lock.ember-try
2723

28-
/.idea/
24+
# broccoli-debug
25+
/DEBUG/

‎packages/boxel-motion/test-app/.prettierignore

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
65
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
126

137
# misc
148
/coverage/
159
!.*
16-
.eslintcache
10+
.*/
1711

1812
# ember-try
1913
/.node_modules.ember-try/
20-
/bower.json.ember-try
21-
/package.json.ember-try

‎packages/boxel-motion/test-app/app/routes/motion-study/details.ts

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import Route from '@ember/routing/route';
22

3-
interface Params {
4-
id: string;
5-
}
6-
73
export default class MotionStudyDetails extends Route {
8-
model(params: Params): string {
4+
model(params: Record<string, string>): string {
95
return params.id;
106
}
117
}

‎packages/boxel-motion/test-app/config/ember-cli-update.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "4.12.1",
6+
"version": "5.4.1",
77
"blueprints": [
88
{
99
"name": "app",
1010
"outputRepo": "https://github.com/ember-cli/ember-new-output",
1111
"codemodsSource": "ember-app-codemods-manifest@1",
1212
"isBaseBlueprint": true,
13-
"options": ["--no-welcome"]
13+
"options": [
14+
"--no-welcome"
15+
]
1416
}
1517
]
1618
}

‎packages/boxel-motion/test-app/package.json

+26-25
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,25 @@
1212
},
1313
"scripts": {
1414
"build": "ember build --environment=production",
15-
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
16-
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
15+
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
16+
"lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
1717
"lint:hbs": "ember-template-lint .",
1818
"lint:hbs:fix": "ember-template-lint . --fix",
1919
"lint:js": "eslint . --cache",
2020
"lint:js:fix": "eslint . --fix",
2121
"lint:glint": "glint",
2222
"start": "ember serve",
23-
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
23+
"test": "concurrently \"pnpm:lint\" \"pnpm:test:*\" --names \"lint,test:\"",
2424
"test:ember": "ember test"
2525
},
2626
"devDependencies": {
2727
"@babel/core": "^7.24.3",
2828
"@babel/eslint-parser": "^7.23.10",
29-
"@babel/plugin-proposal-decorators": "^7.21.0",
29+
"@babel/plugin-proposal-decorators": "^7.23.2",
3030
"@cardstack/boxel-motion": "workspace:*",
3131
"@ember/optional-features": "^2.0.0",
3232
"@ember/string": "^3.1.1",
33-
"@ember/test-helpers": "^2.9.3",
33+
"@ember/test-helpers": "^3.2.0",
3434
"@embroider/compat": "^3.2.2",
3535
"@embroider/core": "^3.3.0",
3636
"@embroider/macros": "^1.13.2",
@@ -49,19 +49,20 @@
4949
"@typescript-eslint/eslint-plugin": "^5.48.1",
5050
"@typescript-eslint/parser": "^5.48.1",
5151
"broccoli-asset-rev": "^3.0.0",
52-
"concurrently": "^8.0.1",
53-
"ember-a11y-testing": "^5.2.1",
52+
"concurrently": "^8.2.2",
53+
"ember-a11y-testing": "^6.1.1",
5454
"ember-auto-import": "^2.7.2",
55-
"ember-cli": "^4.12.1",
55+
"ember-cli": "^5.4.1",
5656
"ember-cli-babel": "^8.2.0",
57-
"ember-cli-dependency-checker": "^3.3.1",
57+
"ember-cli-clean-css": "^3.0.0",
58+
"ember-cli-dependency-checker": "^3.3.2",
59+
"ember-cli-deprecation-workflow": "mixonic/ember-cli-deprecation-workflow#0b4cbe7",
5860
"ember-cli-deploy": "^1.0.2",
5961
"ember-cli-deploy-build": "^2.0.0",
6062
"ember-cli-deploy-cloudfront": "^5.0.0",
6163
"ember-cli-deploy-revision-data": "^2.0.0",
6264
"ember-cli-deploy-s3": "^3.1.0",
6365
"ember-cli-deploy-smart-compress": "^2.0.0",
64-
"ember-cli-deprecation-workflow": "mixonic/ember-cli-deprecation-workflow#0b4cbe7",
6566
"ember-cli-htmlbars": "^6.3.0",
6667
"ember-cli-inject-live-reload": "^2.1.0",
6768
"ember-cli-sri": "^2.1.1",
@@ -71,34 +72,34 @@
7172
"ember-keyboard": "^8.2.0",
7273
"ember-load-initializers": "^2.1.2",
7374
"ember-modifier": "^4.1.0",
74-
"ember-page-title": "^7.0.0",
75-
"ember-qunit": "^6.2.0",
76-
"ember-resolver": "^10.0.0",
75+
"ember-page-title": "^8.0.0",
76+
"ember-qunit": "^8.0.1",
77+
"ember-resolver": "^11.0.1",
7778
"ember-resources": "^6.3.1",
78-
"ember-source": "^4.12.0",
79+
"ember-source": "^5.4.0",
7980
"ember-source-channel-url": "^3.0.0",
8081
"ember-template-imports": "^3.0.1",
81-
"ember-template-lint": "^5.7.2",
82+
"ember-template-lint": "^5.11.2",
8283
"ember-try": "^2.0.0",
83-
"eslint": "^8.37.0",
84-
"eslint-config-prettier": "^8.8.0",
85-
"eslint-plugin-ember": "^11.6.0",
86-
"eslint-plugin-n": "^15.7.0",
87-
"eslint-plugin-prettier": "^5.0.0",
88-
"eslint-plugin-qunit": "^7.3.4",
84+
"eslint": "^8.52.0",
85+
"eslint-config-prettier": "^9.0.0",
86+
"eslint-plugin-ember": "^11.11.1",
87+
"eslint-plugin-n": "^16.2.0",
88+
"eslint-plugin-prettier": "^5.0.1",
89+
"eslint-plugin-qunit": "^8.0.1",
8990
"glimmer-scoped-css": "^0.4.0",
9091
"loader.js": "^4.7.0",
9192
"normalize.css": "8.0.1",
92-
"prettier": "^2.8.7",
93+
"prettier": "^3.0.3",
9394
"prettier-plugin-ember-template-tag": "^1.1.0",
94-
"qunit": "^2.19.4",
95+
"qunit": "^2.20.0",
9596
"qunit-dom": "^2.0.0",
96-
"tracked-built-ins": "^3.2.0",
97+
"tracked-built-ins": "^3.3.0",
9798
"typescript": "~5.1.6",
9899
"webpack": "^5.89.0"
99100
},
100101
"engines": {
101-
"node": "14.* || 16.* || >= 18"
102+
"node": ">= 18"
102103
},
103104
"volta": {
104105
"extends": "../../../package.json"

‎packages/boxel-ui/addon/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
"test": "tests"
1414
},
1515
"scripts": {
16-
"build": "concurrently \"npm:build:*\" --names \"build:\"",
16+
"build": "concurrently \"pnpm:build:*\" --names \"build:\"",
1717
"build:js": "rollup --config",
1818
"build:types": "glint --declaration",
19-
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
20-
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
19+
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
20+
"lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
2121
"lint:glint": "glint",
2222
"lint:hbs": "ember-template-lint .",
2323
"lint:hbs:fix": "ember-template-lint . --fix",
@@ -27,7 +27,7 @@
2727
"rebuild:icons": "node bin/rebuild-icons.mjs",
2828
"rebuild:usage": "node bin/rebuild-usage.mjs",
2929
"prepack": "rollup --config",
30-
"start": "concurrently \"npm:start:*\" --names \"start:\"",
30+
"start": "concurrently \"pnpm:start:*\" --names \"start:\"",
3131
"start:js": "rollup --config --watch --no-watch.clearScreen",
3232
"start:types": "glint --declaration --watch",
3333
"test": "echo 'A v2 addon does not have tests, run tests in test-app'",
@@ -95,7 +95,7 @@
9595
},
9696
"peerDependencies": {
9797
"@glint/environment-ember-loose": "1.3.0",
98-
"ember-source": "^4.0.0",
98+
"ember-source": "^5.4.0",
9999
"typescript": "^5.1.6"
100100
},
101101
"engines": {

0 commit comments

Comments
 (0)