From 15bb64f0b702f1d35ad1351ef826b06a15823b29 Mon Sep 17 00:00:00 2001 From: Marc Doerflinger Date: Wed, 27 Dec 2023 09:41:42 +0000 Subject: [PATCH 1/2] update node to 20 lts --- .devcontainer/devcontainer.json | 4 ++-- .devcontainer/docker-compose.yaml | 2 +- .github/dependabot.yml | 2 +- .github/workflows/build.yml | 4 ++-- Dockerfile | 2 +- package-lock.json | 14 +++++++------- package.json | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b268a1a9..b0e6993c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -40,8 +40,8 @@ // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. "remoteUser": "node", "features": { - "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}, - }, + "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {} + } // "mounts": [ // "source=depeg-ui-node_modules,target=/workspaces/depeg-ui/node_modules,type=volume" diff --git a/.devcontainer/docker-compose.yaml b/.devcontainer/docker-compose.yaml index e8b8cc42..c4a4fa94 100644 --- a/.devcontainer/docker-compose.yaml +++ b/.devcontainer/docker-compose.yaml @@ -10,7 +10,7 @@ services: context: .. dockerfile: .devcontainer/Dockerfile args: - VARIANT: 18-bookworm + VARIANT: 20-bookworm volumes: - ..:/workspaces/depeg-ui:cached - depeg-ui-node_modules:/workspaces/depeg-ui/node_modules diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 75d7f850..53ec2829 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,7 +11,7 @@ updates: interval: "weekly" ignore: - dependency-name: "node" - versions: ["19-alpine", "20-alpine"] + # versions: ["19-alpine", "20-alpine"] - package-ecosystem: "github-actions" directory: "/" schedule: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b50300b6..c23affea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: - name: Setup node uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '20' - name: NPM install run: npm install @@ -34,7 +34,7 @@ jobs: - name: Setup node uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '20' - name: NPM install run: npm install diff --git a/Dockerfile b/Dockerfile index a0fa83a3..e2271577 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG VARIANT=node:18-alpine +ARG VARIANT=node:20-alpine # Install dependencies only when needed FROM ${VARIANT} AS deps # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed. diff --git a/package-lock.json b/package-lock.json index 403b138a..cbd621ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -63,7 +63,7 @@ "@types/canvas-confetti": "^1.6.4", "@types/color": "^3.0.6", "@types/jest": "^29.5.11", - "@types/node": "^18.19.3", + "@types/node": "^20", "@types/react": "^18.2.45", "@types/react-blockies": "^1.4.4", "@types/react-dom": "^18.2.18", @@ -4266,9 +4266,9 @@ "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==" }, "node_modules/@types/node": { - "version": "18.19.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.3.tgz", - "integrity": "sha512-k5fggr14DwAytoA/t8rPrIz++lXK7/DqckthCmoZOKNsEbJkId4Z//BqgApXBUGrGddrigYa1oqheo/7YmW4rg==", + "version": "20.10.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.5.tgz", + "integrity": "sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==", "dependencies": { "undici-types": "~5.26.4" } @@ -17353,9 +17353,9 @@ "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==" }, "@types/node": { - "version": "18.19.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.3.tgz", - "integrity": "sha512-k5fggr14DwAytoA/t8rPrIz++lXK7/DqckthCmoZOKNsEbJkId4Z//BqgApXBUGrGddrigYa1oqheo/7YmW4rg==", + "version": "20.10.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.5.tgz", + "integrity": "sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==", "requires": { "undici-types": "~5.26.4" } diff --git a/package.json b/package.json index 1a99f68b..92224f1d 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "@types/canvas-confetti": "^1.6.4", "@types/color": "^3.0.6", "@types/jest": "^29.5.11", - "@types/node": "^18.19.3", + "@types/node": "^20", "@types/react": "^18.2.45", "@types/react-blockies": "^1.4.4", "@types/react-dom": "^18.2.18", From 2039385c7b9d7b02c115bc9cb5ae9970e5326f87 Mon Sep 17 00:00:00 2001 From: Marc Doerflinger Date: Wed, 27 Dec 2023 09:43:21 +0000 Subject: [PATCH 2/2] fix dependabot --- .github/dependabot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 53ec2829..46884a6c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,7 +11,7 @@ updates: interval: "weekly" ignore: - dependency-name: "node" - # versions: ["19-alpine", "20-alpine"] + versions: ["21-alpine"] - package-ecosystem: "github-actions" directory: "/" schedule: @@ -23,7 +23,7 @@ updates: open-pull-requests-limit: 30 ignore: - dependency-name: "@types/node" - versions: ["19.x", "20.x"] + versions: ["21.x"] - dependency-name: "@etherisc/gif-interface" # ignore all updates to this dependency - dependency-name: "@etherisc/depeg-contracts"