@nx/js 19.4.0 → 19.5.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "19.4.0",
+  "version": "19.5.0-beta.0",
   "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.4.0",
-    "@nx/workspace": "19.4.0",
-    "@nrwl/js": "19.4.0"
+    "@nx/devkit": "19.5.0-beta.0",
+    "@nx/workspace": "19.5.0-beta.0",
+    "@nrwl/js": "19.5.0-beta.0"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

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

@@ -188,22 +188,27 @@ async function* nodeExecutor(options, context) {
                 await addToQueue(childProcess, whenReady);
                 await debouncedProcessQueue();
             };
-            additionalExitHandler = await client_1.daemonClient.registerFileWatcher({
-                watchProjects: [context.projectName],
-                includeDependentProjects: true,
-            }, async (err, data) => {
-                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: ${err?.message ?? 'Unknown'}`);
-                }
-                else {
-                    devkit_1.logger.info(`NX File change detected. Restarting...`);
-                    await runBuild();
-                }
-            });
+            if ((0, devkit_1.isDaemonEnabled)()) {
+                additionalExitHandler = await client_1.daemonClient.registerFileWatcher({
+                    watchProjects: [context.projectName],
+                    includeDependentProjects: true,
+                }, async (err, data) => {
+                    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: ${err?.message ?? 'Unknown'}`);
+                    }
+                    else {
+                        devkit_1.logger.info(`NX File change detected. Restarting...`);
+                        await runBuild();
+                    }
+                });
+            }
+            else {
+                devkit_1.logger.warn(`NX Daemon is not running. Node process will not restart automatically after file changes.`);
+            }
             await runBuild(); // run first build
         }
         else {

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

@@ -66,7 +66,12 @@ async function* tscBatchExecutor(taskGraph, inputs, overrides, context) {
         },
         afterProjectCompilationCallback: processTaskPostCompilation,
     });
-    if (shouldWatch) {
+    if (shouldWatch && !(0, devkit_1.isDaemonEnabled)()) {
+        devkit_1.output.warn({
+            title: 'Nx Daemon is not enabled. Assets and package.json files will not be updated on file changes.',
+        });
+    }
+    if (shouldWatch && (0, devkit_1.isDaemonEnabled)()) {
         const taskInfos = Object.values(tsConfigTaskInfoMap);
         const watchAssetsChangesDisposer = await (0, batch_1.watchTaskProjectsFileChangesForAssets)(taskInfos);
         const watchProjectsChangesDisposer = await (0, batch_1.watchTaskProjectsPackageJsonFileChanges)(taskInfos, (changedTaskInfos) => {

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tscExecutor = exports.createTypeScriptCompilationOptions = exports.determineModuleFormatFromTsConfig = void 0;
 const ts = require("typescript");
+const devkit_1 = require("@nx/devkit");
 const copy_assets_handler_1 = require("../../utils/assets/copy-assets-handler");
 const check_dependencies_1 = require("../../utils/check-dependencies");
 const compiler_helper_dependency_1 = require("../../utils/compiler-helper-dependency");
@@ -72,7 +73,12 @@ async function* tscExecutor(_options, context) {
         }, context, target, dependencies);
         (0, inline_1.postProcessInlinedDependencies)(tsCompilationOptions.outputPath, tsCompilationOptions.projectRoot, inlineProjectGraph);
     });
-    if (options.watch) {
+    if (!(0, devkit_1.isDaemonEnabled)() && options.watch) {
+        devkit_1.output.warn({
+            title: 'Nx Daemon is not enabled. Assets and package.json files will not be updated when files change.',
+        });
+    }
+    if ((0, devkit_1.isDaemonEnabled)() && options.watch) {
         const disposeWatchAssetChanges = await assetHandler.watchAndProcessOnAssetChange();
         const disposePackageJsonChanges = await (0, watch_for_single_file_changes_1.watchForSingleFileChanges)(context.projectName, options.projectRoot, 'package.json', () => (0, update_package_json_1.updatePackageJson)({
             ...options,

package/src/plugins/typescript/plugin.js

@@ -145,7 +145,7 @@ function getInputs(namedInputs, configFilePath, tsConfig, internalProjectReferen
     });
     const inputs = [];
     if (includePaths.size) {
-        inputs.push(...Array.from(configFiles).map((p) => pathToInputOrOutput(p, workspaceRoot, projectRoot)), ...Array.from(includePaths).map((p) => (0, devkit_1.joinPathFragments)('{projectRoot}', p)));
+        inputs.push(...Array.from(configFiles).map((p) => pathToInputOrOutput(p, workspaceRoot, projectRoot)), ...Array.from(includePaths).map((p) => pathToInputOrOutput((0, devkit_1.joinPathFragments)(projectRoot, p), workspaceRoot, projectRoot)));
     }
     else {
         // If we couldn't identify any include paths, we default to the default
@@ -153,7 +153,7 @@ function getInputs(namedInputs, configFilePath, tsConfig, internalProjectReferen
         inputs.push('production' in namedInputs ? 'production' : 'default');
     }
     if (excludePaths.size) {
-        inputs.push(...Array.from(excludePaths).map((p) => `!${(0, devkit_1.joinPathFragments)('{projectRoot}', p)}`));
+        inputs.push(...Array.from(excludePaths).map((p) => `!${pathToInputOrOutput((0, devkit_1.joinPathFragments)(projectRoot, p), workspaceRoot, projectRoot)}`));
     }
     if (hasExternalProjectReferences(configFilePath, tsConfig)) {
         // Importing modules from a referenced project will load its output declaration files (d.ts)

package/src/utils/assets/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.copyAssets = void 0;
 const copy_assets_handler_1 = require("./copy-assets-handler");
+const devkit_1 = require("@nx/devkit");
 async function copyAssets(options, context) {
     const assetHandler = new copy_assets_handler_1.CopyAssetsHandler({
         projectDir: context.projectsConfigurations.projects[context.projectName].root,
@@ -13,7 +14,12 @@ async function copyAssets(options, context) {
     const result = {
         success: true,
     };
-    if (options.watch) {
+    if (!(0, devkit_1.isDaemonEnabled)() && options.watch) {
+        devkit_1.output.warn({
+            title: 'Nx Daemon is not enabled. Assets will not be updated when they are changed.',
+        });
+    }
+    if ((0, devkit_1.isDaemonEnabled)() && options.watch) {
         result.stop = await assetHandler.watchAndProcessOnAssetChange();
     }
     try {