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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "19.2.0-beta.2",
+  "version": "19.2.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": {
@@ -36,7 +36,7 @@
     "semver": "^7.5.3",
     "yargs-parser": "21.1.1",
     "minimatch": "9.0.3",
-    "@nrwl/devkit": "19.2.0-beta.2"
+    "@nrwl/devkit": "19.2.0-beta.4"
   },
   "peerDependencies": {
     "nx": ">= 17 <= 20"

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

@@ -1,7 +1,13 @@
-import { CreateNodes, ProjectGraph, Tree } from 'nx/src/devkit-exports';
+import { CreateNodes, CreateNodesV2, 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, graph: ProjectGraph, 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: CreateNodesV2<PluginOptions>, options: Partial<Record<keyof PluginOptions, PluginOptions[keyof PluginOptions][]>>, shouldUpdatePackageJsonScripts: boolean): Promise<void>;
+/**
+ * @deprecated Use `addPlugin` instead
+ * Iterates through various forms of plugin options to find the one which does not conflict with the current graph
+
+ */
+export declare function addPluginV1<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>[];

package/src/utils/add-plugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateCombinations = exports.addPlugin = void 0;
+exports.generateCombinations = exports.addPluginV1 = 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");
@@ -9,6 +9,31 @@ const devkit_internals_1 = require("nx/src/devkit-internals");
 
  */
 async function addPlugin(tree, graph, pluginName, createNodesTuple, options, shouldUpdatePackageJsonScripts) {
+    return _addPluginInternal(tree, graph, pluginName, (pluginOptions) => new devkit_internals_1.LoadedNxPlugin({
+        name: pluginName,
+        createNodesV2: createNodesTuple,
+    }, {
+        plugin: pluginName,
+        options: pluginOptions,
+    }), options, shouldUpdatePackageJsonScripts);
+}
+exports.addPlugin = addPlugin;
+/**
+ * @deprecated Use `addPlugin` instead
+ * Iterates through various forms of plugin options to find the one which does not conflict with the current graph
+
+ */
+async function addPluginV1(tree, graph, pluginName, createNodesTuple, options, shouldUpdatePackageJsonScripts) {
+    return _addPluginInternal(tree, graph, pluginName, (pluginOptions) => new devkit_internals_1.LoadedNxPlugin({
+        name: pluginName,
+        createNodes: createNodesTuple,
+    }, {
+        plugin: pluginName,
+        options: pluginOptions,
+    }), options, shouldUpdatePackageJsonScripts);
+}
+exports.addPluginV1 = addPluginV1;
+async function _addPluginInternal(tree, graph, pluginName, pluginFactory, options, shouldUpdatePackageJsonScripts) {
     const graphNodes = Object.values(graph.nodes);
     const nxJson = (0, devkit_exports_1.readNxJson)(tree);
     let pluginOptions;
@@ -25,15 +50,7 @@ async function addPlugin(tree, graph, pluginName, createNodesTuple, options, sho
         }
         global.NX_GRAPH_CREATION = true;
         try {
-            projConfigs = await (0, devkit_internals_1.retrieveProjectConfigurations)([
-                new devkit_internals_1.LoadedNxPlugin({
-                    name: pluginName,
-                    createNodes: createNodesTuple,
-                }, {
-                    plugin: pluginName,
-                    options: pluginOptions,
-                }),
-            ], tree.root, nxJson);
+            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
@@ -72,7 +89,6 @@ async function addPlugin(tree, graph, pluginName, createNodesTuple, options, sho
         updatePackageScripts(tree, projConfigs);
     }
 }
-exports.addPlugin = addPlugin;
 function updatePackageScripts(tree, projectConfigurations) {
     for (const projectConfig of Object.values(projectConfigurations.projects)) {
         const projectRoot = projectConfig.root;