nx 18.1.0-canary.20240309-235ca8c → 18.1.0-canary.20240312-9520aa2

package/bin/post-install.js

@@ -12,10 +12,10 @@ const nx_cloud_utils_1 = require("../src/utils/nx-cloud-utils");
 const nx_json_1 = require("../src/config/nx-json");
 const workspace_context_1 = require("../src/utils/workspace-context");
 (async () => {
-    const start = new Date();
     try {
         (0, workspace_context_1.setupWorkspaceContext)(workspace_root_1.workspaceRoot);
         if (isMainNxPackage() && (0, fileutils_1.fileExists)((0, path_1.join)(workspace_root_1.workspaceRoot, 'nx.json'))) {
+            const b = new Date();
             (0, assert_supported_platform_1.assertSupportedPlatform)();
             try {
                 await client_1.daemonClient.stop();
@@ -34,6 +34,10 @@ const workspace_context_1 = require("../src/utils/workspace-context");
                     }
                 });
             }));
+            if (process.env.NX_VERBOSE_LOGGING === 'true') {
+                const a = new Date();
+                console.log(`Nx postinstall steps took ${a.getTime() - b.getTime()}ms`);
+            }
         }
     }
     catch (e) {
@@ -41,12 +45,6 @@ const workspace_context_1 = require("../src/utils/workspace-context");
             console.log(e);
         }
     }
-    finally {
-        if (process.env.NX_VERBOSE_LOGGING === 'true') {
-            const end = new Date();
-            console.log(`Nx postinstall steps took ${end.getTime() - start.getTime()}ms`);
-        }
-    }
 })();
 function isMainNxPackage() {
     const mainNxPath = require.resolve('nx', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "18.1.0-canary.20240309-235ca8c",
+  "version": "18.1.0-canary.20240312-9520aa2",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -66,7 +66,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "18.1.0-canary.20240309-235ca8c"
+    "@nrwl/tao": "18.1.0-canary.20240312-9520aa2"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "18.1.0-canary.20240309-235ca8c",
-    "@nx/nx-darwin-arm64": "18.1.0-canary.20240309-235ca8c",
-    "@nx/nx-linux-x64-gnu": "18.1.0-canary.20240309-235ca8c",
-    "@nx/nx-linux-x64-musl": "18.1.0-canary.20240309-235ca8c",
-    "@nx/nx-win32-x64-msvc": "18.1.0-canary.20240309-235ca8c",
-    "@nx/nx-linux-arm64-gnu": "18.1.0-canary.20240309-235ca8c",
-    "@nx/nx-linux-arm64-musl": "18.1.0-canary.20240309-235ca8c",
-    "@nx/nx-linux-arm-gnueabihf": "18.1.0-canary.20240309-235ca8c",
-    "@nx/nx-win32-arm64-msvc": "18.1.0-canary.20240309-235ca8c",
-    "@nx/nx-freebsd-x64": "18.1.0-canary.20240309-235ca8c"
+    "@nx/nx-darwin-x64": "18.1.0-canary.20240312-9520aa2",
+    "@nx/nx-darwin-arm64": "18.1.0-canary.20240312-9520aa2",
+    "@nx/nx-linux-x64-gnu": "18.1.0-canary.20240312-9520aa2",
+    "@nx/nx-linux-x64-musl": "18.1.0-canary.20240312-9520aa2",
+    "@nx/nx-win32-x64-msvc": "18.1.0-canary.20240312-9520aa2",
+    "@nx/nx-linux-arm64-gnu": "18.1.0-canary.20240312-9520aa2",
+    "@nx/nx-linux-arm64-musl": "18.1.0-canary.20240312-9520aa2",
+    "@nx/nx-linux-arm-gnueabihf": "18.1.0-canary.20240312-9520aa2",
+    "@nx/nx-win32-arm64-msvc": "18.1.0-canary.20240312-9520aa2",
+    "@nx/nx-freebsd-x64": "18.1.0-canary.20240312-9520aa2"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/adapter/angular-json.d.ts

@@ -1,8 +1,7 @@
 import { ProjectsConfigurations } from '../config/workspace-json-project-json';
-import { NxPluginV2 } from '../project-graph/plugins';
+import { NxPluginV2 } from '../utils/nx-plugin';
 export declare const NX_ANGULAR_JSON_PLUGIN_NAME = "nx-angular-json-plugin";
 export declare const NxAngularJsonPlugin: NxPluginV2;
-export default NxAngularJsonPlugin;
 export declare function shouldMergeAngularProjects(root: string, includeProjectsFromAngularJson: boolean): boolean;
 export declare function isAngularPluginInstalled(): boolean;
 export declare function toNewFormat(w: any): ProjectsConfigurations;

package/src/adapter/angular-json.js

@@ -14,7 +14,6 @@ exports.NxAngularJsonPlugin = {
         }),
     ],
 };
-exports.default = exports.NxAngularJsonPlugin;
 function shouldMergeAngularProjects(root, includeProjectsFromAngularJson) {
     if ((0, fs_1.existsSync)(path.join(root, 'angular.json')) &&
         // Include projects from angular.json if explicitly required.

package/src/adapter/ngcli-adapter.js

@@ -19,7 +19,7 @@ const package_json_1 = require("../utils/package-json");
 const package_manager_1 = require("../utils/package-manager");
 const angular_json_1 = require("./angular-json");
 const executor_utils_1 = require("../command-line/run/executor-utils");
-const plugins_1 = require("../project-graph/plugins");
+const nx_plugin_1 = require("../utils/nx-plugin");
 const schema_utils_1 = require("../config/schema-utils");
 async function createBuilderContext(builderInfo, context) {
     require('./compat');
@@ -146,7 +146,7 @@ function createNodeModulesEngineHost(resolvePaths, projects) {
                 collectionFilePath = require.resolve(name, { paths });
             }
             else {
-                const { json: { generators, schematics }, path: packageJsonPath, } = (0, plugins_1.readPluginPackageJson)(name, projects, paths);
+                const { json: { generators, schematics }, path: packageJsonPath, } = (0, nx_plugin_1.readPluginPackageJson)(name, projects, paths);
                 if (!schematics && !generators) {
                     throw new Error(`The "${name}" package does not support Nx generators or Angular Devkit schematics.`);
                 }
@@ -802,7 +802,7 @@ async function getWrappedWorkspaceNodeModulesArchitectHost(workspace, root, proj
             };
         }
         readExecutorsJson(nodeModule, builder) {
-            const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(nodeModule, this.projects, this.root ? [this.root, __dirname] : [__dirname]);
+            const { json: packageJson, path: packageJsonPath } = (0, nx_plugin_1.readPluginPackageJson)(nodeModule, this.projects, this.root ? [this.root, __dirname] : [__dirname]);
             const executorsFile = packageJson.executors ?? packageJson.builders;
             if (!executorsFile) {
                 throw new Error(`The "${nodeModule}" package does not support Nx executors or Angular Devkit Builders.`);

package/src/command-line/generate/generator-utils.js

@@ -4,7 +4,7 @@ exports.readGeneratorsJson = exports.getGeneratorInformation = void 0;
 const path_1 = require("path");
 const schema_utils_1 = require("../../config/schema-utils");
 const fileutils_1 = require("../../utils/fileutils");
-const plugins_1 = require("../../project-graph/plugins");
+const nx_plugin_1 = require("../../utils/nx-plugin");
 function getGeneratorInformation(collectionName, generatorName, root, projects) {
     try {
         const { generatorsFilePath, generatorsJson, resolvedCollectionName, normalizedGeneratorName, } = readGeneratorsJson(collectionName, generatorName, root, projects);
@@ -48,7 +48,7 @@ function readGeneratorsJson(collectionName, generator, root, projects) {
         });
     }
     else {
-        const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(collectionName, projects, root ? [root, __dirname] : [__dirname]);
+        const { json: packageJson, path: packageJsonPath } = (0, nx_plugin_1.readPluginPackageJson)(collectionName, projects, root ? [root, __dirname] : [__dirname]);
         const generatorsFile = packageJson.generators ?? packageJson.schematics;
         if (!generatorsFile) {
             throw new Error(`The "${collectionName}" package does not support Nx generators.`);

package/src/command-line/run/executor-utils.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExecutorInformation = exports.normalizeExecutorSchema = void 0;
 const path_1 = require("path");
-const plugins_1 = require("../../project-graph/plugins");
+const nx_plugin_1 = require("../../utils/nx-plugin");
 const fileutils_1 = require("../../utils/fileutils");
 const schema_utils_1 = require("../../config/schema-utils");
 const installation_directory_1 = require("../../utils/installation-directory");
@@ -55,7 +55,7 @@ function getExecutorInformation(nodeModule, executor, root, projects) {
 }
 exports.getExecutorInformation = getExecutorInformation;
 function readExecutorJson(nodeModule, executor, root, projects) {
-    const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(nodeModule, projects, root
+    const { json: packageJson, path: packageJsonPath } = (0, nx_plugin_1.readPluginPackageJson)(nodeModule, projects, root
         ? [root, __dirname, process.cwd(), ...(0, installation_directory_1.getNxRequirePaths)()]
         : [__dirname, process.cwd(), ...(0, installation_directory_1.getNxRequirePaths)()]);
     const executorsFile = packageJson.executors ?? packageJson.builders;

package/src/config/schema-utils.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveSchema = exports.resolveImplementation = exports.getImplementationFactory = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
-const plugins_1 = require("../project-graph/plugins");
+const nx_plugin_1 = require("../utils/nx-plugin");
 /**
  * This function is used to get the implementation factory of an executor or generator.
  * @param implementation path to the implementation
@@ -15,7 +15,7 @@ function getImplementationFactory(implementation, directory) {
     return () => {
         const modulePath = resolveImplementation(implementationModulePath, directory);
         if ((0, path_1.extname)(modulePath) === '.ts') {
-            (0, plugins_1.registerPluginTSTranspiler)();
+            (0, nx_plugin_1.registerPluginTSTranspiler)();
         }
         const module = require(modulePath);
         return implementationExportName

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/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/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),

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

@@ -1,5 +1,5 @@
 import { TargetConfiguration } from '../../config/workspace-json-project-json';
-import { NxPluginV2 } from '../../project-graph/plugins';
+import { NxPluginV2 } from '../../utils/nx-plugin';
 /**
  * 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,
@@ -18,7 +18,6 @@ export declare const ONLY_MODIFIES_EXISTING_TARGET = "NX_ONLY_MODIFIES_EXISTING_
  */
 export declare const OVERRIDE_SOURCE_FILE = "NX_OVERRIDE_SOURCE_FILE";
 export declare const TargetDefaultsPlugin: NxPluginV2;
-export default TargetDefaultsPlugin;
 /**
  * This fn gets target info that would make a target uniquely compatible
  * with what is described by project.json or package.json. As the merge process

package/src/plugins/target-defaults/target-defaults-plugin.js

@@ -87,7 +87,6 @@ exports.TargetDefaultsPlugin = {
         },
     ],
 };
-exports.default = exports.TargetDefaultsPlugin;
 function getExecutorToTargetMap(packageJsonTargets, projectJsonTargets) {
     const executorToTargetMap = new Map();
     const targets = Object.keys({

package/src/project-graph/affected/locators/project-glob-changes.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTouchedProjectsFromProjectGlobChanges = void 0;
 const minimatch_1 = require("minimatch");
 const workspace_root_1 = require("../../../utils/workspace-root");
+const installation_directory_1 = require("../../../utils/installation-directory");
 const path_1 = require("path");
 const fs_1 = require("fs");
 const retrieve_workspace_files_1 = require("../../utils/retrieve-workspace-files");
-const internal_api_1 = require("../../plugins/internal-api");
+const nx_plugin_1 = require("../../../utils/nx-plugin");
 const globs_1 = require("../../../utils/globs");
 const getTouchedProjectsFromProjectGlobChanges = async (touchedFiles, projectGraphNodes, nxJson) => {
-    const plugins = await (0, internal_api_1.loadPlugins)(nxJson?.plugins ?? [], workspace_root_1.workspaceRoot);
-    const globPattern = (0, globs_1.combineGlobPatterns)((0, retrieve_workspace_files_1.configurationGlobs)(plugins.map((p) => p.plugin)));
+    const globPattern = (0, globs_1.combineGlobPatterns)((0, retrieve_workspace_files_1.configurationGlobs)(await (0, nx_plugin_1.loadNxPlugins)(nxJson?.plugins, (0, installation_directory_1.getNxRequirePaths)(workspace_root_1.workspaceRoot), workspace_root_1.workspaceRoot)));
     const touchedProjects = new Set();
     for (const touchedFile of touchedFiles) {
         const isProjectFile = (0, minimatch_1.minimatch)(touchedFile.file, globPattern, {

package/src/project-graph/build-project-graph.d.ts

@@ -1,6 +1,5 @@
 import { FileData } from './file-utils';
 import { FileMapCache } from './nx-deps-cache';
-import { RemotePlugin } from './plugins/internal-api';
 import { FileMap, ProjectGraph, ProjectGraphExternalNode } from '../config/project-graph';
 import { ProjectConfiguration } from '../config/workspace-json-project-json';
 import { NxWorkspaceFilesExternals } from '../native';
@@ -9,7 +8,7 @@ export declare function getFileMap(): {
     allWorkspaceFiles: FileData[];
     rustReferences: NxWorkspaceFilesExternals | null;
 };
-export declare function buildProjectGraphUsingProjectFileMap(projects: Record<string, ProjectConfiguration>, externalNodes: Record<string, ProjectGraphExternalNode>, fileMap: FileMap, allWorkspaceFiles: FileData[], rustReferences: NxWorkspaceFilesExternals, fileMapCache: FileMapCache | null, shouldWriteCache: boolean, plugins: RemotePlugin[]): Promise<{
+export declare function buildProjectGraphUsingProjectFileMap(projects: Record<string, ProjectConfiguration>, externalNodes: Record<string, ProjectGraphExternalNode>, fileMap: FileMap, allWorkspaceFiles: FileData[], rustReferences: NxWorkspaceFilesExternals, fileMapCache: FileMapCache | null, shouldWriteCache: boolean): Promise<{
     projectGraph: ProjectGraph;
     projectFileMapCache: FileMapCache;
 }>;