@nx/js 19.6.0 → 19.7.0-canary.20240817-b91d788

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "19.6.0",
+  "version": "19.7.0-canary.20240817-b91d788",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -58,9 +58,9 @@
     "semver": "^7.5.3",
     "source-map-support": "0.5.19",
     "tslib": "^2.3.0",
-    "@nx/devkit": "19.6.0",
-    "@nx/workspace": "19.6.0",
-    "@nrwl/js": "19.6.0"
+    "@nx/devkit": "19.7.0-canary.20240817-b91d788",
+    "@nx/workspace": "19.7.0-canary.20240817-b91d788",
+    "@nrwl/js": "19.7.0-canary.20240817-b91d788"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/executors/node/node-with-require-overrides.d.ts

@@ -1,7 +1,4 @@
-declare const Module: any;
 declare const url: any;
-declare const originalLoader: any;
+declare const patchSigint: any;
+declare const patchRequire: any;
 declare const dynamicImport: Function;
-declare const mappings: any;
-declare const keys: string[];
-declare const fileToRun: any;

package/src/executors/node/node-with-require-overrides.js

@@ -1,21 +1,7 @@
-const Module = require('module');
 const url = require('node:url');
-const originalLoader = Module._load;
+const { patchSigint } = require('./patch-sigint');
+const { patchRequire } = require('./patch-require');
+patchSigint();
+patchRequire();
 const dynamicImport = new Function('specifier', 'return import(specifier)');
-const mappings = JSON.parse(process.env.NX_MAPPINGS);
-const keys = Object.keys(mappings);
-const fileToRun = url.pathToFileURL(process.env.NX_FILE_TO_RUN);
-Module._load = function (request, parent) {
-    if (!parent)
-        return originalLoader.apply(this, arguments);
-    const match = keys.find((k) => request === k);
-    if (match) {
-        const newArguments = [...arguments];
-        newArguments[0] = mappings[match];
-        return originalLoader.apply(this, newArguments);
-    }
-    else {
-        return originalLoader.apply(this, arguments);
-    }
-};
-dynamicImport(fileToRun);
+dynamicImport(url.pathToFileURL(process.env.NX_FILE_TO_RUN));

package/src/executors/node/node.impl.js

@@ -111,11 +111,14 @@ async function* nodeExecutor(options, context) {
                         task.childProcess.stderr.on('data', handleStdErr);
                         task.childProcess.once('exit', (code) => {
                             task.childProcess.off('data', handleStdErr);
-                            if (options.watch && !task.killed) {
+                            if (options.watch &&
+                                !task.killed &&
+                                // SIGINT should exist the process rather than watch for changes.
+                                code !== 130) {
                                 devkit_1.logger.info(`NX Process exited with code ${code}, waiting for changes to restart...`);
                             }
-                            if (!options.watch) {
-                                if (code !== 0) {
+                            if (!options.watch || code === 130) {
+                                if (code !== 0 && code !== 130) {
                                     error(new Error(`Process exited with code ${code}`));
                                 }
                                 else {

package/src/executors/node/patch-require.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Overrides require calls to map buildable workspace libs to their output location.
+ * This is useful for running programs compiled via TSC/SWC that aren't bundled.
+ */
+export declare function patchRequire(): void;

package/src/executors/node/patch-require.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.patchRequire = patchRequire;
+const Module = require('node:module');
+const originalLoader = Module._load;
+/**
+ * Overrides require calls to map buildable workspace libs to their output location.
+ * This is useful for running programs compiled via TSC/SWC that aren't bundled.
+ */
+function patchRequire() {
+    const mappings = JSON.parse(process.env.NX_MAPPINGS);
+    const keys = Object.keys(mappings);
+    Module._load = function (request, parent) {
+        if (!parent)
+            return originalLoader.apply(this, arguments);
+        const match = keys.find((k) => request === k);
+        if (match) {
+            const newArguments = [...arguments];
+            newArguments[0] = mappings[match];
+            return originalLoader.apply(this, newArguments);
+        }
+        else {
+            return originalLoader.apply(this, arguments);
+        }
+    };
+}

package/src/executors/node/patch-sigint.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Patches the current process so that Ctrl+C is properly handled.
+ * Without this patch, SIGINT or Ctrl+C does not wait for graceful shutdown and exits immediately.
+ */
+export declare function patchSigint(): void;

package/src/executors/node/patch-sigint.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.patchSigint = patchSigint;
+const readline = require('node:readline');
+/**
+ * Patches the current process so that Ctrl+C is properly handled.
+ * Without this patch, SIGINT or Ctrl+C does not wait for graceful shutdown and exits immediately.
+ */
+function patchSigint() {
+    readline.emitKeypressEvents(process.stdin);
+    if (process.stdin.isTTY)
+        process.stdin.setRawMode(true);
+    process.stdin.on('keypress', async (chunk, key) => {
+        if (key && key.ctrl && key.name === 'c') {
+            process.stdin.setRawMode(false); // To ensure nx terminal is not stuck in raw mode
+            const listeners = process.listeners('SIGINT');
+            for (const listener of listeners) {
+                await listener('SIGINT');
+            }
+            process.exit(130);
+        }
+    });
+    console.log('To exit the process, press Ctrl+C');
+}

package/src/executors/tsc/tsc.impl.js

@@ -29,11 +29,11 @@ function determineModuleFormatFromTsConfig(absolutePathToTsConfig) {
 }
 function createTypeScriptCompilationOptions(normalizedOptions, context) {
     return {
-        outputPath: normalizedOptions.outputPath,
+        outputPath: (0, devkit_1.joinPathFragments)(normalizedOptions.outputPath),
         projectName: context.projectName,
         projectRoot: normalizedOptions.projectRoot,
-        rootDir: normalizedOptions.rootDir,
-        tsConfig: normalizedOptions.tsConfig,
+        rootDir: (0, devkit_1.joinPathFragments)(normalizedOptions.rootDir),
+        tsConfig: (0, devkit_1.joinPathFragments)(normalizedOptions.tsConfig),
         watch: normalizedOptions.watch,
         deleteOutputPath: normalizedOptions.clean,
         getCustomTransformers: (0, lib_1.getCustomTrasformersFactory)(normalizedOptions.transformers),

package/src/generators/library/library.js

@@ -159,7 +159,7 @@ async function addProject(tree, options) {
             }
         }
         if (options.publishable) {
-            const packageRoot = (0, path_1.join)(defaultOutputDirectory, '{projectRoot}');
+            const packageRoot = (0, devkit_1.joinPathFragments)(defaultOutputDirectory, '{projectRoot}');
             projectConfiguration.targets ??= {};
             projectConfiguration.targets['nx-release-publish'] = {
                 options: {

package/src/generators/release-version/release-version.js

@@ -76,7 +76,7 @@ Valid values are: ${version_1.validReleaseVersionPrefixes
             if (!packageRoot) {
                 throw new Error(`The project "${projectName}" does not have a packageRoot available. Please report this issue on https://github.com/nrwl/nx`);
             }
-            const packageJsonPath = (0, node_path_1.join)(packageRoot, 'package.json');
+            const packageJsonPath = (0, devkit_1.joinPathFragments)(packageRoot, 'package.json');
             if (!tree.exists(packageJsonPath)) {
                 throw new Error(`The project "${projectName}" does not have a package.json available at ${packageJsonPath}.
 
@@ -544,7 +544,7 @@ To fix this you will either need to add a package.json file at that location, or
                 if (!dependencyPackageRoot) {
                     throw new Error(`The project "${dependencyProjectName}" does not have a packageRoot available. Please report this issue on https://github.com/nrwl/nx`);
                 }
-                const dependencyPackageJsonPath = (0, node_path_1.join)(dependencyPackageRoot, 'package.json');
+                const dependencyPackageJsonPath = (0, devkit_1.joinPathFragments)(dependencyPackageRoot, 'package.json');
                 const dependencyPackageJson = (0, devkit_1.readJson)(tree, dependencyPackageJsonPath);
                 updateDependentProjectAndAddToVersionData({
                     dependentProject: transitiveDependentProject,

package/src/utils/buildable-libs-utils.js

@@ -283,6 +283,9 @@ function updatePaths(dependencies, paths) {
     const pathsKeys = Object.keys(paths);
     // For each registered dependency
     dependencies.forEach((dep) => {
+        if (dep.node.type === 'npm') {
+            return;
+        }
         // If there are outputs
         if (dep.outputs && dep.outputs.length > 0) {
             // Directly map the dependency name to the output paths (dist/packages/..., etc.)
@@ -294,14 +297,19 @@ function updatePaths(dependencies, paths) {
                 // If the path points to the current dependency and is nested (/)
                 if (path.startsWith(nestedName)) {
                     const nestedPart = path.slice(nestedName.length);
-                    // Bind secondary endpoints for ng-packagr projects
+                    // Bind potential secondary endpoints for ng-packagr projects
                     let mappedPaths = dep.outputs.map((output) => `${output}/${nestedPart}`);
-                    // Get the dependency's package name
-                    const { root } = (dep.node?.data || {});
-                    if (root) {
-                        // Update nested mappings to point to the dependency's output paths
-                        mappedPaths = mappedPaths.concat(paths[path].flatMap((path) => dep.outputs.map((output) => path.replace(root, output))));
-                    }
+                    const { root } = dep.node.data;
+                    // Update nested mappings to point to the dependency's output paths
+                    mappedPaths = mappedPaths.concat(paths[path].flatMap((p) => dep.outputs.flatMap((output) => {
+                        const basePath = p.replace(root, output);
+                        return [
+                            // extension-less path to support compiled output
+                            basePath.replace(new RegExp(`${(0, path_1.extname)(basePath)}$`, 'gi'), ''),
+                            // original path with the root re-mapped to the output path
+                            basePath,
+                        ];
+                    })));
                     paths[path] = mappedPaths;
                 }
             }