@nx/devkit 19.0.3 → 19.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "19.0.3",
+  "version": "19.0.5",
   "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.0.3"
+    "@nrwl/devkit": "19.0.5"
   },
   "peerDependencies": {
     "nx": ">= 17 <= 20"

package/src/utils/add-plugin.d.ts

@@ -1,10 +1,7 @@
-import type { ConfigurationResult } from 'nx/src/project-graph/utils/project-configuration-utils';
-import { CreateNodes, NxJsonConfiguration, Tree } from 'nx/src/devkit-exports';
-import { LoadedNxPlugin } from 'nx/src/devkit-internals';
+import { CreateNodes, ProjectGraph, Tree } from 'nx/src/devkit-exports';
 /**
  * Iterates through various forms of plugin options to find the one which does not conflict with the current graph
 
  */
-export declare function addPlugin<PluginOptions>(tree: Tree, pluginName: string, createNodesTuple: CreateNodes<PluginOptions>, options: Partial<Record<keyof PluginOptions, PluginOptions[keyof PluginOptions][]>>, shouldUpdatePackageJsonScripts: boolean): Promise<void>;
+export declare function addPlugin<PluginOptions>(tree: Tree, graph: ProjectGraph, pluginName: string, createNodesTuple: CreateNodes<PluginOptions>, options: Partial<Record<keyof PluginOptions, PluginOptions[keyof PluginOptions][]>>, shouldUpdatePackageJsonScripts: boolean): Promise<void>;
 export declare function generateCombinations<T>(input: Record<string, T[]>): Record<string, T>[];
-export declare function retrieveProjectConfigurationsWithPartialResult(plugins: LoadedNxPlugin[], workspaceRoot: string, nxJson: NxJsonConfiguration): Promise<ConfigurationResult>;

package/src/utils/add-plugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.retrieveProjectConfigurationsWithPartialResult = exports.generateCombinations = exports.addPlugin = void 0;
+exports.generateCombinations = exports.addPlugin = void 0;
 const yargs = require("yargs-parser");
 const devkit_exports_1 = require("nx/src/devkit-exports");
 const devkit_internals_1 = require("nx/src/devkit-internals");
@@ -8,12 +8,11 @@ const devkit_internals_1 = require("nx/src/devkit-internals");
  * Iterates through various forms of plugin options to find the one which does not conflict with the current graph
 
  */
-async function addPlugin(tree, pluginName, createNodesTuple, options, shouldUpdatePackageJsonScripts) {
+async function addPlugin(tree, graph, pluginName, createNodesTuple, options, shouldUpdatePackageJsonScripts) {
+    const graphNodes = Object.values(graph.nodes);
     const nxJson = (0, devkit_exports_1.readNxJson)(tree);
     let pluginOptions;
-    let projConfigsWithExistingNxJsonPlugins;
-    let projConfigsWithNewPlugin;
-    let projConfigsWithCorePlugins;
+    let projConfigs;
     const combinations = generateCombinations(options);
     optionsLoop: for (const _pluginOptions of combinations) {
         pluginOptions = _pluginOptions;
@@ -25,11 +24,8 @@ async function addPlugin(tree, pluginName, createNodesTuple, options, shouldUpda
             return;
         }
         global.NX_GRAPH_CREATION = true;
-        const [nxJsonPlugins] = await (0, devkit_internals_1.loadNxPlugins)(nxJson.plugins, tree.root, true);
-        projConfigsWithExistingNxJsonPlugins =
-            await retrieveProjectConfigurationsWithPartialResult(nxJsonPlugins, tree.root, nxJson);
-        projConfigsWithNewPlugin =
-            await retrieveProjectConfigurationsWithPartialResult([
+        try {
+            projConfigs = await (0, devkit_internals_1.retrieveProjectConfigurations)([
                 new devkit_internals_1.LoadedNxPlugin({
                     name: pluginName,
                     createNodes: createNodesTuple,
@@ -38,18 +34,24 @@ async function addPlugin(tree, pluginName, createNodesTuple, options, shouldUpda
                     options: pluginOptions,
                 }),
             ], tree.root, nxJson);
-        const [corePlugins] = await (0, devkit_internals_1.loadNxPlugins)([], tree.root);
-        projConfigsWithCorePlugins =
-            await retrieveProjectConfigurationsWithPartialResult(corePlugins, 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(projConfigsWithNewPlugin.projects)) {
+        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) {
-                const existingPluginCreatedTarget = projConfigsWithExistingNxJsonPlugins?.projects?.[projConfig.root]
-                    ?.targets?.[targetName];
-                const corePluginsCreatedTarget = projConfigsWithCorePlugins?.projects?.[projConfig.root]?.targets?.[targetName];
-                if (existingPluginCreatedTarget ||
-                    (corePluginsCreatedTarget &&
-                        !(0, devkit_internals_1.deepEquals)(corePluginsCreatedTarget, (0, devkit_internals_1.mergeTargetConfigurations)(corePluginsCreatedTarget, projConfig.targets[targetName])))) {
+                if (node.data.targets[targetName]) {
                     // Conflicting Target Name, check the next one
                     pluginOptions = null;
                     continue optionsLoop;
@@ -67,7 +69,7 @@ async function addPlugin(tree, pluginName, createNodesTuple, options, shouldUpda
     });
     (0, devkit_exports_1.updateNxJson)(tree, nxJson);
     if (shouldUpdatePackageJsonScripts) {
-        updatePackageScripts(tree, projConfigsWithNewPlugin);
+        updatePackageScripts(tree, projConfigs);
     }
 }
 exports.addPlugin = addPlugin;
@@ -238,20 +240,3 @@ function _generateCombinations(input) {
         return first.flatMap((value) => partialCombinations.map((combination) => [value, ...combination]));
     }
 }
-async function retrieveProjectConfigurationsWithPartialResult(plugins, workspaceRoot, nxJson) {
-    let projConfigs;
-    try {
-        projConfigs = await (0, devkit_internals_1.retrieveProjectConfigurations)(plugins, workspaceRoot, 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;
-        }
-    }
-    return projConfigs;
-}
-exports.retrieveProjectConfigurationsWithPartialResult = retrieveProjectConfigurationsWithPartialResult;

package/src/utils/async-iterable/combine-async-iterables.js

@@ -24,8 +24,8 @@ async function* combineAsyncIterables(..._iterators) {
         iterators.shift();
     }
     const getNextAsyncIteratorValue = getNextAsyncIteratorFactory(options);
+    const asyncIteratorsValues = new Map(iterators.map((it, idx) => [idx, getNextAsyncIteratorValue(it, idx)]));
     try {
-        const asyncIteratorsValues = new Map(iterators.map((it, idx) => [idx, getNextAsyncIteratorValue(it, idx)]));
         do {
             const { iterator, index } = await Promise.race(asyncIteratorsValues.values());
             if (iterator.done) {
@@ -38,7 +38,9 @@ async function* combineAsyncIterables(..._iterators) {
         } while (asyncIteratorsValues.size > 0);
     }
     finally {
-        await Promise.allSettled(iterators.map((it) => it['return']?.()));
+        for (const [index, iterator] of asyncIteratorsValues.entries())
+            if (iterator?.['return'] !== null)
+                iterator['return']?.();
     }
 }
 exports.combineAsyncIterables = combineAsyncIterables;