nx 19.4.0 → 19.5.0-beta.0

package/src/native/nx.wasi-browser.js

@@ -0,0 +1,108 @@
+import {
+  instantiateNapiModuleSync as __emnapiInstantiateNapiModuleSync,
+  getDefaultContext as __emnapiGetDefaultContext,
+  WASI as __WASI,
+  createOnMessage as __wasmCreateOnMessageForFsProxy,
+} from '@napi-rs/wasm-runtime'
+
+import __wasmUrl from './nx.wasm32-wasi.wasm?url'
+
+const __wasi = new __WASI({
+  version: 'preview1',
+})
+
+const __emnapiContext = __emnapiGetDefaultContext()
+
+const __sharedMemory = new WebAssembly.Memory({
+  initial: 16384,
+  maximum: 32768,
+  shared: true,
+})
+
+const __wasmFile = await fetch(__wasmUrl).then((res) => res.arrayBuffer())
+
+const {
+  instance: __napiInstance,
+  module: __wasiModule,
+  napiModule: __napiModule,
+} = __emnapiInstantiateNapiModuleSync(__wasmFile, {
+  context: __emnapiContext,
+  asyncWorkPoolSize: 4,
+  wasi: __wasi,
+  onCreateWorker() {
+    const worker = new Worker(new URL('./wasi-worker-browser.mjs', import.meta.url), {
+      type: 'module',
+    })
+    
+    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']?.()
+}
+export const HashPlanner = __napiModule.exports.HashPlanner
+export const ImportResult = __napiModule.exports.ImportResult
+export const TaskHasher = __napiModule.exports.TaskHasher
+export const WorkspaceContext = __napiModule.exports.WorkspaceContext
+export const copy = __napiModule.exports.copy
+export const expandOutputs = __napiModule.exports.expandOutputs
+export const findImports = __napiModule.exports.findImports
+export const getFilesForOutputs = __napiModule.exports.getFilesForOutputs
+export const hashArray = __napiModule.exports.hashArray
+export const hashFile = __napiModule.exports.hashFile
+export const IS_WASM = __napiModule.exports.IS_WASM
+export const remove = __napiModule.exports.remove
+export const testOnlyTransferFileMap = __napiModule.exports.testOnlyTransferFileMap
+export const transferProjectGraph = __napiModule.exports.transferProjectGraph
+export const WorkspaceErrors = __napiModule.exports.WorkspaceErrors

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: 16384,
+  maximum: 32768,
+  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.IS_WASM = __napiModule.exports.IS_WASM
+module.exports.remove = __napiModule.exports.remove
+module.exports.testOnlyTransferFileMap = __napiModule.exports.testOnlyTransferFileMap
+module.exports.transferProjectGraph = __napiModule.exports.transferProjectGraph
+module.exports.WorkspaceErrors = __napiModule.exports.WorkspaceErrors

package/src/native/wasi-worker-browser.mjs

@@ -0,0 +1,32 @@
+import { instantiateNapiModuleSync, MessageHandler, WASI } from '@napi-rs/wasm-runtime'
+
+const handler = new MessageHandler({
+  onLoad({ wasmModule, wasmMemory }) {
+    const wasi = new WASI({
+      print: function () {
+        // eslint-disable-next-line no-console
+        console.log.apply(console, arguments)
+      },
+      printErr: function() {
+        // eslint-disable-next-line no-console
+        console.error.apply(console, arguments)
+      },
+    })
+    return instantiateNapiModuleSync(wasmModule, {
+      childThread: true,
+      wasi,
+      overwriteImports(importObject) {
+        importObject.env = {
+          ...importObject.env,
+          ...importObject.napi,
+          ...importObject.emnapi,
+          memory: wasmMemory,
+        }
+      },
+    })
+  },
+})
+
+globalThis.onmessage = function (e) {
+  handler.handle(e)
+}

package/src/native/wasi-worker.mjs

@@ -0,0 +1,63 @@
+import fs from "node:fs";
+import { createRequire } from "node:module";
+import { parse } from "node:path";
+import { WASI } from "node:wasi";
+import { parentPort, Worker } from "node:worker_threads";
+
+const require = createRequire(import.meta.url);
+
+const { instantiateNapiModuleSync, MessageHandler, getDefaultContext } = require("@napi-rs/wasm-runtime");
+
+if (parentPort) {
+  parentPort.on("message", (data) => {
+    globalThis.onmessage({ data });
+  });
+}
+
+Object.assign(globalThis, {
+  self: globalThis,
+  require,
+  Worker,
+  importScripts: function (f) {
+    ;(0, eval)(fs.readFileSync(f, "utf8") + "//# sourceURL=" + f);
+  },
+  postMessage: function (msg) {
+    if (parentPort) {
+      parentPort.postMessage(msg);
+    }
+  },
+});
+
+const emnapiContext = getDefaultContext();
+
+const __rootDir = parse(process.cwd()).root;
+
+const handler = new MessageHandler({
+  onLoad({ wasmModule, wasmMemory }) {
+    const wasi = new WASI({
+      version: 'preview1',
+      env: process.env,
+      preopens: {
+        [__rootDir]: __rootDir,
+      },
+    });
+
+    return instantiateNapiModuleSync(wasmModule, {
+      childThread: true,
+      wasi,
+      context: emnapiContext,
+      overwriteImports(importObject) {
+        importObject.env = {
+          ...importObject.env,
+          ...importObject.napi,
+          ...importObject.emnapi,
+          memory: wasmMemory
+        };
+      },
+    });
+  },
+});
+
+globalThis.onmessage = function (e) {
+  handler.handle(e);
+};

package/src/plugins/js/utils/register.js

@@ -79,13 +79,7 @@ function getSwcTranspiler(compilerOptions) {
     return typeof cleanupFn === 'function' ? cleanupFn : () => { };
 }
 exports.getSwcTranspiler = getSwcTranspiler;
-const registered = new Set();
 function getTsNodeTranspiler(compilerOptions) {
-    // Just return if transpiler was already registered before.
-    const registrationKey = JSON.stringify(compilerOptions);
-    if (registered.has(registrationKey)) {
-        return () => { };
-    }
     const { register } = require('ts-node');
     // ts-node doesn't provide a cleanup method
     const service = register({
@@ -94,7 +88,6 @@ function getTsNodeTranspiler(compilerOptions) {
         // we already read and provide the compiler options, so prevent ts-node from reading them again
         skipProject: true,
     });
-    registered.add(registrationKey);
     const { transpiler, swc } = service.options;
     // Don't warn if a faster transpiler is enabled
     if (!transpiler && !swc) {
@@ -147,6 +140,7 @@ function filterRecognizedTsConfigTsNodeOptions(jsonObject) {
     const catchMissingProps = null;
     return { recognized: filteredTsConfigOptions, unrecognized };
 }
+const registered = new Map();
 function getTranspiler(compilerOptions, tsConfigRaw) {
     const preferTsNode = process.env.NX_PREFER_TS_NODE === 'true';
     if (!ts) {
@@ -160,13 +154,35 @@ function getTranspiler(compilerOptions, tsConfigRaw) {
     compilerOptions.target = ts.ScriptTarget.ES2021;
     compilerOptions.inlineSourceMap = true;
     compilerOptions.skipLibCheck = true;
-    if (swcNodeInstalled && !preferTsNode) {
-        return () => getSwcTranspiler(compilerOptions);
+    // Just return if transpiler was already registered before.
+    const registrationKey = JSON.stringify(compilerOptions);
+    const registrationEntry = registered.get(registrationKey);
+    if (registered.has(registrationKey)) {
+        registrationEntry.refCount++;
+        return registrationEntry.cleanup;
     }
-    // We can fall back on ts-node if it's available
-    if (tsNodeInstalled) {
-        const tsNodeOptions = filterRecognizedTsConfigTsNodeOptions(tsConfigRaw).recognized;
-        return () => getTsNodeTranspiler(compilerOptions);
+    const _getTranspiler = swcNodeInstalled && !preferTsNode
+        ? getSwcTranspiler
+        : tsNodeInstalled
+            ? // We can fall back on ts-node if it's available
+                getTsNodeTranspiler
+            : undefined;
+    if (_getTranspiler) {
+        const transpilerCleanup = _getTranspiler(compilerOptions);
+        const currRegistrationEntry = {
+            refCount: 1,
+            cleanup: () => {
+                return () => {
+                    currRegistrationEntry.refCount--;
+                    if (currRegistrationEntry.refCount === 0) {
+                        registered.delete(registrationKey);
+                        transpilerCleanup();
+                    }
+                };
+            },
+        };
+        registered.set(registrationKey, currRegistrationEntry);
+        return currRegistrationEntry.cleanup;
     }
 }
 exports.getTranspiler = getTranspiler;

package/src/project-graph/plugins/internal-api.js

@@ -107,7 +107,6 @@ async function normalizePlugins(plugins, root) {
 async function getDefaultPlugins(root) {
     return [
         (0, path_1.join)(__dirname, '../../plugins/js'),
-        (0, path_1.join)(__dirname, '../../plugins/target-defaults/target-defaults-plugin'),
         ...((0, angular_json_1.shouldMergeAngularProjects)(root, false)
             ? [(0, path_1.join)(__dirname, '../../adapter/angular-json')]
             : []),

package/src/project-graph/plugins/isolation/plugin-pool.js

@@ -235,7 +235,7 @@ async function startPluginWorker() {
         workerPath,
         ipcPath,
     ], {
-        stdio: process.stdout.isTTY ? 'inherit' : 'ignore',
+        stdio: 'inherit',
         env,
         detached: true,
         shell: false,

package/src/project-graph/utils/project-configuration-utils.d.ts

@@ -1,15 +1,10 @@
 import { NxJsonConfiguration, TargetDefaults } from '../../config/nx-json';
 import { ProjectGraphExternalNode } from '../../config/project-graph';
 import { ProjectConfiguration, ProjectMetadata, TargetConfiguration, TargetMetadata } from '../../config/workspace-json-project-json';
-import { ONLY_MODIFIES_EXISTING_TARGET } from '../../plugins/target-defaults/symbols';
 import { LoadedNxPlugin } from '../plugins/internal-api';
 export type SourceInformation = [file: string | null, plugin: string];
 export type ConfigurationSourceMaps = Record<string, Record<string, SourceInformation>>;
-export declare function mergeProjectConfigurationIntoRootMap(projectRootMap: Record<string, ProjectConfiguration>, project: ProjectConfiguration & {
-    targets?: Record<string, TargetConfiguration & {
-        [ONLY_MODIFIES_EXISTING_TARGET]?: boolean;
-    }>;
-}, configurationSourceMaps?: ConfigurationSourceMaps, sourceInformation?: SourceInformation, skipTargetNormalization?: boolean): void;
+export declare function mergeProjectConfigurationIntoRootMap(projectRootMap: Record<string, ProjectConfiguration>, project: ProjectConfiguration, configurationSourceMaps?: ConfigurationSourceMaps, sourceInformation?: SourceInformation, skipTargetNormalization?: boolean): void;
 export declare function mergeMetadata<T = ProjectMetadata | TargetMetadata>(sourceMap: Record<string, [file: string, plugin: string]>, sourceInformation: [file: string, plugin: string], baseSourceMapPath: string, metadata: T, matchingMetadata?: T): T;
 export type ConfigurationResult = {
     /**
@@ -44,6 +39,7 @@ export declare function createProjectConfigurations(root: string, nxJson: NxJson
 plugins: LoadedNxPlugin[]): Promise<ConfigurationResult>;
 export declare function readProjectConfigurationsFromRootMap(projectRootMap: Record<string, ProjectConfiguration>): Record<string, ProjectConfiguration>;
 export declare function validateProject(project: ProjectConfiguration, knownProjects: Record<string, ProjectConfiguration>): void;
+export declare function mergeTargetDefaultWithTargetDefinition(targetName: string, project: ProjectConfiguration, targetDefault: Partial<TargetConfiguration>, sourceMap: Record<string, SourceInformation>): TargetConfiguration;
 /**
  * Merges two targets.
  *
@@ -68,4 +64,10 @@ export declare function mergeTargetConfigurations(target: TargetConfiguration, b
 export declare function isCompatibleTarget(a: TargetConfiguration, b: TargetConfiguration): boolean;
 export declare function resolveNxTokensInOptions<T extends Object | Array<unknown>>(object: T, project: ProjectConfiguration, key: string): T;
 export declare function readTargetDefaultsForTarget(targetName: string, targetDefaults: TargetDefaults, executor?: string): TargetDefaults[string];
+/**
+ * Expand's `command` syntactic sugar and replaces tokens in options.
+ * @param target The target to normalize
+ * @param project The project that the target belongs to
+ * @returns The normalized target configuration
+ */
 export declare function normalizeTarget(target: TargetConfiguration, project: ProjectConfiguration): TargetConfiguration<any>;