From d5aa8db2f0e19a1115283f42c93dae68524ae076 Mon Sep 17 00:00:00 2001 From: Clara Ni Date: Wed, 17 Jul 2024 11:04:22 +0200 Subject: [PATCH] front, ci: bump node js (18 -> 20) --- flake.nix | 2 +- front/.nvmrc | 1 + front/docker/Dockerfile.devel | 2 +- front/docker/Dockerfile.nginx | 2 +- front/docker/Dockerfile.storybook | 2 +- front/package.json | 2 +- front/yarn.lock | 9 ++++++++- 7 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 front/.nvmrc diff --git a/flake.nix b/flake.nix index e99901fa8a6..96506985998 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,7 @@ pythonPackages = ps: (import ./nix/python_env.nix {inherit ps;}); - fixedNode = pkgs.nodejs-18_x; + fixedNode = pkgs.nodejs_20; fixedNodePackages = pkgs.nodePackages.override { nodejs = fixedNode; }; diff --git a/front/.nvmrc b/front/.nvmrc new file mode 100644 index 00000000000..209e3ef4b62 --- /dev/null +++ b/front/.nvmrc @@ -0,0 +1 @@ +20 diff --git a/front/docker/Dockerfile.devel b/front/docker/Dockerfile.devel index 4c2b7d3c0a5..320297c885f 100644 --- a/front/docker/Dockerfile.devel +++ b/front/docker/Dockerfile.devel @@ -5,7 +5,7 @@ COPY docker/exec-as.c . RUN gcc -std=c99 -static -o /exec-as exec-as.c -FROM node:18 +FROM node:20 # Install dependencies RUN apt-get update -yqq && \ diff --git a/front/docker/Dockerfile.nginx b/front/docker/Dockerfile.nginx index d979c5958f1..3e2726b0277 100644 --- a/front/docker/Dockerfile.nginx +++ b/front/docker/Dockerfile.nginx @@ -1,6 +1,6 @@ ### BUILD STAGE -FROM node:18-bookworm as build +FROM node:20-bookworm as build WORKDIR /app diff --git a/front/docker/Dockerfile.storybook b/front/docker/Dockerfile.storybook index d13d6aff4fd..e9e05ad3b09 100644 --- a/front/docker/Dockerfile.storybook +++ b/front/docker/Dockerfile.storybook @@ -1,5 +1,5 @@ # Build Storybook with node -FROM node:18-alpine as build +FROM node:20-alpine as build WORKDIR /app diff --git a/front/package.json b/front/package.json index fb871f1dfbf..32e8ed81a94 100644 --- a/front/package.json +++ b/front/package.json @@ -147,7 +147,7 @@ "@types/d3-drag": "^3.0.7", "@types/jest": "^29.5.12", "@types/lodash": "^4.14.202", - "@types/node": "^20.11.16", + "@types/node": "^20", "@types/react": "^18.2.53", "@types/react-beautiful-dnd": "^13.1.8", "@types/react-dom": "^18.2.18", diff --git a/front/yarn.lock b/front/yarn.lock index 34d4a610215..650d35db10b 100644 --- a/front/yarn.lock +++ b/front/yarn.lock @@ -4420,7 +4420,7 @@ "@types/node" "*" form-data "^4.0.0" -"@types/node@*", "@types/node@^20.11.16", "@types/node@^20.4.1": +"@types/node@*", "@types/node@^20.4.1": version "20.12.7" resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.7.tgz#04080362fa3dd6c5822061aa3124f5c152cff384" integrity sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg== @@ -4434,6 +4434,13 @@ dependencies: undici-types "~5.26.4" +"@types/node@^20": + version "20.14.11" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.11.tgz#09b300423343460455043ddd4d0ded6ac579b74b" + integrity sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA== + dependencies: + undici-types "~5.26.4" + "@types/normalize-package-data@^2.4.0": version "2.4.4" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901"