mirror of
https://github.com/podman-desktop/podman-desktop
synced 2026-04-21 17:47:22 +00:00
chore: update to Node.js v20 and Electron 29
fixes https://github.com/containers/podman-desktop/issues/5212 Signed-off-by: Florent Benoit <fbenoit@redhat.com>
This commit is contained in:
parent
a6b87fb487
commit
64dce9cbc2
12 changed files with 34 additions and 34 deletions
2
.github/workflows/argos.yaml
vendored
2
.github/workflows/argos.yaml
vendored
|
|
@ -44,7 +44,7 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18
|
||||
node-version: 20
|
||||
|
||||
- name: Get yarn cache directory path
|
||||
id: yarn-cache-dir-path
|
||||
|
|
|
|||
8
.github/workflows/e2e-main.yaml
vendored
8
.github/workflows/e2e-main.yaml
vendored
|
|
@ -17,10 +17,10 @@
|
|||
|
||||
name: e2e-tests-main
|
||||
|
||||
on:
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
|
||||
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
organization:
|
||||
|
|
@ -55,7 +55,7 @@ jobs:
|
|||
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18
|
||||
node-version: 20
|
||||
|
||||
- name: Update podman
|
||||
run: |
|
||||
|
|
@ -97,4 +97,4 @@ jobs:
|
|||
if: always()
|
||||
with:
|
||||
name: e2e-tests
|
||||
path: ./tests/output/
|
||||
path: ./tests/output/
|
||||
|
|
|
|||
4
.github/workflows/next-build.yaml
vendored
4
.github/workflows/next-build.yaml
vendored
|
|
@ -83,7 +83,7 @@ jobs:
|
|||
ref: ${{ needs.tag.outputs.githubTag}}
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18
|
||||
node-version: 20
|
||||
|
||||
- uses: actions/setup-python@v5
|
||||
with:
|
||||
|
|
@ -182,7 +182,7 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18
|
||||
node-version: 20
|
||||
- name: Set-up npmjs auth token
|
||||
run: printf "//registry.npmjs.org/:_authToken=${{ secrets.NPM_AUTH_TOKEN }}\n" >> ~/.npmrc
|
||||
|
||||
|
|
|
|||
2
.github/workflows/pr-check-website.yaml
vendored
2
.github/workflows/pr-check-website.yaml
vendored
|
|
@ -33,7 +33,7 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18
|
||||
node-version: 20
|
||||
|
||||
- name: Get yarn cache directory path
|
||||
id: yarn-cache-dir-path
|
||||
|
|
|
|||
10
.github/workflows/pr-check.yaml
vendored
10
.github/workflows/pr-check.yaml
vendored
|
|
@ -31,7 +31,7 @@ jobs:
|
|||
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18
|
||||
node-version: 20
|
||||
|
||||
- uses: actions/setup-python@v5
|
||||
with:
|
||||
|
|
@ -91,7 +91,7 @@ jobs:
|
|||
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18
|
||||
node-version: 20
|
||||
|
||||
- name: Get yarn cache directory path
|
||||
id: yarn-cache-dir-path
|
||||
|
|
@ -146,7 +146,7 @@ jobs:
|
|||
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18
|
||||
node-version: 20
|
||||
|
||||
- name: Get yarn cache directory path
|
||||
id: yarn-cache-dir-path
|
||||
|
|
@ -197,7 +197,7 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18
|
||||
node-version: 20
|
||||
|
||||
|
||||
- name: Get yarn cache directory path (Windows)
|
||||
|
|
@ -262,7 +262,7 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18
|
||||
node-version: 20
|
||||
|
||||
- name: Update podman
|
||||
run: |
|
||||
|
|
|
|||
2
.github/workflows/release-notes.yaml
vendored
2
.github/workflows/release-notes.yaml
vendored
|
|
@ -37,7 +37,7 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18
|
||||
node-version: 20
|
||||
|
||||
- name: Get yarn cache directory path (mac/Linux)
|
||||
id: yarn-cache-dir-path-unix
|
||||
|
|
|
|||
4
.github/workflows/release.yaml
vendored
4
.github/workflows/release.yaml
vendored
|
|
@ -141,7 +141,7 @@ jobs:
|
|||
ref: ${{ needs.tag.outputs.githubTag}}
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18
|
||||
node-version: 20
|
||||
|
||||
- uses: actions/setup-python@v5
|
||||
with:
|
||||
|
|
@ -240,7 +240,7 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18
|
||||
node-version: 20
|
||||
- name: Set-up npmjs auth token
|
||||
run: printf "//registry.npmjs.org/:_authToken=${{ secrets.NPM_AUTH_TOKEN }}\n" >> ~/.npmrc
|
||||
|
||||
|
|
|
|||
2
.github/workflows/website-next.yaml
vendored
2
.github/workflows/website-next.yaml
vendored
|
|
@ -42,7 +42,7 @@ jobs:
|
|||
ref: ${{ needs.tag.outputs.githubTag}}
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18
|
||||
node-version: 20
|
||||
- name: Get yarn cache directory path
|
||||
id: yarn-cache-dir-path
|
||||
run: echo "dir=$(yarn cache dir)" >> ${GITHUB_OUTPUT}
|
||||
|
|
|
|||
2
.nvmrc
2
.nvmrc
|
|
@ -1 +1 @@
|
|||
18
|
||||
20
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/**********************************************************************
|
||||
* Copyright (C) 2023 Red Hat, Inc.
|
||||
* Copyright (C) 2023-2024 Red Hat, Inc.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* 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'
|
|||
expect(console.warn).toBeCalled();
|
||||
expect(console.warn).toBeCalledWith(
|
||||
expect.stringContaining(
|
||||
'Error getting kubectl from user PATH: SyntaxError: Unexpected token { in JSON at position 1',
|
||||
`Error getting kubectl from user PATH: SyntaxError: Expected property name or '}' in JSON at position 1`,
|
||||
),
|
||||
);
|
||||
});
|
||||
|
|
|
|||
10
package.json
10
package.json
|
|
@ -7,8 +7,8 @@
|
|||
"type": "module",
|
||||
"private": true,
|
||||
"engines": {
|
||||
"node": ">=18.12.0",
|
||||
"npm": ">=8.19.2"
|
||||
"node": ">=20.9.0",
|
||||
"npm": ">=10.2.3"
|
||||
},
|
||||
"main": "packages/main/dist/index.cjs",
|
||||
"workspaces": {
|
||||
|
|
@ -122,7 +122,7 @@
|
|||
"@types/express": "^4.17.21",
|
||||
"@types/getos": "^3.0.4",
|
||||
"@types/js-yaml": "^4.0.9",
|
||||
"@types/node": "^18",
|
||||
"@types/node": "^20",
|
||||
"@types/tar": "^6.1.11",
|
||||
"@types/tar-fs": "^2.0.4",
|
||||
"@types/validator": "^13.11.9",
|
||||
|
|
@ -131,7 +131,7 @@
|
|||
"@vitest/coverage-v8": "^1.3.1",
|
||||
"cross-env": "7.0.3",
|
||||
"dts-for-context-bridge": "0.7.1",
|
||||
"electron": "28.2.3",
|
||||
"electron": "29.0.1",
|
||||
"electron-builder": "23.6.0",
|
||||
"electron-builder-notarize": "^1.5.1",
|
||||
"electron-devtools-installer": "^3.2.0",
|
||||
|
|
@ -188,6 +188,6 @@
|
|||
"resolutions": {
|
||||
"trim": "0.0.3",
|
||||
"ssh2": "1.11.0",
|
||||
"@types/node": "^18"
|
||||
"@types/node": "^20"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
18
yarn.lock
18
yarn.lock
|
|
@ -3733,10 +3733,10 @@
|
|||
dependencies:
|
||||
"@types/node" "*"
|
||||
|
||||
"@types/node@*", "@types/node@^17.0.5", "@types/node@^18", "@types/node@^18.11.18", "@types/node@^20.1.1":
|
||||
version "18.19.18"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.18.tgz#7526471b28828d1fef1f7e4960fb9477e6e4369c"
|
||||
integrity sha512-80CP7B8y4PzZF0GWx15/gVWRrB5y/bIjNI84NK3cmQJu0WZwvmj2WMA5LcofQFVfLqqCSp545+U2LsrVzX36Zg==
|
||||
"@types/node@*", "@types/node@^17.0.5", "@types/node@^20", "@types/node@^20.1.1", "@types/node@^20.9.0":
|
||||
version "20.11.20"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.20.tgz#f0a2aee575215149a62784210ad88b3a34843659"
|
||||
integrity sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg==
|
||||
dependencies:
|
||||
undici-types "~5.26.4"
|
||||
|
||||
|
|
@ -7396,13 +7396,13 @@ electron-util@^0.17.2:
|
|||
electron-is-dev "^1.1.0"
|
||||
new-github-issue-url "^0.2.1"
|
||||
|
||||
electron@28.2.3:
|
||||
version "28.2.3"
|
||||
resolved "https://registry.yarnpkg.com/electron/-/electron-28.2.3.tgz#d26821bcfda7ee445b4b75231da4b057a7ce6e7b"
|
||||
integrity sha512-he9nGphZo03ejDjYBXpmFVw0KBKogXvR2tYxE4dyYvnfw42uaFIBFrwGeenvqoEOfheJfcI0u4rFG6h3QxDwnA==
|
||||
electron@29.0.1:
|
||||
version "29.0.1"
|
||||
resolved "https://registry.yarnpkg.com/electron/-/electron-29.0.1.tgz#936c0623a1bbf272dea423305f074de6ac016967"
|
||||
integrity sha512-hsQr9clm8NCAMv4uhHlXThHn52UAgrHgyz3ubBAxZIPuUcpKVDtg4HPmx4hbmHIbYICI5OyLN3Ztp7rS+Dn4Lw==
|
||||
dependencies:
|
||||
"@electron/get" "^2.0.0"
|
||||
"@types/node" "^18.11.18"
|
||||
"@types/node" "^20.9.0"
|
||||
extract-zip "^2.0.1"
|
||||
|
||||
elkjs@^0.8.2:
|
||||
|
|
|
|||
Loading…
Reference in a new issue