From 0a99aa4bde5db83c151d8ac1ffefc69ce03beb85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Mon, 3 Jun 2024 12:35:38 +0200 Subject: [PATCH] refactor: update node to 22 --- .tool-versions | 4 ++-- flake.lock | 12 ++++++------ flake.nix | 2 +- images/node-base/Dockerfile | 2 +- images/node-builder/Dockerfile | 2 +- package.json | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.tool-versions b/.tool-versions index 7aa6272c..d60c8cbe 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ -nodejs 18.19.1 +nodejs 22.2.0 pnpm 8.15.4 -python 3.11.5 \ No newline at end of file +python 3.11.5 diff --git a/flake.lock b/flake.lock index 3ac48479..f7b50153 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709747860, - "narHash": "sha256-RT4zuBy579m+l8VyIQFOR66WXfcs4g1jntZUHjh6eoI=", + "lastModified": 1717112898, + "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "58ae79ea707579c40102ddf62d84b902a987c58b", + "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7d41e631..ef6cd803 100644 --- a/flake.nix +++ b/flake.nix @@ -43,7 +43,7 @@ hash = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM="; }; }); - nodejs = prev.nodejs_18; + nodejs = prev.nodejs_22; }) ]; config = { diff --git a/images/node-base/Dockerfile b/images/node-base/Dockerfile index f819fce0..e08e30f8 100644 --- a/images/node-base/Dockerfile +++ b/images/node-base/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18-alpine3.18 +FROM node:22-alpine RUN apk update && apk add git curl jq && mkdir -p /opt diff --git a/images/node-builder/Dockerfile b/images/node-builder/Dockerfile index 456508ae..bd8a10b8 100644 --- a/images/node-builder/Dockerfile +++ b/images/node-builder/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18-alpine3.18 +FROM node:22-alpine RUN apk update && apk add git jq curl python3 build-base diff --git a/package.json b/package.json index 2b410f53..a1926e0e 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,8 @@ "name": "@openstapps/openstapps", "private": true, "engines": { - "node": ">=18.16", - "pnpm": ">=8" + "node": "^22.2.0", + "pnpm": "^8.15.4" }, "scripts": { "build": "dotenv -c -- turbo run build",