@nx/js 22.3.3 → 22.4.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "22.3.3",
+  "version": "22.4.0-beta.1",
   "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": "22.3.3",
-    "@nx/workspace": "22.3.3",
+    "@nx/devkit": "22.4.0-beta.1",
+    "@nx/workspace": "22.4.0-beta.1",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",
@@ -60,7 +60,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.3.3"
+    "nx": "22.4.0-beta.1"
   },
   "peerDependencies": {
     "verdaccio": "^6.0.5"

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

@@ -1 +1 @@
-{"version":3,"file":"node.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node.impl.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EAQhB,MAAM,YAAY,CAAC;AAOpB,OAAO,EAAe,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAqB5D,wBAAuB,YAAY,CACjC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,eAAe;aAgEb,OAAO;cACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;cAqQhC;AA+HD,eAAe,YAAY,CAAC"}
+{"version":3,"file":"node.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node.impl.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EAQhB,MAAM,YAAY,CAAC;AAOpB,OAAO,EAAe,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAqB5D,wBAAuB,YAAY,CACjC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,eAAe;aAgEb,OAAO;cACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;cA6QhC;AA+HD,eAAe,YAAY,CAAC"}

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

@@ -231,8 +231,16 @@ async function* nodeExecutor(options, context) {
                     watchProjects: [context.projectName],
                     includeDependentProjects: true,
                 }, async (err, data) => {
-                    if (err === 'closed') {
-                        devkit_1.logger.error(`Watch error: Daemon closed the connection`);
+                    if (err === 'reconnecting') {
+                        // Silent - daemon restarts automatically on lockfile changes
+                        return;
+                    }
+                    else if (err === 'reconnected') {
+                        // Silent - reconnection succeeded
+                        return;
+                    }
+                    else if (err === 'closed') {
+                        devkit_1.logger.error(`Failed to reconnect to daemon after multiple attempts`);
                         process.exit(1);
                     }
                     else if (err) {

package/src/executors/tsc/lib/batch/watch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/js/src/executors/tsc/lib/batch/watch.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,wBAAsB,uCAAuC,CAC3D,SAAS,EAAE,QAAQ,EAAE,EACrB,QAAQ,EAAE,CAAC,gBAAgB,EAAE,QAAQ,EAAE,KAAK,IAAI,GAC/C,OAAO,CAAC,MAAM,IAAI,CAAC,CAgCrB;AAED,wBAAsB,qCAAqC,CACzD,SAAS,EAAE,QAAQ,EAAE,GACpB,OAAO,CAAC,MAAM,IAAI,CAAC,CAsBrB"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/js/src/executors/tsc/lib/batch/watch.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,wBAAsB,uCAAuC,CAC3D,SAAS,EAAE,QAAQ,EAAE,EACrB,QAAQ,EAAE,CAAC,gBAAgB,EAAE,QAAQ,EAAE,KAAK,IAAI,GAC/C,OAAO,CAAC,MAAM,IAAI,CAAC,CAsCrB;AAED,wBAAsB,qCAAqC,CACzD,SAAS,EAAE,QAAQ,EAAE,GACpB,OAAO,CAAC,MAAM,IAAI,CAAC,CA4BrB"}

package/src/executors/tsc/lib/batch/watch.js

@@ -13,8 +13,16 @@ async function watchTaskProjectsPackageJsonFileChanges(taskInfos, callback) {
         packageJsonTaskInfoMap.set((0, path_1.join)(t.options.projectRoot, 'package.json'), t);
     });
     const unregisterFileWatcher = await client_1.daemonClient.registerFileWatcher({ watchProjects: projects }, (err, data) => {
-        if (err === 'closed') {
-            devkit_1.logger.error(`Watch error: Daemon closed the connection`);
+        if (err === 'reconnecting') {
+            // Silent - daemon restarts automatically on lockfile changes
+            return;
+        }
+        else if (err === 'reconnected') {
+            // Silent - reconnection succeeded
+            return;
+        }
+        else if (err === 'closed') {
+            devkit_1.logger.error(`Failed to reconnect to daemon after multiple attempts`);
             process.exit(1);
         }
         else if (err) {
@@ -40,8 +48,16 @@ async function watchTaskProjectsFileChangesForAssets(taskInfos) {
         includeDependentProjects: true,
         includeGlobalWorkspaceFiles: true,
     }, (err, data) => {
-        if (err === 'closed') {
-            devkit_1.logger.error(`Watch error: Daemon closed the connection`);
+        if (err === 'reconnecting') {
+            // Silent - daemon restarts automatically on lockfile changes
+            return;
+        }
+        else if (err === 'reconnected') {
+            // Silent - reconnection succeeded
+            return;
+        }
+        else if (err === 'closed') {
+            devkit_1.logger.error(`Failed to reconnect to daemon after multiple attempts`);
             process.exit(1);
         }
         else if (err) {

package/src/utils/assets/copy-assets-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"copy-assets-handler.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/assets/copy-assets-handler.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,WAAW,EAAgB,MAAM,6BAA6B,CAAC;AAGxE,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAE3D,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,aAAa,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,uBAAuB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC/B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,IAAI,CAAC;IACzC,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAWD,eAAO,MAAM,uBAAuB,GAAI,QAAQ,SAAS,EAAE,SAiB1D,CAAC;AAEF,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAe;IAC1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4B;IACnD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgC;IACzD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAU;gBAElC,IAAI,EAAE,uBAAuB;IA2DnC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3C,wBAAwB,IAAI,IAAI;IAgBhC,OAAO,CAAC,yBAAyB;IAa3B,4BAA4B,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC;IAqBnD,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiC9D,OAAO,CAAC,YAAY;IAmBpB,OAAO,CAAC,qBAAqB;CAG9B"}
+{"version":3,"file":"copy-assets-handler.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/assets/copy-assets-handler.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,WAAW,EAAgB,MAAM,6BAA6B,CAAC;AAGxE,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAE3D,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,aAAa,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,uBAAuB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC/B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,IAAI,CAAC;IACzC,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAWD,eAAO,MAAM,uBAAuB,GAAI,QAAQ,SAAS,EAAE,SAiB1D,CAAC;AAEF,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAe;IAC1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4B;IACnD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgC;IACzD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAU;gBAElC,IAAI,EAAE,uBAAuB;IA2DnC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3C,wBAAwB,IAAI,IAAI;IAgBhC,OAAO,CAAC,yBAAyB;IAa3B,4BAA4B,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC;IA2BnD,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiC9D,OAAO,CAAC,YAAY;IAmBpB,OAAO,CAAC,qBAAqB;CAG9B"}

package/src/utils/assets/copy-assets-handler.js

@@ -126,8 +126,16 @@ class CopyAssetsHandler {
             watchProjects: 'all',
             includeGlobalWorkspaceFiles: true,
         }, (err, data) => {
-            if (err === 'closed') {
-                devkit_1.logger.error(`Watch error: Daemon closed the connection`);
+            if (err === 'reconnecting') {
+                // Silent - daemon restarts automatically on lockfile changes
+                return;
+            }
+            else if (err === 'reconnected') {
+                // Silent - reconnection succeeded
+                return;
+            }
+            else if (err === 'closed') {
+                devkit_1.logger.error(`Failed to reconnect to daemon after multiple attempts`);
                 process.exit(1);
             }
             else if (err) {

package/src/utils/typescript/plugin.d.ts

@@ -1,4 +1,3 @@
 import type { NxJsonConfiguration } from '@nx/devkit';
 export declare function ensureProjectIsIncludedInPluginRegistrations(nxJson: NxJsonConfiguration, projectRoot: string, buildTargetName: string | null): void;
-export declare function ensureProjectIsExcludedFromPluginRegistrations(nxJson: NxJsonConfiguration, projectRoot: string): void;
 //# sourceMappingURL=plugin.d.ts.map

package/src/utils/typescript/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,mBAAmB,EACpB,MAAM,YAAY,CAAC;AAIpB,wBAAgB,4CAA4C,CAC1D,MAAM,EAAE,mBAAmB,EAC3B,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GAAG,IAAI,GAC7B,IAAI,CAmGN;AAED,wBAAgB,8CAA8C,CAC5D,MAAM,EAAE,mBAAmB,EAC3B,WAAW,EAAE,MAAM,GAClB,IAAI,CAyCN"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,mBAAmB,EACpB,MAAM,YAAY,CAAC;AAIpB,wBAAgB,4CAA4C,CAC1D,MAAM,EAAE,mBAAmB,EAC3B,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GAAG,IAAI,GAC7B,IAAI,CAmGN"}

package/src/utils/typescript/plugin.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureProjectIsIncludedInPluginRegistrations = ensureProjectIsIncludedInPluginRegistrations;
-exports.ensureProjectIsExcludedFromPluginRegistrations = ensureProjectIsExcludedFromPluginRegistrations;
 const devkit_internals_1 = require("nx/src/devkit-internals");
 function ensureProjectIsIncludedInPluginRegistrations(nxJson, projectRoot, buildTargetName) {
     nxJson.plugins ??= [];
@@ -14,7 +13,7 @@ function ensureProjectIsIncludedInPluginRegistrations(nxJson, projectRoot, build
         }
         if (typeof registration === 'string') {
             if (buildTargetName) {
-                // if it's a string all projects are included but the are no user-specified options
+                // if it's a string all projects are included but there are no user-specified options
                 // and the build task is not inferred by default, so we need to exclude it
                 nxJson.plugins[index] = {
                     plugin: '@nx/js/typescript',
@@ -87,38 +86,6 @@ function ensureProjectIsIncludedInPluginRegistrations(nxJson, projectRoot, build
         nxJson.plugins.push(registration);
     }
 }
-function ensureProjectIsExcludedFromPluginRegistrations(nxJson, projectRoot) {
-    if (!nxJson.plugins?.length ||
-        !nxJson.plugins.some(isTypeScriptPluginRegistration)) {
-        return;
-    }
-    let index = 0;
-    for (const registration of nxJson.plugins) {
-        if (!isTypeScriptPluginRegistration(registration)) {
-            index++;
-            continue;
-        }
-        if (typeof registration === 'string') {
-            // if it's a string, it includes all projects, so we need to exclude it
-            nxJson.plugins[index] = {
-                plugin: '@nx/js/typescript',
-                exclude: [`${projectRoot}/*`],
-            };
-        }
-        else {
-            // check if the project would be included by the plugin registration
-            const matchingConfigFiles = (0, devkit_internals_1.findMatchingConfigFiles)([`${projectRoot}/tsconfig.json`], '**/tsconfig.json', registration.include, registration.exclude);
-            if (matchingConfigFiles.length &&
-                (registration.options?.typecheck !== false ||
-                    registration.options?.build)) {
-                // the project is included by a plugin registration that infers any of the targets, so we need to exclude it
-                registration.exclude ??= [];
-                registration.exclude.push(`${projectRoot}/*`);
-            }
-        }
-        index++;
-    }
-}
 function isTypeScriptPluginRegistration(plugin) {
     return ((typeof plugin === 'string' && plugin === '@nx/js/typescript') ||
         (typeof plugin !== 'string' && plugin.plugin === '@nx/js/typescript'));
@@ -128,7 +95,13 @@ function matchesBuildTargetDefinition(buildOptions, buildTargetName) {
         return !buildTargetName;
     }
     if (!buildTargetName) {
-        return false;
+        // we don't want a build target to be inferred, in which case we'll generate
+        // the package.json with the entry points pointing to source, so, as long as
+        // we don't skip the build check, this registration is valid even if it has
+        // build options defined
+        return typeof buildOptions === 'object'
+            ? !buildOptions.skipBuildCheck
+            : true;
     }
     if (buildOptions === true && buildTargetName === 'build') {
         return true;

package/src/utils/watch-for-single-file-changes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watch-for-single-file-changes.d.ts","sourceRoot":"","sources":["../../../../../packages/js/src/utils/watch-for-single-file-changes.ts"],"names":[],"mappings":"AAIA,wBAAsB,yBAAyB,CAC7C,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,IAAI,GACnB,OAAO,CAAC,MAAM,IAAI,CAAC,CAoBrB"}
+{"version":3,"file":"watch-for-single-file-changes.d.ts","sourceRoot":"","sources":["../../../../../packages/js/src/utils/watch-for-single-file-changes.ts"],"names":[],"mappings":"AAIA,wBAAsB,yBAAyB,CAC7C,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,IAAI,GACnB,OAAO,CAAC,MAAM,IAAI,CAAC,CA0BrB"}

package/src/utils/watch-for-single-file-changes.js

@@ -6,8 +6,16 @@ const client_1 = require("nx/src/daemon/client/client");
 const path_1 = require("path");
 async function watchForSingleFileChanges(projectName, projectRoot, relativeFilePath, callback) {
     const unregisterFileWatcher = await client_1.daemonClient.registerFileWatcher({ watchProjects: [projectName] }, (err, data) => {
-        if (err === 'closed') {
-            devkit_1.logger.error(`Watch error: Daemon closed the connection`);
+        if (err === 'reconnecting') {
+            // Silent - daemon restarts automatically on lockfile changes
+            return;
+        }
+        else if (err === 'reconnected') {
+            // Silent - reconnection succeeded
+            return;
+        }
+        else if (err === 'closed') {
+            devkit_1.logger.error(`Failed to reconnect to daemon after multiple attempts`);
             process.exit(1);
         }
         else if (err) {