Skip to content

Commit ceb0cb0

Browse files
Merge pull request #142 from ember-polyfills/get-ci-green
Fix CI
2 parents 63a701c + 03f90af commit ceb0cb0

File tree

3 files changed

+36
-166
lines changed

3 files changed

+36
-166
lines changed

config/ember-try.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ module.exports = async function () {
3636
npm: {
3737
devDependencies: {
3838
'ember-source': await getChannelURL('release'),
39+
'ember-cli': '^5.0.0',
40+
'@glint/template': '^1.0.0',
3941
},
4042
},
4143
},
@@ -47,6 +49,8 @@ module.exports = async function () {
4749
},
4850
devDependencies: {
4951
'ember-source': await getChannelURL('beta'),
52+
'@glint/template': '^1.0.0',
53+
'ember-cli': '^5.0.0',
5054
webpack: '^5.0.0',
5155
},
5256
},
@@ -59,6 +63,8 @@ module.exports = async function () {
5963
},
6064
devDependencies: {
6165
'ember-source': await getChannelURL('canary'),
66+
'@glint/template': '^1.0.0',
67+
'ember-cli': '^5.0.0',
6268
webpack: '^5.0.0',
6369
},
6470
},

package.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,16 @@
3535
"peerDependencies": {
3636
"ember-source": "^3.25.0 || >=4.0.0"
3737
},
38+
"resolutions": {
39+
"@ember/test-helpers": "^2.6.0"
40+
},
3841
"devDependencies": {
3942
"@commitlint/cli": "^16.2.3",
4043
"@commitlint/config-conventional": "^16.2.1",
4144
"@ember/optional-features": "^2.0.0",
45+
"@ember/string": "^3.1.1",
4246
"@ember/test-helpers": "^2.6.0",
43-
"@ember/test-waiters": "^3.0.1",
47+
"@ember/test-waiters": "~3.0.1",
4448
"@embroider/macros": "^1.0.0",
4549
"@embroider/test-setup": "^1.0.0",
4650
"@glimmer/tracking": "^1.0.4",
@@ -72,16 +76,11 @@
7276
"@typescript-eslint/eslint-plugin": "^5.16.0",
7377
"@typescript-eslint/parser": "^5.16.0",
7478
"babel-eslint": "^10.1.0",
75-
"broccoli-asset-rev": "^3.0.0",
7679
"ember-auto-import": "^2.4.1",
7780
"ember-cli": "~4.2.0",
78-
"ember-cli-dependency-checker": "^3.2.0",
7981
"ember-cli-htmlbars": "^6.0.1",
8082
"ember-cli-inject-live-reload": "^2.1.0",
81-
"ember-cli-sri": "^2.1.1",
82-
"ember-cli-terser": "^4.0.2",
8383
"ember-disable-prototype-extensions": "^1.1.3",
84-
"ember-export-application-global": "^2.0.1",
8584
"ember-load-initializers": "^2.1.2",
8685
"ember-page-title": "^7.0.0",
8786
"ember-qunit": "^5.1.5",
@@ -123,7 +122,7 @@
123122
]
124123
},
125124
"volta": {
126-
"node": "16.13.2",
125+
"node": "14.21.3",
127126
"yarn": "1.22.17"
128127
},
129128
"engines": {

0 commit comments

Comments
 (0)