Skip to content

Commit 76e012b

Browse files
authored
Allow @ember/test-helpers v5.x, tracked-built-ins v4.x & @glimmer/component v2.x (#1090)
* Allow `@ember/test-helpers` v5.x, `tracked-built-ins` v4.x & `@glimmer/component` v2.x * Fix pnpm lock file * Update node version in build * Revert dependency updates inside project * Add try against additional typescript versions * Add [email protected] test * Retry update tracked-built-ins to 4.0 * Update typescript in project * Downgrade @tsconfig/ember for old ts tests * Allow @ember/test-waiters v4 * Revert `@ember/test-waiters` v4 support (@ember/test-helper doesn't support it right now)
1 parent e20fc6c commit 76e012b

File tree

7 files changed

+2544
-2365
lines changed

7 files changed

+2544
-2365
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
pull_request:
88

99
env:
10-
NODE_VERSION: '16.x'
10+
NODE_VERSION: '20.x'
1111

1212
jobs:
1313
lint:
@@ -51,10 +51,14 @@ jobs:
5151
fail-fast: true
5252
matrix:
5353
typescript-scenario:
54-
55-
56-
57-
54+
- [email protected] tracked-built-ins@3 @tsconfig/[email protected]
55+
- [email protected] tracked-built-ins@3 @tsconfig/[email protected]
56+
- [email protected] tracked-built-ins@3 @tsconfig/[email protected]
57+
- [email protected] tracked-built-ins@3 @tsconfig/[email protected]
58+
- [email protected] tracked-built-ins@3 @tsconfig/[email protected]
59+
60+
61+
5862

5963
steps:
6064
- uses: actions/checkout@v4

.github/workflows/website-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
pull_request:
88

99
env:
10-
NODE_VERSION: '16.x'
10+
NODE_VERSION: '20.x'
1111

1212
jobs:
1313
lint:

ember-file-upload/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,18 @@
8686
"eslint-plugin-prettier": "^5.0.0",
8787
"prettier": "^3.0.3",
8888
"rollup": "^3.29.5",
89-
"tracked-built-ins": "^3.0.0",
90-
"typescript": "^5.2.0",
89+
"tracked-built-ins": "^4.0.0",
90+
"typescript": "~5.6.0",
9191
"webpack": "^5.94.0"
9292
},
9393
"peerDependencies": {
94-
"@ember/test-helpers": "^2.9.3 || ^3.0.3 || ^4.0.4",
95-
"@glimmer/component": "^1.1.2",
94+
"@ember/test-helpers": "^2.9.3 || ^3.0.3 || ^4.0.4 || ^5.0.0",
95+
"@glimmer/component": ">=1.1.2",
9696
"@glimmer/tracking": "^1.1.2",
9797
"ember-cli-mirage": "*",
9898
"ember-modifier": "^3.2.7 || ^4.1.0",
9999
"miragejs": "*",
100-
"tracked-built-ins": "^3.1.1"
100+
"tracked-built-ins": ">=3.1.1"
101101
},
102102
"peerDependenciesMeta": {
103103
"ember-cli-mirage": {

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,6 @@
4848
"@glimmer/validator": "^0.92.0"
4949
}
5050
},
51-
"version": "9.1.0"
51+
"version": "9.1.0",
52+
"packageManager": "[email protected]"
5253
}

pnpm-lock.yaml

Lines changed: 2524 additions & 2350 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test-app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@
8585
"stylelint": "^16.0.0",
8686
"stylelint-config-standard": "^36.0.0",
8787
"stylelint-prettier": "^5.0.0",
88-
"tracked-built-ins": "^3.3.0",
89-
"typescript": "~5.2.0",
88+
"tracked-built-ins": "^4.0.0",
89+
"typescript": "~5.6.0",
9090
"webpack": "^5.94.0"
9191
},
9292
"dependenciesMeta": {

website/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"stylelint": "^16.0.0",
8181
"stylelint-config-standard": "^36.0.0",
8282
"stylelint-prettier": "^5.0.0",
83-
"tracked-built-ins": "^3.3.0",
83+
"tracked-built-ins": "^4.0.0",
8484
"webpack": "^5.94.0"
8585
},
8686
"dependenciesMeta": {

0 commit comments

Comments
 (0)