Skip to content

Commit 8b53e45

Browse files
authored
Merge pull request #960 from ember-fastboot/update
update ember-cli-fastboot to v5.12.0 with ember-cli-update
2 parents 75da4a0 + 2896217 commit 8b53e45

7 files changed

Lines changed: 520 additions & 405 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ jobs:
126126
- ember-lts-4.8
127127
- ember-lts-4.12
128128
- ember-lts-5.4
129+
- ember-lts-5.8
129130
- ember-release
130131
- ember-beta
131132
- ember-canary

CONTRIBUTING.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,17 @@ The `test-packages` folder contains sample apps and integration test suite used
1919

2020
* `git clone https://github.com/ember-fastboot/ember-cli-fastboot/`
2121
* `cd ember-cli-fastboot`
22-
* `yarn install`
22+
* `pnpm install`
2323

2424
## Running tests
2525

26-
* `yarn workspace integration-tests test` - Run integration test suite
27-
* `yarn workspace basic-app test:mocha` - Run sample app's test suite
28-
* `yarn workspace ember-cli-fastboot test:ember` – Runs the `ember-cli-fastboot` test suite
26+
If you want to **all** the tests you can run
2927

30-
You can run each package's own test suite specified in its `package.json` via [`yarn workspace`](https://classic.yarnpkg.com/en/docs/cli/workspace#yarn-workspace-workspace_name-command-)
28+
```
29+
pnpm test
30+
```
31+
32+
in the root of the monorepo. You will see that it is calling `npm-run-all` on other scripts listed in `package.json` with the prefix `test:` so if you want to run any specific test again you can just use that package.json sript
3133

3234
## Where to write test
3335

packages/ember-cli-fastboot/package.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
},
1515
"scripts": {
1616
"build": "ember build --environment=production",
17-
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
17+
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
1818
"lint:css": "stylelint \"**/*.css\"",
19-
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
20-
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
19+
"lint:css:fix": "concurrently \"pnpm:lint:css -- --fix\"",
20+
"lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
2121
"lint:hbs": "ember-template-lint .",
2222
"lint:hbs:fix": "ember-template-lint . --fix",
2323
"lint:js": "eslint . --cache",
2424
"lint:js:fix": "eslint . --fix",
2525
"start": "ember serve",
26-
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
26+
"test": "concurrently \"pnpm:lint\" \"pnpm:test:*\" --names \"lint,test:\"",
2727
"test:mocha": "mocha",
2828
"test:ember": "ember test",
2929
"test:ember-compatibility": "ember try:each"
@@ -49,18 +49,18 @@
4949
"silent-error": "^1.1.1"
5050
},
5151
"devDependencies": {
52-
"@babel/eslint-parser": "^7.24.1",
53-
"@babel/plugin-proposal-decorators": "^7.24.1",
52+
"@babel/eslint-parser": "^7.25.1",
53+
"@babel/plugin-proposal-decorators": "^7.24.7",
5454
"@ember/optional-features": "^2.1.0",
55-
"@ember/test-helpers": "^3.3.0",
56-
"@embroider/test-setup": "^3.0.3",
55+
"@ember/test-helpers": "^3.3.1",
56+
"@embroider/test-setup": "^4.0.0",
5757
"@glimmer/component": "^1.1.2",
5858
"@glimmer/tracking": "^1.1.2",
5959
"broccoli-asset-rev": "^3.0.0",
6060
"broccoli-test-helper": "^1.5.0",
6161
"concurrently": "^8.2.2",
62-
"ember-auto-import": "^2.7.2",
63-
"ember-cli": "~5.8.1",
62+
"ember-auto-import": "^2.8.1",
63+
"ember-cli": "~5.12.0",
6464
"ember-cli-clean-css": "^3.0.0",
6565
"ember-cli-dependency-checker": "^3.3.2",
6666
"ember-cli-htmlbars": "^6.3.0",
@@ -69,31 +69,31 @@
6969
"ember-cli-terser": "^4.0.2",
7070
"ember-load-initializers": "^2.1.2",
7171
"ember-page-title": "^8.2.3",
72-
"ember-qunit": "^8.0.2",
73-
"ember-resolver": "^11.0.1",
74-
"ember-source": "~5.8.0",
72+
"ember-qunit": "^8.1.0",
73+
"ember-resolver": "^12.0.1",
74+
"ember-source": "~5.12.0",
7575
"ember-source-channel-url": "^3.0.0",
76-
"ember-template-lint": "^5.13.0",
76+
"ember-template-lint": "^6.0.0",
7777
"ember-try": "^3.0.0",
78-
"eslint": "^8.57.0",
78+
"eslint": "^8.57.1",
7979
"eslint-config-prettier": "^9.1.0",
80-
"eslint-plugin-ember": "^11.12.0",
80+
"eslint-plugin-ember": "^12.2.1",
8181
"eslint-plugin-n": "^16.6.2",
82-
"eslint-plugin-prettier": "^5.1.3",
83-
"eslint-plugin-qunit": "^8.1.1",
82+
"eslint-plugin-prettier": "^5.2.1",
83+
"eslint-plugin-qunit": "^8.1.2",
8484
"glob": "^7.1.3",
8585
"lint-to-the-future": "^2.0.0",
8686
"lint-to-the-future-eslint": "^2.0.1",
8787
"loader.js": "^4.7.0",
8888
"mocha": "^9.1.2",
89-
"prettier": "^3.2.5",
90-
"qunit": "^2.20.1",
91-
"qunit-dom": "^2.0.0",
89+
"prettier": "^3.3.3",
90+
"qunit": "^2.22.0",
91+
"qunit-dom": "^3.2.1",
9292
"sinon": "^17.0.1",
9393
"stylelint": "^15.11.0",
9494
"stylelint-config-standard": "^34.0.0",
9595
"stylelint-prettier": "^4.1.0",
96-
"webpack": "^5.91.0"
96+
"webpack": "^5.95.0"
9797
},
9898
"peerDependencies": {
9999
"ember-source": ">=3.16"

packages/ember-cli-fastboot/tests/dummy/config/ember-cli-update.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "5.8.1",
6+
"version": "5.12.0",
77
"blueprints": [
88
{
99
"name": "addon",
1010
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
1111
"codemodsSource": "ember-addon-codemods-manifest@1",
1212
"isBaseBlueprint": true,
1313
"options": [
14-
"--no-welcome"
14+
"--no-welcome",
15+
"--pnpm"
1516
]
1617
}
1718
]

packages/ember-cli-fastboot/tests/dummy/config/ember-try.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ module.exports = async function () {
1515
'ember-qunit': '^5.0.0',
1616
'ember-cli': '^4.12.0',
1717
'@ember/test-helpers': '^2.4.0',
18+
'ember-resolver': '^11.0.0',
1819
},
1920
},
2021
},
@@ -26,6 +27,7 @@ module.exports = async function () {
2627
'ember-qunit': '^5.0.0',
2728
'ember-cli': '^4.12.0',
2829
'@ember/test-helpers': '^2.4.0',
30+
'ember-resolver': '^11.0.0',
2931
},
3032
},
3133
},
@@ -37,6 +39,7 @@ module.exports = async function () {
3739
'ember-qunit': '^5.0.0',
3840
'ember-cli': '^4.12.0',
3941
'@ember/test-helpers': '^2.4.0',
42+
'ember-resolver': '^11.0.0',
4043
},
4144
},
4245
},
@@ -46,6 +49,7 @@ module.exports = async function () {
4649
devDependencies: {
4750
'ember-source': '~3.28.0',
4851
'ember-cli': '^4.12.0',
52+
'ember-resolver': '^11.0.0',
4953
},
5054
},
5155
},
@@ -54,6 +58,7 @@ module.exports = async function () {
5458
npm: {
5559
devDependencies: {
5660
'ember-source': '~4.4.0',
61+
'ember-resolver': '^11.0.0',
5762
},
5863
},
5964
},
@@ -62,6 +67,7 @@ module.exports = async function () {
6267
npm: {
6368
devDependencies: {
6469
'ember-source': '~4.8.0',
70+
'ember-resolver': '^11.0.0',
6571
},
6672
},
6773
},
@@ -81,6 +87,14 @@ module.exports = async function () {
8187
},
8288
},
8389
},
90+
{
91+
name: 'ember-lts-5.8',
92+
npm: {
93+
devDependencies: {
94+
'ember-source': '~5.8.0',
95+
},
96+
},
97+
},
8498
{
8599
name: 'ember-release',
86100
npm: {

packages/ember-cli-fastboot/tests/helpers/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function setupApplicationTest(hooks, options) {
2323
// This is also a good place to call test setup functions coming
2424
// from other addons:
2525
//
26-
// setupIntl(hooks); // ember-intl
26+
// setupIntl(hooks, 'en-us'); // ember-intl
2727
// setupMirage(hooks); // ember-cli-mirage
2828
}
2929

0 commit comments

Comments
 (0)