@nx/js 19.7.0-beta.4 → 19.7.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "19.7.0-beta.4",
+  "version": "19.7.0-beta.5",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -39,8 +39,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "19.7.0-beta.4",
-    "@nx/workspace": "19.7.0-beta.4",
+    "@nx/devkit": "19.7.0-beta.5",
+    "@nx/workspace": "19.7.0-beta.5",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.1",
@@ -61,7 +61,7 @@
     "ts-node": "10.9.1",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nrwl/js": "19.7.0-beta.4"
+    "@nrwl/js": "19.7.0-beta.5"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

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

@@ -1,4 +1,7 @@
+declare const Module: any;
 declare const url: any;
-declare const patchSigint: any;
-declare const patchRequire: any;
+declare const originalLoader: 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,7 +1,21 @@
+const Module = require('module');
 const url = require('node:url');
-const { patchSigint } = require('./patch-sigint');
-const { patchRequire } = require('./patch-require');
-patchSigint();
-patchRequire();
+const originalLoader = Module._load;
 const dynamicImport = new Function('specifier', 'return import(specifier)');
-dynamicImport(url.pathToFileURL(process.env.NX_FILE_TO_RUN));
+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);

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

@@ -111,14 +111,11 @@ 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 &&
-                                // SIGINT should exist the process rather than watch for changes.
-                                code !== 130) {
+                            if (options.watch && !task.killed) {
                                 devkit_1.logger.info(`NX Process exited with code ${code}, waiting for changes to restart...`);
                             }
-                            if (!options.watch || code === 130) {
-                                if (code !== 0 && code !== 130) {
+                            if (!options.watch) {
+                                if (code !== 0) {
                                     error(new Error(`Process exited with code ${code}`));
                                 }
                                 else {

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

@@ -1,5 +0,0 @@
-/**
- * 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

@@ -1,26 +0,0 @@
-"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

@@ -1,5 +0,0 @@
-/**
- * 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

@@ -1,24 +0,0 @@
-"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');
-}