@nx/js 16.4.1 → 16.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "16.4.1",
+  "version": "16.4.3",
   "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,9 +39,9 @@
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-typescript": "^7.15.0",
     "@babel/runtime": "^7.14.8",
-    "@nrwl/js": "16.4.1",
-    "@nx/devkit": "16.4.1",
-    "@nx/workspace": "16.4.1",
+    "@nrwl/js": "16.4.3",
+    "@nx/devkit": "16.4.3",
+    "@nx/workspace": "16.4.3",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",
@@ -69,5 +69,5 @@
     "access": "public"
   },
   "types": "./src/index.d.ts",
-  "gitHead": "544a10035930d24af38eef68b46dae8dc40ce261"
+  "gitHead": "30ea694c017a9e9956e007d009df18cf5347e6a5"
 }

package/src/executors/node/lib/kill-tree.js

@@ -21,7 +21,11 @@ function killTree(pid, signal) {
             };
             switch (process.platform) {
                 case 'win32':
-                    (0, child_process_1.exec)('taskkill /pid ' + pid + ' /T /F', callback);
+                    (0, child_process_1.exec)('taskkill /pid ' + pid + ' /T /F', (error) => {
+                        // Ignore Fatal errors (128) because it might be due to the process already being killed.
+                        // On Linux/Mac we can check ESRCH (no such process), but on Windows we can't.
+                        callback((error === null || error === void 0 ? void 0 : error.code) !== 128 ? error : null);
+                    });
                     break;
                 case 'darwin':
                     buildProcessTree(pid, tree, pidsToProcess, function (parentPid) {

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

@@ -146,44 +146,46 @@ function nodeExecutor(options, context) {
                 };
                 tasks.push(task);
             });
-            const stopWatch = yield client_1.daemonClient.registerFileWatcher({
-                watchProjects: [context.projectName],
-                includeDependentProjects: true,
-            }, (err, data) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                var _f;
-                if (err === 'closed') {
-                    devkit_1.logger.error(`Watch error: Daemon closed the connection`);
-                    process.exit(1);
-                }
-                else if (err) {
-                    devkit_1.logger.error(`Watch error: ${(_f = err === null || err === void 0 ? void 0 : err.message) !== null && _f !== void 0 ? _f : 'Unknown'}`);
-                }
-                else {
-                    devkit_1.logger.info(`NX File change detected. Restarting...`);
-                    yield addToQueue();
-                    yield debouncedProcessQueue();
-                }
-            }));
-            const stopAllTasks = (signal = 'SIGTERM') => {
-                for (const task of tasks) {
-                    task.stop(signal);
-                }
-            };
-            process.on('SIGTERM', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                stopWatch();
-                stopAllTasks('SIGTERM');
-                process.exit(128 + 15);
-            }));
-            process.on('SIGINT', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                stopWatch();
-                stopAllTasks('SIGINT');
-                process.exit(128 + 2);
-            }));
-            process.on('SIGHUP', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                stopWatch();
-                stopAllTasks('SIGHUP');
-                process.exit(128 + 1);
-            }));
+            if (options.watch) {
+                const stopWatch = yield client_1.daemonClient.registerFileWatcher({
+                    watchProjects: [context.projectName],
+                    includeDependentProjects: true,
+                }, (err, data) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    var _f;
+                    if (err === 'closed') {
+                        devkit_1.logger.error(`Watch error: Daemon closed the connection`);
+                        process.exit(1);
+                    }
+                    else if (err) {
+                        devkit_1.logger.error(`Watch error: ${(_f = err === null || err === void 0 ? void 0 : err.message) !== null && _f !== void 0 ? _f : 'Unknown'}`);
+                    }
+                    else {
+                        devkit_1.logger.info(`NX File change detected. Restarting...`);
+                        yield addToQueue();
+                        yield debouncedProcessQueue();
+                    }
+                }));
+                const stopAllTasks = (signal = 'SIGTERM') => {
+                    for (const task of tasks) {
+                        task.stop(signal);
+                    }
+                };
+                process.on('SIGTERM', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    stopWatch();
+                    stopAllTasks('SIGTERM');
+                    process.exit(128 + 15);
+                }));
+                process.on('SIGINT', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    stopWatch();
+                    stopAllTasks('SIGINT');
+                    process.exit(128 + 2);
+                }));
+                process.on('SIGHUP', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    stopWatch();
+                    stopAllTasks('SIGHUP');
+                    process.exit(128 + 1);
+                }));
+            }
             yield addToQueue();
             yield processQueue();
         })))));

package/src/executors/tsc/lib/batch/build-task-info-per-tsconfig-map.js

@@ -26,7 +26,7 @@ function processTasksAndPopulateTsConfigTaskInfoMap(tsConfigTaskInfoMap, tasksOp
         let taskOptions = (_a = tasksOptions[taskName]) !== null && _a !== void 0 ? _a : (0, get_task_options_1.getTaskWithTscExecutorOptions)(taskName, context);
         if (taskOptions) {
             const taskInfo = createTaskInfo(taskName, taskOptions, context, tsConfig);
-            const tsConfigPath = (0, path_1.join)(context.root, (0, path_1.relative)(context.root, taskOptions.tsConfig));
+            const tsConfigPath = (0, path_1.join)(context.root, (0, path_1.relative)(context.root, taskOptions.tsConfig)).replace(/\\/g, '/');
             tsConfigTaskInfoMap[tsConfigPath] = taskInfo;
             taskTsConfigCache.add(taskName);
         }

package/src/executors/tsc/lib/get-tsconfig.js

@@ -119,7 +119,7 @@ function getInMemoryTsConfig(tsConfig, taskOptions, projectReferences, dependent
         content: JSON.stringify(Object.assign(Object.assign({}, originalTsConfig), { compilerOptions: Object.assign(Object.assign({}, originalTsConfig.compilerOptions), { rootDir: taskOptions.rootDir, outDir: taskOptions.outputPath, composite: true, declaration: true, declarationMap: true, tsBuildInfoFile: (0, path_1.join)(taskOptions.outputPath, 'tsconfig.tsbuildinfo'), paths: dependentBuildableProjectNodes.length
                     ? (0, buildable_libs_utils_1.computeCompilerOptionsPaths)(tsConfig, dependentBuildableProjectNodes)
                     : (_b = originalTsConfig.compilerOptions) === null || _b === void 0 ? void 0 : _b.paths }), references: allProjectReferences.map((pr) => ({ path: pr })) })),
-        path: tsConfig,
+        path: tsConfig.replace(/\\/g, '/'),
     };
 }
 function findTaskWithTsConfig(tasks, context) {