Skip to content

Commit 758f0e7

Browse files
authored
upgrade test app with Ember CLI v5.12 blueprints (#293)
1 parent 0b50357 commit 758f0e7

File tree

7 files changed

+277
-170
lines changed

7 files changed

+277
-170
lines changed

pnpm-lock.yaml

+243-138
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test-app/.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/blueprints/*/files/
33

44
# compiled output
5+
/declarations/
56
/dist/
67

78
# misc

test-app/README.md

+22-22
Original file line numberDiff line numberDiff line change
@@ -7,51 +7,51 @@ A short introduction of this app could easily go here.
77

88
You will need the following things properly installed on your computer.
99

10-
* [Git](https://git-scm.com/)
11-
* [Node.js](https://nodejs.org/)
12-
* [pnpm](https://pnpm.io/)
13-
* [Ember CLI](https://cli.emberjs.com/release/)
14-
* [Google Chrome](https://google.com/chrome/)
10+
- [Git](https://git-scm.com/)
11+
- [Node.js](https://nodejs.org/)
12+
- [pnpm](https://pnpm.io/)
13+
- [Ember CLI](https://cli.emberjs.com/release/)
14+
- [Google Chrome](https://google.com/chrome/)
1515

1616
## Installation
1717

18-
* `git clone <repository-url>` this repository
19-
* `cd test-app`
20-
* `pnpm install`
18+
- `git clone <repository-url>` this repository
19+
- `cd test-app`
20+
- `pnpm install`
2121

2222
## Running / Development
2323

24-
* `pnpm start`
25-
* Visit your app at [http://localhost:4200](http://localhost:4200).
26-
* Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
24+
- `pnpm start`
25+
- Visit your app at [http://localhost:4200](http://localhost:4200).
26+
- Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
2727

2828
### Code Generators
2929

3030
Make use of the many generators for code, try `ember help generate` for more details
3131

3232
### Running Tests
3333

34-
* `pnpm test`
35-
* `pnpm test:ember --server`
34+
- `pnpm test`
35+
- `pnpm test:ember --server`
3636

3737
### Linting
3838

39-
* `pnpm lint`
40-
* `pnpm lint:fix`
39+
- `pnpm lint`
40+
- `pnpm lint:fix`
4141

4242
### Building
4343

44-
* `pnpm ember build` (development)
45-
* `pnpm build` (production)
44+
- `pnpm ember build` (development)
45+
- `pnpm build` (production)
4646

4747
### Deploying
4848

4949
Specify what it takes to deploy your app.
5050

5151
## Further Reading / Useful Links
5252

53-
* [ember.js](https://emberjs.com/)
54-
* [ember-cli](https://cli.emberjs.com/release/)
55-
* Development Browser Extensions
56-
* [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
57-
* [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
53+
- [ember.js](https://emberjs.com/)
54+
- [ember-cli](https://cli.emberjs.com/release/)
55+
- Development Browser Extensions
56+
- [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
57+
- [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)

test-app/config/ember-cli-update.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "5.5.0",
6+
"version": "5.12.0",
77
"blueprints": [
88
{
99
"name": "app",

test-app/config/optional-features.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"application-template-wrapper": false,
33
"default-async-observers": true,
44
"jquery-integration": false,
5-
"template-only-glimmer-components": true
5+
"template-only-glimmer-components": true,
6+
"no-implicit-route-model": true
67
}

test-app/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
},
1313
"scripts": {
1414
"build": "ember build --environment=production",
15-
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
15+
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
1616
"lint:css": "stylelint \"**/*.css\"",
17-
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
18-
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
17+
"lint:css:fix": "concurrently \"pnpm:lint:css -- --fix\"",
18+
"lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
1919
"lint:hbs": "ember-template-lint .",
2020
"lint:hbs:fix": "ember-template-lint . --fix",
2121
"lint:js": "eslint . --cache",
2222
"lint:js:fix": "eslint . --fix",
2323
"lint:types": "glint",
2424
"start": "ember serve",
25-
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
25+
"test": "concurrently \"pnpm:lint\" \"pnpm:test:*\" --names \"lint,test:\"",
2626
"test:ember": "ember test"
2727
},
2828
"devDependencies": {
@@ -37,7 +37,7 @@
3737
"@glint/environment-ember-loose": "1.5.2",
3838
"@glint/environment-ember-template-imports": "1.5.2",
3939
"@glint/template": "1.5.2",
40-
"@tsconfig/ember": "3.0.5",
40+
"@tsconfig/ember": "3.0.8",
4141
"@types/ember": "4.0.11",
4242
"@types/ember__application": "4.0.11",
4343
"@types/ember__array": "4.0.10",
@@ -103,8 +103,8 @@
103103
"stylelint-config-standard": "36.0.1",
104104
"stylelint-prettier": "5.0.3",
105105
"tracked-built-ins": "3.3.0",
106-
"typescript": "5.4.5",
107-
"webpack": "5.94.0"
106+
"typescript": "5.6.2",
107+
"webpack": "5.95.0"
108108
},
109109
"engines": {
110110
"node": ">= 18"

test-app/tests/helpers/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function setupApplicationTest(hooks: NestedHooks, options?: SetupTestOptions) {
2424
// This is also a good place to call test setup functions coming
2525
// from other addons:
2626
//
27-
// setupIntl(hooks); // ember-intl
27+
// setupIntl(hooks, 'en-us'); // ember-intl
2828
// setupMirage(hooks); // ember-cli-mirage
2929
}
3030

0 commit comments

Comments
 (0)