Skip to content

Commit 64dce9c

Browse files
benoitfbenoitf
committedFeb 26, 2024
chore: update to Node.js v20 and Electron 29
fixes podman-desktop#5212 Signed-off-by: Florent Benoit <fbenoit@redhat.com>
1 parent a6b87fb commit 64dce9c

12 files changed

+34
-34
lines changed
 

‎.github/workflows/argos.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- uses: actions/checkout@v4
4545
- uses: actions/setup-node@v4
4646
with:
47-
node-version: 18
47+
node-version: 20
4848

4949
- name: Get yarn cache directory path
5050
id: yarn-cache-dir-path

‎.github/workflows/e2e-main.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
name: e2e-tests-main
1919

20-
on:
20+
on:
2121
push:
2222
branches: [main]
23-
23+
2424
workflow_dispatch:
2525
inputs:
2626
organization:
@@ -55,7 +55,7 @@ jobs:
5555

5656
- uses: actions/setup-node@v4
5757
with:
58-
node-version: 18
58+
node-version: 20
5959

6060
- name: Update podman
6161
run: |
@@ -97,4 +97,4 @@ jobs:
9797
if: always()
9898
with:
9999
name: e2e-tests
100-
path: ./tests/output/
100+
path: ./tests/output/

‎.github/workflows/next-build.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
ref: ${{ needs.tag.outputs.githubTag}}
8484
- uses: actions/setup-node@v4
8585
with:
86-
node-version: 18
86+
node-version: 20
8787

8888
- uses: actions/setup-python@v5
8989
with:
@@ -182,7 +182,7 @@ jobs:
182182
- uses: actions/checkout@v4
183183
- uses: actions/setup-node@v4
184184
with:
185-
node-version: 18
185+
node-version: 20
186186
- name: Set-up npmjs auth token
187187
run: printf "//registry.npmjs.org/:_authToken=${{ secrets.NPM_AUTH_TOKEN }}\n" >> ~/.npmrc
188188

‎.github/workflows/pr-check-website.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- uses: actions/checkout@v4
3434
- uses: actions/setup-node@v4
3535
with:
36-
node-version: 18
36+
node-version: 20
3737

3838
- name: Get yarn cache directory path
3939
id: yarn-cache-dir-path

‎.github/workflows/pr-check.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
- uses: actions/setup-node@v4
3333
with:
34-
node-version: 18
34+
node-version: 20
3535

3636
- uses: actions/setup-python@v5
3737
with:
@@ -91,7 +91,7 @@ jobs:
9191

9292
- uses: actions/setup-node@v4
9393
with:
94-
node-version: 18
94+
node-version: 20
9595

9696
- name: Get yarn cache directory path
9797
id: yarn-cache-dir-path
@@ -146,7 +146,7 @@ jobs:
146146

147147
- uses: actions/setup-node@v4
148148
with:
149-
node-version: 18
149+
node-version: 20
150150

151151
- name: Get yarn cache directory path
152152
id: yarn-cache-dir-path
@@ -197,7 +197,7 @@ jobs:
197197
- uses: actions/checkout@v4
198198
- uses: actions/setup-node@v4
199199
with:
200-
node-version: 18
200+
node-version: 20
201201

202202

203203
- name: Get yarn cache directory path (Windows)
@@ -262,7 +262,7 @@ jobs:
262262
- uses: actions/checkout@v4
263263
- uses: actions/setup-node@v4
264264
with:
265-
node-version: 18
265+
node-version: 20
266266

267267
- name: Update podman
268268
run: |

‎.github/workflows/release-notes.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- uses: actions/checkout@v4
3838
- uses: actions/setup-node@v4
3939
with:
40-
node-version: 18
40+
node-version: 20
4141

4242
- name: Get yarn cache directory path (mac/Linux)
4343
id: yarn-cache-dir-path-unix

‎.github/workflows/release.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
ref: ${{ needs.tag.outputs.githubTag}}
142142
- uses: actions/setup-node@v4
143143
with:
144-
node-version: 18
144+
node-version: 20
145145

146146
- uses: actions/setup-python@v5
147147
with:
@@ -240,7 +240,7 @@ jobs:
240240
- uses: actions/checkout@v4
241241
- uses: actions/setup-node@v4
242242
with:
243-
node-version: 18
243+
node-version: 20
244244
- name: Set-up npmjs auth token
245245
run: printf "//registry.npmjs.org/:_authToken=${{ secrets.NPM_AUTH_TOKEN }}\n" >> ~/.npmrc
246246

‎.github/workflows/website-next.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
ref: ${{ needs.tag.outputs.githubTag}}
4343
- uses: actions/setup-node@v4
4444
with:
45-
node-version: 18
45+
node-version: 20
4646
- name: Get yarn cache directory path
4747
id: yarn-cache-dir-path
4848
run: echo "dir=$(yarn cache dir)" >> ${GITHUB_OUTPUT}

‎.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18
1+
20

‎extensions/kubectl-cli/src/extension.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**********************************************************************
2-
* Copyright (C) 2023 Red Hat, Inc.
2+
* Copyright (C) 2023-2024 Red Hat, Inc.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -150,7 +150,7 @@ test('kubectl CLI tool not registered when version json stdout cannot be parsed'
150150
expect(console.warn).toBeCalled();
151151
expect(console.warn).toBeCalledWith(
152152
expect.stringContaining(
153-
'Error getting kubectl from user PATH: SyntaxError: Unexpected token { in JSON at position 1',
153+
`Error getting kubectl from user PATH: SyntaxError: Expected property name or '}' in JSON at position 1`,
154154
),
155155
);
156156
});

‎package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"type": "module",
88
"private": true,
99
"engines": {
10-
"node": ">=18.12.0",
11-
"npm": ">=8.19.2"
10+
"node": ">=20.9.0",
11+
"npm": ">=10.2.3"
1212
},
1313
"main": "packages/main/dist/index.cjs",
1414
"workspaces": {
@@ -122,7 +122,7 @@
122122
"@types/express": "^4.17.21",
123123
"@types/getos": "^3.0.4",
124124
"@types/js-yaml": "^4.0.9",
125-
"@types/node": "^18",
125+
"@types/node": "^20",
126126
"@types/tar": "^6.1.11",
127127
"@types/tar-fs": "^2.0.4",
128128
"@types/validator": "^13.11.9",
@@ -131,7 +131,7 @@
131131
"@vitest/coverage-v8": "^1.3.1",
132132
"cross-env": "7.0.3",
133133
"dts-for-context-bridge": "0.7.1",
134-
"electron": "28.2.3",
134+
"electron": "29.0.1",
135135
"electron-builder": "23.6.0",
136136
"electron-builder-notarize": "^1.5.1",
137137
"electron-devtools-installer": "^3.2.0",
@@ -188,6 +188,6 @@
188188
"resolutions": {
189189
"trim": "0.0.3",
190190
"ssh2": "1.11.0",
191-
"@types/node": "^18"
191+
"@types/node": "^20"
192192
}
193193
}

‎yarn.lock

+9-9
Original file line numberDiff line numberDiff line change
@@ -3733,10 +3733,10 @@
37333733
dependencies:
37343734
"@types/node" "*"
37353735

3736-
"@types/node@*", "@types/node@^17.0.5", "@types/node@^18", "@types/node@^18.11.18", "@types/node@^20.1.1":
3737-
version "18.19.18"
3738-
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.18.tgz#7526471b28828d1fef1f7e4960fb9477e6e4369c"
3739-
integrity sha512-80CP7B8y4PzZF0GWx15/gVWRrB5y/bIjNI84NK3cmQJu0WZwvmj2WMA5LcofQFVfLqqCSp545+U2LsrVzX36Zg==
3736+
"@types/node@*", "@types/node@^17.0.5", "@types/node@^20", "@types/node@^20.1.1", "@types/node@^20.9.0":
3737+
version "20.11.20"
3738+
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.20.tgz#f0a2aee575215149a62784210ad88b3a34843659"
3739+
integrity sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg==
37403740
dependencies:
37413741
undici-types "~5.26.4"
37423742

@@ -7396,13 +7396,13 @@ electron-util@^0.17.2:
73967396
electron-is-dev "^1.1.0"
73977397
new-github-issue-url "^0.2.1"
73987398

7399-
electron@28.2.3:
7400-
version "28.2.3"
7401-
resolved "https://registry.yarnpkg.com/electron/-/electron-28.2.3.tgz#d26821bcfda7ee445b4b75231da4b057a7ce6e7b"
7402-
integrity sha512-he9nGphZo03ejDjYBXpmFVw0KBKogXvR2tYxE4dyYvnfw42uaFIBFrwGeenvqoEOfheJfcI0u4rFG6h3QxDwnA==
7399+
electron@29.0.1:
7400+
version "29.0.1"
7401+
resolved "https://registry.yarnpkg.com/electron/-/electron-29.0.1.tgz#936c0623a1bbf272dea423305f074de6ac016967"
7402+
integrity sha512-hsQr9clm8NCAMv4uhHlXThHn52UAgrHgyz3ubBAxZIPuUcpKVDtg4HPmx4hbmHIbYICI5OyLN3Ztp7rS+Dn4Lw==
74037403
dependencies:
74047404
"@electron/get" "^2.0.0"
7405-
"@types/node" "^18.11.18"
7405+
"@types/node" "^20.9.0"
74067406
extract-zip "^2.0.1"
74077407

74087408
elkjs@^0.8.2:

0 commit comments

Comments
 (0)
Please sign in to comment.