nx 18.1.0-canary.20240309-235ca8c → 18.1.0-canary.20240313-81df848

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={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))})()})();
+(()=>{"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={2: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([[532],{22232:()=>{}},s=>{var e;e=22232,s(s.s=e)}]);
+"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[3],{22232:(s,e,k)=>{k.r(e)}},s=>{var e;e=22232,s(s.s=e)}]);

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

@@ -13,7 +13,6 @@ 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 plugins_1 = require("./plugins");
 let cachedSerializedProjectGraphPromise;
 const collectedUpdatedFiles = new Set();
 const collectedDeletedFiles = new Set();
@@ -31,16 +30,15 @@ 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(plugins);
+                    processFilesAndCreateAndSerializeProjectGraph();
             }
         }
         else {
             cachedSerializedProjectGraphPromise =
-                processFilesAndCreateAndSerializeProjectGraph(plugins);
+                processFilesAndCreateAndSerializeProjectGraph();
         }
         return await cachedSerializedProjectGraphPromise;
     }
@@ -79,7 +77,7 @@ function addUpdatedAndDeletedFiles(createdFiles, updatedFiles, deletedFiles) {
                 waitPeriod = waitPeriod * 2;
             }
             cachedSerializedProjectGraphPromise =
-                processFilesAndCreateAndSerializeProjectGraph(await (0, plugins_1.getPlugins)());
+                processFilesAndCreateAndSerializeProjectGraph();
             await cachedSerializedProjectGraphPromise;
             if (createdFiles.length > 0) {
                 (0, file_watcher_sockets_1.notifyFileWatcherSockets)(createdFiles, null, null);
@@ -127,7 +125,7 @@ async function processCollectedUpdatedAndDeletedFiles({ projects, externalNodes,
         throw e;
     }
 }
-async function processFilesAndCreateAndSerializeProjectGraph(plugins) {
+async function processFilesAndCreateAndSerializeProjectGraph() {
     try {
         perf_hooks_1.performance.mark('hash-watched-changes-start');
         const updatedFiles = [...collectedUpdatedFiles.values()];
@@ -139,8 +137,9 @@ async function processFilesAndCreateAndSerializeProjectGraph(plugins) {
         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;
-        const graphNodes = await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(plugins, workspace_root_1.workspaceRoot, nxJson);
+        const graphNodes = await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(workspace_root_1.workspaceRoot, nxJson);
         await processCollectedUpdatedAndDeletedFiles(graphNodes, updatedFileHashes, deletedFiles);
         const g = createAndSerializeProjectGraph(graphNodes);
         delete global.NX_GRAPH_CREATION;
@@ -177,7 +176,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)(), true, await (0, plugins_1.getPlugins)());
+        const { projectGraph, projectFileMapCache } = await (0, build_project_graph_1.buildProjectGraphUsingProjectFileMap)(projects, knownExternalNodes, fileMap, allWorkspaceFiles, rustReferences, exports.currentProjectFileMapCache || (0, nx_deps_cache_1.readFileMapCache)(), true);
         exports.currentProjectFileMapCache = projectFileMapCache;
         exports.currentProjectGraph = projectGraph;
         perf_hooks_1.performance.mark('create-project-graph-end');

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

@@ -5,7 +5,6 @@ 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) {
@@ -29,7 +28,6 @@ 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,8 +19,7 @@ export type { Generator, GeneratorCallback, Executor, ExecutorContext, TaskGraph
  */
 export { Workspaces } from './config/workspaces';
 export { workspaceLayout } from './config/configuration';
-export type { NxPlugin, NxPluginV2, CreateNodes, CreateNodesFunction, CreateNodesResult, CreateNodesContext, CreateDependencies, CreateDependenciesContext, } from './project-graph/plugins';
-export type { NxPluginV1, ProjectTargetConfigurator, } from './utils/nx-plugin.deprecated';
+export type { NxPlugin, NxPluginV1, NxPluginV2, ProjectTargetConfigurator, CreateNodes, CreateNodesFunction, CreateNodesResult, CreateNodesContext, CreateDependencies, CreateDependenciesContext, } from './utils/nx-plugin';
 /**
  * @category Workspace
  */

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

@@ -25,6 +25,8 @@ export interface RunCommandsOptions extends Json {
     args?: string | string[];
     envFile?: string;
     __unparsed__: string[];
+    usePty?: boolean;
+    streamOutput?: boolean;
 }
 export interface NormalizedRunCommandsOptions extends RunCommandsOptions {
     commands: {
@@ -41,5 +43,6 @@ export interface NormalizedRunCommandsOptions extends RunCommandsOptions {
 }
 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;

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

@@ -34,7 +34,8 @@ const propKeys = [
     'envFile',
     '__unparsed__',
     'env',
-    'mode',
+    'usePty',
+    'streamOutput',
     'verbose',
 ];
 async function default_1(options, context) {
@@ -48,10 +49,10 @@ async function default_1(options, context) {
         throw new Error('ERROR: Bad executor config for run-commands - "prefix", "color" and "bgColor" can only be set when "parallel=true".');
     }
     try {
-        const success = options.parallel
+        const result = options.parallel
             ? await runInParallel(normalized, context)
             : await runSerially(normalized, context);
-        return { success };
+        return result;
     }
     catch (e) {
         if (process.env.NX_VERBOSE_LOGGING === 'true') {
@@ -62,31 +63,48 @@ async function default_1(options, context) {
 }
 exports.default = default_1;
 async function runInParallel(options, context) {
-    const procs = options.commands.map((c) => createProcess(c, options.readyWhen, options.color, calculateCwd(options.cwd, context), options.env ?? {}, true).then((result) => ({
+    const procs = options.commands.map((c) => createProcess(c, options.readyWhen, options.color, calculateCwd(options.cwd, context), options.env ?? {}, true, options.usePty, options.streamOutput).then((result) => ({
         result,
         command: c.command,
     })));
+    let terminalOutput = '';
     if (options.readyWhen) {
         const r = await Promise.race(procs);
-        if (!r.result) {
-            process.stderr.write(`Warning: command "${r.command}" exited with non-zero status code`);
-            return false;
+        terminalOutput += r.result.terminalOutput;
+        if (!r.result.success) {
+            const output = `Warning: command "${r.command}" exited with non-zero status code`;
+            terminalOutput += output;
+            if (options.streamOutput) {
+                process.stderr.write(output);
+            }
+            return { success: false, terminalOutput };
         }
         else {
-            return true;
+            return { success: true, terminalOutput };
         }
     }
     else {
         const r = await Promise.all(procs);
-        const failed = r.filter((v) => !v.result);
+        terminalOutput += r.map((f) => f.result.terminalOutput).join('');
+        const failed = r.filter((v) => !v.result.success);
         if (failed.length > 0) {
-            failed.forEach((f) => {
-                process.stderr.write(`Warning: command "${f.command}" exited with non-zero status code`);
-            });
-            return false;
+            const output = failed
+                .map((f) => `Warning: command "${f.command}" exited with non-zero status code`)
+                .join('\r\n');
+            terminalOutput += output;
+            if (options.streamOutput) {
+                process.stderr.write(output);
+            }
+            return {
+                success: false,
+                terminalOutput,
+            };
         }
         else {
-            return true;
+            return {
+                success: true,
+                terminalOutput,
+            };
         }
     }
 }
@@ -118,46 +136,53 @@ function normalizeOptions(options) {
     return options;
 }
 async function runSerially(options, context) {
+    let terminalOutput = '';
     for (const c of options.commands) {
-        const success = await createProcess(c, undefined, options.color, calculateCwd(options.cwd, context), options.env ?? {}, false);
-        if (!success) {
-            process.stderr.write(`Warning: command "${c.command}" exited with non-zero status code`);
-            return false;
+        const result = await createProcess(c, undefined, options.color, calculateCwd(options.cwd, context), options.env ?? {}, false, options.usePty, options.streamOutput);
+        terminalOutput += result.terminalOutput;
+        if (!result.success) {
+            const output = `Warning: command "${c.command}" exited with non-zero status code`;
+            result.terminalOutput += output;
+            if (options.streamOutput) {
+                process.stderr.write(output);
+            }
+            return { success: false, terminalOutput };
         }
     }
-    return true;
+    return { success: true, terminalOutput };
 }
-async function createProcess(commandConfig, readyWhen, color, cwd, env, isParallel) {
+async function createProcess(commandConfig, readyWhen, color, cwd, env, isParallel, usePty = true, streamOutput = true) {
     env = processEnv(color, cwd, env);
     // The rust runCommand is always a tty, so it will not look nice in parallel and if we need prefixes
     // currently does not work properly in windows
     if (process.env.NX_NATIVE_COMMAND_RUNNER !== 'false' &&
         process.stdout.isTTY &&
         !commandConfig.prefix &&
-        !isParallel) {
-        const cp = new child_process_2.PseudoTtyProcess((0, native_1.runCommand)(commandConfig.command, cwd, env));
+        !isParallel &&
+        usePty) {
+        const cp = new child_process_2.PseudoTtyProcess((0, native_1.runCommand)(commandConfig.command, cwd, env, !streamOutput));
+        let terminalOutput = '';
         return new Promise((res) => {
             cp.onOutput((output) => {
+                terminalOutput += output;
                 if (readyWhen && output.indexOf(readyWhen) > -1) {
-                    res(true);
+                    res({ success: true, terminalOutput });
                 }
             });
             cp.onExit((code) => {
-                if (code === 0) {
-                    res(true);
-                }
-                else if (code >= 128) {
+                if (code >= 128) {
                     process.exit(code);
                 }
                 else {
-                    res(false);
+                    res({ success: code === 0, terminalOutput });
                 }
             });
         });
     }
-    return nodeProcess(commandConfig, color, cwd, env, readyWhen);
+    return nodeProcess(commandConfig, cwd, env, readyWhen, streamOutput);
 }
-function nodeProcess(commandConfig, color, cwd, env, readyWhen) {
+function nodeProcess(commandConfig, cwd, env, readyWhen, streamOutput = true) {
+    let terminalOutput = '';
     return new Promise((res) => {
         const childProcess = (0, child_process_1.exec)(commandConfig.command, {
             maxBuffer: exports.LARGE_BUFFER,
@@ -173,24 +198,36 @@ function nodeProcess(commandConfig, color, cwd, env, readyWhen) {
         process.on('SIGINT', processExitListener);
         process.on('SIGQUIT', processExitListener);
         childProcess.stdout.on('data', (data) => {
-            process.stdout.write(addColorAndPrefix(data, commandConfig));
+            const output = addColorAndPrefix(data, commandConfig);
+            terminalOutput += output;
+            if (streamOutput) {
+                process.stdout.write(output);
+            }
             if (readyWhen && data.toString().indexOf(readyWhen) > -1) {
-                res(true);
+                res({ success: true, terminalOutput });
             }
         });
         childProcess.stderr.on('data', (err) => {
-            process.stderr.write(addColorAndPrefix(err, commandConfig));
+            const output = addColorAndPrefix(err, commandConfig);
+            terminalOutput += output;
+            if (streamOutput) {
+                process.stderr.write(output);
+            }
             if (readyWhen && err.toString().indexOf(readyWhen) > -1) {
-                res(true);
+                res({ success: true, terminalOutput });
             }
         });
         childProcess.on('error', (err) => {
-            process.stderr.write(addColorAndPrefix(err.toString(), commandConfig));
-            res(false);
+            const ouptput = addColorAndPrefix(err.toString(), commandConfig);
+            terminalOutput += ouptput;
+            if (streamOutput) {
+                process.stderr.write(ouptput);
+            }
+            res({ success: false, terminalOutput });
         });
         childProcess.on('exit', (code) => {
             if (!readyWhen) {
-                res(code === 0);
+                res({ success: code === 0, terminalOutput });
             }
         });
     });
@@ -218,11 +255,13 @@ function calculateCwd(cwd, context) {
     return path.join(context.root, cwd);
 }
 function processEnv(color, cwd, env) {
+    const localEnv = (0, npm_run_path_1.env)({ cwd: cwd ?? process.cwd() });
     const res = {
         ...process.env,
-        ...(0, npm_run_path_1.env)({ cwd: cwd ?? process.cwd() }),
+        ...localEnv,
         ...env,
     };
+    res.PATH = localEnv.PATH; // need to override PATH to make sure we are using the local node_modules
     if (color) {
         res.FORCE_COLOR = `${color}`;
     }

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

@@ -6,7 +6,6 @@ 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
  *
@@ -16,12 +15,10 @@ 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.loadNxPluginsInIsolation)(nxJsonConfiguration.plugins, builderContext.workspaceRoot);
             const projectsConfigurations = {
                 version: 2,
-                projects: (await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(plugins, builderContext.workspaceRoot, nxJsonConfiguration)).projects,
+                projects: (await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(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)([
-        project_json_1.ProjectJsonProjectsPlugin,
-        { createNodes: package_json_workspaces_1.createNodes },
+        { plugin: project_json_1.ProjectJsonProjectsPlugin },
+        { plugin: (0, package_json_workspaces_1.getNxPackageJsonWorkspacesPlugin)(tree.root) },
     ]);
     const globbedFiles = (0, workspace_context_1.globWithWorkspaceContext)(tree.root, projectGlobPatterns);
     const createdFiles = findCreatedProjectFiles(tree, patterns);

package/src/hasher/hash-task.js

@@ -9,7 +9,7 @@ async function hashTasksThatDoNotDependOnOutputsOfOtherTasks(hasher, projectGrap
     performance.mark('hashMultipleTasks:start');
     const tasks = Object.values(taskGraph.tasks);
     const tasksWithHashers = await Promise.all(tasks.map(async (task) => {
-        const customHasher = await (0, utils_1.getCustomHasher)(task, projectGraph);
+        const customHasher = (0, utils_1.getCustomHasher)(task, projectGraph);
         return { task, customHasher };
     }));
     const tasksToHash = tasksWithHashers
@@ -33,7 +33,7 @@ async function hashTasksThatDoNotDependOnOutputsOfOtherTasks(hasher, projectGrap
 exports.hashTasksThatDoNotDependOnOutputsOfOtherTasks = hashTasksThatDoNotDependOnOutputsOfOtherTasks;
 async function hashTask(hasher, projectGraph, taskGraph, task, env) {
     performance.mark('hashSingleTask:start');
-    const customHasher = await (0, utils_1.getCustomHasher)(task, projectGraph);
+    const customHasher = (0, utils_1.getCustomHasher)(task, projectGraph);
     const projectsConfigurations = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
     const { value, details } = await (customHasher
         ? customHasher(task, {

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

@@ -5,10 +5,10 @@ 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 internal_api_1 = require("../../project-graph/plugins/internal-api");
+const nx_plugin_1 = require("../../utils/nx-plugin");
 async function default_1(tree) {
     const nxJson = (0, nx_json_1.readNxJson)(tree);
-    const projectFiles = (0, retrieve_workspace_files_1.retrieveProjectConfigurationPaths)(tree.root, (await (0, internal_api_1.loadPlugins)(nxJson?.plugins ?? [], tree.root)).map((p) => p.plugin));
+    const projectFiles = await (0, retrieve_workspace_files_1.retrieveProjectConfigurationPaths)(tree.root, await (0, nx_plugin_1.loadNxPlugins)(nxJson?.plugins));
     const projectJsons = projectFiles.filter((f) => f.endsWith('project.json'));
     for (let f of projectJsons) {
         const projectJson = (0, json_1.readJson)(tree, f);

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

@@ -1,4 +1,4 @@
-import { CreateDependencies, CreateNodes } from '../../project-graph/plugins';
+import { CreateDependencies, CreateNodes } from '../../utils/nx-plugin';
 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 } from '../../../project-graph/plugins';
+import { CreateDependenciesContext } from '../../../utils/nx-plugin';
 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 '../../../project-graph/plugins';
+import { CreateDependenciesContext } from '../../../utils/nx-plugin';
 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 '../../../project-graph/plugins';
+import { CreateDependenciesContext } from '../../../utils/nx-plugin';
 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 '../../../project-graph/plugins';
+import { CreateDependenciesContext } from '../../../utils/nx-plugin';
 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 '../../../../project-graph/plugins';
+import { CreateDependenciesContext } from '../../../../utils/nx-plugin';
 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 '../../../../project-graph/plugins';
+import { CreateDependenciesContext } from '../../../../utils/nx-plugin';
 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 '../../../../project-graph/plugins';
+import { CreateDependenciesContext } from '../../../../utils/nx-plugin';
 import { RawProjectGraphDependency } from '../../../../project-graph/project-graph-builder';
 export declare function buildExplicitTypeScriptDependencies(ctx: CreateDependenciesContext): RawProjectGraphDependency[];

package/src/plugins/js/utils/register.js

@@ -67,7 +67,9 @@ function getTranspiler(compilerOptions) {
     }
     compilerOptions.lib = ['es2021'];
     compilerOptions.module = ts.ModuleKind.CommonJS;
-    compilerOptions.moduleResolution = ts.ModuleResolutionKind.Node10;
+    // use NodeJs module resolution until support for TS 4.x is dropped and then
+    // we can switch to Node10
+    compilerOptions.moduleResolution = ts.ModuleResolutionKind.NodeJs;
     compilerOptions.target = ts.ScriptTarget.ES2021;
     compilerOptions.inlineSourceMap = true;
     compilerOptions.skipLibCheck = true;

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';
-import { CreateNodes } from '../../project-graph/plugins';
-export declare const createNodes: CreateNodes;
+export declare function getNxPackageJsonWorkspacesPlugin(root: string): NxPluginV2;
 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.createNodes = void 0;
+exports.getGlobPatternsFromPackageManagerWorkspaces = exports.buildProjectConfigurationFromPackageJson = exports.createNodeFromPackageJson = exports.getNxPackageJsonWorkspacesPlugin = void 0;
 const minimatch_1 = require("minimatch");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
@@ -12,30 +12,37 @@ 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");
-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');
+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 {};
+            },
+        ],
+    };
 }
-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 {};
-    },
-];
+exports.getNxPackageJsonWorkspacesPlugin = getNxPackageJsonWorkspacesPlugin;
 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,2 +1 @@
 export * from './create-nodes';
-export declare const name = "nx/core/package-json-workspaces";

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

@@ -1,6 +1,4 @@
 "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,3 +1,2 @@
-import { NxPluginV2 } from '../../../project-graph/plugins';
+import { NxPluginV2 } from '../../../utils/nx-plugin';
 export declare const PackageJsonProjectsNextToProjectJsonPlugin: NxPluginV2;
-export default PackageJsonProjectsNextToProjectJsonPlugin;

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

@@ -24,7 +24,6 @@ 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,5 +1,4 @@
 import { ProjectConfiguration } from '../../../config/workspace-json-project-json';
-import { NxPluginV2 } from '../../../project-graph/plugins';
+import { NxPluginV2 } from '../../../utils/nx-plugin';
 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,7 +19,6 @@ exports.ProjectJsonProjectsPlugin = {
         },
     ],
 };
-exports.default = exports.ProjectJsonProjectsPlugin;
 function buildProjectFromProjectJson(json, path) {
     return {
         name: (0, workspaces_1.toProjectName)(path),