nx 17.0.0-beta.1 → 17.0.0-beta.2

package/migrations.json

@@ -65,6 +65,12 @@
       "version": "17.0.0-beta.1",
       "description": "Updates the default cache directory to .nx/cache",
       "implementation": "./src/migrations/update-17-0-0/move-cache-directory"
+    },
+    "17.0.0-use-minimal-config-for-tasks-runner-options": {
+      "cli": "nx",
+      "version": "17.0.0-beta.2",
+      "description": "Use minimal config for tasksRunnerOptions",
+      "implementation": "./src/migrations/update-17-0-0/use-minimal-config-for-tasks-runner-options"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "17.0.0-beta.1",
+  "version": "17.0.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.0.0-beta.1"
+    "@nrwl/tao": "17.0.0-beta.2"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.6.7",
@@ -82,16 +82,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "17.0.0-beta.1",
-    "@nx/nx-darwin-arm64": "17.0.0-beta.1",
-    "@nx/nx-linux-x64-gnu": "17.0.0-beta.1",
-    "@nx/nx-linux-x64-musl": "17.0.0-beta.1",
-    "@nx/nx-win32-x64-msvc": "17.0.0-beta.1",
-    "@nx/nx-linux-arm64-gnu": "17.0.0-beta.1",
-    "@nx/nx-linux-arm64-musl": "17.0.0-beta.1",
-    "@nx/nx-linux-arm-gnueabihf": "17.0.0-beta.1",
-    "@nx/nx-win32-arm64-msvc": "17.0.0-beta.1",
-    "@nx/nx-freebsd-x64": "17.0.0-beta.1"
+    "@nx/nx-darwin-x64": "17.0.0-beta.2",
+    "@nx/nx-darwin-arm64": "17.0.0-beta.2",
+    "@nx/nx-linux-x64-gnu": "17.0.0-beta.2",
+    "@nx/nx-linux-x64-musl": "17.0.0-beta.2",
+    "@nx/nx-win32-x64-msvc": "17.0.0-beta.2",
+    "@nx/nx-linux-arm64-gnu": "17.0.0-beta.2",
+    "@nx/nx-linux-arm64-musl": "17.0.0-beta.2",
+    "@nx/nx-linux-arm-gnueabihf": "17.0.0-beta.2",
+    "@nx/nx-win32-arm64-msvc": "17.0.0-beta.2",
+    "@nx/nx-freebsd-x64": "17.0.0-beta.2"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/affected/print-affected.js

@@ -47,7 +47,7 @@ async function createTasks(affectedProjectsWithTargetAndConfig, projectGraph, nx
         target: task.target,
         hash: task.hash,
         command: (0, utils_1.getCommandAsString)(execCommand, task),
-        outputs: (0, utils_1.getOutputs)(projectGraph.nodes, task),
+        outputs: task.outputs,
     }));
 }
 function serializeProjectGraph(projectGraph) {

package/src/command-line/examples.js

@@ -192,7 +192,6 @@ exports.examples = {
             description: 'Open the project graph of the workspace in the browser, highlight the projects affected, but exclude project-one and project-two',
         },
     ],
-    'workspace-generator': [],
     list: [
         {
             command: 'list',

package/src/command-line/generate/command-object.d.ts

@@ -1,6 +1,2 @@
 import { CommandModule } from 'yargs';
 export declare const yargsGenerateCommand: CommandModule;
-/**
- * @deprecated(v17): Remove `workspace-generator in v17. Use local plugins.
- */
-export declare const yargsWorkspaceGeneratorCommand: CommandModule;

package/src/command-line/generate/command-object.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.yargsWorkspaceGeneratorCommand = exports.yargsGenerateCommand = void 0;
+exports.yargsGenerateCommand = void 0;
 const path_1 = require("../../utils/path");
-const documentation_1 = require("../yargs-utils/documentation");
 exports.yargsGenerateCommand = {
     command: 'generate <generator> [_..]',
     describe: 'Generate or update source code (e.g., nx generate @nx/js:lib mylib).',
@@ -14,20 +13,6 @@ exports.yargsGenerateCommand = {
         process.exit(await (await Promise.resolve().then(() => require('./generate'))).generate((0, path_1.getCwd)(), args));
     },
 };
-/**
- * @deprecated(v17): Remove `workspace-generator in v17. Use local plugins.
- */
-exports.yargsWorkspaceGeneratorCommand = {
-    command: 'workspace-generator [generator]',
-    describe: 'Runs a workspace generator from the tools/generators directory',
-    deprecated: 'Use a local plugin instead. See: https://nx.dev/deprecated/workspace-generators',
-    aliases: ['workspace-schematic [schematic]'],
-    builder: async (yargs) => (0, documentation_1.linkToNxDevAndExamples)(withGenerateOptions(yargs), 'workspace-generator'),
-    handler: async (args) => {
-        await (await Promise.resolve().then(() => require('./generate'))).workspaceGenerators(args);
-        process.exit(0);
-    },
-};
 function withGenerateOptions(yargs) {
     const generatorWillShowHelp = process.argv[3] && !process.argv[3].startsWith('-');
     const res = yargs

package/src/command-line/generate/generate.d.ts

@@ -1,6 +1,5 @@
 import { FileChange } from '../../generators/tree';
 import { Options, Schema } from '../../utils/params';
-import type { Arguments } from 'yargs';
 export interface GenerateOptions {
     collectionName: string;
     generatorName: string;
@@ -20,9 +19,3 @@ export declare function printGenHelp(opts: GenerateOptions, schema: Schema, norm
 export declare function generate(cwd: string, args: {
     [k: string]: any;
 }): Promise<any>;
-/**
- * Wraps `workspace-generator` to invoke `generate`.
- *
- * @deprecated(v17): Remove `workspace-generator in v17. Use local plugins.
- */
-export declare function workspaceGenerators(args: Arguments): Promise<any>;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.workspaceGenerators = exports.generate = exports.printGenHelp = exports.parseGeneratorString = exports.printChanges = void 0;
+exports.generate = exports.printGenHelp = exports.parseGeneratorString = exports.printChanges = void 0;
 const chalk = require("chalk");
 const enquirer_1 = require("enquirer");
 const path_1 = require("path");
@@ -14,7 +14,6 @@ const print_help_1 = require("../../utils/print-help");
 const workspace_root_1 = require("../../utils/workspace-root");
 const calculate_default_project_name_1 = require("../../config/calculate-default-project-name");
 const installed_plugins_1 = require("../../utils/plugins/installed-plugins");
-const output_1 = require("../../utils/output");
 const generator_utils_1 = require("./generator-utils");
 function printChanges(fileChanges) {
     fileChanges.forEach((f) => {
@@ -272,29 +271,3 @@ async function generate(cwd, args) {
     });
 }
 exports.generate = generate;
-/**
- * Wraps `workspace-generator` to invoke `generate`.
- *
- * @deprecated(v17): Remove `workspace-generator in v17. Use local plugins.
- */
-async function workspaceGenerators(args) {
-    const generator = process.argv.slice(3);
-    output_1.output.warn({
-        title: `Workspace Generators are no longer supported`,
-        bodyLines: [
-            'Instead, Nx now supports executing generators or executors from ',
-            'local plugins. To run a generator from a local plugin, ',
-            'use `nx generate` like you would with any other generator.',
-            '',
-            'For more information, see: https://nx.dev/deprecated/workspace-generators',
-        ],
-    });
-    const nxJson = (0, configuration_1.readNxJson)();
-    const collection = nxJson.npmScope
-        ? `@${nxJson.npmScope}/workspace-plugin`
-        : 'workspace-plugin';
-    args._ = args._.slice(1);
-    args.generator = `${collection}:${generator}`;
-    return generate(process.cwd(), args);
-}
-exports.workspaceGenerators = workspaceGenerators;

package/src/command-line/nx-commands.js

@@ -67,7 +67,6 @@ exports.commandsObject = yargs
     .command(command_object_16.yargsShowCommand)
     .command(command_object_2.yargsViewLogsCommand)
     .command(command_object_17.yargsWatchCommand)
-    .command(command_object_7.yargsWorkspaceGeneratorCommand)
     .command(command_object_18.yargsWorkspaceLintCommand)
     .scriptName('nx')
     .help()

package/src/config/task-graph.d.ts

@@ -27,6 +27,10 @@ export interface Task {
      * Overrides for the configured options of the target
      */
     overrides: any;
+    /**
+     * The outputs the task may produce
+     */
+    outputs: string[];
     /**
      * Root of the project the task belongs to
      */

package/src/devkit-internals.d.ts

@@ -14,3 +14,4 @@ export { sortObjectByKeys } from './utils/object-sort';
 export { stripIndent } from './utils/logger';
 export { readModulePackageJson } from './utils/package-json';
 export { splitByColons } from './utils/split-target';
+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.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.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,3 +28,6 @@ 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 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/hasher/task-hasher.js

@@ -195,7 +195,7 @@ class TaskHasherImpl {
         const partialHashes = [];
         for (const d of taskGraph.dependencies[task.id]) {
             const childTask = taskGraph.tasks[d];
-            const outputs = (0, utils_1.getOutputsForTargetAndConfiguration)(childTask, this.projectGraph.nodes[childTask.target.project]);
+            const outputs = (0, utils_1.getOutputsForTargetAndConfiguration)(childTask.target, childTask.overrides, this.projectGraph.nodes[childTask.target.project]);
             const { getFilesForOutputs } = require('../native');
             const outputFiles = getFilesForOutputs(workspace_root_1.workspaceRoot, outputs);
             const filteredFiles = outputFiles.filter((p) => p === dependentTasksOutputFiles ||

package/src/migrations/update-17-0-0/use-minimal-config-for-tasks-runner-options.d.ts

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

package/src/migrations/update-17-0-0/use-minimal-config-for-tasks-runner-options.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const json_1 = require("../../generators/utils/json");
+async function migrate(tree) {
+    if (!tree.exists('nx.json')) {
+        return;
+    }
+    (0, json_1.updateJson)(tree, 'nx.json', (nxJson) => {
+        // Already migrated
+        if (!nxJson.tasksRunnerOptions?.default) {
+            return nxJson;
+        }
+        const { runner, options } = nxJson.tasksRunnerOptions.default;
+        // This property shouldn't ever be part of tasks runner options.
+        if (options.useDaemonProcess !== undefined) {
+            nxJson.useDaemonProcess = options.useDaemonProcess;
+            delete options.useDaemonProcess;
+        }
+        // Remaining keys may be specific to a given runner, so leave them alone if there are multiple runners.
+        if (Object.keys(nxJson.tasksRunnerOptions ?? {}).length > 1) {
+            return nxJson;
+        }
+        // These options can only be moved for nx-cloud.
+        if (runner === 'nx-cloud' || runner === '@nrwl/nx-cloud') {
+            nxJson.nxCloudAccessToken = options.accessToken;
+            delete options.accessToken;
+            if (options.url) {
+                nxJson.nxCloudUrl = options.url;
+                delete options.url;
+            }
+            if (options.encryptionKey) {
+                nxJson.nxCloudEncryptionKey = options.encryptionKey;
+                delete options.encryptionKey;
+            }
+        }
+        // These options should be safe to move for all tasks runners:
+        if (options.parallel !== undefined) {
+            nxJson.parallel = options.parallel;
+            delete options.parallel;
+        }
+        if (options.cacheDirectory !== undefined) {
+            nxJson.cacheDirectory = options.cacheDirectory;
+            delete options.cacheDirectory;
+        }
+        if (Array.isArray(options.cacheableOperations)) {
+            nxJson.targetDefaults ??= {};
+            for (const target of options.cacheableOperations) {
+                nxJson.targetDefaults[target] ??= {};
+                nxJson.targetDefaults[target].cache ??= true;
+            }
+            delete options.cacheableOperations;
+        }
+        if (['nx-cloud', '@nrwl/nx-cloud', 'nx/tasks-runners/default'].includes(runner)) {
+            delete nxJson.tasksRunnerOptions.default.runner;
+            if (Object.values(options).length === 0) {
+                delete nxJson.tasksRunnerOptions;
+            }
+        }
+        return nxJson;
+    });
+}
+exports.default = migrate;

package/src/tasks-runner/create-task-graph.js

@@ -163,11 +163,13 @@ class ProcessTasks {
             target,
             configuration: resolvedConfiguration,
         };
+        const interpolatedOverrides = interpolateOverrides(overrides, project.name, project.data);
         return {
             id,
             target: qualifiedTarget,
             projectRoot: project.data.root,
-            overrides: interpolateOverrides(overrides, project.name, project.data),
+            overrides: interpolatedOverrides,
+            outputs: (0, utils_1.getOutputs)(this.projectGraph.nodes, qualifiedTarget, interpolatedOverrides),
             // TODO(v18): Remove cast here after typing is moved back onto TargetConfiguration
             cache: project.data.targets[target].cache,
         };

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

@@ -7,6 +7,7 @@ const project_graph_1 = require("../project-graph/project-graph");
 const run_command_1 = require("./run-command");
 const invoke_runner_terminal_output_life_cycle_1 = require("./life-cycles/invoke-runner-terminal-output-life-cycle");
 const perf_hooks_1 = require("perf_hooks");
+const utils_1 = require("./utils");
 async function initTasksRunner(nxArgs) {
     perf_hooks_1.performance.mark('init-local');
     (0, workspace_configuration_check_1.workspaceConfigurationCheck)();
@@ -18,6 +19,12 @@ async function initTasksRunner(nxArgs) {
     return {
         invoke: async (opts) => {
             perf_hooks_1.performance.mark('code-loading:end');
+            // TODO: This polyfills the outputs if someone doesn't pass a task with outputs. Remove this in Nx 18
+            opts.tasks.forEach((t) => {
+                if (!t.outputs) {
+                    t.outputs = (0, utils_1.getOutputs)(projectGraph.nodes, t.target, t.overrides);
+                }
+            });
             const lifeCycle = new invoke_runner_terminal_output_life_cycle_1.InvokeRunnerTerminalOutputLifeCycle(opts.tasks);
             const taskGraph = {
                 roots: opts.tasks.map((task) => task.id),

package/src/tasks-runner/task-orchestrator.js

@@ -81,7 +81,7 @@ class TaskOrchestrator {
         const cachedResult = await this.cache.get(task);
         if (!cachedResult || cachedResult.code !== 0)
             return null;
-        const outputs = (0, utils_1.getOutputs)(this.projectGraph.nodes, task);
+        const outputs = task.outputs;
         const shouldCopyOutputsFromCache = !!outputs.length &&
             (await this.shouldCopyOutputsFromCache(outputs, task.hash));
         if (shouldCopyOutputsFromCache) {
@@ -232,7 +232,7 @@ class TaskOrchestrator {
                     result.status === 'success'
                     ? 0
                     : 1,
-                outputs: (0, utils_1.getOutputs)(this.projectGraph.nodes, result.task),
+                outputs: result.task.outputs,
             }))
                 .filter(({ task, code }) => this.shouldCacheTaskResult(task, code))
                 .filter(({ terminalOutput, outputs }) => terminalOutput || outputs)
@@ -325,7 +325,7 @@ class TaskOrchestrator {
     }
     async recordOutputsHash(task) {
         if (this.daemon?.enabled()) {
-            return this.daemon.recordOutputsHash((0, utils_1.getOutputs)(this.projectGraph.nodes, task), task.hash);
+            return this.daemon.recordOutputsHash(task.outputs, task.hash);
         }
     }
 }

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

@@ -8,7 +8,7 @@ export declare function getDependencyConfigs({ project, target }: {
     target: string;
 }, defaultDependencyConfigs: Record<string, (TargetDependencyConfig | string)[]>, projectGraph: ProjectGraph): TargetDependencyConfig[] | undefined;
 export declare function expandDependencyConfigSyntaxSugar(dependencyConfigString: string, graph: ProjectGraph): TargetDependencyConfig;
-export declare function getOutputs(p: Record<string, ProjectGraphProjectNode>, task: Task): string[];
+export declare function getOutputs(p: Record<string, ProjectGraphProjectNode>, target: Task['target'], overrides: Task['overrides']): string[];
 declare class InvalidOutputsError extends Error {
     outputs: string[];
     invalidOutputs: Set<string>;
@@ -18,11 +18,10 @@ declare class InvalidOutputsError extends Error {
 export declare function validateOutputs(outputs: string[]): void;
 export declare function transformLegacyOutputs(projectRoot: string, error: InvalidOutputsError): string[];
 /**
- * Returns the list of outputs that will be cached.
- * @param task target + overrides
- * @param node ProjectGraphProjectNode object that the task runs against
+ * @deprecated Pass the target and overrides instead. This will be removed in v18.
  */
-export declare function getOutputsForTargetAndConfiguration(task: Pick<Task, 'target' | 'overrides'>, node: ProjectGraphProjectNode): string[];
+export declare function getOutputsForTargetAndConfiguration(task: Task, node: ProjectGraphProjectNode): string[];
+export declare function getOutputsForTargetAndConfiguration(target: Task['target'] | Task, overrides: Task['overrides'] | ProjectGraphProjectNode, node: ProjectGraphProjectNode): string[];
 export declare function interpolate(template: string, data: any): string;
 export declare function getExecutorNameForTask(task: Task, projectGraph: ProjectGraph): Promise<string>;
 export declare function getExecutorForTask(task: Task, projectGraph: ProjectGraph): Promise<import("../config/misc-interfaces").ExecutorConfig & {

package/src/tasks-runner/utils.js

@@ -62,8 +62,8 @@ function expandDependencyConfigSyntaxSugar(dependencyConfigString, graph) {
     };
 }
 exports.expandDependencyConfigSyntaxSugar = expandDependencyConfigSyntaxSugar;
-function getOutputs(p, task) {
-    return getOutputsForTargetAndConfiguration(task, p[task.target.project]);
+function getOutputs(p, target, overrides) {
+    return getOutputsForTargetAndConfiguration(target, overrides, p[target.project]);
 }
 exports.getOutputs = getOutputs;
 class InvalidOutputsError extends Error {
@@ -104,31 +104,20 @@ function transformLegacyOutputs(projectRoot, error) {
 exports.transformLegacyOutputs = transformLegacyOutputs;
 /**
  * Returns the list of outputs that will be cached.
- * @param task target + overrides
- * @param node ProjectGraphProjectNode object that the task runs against
  */
-function getOutputsForTargetAndConfiguration(task, node) {
-    const { target, configuration } = task.target;
+function getOutputsForTargetAndConfiguration(taskTargetOrTask, overridesOrNode, node) {
+    const taskTarget = 'id' in taskTargetOrTask ? taskTargetOrTask.target : taskTargetOrTask;
+    const overrides = 'id' in taskTargetOrTask ? taskTargetOrTask.overrides : overridesOrNode;
+    node = 'id' in taskTargetOrTask ? overridesOrNode : node;
+    const { target, configuration } = taskTarget;
     const targetConfiguration = node.data.targets[target];
     const options = {
         ...targetConfiguration.options,
         ...targetConfiguration?.configurations?.[configuration],
-        ...task.overrides,
+        ...overrides,
     };
     if (targetConfiguration?.outputs) {
-        try {
-            validateOutputs(targetConfiguration.outputs);
-        }
-        catch (error) {
-            if (error instanceof InvalidOutputsError) {
-                // TODO(@FrozenPandaz): In v17, throw this error and do not transform.
-                console.warn(error.message);
-                targetConfiguration.outputs = transformLegacyOutputs(node.data.root, error);
-            }
-            else {
-                throw error;
-            }
-        }
+        validateOutputs(targetConfiguration.outputs);
         return targetConfiguration.outputs
             .map((output) => {
             return interpolate(output, {

package/src/utils/params.js

@@ -426,11 +426,11 @@ async function combineOptionsForGenerator(commandLineOpts, collectionName, gener
         ? getGeneratorDefaults(defaultProjectName, projectsConfigurations, nxJsonConfiguration, collectionName, generatorName)
         : {};
     let combined = convertAliases(coerceTypesInOptions({ ...generatorDefaults, ...commandLineOpts }, schema), schema, false);
+    warnDeprecations(combined, schema);
     convertSmartDefaultsIntoNamedParams(combined, schema, defaultProjectName, relativeCwd);
     if (isInteractive && isTTY()) {
         combined = await promptForValues(combined, schema, projectsConfigurations);
     }
-    warnDeprecations(combined, schema);
     setDefaults(combined, schema);
     validateOptsAgainstSchema(combined, schema);
     applyVerbosity(combined, schema, isVerbose);