nx 20.0.7 → 20.1.0-beta.0

package/src/core/graph/styles.js

@@ -1 +1 @@
-"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[532],{71970:()=>{}},s=>{var e;e=71970,s(s.s=e)}]);
+"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[532],{8476:()=>{}},s=>{var e;e=8476,s(s.s=e)}]);

package/src/devkit-internals.d.ts

@@ -24,3 +24,4 @@ export { LoadedNxPlugin } from './project-graph/plugins/internal-api';
 export * from './project-graph/error-types';
 export { registerTsProject } from './plugins/js/utils/register';
 export { interpolate } from './tasks-runner/utils';
+export { isCI } from './utils/is-ci';

package/src/devkit-internals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.interpolate = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.findMatchingConfigFiles = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
+exports.isCI = exports.interpolate = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.findMatchingConfigFiles = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
 const tslib_1 = require("tslib");
 /**
  * Note to developers: STOP! These exports are available via requireNx in @nx/devkit.
@@ -50,3 +50,5 @@ var register_1 = require("./plugins/js/utils/register");
 Object.defineProperty(exports, "registerTsProject", { enumerable: true, get: function () { return register_1.registerTsProject; } });
 var utils_1 = require("./tasks-runner/utils");
 Object.defineProperty(exports, "interpolate", { enumerable: true, get: function () { return utils_1.interpolate; } });
+var is_ci_1 = require("./utils/is-ci");
+Object.defineProperty(exports, "isCI", { enumerable: true, get: function () { return is_ci_1.isCI; } });

package/src/plugins/js/utils/config.js

@@ -6,7 +6,7 @@ const fileutils_1 = require("../../../utils/fileutils");
 const workspace_root_1 = require("../../../utils/workspace-root");
 const fs_1 = require("fs");
 function jsPluginConfig(nxJson) {
-    const nxJsonConfig = nxJson?.pluginsConfig?.['@nx/js'] ?? nxJson?.pluginsConfig?.['@nrwl/js'];
+    const nxJsonConfig = nxJson?.pluginsConfig?.['@nx/js'];
     // using lerna _before_ installing deps is causing an issue when parsing lockfile.
     // See: https://github.com/lerna/lerna/issues/3807
     // Note that previous attempt to fix this caused issues with Nx itself, thus we're checking
@@ -42,14 +42,7 @@ function jsPluginConfig(nxJson) {
         packageJsonDeps['@nx/next'] ||
         packageJsonDeps['@nx/react'] ||
         packageJsonDeps['@nx/angular'] ||
-        packageJsonDeps['@nx/web'] ||
-        packageJsonDeps['@nrwl/workspace'] ||
-        packageJsonDeps['@nrwl/js'] ||
-        packageJsonDeps['@nrwl/node'] ||
-        packageJsonDeps['@nrwl/next'] ||
-        packageJsonDeps['@nrwl/react'] ||
-        packageJsonDeps['@nrwl/angular'] ||
-        packageJsonDeps['@nrwl/web']) {
+        packageJsonDeps['@nx/web']) {
         return {
             analyzePackageJson: true,
             analyzeLockfile,

package/src/tasks-runner/create-task-graph.d.ts

@@ -22,6 +22,21 @@ export declare class ProcessTasks {
     createTask(id: string, project: ProjectGraphProjectNode, target: string, resolvedConfiguration: string | undefined, overrides: Object): Task;
     resolveConfiguration(project: ProjectGraphProjectNode, target: string, configuration: string | undefined): string;
     getId(project: string, target: string, configuration: string | undefined): string;
+    /**
+     * this function is used to get the non dummy dependencies of a task recursively
+     * For example, when we have the following dependencies:
+     * {
+     *   'app1:compile': [ 'app2:__nx_dummy_task__' ],
+     *   'app2:__nx_dummy_task__': [ 'app3:__nx_dummy_task__' ],
+     *   'app3:__nx_dummy_task__': [ 'app4:precompile' ],
+     *   'app4:precompile': []
+     * }
+     * getNonDummyDeps('app1:compile') will return ['app1:compile']
+     * getNonDummyDeps('app2:__nx_dummy_task__') will return ['app4:precompile']
+     * getNonDummyDeps('app3:__nx_dummy_task__') will return ['app4:precompile']
+     * getNonDummyDeps('app4:precompile') will return ['app4:precompile']
+     */
+    private getNonDummyDeps;
     private filterDummyTasks;
 }
 export declare function createTaskGraph(projectGraph: ProjectGraph, extraTargetDependencies: TargetDependencies, projectNames: string[], targets: string[], configuration: string | undefined, overrides: Object, excludeTaskDependencies?: boolean): TaskGraph;

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

@@ -6,6 +6,7 @@ exports.mapTargetDefaultsToDependencies = mapTargetDefaultsToDependencies;
 const utils_1 = require("./utils");
 const project_graph_utils_1 = require("../utils/project-graph-utils");
 const output_1 = require("../utils/output");
+const task_graph_utils_1 = require("./task-graph-utils");
 const DUMMY_TASK_TARGET = '__nx_dummy_task__';
 class ProcessTasks {
     constructor(extraTargetDependencies, projectGraph) {
@@ -139,7 +140,7 @@ class ProcessTasks {
             else {
                 const dummyId = this.getId(depProject.name, DUMMY_TASK_TARGET, undefined);
                 this.dependencies[task.id].push(dummyId);
-                this.dependencies[dummyId] = [];
+                this.dependencies[dummyId] ??= [];
                 const noopTask = this.createDummyTask(dummyId, task);
                 this.processTask(noopTask, depProject.name, configuration, overrides);
             }
@@ -188,18 +189,45 @@ class ProcessTasks {
         }
         return id;
     }
+    /**
+     * this function is used to get the non dummy dependencies of a task recursively
+     * For example, when we have the following dependencies:
+     * {
+     *   'app1:compile': [ 'app2:__nx_dummy_task__' ],
+     *   'app2:__nx_dummy_task__': [ 'app3:__nx_dummy_task__' ],
+     *   'app3:__nx_dummy_task__': [ 'app4:precompile' ],
+     *   'app4:precompile': []
+     * }
+     * getNonDummyDeps('app1:compile') will return ['app1:compile']
+     * getNonDummyDeps('app2:__nx_dummy_task__') will return ['app4:precompile']
+     * getNonDummyDeps('app3:__nx_dummy_task__') will return ['app4:precompile']
+     * getNonDummyDeps('app4:precompile') will return ['app4:precompile']
+     */
+    getNonDummyDeps(currentTask, originalTask, cycle) {
+        if (currentTask === originalTask) {
+            return [];
+        }
+        else if (currentTask.endsWith(DUMMY_TASK_TARGET)) {
+            if (cycle?.length && cycle?.includes(currentTask)) {
+                return [];
+            }
+            // if not a cycle, recursively get the non dummy dependencies
+            return (this.dependencies[currentTask]?.flatMap((dep) => this.getNonDummyDeps(dep, originalTask, cycle)) ?? []);
+        }
+        else {
+            return [currentTask];
+        }
+    }
     filterDummyTasks() {
+        const cycle = (0, task_graph_utils_1.findCycle)({ dependencies: this.dependencies });
         for (const [key, deps] of Object.entries(this.dependencies)) {
-            const normalizedDeps = [];
-            for (const dep of deps) {
-                if (dep.endsWith(DUMMY_TASK_TARGET)) {
-                    normalizedDeps.push(...this.dependencies[dep].filter((d) => !d.endsWith(DUMMY_TASK_TARGET)));
-                }
-                else {
-                    normalizedDeps.push(dep);
+            if (!key.endsWith(DUMMY_TASK_TARGET)) {
+                const normalizedDeps = [];
+                for (const dep of deps) {
+                    normalizedDeps.push(...this.getNonDummyDeps(dep, key, cycle));
                 }
+                this.dependencies[key] = normalizedDeps;
             }
-            this.dependencies[key] = normalizedDeps;
         }
         for (const key of Object.keys(this.dependencies)) {
             if (key.endsWith(DUMMY_TASK_TARGET)) {

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

@@ -34,6 +34,7 @@ export interface NxArgs {
     batch?: boolean;
     excludeTaskDependencies?: boolean;
     skipSync?: boolean;
+    sortRootTsconfigPaths?: boolean;
 }
 export declare function createOverrides(__overrides_unparsed__?: string[]): Record<string, any>;
 export declare function getBaseRef(nxJson: NxJsonConfiguration): string;

package/src/utils/print-help.js

@@ -110,9 +110,7 @@ function generateExecutorOverviewOutput({ pluginName, name, description, }) {
         },
         {
             text: `${pluginName}:${name}` +
-                (pluginName.startsWith('@nrwl/')
-                    ? chalk.dim(` (v${versions_1.nxVersion})`)
-                    : ''),
+                (pluginName.startsWith('@nx/') ? chalk.dim(` (v${versions_1.nxVersion})`) : ''),
             padding: [1, 0, 0, 0],
         },
     ]);
@@ -220,14 +218,10 @@ function generateExamplesOutput(schema) {
 // TODO: generalize link generation so it works for non @nx plugins as well
 function generateLinkOutput({ pluginName, name, type, }) {
     const nxPackagePrefix = '@nx/';
-    const nrwlPackagePrefix = '@nrwl/';
-    if (!pluginName.startsWith(nxPackagePrefix) &&
-        !pluginName.startsWith(nrwlPackagePrefix)) {
+    if (!pluginName.startsWith(nxPackagePrefix)) {
         return '';
     }
-    const link = `https://nx.dev/nx-api/${pluginName.substring(pluginName.startsWith(nxPackagePrefix)
-        ? nxPackagePrefix.length
-        : nrwlPackagePrefix.length)}/${type}/${name}`;
+    const link = `https://nx.dev/nx-api/${pluginName.substring(nxPackagePrefix.length)}/${type}/${name}`;
     return `\n\n${chalk.dim('Find more information and examples at:')} ${chalk.bold(link)}`;
 }
 /**