Skip to content

Commit 6399843

Browse files
authored
Merge pull request #486 from jrjohnson/update-ember-512
Update Ember CLI to 5.12.0
2 parents e1162a3 + 650920c commit 6399843

File tree

11 files changed

+9163
-6874
lines changed

11 files changed

+9163
-6874
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
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

.github/workflows/ci.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@ jobs:
2020
steps:
2121
- uses: actions/checkout@v4
2222
- uses: pnpm/action-setup@v4
23-
- uses: actions/setup-node@v4
23+
- name: Install Node
24+
uses: actions/setup-node@v4
2425
with:
2526
node-version: 18
2627
cache: pnpm
27-
- run: pnpm install
28+
- name: Install Dependencies
29+
run: pnpm install --frozen-lockfile
2830
- name: Lint
2931
run: pnpm run lint
3032
- name: Run Tests
@@ -46,7 +48,8 @@ jobs:
4648
with:
4749
node-version: 18
4850
cache: pnpm
49-
- run: pnpm install --no-lockfile
51+
- name: Install Dependencies
52+
run: pnpm install --no-lockfile
5053
- name: Run Tests
5154
run: pnpm run test:ember
5255

@@ -60,8 +63,8 @@ jobs:
6063
fail-fast: false
6164
matrix:
6265
try-scenario:
63-
- ember-lts-4.8
6466
- ember-lts-4.12
67+
- ember-lts-5.4
6568
- ember-release
6669
- ember-beta
6770
- ember-canary
@@ -71,10 +74,12 @@ jobs:
7174
steps:
7275
- uses: actions/checkout@v4
7376
- uses: pnpm/action-setup@v4
74-
- uses: actions/setup-node@v4
77+
- name: Install Node
78+
uses: actions/setup-node@v4
7579
with:
7680
node-version: 18
7781
cache: pnpm
78-
- run: pnpm install
82+
- name: Install Dependencies
83+
run: pnpm install --frozen-lockfile
7984
- name: Run Tests
8085
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

.npmignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
/ember-cli-build.js
2424
/testem.js
2525
/tests/
26+
/tsconfig.declarations.json
27+
/tsconfig.json
2628
/yarn-error.log
2729
/yarn.lock
2830
.gitkeep

CONTRIBUTING.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22

33
## Installation
44

5-
* `git clone <repository-url>`
6-
* `cd my-addon`
7-
* `npm install`
5+
- `git clone <repository-url>`
6+
- `cd ember-cli-image-transformer`
7+
- `pnpm install`
88

99
## Linting
1010

11-
* `npm run lint`
12-
* `npm run lint:fix`
11+
- `pnpm lint`
12+
- `pnpm lint:fix`
1313

1414
## Running tests
1515

16-
* `ember test` – Runs the test suite on the current Ember version
17-
* `ember test --server` – Runs the test suite in "watch mode"
18-
* `ember try:each` – Runs the test suite against multiple Ember versions
16+
- `pnpm test` – Runs the test suite on the current Ember version
17+
- `pnpm test:ember --server` – Runs the test suite in "watch mode"
18+
- `pnpm test:ember-compatibility` – Runs the test suite against multiple Ember versions
1919

2020
## Running the dummy application
2121

22-
* `ember serve`
23-
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
22+
- `pnpm start`
23+
- Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2424

2525
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ It is built using EmberJS and takes advantage of the awesome [Sharp](https://git
1111

1212
## Compatibility
1313

14-
* Ember.js v4.8 or above
15-
* Ember CLI v4.8 or above
16-
* Node.js v18 or above
14+
- Ember.js v4.12 or above
15+
- Ember CLI v4.12 or above
16+
- Node.js v18 or above
1717

1818
## Installation
1919

package.json

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,72 +17,71 @@
1717
},
1818
"scripts": {
1919
"build": "ember build --environment=production",
20-
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
20+
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
2121
"lint:css": "stylelint \"**/*.css\"",
22-
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
23-
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
22+
"lint:css:fix": "concurrently \"pnpm:lint:css -- --fix\"",
23+
"lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
2424
"lint:hbs": "ember-template-lint .",
2525
"lint:hbs:fix": "ember-template-lint . --fix",
2626
"lint:js": "eslint . --cache",
2727
"lint:js:fix": "eslint . --fix",
2828
"start": "ember serve",
29-
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
29+
"test": "concurrently \"pnpm:lint\" \"pnpm:test:*\" --names \"lint,test:\"",
3030
"test:ember": "ember test",
3131
"test:ember-compatibility": "ember try:each",
3232
"test:percy": "percy exec -- ember test",
3333
"preinstall": "npx only-allow pnpm"
3434
},
3535
"dependencies": {
36-
"@babel/core": "^7.23.2",
36+
"@babel/core": "^7.25.2",
3737
"broccoli-caching-writer": "^3.0.3",
3838
"broccoli-funnel": "^3.0.2",
3939
"broccoli-merge-trees": "^4.1.0",
4040
"ember-cli-babel": "^8.2.0",
4141
"ember-cli-htmlbars": "^6.3.0",
42-
"rsvp": "^4.7.0",
4342
"sharp": "^0.33.0"
4443
},
4544
"devDependencies": {
46-
"@babel/eslint-parser": "^7.22.15",
47-
"@babel/plugin-proposal-decorators": "^7.23.2",
48-
"@ember/optional-features": "^2.0.0",
49-
"@ember/test-helpers": "^3.2.0",
50-
"@embroider/test-setup": "^3.0.2",
45+
"@babel/eslint-parser": "^7.25.1",
46+
"@babel/plugin-proposal-decorators": "^7.24.7",
47+
"@ember/optional-features": "^2.1.0",
48+
"@ember/test-helpers": "^3.3.1",
49+
"@embroider/test-setup": "^4.0.0",
5150
"@glimmer/component": "^1.1.2",
5251
"@glimmer/tracking": "^1.1.2",
5352
"@percy/cli": "^1.0.0-beta.70",
5453
"@percy/ember": "^4.2.0",
5554
"broccoli-asset-rev": "^3.0.0",
5655
"concurrently": "^8.2.2",
57-
"ember-auto-import": "^2.6.3",
58-
"ember-cli": "~5.4.1",
56+
"ember-auto-import": "^2.8.1",
57+
"ember-cli": "~5.12.0",
5958
"ember-cli-clean-css": "^3.0.0",
6059
"ember-cli-dependency-checker": "^3.3.2",
6160
"ember-cli-inject-live-reload": "^2.1.0",
6261
"ember-cli-sri": "^2.1.1",
6362
"ember-cli-terser": "^4.0.2",
6463
"ember-load-initializers": "^2.1.2",
65-
"ember-page-title": "^8.0.0",
66-
"ember-qunit": "^8.0.1",
67-
"ember-resolver": "^11.0.1",
68-
"ember-source": "~5.4.0",
64+
"ember-page-title": "^8.2.3",
65+
"ember-qunit": "^8.1.0",
66+
"ember-resolver": "^12.0.1",
67+
"ember-source": "~5.12.0",
6968
"ember-source-channel-url": "^3.0.0",
70-
"ember-template-lint": "^5.11.2",
69+
"ember-template-lint": "^6.0.0",
7170
"ember-try": "^3.0.0",
72-
"eslint": "^8.52.0",
73-
"eslint-config-prettier": "^9.0.0",
74-
"eslint-plugin-ember": "^11.11.1",
75-
"eslint-plugin-n": "^16.2.0",
76-
"eslint-plugin-prettier": "^5.0.1",
77-
"eslint-plugin-qunit": "^8.0.1",
71+
"eslint": "^8.57.1",
72+
"eslint-config-prettier": "^9.1.0",
73+
"eslint-plugin-ember": "^12.2.1",
74+
"eslint-plugin-n": "^16.6.2",
75+
"eslint-plugin-prettier": "^5.2.1",
76+
"eslint-plugin-qunit": "^8.1.2",
7877
"loader.js": "^4.7.0",
79-
"prettier": "^3.0.3",
80-
"qunit": "^2.20.0",
81-
"qunit-dom": "^2.0.0",
78+
"prettier": "^3.3.3",
79+
"qunit": "^2.22.0",
80+
"qunit-dom": "^3.2.1",
8281
"stylelint": "^15.11.0",
8382
"stylelint-config-standard": "^34.0.0",
84-
"stylelint-prettier": "^4.0.2",
85-
"webpack": "^5.89.0"
83+
"stylelint-prettier": "^4.1.0",
84+
"webpack": "^5.95.0"
8685
},
8786
"peerDependencies": {
8887
"ember-source": ">= 4.0.0"

0 commit comments

Comments
 (0)