@nx/devkit 22.7.0-beta.1 → 22.7.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "22.7.0-beta.1",
+  "version": "22.7.0-beta.2",
   "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": {
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "jest": "^30.0.2",
-    "nx": "22.7.0-beta.1"
+    "nx": "22.7.0-beta.2"
   },
   "peerDependencies": {
     "nx": ">= 21 <= 23 || ^22.0.0-0"

package/project.json

@@ -7,7 +7,12 @@
         "build": {
             "outputs": ["{workspaceRoot}/dist/packages/devkit/README.md"],
             "command": "node ./scripts/copy-readme.js devkit",
-            "dependsOn": ["^build", "build-base", "legacy-post-build"]
+            "dependsOn": [
+                "^build",
+                "nx:legacy-post-build",
+                "build-base",
+                "legacy-post-build"
+            ]
         },
         "legacy-post-build": {
             "executor": "@nx/workspace-plugin:legacy-post-build",

package/src/executors/parse-target-string.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-target-string.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/executors/parse-target-string.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,YAAY,EAEZ,MAAM,EACP,MAAM,uBAAuB,CAAC;AAG/B;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,YAAY,GACzB,MAAM,CAAC;AACV;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,eAAe,GACnB,MAAM,CAAC;AA2CV;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAAC,EACnC,OAAO,EACP,MAAM,EACN,aAAa,GACd,EAAE,MAAM,GAAG,MAAM,CAIjB"}
+{"version":3,"file":"parse-target-string.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/executors/parse-target-string.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,YAAY,EAEZ,MAAM,EACP,MAAM,uBAAuB,CAAC;AAG/B;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,YAAY,GACzB,MAAM,CAAC;AACV;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,eAAe,GACnB,MAAM,CAAC;AAiDV;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAAC,EACnC,OAAO,EACP,MAAM,EACN,aAAa,GACd,EAAE,MAAM,GAAG,MAAM,CAIjB"}

package/src/executors/parse-target-string.js

@@ -23,7 +23,10 @@ function parseTargetString(targetString, projectGraphOrCtx) {
         maybeProject !== projectGraphOrCtx.projectName) {
         targetString = `${projectGraphOrCtx.projectName}:${targetString}`;
     }
-    const [project, target, configuration] = (0, devkit_internals_1.splitTarget)(targetString, projectGraph);
+    const currentProject = projectGraphOrCtx && 'projectName' in projectGraphOrCtx
+        ? projectGraphOrCtx.projectName
+        : undefined;
+    const [project, target, configuration] = (0, devkit_internals_1.splitTarget)(targetString, projectGraph, { currentProject });
     if (!project || !target) {
         throw new Error(`Invalid Target String: ${targetString}`);
     }

package/src/generators/format-files.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatFiles = formatFiles;
+const tslib_1 = require("tslib");
 const devkit_exports_1 = require("nx/src/devkit-exports");
 const devkit_internals_1 = require("nx/src/devkit-internals");
-const path = require("path");
+const path = tslib_1.__importStar(require("path"));
 /**
  * Formats all the created or updated files using Prettier
  * @param tree - the file system tree
@@ -31,7 +32,7 @@ async function formatFiles(tree, options = {}) {
     }
     let prettier;
     try {
-        prettier = await Promise.resolve().then(() => require('prettier'));
+        prettier = await Promise.resolve().then(() => tslib_1.__importStar(require('prettier')));
         /**
          * Even after we discovered prettier in node_modules, we need to be sure that the user is intentionally using prettier
          * before proceeding to format with it.

package/src/generators/generate-files.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OverwriteStrategy = void 0;
 exports.generateFiles = generateFiles;
+const tslib_1 = require("tslib");
 const fs_1 = require("fs");
-const path = require("path");
+const path = tslib_1.__importStar(require("path"));
 const binary_extensions_1 = require("../utils/binary-extensions");
 const devkit_exports_1 = require("nx/src/devkit-exports");
 /**

package/src/generators/target-defaults-utils.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addBuildTargetDefaults = addBuildTargetDefaults;
 exports.addE2eCiTargetDefaults = addE2eCiTargetDefaults;
@@ -25,7 +58,7 @@ async function addE2eCiTargetDefaults(tree, e2ePlugin, buildTarget, pathToE2ECon
     if (!e2ePluginRegistrations.length) {
         return;
     }
-    const resolvedE2ePlugin = await Promise.resolve(`${e2ePlugin}`).then(s => require(s));
+    const resolvedE2ePlugin = await Promise.resolve(`${e2ePlugin}`).then(s => __importStar(require(s)));
     const e2ePluginGlob = resolvedE2ePlugin.createNodesV2?.[0] ?? resolvedE2ePlugin.createNodes?.[0];
     let foundPluginForApplication;
     for (let i = 0; i < e2ePluginRegistrations.length; i++) {

package/src/tasks/install-packages-task.d.ts

@@ -4,7 +4,8 @@ import { PackageManager, Tree } from 'nx/src/devkit-exports';
  * `package.json` hasn't changed at all or it hasn't changed since the last invocation.
  *
  * @param tree - the file system tree
- * @param alwaysRun - always run the command even if `package.json` hasn't changed.
+ * @param ensureInstall - ensure install runs even if `package.json` hasn't changed,
+ * unless install already ran this generator cycle.
  */
-export declare function installPackagesTask(tree: Tree, alwaysRun?: boolean, cwd?: string, packageManager?: PackageManager): void;
+export declare function installPackagesTask(tree: Tree, ensureInstall?: boolean, cwd?: string, packageManager?: PackageManager): void;
 //# sourceMappingURL=install-packages-task.d.ts.map

package/src/tasks/install-packages-task.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install-packages-task.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/tasks/install-packages-task.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,cAAc,EACd,IAAI,EACL,MAAM,uBAAuB,CAAC;AAE/B;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,SAAS,GAAE,OAAe,EAC1B,GAAG,GAAE,MAAW,EAChB,cAAc,GAAE,cAA2D,GAC1E,IAAI,CAoCN"}
+{"version":3,"file":"install-packages-task.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/tasks/install-packages-task.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,cAAc,EACd,IAAI,EACL,MAAM,uBAAuB,CAAC;AAE/B;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,aAAa,GAAE,OAAe,EAC9B,GAAG,GAAE,MAAW,EAChB,cAAc,GAAE,cAA2D,GAC1E,IAAI,CAmCN"}

package/src/tasks/install-packages-task.js

@@ -9,25 +9,28 @@ const devkit_exports_1 = require("nx/src/devkit-exports");
  * `package.json` hasn't changed at all or it hasn't changed since the last invocation.
  *
  * @param tree - the file system tree
- * @param alwaysRun - always run the command even if `package.json` hasn't changed.
+ * @param ensureInstall - ensure install runs even if `package.json` hasn't changed,
+ * unless install already ran this generator cycle.
  */
-function installPackagesTask(tree, alwaysRun = false, cwd = '', packageManager = (0, devkit_exports_1.detectPackageManager)((0, path_1.join)(tree.root, cwd))) {
-    if (!tree
+function installPackagesTask(tree, ensureInstall = false, cwd = '', packageManager = (0, devkit_exports_1.detectPackageManager)((0, path_1.join)(tree.root, cwd))) {
+    const packageJsonPath = (0, devkit_exports_1.joinPathFragments)(cwd, 'package.json');
+    const packageJsonChanged = tree
         .listChanges()
-        .find((f) => f.path === (0, devkit_exports_1.joinPathFragments)(cwd, 'package.json')) &&
-        !alwaysRun) {
+        .some((f) => f.path === packageJsonPath);
+    if (!packageJsonChanged && !ensureInstall) {
         return;
     }
-    const packageJsonValue = tree.read((0, devkit_exports_1.joinPathFragments)(cwd, 'package.json'), 'utf-8');
-    let storedPackageJsonValue = global['__packageJsonInstallCache__'];
-    // Don't install again if install was already executed with package.json
-    if (storedPackageJsonValue != packageJsonValue || alwaysRun) {
+    const packageJsonValue = tree.read(packageJsonPath, 'utf-8');
+    const storedPackageJsonValue = global['__packageJsonInstallCache__'];
+    const installAlreadyRan = storedPackageJsonValue != null;
+    const packageJsonDiffers = storedPackageJsonValue != packageJsonValue;
+    if (packageJsonDiffers || (ensureInstall && !installAlreadyRan)) {
         global['__packageJsonInstallCache__'] = packageJsonValue;
         const pmc = (0, devkit_exports_1.getPackageManagerCommand)(packageManager);
         const execSyncOptions = {
             cwd: (0, path_1.join)(tree.root, cwd),
             stdio: process.env.NX_GENERATE_QUIET === 'true' ? 'ignore' : 'inherit',
-            windowsHide: false,
+            windowsHide: true,
         };
         // ensure local registry from process is not interfering with the install
         // when we start the process from temp folder the local registry would override the custom registry

package/src/utils/add-plugin.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addPlugin = addPlugin;
 exports.addPluginV1 = addPluginV1;
 exports.generateCombinations = generateCombinations;
-const yargs = require("yargs-parser");
+const tslib_1 = require("tslib");
+const yargs_parser_1 = tslib_1.__importDefault(require("yargs-parser"));
 const devkit_exports_1 = require("nx/src/devkit-exports");
 const devkit_internals_1 = require("nx/src/devkit-internals");
 /**
@@ -159,7 +160,7 @@ function processProject(tree, projectRoot, projectConfiguration) {
                  * - if command has same args, regardless of order    => replace removing args
                  * - if command has less args or with different value => replace leaving args
                  */
-                const parsedCommand = yargs(command, {
+                const parsedCommand = (0, yargs_parser_1.default)(command, {
                     configuration: { 'strip-dashed': true },
                 });
                 // this assumes there are no positional args in the command, everything is a command or subcommand
@@ -172,7 +173,7 @@ function processProject(tree, projectRoot, projectConfiguration) {
                 }
                 for (const match of matches) {
                     // parse the matched command within the script
-                    const parsedScript = yargs(match, {
+                    const parsedScript = (0, yargs_parser_1.default)(match, {
                         configuration: { 'strip-dashed': true },
                     });
                     let hasArgsWithDifferentValues = false;

package/src/utils/find-plugin-for-config-file.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findPluginForConfigFile = findPluginForConfigFile;
 const devkit_exports_1 = require("nx/src/devkit-exports");
@@ -17,7 +50,7 @@ async function findPluginForConfigFile(tree, pluginName, pathToConfigFile) {
             return plugin;
         }
         if (plugin.include || plugin.exclude) {
-            const resolvedPlugin = await Promise.resolve(`${pluginName}`).then(s => require(s));
+            const resolvedPlugin = await Promise.resolve(`${pluginName}`).then(s => __importStar(require(s)));
             const pluginGlob = resolvedPlugin.createNodesV2?.[0] ?? resolvedPlugin.createNodes?.[0];
             const matchingConfigFile = (0, devkit_internals_1.findMatchingConfigFiles)([pathToConfigFile], pluginGlob, plugin.include, plugin.exclude);
             if (matchingConfigFile.length) {