nx 22.4.0-canary.20260113-246d4fd → 22.4.0-canary.20260114-45f2ae3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "22.4.0-canary.20260113-246d4fd",
+  "version": "22.4.0-canary.20260114-45f2ae3",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -53,7 +53,7 @@
     "jest-diff": "^30.0.2",
     "jsonc-parser": "3.2.0",
     "lines-and-columns": "2.0.3",
-    "minimatch": "9.0.3",
+    "minimatch": "10.1.1",
     "node-machine-id": "1.1.12",
     "npm-run-path": "^4.0.1",
     "open": "^8.4.0",
@@ -83,16 +83,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "22.4.0-canary.20260113-246d4fd",
-    "@nx/nx-darwin-x64": "22.4.0-canary.20260113-246d4fd",
-    "@nx/nx-freebsd-x64": "22.4.0-canary.20260113-246d4fd",
-    "@nx/nx-linux-arm-gnueabihf": "22.4.0-canary.20260113-246d4fd",
-    "@nx/nx-linux-arm64-gnu": "22.4.0-canary.20260113-246d4fd",
-    "@nx/nx-linux-arm64-musl": "22.4.0-canary.20260113-246d4fd",
-    "@nx/nx-linux-x64-gnu": "22.4.0-canary.20260113-246d4fd",
-    "@nx/nx-linux-x64-musl": "22.4.0-canary.20260113-246d4fd",
-    "@nx/nx-win32-arm64-msvc": "22.4.0-canary.20260113-246d4fd",
-    "@nx/nx-win32-x64-msvc": "22.4.0-canary.20260113-246d4fd"
+    "@nx/nx-darwin-arm64": "22.4.0-canary.20260114-45f2ae3",
+    "@nx/nx-darwin-x64": "22.4.0-canary.20260114-45f2ae3",
+    "@nx/nx-freebsd-x64": "22.4.0-canary.20260114-45f2ae3",
+    "@nx/nx-linux-arm-gnueabihf": "22.4.0-canary.20260114-45f2ae3",
+    "@nx/nx-linux-arm64-gnu": "22.4.0-canary.20260114-45f2ae3",
+    "@nx/nx-linux-arm64-musl": "22.4.0-canary.20260114-45f2ae3",
+    "@nx/nx-linux-x64-gnu": "22.4.0-canary.20260114-45f2ae3",
+    "@nx/nx-linux-x64-musl": "22.4.0-canary.20260114-45f2ae3",
+    "@nx/nx-win32-arm64-msvc": "22.4.0-canary.20260114-45f2ae3",
+    "@nx/nx-win32-x64-msvc": "22.4.0-canary.20260114-45f2ae3"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/project.json

@@ -15,7 +15,7 @@
             "inputs": ["native"],
             "outputs": [
                 "{projectRoot}/src/native/*.wasm",
-                "{projectRoot}/src/native/*.js",
+                "{projectRoot}/src/native/!(index|browser).js",
                 "{projectRoot}/src/native/*.cjs",
                 "{projectRoot}/src/native/*.mjs",
                 "{projectRoot}/src/native/index.d.ts"
@@ -31,7 +31,7 @@
         "build-native": {
             "outputs": [
                 "{projectRoot}/src/native/*.node",
-                "{projectRoot}/src/native/*.js",
+                "{projectRoot}/src/native/!(index|browser).js",
                 "{projectRoot}/src/native/index.d.ts"
             ],
             "executor": "@monodon/rust:napi",

package/src/native/index.js

@@ -1,9 +1,18 @@
 const { join, basename } = require('path');
-const { copyFileSync, existsSync, mkdirSync, renameSync } = require('fs');
+const {
+  copyFileSync,
+  existsSync,
+  mkdirSync,
+  renameSync,
+  statSync,
+  unlinkSync,
+} = require('fs');
 const Module = require('module');
 const { nxVersion } = require('../utils/versions');
 const { getNativeFileCacheLocation } = require('./native-file-cache-location');
 
+const MAX_COPY_RETRIES = 3;
+
 // WASI is still experimental and throws a warning when used
 // We spawn many many processes so the warning gets printed a lot
 // We have a different warning elsewhere to warn people using WASI
@@ -56,6 +65,14 @@ const localNodeFiles = [
 
 const originalLoad = Module._load;
 
+function statsOrNull(path) {
+  try {
+    return statSync(path);
+  } catch {
+    return null;
+  }
+}
+
 // We override the _load function so that when a native file is required,
 // we copy it to a cache directory and require it from there.
 // This prevents the file being loaded from node_modules and causing file locking issues.
@@ -83,22 +100,45 @@ Module._load = function (request, parent, isMain) {
     );
     // This is the path that will get loaded
     const tmpFile = join(nativeFileCacheLocation, nxVersion + '-' + fileName);
+    const expectedFileSize = statSync(nativeLocation).size;
+    const existingFileStats = statsOrNull(tmpFile);
 
     // If the file to be loaded already exists, just load it
-    if (existsSync(tmpFile)) {
+    if (existingFileStats?.size === expectedFileSize) {
       return originalLoad.apply(this, [tmpFile, parent, isMain]);
     }
     if (!existsSync(nativeFileCacheLocation)) {
       mkdirSync(nativeFileCacheLocation, { recursive: true });
     }
-    // First copy to a unique location for each process
-    copyFileSync(nativeLocation, tmpTmpFile);
 
-    // Then rename to the final location
-    renameSync(tmpTmpFile, tmpFile);
+    // Retry copying up to 3 times, validating after each copy
+    for (let attempt = 1; attempt <= MAX_COPY_RETRIES; attempt++) {
+      // First copy to a unique location for each process
+      copyFileSync(nativeLocation, tmpTmpFile);
+
+      // Validate the copy - check file size matches expected
+      const copiedFileStats = statsOrNull(tmpTmpFile);
+      if (copiedFileStats?.size === expectedFileSize) {
+        // Copy succeeded, rename to final location and load
+        renameSync(tmpTmpFile, tmpFile);
+        return originalLoad.apply(this, [tmpFile, parent, isMain]);
+      }
 
-    // Load from the final location
-    return originalLoad.apply(this, [tmpFile, parent, isMain]);
+      // Copy failed validation, clean up the malformed file
+      try {
+        unlinkSync(tmpTmpFile);
+      } catch {
+        // Ignore cleanup errors
+      }
+    }
+
+    // All retries failed - warn and load from original location
+    console.warn(
+      `Warning: Failed to copy native module to cache after ${MAX_COPY_RETRIES} attempts. ` +
+        `Loading from original location instead. ` +
+        `This may cause file locking issues on Windows.`
+    );
+    return originalLoad.apply(this, [nativeLocation, parent, isMain]);
   } else {
     // call the original _load function for everything else
     return originalLoad.apply(this, arguments);