@nrwl/js 14.5.0 → 14.5.3

package/CHANGELOG.md

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [14.5.0](https://github.com/nrwl/nx/compare/14.4.2...14.5.0) (2022-07-28)
+## [14.5.3](https://github.com/nrwl/nx/compare/14.5.2...14.5.3) (2022-08-04)
 
 **Note:** Version bump only for package @nrwl/js

package/executors.json

@@ -10,6 +10,11 @@
       "implementation": "./src/executors/swc/swc.impl",
       "schema": "./src/executors/swc/schema.json",
       "description": "Build a project using SWC."
+    },
+    "node": {
+      "implementation": "./src/executors/node/node.impl",
+      "schema": "./src/executors/node/schema.json",
+      "description": "Execute a Node application."
     }
   },
   "builders": {
@@ -22,6 +27,11 @@
       "implementation": "./src/executors/swc/compat",
       "schema": "./src/executors/swc/schema.json",
       "description": "Build a project using SWC."
+    },
+    "node": {
+      "implementation": "./src/executors/node/compat",
+      "schema": "./src/executors/node/schema.json",
+      "description": "Execute a Node application."
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/js",
-  "version": "14.5.0",
+  "version": "14.5.3",
   "description": "The Nx plugin that provides the best experience for developing JavaScript and TypeScript projects.",
   "repository": {
     "type": "git",
@@ -31,10 +31,10 @@
   "executors": "./executors.json",
   "builders": "./executors.json",
   "dependencies": {
-    "@nrwl/devkit": "14.5.0",
-    "@nrwl/jest": "14.5.0",
-    "@nrwl/linter": "14.5.0",
-    "@nrwl/workspace": "14.5.0",
+    "@nrwl/devkit": "14.5.3",
+    "@nrwl/jest": "14.5.3",
+    "@nrwl/linter": "14.5.3",
+    "@nrwl/workspace": "14.5.3",
     "@parcel/watcher": "2.0.4",
     "chalk": "4.1.0",
     "fast-glob": "3.2.7",
@@ -45,5 +45,5 @@
     "source-map-support": "0.5.19",
     "tree-kill": "1.2.2"
   },
-  "gitHead": "5bff9159df187bb60fabd11f1eb58c4d4d835afa"
+  "gitHead": "72106d0d81ff66f92d4cbb0459dd70cbe1c7aefa"
 }

package/src/executors/node/compat.d.ts

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

package/src/executors/node/compat.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nrwl/devkit");
+const node_impl_1 = require("./node.impl");
+exports.default = (0, devkit_1.convertNxExecutor)(node_impl_1.default);
+//# sourceMappingURL=compat.js.map

package/src/executors/node/compat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/compat.ts"],"names":[],"mappings":";;AAAA,yCAAiD;AACjD,2CAAuC;AAEvC,kBAAe,IAAA,0BAAiB,EAAC,mBAAY,CAAC,CAAC"}

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

@@ -0,0 +1,5 @@
+declare const Module: any;
+declare const originalLoader: any;
+declare const mappings: any;
+declare const keys: string[];
+declare const fileToRun: string;

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

@@ -0,0 +1,20 @@
+const Module = require('module');
+const originalLoader = Module._load;
+const mappings = JSON.parse(process.env.NX_MAPPINGS);
+const keys = Object.keys(mappings);
+const fileToRun = 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);
+    }
+};
+require(fileToRun);
+//# sourceMappingURL=node-with-require-overrides.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"node-with-require-overrides.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node-with-require-overrides.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACjC,MAAM,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC;AAEpC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AACrD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACnC,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;AAE7C,MAAM,CAAC,KAAK,GAAG,UAAU,OAAO,EAAE,MAAM;IACtC,IAAI,CAAC,MAAM;QAAE,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC;IAC9C,IAAI,KAAK,EAAE;QACT,MAAM,YAAY,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC;QACpC,YAAY,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClC,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;KACjD;SAAM;QACL,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;KAC9C;AACH,CAAC,CAAC;AAEF,OAAO,CAAC,SAAS,CAAC,CAAC"}

package/src/executors/node/node.impl.d.ts

@@ -0,0 +1,8 @@
+import { ExecutorContext } from '@nrwl/devkit';
+import { NodeExecutorOptions } from './schema';
+export interface ExecutorEvent {
+    outfile: string;
+    success: boolean;
+}
+export declare function nodeExecutor(options: NodeExecutorOptions, context: ExecutorContext): AsyncGenerator<ExecutorEvent, void, unknown>;
+export default nodeExecutor;

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

@@ -0,0 +1,177 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.nodeExecutor = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
+const child_process_1 = require("child_process");
+const hashing_impl_1 = require("nx/src/hasher/hashing-impl");
+const treeKill = require("tree-kill");
+const util_1 = require("util");
+const hasher = new hashing_impl_1.HashingImpl();
+const processMap = new Map();
+const hashedMap = new Map();
+function nodeExecutor(options, context) {
+    return tslib_1.__asyncGenerator(this, arguments, function* nodeExecutor_1() {
+        var e_1, _a;
+        process.on('SIGTERM', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            yield killCurrentProcess(options, 'SIGTERM');
+            process.exit(128 + 15);
+        }));
+        process.on('SIGINT', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            yield killCurrentProcess(options, 'SIGINT');
+            process.exit(128 + 2);
+        }));
+        process.on('SIGHUP', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            yield killCurrentProcess(options, 'SIGHUP');
+            process.exit(128 + 1);
+        }));
+        if (options.waitUntilTargets && options.waitUntilTargets.length > 0) {
+            const results = yield tslib_1.__await(runWaitUntilTargets(options, context));
+            for (const [i, result] of results.entries()) {
+                if (!result.success) {
+                    throw new Error(`Wait until target failed: ${options.waitUntilTargets[i]}.`);
+                }
+            }
+        }
+        const mappings = calculateResolveMappings(context, options);
+        try {
+            for (var _b = tslib_1.__asyncValues(startBuild(options, context)), _c; _c = yield tslib_1.__await(_b.next()), !_c.done;) {
+                const event = _c.value;
+                if (!event.success) {
+                    devkit_1.logger.error('There was an error with the build. See above.');
+                    devkit_1.logger.info(`${event.outfile} was not restarted.`);
+                }
+                yield tslib_1.__await(handleBuildEvent(event, options, mappings));
+                yield yield tslib_1.__await(event);
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) yield tslib_1.__await(_a.call(_b));
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+    });
+}
+exports.nodeExecutor = nodeExecutor;
+function calculateResolveMappings(context, options) {
+    const projectGraph = (0, devkit_1.readCachedProjectGraph)();
+    const parsed = (0, devkit_1.parseTargetString)(options.buildTarget);
+    const { dependencies } = (0, buildable_libs_utils_1.calculateProjectDependencies)(projectGraph, context.root, parsed.project, parsed.target, parsed.configuration);
+    return dependencies.reduce((m, c) => {
+        if (c.node.type !== 'npm' && c.outputs[0] != null) {
+            m[c.name] = (0, devkit_1.joinPathFragments)(context.root, c.outputs[0]);
+        }
+        return m;
+    }, {});
+}
+function runProcess(event, options, mappings) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const execArgv = getExecArgv(options);
+        const hashed = hasher.hashArray(execArgv.concat(options.args));
+        hashedMap.set(options.args, hashed);
+        const subProcess = (0, child_process_1.fork)((0, devkit_1.joinPathFragments)(__dirname, 'node-with-require-overrides'), options.args, {
+            execArgv,
+            stdio: 'inherit',
+            env: Object.assign(Object.assign({}, process.env), { NX_FILE_TO_RUN: event.outfile, NX_MAPPINGS: JSON.stringify(mappings) }),
+        });
+        processMap.set(hashed, subProcess);
+        if (!options.watch) {
+            return new Promise((resolve, reject) => {
+                subProcess.on('exit', (code) => {
+                    if (code === 0) {
+                        resolve(undefined);
+                    }
+                    else {
+                        reject();
+                    }
+                });
+            });
+        }
+    });
+}
+function getExecArgv(options) {
+    const args = [
+        '-r',
+        require.resolve('source-map-support/register'),
+        ...options.runtimeArgs,
+    ];
+    if (options.inspect === true) {
+        options.inspect = "inspect" /* InspectType.Inspect */;
+    }
+    if (options.inspect) {
+        args.push(`--${options.inspect}=${options.host}:${options.port}`);
+    }
+    return args;
+}
+function handleBuildEvent(event, options, mappings) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        // Don't kill previous run unless new build is successful.
+        if (options.watch && event.success) {
+            yield killCurrentProcess(options);
+        }
+        if (event.success) {
+            yield runProcess(event, options, mappings);
+        }
+    });
+}
+const promisifiedTreeKill = (0, util_1.promisify)(treeKill);
+function killCurrentProcess(options, signal = 'SIGTERM') {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const currentProcessKey = hashedMap.get(options.args);
+        if (!currentProcessKey)
+            return;
+        const currentProcess = processMap.get(currentProcessKey);
+        if (!currentProcess)
+            return;
+        try {
+            yield promisifiedTreeKill(currentProcess.pid, signal);
+            // if the currentProcess.killed is false, invoke kill()
+            // to properly send the signal to the process
+            if (!currentProcess.killed) {
+                currentProcess.kill(signal);
+            }
+        }
+        catch (err) {
+            if (Array.isArray(err) && err[0] && err[2]) {
+                const errorMessage = err[2];
+                devkit_1.logger.error(errorMessage);
+            }
+            else if (err.message) {
+                devkit_1.logger.error(err.message);
+            }
+        }
+        finally {
+            processMap.delete(currentProcessKey);
+            hashedMap.delete(options.args);
+        }
+    });
+}
+function startBuild(options, context) {
+    var _a;
+    return tslib_1.__asyncGenerator(this, arguments, function* startBuild_1() {
+        const buildTarget = (0, devkit_1.parseTargetString)(options.buildTarget);
+        // TODO(jack): [Nx 14] Remove this line once we generate `development` configuration by default + add migration for it if missing
+        (_a = buildTarget.configuration) !== null && _a !== void 0 ? _a : (buildTarget.configuration = '');
+        yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(yield tslib_1.__await((0, devkit_1.runExecutor)(buildTarget, Object.assign(Object.assign({}, options.buildTargetOptions), { watch: options.watch }), context)))));
+    });
+}
+function runWaitUntilTargets(options, context) {
+    return Promise.all(options.waitUntilTargets.map((waitUntilTarget) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const target = (0, devkit_1.parseTargetString)(waitUntilTarget);
+        const output = yield (0, devkit_1.runExecutor)(target, {}, context);
+        return new Promise((resolve) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let event = yield output.next();
+            // Resolve after first event
+            resolve(event.value);
+            // Continue iterating
+            while (!event.done) {
+                event = yield output.next();
+            }
+        }));
+    })));
+}
+exports.default = nodeExecutor;
+//# sourceMappingURL=node.impl.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"node.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node.impl.ts"],"names":[],"mappings":"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"}

package/src/executors/node/schema.d.ts

@@ -0,0 +1,16 @@
+export const enum InspectType {
+  Inspect = 'inspect',
+  InspectBrk = 'inspect-brk',
+}
+
+export interface NodeExecutorOptions {
+  inspect: boolean | InspectType;
+  runtimeArgs: string[];
+  args: string[];
+  waitUntilTargets: string[];
+  buildTarget: string;
+  buildTargetOptions: Record<string, any>;
+  host: string;
+  port: number;
+  watch?: boolean;
+}

package/src/executors/node/schema.json

@@ -0,0 +1,72 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "cli": "nx",
+  "title": "Node executor",
+  "description": "Execute Nodejs applications.",
+  "type": "object",
+  "properties": {
+    "buildTarget": {
+      "type": "string",
+      "description": "The target to run to build you the app."
+    },
+    "buildTargetOptions": {
+      "type": "object",
+      "description": "Additional options to pass into the build target.",
+      "default": {}
+    },
+    "waitUntilTargets": {
+      "type": "array",
+      "description": "The targets to run to before starting the node app.",
+      "default": [],
+      "items": {
+        "type": "string"
+      }
+    },
+    "host": {
+      "type": "string",
+      "default": "localhost",
+      "description": "The host to inspect the process on."
+    },
+    "port": {
+      "type": "number",
+      "default": 9229,
+      "description": "The port to inspect the process on. Setting port to 0 will assign random free ports to all forked processes."
+    },
+    "inspect": {
+      "oneOf": [
+        {
+          "type": "string",
+          "enum": ["inspect", "inspect-brk"]
+        },
+        {
+          "type": "boolean"
+        }
+      ],
+      "description": "Ensures the app is starting with debugging.",
+      "default": "inspect"
+    },
+    "runtimeArgs": {
+      "type": "array",
+      "description": "Extra args passed to the node process.",
+      "default": [],
+      "items": {
+        "type": "string"
+      }
+    },
+    "args": {
+      "type": "array",
+      "description": "Extra args when starting the app.",
+      "default": [],
+      "items": {
+        "type": "string"
+      }
+    },
+    "watch": {
+      "type": "boolean",
+      "description": "Enable re-building when files change.",
+      "default": true
+    }
+  },
+  "additionalProperties": false,
+  "required": ["buildTarget"]
+}

package/src/utils/swc/compile-swc.js

@@ -118,6 +118,9 @@ function compileSwcWatch(context, normalizedOptions, postCompilationCallback) {
             });
             stderrOnData = (err) => {
                 process.stderr.write(err);
+                if (err.includes('Debugger attached.')) {
+                    return;
+                }
                 next(getResult(false));
             };
             watcherOnExit = () => {

package/src/utils/swc/compile-swc.js.map

@@ -1 +1 @@
-{"version":3,"file":"compile-swc.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/swc/compile-swc.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compile-swc.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/swc/compile-swc.ts"],"names":[],"mappings":"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"}