nx 19.4.1 → 19.5.0-beta.0

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDefaultPluginsSync = void 0;
 const angular_json_1 = require("../adapter/angular-json");
 const project_json_1 = require("../plugins/project-json/build-nodes/project-json");
-const target_defaults_plugin_1 = require("../plugins/target-defaults/target-defaults-plugin");
 const PackageJsonWorkspacesPlugin = require("../plugins/package-json-workspaces");
 /**
  * @todo(@agentender) v20: Remove this fn when we remove readWorkspaceConfig
@@ -14,7 +13,6 @@ function getDefaultPluginsSync(root) {
         ...((0, angular_json_1.shouldMergeAngularProjects)(root, false)
             ? [require('../adapter/angular-json').NxAngularJsonPlugin]
             : []),
-        target_defaults_plugin_1.default,
         PackageJsonWorkspacesPlugin,
         project_json_1.default,
     ];

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

@@ -1,17 +0,0 @@
-/**
- * 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,
- * the information provided by it will be discarded.
- *
- * NOTE: This cannot be a symbol, as they are not serialized in JSON the communication
- * between the plugin-worker and the main process.
- */
-export declare const ONLY_MODIFIES_EXISTING_TARGET = "NX_ONLY_MODIFIES_EXISTING_TARGET";
-/**
- * This is used to override the source file for the target defaults plugin.
- * This allows the plugin to use the project files as the context, but point to nx.json as the source file.
- *
- * NOTE: This cannot be a symbol, as they are not serialized in JSON the communication
- * between the plugin-worker and the main process.
- */
-export declare const OVERRIDE_SOURCE_FILE = "NX_OVERRIDE_SOURCE_FILE";

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

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OVERRIDE_SOURCE_FILE = exports.ONLY_MODIFIES_EXISTING_TARGET = void 0;
-/**
- * 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,
- * the information provided by it will be discarded.
- *
- * NOTE: This cannot be a symbol, as they are not serialized in JSON the communication
- * between the plugin-worker and the main process.
- */
-exports.ONLY_MODIFIES_EXISTING_TARGET = 'NX_ONLY_MODIFIES_EXISTING_TARGET';
-/**
- * This is used to override the source file for the target defaults plugin.
- * This allows the plugin to use the project files as the context, but point to nx.json as the source file.
- *
- * NOTE: This cannot be a symbol, as they are not serialized in JSON the communication
- * between the plugin-worker and the main process.
- */
-exports.OVERRIDE_SOURCE_FILE = 'NX_OVERRIDE_SOURCE_FILE';

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

@@ -1,121 +0,0 @@
-import { TargetConfiguration } from '../../config/workspace-json-project-json';
-import { NxPluginV2 } from '../../project-graph/plugins';
-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
- * for config happens, without this, the target defaults may be compatible
- * with a config from a plugin and then that combined target be incompatible
- * with the project json configuration resulting in the target default values
- * 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, projectJsonTargets: Record<string, TargetConfiguration>, packageJsonTargets: Record<string, TargetConfiguration>): {
-    command: string;
-    metadata: {
-        [x: string]: any;
-        description?: string;
-        technologies?: string[];
-        nonAtomizedTarget?: string;
-        help?: {
-            command: string;
-            example: {
-                options?: Record<string, unknown>;
-                args?: string[];
-            };
-        };
-    };
-    executor?: undefined;
-    options?: undefined;
-} | {
-    executor: string;
-    options: {
-        command: any;
-        commands?: undefined;
-        script?: undefined;
-    };
-    metadata: {
-        [x: string]: any;
-        description?: string;
-        technologies?: string[];
-        nonAtomizedTarget?: string;
-        help?: {
-            command: string;
-            example: {
-                options?: Record<string, unknown>;
-                args?: string[];
-            };
-        };
-    };
-    command?: undefined;
-} | {
-    executor: string;
-    options: {
-        commands: any;
-        command?: undefined;
-        script?: undefined;
-    };
-    metadata: {
-        [x: string]: any;
-        description?: string;
-        technologies?: string[];
-        nonAtomizedTarget?: string;
-        help?: {
-            command: string;
-            example: {
-                options?: Record<string, unknown>;
-                args?: string[];
-            };
-        };
-    };
-    command?: undefined;
-} | {
-    executor: string;
-    metadata: {
-        [x: string]: any;
-        description?: string;
-        technologies?: string[];
-        nonAtomizedTarget?: string;
-        help?: {
-            command: string;
-            example: {
-                options?: Record<string, unknown>;
-                args?: string[];
-            };
-        };
-    };
-    command?: undefined;
-    options?: undefined;
-} | {
-    executor: string;
-    options: {
-        script: any;
-        command?: undefined;
-        commands?: undefined;
-    };
-    metadata: {
-        [x: string]: any;
-        description?: string;
-        technologies?: string[];
-        nonAtomizedTarget?: string;
-        help?: {
-            command: string;
-            example: {
-                options?: Record<string, unknown>;
-                args?: string[];
-            };
-        };
-    };
-    command?: undefined;
-} | {
-    executor: string;
-    command?: undefined;
-    metadata?: undefined;
-    options?: undefined;
-} | {
-    command?: undefined;
-    metadata?: undefined;
-    executor?: undefined;
-    options?: undefined;
-};

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

@@ -1,176 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTargetInfo = exports.TargetDefaultsPlugin = void 0;
-const minimatch_1 = require("minimatch");
-const node_fs_1 = require("node:fs");
-const node_path_1 = require("node:path");
-const fileutils_1 = require("../../utils/fileutils");
-const globs_1 = require("../../utils/globs");
-const package_json_1 = require("../../utils/package-json");
-const package_json_workspaces_1 = require("../package-json-workspaces");
-const symbols_1 = require("./symbols");
-exports.TargetDefaultsPlugin = {
-    name: 'nx/core/target-defaults',
-    createNodes: [
-        '{package.json,**/package.json,project.json,**/project.json}',
-        (configFile, _, ctx) => {
-            const fileName = (0, node_path_1.basename)(configFile);
-            const root = (0, node_path_1.dirname)(configFile);
-            const packageManagerWorkspacesGlob = (0, globs_1.combineGlobPatterns)((0, package_json_workspaces_1.getGlobPatternsFromPackageManagerWorkspaces)(ctx.workspaceRoot));
-            // Only process once if package.json + project.json both exist
-            if (fileName === 'package.json' &&
-                (0, node_fs_1.existsSync)((0, node_path_1.join)(ctx.workspaceRoot, root, 'project.json'))) {
-                return {};
-            }
-            else if (fileName === 'package.json' &&
-                !(0, minimatch_1.minimatch)(configFile, packageManagerWorkspacesGlob)) {
-                return {};
-            }
-            // If no target defaults, this does nothing
-            const targetDefaults = ctx.nxJsonConfiguration?.targetDefaults;
-            if (!targetDefaults) {
-                return {};
-            }
-            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(packageJsonTargets) : []),
-            ]);
-            const executorToTargetMap = getExecutorToTargetMap(packageJsonTargets, projectJson?.targets);
-            const modifiedTargets = {};
-            for (const defaultSpecifier in targetDefaults) {
-                const targetNames = executorToTargetMap.get(defaultSpecifier) ?? new Set();
-                targetNames.add(defaultSpecifier);
-                for (const targetName of targetNames) {
-                    // Prevents `build` from overwriting `@nx/js:tsc` if both are present
-                    // and build is specified later in the ordering.
-                    if (!modifiedTargets[targetName] || targetName !== defaultSpecifier) {
-                        const defaults = JSON.parse(JSON.stringify(targetDefaults[defaultSpecifier]));
-                        modifiedTargets[targetName] = {
-                            ...getTargetInfo(targetName, projectJson?.targets, packageJsonTargets),
-                            ...defaults,
-                        };
-                    }
-                    // TODO: Remove this after we figure out a way to define new targets
-                    // in target defaults
-                    if (!projectDefinedTargets.has(targetName)) {
-                        modifiedTargets[targetName][symbols_1.ONLY_MODIFIES_EXISTING_TARGET] = true;
-                    }
-                }
-            }
-            return {
-                projects: {
-                    [root]: {
-                        targets: modifiedTargets,
-                    },
-                },
-                [symbols_1.OVERRIDE_SOURCE_FILE]: 'nx.json',
-            };
-        },
-    ],
-};
-exports.default = exports.TargetDefaultsPlugin;
-function getExecutorToTargetMap(packageJsonTargets, projectJsonTargets) {
-    const executorToTargetMap = new Map();
-    const targets = Object.keys({
-        ...projectJsonTargets,
-        ...packageJsonTargets,
-    });
-    for (const target of targets) {
-        const executor = getTargetExecutor(target, projectJsonTargets, packageJsonTargets);
-        const targetsForExecutor = executorToTargetMap.get(executor) ?? new Set();
-        targetsForExecutor.add(target);
-        executorToTargetMap.set(executor, targetsForExecutor);
-    }
-    return executorToTargetMap;
-}
-function readJsonOrNull(path) {
-    if ((0, node_fs_1.existsSync)(path)) {
-        return (0, fileutils_1.readJsonFile)(path);
-    }
-    else {
-        return null;
-    }
-}
-/**
- * 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
- * for config happens, without this, the target defaults may be compatible
- * with a config from a plugin and then that combined target be incompatible
- * with the project json configuration resulting in the target default values
- * 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, projectJsonTargets, packageJsonTargets) {
-    const projectJsonTarget = projectJsonTargets?.[target];
-    const packageJsonTarget = packageJsonTargets?.[target];
-    const executor = getTargetExecutor(target, projectJsonTargets, packageJsonTargets);
-    const targetOptions = {
-        ...packageJsonTarget?.options,
-        ...projectJsonTarget?.options,
-    };
-    const metadata = {
-        ...packageJsonTarget?.metadata,
-        ...projectJsonTarget?.metadata,
-    };
-    if (projectJsonTarget?.command) {
-        return {
-            command: projectJsonTarget?.command,
-            metadata,
-        };
-    }
-    if (executor === 'nx:run-commands') {
-        if (targetOptions?.command) {
-            return {
-                executor: 'nx:run-commands',
-                options: {
-                    command: targetOptions?.command,
-                },
-                metadata,
-            };
-        }
-        else if (targetOptions?.commands) {
-            return {
-                executor: 'nx:run-commands',
-                options: {
-                    commands: targetOptions.commands,
-                },
-                metadata,
-            };
-        }
-        return {
-            executor: 'nx:run-commands',
-            metadata,
-        };
-    }
-    if (executor === 'nx:run-script') {
-        return {
-            executor: 'nx:run-script',
-            options: {
-                script: targetOptions?.script ?? target,
-            },
-            metadata,
-        };
-    }
-    if (executor) {
-        return { executor };
-    }
-    return {};
-}
-exports.getTargetInfo = getTargetInfo;
-function getTargetExecutor(target, projectJsonTargets, packageJsonTargets) {
-    const projectJsonTargetConfiguration = projectJsonTargets?.[target];
-    const packageJsonTargetConfiguration = packageJsonTargets?.[target];
-    if (!projectJsonTargetConfiguration && packageJsonTargetConfiguration) {
-        return packageJsonTargetConfiguration?.executor;
-    }
-    if (projectJsonTargetConfiguration?.executor) {
-        return projectJsonTargetConfiguration.executor;
-    }
-    if (projectJsonTargetConfiguration?.command) {
-        return 'nx:run-commands';
-    }
-    return null;
-}