@nx/devkit 18.1.0 → 18.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "18.1.0",
+  "version": "18.1.1",
   "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"
+    "@nrwl/devkit": "18.1.1"
   },
   "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, shutdownPluginWorkers, } = (0, nx_1.requireNx)();
+const { Workspaces, readNxJsonFromDisk, retrieveProjectConfigurationsWithAngularProjects, } = (0, nx_1.requireNx)();
 /**
  * Convert an Nx Executor into an Angular Devkit Builder
  *
@@ -26,7 +26,6 @@ function convertNxExecutor(executor) {
                     workspaces.readProjectsConfigurations({
                         _includeProjectsFromAngularJson: true,
                     });
-            shutdownPluginWorkers?.();
             const context = {
                 root: builderContext.workspaceRoot,
                 projectName: builderContext.target.project,

package/src/utils/replace-project-configuration-with-plugin.d.ts

@@ -1,3 +1,2 @@
-import type { Tree } from 'nx/src/generators/tree';
-import type { CreateNodes } from 'nx/src/utils/nx-plugin';
+import type { Tree, CreateNodes } from 'nx/src/devkit-exports';
 export declare function replaceProjectConfigurationsWithPlugin<T = unknown>(tree: Tree, rootMappings: Map<string, string>, pluginPath: string, createNodes: CreateNodes<T>, pluginOptions: T): Promise<void>;

package/src/utils/replace-project-configuration-with-plugin.js

@@ -24,6 +24,7 @@ async function replaceProjectConfigurationsWithPlugin(tree, rootMappings, plugin
             const nodes = await createNodesFunction(configFile, pluginOptions, {
                 workspaceRoot: tree.root,
                 nxJsonConfiguration: readNxJson(tree),
+                configFiles,
             });
             const node = nodes.projects[Object.keys(nodes.projects)[0]];
             for (const [targetName, targetConfig] of Object.entries(node.targets)) {

package/src/utils/update-package-scripts.d.ts

@@ -1,3 +1,2 @@
-import type { Tree } from 'nx/src/generators/tree';
-import type { CreateNodes } from 'nx/src/utils/nx-plugin';
+import type { CreateNodes, Tree } from 'nx/src/devkit-exports';
 export declare function updatePackageScripts(tree: Tree, createNodesTuple: CreateNodes): Promise<void>;

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

@@ -8,14 +8,14 @@ const { glob, readJson, readNxJson, workspaceRoot, writeJson } = (0, nx_1.requir
 async function updatePackageScripts(tree, createNodesTuple) {
     const nxJson = readNxJson(tree);
     const [pattern, createNodes] = createNodesTuple;
-    const files = glob(tree, [pattern]);
-    for (const file of files) {
+    const matchingFiles = glob(tree, [pattern]);
+    for (const file of matchingFiles) {
         const projectRoot = getProjectRootFromConfigFile(file);
-        await processProject(tree, projectRoot, file, createNodes, nxJson);
+        await processProject(tree, projectRoot, file, createNodes, nxJson, matchingFiles);
     }
 }
 exports.updatePackageScripts = updatePackageScripts;
-async function processProject(tree, projectRoot, projectConfigurationFile, createNodesFunction, nxJsonConfiguration) {
+async function processProject(tree, projectRoot, projectConfigurationFile, createNodesFunction, nxJsonConfiguration, configFiles) {
     const packageJsonPath = `${projectRoot}/package.json`;
     if (!tree.exists(packageJsonPath)) {
         return;
@@ -24,14 +24,16 @@ async function processProject(tree, projectRoot, projectConfigurationFile, creat
     if (!packageJson.scripts || !Object.keys(packageJson.scripts).length) {
         return;
     }
-    const result = await createNodesFunction(projectConfigurationFile, {}, { nxJsonConfiguration, workspaceRoot });
+    const result = await createNodesFunction(projectConfigurationFile, {}, {
+        nxJsonConfiguration,
+        workspaceRoot,
+        configFiles,
+    });
     const targetCommands = getInferredTargetCommands(result);
     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 +44,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 +103,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 +174,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') {