nx 20.0.0-beta.6 → 20.0.0-beta.8

package/src/daemon/client/client.js

@@ -57,9 +57,7 @@ class DaemonClient {
     }
     enabled() {
         if (this._enabled === undefined) {
-            // TODO(v19): Add migration to move it out of existing configs and remove the ?? here.
-            const useDaemonProcessOption = this.nxJson?.useDaemonProcess ??
-                this.nxJson?.tasksRunnerOptions?.['default']?.options?.useDaemonProcess;
+            const useDaemonProcessOption = this.nxJson?.useDaemonProcess;
             const env = process.env.NX_DAEMON;
             // env takes precedence
             // option=true,env=false => no daemon

package/src/devkit-exports.d.ts

@@ -18,7 +18,6 @@ export { workspaceLayout } from './config/configuration';
 export type { NxPlugin, NxPluginV2, CreateNodes, CreateNodesFunction, CreateNodesResult, CreateNodesContext, CreateNodesContextV2, CreateNodesFunctionV2, CreateNodesResultV2, CreateNodesV2, CreateDependencies, CreateDependenciesContext, CreateMetadata, CreateMetadataContext, ProjectsMetadata, } from './project-graph/plugins';
 export { AggregateCreateNodesError } from './project-graph/error-types';
 export { createNodesFromFiles } from './project-graph/plugins';
-export type { NxPluginV1, ProjectTargetConfigurator, } from './utils/nx-plugin.deprecated';
 /**
  * @category Workspace
  */
@@ -66,7 +65,7 @@ export { readNxJson, updateNxJson, } from './generators/utils/project-configurat
 /**
  * @category Project Graph
  */
-export type { ProjectFileMap, FileMap, FileData, ProjectGraph, ProjectGraphDependency, ProjectGraphNode, ProjectGraphProjectNode, ProjectGraphExternalNode, ProjectGraphProcessorContext, } from './config/project-graph';
+export type { ProjectFileMap, FileMap, FileData, ProjectGraph, ProjectGraphDependency, ProjectGraphProjectNode, ProjectGraphExternalNode, } from './config/project-graph';
 export type { GraphJson } from './command-line/graph/graph';
 /**
  * @category Project Graph
@@ -75,7 +74,7 @@ export { DependencyType } from './config/project-graph';
 /**
  * @category Project Graph
  */
-export { ProjectGraphBuilder, RawProjectGraphDependency, DynamicDependency, ImplicitDependency, StaticDependency, validateDependency, } from './project-graph/project-graph-builder';
+export { RawProjectGraphDependency, DynamicDependency, ImplicitDependency, StaticDependency, validateDependency, } from './project-graph/project-graph-builder';
 /**
  * @category Generators
  */
@@ -103,7 +102,7 @@ export { joinPathFragments, normalizePath } from './utils/path';
 /**
  * @category Utils
  */
-export { workspaceRoot, appRootPath } from './utils/app-root';
+export { workspaceRoot } from './utils/workspace-root';
 /**
  * @category Utils
  */

package/src/devkit-exports.js

@@ -4,7 +4,7 @@
  * Try hard to not add to this API to reduce the surface area we need to maintain.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDaemonEnabled = exports.createProjectFileMapUsingProjectGraph = exports.cacheDir = exports.hashArray = exports.defaultTasksRunner = exports.getOutputsForTargetAndConfiguration = exports.readProjectsConfigurationFromProjectGraph = exports.readCachedProjectGraph = exports.createProjectGraphAsync = exports.reverse = exports.appRootPath = exports.workspaceRoot = exports.normalizePath = exports.joinPathFragments = exports.stripIndents = exports.writeJsonFile = exports.readJsonFile = exports.stripJsonComments = exports.serializeJson = exports.parseJson = exports.updateJson = exports.writeJson = exports.readJson = exports.validateDependency = exports.ProjectGraphBuilder = exports.DependencyType = exports.updateNxJson = exports.readNxJson = exports.globAsync = exports.glob = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.isWorkspacesEnabled = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.createNodesFromFiles = exports.AggregateCreateNodesError = exports.workspaceLayout = void 0;
+exports.isDaemonEnabled = exports.createProjectFileMapUsingProjectGraph = exports.cacheDir = exports.hashArray = exports.defaultTasksRunner = exports.getOutputsForTargetAndConfiguration = exports.readProjectsConfigurationFromProjectGraph = exports.readCachedProjectGraph = exports.createProjectGraphAsync = exports.reverse = exports.workspaceRoot = exports.normalizePath = exports.joinPathFragments = exports.stripIndents = exports.writeJsonFile = exports.readJsonFile = exports.stripJsonComments = exports.serializeJson = exports.parseJson = exports.updateJson = exports.writeJson = exports.readJson = exports.validateDependency = exports.DependencyType = exports.updateNxJson = exports.readNxJson = exports.globAsync = exports.glob = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.isWorkspacesEnabled = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.createNodesFromFiles = exports.AggregateCreateNodesError = exports.workspaceLayout = void 0;
 var configuration_1 = require("./config/configuration");
 Object.defineProperty(exports, "workspaceLayout", { enumerable: true, get: function () { return configuration_1.workspaceLayout; } });
 var error_types_1 = require("./project-graph/error-types");
@@ -64,7 +64,6 @@ Object.defineProperty(exports, "DependencyType", { enumerable: true, get: functi
  * @category Project Graph
  */
 var project_graph_builder_1 = require("./project-graph/project-graph-builder");
-Object.defineProperty(exports, "ProjectGraphBuilder", { enumerable: true, get: function () { return project_graph_builder_1.ProjectGraphBuilder; } });
 Object.defineProperty(exports, "validateDependency", { enumerable: true, get: function () { return project_graph_builder_1.validateDependency; } });
 /**
  * @category Generators
@@ -97,13 +96,11 @@ Object.defineProperty(exports, "stripIndents", { enumerable: true, get: function
 var path_1 = require("./utils/path");
 Object.defineProperty(exports, "joinPathFragments", { enumerable: true, get: function () { return path_1.joinPathFragments; } });
 Object.defineProperty(exports, "normalizePath", { enumerable: true, get: function () { return path_1.normalizePath; } });
-// TODO(v16): Change this to export from './utils/workspace-root'
 /**
  * @category Utils
  */
-var app_root_1 = require("./utils/app-root");
-Object.defineProperty(exports, "workspaceRoot", { enumerable: true, get: function () { return app_root_1.workspaceRoot; } });
-Object.defineProperty(exports, "appRootPath", { enumerable: true, get: function () { return app_root_1.appRootPath; } });
+var workspace_root_1 = require("./utils/workspace-root");
+Object.defineProperty(exports, "workspaceRoot", { enumerable: true, get: function () { return workspace_root_1.workspaceRoot; } });
 /**
  * @category Utils
  */

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

@@ -29,7 +29,6 @@ function convertNxExecutor(executor) {
                 targetName: builderContext.target.target,
                 target: builderContext.target.target,
                 configurationName: builderContext.target.configuration,
-                workspace: { ...nxJsonConfiguration, ...projectsConfigurations },
                 projectsConfigurations,
                 nxJsonConfiguration,
                 cwd: process.cwd(),

package/src/generators/utils/nx-json.d.ts

@@ -1,7 +1,7 @@
 import type { NxJsonConfiguration } from '../../config/nx-json';
 import type { Tree } from '../tree';
 /**
- * @deprecated You must pass a {@link Tree}
+ * @deprecated You must pass a {@link Tree}. This will be removed in Nx 21.
  */
 export declare function readNxJson(): NxJsonConfiguration | null;
 export declare function readNxJson(tree: Tree): NxJsonConfiguration | null;

package/src/migrations/update-20-0-0/move-use-daemon-process.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '../../generators/tree';
+export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-20-0-0/move-use-daemon-process.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
+const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
+const nx_json_1 = require("../../generators/utils/nx-json");
+async function update(tree) {
+    const nxJson = (0, nx_json_1.readNxJson)(tree);
+    if (nxJson?.tasksRunnerOptions?.['default']?.options?.useDaemonProcess !==
+        undefined) {
+        nxJson.useDaemonProcess =
+            nxJson.tasksRunnerOptions['default'].options.useDaemonProcess;
+        delete nxJson.tasksRunnerOptions['default'].options.useDaemonProcess;
+        if (Object.keys(nxJson.tasksRunnerOptions['default'].options).length === 0) {
+            delete nxJson.tasksRunnerOptions['default'].options;
+        }
+        if (Object.keys(nxJson.tasksRunnerOptions['default']).length === 0) {
+            delete nxJson.tasksRunnerOptions['default'];
+        }
+        if (Object.keys(nxJson.tasksRunnerOptions).length === 0) {
+            delete nxJson.tasksRunnerOptions;
+        }
+        (0, nx_json_1.updateNxJson)(tree, nxJson);
+    }
+    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
+}

package/src/plugins/js/project-graph/build-dependencies/target-project-locator.js

@@ -15,20 +15,10 @@ const get_package_name_from_import_path_1 = require("../../../../utils/get-packa
  * Use a shared cache to avoid repeated npm package resolution work within the TargetProjectLocator.
  */
 const defaultNpmResolutionCache = new Map();
-const builtInModuleSet = new Set([
-    ...node_module_1.builtinModules,
-    ...node_module_1.builtinModules.map((x) => `node:${x}`),
-    // These are missing in the builtinModules list
-    // See: https://github.com/nodejs/node/issues/42785
-    // TODO(v20): We should be safe to use `isBuiltin` function instead of keep the set here (https://nodejs.org/api/module.html#moduleisbuiltinmodulename)
-    'test',
-    'node:test',
-    'node:sea',
-    'node:sqlite',
-]);
+const experimentalNodeModules = new Set(['node:sqlite']);
 function isBuiltinModuleImport(importExpr) {
     const packageName = (0, get_package_name_from_import_path_1.getPackageNameFromImportPath)(importExpr);
-    return builtInModuleSet.has(packageName);
+    return (0, node_module_1.isBuiltin)(packageName) || experimentalNodeModules.has(packageName);
 }
 class TargetProjectLocator {
     constructor(nodes, externalNodes = {}, npmResolutionCache = defaultNpmResolutionCache) {

package/src/project-graph/build-project-graph.js

@@ -10,13 +10,11 @@ const assert_workspace_validity_1 = require("../utils/assert-workspace-validity"
 const nx_deps_cache_1 = require("./nx-deps-cache");
 const implicit_project_dependencies_1 = require("./utils/implicit-project-dependencies");
 const normalize_project_nodes_1 = require("./utils/normalize-project-nodes");
-const utils_1 = require("./plugins/utils");
 const typescript_1 = require("../plugins/js/utils/typescript");
 const fileutils_1 = require("../utils/fileutils");
 const project_graph_builder_1 = require("./project-graph-builder");
 const configuration_1 = require("../config/configuration");
 const fs_1 = require("fs");
-const output_1 = require("../utils/output");
 const error_types_1 = require("./error-types");
 const project_configuration_utils_1 = require("./utils/project-configuration-utils");
 let storedFileMap = null;
@@ -182,44 +180,8 @@ function createContext(projects, nxJson, externalNodes, fileMap, filesToProcess)
 async function updateProjectGraphWithPlugins(context, initProjectGraph, plugins, sourceMap) {
     let graph = initProjectGraph;
     const errors = [];
-    for (const plugin of plugins) {
-        try {
-            if ((0, utils_1.isNxPluginV1)(plugin) &&
-                plugin.processProjectGraph &&
-                !plugin.createDependencies) {
-                output_1.output.warn({
-                    title: `${plugin.name} is a v1 plugin.`,
-                    bodyLines: [
-                        'Nx has recently released a v2 model for project graph plugins. The `processProjectGraph` method is deprecated. Plugins should use some combination of `createNodes` and `createDependencies` instead.',
-                    ],
-                });
-                perf_hooks_1.performance.mark(`${plugin.name}:processProjectGraph - start`);
-                graph = await plugin.processProjectGraph(graph, {
-                    ...context,
-                    projectsConfigurations: {
-                        projects: context.projects,
-                        version: 2,
-                    },
-                    fileMap: context.fileMap.projectFileMap,
-                    filesToProcess: context.filesToProcess.projectFileMap,
-                    workspace: {
-                        version: 2,
-                        projects: context.projects,
-                        ...context.nxJsonConfiguration,
-                    },
-                });
-                perf_hooks_1.performance.mark(`${plugin.name}:processProjectGraph - end`);
-                perf_hooks_1.performance.measure(`${plugin.name}:processProjectGraph`, `${plugin.name}:processProjectGraph - start`, `${plugin.name}:processProjectGraph - end`);
-            }
-        }
-        catch (e) {
-            errors.push(new error_types_1.ProcessProjectGraphError(plugin.name, {
-                cause: e,
-            }));
-        }
-    }
     const builder = new project_graph_builder_1.ProjectGraphBuilder(graph, context.fileMap.projectFileMap, context.fileMap.nonProjectFiles);
-    const createDependencyPlugins = plugins.filter((plugin) => (0, utils_1.isNxPluginV2)(plugin) && plugin.createDependencies);
+    const createDependencyPlugins = plugins.filter((plugin) => plugin.createDependencies);
     await Promise.all(createDependencyPlugins.map(async (plugin) => {
         perf_hooks_1.performance.mark(`${plugin.name}:createDependencies - start`);
         try {
@@ -264,10 +226,10 @@ async function applyProjectMetadata(graph, plugins, context, sourceMap) {
     const results = [];
     const errors = [];
     const promises = plugins.map(async (plugin) => {
-        if ((0, utils_1.isNxPluginV2)(plugin) && plugin.createMetadata) {
+        if (plugin.createMetadata) {
             perf_hooks_1.performance.mark(`${plugin.name}:createMetadata - start`);
             try {
-                const metadata = await plugin.createMetadata(graph, undefined, context);
+                const metadata = await plugin.createMetadata(graph, context);
                 results.push({ metadata, pluginName: plugin.name });
             }
             catch (e) {

package/src/project-graph/error-types.d.ts

@@ -4,7 +4,7 @@ import { ProjectGraph } from '../config/project-graph';
 import { CreateNodesFunctionV2 } from './plugins';
 export declare class ProjectGraphError extends Error {
     #private;
-    constructor(errors: Array<AggregateCreateNodesError | MergeNodesError | ProjectsWithNoNameError | MultipleProjectsWithSameNameError | ProcessDependenciesError | ProcessProjectGraphError | CreateMetadataError | WorkspaceValidityError>, partialProjectGraph: ProjectGraph, partialSourceMaps: ConfigurationSourceMaps);
+    constructor(errors: Array<AggregateCreateNodesError | MergeNodesError | ProjectsWithNoNameError | MultipleProjectsWithSameNameError | ProcessDependenciesError | CreateMetadataError | WorkspaceValidityError>, partialProjectGraph: ProjectGraph, partialSourceMaps: ConfigurationSourceMaps);
     /**
      * The daemon cannot throw errors which contain methods as they are not serializable.
      *
@@ -18,7 +18,7 @@ export declare class ProjectGraphError extends Error {
      */
     getPartialProjectGraph(): ProjectGraph;
     getPartialSourcemaps(): ConfigurationSourceMaps;
-    getErrors(): (AggregateCreateNodesError | MergeNodesError | ProjectsWithNoNameError | MultipleProjectsWithSameNameError | CreateMetadataError | ProcessDependenciesError | ProcessProjectGraphError | WorkspaceValidityError)[];
+    getErrors(): (AggregateCreateNodesError | MergeNodesError | ProjectsWithNoNameError | MultipleProjectsWithSameNameError | CreateMetadataError | ProcessDependenciesError | WorkspaceValidityError)[];
 }
 export declare class MultipleProjectsWithSameNameError extends Error {
     conflicts: Map<string, string[]>;
@@ -108,16 +108,10 @@ export declare class WorkspaceValidityError extends Error {
     constructor(message: string);
 }
 export declare function isWorkspaceValidityError(e: unknown): e is WorkspaceValidityError;
-export declare class ProcessProjectGraphError extends Error {
-    readonly pluginName: string;
-    constructor(pluginName: string, { cause }: {
-        cause: any;
-    });
-}
 export declare class AggregateProjectGraphError extends Error {
-    readonly errors: Array<CreateMetadataError | ProcessDependenciesError | ProcessProjectGraphError | WorkspaceValidityError>;
+    readonly errors: Array<CreateMetadataError | ProcessDependenciesError | WorkspaceValidityError>;
     readonly partialProjectGraph: ProjectGraph;
-    constructor(errors: Array<CreateMetadataError | ProcessDependenciesError | ProcessProjectGraphError | WorkspaceValidityError>, partialProjectGraph: ProjectGraph);
+    constructor(errors: Array<CreateMetadataError | ProcessDependenciesError | WorkspaceValidityError>, partialProjectGraph: ProjectGraph);
 }
 export declare function isAggregateProjectGraphError(e: unknown): e is AggregateProjectGraphError;
 export declare function isCreateMetadataError(e: unknown): e is CreateMetadataError;

package/src/project-graph/error-types.js

@@ -1,7 +1,7 @@
 "use strict";
 var _ProjectGraphError_errors, _ProjectGraphError_partialProjectGraph, _ProjectGraphError_partialSourceMaps;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LoadPluginError = exports.DaemonProjectGraphError = exports.AggregateProjectGraphError = exports.ProcessProjectGraphError = exports.WorkspaceValidityError = exports.ProcessDependenciesError = exports.CreateMetadataError = exports.MergeNodesError = exports.AggregateCreateNodesError = exports.ProjectConfigurationsError = exports.ProjectWithNoNameError = exports.ProjectsWithNoNameError = exports.ProjectWithExistingNameError = exports.MultipleProjectsWithSameNameError = exports.ProjectGraphError = void 0;
+exports.LoadPluginError = exports.DaemonProjectGraphError = exports.AggregateProjectGraphError = exports.WorkspaceValidityError = exports.ProcessDependenciesError = exports.CreateMetadataError = exports.MergeNodesError = exports.AggregateCreateNodesError = exports.ProjectConfigurationsError = exports.ProjectWithNoNameError = exports.ProjectsWithNoNameError = exports.ProjectWithExistingNameError = exports.MultipleProjectsWithSameNameError = exports.ProjectGraphError = void 0;
 exports.isProjectWithExistingNameError = isProjectWithExistingNameError;
 exports.isMultipleProjectsWithSameNameError = isMultipleProjectsWithSameNameError;
 exports.isProjectsWithNoNameError = isProjectsWithNoNameError;
@@ -227,17 +227,6 @@ function isWorkspaceValidityError(e) {
             'name' in e &&
             e?.name === WorkspaceValidityError.name));
 }
-class ProcessProjectGraphError extends Error {
-    constructor(pluginName, { cause }) {
-        super(`The "${pluginName}" plugin threw an error while processing the project graph:`, {
-            cause,
-        });
-        this.pluginName = pluginName;
-        this.name = this.constructor.name;
-        this.stack = `${this.message}\n${indentString(cause, 2)}`;
-    }
-}
-exports.ProcessProjectGraphError = ProcessProjectGraphError;
 class AggregateProjectGraphError extends Error {
     constructor(errors, partialProjectGraph) {
         super('Failed to create project graph. See above for errors');

package/src/project-graph/file-utils.js

@@ -140,7 +140,7 @@ function readPackageJson() {
     }
 }
 /**
- * TODO(v20): Remove this function.
+ * TODO(v21): Remove this function.
  */
 function getProjectsSync(root, nxJson) {
     /**

package/src/project-graph/nx-deps-cache.d.ts

@@ -4,7 +4,6 @@ import { ProjectConfiguration } from '../config/workspace-json-project-json';
 export interface FileMapCache {
     version: string;
     nxVersion: string;
-    deps: Record<string, string>;
     pathMappings: Record<string, any>;
     nxJsonPlugins: PluginData[];
     pluginsConfig?: any;

package/src/project-graph/nx-deps-cache.js

@@ -77,7 +77,6 @@ function createProjectFileMapCache(nxJson, packageJsonDeps, fileMap, tsConfig) {
     const newValue = {
         version: '6.0',
         nxVersion: versions_1.nxVersion,
-        deps: packageJsonDeps, // TODO(v19): We can remove this in favor of nxVersion
         // compilerOptions may not exist, especially for package-based repos
         pathMappings: tsConfig?.compilerOptions?.paths || {},
         nxJsonPlugins,

package/src/project-graph/plugins/internal-api.d.ts

@@ -1,7 +1,6 @@
 import { PluginConfiguration } from '../../config/nx-json';
-import { NxPluginV1 } from '../../utils/nx-plugin.deprecated';
 import { CreateDependencies, CreateDependenciesContext, CreateMetadata, CreateMetadataContext, CreateNodesContextV2, CreateNodesResult, NxPluginV2 } from './public-api';
-import { ProjectGraph, ProjectGraphProcessor } from '../../config/project-graph';
+import { ProjectGraph } from '../../config/project-graph';
 export declare class LoadedNxPlugin {
     readonly name: string;
     readonly createNodes?: [
@@ -10,17 +9,15 @@ export declare class LoadedNxPlugin {
     ];
     readonly createDependencies?: (context: CreateDependenciesContext) => ReturnType<CreateDependencies>;
     readonly createMetadata?: (graph: ProjectGraph, context: CreateMetadataContext) => ReturnType<CreateMetadata>;
-    readonly processProjectGraph?: ProjectGraphProcessor;
     readonly options?: unknown;
     readonly include?: string[];
     readonly exclude?: string[];
-    constructor(plugin: NormalizedPlugin, pluginDefinition: PluginConfiguration);
+    constructor(plugin: NxPluginV2, pluginDefinition: PluginConfiguration);
 }
 export type CreateNodesResultWithContext = CreateNodesResult & {
     file: string;
     pluginName: string;
 };
-export type NormalizedPlugin = NxPluginV2 & Pick<NxPluginV1, 'processProjectGraph'>;
 export declare const nxPluginCache: Map<unknown, [
     Promise<LoadedNxPlugin>,
     () => void

package/src/project-graph/plugins/internal-api.js

@@ -62,7 +62,6 @@ class LoadedNxPlugin {
         if (plugin.createMetadata) {
             this.createMetadata = (graph, context) => plugin.createMetadata(graph, this.options, context);
         }
-        this.processProjectGraph = plugin.processProjectGraph;
     }
 }
 exports.LoadedNxPlugin = LoadedNxPlugin;

package/src/project-graph/plugins/isolation/messaging.d.ts

@@ -1,4 +1,4 @@
-import { ProjectGraph, ProjectGraphProcessorContext } from '../../../config/project-graph';
+import { ProjectGraph } from '../../../config/project-graph';
 import { PluginConfiguration } from '../../../config/nx-json';
 import { CreateDependenciesContext, CreateMetadataContext, CreateNodesContextV2 } from '../public-api';
 import { LoadedNxPlugin } from '../internal-api';
@@ -86,32 +86,12 @@ export interface PluginCreateMetadataResult {
         tx: string;
     };
 }
-export interface PluginWorkerProcessProjectGraphMessage {
-    type: 'processProjectGraph';
-    payload: {
-        graph: ProjectGraph;
-        ctx: ProjectGraphProcessorContext;
-        tx: string;
-    };
-}
-export interface PluginWorkerProcessProjectGraphResult {
-    type: 'processProjectGraphResult';
-    payload: {
-        graph: ProjectGraph;
-        success: true;
-        tx: string;
-    } | {
-        success: false;
-        error: Error;
-        tx: string;
-    };
-}
 export interface PluginWorkerShutdownMessage {
     type: 'shutdown';
     payload: {};
 }
-export type PluginWorkerMessage = PluginWorkerLoadMessage | PluginWorkerShutdownMessage | PluginWorkerCreateNodesMessage | PluginCreateDependenciesMessage | PluginWorkerProcessProjectGraphMessage | PluginCreateMetadataMessage;
-export type PluginWorkerResult = PluginWorkerLoadResult | PluginWorkerCreateNodesResult | PluginCreateDependenciesResult | PluginWorkerProcessProjectGraphResult | PluginCreateMetadataResult;
+export type PluginWorkerMessage = PluginWorkerLoadMessage | PluginWorkerShutdownMessage | PluginWorkerCreateNodesMessage | PluginCreateDependenciesMessage | PluginCreateMetadataMessage;
+export type PluginWorkerResult = PluginWorkerLoadResult | PluginWorkerCreateNodesResult | PluginCreateDependenciesResult | PluginCreateMetadataResult;
 export declare function isPluginWorkerMessage(message: Serializable): message is PluginWorkerMessage;
 export declare function isPluginWorkerResult(message: Serializable): message is PluginWorkerResult;
 type MaybePromise<T> = T | Promise<T>;

package/src/project-graph/plugins/isolation/plugin-pool.js

@@ -115,20 +115,6 @@ function createWorkerHandler(worker, pending, onload, onloadError, socket) {
                                 });
                             }
                             : undefined,
-                        processProjectGraph: result.hasProcessProjectGraph
-                            ? (graph, ctx) => {
-                                const tx = pluginName + worker.pid + ':processProjectGraph:' + txId++;
-                                return registerPendingPromise(tx, pending, () => {
-                                    (0, messaging_1.sendMessageOverSocket)(socket, {
-                                        type: 'processProjectGraph',
-                                        payload: { graph, ctx, tx },
-                                    });
-                                }, {
-                                    operation: 'processProjectGraph',
-                                    plugin: pluginName,
-                                });
-                            }
-                            : undefined,
                         createMetadata: result.hasCreateMetadata
                             ? (graph, ctx) => {
                                 const tx = pluginName + worker.pid + ':createMetadata:' + txId++;
@@ -167,15 +153,6 @@ function createWorkerHandler(worker, pending, onload, onloadError, socket) {
                     rejector(result.error);
                 }
             },
-            processProjectGraphResult: ({ tx, ...result }) => {
-                const { resolver, rejector } = pending.get(tx);
-                if (result.success) {
-                    resolver(result.graph);
-                }
-                else if (result.success === false) {
-                    rejector(result.error);
-                }
-            },
             createMetadataResult: ({ tx, ...result }) => {
                 const { resolver, rejector } = pending.get(tx);
                 if (result.success) {

package/src/project-graph/plugins/isolation/plugin-worker.js

@@ -102,25 +102,6 @@ const server = (0, net_1.createServer)((socket) => {
                     };
                 }
             },
-            processProjectGraph: async ({ graph, ctx, tx }) => {
-                try {
-                    const result = await plugin.processProjectGraph(graph, ctx);
-                    return {
-                        type: 'processProjectGraphResult',
-                        payload: { graph: result, success: true, tx },
-                    };
-                }
-                catch (e) {
-                    return {
-                        type: 'processProjectGraphResult',
-                        payload: {
-                            success: false,
-                            error: (0, serializable_error_1.createSerializableError)(e),
-                            tx,
-                        },
-                    };
-                }
-            },
             createMetadata: async ({ graph, context, tx }) => {
                 try {
                     const result = await plugin.createMetadata(graph, context);

package/src/project-graph/plugins/loader.js

@@ -20,7 +20,6 @@ const path_1 = require("../../utils/path");
 const logger_1 = require("../../utils/logger");
 const node_path_1 = require("node:path");
 const retrieve_workspace_files_1 = require("../utils/retrieve-workspace-files");
-const utils_1 = require("./utils");
 const internal_api_1 = require("./internal-api");
 const error_types_1 = require("../error-types");
 const path = require("node:path/posix");
@@ -197,8 +196,8 @@ async function loadNxPluginAsync(pluginConfiguration, paths, root) {
                 await (0, retrieve_workspace_files_1.retrieveProjectConfigurationsWithoutPluginInference)(root);
         }
         performance.mark(`Load Nx Plugin: ${moduleName} - start`);
-        let { pluginPath, name } = await getPluginPathAndName(moduleName, paths, projectsWithoutInference, root);
-        const plugin = (0, utils_1.normalizeNxPlugin)(await importPluginModule(pluginPath));
+        const { pluginPath, name } = getPluginPathAndName(moduleName, paths, projectsWithoutInference, root);
+        const plugin = await importPluginModule(pluginPath);
         plugin.name ??= name;
         performance.mark(`Load Nx Plugin: ${moduleName} - end`);
         performance.measure(`Load Nx Plugin: ${moduleName}`, `Load Nx Plugin: ${moduleName} - start`, `Load Nx Plugin: ${moduleName} - end`);

package/src/project-graph/plugins/public-api.d.ts

@@ -1,4 +1,3 @@
-import { NxPluginV1 } from '../../utils/nx-plugin.deprecated';
 import { FileMap, ProjectGraph, ProjectGraphExternalNode } from '../../config/project-graph';
 import { ProjectConfiguration } from '../../config/workspace-json-project-json';
 import { NxJsonConfiguration } from '../../config/nx-json';
@@ -38,12 +37,12 @@ export interface CreateNodesResult {
  * A pair of file patterns and {@link CreateNodesFunction}
  *
  * Nx 19.2+: Both original `CreateNodes` and `CreateNodesV2` are supported. Nx will only invoke `CreateNodesV2` if it is present.
- * Nx 20.X : The `CreateNodesV2` will be the only supported API. This typing will still exist, but be identical to `CreateNodesV2`.
+ * Nx 21.X : The `CreateNodesV2` will be the only supported API. This typing will still exist, but be identical to `CreateNodesV2`.
              Nx **will not** invoke the original `plugin.createNodes` callback. This should give plugin authors a window to transition.
              Plugin authors should update their plugin's `createNodes` function to align with `CreateNodesV2` / the updated `CreateNodes`.
              The plugin should contain something like: `export createNodes = createNodesV2;` during this period. This will allow the plugin
              to maintain compatibility with Nx 19.2 and up.
- * Nx 21.X : The `CreateNodesV2` typing will be removed, as it has replaced `CreateNodes`.
+ * Nx 22.X : The `CreateNodesV2` typing will be removed, as it has replaced `CreateNodes`.
  *
  * @deprecated Use {@link CreateNodesV2} instead. CreateNodesV2 will replace this API. Read more about the transition above.
  */
@@ -53,7 +52,7 @@ export type CreateNodes<T = unknown> = readonly [
 ];
 /**
  * A pair of file patterns and {@link CreateNodesFunctionV2}
- * In Nx 20 {@link CreateNodes} will be replaced with this type. In Nx 21, this type will be removed.
+ * In Nx 21 {@link CreateNodes} will be replaced with this type. In Nx 22, this type will be removed.
  */
 export type CreateNodesV2<T = unknown> = readonly [
     projectFilePattern: string,
@@ -105,14 +104,14 @@ export type NxPluginV2<TOptions = unknown> = {
      * Provides a file pattern and function that retrieves configuration info from
      * those files. e.g. { '**\/*.csproj': buildProjectsFromCsProjFile }
      *
-     * @deprecated Use {@link createNodesV2} instead. In Nx 20 support for calling createNodes with a single file for the first argument will be removed.
+     * @deprecated Use {@link createNodesV2} instead. In Nx 21 support for calling createNodes with a single file for the first argument will be removed.
      */
     createNodes?: CreateNodes<TOptions>;
     /**
      * Provides a file pattern and function that retrieves configuration info from
      * those files. e.g. { '**\/*.csproj': buildProjectsFromCsProjFiles }
      *
-     * In Nx 20 {@link createNodes} will be replaced with this property. In Nx 21, this property will be removed.
+     * In Nx 21 {@link createNodes} will be replaced with this property. In Nx 22, this property will be removed.
      */
     createNodesV2?: CreateNodesV2<TOptions>;
     /**
@@ -127,4 +126,4 @@ export type NxPluginV2<TOptions = unknown> = {
 /**
  * A plugin for Nx
  */
-export type NxPlugin = NxPluginV1 | NxPluginV2;
+export type NxPlugin = NxPluginV2;

package/src/project-graph/plugins/utils.d.ts

@@ -1,8 +1,2 @@
-import type { NxPluginV1 } from '../../utils/nx-plugin.deprecated';
-import type { LoadedNxPlugin, NormalizedPlugin } from './internal-api';
-import { CreateNodesContextV2, CreateNodesFunction, CreateNodesResult, type NxPlugin, type NxPluginV2 } from './public-api';
-export declare function isNxPluginV2(plugin: NxPlugin): plugin is NxPluginV2;
-export declare function isNxPluginV1(plugin: NxPlugin | LoadedNxPlugin): plugin is NxPluginV1;
-export declare function normalizeNxPlugin(plugin: NxPlugin): NormalizedPlugin;
-export type AsyncFn<T extends Function> = T extends (...args: infer A) => infer R ? (...args: A) => Promise<Awaited<R>> : never;
+import { CreateNodesContextV2, CreateNodesFunction, CreateNodesResult } from './public-api';
 export declare function createNodesFromFiles<T = unknown>(createNodes: CreateNodesFunction<T>, configFiles: readonly string[], options: T, context: CreateNodesContextV2): Promise<[file: string, value: CreateNodesResult][]>;

package/src/project-graph/plugins/utils.js

@@ -1,44 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNxPluginV2 = isNxPluginV2;
-exports.isNxPluginV1 = isNxPluginV1;
-exports.normalizeNxPlugin = normalizeNxPlugin;
 exports.createNodesFromFiles = createNodesFromFiles;
-const node_path_1 = require("node:path");
-const to_project_name_1 = require("../../config/to-project-name");
-const globs_1 = require("../../utils/globs");
 const error_types_1 = require("../error-types");
-function isNxPluginV2(plugin) {
-    return 'createNodes' in plugin || 'createDependencies' in plugin;
-}
-function isNxPluginV1(plugin) {
-    return 'processProjectGraph' in plugin || 'projectFilePatterns' in plugin;
-}
-function normalizeNxPlugin(plugin) {
-    if (isNxPluginV2(plugin)) {
-        return plugin;
-    }
-    if (isNxPluginV1(plugin) && plugin.projectFilePatterns) {
-        return {
-            ...plugin,
-            createNodes: [
-                `*/**/${(0, globs_1.combineGlobPatterns)(plugin.projectFilePatterns)}`,
-                (configFilePath) => {
-                    const root = (0, node_path_1.dirname)(configFilePath);
-                    return {
-                        projects: {
-                            [root]: {
-                                name: (0, to_project_name_1.toProjectName)(configFilePath),
-                                targets: plugin.registerProjectTargets?.(configFilePath),
-                            },
-                        },
-                    };
-                },
-            ],
-        };
-    }
-    return plugin;
-}
 async function createNodesFromFiles(createNodes, configFiles, options, context) {
     const results = [];
     const errors = [];

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

@@ -184,7 +184,7 @@ function mergeMetadata(sourceMap, sourceInformation, baseSourceMapPath, metadata
                     }
                 }
                 else {
-                    result[metadataKey] = value;
+                    result[metadataKey][key] = value[key];
                     if (sourceMap) {
                         sourceMap[`${baseSourceMapPath}.${metadataKey}`] =
                             sourceInformation;

package/src/tasks-runner/batch/run-batch.js

@@ -23,7 +23,6 @@ async function runTasks(executorName, batchTaskGraph, fullTaskGraph) {
         cwd: process.cwd(),
         projectsConfigurations,
         nxJsonConfiguration,
-        workspace: { ...projectsConfigurations, ...nxJsonConfiguration },
         isVerbose: false,
         projectGraph,
         taskGraph: fullTaskGraph,

package/src/tasks-runner/cache.d.ts

@@ -1,5 +1,6 @@
 import { DefaultTasksRunnerOptions, RemoteCache } from './default-tasks-runner';
 import { Task } from '../config/task-graph';
+import { NxJsonConfiguration } from '../config/nx-json';
 export type CachedResult = {
     terminalOutput: string;
     outputsPath: string;
@@ -10,6 +11,7 @@ export type TaskWithCachedResult = {
     task: Task;
     cachedResult: CachedResult;
 };
+export declare function dbCacheEnabled(nxJson?: NxJsonConfiguration): boolean;
 export declare function getCache(options: DefaultTasksRunnerOptions): DbCache | Cache;
 export declare class DbCache {
     private readonly options;