nx 19.4.0-rc.0 → 19.4.0-rc.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.4.0-rc.0",
+  "version": "19.4.0-rc.1",
   "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.4.0-rc.0"
+    "@nrwl/tao": "19.4.0-rc.1"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -85,16 +85,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.4.0-rc.0",
-    "@nx/nx-darwin-arm64": "19.4.0-rc.0",
-    "@nx/nx-linux-x64-gnu": "19.4.0-rc.0",
-    "@nx/nx-linux-x64-musl": "19.4.0-rc.0",
-    "@nx/nx-win32-x64-msvc": "19.4.0-rc.0",
-    "@nx/nx-linux-arm64-gnu": "19.4.0-rc.0",
-    "@nx/nx-linux-arm64-musl": "19.4.0-rc.0",
-    "@nx/nx-linux-arm-gnueabihf": "19.4.0-rc.0",
-    "@nx/nx-win32-arm64-msvc": "19.4.0-rc.0",
-    "@nx/nx-freebsd-x64": "19.4.0-rc.0"
+    "@nx/nx-darwin-x64": "19.4.0-rc.1",
+    "@nx/nx-darwin-arm64": "19.4.0-rc.1",
+    "@nx/nx-linux-x64-gnu": "19.4.0-rc.1",
+    "@nx/nx-linux-x64-musl": "19.4.0-rc.1",
+    "@nx/nx-win32-x64-msvc": "19.4.0-rc.1",
+    "@nx/nx-linux-arm64-gnu": "19.4.0-rc.1",
+    "@nx/nx-linux-arm64-musl": "19.4.0-rc.1",
+    "@nx/nx-linux-arm-gnueabihf": "19.4.0-rc.1",
+    "@nx/nx-win32-arm64-msvc": "19.4.0-rc.1",
+    "@nx/nx-freebsd-x64": "19.4.0-rc.1"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/plugins/js/package-json/create-package-json.js

@@ -10,6 +10,7 @@ const configuration_1 = require("../../../config/configuration");
 const nx_deps_cache_1 = require("../../../project-graph/nx-deps-cache");
 const path_1 = require("path");
 const task_hasher_1 = require("../../../hasher/task-hasher");
+const output_1 = require("../../../utils/output");
 /**
  * Creates a package.json in the output directory for support to install dependencies within containers.
  *
@@ -106,6 +107,19 @@ function createPackageJson(projectName, graph, options = {}, fileMap = null) {
     packageJson.dependencies &&= (0, object_sort_1.sortObjectByKeys)(packageJson.dependencies);
     packageJson.peerDependencies &&= (0, object_sort_1.sortObjectByKeys)(packageJson.peerDependencies);
     packageJson.peerDependenciesMeta &&= (0, object_sort_1.sortObjectByKeys)(packageJson.peerDependenciesMeta);
+    if (rootPackageJson.packageManager) {
+        if (packageJson.packageManager &&
+            packageJson.packageManager !== rootPackageJson.packageManager) {
+            output_1.output.warn({
+                title: 'Package Manager Mismatch',
+                bodyLines: [
+                    `The project ${projectName} has explicitly specified "packageManager" config of "${packageJson.packageManager}" but the workspace is using "${rootPackageJson.packageManager}".`,
+                    `Please remove the project level "packageManager" config or align it with the workspace root package.json.`,
+                ],
+            });
+        }
+        packageJson.packageManager = rootPackageJson.packageManager;
+    }
     return packageJson;
 }
 exports.createPackageJson = createPackageJson;

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

@@ -1,4 +1,3 @@
-import type { TsConfigOptions } from 'ts-node';
 import type { CompilerOptions } from 'typescript';
 /**
  * Optionally, if swc-node and tsconfig-paths are available in the current workspace, apply the require
@@ -24,7 +23,7 @@ export declare function registerTsProject(tsConfigPath: string): () => void;
  */
 export declare function registerTsProject(path: string, configFilename: string): any;
 export declare function getSwcTranspiler(compilerOptions: CompilerOptions): (...args: unknown[]) => unknown;
-export declare function getTsNodeTranspiler(compilerOptions: CompilerOptions, tsNodeOptions?: TsConfigOptions): (...args: unknown[]) => unknown;
+export declare function getTsNodeTranspiler(compilerOptions: CompilerOptions): (...args: unknown[]) => unknown;
 export declare function getTranspiler(compilerOptions: CompilerOptions, tsConfigRaw?: unknown): () => (...args: unknown[]) => unknown;
 /**
  * Register ts-node or swc-node given a set of compiler options.

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

@@ -7,7 +7,45 @@ const swcNodeInstalled = packageIsInstalled('@swc-node/register');
 const tsNodeInstalled = packageIsInstalled('ts-node/register');
 let ts;
 let isTsEsmLoaderRegistered = false;
+/**
+ * tsx is a utility to run TypeScript files in node which is growing in popularity:
+ * https://tsx.is
+ *
+ * Behind the scenes it is invoking node with relevant --require and --import flags.
+ *
+ * If the user is invoking Nx via a script which is being invoked via tsx, then we
+ * do not need to register any transpiler at all as the environment will have already
+ * been configured by tsx. In fact, registering a transpiler such as ts-node or swc
+ * in this case causes issues.
+ *
+ * Because node is being invoked by tsx, the tsx binary does not end up in the final
+ * process.argv and so we need to check a few possible things to account for usage
+ * via different package managers (e.g. pnpm does not set process._ to tsx, but rather
+ * pnpm itself, modern yarn does not set process._ at all etc.).
+ */
+const isInvokedByTsx = (() => {
+    if (process.env._?.endsWith(`${path_1.sep}tsx`)) {
+        return true;
+    }
+    const requireArgs = [];
+    const importArgs = [];
+    (process.execArgv ?? []).forEach((arg, i) => {
+        if (arg === '-r' || arg === '--require') {
+            requireArgs.push(process.execArgv[i + 1]);
+        }
+        if (arg === '--import') {
+            importArgs.push(process.execArgv[i + 1]);
+        }
+    });
+    const isTsxPath = (p) => p.includes(`${path_1.sep}tsx${path_1.sep}`);
+    return (requireArgs.some((a) => isTsxPath(a)) ||
+        importArgs.some((a) => isTsxPath(a)));
+})();
 function registerTsProject(path, configFilename) {
+    // See explanation alongside isInvokedByTsx declaration
+    if (isInvokedByTsx) {
+        return () => { };
+    }
     const tsConfigPath = configFilename ? (0, path_1.join)(path, configFilename) : path;
     const compilerOptions = readCompilerOptions(tsConfigPath);
     const cleanupFunctions = [
@@ -41,7 +79,13 @@ function getSwcTranspiler(compilerOptions) {
     return typeof cleanupFn === 'function' ? cleanupFn : () => { };
 }
 exports.getSwcTranspiler = getSwcTranspiler;
-function getTsNodeTranspiler(compilerOptions, tsNodeOptions) {
+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({
@@ -50,13 +94,14 @@ function getTsNodeTranspiler(compilerOptions, tsNodeOptions) {
         // 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) {
         warnTsNodeUsage();
     }
     return () => {
-        service.enabled(false);
+        // Do not cleanup ts-node service since other consumers may need it
     };
 }
 exports.getTsNodeTranspiler = getTsNodeTranspiler;
@@ -121,7 +166,7 @@ function getTranspiler(compilerOptions, tsConfigRaw) {
     // We can fall back on ts-node if it's available
     if (tsNodeInstalled) {
         const tsNodeOptions = filterRecognizedTsConfigTsNodeOptions(tsConfigRaw).recognized;
-        return () => getTsNodeTranspiler(compilerOptions, tsNodeOptions);
+        return () => getTsNodeTranspiler(compilerOptions);
     }
 }
 exports.getTranspiler = getTranspiler;

package/src/project-graph/utils/retrieve-workspace-files.d.ts

@@ -9,12 +9,12 @@ import { LoadedNxPlugin } from '../plugins/internal-api';
  * @param nxJson
  */
 export declare function retrieveWorkspaceFiles(workspaceRoot: string, projectRootMap: Record<string, string>): Promise<{
-    allWorkspaceFiles: import("nx/src/devkit-exports").FileData[];
+    allWorkspaceFiles: import("../file-utils").FileData[];
     fileMap: {
         projectFileMap: ProjectFiles;
-        nonProjectFiles: import("nx/src/native").FileData[];
+        nonProjectFiles: import("../../native").FileData[];
     };
-    rustReferences: import("nx/src/native").NxWorkspaceFilesExternals;
+    rustReferences: import("../../native").NxWorkspaceFilesExternals;
 }>;
 /**
  * Walk through the workspace and return `ProjectConfigurations`. Only use this if the projectFileMap is not needed.