nx 20.0.0-canary.20241003-84a5c7a → 20.0.0-canary.20241005-75c1da3

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.js

@@ -22,7 +22,8 @@ const is_ci_1 = require("../utils/is-ci");
 const output_1 = require("../utils/output");
 function dbCacheEnabled(nxJson = (0, nx_json_1.readNxJson)()) {
     return (process.env.NX_DISABLE_DB !== 'true' &&
-        (nxJson.enableDbCache === true || process.env.NX_DB_CACHE === 'true'));
+        nxJson.useLegacyCache !== true &&
+        process.env.NX_DB_CACHE !== 'false');
 }
 // Do not change the order of these arguments as this function is used by nx cloud
 function getCache(options) {

package/src/tasks-runner/init-tasks-runner.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initTasksRunner = initTasksRunner;
-const workspace_configuration_check_1 = require("../utils/workspace-configuration-check");
 const configuration_1 = require("../config/configuration");
 const project_graph_1 = require("../project-graph/project-graph");
 const run_command_1 = require("./run-command");
@@ -12,7 +11,6 @@ const dotenv_1 = require("../utils/dotenv");
 async function initTasksRunner(nxArgs) {
     perf_hooks_1.performance.mark('init-local');
     (0, dotenv_1.loadRootEnvFiles)();
-    (0, workspace_configuration_check_1.workspaceConfigurationCheck)();
     const nxJson = (0, configuration_1.readNxJson)();
     if (nxArgs.verbose) {
         process.env.NX_VERBOSE_LOGGING = 'true';

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

@@ -139,41 +139,32 @@ function readParallelFromArgsAndEnv(args) {
 }
 function normalizeNxArgsRunner(nxArgs, nxJson, options) {
     if (!nxArgs.runner) {
-        // TODO: Remove NX_RUNNER environment variable support in Nx v17
-        for (const envKey of ['NX_TASKS_RUNNER', 'NX_RUNNER']) {
-            const runner = process.env[envKey];
-            if (runner) {
-                const runnerExists = nxJson.tasksRunnerOptions?.[runner];
-                if (options.printWarnings) {
-                    if (runnerExists) {
-                        output_1.output.note({
-                            title: `No explicit --runner argument provided, but found environment variable ${envKey} so using its value: ${output_1.output.bold(`${runner}`)}`,
-                        });
-                    }
-                    else if (nxArgs.verbose ||
-                        process.env.NX_VERBOSE_LOGGING === 'true') {
-                        output_1.output.warn({
-                            title: `Could not find ${output_1.output.bold(`${runner}`)} within \`nx.json\` tasksRunnerOptions.`,
-                            bodyLines: [
-                                `${output_1.output.bold(`${runner}`)} was set by ${envKey}`,
-                                ``,
-                                `To suppress this message, either:`,
-                                `  - provide a valid task runner with --runner`,
-                                `  - ensure NX_TASKS_RUNNER matches a task runner defined in nx.json`,
-                            ],
-                        });
-                    }
-                }
+        const envKey = 'NX_TASKS_RUNNER';
+        const runner = process.env[envKey];
+        if (runner) {
+            const runnerExists = nxJson.tasksRunnerOptions?.[runner];
+            if (options.printWarnings) {
                 if (runnerExists) {
-                    // TODO: Remove in v17
-                    if (envKey === 'NX_RUNNER' && options.printWarnings) {
-                        output_1.output.warn({
-                            title: 'NX_RUNNER is deprecated, please use NX_TASKS_RUNNER instead.',
-                        });
-                    }
-                    nxArgs.runner = runner;
+                    output_1.output.note({
+                        title: `No explicit --runner argument provided, but found environment variable ${envKey} so using its value: ${output_1.output.bold(`${runner}`)}`,
+                    });
                 }
-                break;
+                else if (nxArgs.verbose ||
+                    process.env.NX_VERBOSE_LOGGING === 'true') {
+                    output_1.output.warn({
+                        title: `Could not find ${output_1.output.bold(`${runner}`)} within \`nx.json\` tasksRunnerOptions.`,
+                        bodyLines: [
+                            `${output_1.output.bold(`${runner}`)} was set by ${envKey}`,
+                            ``,
+                            `To suppress this message, either:`,
+                            `  - provide a valid task runner with --runner`,
+                            `  - ensure NX_TASKS_RUNNER matches a task runner defined in nx.json`,
+                        ],
+                    });
+                }
+            }
+            if (runnerExists) {
+                nxArgs.runner = runner;
             }
         }
     }

package/src/utils/plugins/plugin-capabilities.js

@@ -20,7 +20,7 @@ function tryGetCollection(packageJsonPath, collectionFile, propName) {
 }
 async function getPluginCapabilities(workspaceRoot, pluginName, projects, includeRuntimeCapabilities = false) {
     try {
-        const { json: packageJson, path: packageJsonPath } = await (0, plugins_1.readPluginPackageJson)(pluginName, projects, (0, installation_directory_1.getNxRequirePaths)(workspaceRoot));
+        const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(pluginName, projects, (0, installation_directory_1.getNxRequirePaths)(workspaceRoot));
         const pluginModule = includeRuntimeCapabilities
             ? await tryGetModule(packageJson, workspaceRoot)
             : {};
@@ -62,8 +62,7 @@ async function tryGetModule(packageJson, workspaceRoot) {
             packageJson['schematics'] ??
             packageJson['builders']) {
             const [pluginPromise] = (0, loader_1.loadNxPlugin)(packageJson.name, workspaceRoot);
-            const plugin = await pluginPromise;
-            return plugin;
+            return await pluginPromise;
         }
         else {
             return {

package/src/utils/app-root.d.ts

@@ -1,8 +0,0 @@
-import { workspaceRoot } from './workspace-root';
-/**
- * The root of the workspace.
- *
- * @deprecated use workspaceRoot instead
- */
-export declare const appRootPath: string;
-export { workspaceRoot };

package/src/utils/app-root.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.workspaceRoot = exports.appRootPath = void 0;
-// TODO(v16): Remove this file
-const workspace_root_1 = require("./workspace-root");
-Object.defineProperty(exports, "workspaceRoot", { enumerable: true, get: function () { return workspace_root_1.workspaceRoot; } });
-/**
- * The root of the workspace.
- *
- * @deprecated use workspaceRoot instead
- */
-exports.appRootPath = workspace_root_1.workspaceRoot;

package/src/utils/nx-plugin.deprecated.d.ts

@@ -1,31 +0,0 @@
-import { ProjectGraphProcessor } from '../config/project-graph';
-import { TargetConfiguration } from '../config/workspace-json-project-json';
-import { NxPluginV2 } from '../project-graph/plugins';
-/**
- * @deprecated Add targets to the projects in a {@link CreateNodes} function instead. This will be removed in Nx 20
- */
-export type ProjectTargetConfigurator = (file: string) => Record<string, TargetConfiguration>;
-/**
- * @deprecated Use {@link NxPluginV2} instead. This will be removed in Nx 20
- */
-export type NxPluginV1 = {
-    name: string;
-    /**
-     * @deprecated Use {@link CreateNodes} and {@link CreateDependencies} instead. This will be removed in Nx 20
-     */
-    processProjectGraph?: ProjectGraphProcessor;
-    /**
-     * @deprecated Add targets to the projects inside of {@link CreateNodes} instead. This will be removed in Nx 20
-     */
-    registerProjectTargets?: ProjectTargetConfigurator;
-    /**
-     * A glob pattern to search for non-standard project files.
-     * @example: ["*.csproj", "pom.xml"]
-     * @deprecated Use {@link CreateNodes} instead. This will be removed in Nx 20
-     */
-    projectFilePatterns?: string[];
-};
-/**
- * @todo(@agentender) v20: Remove this fn when we remove readWorkspaceConfig
- */
-export declare function getDefaultPluginsSync(root: string): NxPluginV2[];

package/src/utils/nx-plugin.deprecated.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultPluginsSync = getDefaultPluginsSync;
-const angular_json_1 = require("../adapter/angular-json");
-const project_json_1 = require("../plugins/project-json/build-nodes/project-json");
-const PackageJsonWorkspacesPlugin = require("../plugins/package-json");
-/**
- * @todo(@agentender) v20: Remove this fn when we remove readWorkspaceConfig
- */
-function getDefaultPluginsSync(root) {
-    const plugins = [
-        require('../plugins/js'),
-        ...((0, angular_json_1.shouldMergeAngularProjects)(root, false)
-            ? [require('../adapter/angular-json').NxAngularJsonPlugin]
-            : []),
-        PackageJsonWorkspacesPlugin,
-        project_json_1.default,
-    ];
-    return plugins;
-}

package/src/utils/workspace-configuration-check.d.ts

@@ -1 +0,0 @@
-export declare function workspaceConfigurationCheck(): void;

package/src/utils/workspace-configuration-check.js

@@ -1,36 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.workspaceConfigurationCheck = workspaceConfigurationCheck;
-const workspace_root_1 = require("./workspace-root");
-const fs_1 = require("fs");
-const path_1 = require("path");
-const output_1 = require("./output");
-const fileutils_1 = require("../utils/fileutils");
-//TODO: vsavkin remove after Nx 19
-function workspaceConfigurationCheck() {
-    if ((0, fs_1.existsSync)((0, path_1.join)(workspace_root_1.workspaceRoot, 'workspace.json'))) {
-        output_1.output.warn({
-            title: 'workspace.json is ignored',
-            bodyLines: [
-                'Nx no longer reads configuration from workspace.json.',
-                'Run "nx g @nx/workspace:fix-configuration" to split workspace.json into individual project.json files.',
-            ],
-        });
-        return;
-    }
-    if ((0, fs_1.existsSync)((0, path_1.join)(workspace_root_1.workspaceRoot, 'angular.json'))) {
-        const angularJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(workspace_root_1.workspaceRoot, 'angular.json'));
-        const v2Props = Object.values(angularJson.projects).find((p) => !!p.targets);
-        if (angularJson.version === 2 || v2Props) {
-            output_1.output.error({
-                title: 'angular.json format is incorrect',
-                bodyLines: [
-                    'Nx no longer supports the v2 format of angular.json.',
-                    'Run "nx g @nx/workspace:fix-configuration" to split angular.json into individual project.json files. (Recommended)',
-                    'If you want to preserve angular.json, run "nx g @nx/workspace:fix-configuration --reformat"',
-                ],
-            });
-            process.exit(1);
-        }
-    }
-}