nx 18.1.0-canary.20240223-21e7648 → 18.1.0-canary.20240227-452d845

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "18.1.0-canary.20240223-21e7648",
+  "version": "18.1.0-canary.20240227-452d845",
   "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.20240223-21e7648"
+    "@nrwl/tao": "18.1.0-canary.20240227-452d845"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "18.1.0-canary.20240223-21e7648",
-    "@nx/nx-darwin-arm64": "18.1.0-canary.20240223-21e7648",
-    "@nx/nx-linux-x64-gnu": "18.1.0-canary.20240223-21e7648",
-    "@nx/nx-linux-x64-musl": "18.1.0-canary.20240223-21e7648",
-    "@nx/nx-win32-x64-msvc": "18.1.0-canary.20240223-21e7648",
-    "@nx/nx-linux-arm64-gnu": "18.1.0-canary.20240223-21e7648",
-    "@nx/nx-linux-arm64-musl": "18.1.0-canary.20240223-21e7648",
-    "@nx/nx-linux-arm-gnueabihf": "18.1.0-canary.20240223-21e7648",
-    "@nx/nx-win32-arm64-msvc": "18.1.0-canary.20240223-21e7648",
-    "@nx/nx-freebsd-x64": "18.1.0-canary.20240223-21e7648"
+    "@nx/nx-darwin-x64": "18.1.0-canary.20240227-452d845",
+    "@nx/nx-darwin-arm64": "18.1.0-canary.20240227-452d845",
+    "@nx/nx-linux-x64-gnu": "18.1.0-canary.20240227-452d845",
+    "@nx/nx-linux-x64-musl": "18.1.0-canary.20240227-452d845",
+    "@nx/nx-win32-x64-msvc": "18.1.0-canary.20240227-452d845",
+    "@nx/nx-linux-arm64-gnu": "18.1.0-canary.20240227-452d845",
+    "@nx/nx-linux-arm64-musl": "18.1.0-canary.20240227-452d845",
+    "@nx/nx-linux-arm-gnueabihf": "18.1.0-canary.20240227-452d845",
+    "@nx/nx-win32-arm64-msvc": "18.1.0-canary.20240227-452d845",
+    "@nx/nx-freebsd-x64": "18.1.0-canary.20240227-452d845"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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

@@ -1,7 +1,8 @@
 import { ProjectsConfigurations } from '../config/workspace-json-project-json';
-import { NxPluginV2 } from '../utils/nx-plugin';
+import { NxPluginV2 } from '../project-graph/plugins';
 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,6 +14,7 @@ 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 nx_plugin_1 = require("../utils/nx-plugin");
+const plugins_1 = require("../project-graph/plugins");
 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, nx_plugin_1.readPluginPackageJson)(name, projects, paths);
+                const { json: { generators, schematics }, path: packageJsonPath, } = (0, plugins_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, nx_plugin_1.readPluginPackageJson)(nodeModule, this.projects, this.root ? [this.root, __dirname] : [__dirname]);
+            const { json: packageJson, path: packageJsonPath } = (0, plugins_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 nx_plugin_1 = require("../../utils/nx-plugin");
+const plugins_1 = require("../../project-graph/plugins");
 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, nx_plugin_1.readPluginPackageJson)(collectionName, projects, root ? [root, __dirname] : [__dirname]);
+        const { json: packageJson, path: packageJsonPath } = (0, plugins_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/init/init-v2.js

@@ -17,6 +17,7 @@ const workspace_context_1 = require("../../utils/workspace-context");
 const connect_to_nx_cloud_1 = require("../connect/connect-to-nx-cloud");
 const add_nx_to_npm_repo_1 = require("./implementation/add-nx-to-npm-repo");
 const add_nx_to_monorepo_1 = require("./implementation/add-nx-to-monorepo");
+const path_1 = require("path");
 async function initHandler(options) {
     const version = process.env.NX_VERSION ?? ((0, semver_1.prerelease)(versions_1.nxVersion) ? 'next' : 'latest');
     if (process.env.NX_VERSION) {
@@ -42,6 +43,7 @@ async function initHandler(options) {
         });
         return;
     }
+    output_1.output.log({ title: '🧐 Checking dependencies' });
     const detectPluginsResponse = await detectPlugins();
     if (!detectPluginsResponse?.plugins.length) {
         // If no plugins are detected/chosen, guide users to setup
@@ -63,19 +65,23 @@ async function initHandler(options) {
         const pmc = (0, package_manager_1.getPackageManagerCommand)();
         (0, utils_1.createNxJsonFile)(repoRoot, [], [], {});
         (0, utils_1.updateGitIgnore)(repoRoot);
-        (0, utils_1.addDepsToPackageJson)(repoRoot, detectPluginsResponse?.plugins ?? []);
+        (0, utils_1.addDepsToPackageJson)(repoRoot, detectPluginsResponse.plugins);
         output_1.output.log({ title: '📦 Installing Nx' });
         (0, utils_1.runInstall)(repoRoot, pmc);
-        if (detectPluginsResponse) {
-            output_1.output.log({ title: '🔨 Configuring plugins' });
-            for (const plugin of detectPluginsResponse.plugins) {
-                (0, child_process_2.execSync)(`${pmc.exec} nx g ${plugin}:init --keepExistingVersions ${detectPluginsResponse.updatePackageScripts
-                    ? '--updatePackageScripts'
-                    : ''} --no-interactive`, {
-                    stdio: [0, 1, 2],
-                    cwd: repoRoot,
-                });
-            }
+        output_1.output.log({ title: '🔨 Configuring plugins' });
+        for (const plugin of detectPluginsResponse.plugins) {
+            (0, child_process_2.execSync)(`${pmc.exec} nx g ${plugin}:init --keepExistingVersions ${detectPluginsResponse.updatePackageScripts
+                ? '--updatePackageScripts'
+                : ''} --no-interactive`, {
+                stdio: [0, 1, 2],
+                cwd: repoRoot,
+            });
+        }
+        if (!detectPluginsResponse.updatePackageScripts) {
+            const rootPackageJsonPath = (0, path_1.join)(repoRoot, 'package.json');
+            const json = (0, fileutils_1.readJsonFile)(rootPackageJsonPath);
+            json.nx = {};
+            (0, fileutils_1.writeJsonFile)(rootPackageJsonPath, json);
         }
         if (useNxCloud) {
             output_1.output.log({ title: '🛠️ Setting up Nx Cloud' });

package/src/command-line/migrate/migrate.js

@@ -872,7 +872,9 @@ async function executeMigrations(root, migrations, isVerbose, shouldCreateCommit
         if (b.name === '15-7-0-split-configuration-into-project-json-files') {
             return 1;
         }
-        return (0, semver_1.lt)(a.version, b.version) ? -1 : 1;
+        return (0, semver_1.lt)(normalizeVersion(a.version), normalizeVersion(b.version))
+            ? -1
+            : 1;
     });
     for (const m of sortedMigrations) {
         try {

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 nx_plugin_1 = require("../../utils/nx-plugin");
+const plugins_1 = require("../../project-graph/plugins");
 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, nx_plugin_1.readPluginPackageJson)(nodeModule, projects, root
+    const { json: packageJson, path: packageJsonPath } = (0, plugins_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 nx_plugin_1 = require("../utils/nx-plugin");
+const plugins_1 = require("../project-graph/plugins");
 /**
  * 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, nx_plugin_1.registerPluginTSTranspiler)();
+            (0, plugins_1.registerPluginTSTranspiler)();
         }
         const module = require(modulePath);
         return implementationExportName

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
  */

package/src/devkit-internals.d.ts

@@ -18,3 +18,4 @@ export { hashObject } from './hasher/file-hasher';
 export { hashWithWorkspaceContext } from './utils/workspace-context';
 export { createProjectRootMappingsFromProjectConfigurations, findProjectForPath, } from './project-graph/utils/find-project-for-path';
 export { registerTsProject } from './plugins/js/utils/register';
+export { shutdownPluginWorkers } from './project-graph/plugins/plugin-pool';

package/src/devkit-internals.js

@@ -1,6 +1,6 @@
 "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.shutdownPluginWorkers = 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;
 /**
  * Note to developers: STOP! These exports are available via requireNx in @nx/devkit.
  *
@@ -37,3 +37,5 @@ Object.defineProperty(exports, "createProjectRootMappingsFromProjectConfiguratio
 Object.defineProperty(exports, "findProjectForPath", { enumerable: true, get: function () { return find_project_for_path_1.findProjectForPath; } });
 var register_1 = require("./plugins/js/utils/register");
 Object.defineProperty(exports, "registerTsProject", { enumerable: true, get: function () { return register_1.registerTsProject; } });
+var plugin_pool_1 = require("./project-graph/plugins/plugin-pool");
+Object.defineProperty(exports, "shutdownPluginWorkers", { enumerable: true, get: function () { return plugin_pool_1.shutdownPluginWorkers; } });

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

@@ -134,8 +134,8 @@ function readAndCombineAllProjectConfigurations(tree) {
         ...(0, package_json_workspaces_1.getGlobPatternsFromPackageManagerWorkspaces)(tree.root, (p) => (0, json_1.readJson)(tree, p)),
     ];
     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,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 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 projectFiles = await (0, retrieve_workspace_files_1.retrieveProjectConfigurationPaths)(tree.root, await (0, internal_api_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 '../../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 } from '../../../utils/nx-plugin';
+import { CreateDependenciesContext } 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/target-defaults-plugin.d.ts

@@ -1,6 +1,5 @@
-import { ProjectConfiguration } from '../../config/workspace-json-project-json';
-import { NxPluginV2 } from '../../utils/nx-plugin';
-import { PackageJson } from '../../utils/package-json';
+import { TargetConfiguration } from '../../config/workspace-json-project-json';
+import { NxPluginV2 } from '../../project-graph/plugins';
 /**
  * This symbol 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,
@@ -8,6 +7,7 @@ import { PackageJson } from '../../utils/package-json';
  */
 export declare const ONLY_MODIFIES_EXISTING_TARGET: unique symbol;
 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
@@ -17,7 +17,7 @@ export declare const TargetDefaultsPlugin: NxPluginV2;
  * being scrapped. By adding enough information from the project.json / package.json,
  * we can make sure that the target after merging is compatible with the defined target.
  */
-export declare function getTargetInfo(target: string, projectJson: Pick<ProjectConfiguration, 'targets'>, packageJson: Pick<PackageJson, 'scripts' | 'nx'>): {
+export declare function getTargetInfo(target: string, projectJsonTargets: Record<string, TargetConfiguration>, packageJsonTargets: Record<string, TargetConfiguration>): {
     command: string;
     executor?: undefined;
     options?: undefined;

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

@@ -38,13 +38,12 @@ exports.TargetDefaultsPlugin = {
             }
             const projectJson = readJsonOrNull((0, node_path_1.join)(ctx.workspaceRoot, root, 'project.json'));
             const packageJson = readJsonOrNull((0, node_path_1.join)(ctx.workspaceRoot, root, 'package.json'));
+            const packageJsonTargets = (0, package_json_1.readTargetsFromPackageJson)(packageJson);
             const projectDefinedTargets = new Set([
                 ...Object.keys(projectJson?.targets ?? {}),
-                ...(packageJson
-                    ? Object.keys((0, package_json_1.readTargetsFromPackageJson)(packageJson))
-                    : []),
+                ...(packageJson ? Object.keys(packageJsonTargets) : []),
             ]);
-            const executorToTargetMap = getExecutorToTargetMap(packageJson, projectJson);
+            const executorToTargetMap = getExecutorToTargetMap(packageJsonTargets, projectJson?.targets);
             const modifiedTargets = {};
             for (const defaultSpecifier in targetDefaults) {
                 const targetNames = executorToTargetMap.get(defaultSpecifier) ?? new Set();
@@ -55,7 +54,7 @@ exports.TargetDefaultsPlugin = {
                     if (!modifiedTargets[targetName] || targetName !== defaultSpecifier) {
                         const defaults = JSON.parse(JSON.stringify(targetDefaults[defaultSpecifier]));
                         modifiedTargets[targetName] = {
-                            ...getTargetInfo(targetName, projectJson, packageJson),
+                            ...getTargetInfo(targetName, projectJson?.targets, packageJsonTargets),
                             ...defaults,
                         };
                     }
@@ -76,17 +75,15 @@ exports.TargetDefaultsPlugin = {
         },
     ],
 };
-function getExecutorToTargetMap(packageJson, projectJson) {
+exports.default = exports.TargetDefaultsPlugin;
+function getExecutorToTargetMap(packageJsonTargets, projectJsonTargets) {
     const executorToTargetMap = new Map();
     const targets = Object.keys({
-        ...projectJson?.targets,
-        ...packageJson?.scripts,
-        ...packageJson?.nx?.targets,
+        ...projectJsonTargets,
+        ...packageJsonTargets,
     });
     for (const target of targets) {
-        const executor = projectJson?.targets?.[target]?.executor ??
-            packageJson?.nx?.targets?.[target]?.executor ??
-            'nx:run-script';
+        const executor = getTargetExecutor(target, projectJsonTargets, packageJsonTargets);
         const targetsForExecutor = executorToTargetMap.get(executor) ?? new Set();
         targetsForExecutor.add(target);
         executorToTargetMap.set(executor, targetsForExecutor);
@@ -110,10 +107,10 @@ function readJsonOrNull(path) {
  * being scrapped. By adding enough information from the project.json / package.json,
  * we can make sure that the target after merging is compatible with the defined target.
  */
-function getTargetInfo(target, projectJson, packageJson) {
-    const projectJsonTarget = projectJson?.targets?.[target];
-    const packageJsonTarget = packageJson?.nx?.targets?.[target];
-    const executor = getTargetExecutor(target, projectJson, packageJson);
+function getTargetInfo(target, projectJsonTargets, packageJsonTargets) {
+    const projectJsonTarget = projectJsonTargets?.[target];
+    const packageJsonTarget = packageJsonTargets?.[target];
+    const executor = getTargetExecutor(target, projectJsonTargets, packageJsonTargets);
     const targetOptions = {
         ...packageJsonTarget?.options,
         ...projectJsonTarget?.options,
@@ -158,17 +155,17 @@ function getTargetInfo(target, projectJson, packageJson) {
     return {};
 }
 exports.getTargetInfo = getTargetInfo;
-function getTargetExecutor(target, projectJson, packageJson) {
-    const projectJsonTarget = projectJson?.targets?.[target];
-    const packageJsonTarget = packageJson?.nx?.targets?.[target];
-    const packageJsonScript = packageJson?.scripts?.[target];
-    if (projectJsonTarget?.command) {
-        return 'nx:run-commands';
+function getTargetExecutor(target, projectJsonTargets, packageJsonTargets) {
+    const projectJsonTargetConfiguration = projectJsonTargets?.[target];
+    const packageJsonTargetConfiguration = packageJsonTargets?.[target];
+    if (!projectJsonTargetConfiguration && packageJsonTargetConfiguration) {
+        return packageJsonTargetConfiguration?.executor ?? 'nx:run-script';
     }
-    if (!projectJsonTarget?.executor &&
-        !packageJsonTarget?.executor &&
-        packageJsonScript) {
-        return 'nx:run-script';
+    if (projectJsonTargetConfiguration?.executor) {
+        return projectJsonTargetConfiguration.executor;
+    }
+    if (projectJsonTargetConfiguration?.command) {
+        return 'nx:run-commands';
     }
-    return projectJsonTarget?.executor ?? packageJsonTarget?.executor;
+    return null;
 }

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

@@ -3,14 +3,13 @@ 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 nx_plugin_1 = require("../../../utils/nx-plugin");
+const internal_api_1 = require("../../plugins/internal-api");
 const globs_1 = require("../../../utils/globs");
 const getTouchedProjectsFromProjectGlobChanges = async (touchedFiles, projectGraphNodes, nxJson) => {
-    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 globPattern = (0, globs_1.combineGlobPatterns)((0, retrieve_workspace_files_1.configurationGlobs)(await (0, internal_api_1.loadNxPlugins)(nxJson?.plugins, workspace_root_1.workspaceRoot)));
     const touchedProjects = new Set();
     for (const touchedFile of touchedFiles) {
         const isProjectFile = (0, minimatch_1.minimatch)(touchedFile.file, globPattern, {