nx 17.1.0-beta.0 → 17.1.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "17.1.0-beta.0",
+  "version": "17.1.0-beta.2",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -67,7 +67,7 @@
     "yargs": "^17.6.2",
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
-    "@nrwl/tao": "17.1.0-beta.0"
+    "@nrwl/tao": "17.1.0-beta.2"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.6.7",
@@ -82,16 +82,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "17.1.0-beta.0",
-    "@nx/nx-darwin-arm64": "17.1.0-beta.0",
-    "@nx/nx-linux-x64-gnu": "17.1.0-beta.0",
-    "@nx/nx-linux-x64-musl": "17.1.0-beta.0",
-    "@nx/nx-win32-x64-msvc": "17.1.0-beta.0",
-    "@nx/nx-linux-arm64-gnu": "17.1.0-beta.0",
-    "@nx/nx-linux-arm64-musl": "17.1.0-beta.0",
-    "@nx/nx-linux-arm-gnueabihf": "17.1.0-beta.0",
-    "@nx/nx-win32-arm64-msvc": "17.1.0-beta.0",
-    "@nx/nx-freebsd-x64": "17.1.0-beta.0"
+    "@nx/nx-darwin-x64": "17.1.0-beta.2",
+    "@nx/nx-darwin-arm64": "17.1.0-beta.2",
+    "@nx/nx-linux-x64-gnu": "17.1.0-beta.2",
+    "@nx/nx-linux-x64-musl": "17.1.0-beta.2",
+    "@nx/nx-win32-x64-msvc": "17.1.0-beta.2",
+    "@nx/nx-linux-arm64-gnu": "17.1.0-beta.2",
+    "@nx/nx-linux-arm64-musl": "17.1.0-beta.2",
+    "@nx/nx-linux-arm-gnueabihf": "17.1.0-beta.2",
+    "@nx/nx-win32-arm64-msvc": "17.1.0-beta.2",
+    "@nx/nx-freebsd-x64": "17.1.0-beta.2"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/init/implementation/add-nx-to-monorepo.js

@@ -57,6 +57,7 @@ async function addNxToMonorepo(options) {
                 (options.interactive ? await (0, utils_1.askAboutNxCloud)() : false);
     }
     (0, utils_1.createNxJsonFile)(repoRoot, targetDefaults, cacheableOperations, scriptOutputs);
+    (0, utils_1.updateGitIgnore)(repoRoot);
     (0, utils_1.addDepsToPackageJson)(repoRoot);
     output_1.output.log({ title: '📦 Installing dependencies' });
     (0, utils_1.runInstall)(repoRoot);

package/src/command-line/init/implementation/add-nx-to-nest.js

@@ -71,6 +71,7 @@ async function addNxToNest(options, packageJson) {
     }
     (0, utils_1.createNxJsonFile)(repoRoot, [], [...cacheableOperations, ...nestCacheableScripts], {});
     const pmc = (0, package_manager_1.getPackageManagerCommand)();
+    (0, utils_1.updateGitIgnore)(repoRoot);
     (0, utils_1.addDepsToPackageJson)(repoRoot);
     addNestPluginToPackageJson(repoRoot);
     (0, utils_1.markRootPackageJsonAsNxProject)(repoRoot, cacheableOperations, scriptOutputs, pmc);

package/src/command-line/init/implementation/add-nx-to-npm-repo.js

@@ -46,6 +46,7 @@ async function addNxToNpmRepo(options) {
     }
     (0, utils_1.createNxJsonFile)(repoRoot, [], cacheableOperations, {});
     const pmc = (0, package_manager_1.getPackageManagerCommand)();
+    (0, utils_1.updateGitIgnore)(repoRoot);
     (0, utils_1.addDepsToPackageJson)(repoRoot);
     (0, utils_1.markRootPackageJsonAsNxProject)(repoRoot, cacheableOperations, scriptOutputs, pmc);
     output_1.output.log({ title: '📦 Installing dependencies' });

package/src/command-line/init/implementation/utils.d.ts

@@ -4,6 +4,7 @@ export declare function createNxJsonFile(repoRoot: string, topologicalTargets: s
     [name: string]: string;
 }): void;
 export declare function addDepsToPackageJson(repoRoot: string): void;
+export declare function updateGitIgnore(root: string): void;
 export declare function runInstall(repoRoot: string, pmc?: PackageManagerCommands): void;
 export declare function initCloud(repoRoot: string, installationSource: 'nx-init-angular' | 'nx-init-cra' | 'nx-init-monorepo' | 'nx-init-nest' | 'nx-init-npm-repo'): void;
 export declare function addVsCodeRecommendedExtensions(repoRoot: string, extensions: string[]): void;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printFinalMessage = exports.markRootPackageJsonAsNxProject = exports.addVsCodeRecommendedExtensions = exports.initCloud = exports.runInstall = exports.addDepsToPackageJson = exports.createNxJsonFile = exports.askAboutNxCloud = void 0;
+exports.printFinalMessage = exports.markRootPackageJsonAsNxProject = exports.addVsCodeRecommendedExtensions = exports.initCloud = exports.runInstall = exports.updateGitIgnore = exports.addDepsToPackageJson = exports.createNxJsonFile = exports.askAboutNxCloud = void 0;
 const child_process_1 = require("child_process");
 const enquirer = require("enquirer");
 const path_1 = require("path");
@@ -10,6 +10,7 @@ const output_1 = require("../../../utils/output");
 const package_manager_1 = require("../../../utils/package-manager");
 const path_2 = require("../../../utils/path");
 const versions_1 = require("../../../utils/versions");
+const fs_1 = require("fs");
 async function askAboutNxCloud() {
     return await enquirer
         .prompt([
@@ -108,6 +109,18 @@ function addDepsToPackageJson(repoRoot) {
     (0, fileutils_1.writeJsonFile)(path, json);
 }
 exports.addDepsToPackageJson = addDepsToPackageJson;
+function updateGitIgnore(root) {
+    const ignorePath = (0, path_1.join)(root, '.gitignore');
+    try {
+        let contents = (0, fs_1.readFileSync)(ignorePath, 'utf-8');
+        if (!contents.includes('.nx/cache')) {
+            contents = [contents, '', '.nx/cache'].join('\n');
+            (0, fs_1.writeFileSync)(ignorePath, contents, 'utf-8');
+        }
+    }
+    catch { }
+}
+exports.updateGitIgnore = updateGitIgnore;
 function runInstall(repoRoot, pmc = (0, package_manager_1.getPackageManagerCommand)()) {
     (0, child_process_1.execSync)(pmc.install, { stdio: [0, 1, 2], cwd: repoRoot });
 }

package/src/devkit-internals.d.ts

@@ -14,4 +14,5 @@ export { sortObjectByKeys } from './utils/object-sort';
 export { stripIndent } from './utils/logger';
 export { readModulePackageJson } from './utils/package-json';
 export { splitByColons } from './utils/split-target';
+export { hashObject } from './hasher/file-hasher';
 export { createProjectRootMappingsFromProjectConfigurations, findProjectForPath, } from './project-graph/utils/find-project-for-path';

package/src/devkit-internals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = 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.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = 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.
  *
@@ -28,6 +28,8 @@ var package_json_1 = require("./utils/package-json");
 Object.defineProperty(exports, "readModulePackageJson", { enumerable: true, get: function () { return package_json_1.readModulePackageJson; } });
 var split_target_2 = require("./utils/split-target");
 Object.defineProperty(exports, "splitByColons", { enumerable: true, get: function () { return split_target_2.splitByColons; } });
+var file_hasher_1 = require("./hasher/file-hasher");
+Object.defineProperty(exports, "hashObject", { enumerable: true, get: function () { return file_hasher_1.hashObject; } });
 var find_project_for_path_1 = require("./project-graph/utils/find-project-for-path");
 Object.defineProperty(exports, "createProjectRootMappingsFromProjectConfigurations", { enumerable: true, get: function () { return find_project_for_path_1.createProjectRootMappingsFromProjectConfigurations; } });
 Object.defineProperty(exports, "findProjectForPath", { enumerable: true, get: function () { return find_project_for_path_1.findProjectForPath; } });

package/src/generators/testing-utils/create-tree-with-empty-workspace.js

@@ -35,9 +35,6 @@ function addCommonFiles(tree, addAppsAndLibsFolders) {
             lint: {
                 cache: true,
             },
-            test: {
-                cache: true,
-            },
             e2e: {
                 cache: true,
             },

package/src/project-graph/utils/normalize-project-nodes.js

@@ -6,7 +6,10 @@ const logger_1 = require("../../utils/logger");
 const project_configuration_utils_1 = require("../utils/project-configuration-utils");
 async function normalizeProjectNodes(ctx, builder, nxJson) {
     const toAdd = [];
-    const projects = Object.keys(ctx.projects);
+    // Sorting projects by name to make sure that the order of projects in the graph is deterministic.
+    // This is important to ensure that expanded properties referencing projects (e.g. implicit dependencies)
+    // are also deterministic, and thus don't cause the calculated project configuration hash to shift.
+    const projects = Object.keys(ctx.projects).sort();
     // Used for expanding implicit dependencies (e.g. `@proj/*` or `tag:foo`)
     const partialProjectGraphNodes = projects.reduce((graph, project) => {
         const projectConfiguration = ctx.projects[project];
@@ -71,7 +74,7 @@ function normalizeProjectTargets(project, targetDefaults, projectName) {
         const defaults = resolveCommandSyntacticSugar((0, project_configuration_utils_1.readTargetDefaultsForTarget)(target, targetDefaults, executor), `targetDefaults:${target}`);
         targets[target] = resolveCommandSyntacticSugar(targets[target], `${projectName}:${target}`);
         if (defaults) {
-            targets[target] = (0, project_configuration_utils_1.mergeTargetConfigurations)(project, target, defaults);
+            targets[target] = (0, project_configuration_utils_1.mergeTargetConfigurations)(targets[target], defaults);
         }
         targets[target].options = (0, project_configuration_utils_1.resolveNxTokensInOptions)(targets[target].options, project, `${projectName}:${target}`);
         targets[target].configurations ??= {};

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

@@ -9,6 +9,16 @@ plugins: LoadedNxPlugin[], root?: string): {
     externalNodes: Record<string, ProjectGraphExternalNode>;
 };
 export declare function readProjectConfigurationsFromRootMap(projectRootMap: Map<string, ProjectConfiguration>): Record<string, ProjectConfiguration>;
-export declare function mergeTargetConfigurations(projectConfiguration: ProjectConfiguration, target: string, targetDefaults: TargetDefaults[string]): TargetConfiguration;
+/**
+ * Merges two configurations for a target.
+ *
+ * Most properties from `target` will overwrite any properties from `baseTarget`.
+ * Options and configurations are treated differently - they are merged together if the executor definition is compatible.
+ *
+ * @param target The configuration for the target with higher priority
+ * @param baseTarget The configuration for the target that should be overwritten.
+ * @returns A merged target configuration
+ */
+export declare function mergeTargetConfigurations(target: TargetConfiguration, baseTarget: TargetConfiguration): TargetConfiguration;
 export declare function resolveNxTokensInOptions<T extends Object | Array<unknown>>(object: T, project: ProjectConfiguration, key: string): T;
 export declare function readTargetDefaultsForTarget(targetName: string, targetDefaults: TargetDefaults, executor?: string): TargetDefaults[string];

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

@@ -21,16 +21,28 @@ function mergeProjectConfigurationIntoRootMap(projectRootMap, project) {
     };
     // The next blocks handle properties that should be themselves merged (e.g. targets, tags, and implicit dependencies)
     if (project.tags && matchingProject.tags) {
-        updatedProjectConfiguration.tags = matchingProject.tags.concat(project.tags);
+        updatedProjectConfiguration.tags = Array.from(new Set(matchingProject.tags.concat(project.tags)));
     }
     if (project.implicitDependencies && matchingProject.implicitDependencies) {
         updatedProjectConfiguration.implicitDependencies =
             matchingProject.implicitDependencies.concat(project.implicitDependencies);
     }
     if (project.generators && matchingProject.generators) {
-        updatedProjectConfiguration.generators = {
-            ...matchingProject.generators,
-            ...project.generators,
+        // Start with generators config in new project.
+        updatedProjectConfiguration.generators = { ...project.generators };
+        // For each generator that was already defined, shallow merge the options.
+        // Project contains the new info, so it has higher priority.
+        for (const generator in matchingProject.generators) {
+            updatedProjectConfiguration.generators[generator] = {
+                ...matchingProject.generators[generator],
+                ...project.generators[generator],
+            };
+        }
+    }
+    if (project.namedInputs && matchingProject.namedInputs) {
+        updatedProjectConfiguration.namedInputs = {
+            ...matchingProject.namedInputs,
+            ...project.namedInputs,
         };
     }
     if (project.targets && matchingProject.targets) {
@@ -38,6 +50,14 @@ function mergeProjectConfigurationIntoRootMap(projectRootMap, project) {
             ...matchingProject.targets,
             ...project.targets,
         };
+        for (const target in matchingProject.targets) {
+            if (target in matchingProject.targets && target in project.targets) {
+                // If the target is defined in both places, merge the options
+                // Project contains the new info, so it has higher priority.
+                // Options from matchingProject are used as defaults.
+                updatedProjectConfiguration.targets[target] = mergeTargetConfigurations(project.targets[target], matchingProject.targets[target]);
+            }
+        }
     }
     projectRootMap.set(updatedProjectConfiguration.root, updatedProjectConfiguration);
 }
@@ -104,27 +124,41 @@ function readProjectConfigurationsFromRootMap(projectRootMap) {
     return projects;
 }
 exports.readProjectConfigurationsFromRootMap = readProjectConfigurationsFromRootMap;
-function mergeTargetConfigurations(projectConfiguration, target, targetDefaults) {
-    const targetConfiguration = projectConfiguration.targets?.[target];
-    if (!targetConfiguration) {
-        throw new Error(`Attempted to merge targetDefaults for ${projectConfiguration.name}.${target}, which doesn't exist.`);
-    }
-    const { configurations: defaultConfigurations, options: defaultOptions, ...defaults } = targetDefaults;
+/**
+ * Merges two configurations for a target.
+ *
+ * Most properties from `target` will overwrite any properties from `baseTarget`.
+ * Options and configurations are treated differently - they are merged together if the executor definition is compatible.
+ *
+ * @param target The configuration for the target with higher priority
+ * @param baseTarget The configuration for the target that should be overwritten.
+ * @returns A merged target configuration
+ */
+function mergeTargetConfigurations(target, baseTarget) {
+    const { configurations: defaultConfigurations, options: defaultOptions, ...defaults } = baseTarget;
     const result = {
         ...defaults,
-        ...targetConfiguration,
+        ...target,
     };
     // Target is "compatible", e.g. executor is defined only once or is the same
     // in both places. This means that it is likely safe to merge options
-    if (!targetDefaults.executor ||
-        !targetConfiguration.executor ||
-        targetDefaults.executor === targetConfiguration.executor) {
-        result.options = { ...defaultOptions, ...targetConfiguration?.options };
-        result.configurations = mergeConfigurations(defaultConfigurations, targetConfiguration.configurations);
+    if (isCompatibleTarget(defaults, target)) {
+        result.options = { ...defaultOptions, ...target?.options };
+        result.configurations = mergeConfigurations(defaultConfigurations, target.configurations);
     }
     return result;
 }
 exports.mergeTargetConfigurations = mergeTargetConfigurations;
+/**
+ * Checks if targets options are compatible - used when merging configurations
+ * to avoid merging options for @nx/js:tsc into something like @nx/webpack:webpack.
+ *
+ * If the executors are both specified and don't match, the options aren't considered
+ * "compatible" and shouldn't be merged.
+ */
+function isCompatibleTarget(a, b) {
+    return !a.executor || !b.executor || a.executor === b.executor;
+}
 function mergeConfigurations(defaultConfigurations, projectDefinedConfigurations) {
     const result = {};
     const configurations = new Set([

package/src/project-graph/utils/retrieve-workspace-files.js

@@ -121,7 +121,9 @@ exports.retrieveProjectConfigurationsWithoutPluginInference = retrieveProjectCon
 function buildAllWorkspaceFiles(projectFileMap, globalFiles) {
     perf_hooks_1.performance.mark('get-all-workspace-files:start');
     let fileData = Object.values(projectFileMap).flat();
-    fileData = fileData.concat(globalFiles).sort();
+    fileData = fileData
+        .concat(globalFiles)
+        .sort((a, b) => a.file.localeCompare(b.file));
     perf_hooks_1.performance.mark('get-all-workspace-files:end');
     perf_hooks_1.performance.measure('get-all-workspace-files', 'get-all-workspace-files:start', 'get-all-workspace-files:end');
     return fileData;

package/src/utils/package-manager.d.ts

@@ -7,6 +7,7 @@ export interface PackageManagerCommands {
     addDev: string;
     rm: string;
     exec: string;
+    dlx: string;
     list: string;
     run: (script: string, args: string) => string;
 }

package/src/utils/package-manager.js

@@ -55,13 +55,14 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
                 addDev: useBerry ? 'yarn add -D' : 'yarn add -D -W',
                 rm: 'yarn remove',
                 exec: 'yarn',
+                dlx: useBerry ? 'yarn dlx' : 'yarn',
                 run: (script, args) => `yarn ${script} ${args}`,
                 list: useBerry ? 'yarn info --name-only' : 'yarn list',
             };
         },
         pnpm: () => {
             const pnpmVersion = getPackageManagerVersion('pnpm', root);
-            const useExec = (0, semver_1.gte)(pnpmVersion, '6.13.0');
+            const modernPnpm = (0, semver_1.gte)(pnpmVersion, '6.13.0');
             const includeDoubleDashBeforeArgs = (0, semver_1.lt)(pnpmVersion, '7.0.0');
             const isPnpmWorkspace = (0, fs_1.existsSync)((0, path_1.join)(root, 'pnpm-workspace.yaml'));
             return {
@@ -70,7 +71,8 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
                 add: isPnpmWorkspace ? 'pnpm add -w' : 'pnpm add',
                 addDev: isPnpmWorkspace ? 'pnpm add -Dw' : 'pnpm add -D',
                 rm: 'pnpm rm',
-                exec: useExec ? 'pnpm exec' : 'pnpx',
+                exec: modernPnpm ? 'pnpm exec' : 'pnpx',
+                dlx: modernPnpm ? 'pnpm dlx' : 'pnpx',
                 run: (script, args) => includeDoubleDashBeforeArgs
                     ? `pnpm run ${script} -- ${args}`
                     : `pnpm run ${script} ${args}`,
@@ -87,6 +89,7 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
                 addDev: 'npm install -D',
                 rm: 'npm rm',
                 exec: 'npx',
+                dlx: 'npx',
                 run: (script, args) => `npm run ${script} -- ${args}`,
                 list: 'npm ls',
             };

package/src/utils/params.js

@@ -532,10 +532,25 @@ function getPromptsForSchema(opts, schema, projectsConfigurations) {
             // Normalize x-prompt
             if (typeof v['x-prompt'] === 'string') {
                 const message = v['x-prompt'];
-                v['x-prompt'] = {
-                    type: v.type === 'boolean' ? 'confirm' : 'input',
-                    message,
-                };
+                if (v.type === 'boolean') {
+                    v['x-prompt'] = {
+                        type: 'confirm',
+                        message,
+                    };
+                }
+                else if (v.type === 'array' && v.items?.enum) {
+                    v['x-prompt'] = {
+                        type: 'multiselect',
+                        items: v.items.enum,
+                        message,
+                    };
+                }
+                else {
+                    v['x-prompt'] = {
+                        type: 'input',
+                        message,
+                    };
+                }
             }
             question.message = v['x-prompt'].message;
             question.validate = (s) => {