feat: update to node 22

.tool-versions

@@ -1,3 +1,3 @@
-nodejs 18.19.1
+nodejs 22.2.0
 pnpm 8.15.4
-python 3.11.5
+python 3.11.5

flake.lock

@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1709126324,
+        "lastModified": 1710146030,
-        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
+        "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,
+        "lastModified": 1717112898,
-        "narHash": "sha256-RT4zuBy579m+l8VyIQFOR66WXfcs4g1jntZUHjh6eoI=",
+        "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "58ae79ea707579c40102ddf62d84b902a987c58b",
+        "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0",
         "type": "github"
       },
       "original": {

flake.nix

@@ -4,68 +4,85 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
   };
-  outputs = {
+  outputs =
-    self,
+    {
-    nixpkgs,
+      self,
-    flake-utils,
+      nixpkgs,
-  }: let
+      flake-utils,
-    aapt2buildToolsVersion = "33.0.2";
+    }:
-  in
+    let
-    flake-utils.lib.eachDefaultSystem (system: let
+      aapt2buildToolsVersion = "33.0.2";
-      pkgs = import nixpkgs {
+    in
-        inherit system;
+    flake-utils.lib.eachDefaultSystem (
-        overlays = [
+      system:
-          (final: prev: rec {
+      let
-            fontMin = prev.python311.withPackages (ps: with ps; [brotli fonttools] ++ (with fonttools.optional-dependencies; [woff]));
+        pkgs = import nixpkgs {
-            android = prev.androidenv.composeAndroidPackages {
+          inherit system;
-              buildToolsVersions = ["30.0.3" aapt2buildToolsVersion];
+          overlays = [
-              platformVersions = ["33"];
+            (final: prev: rec {
-            };
+              fontMin = prev.python311.withPackages (
-            cypress = prev.cypress.overrideAttrs (cyPrev: rec {
+                ps:
-              version = "13.2.0";
+                with ps;
-              src = prev.fetchzip {
+                [
-                url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
+                  brotli
-                hash = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM=";
+                  fonttools
+                ]
+                ++ (with fonttools.optional-dependencies; [ woff ])
+              );
+              android = prev.androidenv.composeAndroidPackages {
+                buildToolsVersions = [
+                  "30.0.3"
+                  aapt2buildToolsVersion
+                ];
+                platformVersions = [ "33" ];
               };
-            });
+              cypress = prev.cypress.overrideAttrs (cyPrev: rec {
-            nodejs = prev.nodejs_18;
+                version = "13.2.0";
-          })
+                src = prev.fetchzip {
-        ];
+                  url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
-        config = {
+                  hash = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM=";
-          allowUnfree = true;
+                };
-          android_sdk.accept_license = true;
+              });
+              nodejs = prev.nodejs_22;
+            })
+          ];
+          config = {
+            allowUnfree = true;
+            android_sdk.accept_license = true;
+          };
         };
-      };
+        androidFhs = pkgs.buildFHSUserEnv {
-      androidFhs = pkgs.buildFHSUserEnv {
+          name = "android-env";
-        name = "android-env";
+          targetPkgs = pkgs: with pkgs; [ ];
-        targetPkgs = pkgs: with pkgs; [];
+          runScript = "bash";
-        runScript = "bash";
+          profile = ''
-        profile = ''
+            export ALLOW_NINJA_ENV=true
-          export ALLOW_NINJA_ENV=true
+            export USE_CCACHE=1
-          export USE_CCACHE=1
+            export LD_LIBRARY_PATH=/usr/lib:/usr/lib32
-          export LD_LIBRARY_PATH=/usr/lib:/usr/lib32
+          '';
-        '';
+        };
-      };
+      in
-    in {
+      {
-      devShell = pkgs.mkShell rec {
+        devShell = pkgs.mkShell rec {
-        nativeBuildInputs = [androidFhs];
+          nativeBuildInputs = [ androidFhs ];
-        buildInputs = with pkgs; [
+          buildInputs = with pkgs; [
-          nodejs
+            nodejs
-          corepack
+            corepack
-          # tools
+            # tools
-          curl
+            curl
-          jq
+            jq
-          fontMin
+            fontMin
-          cypress
+            cypress
-          # android
+            # android
-          jdk17
+            jdk17
-          android.androidsdk
+            android.androidsdk
-        ];
+          ];
-        ANDROID_JAVA_HOME = "${pkgs.jdk.home}";
+          ANDROID_JAVA_HOME = "${pkgs.jdk.home}";
-        ANDROID_SDK_ROOT = "${pkgs.android.androidsdk}/libexec/android-sdk";
+          ANDROID_SDK_ROOT = "${pkgs.android.androidsdk}/libexec/android-sdk";
-        GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${aapt2buildToolsVersion}/aapt2";
+          GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${aapt2buildToolsVersion}/aapt2";
-        CYPRESS_INSTALL_BINARY = "0";
+          CYPRESS_INSTALL_BINARY = "0";
-        CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
+          CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
-      };
+        };
-    });
+      }
+    );
 }

images/app-builder/scripts/node_setup.sh

@@ -21,9 +21,9 @@
 
 
 export DEBIAN_FRONTEND=noninteractive
-SCRSUFFIX="_18.x"
+SCRSUFFIX="_22.x"
-NODENAME="Node.js 18.x"
+NODENAME="Node.js 22.x"
-NODEREPO="node_18.x"
+NODEREPO="node_22.x"
 NODEPKG="nodejs"
 
 print_status() {
@@ -94,7 +94,7 @@ node_deprecation_warning() {
           "X${NODENAME}" == "XNode.js 8.x LTS Carbon" ||
           "X${NODENAME}" == "XNode.js 9.x" ||
           "X${NODENAME}" == "XNode.js 10.x" ||
-          "X${NODENAME}" == "XNode.js 11.x" || 
+          "X${NODENAME}" == "XNode.js 11.x" ||
           "X${NODENAME}" == "XNode.js 12.x" ||
           "X${NODENAME}" == "XNode.js 13.x" ||
           "X${NODENAME}" == "XNode.js 14.x" ||

images/app-cypress/Dockerfile

@@ -1,5 +1,5 @@
 ### Set base image
-FROM cypress/base:18.16.1
+FROM cypress/base:22.0.0
 
 USER root
 

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
 

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
 

package.json

@@ -2,8 +2,8 @@
   "name": "@openstapps/openstapps",
   "private": true,
   "engines": {
-    "node": ">=18.16",
+    "node": "^22.0.0",
-    "pnpm": ">=8"
+    "pnpm": "^8.15.4"
   },
   "scripts": {
     "build": "dotenv -c -- turbo run build",