nx 19.2.0-alpha.0 → 19.2.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.2.0-alpha.0",
+  "version": "19.2.0-alpha.2",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -70,7 +70,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.2.0-alpha.0"
+    "@nrwl/tao": "19.2.0-alpha.2"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -85,16 +85,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.2.0-alpha.0",
-    "@nx/nx-darwin-arm64": "19.2.0-alpha.0",
-    "@nx/nx-linux-x64-gnu": "19.2.0-alpha.0",
-    "@nx/nx-linux-x64-musl": "19.2.0-alpha.0",
-    "@nx/nx-win32-x64-msvc": "19.2.0-alpha.0",
-    "@nx/nx-linux-arm64-gnu": "19.2.0-alpha.0",
-    "@nx/nx-linux-arm64-musl": "19.2.0-alpha.0",
-    "@nx/nx-linux-arm-gnueabihf": "19.2.0-alpha.0",
-    "@nx/nx-win32-arm64-msvc": "19.2.0-alpha.0",
-    "@nx/nx-freebsd-x64": "19.2.0-alpha.0"
+    "@nx/nx-darwin-x64": "19.2.0-alpha.2",
+    "@nx/nx-darwin-arm64": "19.2.0-alpha.2",
+    "@nx/nx-linux-x64-gnu": "19.2.0-alpha.2",
+    "@nx/nx-linux-x64-musl": "19.2.0-alpha.2",
+    "@nx/nx-win32-x64-msvc": "19.2.0-alpha.2",
+    "@nx/nx-linux-arm64-gnu": "19.2.0-alpha.2",
+    "@nx/nx-linux-arm64-musl": "19.2.0-alpha.2",
+    "@nx/nx-linux-arm-gnueabihf": "19.2.0-alpha.2",
+    "@nx/nx-win32-arm64-msvc": "19.2.0-alpha.2",
+    "@nx/nx-freebsd-x64": "19.2.0-alpha.2"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/native/index.js

@@ -1,378 +1,78 @@
-// prettier-ignore
-/* eslint-disable */
-/* auto-generated by NAPI-RS */
-
-const { readFileSync } = require('fs')
-
-let nativeBinding = null
-const loadErrors = []
-
-const isMusl = () => {
-  let musl = false
-  if (process.platform === 'linux') {
-    musl = isMuslFromFilesystem()
-    if (musl === null) {
-      musl = isMuslFromReport()
-    }
-    if (musl === null) {
-      musl = isMuslFromChildProcess()
-    }
-  }
-  return musl
-}
-
-const isFileMusl = (f) => f.includes('libc.musl-') || f.includes('ld-musl-')
-
-const isMuslFromFilesystem = () => {
-  try {
-    return readFileSync('/usr/bin/ldd', 'utf-8').includes('musl')
-  } catch {
-    return null
-  }
-}
-
-const isMuslFromReport = () => {
-  const report = typeof process.report.getReport === 'function' ? process.report.getReport() : null
-  if (!report) {
-    return null
-  }
-  if (report.header && report.header.glibcVersionRuntime) {
-    return false
-  }
-  if (Array.isArray(report.sharedObjects)) {
-    if (report.sharedObjects.some(isFileMusl)) {
-      return true
+const { join, basename } = require('path');
+const { copyFileSync, existsSync, mkdirSync } = require('fs');
+const Module = require('module');
+const { nxVersion } = require('../utils/versions');
+const { getNativeFileCacheLocation } = require('./native-file-cache-location');
+
+const nxPackages = new Set([
+  '@nx/nx-android-arm64',
+  '@nx/nx-android-arm-eabi',
+  '@nx/nx-win32-x64-msvc',
+  '@nx/nx-win32-ia32-msvc',
+  '@nx/nx-win32-arm64-msvc',
+  '@nx/nx-darwin-universal',
+  '@nx/nx-darwin-x64',
+  '@nx/nx-darwin-arm64',
+  '@nx/nx-freebsd-x64',
+  '@nx/nx-linux-x64-musl',
+  '@nx/nx-linux-x64-gnu',
+  '@nx/nx-linux-arm64-musl',
+  '@nx/nx-linux-arm64-gnu',
+  '@nx/nx-linux-arm-gnueabihf',
+]);
+
+const localNodeFiles = [
+  'nx.android-arm64.node',
+  'nx.android-arm-eabi.node',
+  'nx.win32-x64-msvc.node',
+  'nx.win32-ia32-msvc.node',
+  'nx.win32-arm64-msvc.node',
+  'nx.darwin-universal.node',
+  'nx.darwin-x64.node',
+  'nx.darwin-arm64.node',
+  'nx.freebsd-x64.node',
+  'nx.linux-x64-musl.node',
+  'nx.linux-x64-gnu.node',
+  'nx.linux-arm64-musl.node',
+  'nx.linux-arm64-gnu.node',
+  'nx.linux-arm-gnueabihf.node',
+];
+
+const originalLoad = Module._load;
+
+// 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.
+// Will only be called once because the require cache takes over afterwards.
+Module._load = function (request, parent, isMain) {
+  const modulePath = request;
+  if (
+    nxPackages.has(modulePath) ||
+    localNodeFiles.some((f) => modulePath.endsWith(f))
+  ) {
+    const nativeLocation = require.resolve(modulePath);
+    const fileName = basename(nativeLocation);
+
+    // we copy the file to a workspace-scoped tmp directory and prefix with nxVersion to avoid stale files being loaded
+    const nativeFileCacheLocation = getNativeFileCacheLocation();
+    const tmpFile = join(nativeFileCacheLocation, nxVersion + '-' + fileName);
+    if (existsSync(tmpFile)) {
+      return originalLoad.apply(this, [tmpFile, parent, isMain]);
     }
-  }
-  return false
-}
-
-const isMuslFromChildProcess = () => {
-  try {
-    return require('child_process').execSync('ldd --version', { encoding: 'utf8' }).includes('musl')
-  } catch (e) {
-    // If we reach this case, we don't know if the system is musl or not, so is better to just fallback to false
-    return false
-  }
-}
-
-function requireNative() {
-  if (process.platform === 'android') {
-    if (process.arch === 'arm64') {
-      try {
-        return require('./nx.android-arm64.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@nx/nx-android-arm64')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else if (process.arch === 'arm') {
-      try {
-        return require('./nx.android-arm-eabi.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@nx/nx-android-arm-eabi')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else {
-      loadErrors.push(new Error(`Unsupported architecture on Android ${process.arch}`))
-    }
-  } else if (process.platform === 'win32') {
-    if (process.arch === 'x64') {
-      try {
-        return require('./nx.win32-x64-msvc.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@nx/nx-win32-x64-msvc')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else if (process.arch === 'ia32') {
-      try {
-        return require('./nx.win32-ia32-msvc.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@nx/nx-win32-ia32-msvc')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else if (process.arch === 'arm64') {
-      try {
-        return require('./nx.win32-arm64-msvc.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@nx/nx-win32-arm64-msvc')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else {
-      loadErrors.push(new Error(`Unsupported architecture on Windows: ${process.arch}`))
-    }
-  } else if (process.platform === 'darwin') {
-    try {
-        return require('./nx.darwin-universal.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@nx/nx-darwin-universal')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    if (process.arch === 'x64') {
-      try {
-        return require('./nx.darwin-x64.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@nx/nx-darwin-x64')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else if (process.arch === 'arm64') {
-      try {
-        return require('./nx.darwin-arm64.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@nx/nx-darwin-arm64')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else {
-      loadErrors.push(new Error(`Unsupported architecture on macOS: ${process.arch}`))
-    }
-  } else if (process.platform === 'freebsd') {
-    if (process.arch === 'x64') {
-      try {
-        return require('./nx.freebsd-x64.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@nx/nx-freebsd-x64')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else if (process.arch === 'arm64') {
-      try {
-        return require('./nx.freebsd-arm64.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@nx/nx-freebsd-arm64')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else {
-      loadErrors.push(new Error(`Unsupported architecture on FreeBSD: ${process.arch}`))
-    }
-  } else if (process.platform === 'linux') {
-    if (process.arch === 'x64') {
-      if (isMusl()) {
-        try {
-        return require('./nx.linux-x64-musl.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@nx/nx-linux-x64-musl')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-      } else {
-        try {
-        return require('./nx.linux-x64-gnu.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@nx/nx-linux-x64-gnu')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-      }
-    } else if (process.arch === 'arm64') {
-      if (isMusl()) {
-        try {
-        return require('./nx.linux-arm64-musl.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@nx/nx-linux-arm64-musl')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-      } else {
-        try {
-        return require('./nx.linux-arm64-gnu.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@nx/nx-linux-arm64-gnu')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-      }
-    } else if (process.arch === 'arm') {
-      if (isMusl()) {
-        try {
-        return require('./nx.linux-arm-musleabihf.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@nx/nx-linux-arm-musleabihf')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-      } else {
-        try {
-        return require('./nx.linux-arm-gnueabihf.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@nx/nx-linux-arm-gnueabihf')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-      }
-    } else if (process.arch === 'riscv64') {
-      if (isMusl()) {
-        try {
-        return require('./nx.linux-riscv64-musl.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@nx/nx-linux-riscv64-musl')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-      } else {
-        try {
-        return require('./nx.linux-riscv64-gnu.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@nx/nx-linux-riscv64-gnu')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-      }
-    } else if (process.arch === 'ppc64') {
-      try {
-        return require('./nx.linux-ppc64-gnu.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@nx/nx-linux-ppc64-gnu')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else if (process.arch === 's390x') {
-      try {
-        return require('./nx.linux-s390x-gnu.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@nx/nx-linux-s390x-gnu')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else {
-      loadErrors.push(new Error(`Unsupported architecture on Linux: ${process.arch}`))
+    if (!existsSync(nativeFileCacheLocation)) {
+      mkdirSync(nativeFileCacheLocation, { recursive: true });
     }
+    copyFileSync(nativeLocation, tmpFile);
+    return originalLoad.apply(this, [tmpFile, parent, isMain]);
   } else {
-    loadErrors.push(new Error(`Unsupported OS: ${process.platform}, architecture: ${process.arch}`))
+    // call the original _load function for everything else
+    return originalLoad.apply(this, arguments);
   }
-}
-
-nativeBinding = requireNative()
+};
 
-if (!nativeBinding || process.env.NAPI_RS_FORCE_WASI) {
-  try {
-    nativeBinding = require('./nx.wasi.cjs')
-  } catch (err) {
-    if (process.env.NAPI_RS_FORCE_WASI) {
-      console.error(err)
-    }
-  }
-  if (!nativeBinding) {
-    try {
-      nativeBinding = require('@nx/nx-wasm32-wasi')
-    } catch (err) {
-      if (process.env.NAPI_RS_FORCE_WASI) {
-        console.error(err)
-      }
-    }
-  }
-}
-
-if (!nativeBinding) {
-  if (loadErrors.length > 0) {
-    // TODO Link to documentation with potential fixes
-    //  - The package owner could build/publish bindings for this arch
-    //  - The user may need to bundle the correct files
-    //  - The user may need to re-install node_modules to get new packages
-    throw new Error('Failed to load native binding', { cause: loadErrors })
-  }
-  throw new Error(`Failed to load native binding`)
-}
+const indexModulePath = require.resolve('./native-bindings.js');
+delete require.cache[indexModulePath];
+const indexModule = require('./native-bindings.js');
 
-module.exports.HashPlanner = nativeBinding.HashPlanner
-module.exports.ImportResult = nativeBinding.ImportResult
-module.exports.TaskHasher = nativeBinding.TaskHasher
-module.exports.WorkspaceContext = nativeBinding.WorkspaceContext
-module.exports.copy = nativeBinding.copy
-module.exports.expandOutputs = nativeBinding.expandOutputs
-module.exports.findImports = nativeBinding.findImports
-module.exports.getFilesForOutputs = nativeBinding.getFilesForOutputs
-module.exports.hashArray = nativeBinding.hashArray
-module.exports.hashFile = nativeBinding.hashFile
-module.exports.isWasm = nativeBinding.isWasm
-module.exports.remove = nativeBinding.remove
-module.exports.testOnlyTransferFileMap = nativeBinding.testOnlyTransferFileMap
-module.exports.transferProjectGraph = nativeBinding.transferProjectGraph
-module.exports.WorkspaceErrors = nativeBinding.WorkspaceErrors
+module.exports = indexModule;
+Module._load = originalLoad;

package/src/native/nx.wasi.cjs

@@ -0,0 +1,139 @@
+/* eslint-disable */
+/* prettier-ignore */
+
+/* auto-generated by NAPI-RS */
+
+const __nodeFs = require('node:fs')
+const __nodePath = require('node:path')
+const { WASI: __nodeWASI } = require('node:wasi')
+const { Worker } = require('node:worker_threads')
+
+const {
+  instantiateNapiModuleSync: __emnapiInstantiateNapiModuleSync,
+  getDefaultContext: __emnapiGetDefaultContext,
+  createOnMessage: __wasmCreateOnMessageForFsProxy,
+} = require('@napi-rs/wasm-runtime')
+
+const __rootDir = __nodePath.parse(process.cwd()).root
+
+const __wasi = new __nodeWASI({
+  version: 'preview1',
+  env: process.env,
+  preopens: {
+    [__rootDir]: __rootDir,
+  }
+})
+
+const __emnapiContext = __emnapiGetDefaultContext()
+
+const __sharedMemory = new WebAssembly.Memory({
+  initial: 4000,
+  maximum: 65536,
+  shared: true,
+})
+
+let __wasmFilePath = __nodePath.join(__dirname, 'nx.wasm32-wasi.wasm')
+const __wasmDebugFilePath = __nodePath.join(__dirname, 'nx.wasm32-wasi.debug.wasm')
+
+if (__nodeFs.existsSync(__wasmDebugFilePath)) {
+  __wasmFilePath = __wasmDebugFilePath
+} else if (!__nodeFs.existsSync(__wasmFilePath)) {
+  try {
+    __wasmFilePath = __nodePath.resolve('@nx/nx-wasm32-wasi')
+  } catch {
+    throw new Error('Cannot find nx.wasm32-wasi.wasm file, and @nx/nx-wasm32-wasi package is not installed.')
+  }
+}
+
+const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule } = __emnapiInstantiateNapiModuleSync(__nodeFs.readFileSync(__wasmFilePath), {
+  context: __emnapiContext,
+  asyncWorkPoolSize: (function() {
+    const threadsSizeFromEnv = Number(process.env.NAPI_RS_ASYNC_WORK_POOL_SIZE ?? process.env.UV_THREADPOOL_SIZE)
+    // NaN > 0 is false
+    if (threadsSizeFromEnv > 0) {
+      return threadsSizeFromEnv
+    } else {
+      return 4
+    }
+  })(),
+  wasi: __wasi,
+  onCreateWorker() {
+    const worker = new Worker(__nodePath.join(__dirname, 'wasi-worker.mjs'), {
+      env: process.env,
+      execArgv: ['--experimental-wasi-unstable-preview1'],
+    })
+    worker.onmessage = ({ data }) => {
+      __wasmCreateOnMessageForFsProxy(__nodeFs)(data)
+    }
+    return worker
+  },
+  overwriteImports(importObject) {
+    importObject.env = {
+      ...importObject.env,
+      ...importObject.napi,
+      ...importObject.emnapi,
+      memory: __sharedMemory,
+    }
+    return importObject
+  },
+  beforeInit({ instance }) {
+    __napi_rs_initialize_modules(instance)
+  }
+})
+
+function __napi_rs_initialize_modules(__napiInstance) {
+  __napiInstance.exports['__napi_register__expand_outputs_0']?.()
+  __napiInstance.exports['__napi_register__get_files_for_outputs_1']?.()
+  __napiInstance.exports['__napi_register__remove_2']?.()
+  __napiInstance.exports['__napi_register__copy_3']?.()
+  __napiInstance.exports['__napi_register__hash_array_4']?.()
+  __napiInstance.exports['__napi_register__hash_file_5']?.()
+  __napiInstance.exports['__napi_register__ImportResult_struct_6']?.()
+  __napiInstance.exports['__napi_register__find_imports_7']?.()
+  __napiInstance.exports['__napi_register__transfer_project_graph_8']?.()
+  __napiInstance.exports['__napi_register__ExternalNode_struct_9']?.()
+  __napiInstance.exports['__napi_register__Target_struct_10']?.()
+  __napiInstance.exports['__napi_register__Project_struct_11']?.()
+  __napiInstance.exports['__napi_register__ProjectGraph_struct_12']?.()
+  __napiInstance.exports['__napi_register__HashPlanner_struct_13']?.()
+  __napiInstance.exports['__napi_register__HashPlanner_impl_17']?.()
+  __napiInstance.exports['__napi_register__HashDetails_struct_18']?.()
+  __napiInstance.exports['__napi_register__HasherOptions_struct_19']?.()
+  __napiInstance.exports['__napi_register__TaskHasher_struct_20']?.()
+  __napiInstance.exports['__napi_register__TaskHasher_impl_23']?.()
+  __napiInstance.exports['__napi_register__Task_struct_24']?.()
+  __napiInstance.exports['__napi_register__TaskTarget_struct_25']?.()
+  __napiInstance.exports['__napi_register__TaskGraph_struct_26']?.()
+  __napiInstance.exports['__napi_register__FileData_struct_27']?.()
+  __napiInstance.exports['__napi_register__InputsInput_struct_28']?.()
+  __napiInstance.exports['__napi_register__FileSetInput_struct_29']?.()
+  __napiInstance.exports['__napi_register__RuntimeInput_struct_30']?.()
+  __napiInstance.exports['__napi_register__EnvironmentInput_struct_31']?.()
+  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_32']?.()
+  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_33']?.()
+  __napiInstance.exports['__napi_register__NxJson_struct_34']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_struct_35']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_impl_44']?.()
+  __napiInstance.exports['__napi_register__WorkspaceErrors_45']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_46']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_47']?.()
+  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_48']?.()
+  __napiInstance.exports['__napi_register__FileMap_struct_49']?.()
+  __napiInstance.exports['__napi_register____test_only_transfer_file_map_50']?.()
+  __napiInstance.exports['__napi_register__is_wasm_51']?.()
+}
+module.exports.HashPlanner = __napiModule.exports.HashPlanner
+module.exports.ImportResult = __napiModule.exports.ImportResult
+module.exports.TaskHasher = __napiModule.exports.TaskHasher
+module.exports.WorkspaceContext = __napiModule.exports.WorkspaceContext
+module.exports.copy = __napiModule.exports.copy
+module.exports.expandOutputs = __napiModule.exports.expandOutputs
+module.exports.findImports = __napiModule.exports.findImports
+module.exports.getFilesForOutputs = __napiModule.exports.getFilesForOutputs
+module.exports.hashArray = __napiModule.exports.hashArray
+module.exports.hashFile = __napiModule.exports.hashFile
+module.exports.isWasm = __napiModule.exports.isWasm
+module.exports.remove = __napiModule.exports.remove
+module.exports.testOnlyTransferFileMap = __napiModule.exports.testOnlyTransferFileMap
+module.exports.transferProjectGraph = __napiModule.exports.transferProjectGraph
+module.exports.WorkspaceErrors = __napiModule.exports.WorkspaceErrors