@nx/devkit 18.1.0-beta.2 → 18.1.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "18.1.0-beta.2",
+  "version": "18.1.0-beta.4",
   "private": false,
   "description": "The Nx Devkit is used to customize Nx for different technologies and use cases. It contains many utility functions for reading and writing files, updating configuration, working with Abstract Syntax Trees(ASTs), and more. Learn more about [extending Nx by leveraging the Nx Devkit](https://nx.dev/extending-nx/intro/getting-started) on our docs.",
   "repository": {
@@ -35,7 +35,7 @@
     "tslib": "^2.3.0",
     "semver": "^7.5.3",
     "yargs-parser": "21.1.1",
-    "@nrwl/devkit": "18.1.0-beta.2"
+    "@nrwl/devkit": "18.1.0-beta.4"
   },
   "peerDependencies": {
     "nx": ">= 16 <= 18"

package/src/utils/convert-nx-executor.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertNxExecutor = void 0;
 const nx_1 = require("../../nx");
-const { Workspaces, readNxJsonFromDisk, retrieveProjectConfigurationsWithAngularProjects, } = (0, nx_1.requireNx)();
+const { Workspaces, readNxJsonFromDisk, retrieveProjectConfigurationsWithAngularProjects, shutdownPluginWorkers, } = (0, nx_1.requireNx)();
 /**
  * Convert an Nx Executor into an Angular Devkit Builder
  *
@@ -26,6 +26,7 @@ function convertNxExecutor(executor) {
                     workspaces.readProjectsConfigurations({
                         _includeProjectsFromAngularJson: true,
                     });
+            shutdownPluginWorkers?.();
             const context = {
                 root: builderContext.workspaceRoot,
                 projectName: builderContext.target.project,

package/src/utils/package-json.js

@@ -289,7 +289,7 @@ function ensurePackage(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion
         }
     }
     if (process.env.NX_DRY_RUN && process.env.NX_DRY_RUN !== 'false') {
-        throw new Error('NOTE: This generator does not support --dry-run. If you are running this in Nx Console, it should execute fine once you hit the "Run" button.\n');
+        throw new Error('NOTE: This generator does not support --dry-run. If you are running this in Nx Console, it should execute fine once you hit the "Generate" button.\n');
     }
     const { dir: tempDir } = createTempNpmDirectory?.() ?? {
         dir: (0, tmp_1.dirSync)().name,

package/src/utils/update-package-scripts.js

@@ -29,9 +29,7 @@ async function processProject(tree, projectRoot, projectConfigurationFile, creat
     if (!targetCommands.length) {
         return;
     }
-    // exclude package.json scripts from nx
-    packageJson.nx ??= {};
-    packageJson.nx.includedScripts ??= [];
+    const replacedTargets = new Set();
     for (const targetCommand of targetCommands) {
         const { command, target, configuration } = targetCommand;
         const targetCommandRegex = new RegExp(`(?<=^|&)((?: )*(?:[^&\\r\\n\\s]+ )*)(${command})((?: [^&\\r\\n\\s]+)*(?: )*)(?=$|&)`, 'g');
@@ -42,7 +40,7 @@ async function processProject(tree, projectRoot, projectConfigurationFile, creat
                 packageJson.scripts[scriptName] = script.replace(targetCommandRegex, configuration
                     ? `$1nx ${target} --configuration=${configuration}$3`
                     : `$1nx ${target}$3`);
-                excludeScriptFromPackageJson(packageJson, scriptName);
+                replacedTargets.add(target);
             }
             else {
                 /**
@@ -101,18 +99,37 @@ async function processProject(tree, projectRoot, projectConfigurationFile, creat
                         packageJson.scripts[scriptName] = packageJson.scripts[scriptName].replace(match, match.replace(commandRegex, configuration
                             ? `$1nx ${target} --configuration=${configuration}$4`
                             : `$1nx ${target}$4`));
+                        replacedTargets.add(target);
                     }
                     else {
                         // there are different args or the script has extra args, replace with the command leaving the args
                         packageJson.scripts[scriptName] = packageJson.scripts[scriptName].replace(match, match.replace(commandRegex, configuration
                             ? `$1nx ${target} --configuration=${configuration}$3`
                             : `$1nx ${target}$3`));
+                        replacedTargets.add(target);
                     }
-                    excludeScriptFromPackageJson(packageJson, scriptName);
                 }
             }
         }
     }
+    if (process.env.NX_RUNNING_NX_INIT === 'true') {
+        // running `nx init` so we want to exclude everything by default
+        packageJson.nx ??= {};
+        packageJson.nx.includedScripts = [];
+    }
+    else if (replacedTargets.size) {
+        /**
+         * Running `nx add`. In this case we want to:
+         * - if `includedScripts` is already set: exclude scripts that match inferred targets that were used to replace a script
+         * - if `includedScripts` is not set: set `includedScripts` with all scripts except the ones that match an inferred target that was used to replace a script
+         */
+        const includedScripts = packageJson.nx?.includedScripts ?? Object.keys(packageJson.scripts);
+        const filteredScripts = includedScripts.filter((s) => !replacedTargets.has(s));
+        if (filteredScripts.length !== includedScripts.length) {
+            packageJson.nx ??= {};
+            packageJson.nx.includedScripts = filteredScripts;
+        }
+    }
     writeJson(tree, packageJsonPath, packageJson);
 }
 function getInferredTargetCommands(result) {
@@ -153,9 +170,6 @@ function getInferredTargetCommands(result) {
     }
     return targetCommands;
 }
-function excludeScriptFromPackageJson(packageJson, scriptName) {
-    packageJson.nx.includedScripts = packageJson.nx.includedScripts.filter((s) => s !== scriptName);
-}
 function getProjectRootFromConfigFile(file) {
     let projectRoot = (0, path_1.dirname)(file);
     if ((0, path_1.basename)(projectRoot) === '.storybook') {