chore: update node

.gitlab-ci.yml

@@ -30,7 +30,7 @@ tests:
     untracked: true
     key:
       files:
-        - pnpm-lock.yaml
+        - package
     paths:
       - node_modules/
   rules:
@@ -47,7 +47,7 @@ web-tests:
     untracked: true
     key:
       files:
-        - pnpm-lock.yaml
+        - package-lock.json
     paths:
       - node_modules/
   artifacts:

flake.nix

@@ -65,6 +65,9 @@
     in {
       packages = rec {
         monster = pkgs'.callPackage ./nix/packages/monster.nix {inherit self pkgs';};
+
+        nodeModule = pkgs'.callPackage ./nix/packages/node-module.nix {inherit pkgs';};
+
         default = monster;
       };
 

nix/packages/node-module.nix

+{
+  pkgs',
+  system,
+  ...
+}: let
+  releaseInfo = import ../config/release.nix;
+
+  src = ../..;
+
+  # Read the package-lock.json as a Nix attrset
+  packageLock = builtins.fromJSON (builtins.readFile (src + "/package-lock.json"));
+
+  # Helper function to safely get attributes
+  getAttr = attr: def: set:
+    if builtins.hasAttr attr set
+    then builtins.getAttr attr set
+    else def;
+
+  # Create an array of all (meaningful) dependencies
+  deps =
+    builtins.attrValues (removeAttrs packageLock.packages [""])
+    ++ builtins.attrValues (removeAttrs (getAttr "dependencies" {} packageLock) [""]);
+
+  # Turn each dependency into a fetchurl call
+  fetchTarball = p:
+    pkgs'.fetchurl {
+      url = p.resolved;
+      hash = p.integrity;
+    };
+
+  tarballs = map fetchTarball deps;
+
+  # Write a file with the list of tarballs
+  tarballsFile = pkgs'.writeTextFile {
+    name = "tarballs";
+    text = builtins.concatStringsSep "\n" (map (x: x.outPath) tarballs);
+  };
+
+  stdenv = pkgs'.stdenv;
+in
+  stdenv.mkDerivation {
+    inherit src;
+
+    name = "node-module";
+    version = releaseInfo.version;
+
+    buildPhase = ''
+      #!${pkgs'.bash}/bin/bash
+      source ${pkgs'.common}/bin/common
+
+      mkdir -p $out/
+      cd $out
+
+      cp -r $src/package.json .
+      cp -r $src/package-lock.json .
+
+      export HOME=$PWD/.home
+      export npm_config_cache=$PWD/.npm
+      export npm_config_offline=true
+
+      total_cores=$(nproc)
+      half_cores=$((total_cores / 2))
+
+      echo "Total cores: $total_cores"
+
+      if [ $half_cores -lt 1 ]; then
+        half_cores=1
+      fi
+
+      printf "will cite\n" | parallel --citation
+      nice -n 10 parallel -j $half_cores -a ${tarballsFile} npm cache add "{}" || {
+        echo "Failed to cache some packages"
+        exit 1
+      }
+
+      sleep 1
+
+      nice -n 10 npm ci --verbose --prefer-offline --no-audit --progress=true --loglevel=error || {
+        echo "Retrying npm ci without cache"
+        sleep 5
+        nice -n 10 npm ci --verbose --prefer-offline --no-audit --progress=true --loglevel=error || {
+          echo "Failed to install dependencies"
+          exit 1
+        }
+      }
+
+    '';
+
+    buildInputs = with pkgs'; [projectNodeJS getent strace coreutils bash rsync parallel findutils];
+
+    system = system;
+  }

nix/scripts/init-project.nix

@@ -10,7 +10,7 @@ in
 
     echo_step "Installing dependencies"
 
-    if ! ${pkgs'.findutils}/bin/find . -type d -name node_modules -prune -o -type f -name package.json -print | ${pkgs'.findutils}/bin/xargs -I {} sh -c "cd $(dirname {}); ${pkgs'.projectCorepack}/bin/pnpm install"
+    if ! ${pkgs'.findutils}/bin/find . -type d -name node_modules -prune -o -type f -name package.json -print | ${pkgs'.findutils}/bin/xargs -I {} sh -c "cd $(dirname {}); ${pkgs'.projectCorepack}/bin/npm install"
     then
       echo_error "Failed to install dependencies"
       echo_hint "Check the error message and try again"

nix/scripts/run-ci-tests.nix

@@ -14,7 +14,7 @@ pkgs'.writeShellScriptBin "run-ci-tests" ''
 
   TEST_CASES_PATH="''${CI_PROJECT_DIR}/test/cases/"
 
-  if ! pnpm install
+  if ! npm install
   then
      echo "Failed to install dependencies"
      exit 1

nix/scripts/run-ci-web-tests.nix

@@ -14,7 +14,7 @@ pkgs'.writeShellScriptBin "run-ci-web-tests" ''
 
   TEST_CASES_PATH="''${CI_PROJECT_DIR}/test/web/"
 
-  if ! ${pkgs'.projectCorepack}/bin/pnpm install
+  if ! ${pkgs'.projectCorepack}/bin/npm install
   then
      echo "Failed to install dependencies"
      exit 1

nix/scripts/start-server.nix

@@ -23,7 +23,7 @@ in
     export VERSION=${releaseInfo.version}
     export COMMIT=${releaseInfo.commit}
 
-    export PNPX_BIN=${pkgs'.nodePackages.pnpm}/bin/pnpx
+    export PNPX_BIN=${pkgs'.nodePackages.npm}/bin/npx
     export NODE_BIN=${pkgs'.projectNodeJS}/bin/node
     export LOCALHOST_CERTS_DIR=${pkgs'.alvineDevCerts}
 

nix/scripts/update-project.nix

@@ -19,7 +19,7 @@ in
 
     echo_step "Installing dependencies (node)"
 
-    if ! ${pkgs'.findutils}/bin/find . -type d -name node_modules -prune -o -type f -name package.json -print | ${pkgs'.findutils}/bin/xargs -I {} sh -c "cd $(dirname {}); ${pkgs'.projectCorepack}/bin/pnpm install"
+    if ! ${pkgs'.findutils}/bin/find . -type d -name node_modules -prune -o -type f -name package.json -print | ${pkgs'.findutils}/bin/xargs -I {} sh -c "cd $(dirname {}); ${pkgs'.projectCorepack}/bin/npm install"
     then
       echo_error "Failed to install dependencies"
       echo_hint "Check the error message and try again"

package.json

@@ -96,13 +96,5 @@
     "vite-plugin-mock": "^3.0.2",
     "vite-plugin-terminal": "^1.2.0",
     "ws": "^8.18.0"
-  },
-  "packageManager": "pnpm@10.1.0+sha512.c89847b0667ddab50396bbbd008a2a43cf3b581efd59cf5d9aa8923ea1fb4b8106c041d540d08acb095037594d73ebc51e1ec89ee40c88b30b8a66c0fae0ac1b",
-  "pnpm": {
-    "onlyBuiltDependencies": [
-      "esbuild",
-      "@biomejs/biome",
-      "puppeteer"
-    ]
   }
 }