Skip to content

Commit 75da4a0

Browse files
authored
Merge pull request #954 from ember-fastboot/node-versions
drop support for node < 20
2 parents 5c5883a + 96b5f83 commit 75da4a0

13 files changed

Lines changed: 15654 additions & 12846 deletions

File tree

.github/workflows/ci.yml

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,10 @@ jobs:
2626

2727
steps:
2828
- uses: actions/checkout@v4
29-
- uses: pnpm/action-setup@v3
30-
with:
31-
version: 7
29+
- uses: pnpm/action-setup@v4
3230
- uses: actions/setup-node@v4
3331
with:
34-
node-version: 18
32+
node-version: 22
3533
cache: pnpm
3634
- run: pnpm install --frozen-lockfile
3735
- run: pnpm lint
@@ -44,15 +42,13 @@ jobs:
4442
strategy:
4543
fail-fast: false
4644
matrix:
47-
node-version: [16.x, 14.x]
45+
node-version: [20.x, 22.x, 24.x]
4846
os: [ubuntu-latest, windows-latest]
4947

5048
steps:
5149
- name: Checkout Code
5250
uses: actions/checkout@v4
53-
- uses: pnpm/action-setup@v3
54-
with:
55-
version: 7
51+
- uses: pnpm/action-setup@v4
5652
- name: Use Node.js ${{ matrix.node-version }}
5753
uses: actions/setup-node@v4
5854
with:
@@ -74,15 +70,13 @@ jobs:
7470
strategy:
7571
fail-fast: false
7672
matrix:
77-
node-version: [16.x, 14.x]
73+
node-version: [20.x, 22.x, 24.x]
7874
os: [ubuntu-latest, windows-latest]
7975

8076
steps:
8177
- name: Checkout Code
8278
uses: actions/checkout@v4
83-
- uses: pnpm/action-setup@v3
84-
with:
85-
version: 7
79+
- uses: pnpm/action-setup@v4
8680
- name: Use Node.js ${{ matrix.node-version }}
8781
uses: actions/setup-node@v4
8882
with:
@@ -101,14 +95,12 @@ jobs:
10195
strategy:
10296
fail-fast: false
10397
matrix:
104-
node-version: [16.x, 14.x]
98+
node-version: [20.x, 22.x, 24.x]
10599

106100
steps:
107101
- name: Checkout Code
108102
uses: actions/checkout@v4
109-
- uses: pnpm/action-setup@v3
110-
with:
111-
version: 7
103+
- uses: pnpm/action-setup@v4
112104
- name: Use Node.js ${{ matrix.node-version }}
113105
uses: actions/setup-node@v4
114106
with:
@@ -144,12 +136,10 @@ jobs:
144136

145137
steps:
146138
- uses: actions/checkout@v4
147-
- uses: pnpm/action-setup@v3
148-
with:
149-
version: 7
139+
- uses: pnpm/action-setup@v4
150140
- uses: actions/setup-node@v4
151141
with:
152-
node-version: 14
142+
node-version: 22
153143
cache: pnpm
154144
- run: pnpm install --frozen-lockfile
155145
- name: test
@@ -163,12 +153,10 @@ jobs:
163153

164154
steps:
165155
- uses: actions/checkout@v4
166-
- uses: pnpm/action-setup@v3
167-
with:
168-
version: 7
156+
- uses: pnpm/action-setup@v4
169157
- uses: actions/setup-node@v4
170158
with:
171-
node-version: 16
159+
node-version: 22
172160
cache: pnpm
173161
- run: pnpm install --frozen-lockfile
174162
- id: set-matrix
@@ -187,12 +175,10 @@ jobs:
187175

188176
steps:
189177
- uses: actions/checkout@v4
190-
- uses: pnpm/action-setup@v3
191-
with:
192-
version: 7
178+
- uses: pnpm/action-setup@v4
193179
- uses: actions/setup-node@v4
194180
with:
195-
node-version: 16
181+
node-version: 22
196182
cache: pnpm
197183
- run: pnpm install --frozen-lockfile
198184
- name: test

package.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,14 @@
2323
},
2424
"publishConfig": {
2525
"registry": "https://registry.npmjs.org"
26-
}
26+
},
27+
"pnpm": {
28+
"overrides": {
29+
"clean-css@3": "^4.0.0"
30+
},
31+
"patchedDependencies": {
32+
"ember-source@3.19.0": "patches/ember-source@3.19.0.patch"
33+
}
34+
},
35+
"packageManager": "pnpm@10.17.0+sha512.fce8a3dd29a4ed2ec566fb53efbb04d8c44a0f05bc6f24a73046910fb9c3ce7afa35a0980500668fa3573345bd644644fa98338fa168235c80f4aa17aa17fbef"
2736
}

packages/ember-cli-fastboot/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"ember-source": ">=3.16"
100100
},
101101
"engines": {
102-
"node": "14.* || 16.* || >= 18"
102+
"node": "20.* || 22.* || >= 24"
103103
},
104104
"ember": {
105105
"edition": "octane"

packages/fastboot-app-server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"request-promise": "^4.2.1"
4646
},
4747
"engines": {
48-
"node": "12.* || 14.* || >=16"
48+
"node": "20.* || 22.* || >= 24"
4949
},
5050
"volta": {
5151
"extends": "../../package.json"

packages/fastboot-express-middleware/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"request-promise": "^4.2.1"
4646
},
4747
"engines": {
48-
"node": "12.* || 14.* || >=16"
48+
"node": "20.* || 22.* || >= 24"
4949
},
5050
"volta": {
5151
"extends": "../../package.json"

packages/fastboot/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"tmp": "^0.2.1"
5757
},
5858
"engines": {
59-
"node": "12.* || 14.* || >=16"
59+
"node": "20.* || 22.* || >= 24"
6060
},
6161
"volta": {
6262
"extends": "../../package.json"

patches/ember-source@3.19.0.patch

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
diff --git a/CHANGELOG.md b/CHANGELOG.md
2+
deleted file mode 100644
3+
index 1b2b830f141254893e8a23812dbb594bc8abe118..0000000000000000000000000000000000000000
4+
diff --git a/dist/packages/@ember/-internals/runtime/.gitignore b/dist/packages/@ember/-internals/runtime/.gitignore
5+
deleted file mode 100644
6+
index a1136368651e6eb6d0d93a09c478f4978f4196fa..0000000000000000000000000000000000000000
7+
diff --git a/dist/packages/ember-babel.js b/dist/packages/ember-babel.js
8+
index 167f6a7b9f30fe3446d839c486d1e5be7ee3909b..55859f2d082a9182b0edcd4784d87bd839fe9750 100644
9+
--- a/dist/packages/ember-babel.js
10+
+++ b/dist/packages/ember-babel.js
11+
@@ -150,7 +150,7 @@ export function createSuper(Derived) {
12+
/*
13+
Does not differ from default implementation.
14+
*/
15+
-function arrayLikeToArray(arr, len) {
16+
+export function arrayLikeToArray(arr, len) {
17+
if (len == null || len > arr.length) len = arr.length;
18+
19+
let arr2 = new Array(len);

0 commit comments

Comments
 (0)