fix(pnpm): allow releases within the minimum release date cutoff for trusted packages (#2236)

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1783224372,
+        "lastModified": 1785967620,
-        "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
+        "narHash": "sha256-IItrdb7Puk05RqOBWZYFC5X6Wl1sJmCfh5MWVHw5iMM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d407951447dcd00442e97087bf374aad70c04cea",
+        "rev": "b7c2ada94fe99c15b0dbcf4d11fd7850b957a436",
         "type": "github"
       },
       "original": {

nix/common.nix

@@ -6,12 +6,12 @@
   cacert,
   gitMinimal,
   nodejs,
-  pnpm_10,
+  pnpm_11,
   pnpmConfigHook,
 }:
 
 let
-  pnpm = pnpm_10;
+  pnpm = pnpm_11;
 in
 
 stdenvNoCC.mkDerivation (final: {
@@ -31,7 +31,8 @@ stdenvNoCC.mkDerivation (final: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (final) pname version src;
-    fetcherVersion = 3;
+    inherit pnpm;
+    fetcherVersion = 4;
     hash = builtins.readFile ./pnpm-deps-hash.txt;
   };
 
@@ -51,8 +52,7 @@ stdenvNoCC.mkDerivation (final: {
     buildPhase = ''
       runHook preBuild
 
-      pnpm run build:packages
+      pnpm -F @proj-airi/stage-web... run build
-      pnpm -F @proj-airi/stage-web run build
 
       runHook postBuild
     '';

nix/package.nix

@@ -9,7 +9,7 @@
   makeWrapper,
   gitMinimal,
   nodejs,
-  pnpm_10,
+  pnpm_11,
   pnpmConfigHook,
 
   electron_41,
@@ -18,7 +18,7 @@
 }:
 
 let
-  pnpm = pnpm_10;
+  pnpm = pnpm_11;
   electron = electron_41;
   libraryPath = lib.makeLibraryPath [
     libxt
@@ -67,9 +67,8 @@ in
   buildPhase = ''
     runHook preBuild
 
-    pnpm run build:packages
+    pnpm -F @proj-airi/stage-tamagotchi... run build
     cd apps/stage-tamagotchi
-    pnpm run build
     pnpm exec electron-builder build \
       --dir --${if stdenvNoCC.isLinux then "linux" else "mac"} \
       -c.electronDist="${electron.dist}" \

nix/pnpm-deps-hash.txt

@@ -1 +1 @@
-sha256-1rosTdrhLs0SR+BlOUODMo3yf0oYVvZRH4NJ2tGvJlE=
+sha256-LU82SxDsmrI9YewQiw5RPxWmMipPEERZoMSvsZ1BUaY=

nix/update-assets-hash.sh

@@ -7,4 +7,5 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
 echo -n "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" > assets-hash.txt
 BUILD_LOG="$(mktemp)"
 nix build -L ..#airi.assets |& tee "$BUILD_LOG"
-grep -oP 'got: +\K\S+' "$BUILD_LOG" > assets-hash.txt
+HASH="$(grep -aoP 'got: +\Ksha256-\S{43}=' "$BUILD_LOG")"
+[ -n "$HASH" ] && echo "$HASH" > assets-hash.txt

nix/update-pnpm-deps-hash.sh

@@ -6,4 +6,5 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
 :> pnpm-deps-hash.txt # Clear hash to trigger rebuild
 BUILD_LOG="$(mktemp)"
 nix build -L ..#airi.pnpmDeps |& tee "$BUILD_LOG"
-grep -oP 'got: +\K\S+' "$BUILD_LOG" > pnpm-deps-hash.txt
+HASH="$(grep -aoP 'got: +\Ksha256-\S{43}=' "$BUILD_LOG")"
+[ -n "$HASH" ] && echo "$HASH" > pnpm-deps-hash.txt

pnpm-workspace.yaml

@@ -1,4 +1,12 @@
 catalogMode: prefer
+minimumReleaseAgeExclude:
+  - '@moeru/*'
+  - '@proj-airi/*'
+  - '@vishot/*'
+  - '@xsai/*'
+  - '@xsai-ext/*'
+  - '@xsai-transformers/*'
+
 shellEmulator: true
 packages:
   - packages/**