@nx/devkit 19.8.0-canary.20240914-dc821ab → 19.8.0-canary.20240918-eb61254

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "19.8.0-canary.20240914-dc821ab",
+  "version": "19.8.0-canary.20240918-eb61254",
   "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": {
@@ -36,7 +36,7 @@
     "semver": "^7.5.3",
     "yargs-parser": "21.1.1",
     "minimatch": "9.0.3",
-    "@nrwl/devkit": "19.8.0-canary.20240914-dc821ab"
+    "@nrwl/devkit": "19.8.0-canary.20240918-eb61254"
   },
   "peerDependencies": {
     "nx": ">= 17 <= 20"

package/src/utils/add-plugin.js

@@ -38,16 +38,51 @@ async function _addPluginInternal(tree, graph, pluginName, pluginFactory, option
     const nxJson = (0, devkit_exports_1.readNxJson)(tree);
     let pluginOptions;
     let projConfigs;
-    const combinations = generateCombinations(options);
-    optionsLoop: for (const _pluginOptions of combinations) {
-        pluginOptions = _pluginOptions;
-        nxJson.plugins ??= [];
-        if (nxJson.plugins.some((p) => typeof p === 'string'
-            ? p === pluginName
-            : p.plugin === pluginName && !p.include)) {
-            // Plugin has already been added
-            return;
+    if (Object.keys(options).length > 0) {
+        const combinations = generateCombinations(options);
+        optionsLoop: for (const _pluginOptions of combinations) {
+            pluginOptions = _pluginOptions;
+            nxJson.plugins ??= [];
+            if (nxJson.plugins.some((p) => typeof p === 'string'
+                ? p === pluginName
+                : p.plugin === pluginName && !p.include)) {
+                // Plugin has already been added
+                return;
+            }
+            global.NX_GRAPH_CREATION = true;
+            try {
+                projConfigs = await (0, devkit_internals_1.retrieveProjectConfigurations)([pluginFactory(pluginOptions)], tree.root, nxJson);
+            }
+            catch (e) {
+                // Errors are okay for this because we're only running 1 plugin
+                if (e instanceof devkit_internals_1.ProjectConfigurationsError) {
+                    projConfigs = e.partialProjectConfigurationsResult;
+                }
+                else {
+                    throw e;
+                }
+            }
+            global.NX_GRAPH_CREATION = false;
+            for (const projConfig of Object.values(projConfigs.projects)) {
+                const node = graphNodes.find((node) => node.data.root === projConfig.root);
+                if (!node) {
+                    continue;
+                }
+                for (const targetName in projConfig.targets) {
+                    if (node.data.targets[targetName]) {
+                        // Conflicting Target Name, check the next one
+                        pluginOptions = null;
+                        continue optionsLoop;
+                    }
+                }
+            }
+            break;
         }
+    }
+    else {
+        // If the plugin does not take in options, we add the plugin with empty options.
+        nxJson.plugins ??= [];
+        pluginOptions = {};
         global.NX_GRAPH_CREATION = true;
         try {
             projConfigs = await (0, devkit_internals_1.retrieveProjectConfigurations)([pluginFactory(pluginOptions)], tree.root, nxJson);
@@ -62,20 +97,6 @@ async function _addPluginInternal(tree, graph, pluginName, pluginFactory, option
             }
         }
         global.NX_GRAPH_CREATION = false;
-        for (const projConfig of Object.values(projConfigs.projects)) {
-            const node = graphNodes.find((node) => node.data.root === projConfig.root);
-            if (!node) {
-                continue;
-            }
-            for (const targetName in projConfig.targets) {
-                if (node.data.targets[targetName]) {
-                    // Conflicting Target Name, check the next one
-                    pluginOptions = null;
-                    continue optionsLoop;
-                }
-            }
-        }
-        break;
     }
     if (!pluginOptions) {
         throw new Error('Could not add the plugin in a way which does not conflict with existing targets. Please report this error at: https://github.com/nrwl/nx/issues/new/choose');

package/src/utils/calculate-hash-for-create-nodes.d.ts

@@ -1,2 +1,2 @@
-import { CreateNodesContext } from 'nx/src/devkit-exports';
-export declare function calculateHashForCreateNodes(projectRoot: string, options: object, context: CreateNodesContext, additionalGlobs?: string[]): Promise<string>;
+import { CreateNodesContext, CreateNodesContextV2 } from 'nx/src/devkit-exports';
+export declare function calculateHashForCreateNodes(projectRoot: string, options: object, context: CreateNodesContext | CreateNodesContextV2, additionalGlobs?: string[]): Promise<string>;

package/src/utils/get-named-inputs.d.ts

@@ -1,8 +1,8 @@
 import type { InputDefinition } from 'nx/src/config/workspace-json-project-json';
-import { CreateNodesContext } from 'nx/src/devkit-exports';
+import { CreateNodesContext, CreateNodesContextV2 } from 'nx/src/devkit-exports';
 /**
  * Get the named inputs available for a directory
  */
-export declare function getNamedInputs(directory: string, context: CreateNodesContext): {
+export declare function getNamedInputs(directory: string, context: CreateNodesContext | CreateNodesContextV2): {
     [inputName: string]: (string | InputDefinition)[];
 };