nx 18.3.0-beta.0 → 18.3.0-beta.2

package/src/core/graph/runtime.js

@@ -1 +1 @@
-(()=>{"use strict";var e,r={},t={};function o(e){var n=t[e];if(void 0!==n)return n.exports;var i=t[e]={id:e,loaded:!1,exports:{}};return r[e].call(i.exports,i,i.exports,o),i.loaded=!0,i.exports}o.m=r,e=[],o.O=(r,t,n,i)=>{if(!t){var l=1/0;for(f=0;f<e.length;f++){for(var[t,n,i]=e[f],a=!0,u=0;u<t.length;u++)(!1&i||l>=i)&&Object.keys(o.O).every((e=>o.O[e](t[u])))?t.splice(u--,1):(a=!1,i<l&&(l=i));if(a){e.splice(f--,1);var d=n();void 0!==d&&(r=d)}}return r}i=i||0;for(var f=e.length;f>0&&e[f-1][2]>i;f--)e[f]=e[f-1];e[f]=[t,n,i]},o.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return o.d(r,{a:r}),r},o.d=(e,r)=>{for(var t in r)o.o(r,t)&&!o.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},o.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),o.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),(()=>{var e={1:0};o.O.j=r=>0===e[r];var r=(r,t)=>{var n,i,[l,a,u]=t,d=0;if(l.some((r=>0!==e[r]))){for(n in a)o.o(a,n)&&(o.m[n]=a[n]);if(u)var f=u(o)}for(r&&r(t);d<l.length;d++)i=l[d],o.o(e,i)&&e[i]&&e[i][0](),e[i]=0;return o.O(f)},t=self.webpackChunk=self.webpackChunk||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})()})();
+(()=>{"use strict";var e,r={},t={};function o(e){var n=t[e];if(void 0!==n)return n.exports;var i=t[e]={id:e,loaded:!1,exports:{}};return r[e].call(i.exports,i,i.exports,o),i.loaded=!0,i.exports}o.m=r,e=[],o.O=(r,t,n,i)=>{if(!t){var l=1/0;for(f=0;f<e.length;f++){for(var[t,n,i]=e[f],a=!0,u=0;u<t.length;u++)(!1&i||l>=i)&&Object.keys(o.O).every((e=>o.O[e](t[u])))?t.splice(u--,1):(a=!1,i<l&&(l=i));if(a){e.splice(f--,1);var d=n();void 0!==d&&(r=d)}}return r}i=i||0;for(var f=e.length;f>0&&e[f-1][2]>i;f--)e[f]=e[f-1];e[f]=[t,n,i]},o.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return o.d(r,{a:r}),r},o.d=(e,r)=>{for(var t in r)o.o(r,t)&&!o.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},o.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),o.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),(()=>{var e={666:0};o.O.j=r=>0===e[r];var r=(r,t)=>{var n,i,[l,a,u]=t,d=0;if(l.some((r=>0!==e[r]))){for(n in a)o.o(a,n)&&(o.m[n]=a[n]);if(u)var f=u(o)}for(r&&r(t);d<l.length;d++)i=l[d],o.o(e,i)&&e[i]&&e[i][0](),e[i]=0;return o.O(f)},t=self.webpackChunk=self.webpackChunk||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})()})();

package/src/core/graph/styles.js

@@ -1 +1 @@
-"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[2],{22232:(s,e,k)=>{k.r(e)}},s=>{var e;e=22232,s(s.s=e)}]);
+"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[532],{22232:()=>{}},s=>{var e;e=22232,s(s.s=e)}]);

package/src/daemon/client/client.js

@@ -21,7 +21,6 @@ const cache_1 = require("../cache");
 const daemon_project_graph_error_1 = require("../daemon-project-graph-error");
 const project_graph_1 = require("../../project-graph/project-graph");
 const DAEMON_ENV_SETTINGS = {
-    ...process.env,
     NX_PROJECT_GLOB_CACHE: 'false',
     NX_CACHE_PROJECTS_CONFIG: 'false',
 };
@@ -293,7 +292,7 @@ class DaemonClient {
             detached: true,
             windowsHide: true,
             shell: false,
-            env: DAEMON_ENV_SETTINGS,
+            env: { ...process.env, ...DAEMON_ENV_SETTINGS },
         });
         backgroundProcess.unref();
         /**

package/src/daemon/server/plugins.d.ts

@@ -0,0 +1,3 @@
+import { LoadedNxPlugin } from '../../project-graph/plugins/internal-api';
+export declare function getPlugins(): Promise<LoadedNxPlugin[]>;
+export declare function cleanupPlugins(): void;

package/src/daemon/server/plugins.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cleanupPlugins = exports.getPlugins = void 0;
+const nx_json_1 = require("../../config/nx-json");
+const internal_api_1 = require("../../project-graph/plugins/internal-api");
+const workspace_root_1 = require("../../utils/workspace-root");
+let loadedPlugins;
+let cleanup;
+async function getPlugins() {
+    if (loadedPlugins) {
+        return loadedPlugins;
+    }
+    const pluginsConfiguration = (0, nx_json_1.readNxJson)().plugins ?? [];
+    const [result, cleanupFn] = await (0, internal_api_1.loadNxPlugins)(pluginsConfiguration, workspace_root_1.workspaceRoot);
+    cleanup = cleanupFn;
+    return result;
+}
+exports.getPlugins = getPlugins;
+function cleanupPlugins() {
+    cleanup();
+}
+exports.cleanupPlugins = cleanupPlugins;

package/src/daemon/server/project-graph-incremental-recomputation.js

@@ -13,8 +13,9 @@ const workspace_context_1 = require("../../utils/workspace-context");
 const workspace_root_1 = require("../../utils/workspace-root");
 const file_watcher_sockets_1 = require("./file-watching/file-watcher-sockets");
 const logger_1 = require("./logger");
-const project_configuration_utils_1 = require("../../project-graph/utils/project-configuration-utils");
 const daemon_project_graph_error_1 = require("../daemon-project-graph-error");
+const plugins_1 = require("./plugins");
+const error_types_1 = require("../../project-graph/error-types");
 let cachedSerializedProjectGraphPromise;
 const collectedUpdatedFiles = new Set();
 const collectedDeletedFiles = new Set();
@@ -32,15 +33,16 @@ async function getCachedSerializedProjectGraphPromise() {
         // reset the wait time
         waitPeriod = 100;
         await resetInternalStateIfNxDepsMissing();
+        const plugins = await (0, plugins_1.getPlugins)();
         if (collectedUpdatedFiles.size == 0 && collectedDeletedFiles.size == 0) {
             if (!cachedSerializedProjectGraphPromise) {
                 cachedSerializedProjectGraphPromise =
-                    processFilesAndCreateAndSerializeProjectGraph();
+                    processFilesAndCreateAndSerializeProjectGraph(plugins);
             }
         }
         else {
             cachedSerializedProjectGraphPromise =
-                processFilesAndCreateAndSerializeProjectGraph();
+                processFilesAndCreateAndSerializeProjectGraph(plugins);
         }
         return await cachedSerializedProjectGraphPromise;
     }
@@ -80,7 +82,7 @@ function addUpdatedAndDeletedFiles(createdFiles, updatedFiles, deletedFiles) {
                 waitPeriod = waitPeriod * 2;
             }
             cachedSerializedProjectGraphPromise =
-                processFilesAndCreateAndSerializeProjectGraph();
+                processFilesAndCreateAndSerializeProjectGraph(await (0, plugins_1.getPlugins)());
             await cachedSerializedProjectGraphPromise;
             if (createdFiles.length > 0) {
                 (0, file_watcher_sockets_1.notifyFileWatcherSockets)(createdFiles, null, null);
@@ -128,7 +130,7 @@ async function processCollectedUpdatedAndDeletedFiles({ projects, externalNodes,
         throw e;
     }
 }
-async function processFilesAndCreateAndSerializeProjectGraph() {
+async function processFilesAndCreateAndSerializeProjectGraph(plugins) {
     try {
         perf_hooks_1.performance.mark('hash-watched-changes-start');
         const updatedFiles = [...collectedUpdatedFiles.values()];
@@ -140,15 +142,14 @@ async function processFilesAndCreateAndSerializeProjectGraph() {
         logger_1.serverLogger.requestLog([...updatedFiles.values()]);
         logger_1.serverLogger.requestLog([...deletedFiles]);
         const nxJson = (0, nx_json_1.readNxJson)(workspace_root_1.workspaceRoot);
-        // Set this globally to allow plugins to know if they are being called from the project graph creation
         global.NX_GRAPH_CREATION = true;
         let graphNodes;
         let projectConfigurationsError;
         try {
-            graphNodes = await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(workspace_root_1.workspaceRoot, nxJson);
+            graphNodes = await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(plugins, workspace_root_1.workspaceRoot, nxJson);
         }
         catch (e) {
-            if (e instanceof project_configuration_utils_1.ProjectConfigurationsError) {
+            if (e instanceof error_types_1.ProjectConfigurationsError) {
                 graphNodes = e.partialProjectConfigurationsResult;
                 projectConfigurationsError = e;
             }
@@ -162,7 +163,7 @@ async function processFilesAndCreateAndSerializeProjectGraph() {
         const errors = [...(projectConfigurationsError?.errors ?? [])];
         if (g.error) {
             if (g.error instanceof build_project_graph_1.CreateDependenciesError) {
-                errors.concat(g.error.errors);
+                errors.push(...g.error.errors);
             }
             else {
                 return {
@@ -226,7 +227,7 @@ async function createAndSerializeProjectGraph({ projects, sourceMaps, }) {
         const fileMap = copyFileMap(exports.fileMapWithFiles.fileMap);
         const allWorkspaceFiles = copyFileData(exports.fileMapWithFiles.allWorkspaceFiles);
         const rustReferences = exports.fileMapWithFiles.rustReferences;
-        const { projectGraph, projectFileMapCache } = await (0, build_project_graph_1.buildProjectGraphUsingProjectFileMap)(projects, knownExternalNodes, fileMap, allWorkspaceFiles, rustReferences, exports.currentProjectFileMapCache || (0, nx_deps_cache_1.readFileMapCache)());
+        const { projectGraph, projectFileMapCache } = await (0, build_project_graph_1.buildProjectGraphUsingProjectFileMap)(projects, knownExternalNodes, fileMap, allWorkspaceFiles, rustReferences, exports.currentProjectFileMapCache || (0, nx_deps_cache_1.readFileMapCache)(), await (0, plugins_1.getPlugins)());
         exports.currentProjectFileMapCache = projectFileMapCache;
         exports.currentProjectGraph = projectGraph;
         perf_hooks_1.performance.mark('create-project-graph-end');

package/src/daemon/server/shutdown-utils.js

@@ -5,6 +5,7 @@ const workspace_root_1 = require("../../utils/workspace-root");
 const logger_1 = require("./logger");
 const socket_utils_1 = require("../socket-utils");
 const cache_1 = require("../cache");
+const plugins_1 = require("./plugins");
 exports.SERVER_INACTIVITY_TIMEOUT_MS = 10800000; // 10800000 ms = 3 hours
 let watcherInstance;
 function storeWatcherInstance(instance) {
@@ -28,6 +29,7 @@ async function handleServerProcessTermination({ server, reason, }) {
     try {
         server.close();
         (0, cache_1.deleteDaemonJsonProcessCache)();
+        (0, plugins_1.cleanupPlugins)();
         if (watcherInstance) {
             await watcherInstance.stop();
             logger_1.serverLogger.watcherLog(`Stopping the watcher for ${workspace_root_1.workspaceRoot} (sources)`);

package/src/devkit-exports.d.ts

@@ -19,7 +19,8 @@ export type { Generator, GeneratorCallback, Executor, ExecutorContext, TaskGraph
  */
 export { Workspaces } from './config/workspaces';
 export { workspaceLayout } from './config/configuration';
-export type { NxPlugin, NxPluginV1, NxPluginV2, ProjectTargetConfigurator, CreateNodes, CreateNodesFunction, CreateNodesResult, CreateNodesContext, CreateDependencies, CreateDependenciesContext, } from './utils/nx-plugin';
+export type { NxPlugin, NxPluginV2, CreateNodes, CreateNodesFunction, CreateNodesResult, CreateNodesContext, CreateDependencies, CreateDependenciesContext, } from './project-graph/plugins';
+export type { NxPluginV1, ProjectTargetConfigurator, } from './utils/nx-plugin.deprecated';
 /**
  * @category Workspace
  */
@@ -27,7 +28,7 @@ export type { Task, TaskGraph } from './config/task-graph';
 /**
  * @category Workspace
  */
-export type { ImplicitDependencyEntry, ImplicitJsonSubsetDependency, NxJsonConfiguration, PluginConfiguration, TargetDefaults, NxAffectedConfig, } from './config/nx-json';
+export type { ImplicitDependencyEntry, ImplicitJsonSubsetDependency, NxJsonConfiguration, PluginConfiguration, ExpandedPluginConfiguration, TargetDefaults, NxAffectedConfig, } from './config/nx-json';
 /**
  * @category Logger
  */

package/src/devkit-internals.d.ts

@@ -17,4 +17,7 @@ export { splitByColons } from './utils/split-target';
 export { hashObject } from './hasher/file-hasher';
 export { hashWithWorkspaceContext } from './utils/workspace-context';
 export { createProjectRootMappingsFromProjectConfigurations, findProjectForPath, } from './project-graph/utils/find-project-for-path';
+export { retrieveProjectConfigurations } from './project-graph/utils/retrieve-workspace-files';
+export { LoadedNxPlugin } from './project-graph/plugins/internal-api';
+export * from './project-graph/error-types';
 export { registerTsProject } from './plugins/js/utils/register';

package/src/devkit-internals.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerTsProject = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
+exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
+const tslib_1 = require("tslib");
 /**
  * Note to developers: STOP! These exports are available via requireNx in @nx/devkit.
  *
@@ -35,5 +36,10 @@ Object.defineProperty(exports, "hashWithWorkspaceContext", { enumerable: true, g
 var find_project_for_path_1 = require("./project-graph/utils/find-project-for-path");
 Object.defineProperty(exports, "createProjectRootMappingsFromProjectConfigurations", { enumerable: true, get: function () { return find_project_for_path_1.createProjectRootMappingsFromProjectConfigurations; } });
 Object.defineProperty(exports, "findProjectForPath", { enumerable: true, get: function () { return find_project_for_path_1.findProjectForPath; } });
+var retrieve_workspace_files_2 = require("./project-graph/utils/retrieve-workspace-files");
+Object.defineProperty(exports, "retrieveProjectConfigurations", { enumerable: true, get: function () { return retrieve_workspace_files_2.retrieveProjectConfigurations; } });
+var internal_api_1 = require("./project-graph/plugins/internal-api");
+Object.defineProperty(exports, "LoadedNxPlugin", { enumerable: true, get: function () { return internal_api_1.LoadedNxPlugin; } });
+tslib_1.__exportStar(require("./project-graph/error-types"), exports);
 var register_1 = require("./plugins/js/utils/register");
 Object.defineProperty(exports, "registerTsProject", { enumerable: true, get: function () { return register_1.registerTsProject; } });

package/src/executors/run-commands/run-commands.impl.d.ts

@@ -39,10 +39,13 @@ export interface NormalizedRunCommandsOptions extends RunCommandsOptions {
     parsedArgs: {
         [k: string]: any;
     };
+    unparsedCommandArgs?: {
+        [k: string]: string;
+    };
     args?: string;
 }
 export default function (options: RunCommandsOptions, context: ExecutorContext): Promise<{
     success: boolean;
     terminalOutput: string;
 }>;
-export declare function interpolateArgsIntoCommand(command: string, opts: Pick<NormalizedRunCommandsOptions, 'args' | 'parsedArgs' | '__unparsed__' | 'unknownOptions'>, forwardAllArgs: boolean): string;
+export declare function interpolateArgsIntoCommand(command: string, opts: Pick<NormalizedRunCommandsOptions, 'args' | 'parsedArgs' | '__unparsed__' | 'unknownOptions' | 'unparsedCommandArgs'>, forwardAllArgs: boolean): string;

package/src/executors/run-commands/run-commands.impl.js

@@ -129,6 +129,7 @@ function normalizeOptions(options) {
         .filter((p) => propKeys.indexOf(p) === -1 && unparsedCommandArgs[p] === undefined)
         .reduce((m, c) => ((m[c] = options[c]), m), {});
     options.parsedArgs = parseArgs(unparsedCommandArgs, options.unknownOptions, options.args);
+    options.unparsedCommandArgs = unparsedCommandArgs;
     options.commands.forEach((c) => {
         c.command = interpolateArgsIntoCommand(c.command, options, c.forwardAllArgs ?? true);
     });
@@ -162,12 +163,15 @@ async function createProcess(pseudoTerminal, commandConfig, readyWhen, color, cw
         !commandConfig.prefix &&
         !isParallel &&
         usePty) {
+        let terminalOutput = chalk.dim('> ') + commandConfig.command + '\r\n\r\n';
+        if (streamOutput) {
+            process.stdout.write(terminalOutput);
+        }
         const cp = pseudoTerminal.runCommand(commandConfig.command, {
             cwd,
             jsEnv: env,
             quiet: !streamOutput,
         });
-        let terminalOutput = '';
         return new Promise((res) => {
             cp.onOutput((output) => {
                 terminalOutput += output;
@@ -188,7 +192,10 @@ async function createProcess(pseudoTerminal, commandConfig, readyWhen, color, cw
     return nodeProcess(commandConfig, cwd, env, readyWhen, streamOutput);
 }
 function nodeProcess(commandConfig, cwd, env, readyWhen, streamOutput = true) {
-    let terminalOutput = '';
+    let terminalOutput = chalk.dim('> ') + commandConfig.command + '\r\n\r\n';
+    if (streamOutput) {
+        process.stdout.write(terminalOutput);
+    }
     return new Promise((res) => {
         const childProcess = (0, child_process_1.exec)(commandConfig.command, {
             maxBuffer: exports.LARGE_BUFFER,
@@ -290,14 +297,17 @@ function interpolateArgsIntoCommand(command, opts, forwardAllArgs) {
                     Object.keys(opts.unknownOptions)
                         .filter((k) => typeof opts.unknownOptions[k] !== 'object' &&
                         opts.parsedArgs[k] === opts.unknownOptions[k])
-                        .map((k) => `--${k} ${opts.unknownOptions[k]}`)
+                        .map((k) => `--${k}=${opts.unknownOptions[k]}`)
                         .join(' ');
         }
         if (opts.args) {
             args += ` ${opts.args}`;
         }
         if (opts.__unparsed__?.length > 0) {
-            args += ` ${opts.__unparsed__.join(' ')}`;
+            const filterdParsedOptions = filterPropKeysFromUnParsedOptions(opts.__unparsed__, opts.unparsedCommandArgs);
+            if (filterdParsedOptions.length > 0) {
+                args += ` ${filterdParsedOptions.join(' ')}`;
+            }
         }
         return `${command}${args}`;
     }
@@ -314,3 +324,40 @@ function parseArgs(unparsedCommandArgs, unknownOptions, args) {
         configuration: { 'camel-case-expansion': false },
     });
 }
+/**
+ * This function filters out the prop keys from the unparsed options
+ * @param __unparsed__ e.g. ['--prop1', 'value1', '--prop2=value2', '--args=test']
+ * @param unparsedCommandArgs e.g. { prop1: 'value1', prop2: 'value2', args: 'test'}
+ * @returns filtered options that are not part of the propKeys array e.g. ['--prop1', 'value1', '--prop2=value2']
+ */
+function filterPropKeysFromUnParsedOptions(__unparsed__, unparsedCommandArgs = {}) {
+    const parsedOptions = [];
+    for (let index = 0; index < __unparsed__.length; index++) {
+        const element = __unparsed__[index];
+        if (element.startsWith('--')) {
+            const key = element.replace('--', '');
+            if (element.includes('=')) {
+                if (!propKeys.includes(key.split('=')[0].split('.')[0])) {
+                    // check if the key is part of the propKeys array
+                    parsedOptions.push(element);
+                }
+            }
+            else {
+                // check if the next element is a value for the key
+                if (propKeys.includes(key)) {
+                    if (index + 1 < __unparsed__.length &&
+                        __unparsed__[index + 1] === unparsedCommandArgs[key]) {
+                        index++; // skip the next element
+                    }
+                }
+                else {
+                    parsedOptions.push(element);
+                }
+            }
+        }
+        else {
+            parsedOptions.push(element);
+        }
+    }
+    return parsedOptions;
+}

package/src/executors/utils/convert-nx-executor.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertNxExecutor = void 0;
 const nx_json_1 = require("../../config/nx-json");
 const retrieve_workspace_files_1 = require("../../project-graph/utils/retrieve-workspace-files");
+const internal_api_1 = require("../../project-graph/plugins/internal-api");
 /**
  * Convert an Nx Executor into an Angular Devkit Builder
  *
@@ -15,10 +16,12 @@ function convertNxExecutor(executor) {
     const builderFunction = (options, builderContext) => {
         const promise = async () => {
             const nxJsonConfiguration = (0, nx_json_1.readNxJson)(builderContext.workspaceRoot);
+            const [plugins, cleanup] = await (0, internal_api_1.loadNxPlugins)(nxJsonConfiguration.plugins, builderContext.workspaceRoot);
             const projectsConfigurations = {
                 version: 2,
-                projects: (await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(builderContext.workspaceRoot, nxJsonConfiguration)).projects,
+                projects: (await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(plugins, builderContext.workspaceRoot, nxJsonConfiguration)).projects,
             };
+            cleanup();
             const context = {
                 root: builderContext.workspaceRoot,
                 projectName: builderContext.target.project,

package/src/generators/utils/project-configuration.js

@@ -136,8 +136,8 @@ function readAndCombineAllProjectConfigurations(tree) {
         ...(0, package_json_workspaces_1.getGlobPatternsFromPackageManagerWorkspaces)(tree.root, (p) => (0, json_1.readJson)(tree, p, { expectComments: true })),
     ];
     const projectGlobPatterns = (0, retrieve_workspace_files_1.configurationGlobs)([
-        { plugin: project_json_1.ProjectJsonProjectsPlugin },
-        { plugin: (0, package_json_workspaces_1.getNxPackageJsonWorkspacesPlugin)(tree.root) },
+        project_json_1.ProjectJsonProjectsPlugin,
+        { createNodes: package_json_workspaces_1.createNodes },
     ]);
     const globbedFiles = (0, workspace_context_1.globWithWorkspaceContext)(tree.root, projectGlobPatterns);
     const createdFiles = findCreatedProjectFiles(tree, patterns);

package/src/migrations/update-15-1-0/set-project-names.js

@@ -5,10 +5,11 @@ const path_1 = require("path");
 const json_1 = require("../../generators/utils/json");
 const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
 const retrieve_workspace_files_1 = require("../../project-graph/utils/retrieve-workspace-files");
-const nx_plugin_1 = require("../../utils/nx-plugin");
+const internal_api_1 = require("../../project-graph/plugins/internal-api");
 async function default_1(tree) {
     const nxJson = (0, nx_json_1.readNxJson)(tree);
-    const projectFiles = await (0, retrieve_workspace_files_1.retrieveProjectConfigurationPaths)(tree.root, await (0, nx_plugin_1.loadNxPlugins)(nxJson?.plugins));
+    const [plugins, cleanup] = await (0, internal_api_1.loadNxPlugins)(nxJson?.plugins ?? [], tree.root);
+    const projectFiles = (0, retrieve_workspace_files_1.retrieveProjectConfigurationPaths)(tree.root, plugins);
     const projectJsons = projectFiles.filter((f) => f.endsWith('project.json'));
     for (let f of projectJsons) {
         const projectJson = (0, json_1.readJson)(tree, f);
@@ -18,6 +19,7 @@ async function default_1(tree) {
         }
     }
     await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
+    cleanup();
 }
 exports.default = default_1;
 function toProjectName(directory, nxJson) {

package/src/native/assert-supported-platform.js

@@ -28,7 +28,7 @@ function assertSupportedPlatform() {
                 `This platform (${process.platform}-${process.arch}) is currently not supported by Nx.`,
             ];
         }
-        bodyLines.push('For more information please see https://nx.dev/recipes/troubleshooting/troubleshoot-nx-install-issues');
+        bodyLines.push('For more information please see https://nx.dev/troubleshooting/troubleshoot-nx-install-issues');
         output_1.output.error({
             title,
             bodyLines,

package/src/plugins/js/index.d.ts

@@ -1,4 +1,4 @@
-import { CreateDependencies, CreateNodes } from '../../utils/nx-plugin';
+import { CreateDependencies, CreateNodes } from '../../project-graph/plugins';
 export declare const name = "nx/js/dependencies-and-lockfile";
 export declare const createNodes: CreateNodes;
 export declare const createDependencies: CreateDependencies;

package/src/plugins/js/lock-file/lock-file.d.ts

@@ -6,7 +6,7 @@ import { PackageManager } from '../../../utils/package-manager';
 import { ProjectGraph, ProjectGraphExternalNode } from '../../../config/project-graph';
 import { RawProjectGraphDependency } from '../../../project-graph/project-graph-builder';
 import { PackageJson } from '../../../utils/package-json';
-import { CreateDependenciesContext, CreateNodesContext } from '../../../utils/nx-plugin';
+import { CreateDependenciesContext, CreateNodesContext } from '../../../project-graph/plugins';
 export declare const LOCKFILES: string[];
 /**
  * Parses lock file and maps dependencies and metadata to {@link LockFileGraph}

package/src/plugins/js/lock-file/npm-parser.d.ts

@@ -1,7 +1,7 @@
 import { NormalizedPackageJson } from './utils/package-json';
 import { RawProjectGraphDependency } from '../../../project-graph/project-graph-builder';
 import { ProjectGraph, ProjectGraphExternalNode } from '../../../config/project-graph';
-import { CreateDependenciesContext } from '../../../utils/nx-plugin';
+import { CreateDependenciesContext } from '../../../project-graph/plugins';
 export declare function getNpmLockfileNodes(lockFileContent: string, lockFileHash: string): Record<string, ProjectGraphExternalNode>;
 export declare function getNpmLockfileDependencies(lockFileContent: string, lockFileHash: string, ctx: CreateDependenciesContext): RawProjectGraphDependency[];
 export declare function stringifyNpmLockfile(graph: ProjectGraph, rootLockFileContent: string, packageJson: NormalizedPackageJson): string;

package/src/plugins/js/lock-file/pnpm-parser.d.ts

@@ -1,7 +1,7 @@
 import { NormalizedPackageJson } from './utils/package-json';
 import { RawProjectGraphDependency } from '../../../project-graph/project-graph-builder';
 import { ProjectGraph, ProjectGraphExternalNode } from '../../../config/project-graph';
-import { CreateDependenciesContext } from '../../../utils/nx-plugin';
+import { CreateDependenciesContext } from '../../../project-graph/plugins';
 export declare function getPnpmLockfileNodes(lockFileContent: string, lockFileHash: string): Record<string, ProjectGraphExternalNode>;
 export declare function getPnpmLockfileDependencies(lockFileContent: string, lockFileHash: string, ctx: CreateDependenciesContext): RawProjectGraphDependency[];
 export declare function stringifyPnpmLockfile(graph: ProjectGraph, rootLockFileContent: string, packageJson: NormalizedPackageJson): string;

package/src/plugins/js/lock-file/yarn-parser.d.ts

@@ -1,7 +1,7 @@
 import { NormalizedPackageJson } from './utils/package-json';
 import { RawProjectGraphDependency } from '../../../project-graph/project-graph-builder';
 import { ProjectGraph, ProjectGraphExternalNode } from '../../../config/project-graph';
-import { CreateDependenciesContext } from '../../../utils/nx-plugin';
+import { CreateDependenciesContext } from '../../../project-graph/plugins';
 export declare function getYarnLockfileNodes(lockFileContent: string, lockFileHash: string, packageJson: NormalizedPackageJson): Record<string, ProjectGraphExternalNode>;
 export declare function getYarnLockfileDependencies(lockFileContent: string, lockFileHash: string, ctx: CreateDependenciesContext): RawProjectGraphDependency[];
 export declare function stringifyYarnLockfile(graph: ProjectGraph, rootLockFileContent: string, packageJson: NormalizedPackageJson): string;

package/src/plugins/js/project-graph/build-dependencies/build-dependencies.d.ts

@@ -1,4 +1,4 @@
-import { CreateDependenciesContext } from '../../../../utils/nx-plugin';
+import { CreateDependenciesContext } from '../../../../project-graph/plugins';
 import { RawProjectGraphDependency } from '../../../../project-graph/project-graph-builder';
 export declare function buildExplicitDependencies(jsPluginConfig: {
     analyzeSourceFiles?: boolean;

package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.d.ts

@@ -1,3 +1,3 @@
-import { CreateDependenciesContext } from '../../../../utils/nx-plugin';
+import { CreateDependenciesContext } from '../../../../project-graph/plugins';
 import { RawProjectGraphDependency } from '../../../../project-graph/project-graph-builder';
 export declare function buildExplicitPackageJsonDependencies(ctx: CreateDependenciesContext): RawProjectGraphDependency[];

package/src/plugins/js/project-graph/build-dependencies/explicit-project-dependencies.d.ts

@@ -1,3 +1,3 @@
-import { CreateDependenciesContext } from '../../../../utils/nx-plugin';
+import { CreateDependenciesContext } from '../../../../project-graph/plugins';
 import { RawProjectGraphDependency } from '../../../../project-graph/project-graph-builder';
 export declare function buildExplicitTypeScriptDependencies(ctx: CreateDependenciesContext): RawProjectGraphDependency[];

package/src/plugins/package-json-workspaces/create-nodes.d.ts

@@ -1,8 +1,8 @@
 import { NxJsonConfiguration } from '../../config/nx-json';
 import { ProjectConfiguration } from '../../config/workspace-json-project-json';
-import { NxPluginV2 } from '../../utils/nx-plugin';
 import { PackageJson } from '../../utils/package-json';
-export declare function getNxPackageJsonWorkspacesPlugin(root: string): NxPluginV2;
+import { CreateNodes } from '../../project-graph/plugins';
+export declare const createNodes: CreateNodes;
 export declare function createNodeFromPackageJson(pkgJsonPath: string, root: string): {
     projects: {
         [x: string]: ProjectConfiguration & {

package/src/plugins/package-json-workspaces/create-nodes.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGlobPatternsFromPackageManagerWorkspaces = exports.buildProjectConfigurationFromPackageJson = exports.createNodeFromPackageJson = exports.getNxPackageJsonWorkspacesPlugin = void 0;
+exports.getGlobPatternsFromPackageManagerWorkspaces = exports.buildProjectConfigurationFromPackageJson = exports.createNodeFromPackageJson = exports.createNodes = void 0;
 const minimatch_1 = require("minimatch");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
@@ -12,37 +12,30 @@ const logger_1 = require("../../utils/logger");
 const output_1 = require("../../utils/output");
 const package_json_1 = require("../../utils/package-json");
 const path_1 = require("../../utils/path");
-function getNxPackageJsonWorkspacesPlugin(root) {
-    const readJson = (f) => (0, fileutils_1.readJsonFile)((0, node_path_1.join)(root, f));
-    const patterns = getGlobPatternsFromPackageManagerWorkspaces(root, readJson);
-    // If the user only specified a negative pattern, we should find all package.json
-    // files and only return those that don't match a negative pattern.
-    const negativePatterns = patterns.filter((p) => p.startsWith('!'));
-    let positivePatterns = patterns.filter((p) => !p.startsWith('!'));
-    if (
-    // There are some negative patterns
-    negativePatterns.length > 0 &&
-        // No positive patterns
-        (positivePatterns.length === 0 ||
-            // Or only a single positive pattern that is the default coming from root package
-            (positivePatterns.length === 1 && positivePatterns[0] === 'package.json'))) {
-        positivePatterns.push('**/package.json');
-    }
-    return {
-        name: 'nx/core/package-json-workspaces',
-        createNodes: [
-            (0, globs_1.combineGlobPatterns)(positivePatterns),
-            (p) => {
-                if (!negativePatterns.some((negative) => (0, minimatch_1.minimatch)(p, negative))) {
-                    return createNodeFromPackageJson(p, root);
-                }
-                // A negative pattern matched, so we should not create a node for this package.json
-                return {};
-            },
-        ],
-    };
+const workspace_root_1 = require("../../utils/workspace-root");
+const readJson = (f) => (0, fileutils_1.readJsonFile)((0, node_path_1.join)(workspace_root_1.workspaceRoot, f));
+const patterns = getGlobPatternsFromPackageManagerWorkspaces(workspace_root_1.workspaceRoot, readJson);
+const negativePatterns = patterns.filter((p) => p.startsWith('!'));
+const positivePatterns = patterns.filter((p) => !p.startsWith('!'));
+if (
+// There are some negative patterns
+negativePatterns.length > 0 &&
+    // No positive patterns
+    (positivePatterns.length === 0 ||
+        // Or only a single positive pattern that is the default coming from root package
+        (positivePatterns.length === 1 && positivePatterns[0] === 'package.json'))) {
+    positivePatterns.push('**/package.json');
 }
-exports.getNxPackageJsonWorkspacesPlugin = getNxPackageJsonWorkspacesPlugin;
+exports.createNodes = [
+    (0, globs_1.combineGlobPatterns)(positivePatterns),
+    (p, _, { workspaceRoot }) => {
+        if (!negativePatterns.some((negative) => (0, minimatch_1.minimatch)(p, negative))) {
+            return createNodeFromPackageJson(p, workspaceRoot);
+        }
+        // A negative pattern matched, so we should not create a node for this package.json
+        return {};
+    },
+];
 function createNodeFromPackageJson(pkgJsonPath, root) {
     const json = (0, fileutils_1.readJsonFile)((0, node_path_1.join)(root, pkgJsonPath));
     const project = buildProjectConfigurationFromPackageJson(json, pkgJsonPath, (0, nx_json_1.readNxJson)(root));

package/src/plugins/package-json-workspaces/index.d.ts

@@ -1 +1,2 @@
 export * from './create-nodes';
+export declare const name = "nx/core/package-json-workspaces";

package/src/plugins/package-json-workspaces/index.js

@@ -1,4 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.name = void 0;
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./create-nodes"), exports);
+exports.name = 'nx/core/package-json-workspaces';

package/src/plugins/project-json/build-nodes/package-json-next-to-project-json.d.ts

@@ -1,2 +1,3 @@
-import { NxPluginV2 } from '../../../utils/nx-plugin';
+import { NxPluginV2 } from '../../../project-graph/plugins';
 export declare const PackageJsonProjectsNextToProjectJsonPlugin: NxPluginV2;
+export default PackageJsonProjectsNextToProjectJsonPlugin;

package/src/plugins/project-json/build-nodes/package-json-next-to-project-json.js

@@ -24,6 +24,7 @@ exports.PackageJsonProjectsNextToProjectJsonPlugin = {
         },
     ],
 };
+exports.default = exports.PackageJsonProjectsNextToProjectJsonPlugin;
 function createProjectFromPackageJsonNextToProjectJson(projectJsonPath, workspaceRoot) {
     const root = (0, path_1.dirname)(projectJsonPath);
     const packageJsonPath = (0, path_1.join)(workspaceRoot, root, 'package.json');

package/src/plugins/project-json/build-nodes/project-json.d.ts

@@ -1,4 +1,5 @@
 import { ProjectConfiguration } from '../../../config/workspace-json-project-json';
-import { NxPluginV2 } from '../../../utils/nx-plugin';
+import { NxPluginV2 } from '../../../project-graph/plugins';
 export declare const ProjectJsonProjectsPlugin: NxPluginV2;
+export default ProjectJsonProjectsPlugin;
 export declare function buildProjectFromProjectJson(json: Partial<ProjectConfiguration>, path: string): ProjectConfiguration;

package/src/plugins/project-json/build-nodes/project-json.js

@@ -19,6 +19,7 @@ exports.ProjectJsonProjectsPlugin = {
         },
     ],
 };
+exports.default = exports.ProjectJsonProjectsPlugin;
 function buildProjectFromProjectJson(json, path) {
     return {
         name: (0, workspaces_1.toProjectName)(path),

package/src/plugins/target-defaults/symbols.d.ts

@@ -0,0 +1,17 @@
+/**
+ * This marks that a target provides information which should modify a target already registered
+ * on the project via other plugins. If the target has not already been registered, and this symbol is true,
+ * the information provided by it will be discarded.
+ *
+ * NOTE: This cannot be a symbol, as they are not serialized in JSON the communication
+ * between the plugin-worker and the main process.
+ */
+export declare const ONLY_MODIFIES_EXISTING_TARGET = "NX_ONLY_MODIFIES_EXISTING_TARGET";
+/**
+ * This is used to override the source file for the target defaults plugin.
+ * This allows the plugin to use the project files as the context, but point to nx.json as the source file.
+ *
+ * NOTE: This cannot be a symbol, as they are not serialized in JSON the communication
+ * between the plugin-worker and the main process.
+ */
+export declare const OVERRIDE_SOURCE_FILE = "NX_OVERRIDE_SOURCE_FILE";