Skip to content

Commit d9c48e5

Browse files
authored
Merge pull request #788 from ember-cli/update-min-node
update minimum node version
2 parents 671b395 + 5a90d2a commit d9c48e5

File tree

7 files changed

+3085
-2531
lines changed

7 files changed

+3085
-2531
lines changed

.github/workflows/ci.yml

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,27 @@ on:
55
branches:
66
- master
77
- main
8-
- 'v*'
8+
- "v*"
99
pull_request: {}
1010
schedule:
11-
- cron: '0 6 * * 0' # weekly, on sundays
11+
- cron: "0 6 * * 0" # weekly, on sundays
1212

1313
jobs:
1414
lint:
1515
name: Linting
1616
runs-on: ubuntu-latest
1717

1818
steps:
19-
- uses: actions/checkout@v3
20-
- uses: actions/setup-node@v3
21-
with:
22-
node-version: 18.x
23-
- name: install dependencies
24-
run: yarn install --frozen-lockfile
25-
- name: lint:js
26-
run: yarn lint:js
27-
- name: lint:hbs
28-
run: yarn lint:hbs
19+
- uses: actions/checkout@v3
20+
- uses: actions/setup-node@v3
21+
with:
22+
node-version: 20.x
23+
- name: install dependencies
24+
run: yarn install --frozen-lockfile
25+
- name: lint:js
26+
run: yarn lint:js
27+
- name: lint:hbs
28+
run: yarn lint:hbs
2929

3030
test:
3131
name: Tests
@@ -35,19 +35,19 @@ jobs:
3535
fail-fast: false
3636
matrix:
3737
os: [ubuntu, windows]
38-
node-version: [18.x, 20.x]
38+
node-version: [20.x, 24.x]
3939

4040
steps:
41-
- uses: actions/checkout@v3
42-
- uses: actions/setup-node@v3
43-
with:
44-
node-version: ${{ matrix.node-version }}
45-
- name: install dependencies
46-
run: yarn install --ignore-engines --frozen-lockfile
47-
- name: node tests
48-
run: yarn test:node
49-
- name: ember test
50-
run: yarn test:ember
41+
- uses: actions/checkout@v3
42+
- uses: actions/setup-node@v3
43+
with:
44+
node-version: ${{ matrix.node-version }}
45+
- name: install dependencies
46+
run: yarn install --ignore-engines --frozen-lockfile
47+
- name: node tests
48+
run: yarn test:node
49+
- name: ember test
50+
run: yarn test:ember
5151

5252
floating-dependencies:
5353
name: Floating Deps
@@ -56,16 +56,16 @@ jobs:
5656
needs: [test, lint]
5757

5858
steps:
59-
- uses: actions/checkout@v3
60-
- uses: actions/setup-node@v3
61-
with:
62-
node-version: 18.x
63-
- name: install dependencies
64-
run: yarn install --ignore-lockfile
65-
- name: node tests
66-
run: yarn test:node
67-
- name: ember test
68-
run: yarn test:ember
59+
- uses: actions/checkout@v3
60+
- uses: actions/setup-node@v3
61+
with:
62+
node-version: 20.x
63+
- name: install dependencies
64+
run: yarn install --ignore-lockfile
65+
- name: node tests
66+
run: yarn test:node
67+
- name: ember test
68+
run: yarn test:ember
6969

7070
try-scenarios:
7171
name: ${{ matrix.ember-try-scenario }}
@@ -78,21 +78,21 @@ jobs:
7878
fail-fast: false
7979
matrix:
8080
ember-try-scenario:
81-
- ember-lts-4.12
82-
- ember-release
83-
- ember-beta
84-
- ember-canary
85-
- embroider-safe
86-
- embroider-optimized
81+
- ember-lts-4.12
82+
- ember-release
83+
- ember-beta
84+
- ember-canary
85+
- embroider-safe
86+
- embroider-optimized
8787

8888
steps:
89-
- uses: actions/checkout@v3
90-
- uses: actions/setup-node@v3
91-
with:
92-
node-version: 18.x
93-
- name: install dependencies
94-
run: yarn install
95-
- name: test
96-
env:
97-
EMBER_TRY_SCENARIO: ${{ matrix.ember-try-scenario }}
98-
run: node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
89+
- uses: actions/checkout@v3
90+
- uses: actions/setup-node@v3
91+
with:
92+
node-version: 20.x
93+
- name: install dependencies
94+
run: yarn install
95+
- name: test
96+
env:
97+
EMBER_TRY_SCENARIO: ${{ matrix.ember-try-scenario }}
98+
run: node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Ember.js v4.12 or above
88
* Ember CLI v4.12 or above
99
* `@embroider/compat` 3.4.3 or above (optional)
10-
* Node.js v18 or above
10+
* Node.js v20 or above
1111

1212
## Adding Custom Plugins
1313

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343
"heimdalljs-logger": "^0.1.10",
4444
"js-string-escape": "^1.0.1",
4545
"silent-error": "^1.1.1",
46-
"walk-sync": "^2.2.0"
46+
"walk-sync": "^4.0.1"
4747
},
4848
"devDependencies": {
4949
"@babel/core": "^7.23.6",
5050
"@babel/eslint-parser": "^7.23.3",
51-
"@babel/plugin-transform-class-properties": "^7.23.3",
5251
"@babel/plugin-proposal-decorators": "^7.23.6",
52+
"@babel/plugin-transform-class-properties": "^7.23.3",
5353
"@babel/plugin-transform-runtime": "^7.13.15",
5454
"@babel/plugin-transform-typescript": "^7.10.1",
5555
"@babel/runtime": "^7.13.8",
@@ -102,7 +102,7 @@
102102
"ember-source": ">= 4.0.0"
103103
},
104104
"engines": {
105-
"node": ">= 18"
105+
"node": ">= 20"
106106
},
107107
"publishConfig": {
108108
"registry": "https://registry.npmjs.org"

tests/dummy/app/templates/components/x-module-name-inlined-component.hbs renamed to tests/dummy/app/components/x-module-name-inlined-component.hbs

File renamed without changes.

tests/dummy/app/templates/components/x-module-name-reversed-component.hbs renamed to tests/dummy/app/components/x-module-name-reversed-component.hbs

File renamed without changes.

tests/integration/components/ast-plugins-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module('tests/integration/components/ast-plugins-test', function (hooks) {
1111

1212
assert.strictEqual(
1313
this.element.textContent.trim(),
14-
'dummy/templates/components/x-module-name-inlined-component.hbs',
14+
'dummy/components/x-module-name-inlined-component.hbs',
1515
);
1616
});
1717
});

0 commit comments

Comments
 (0)