nx 20.0.0-beta.5 → 20.0.0-beta.7

package/src/nx-cloud/utilities/axios.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createApiAxiosInstance = createApiAxiosInstance;
 const path_1 = require("path");
 const environment_1 = require("./environment");
-const axios = require('axios');
 function createApiAxiosInstance(options) {
     let axiosConfigBuilder = (axiosConfig) => axiosConfig;
     const baseUrl = process.env.NX_CLOUD_API || options.url || 'https://cloud.nx.app';
@@ -17,7 +16,7 @@ function createApiAxiosInstance(options) {
         const { nxCloudProxyConfig } = require((0, path_1.join)(process.cwd(), options.customProxyConfigPath));
         axiosConfigBuilder = nxCloudProxyConfig ?? axiosConfigBuilder;
     }
-    return axios.create(axiosConfigBuilder({
+    return require('axios').create(axiosConfigBuilder({
         baseURL: baseUrl,
         timeout: environment_1.NX_CLOUD_NO_TIMEOUTS ? environment_1.UNLIMITED_TIMEOUT : 10000,
         headers: { authorization: accessToken },

package/src/nx-cloud/utilities/onboarding.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNxCloudOnboardingURLForWelcomeApp = createNxCloudOnboardingURLForWelcomeApp;
 exports.getNxCloudAppOnBoardingUrl = getNxCloudAppOnBoardingUrl;
 exports.readNxCloudToken = readNxCloudToken;
-const devkit_exports_1 = require("../../devkit-exports");
 const is_workspace_claimed_1 = require("./is-workspace-claimed");
 const url_shorten_1 = require("./url-shorten");
 const run_command_1 = require("../../tasks-runner/run-command");
+const nx_json_1 = require("../../generators/utils/nx-json");
 async function createNxCloudOnboardingURLForWelcomeApp(tree, token) {
     token = token || readNxCloudToken(tree);
     if (!token) {
@@ -22,7 +22,7 @@ async function getNxCloudAppOnBoardingUrl(token) {
     return onboardingUrl;
 }
 function readNxCloudToken(tree) {
-    const nxJson = (0, devkit_exports_1.readNxJson)(tree);
+    const nxJson = (0, nx_json_1.readNxJson)(tree);
     const { accessToken, nxCloudId } = (0, run_command_1.getRunnerOptions)('default', nxJson, {}, true);
     return accessToken || nxCloudId;
 }

package/src/nx-cloud/utilities/url-shorten.js

@@ -7,7 +7,7 @@ exports.getNxCloudVersion = getNxCloudVersion;
 exports.removeVersionModifier = removeVersionModifier;
 exports.versionIsValid = versionIsValid;
 exports.compareCleanCloudVersions = compareCleanCloudVersions;
-const devkit_exports_1 = require("../../devkit-exports");
+const logger_1 = require("../../utils/logger");
 const git_utils_1 = require("../../utils/git-utils");
 const get_cloud_options_1 = require("./get-cloud-options");
 /**
@@ -27,7 +27,7 @@ async function createNxCloudOnboardingURL(onboardingSource, accessToken, usesGit
         }
     }
     catch (e) {
-        devkit_exports_1.logger.verbose(`Failed to get Nx Cloud version.
+        logger_1.logger.verbose(`Failed to get Nx Cloud version.
     ${e}`);
         return apiUrl;
     }
@@ -46,7 +46,7 @@ async function createNxCloudOnboardingURL(onboardingSource, accessToken, usesGit
         return `${apiUrl}/connect/${response.data}`;
     }
     catch (e) {
-        devkit_exports_1.logger.verbose(`Failed to shorten Nx Cloud URL.
+        logger_1.logger.verbose(`Failed to shorten Nx Cloud URL.
     ${e}`);
         return getURLifShortenFailed(usesGithub, githubSlug === 'github' ? null : githubSlug, apiUrl, source, accessToken);
     }
@@ -96,7 +96,7 @@ async function getInstallationSupportsGitHub(apiUrl) {
     }
     catch (e) {
         if (process.env.NX_VERBOSE_LOGGING === 'true') {
-            devkit_exports_1.logger.warn(`Failed to access system features. GitHub integration assumed to be disabled. 
+            logger_1.logger.warn(`Failed to access system features. GitHub integration assumed to be disabled. 
     ${e}`);
         }
         return false;
@@ -116,7 +116,7 @@ async function getNxCloudVersion(apiUrl) {
         return version;
     }
     catch (e) {
-        devkit_exports_1.logger.verbose(`Failed to get version of Nx Cloud.
+        logger_1.logger.verbose(`Failed to get version of Nx Cloud.
       ${e}`);
         return null;
     }

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

@@ -18,8 +18,8 @@ export declare function isDeletedFileChange(change: Change): change is DeletedFi
 export declare function calculateFileChanges(files: string[], allWorkspaceFiles: FileData[], nxArgs?: NxArgs, readFileAtRevision?: (f: string, r: void | string) => string, ignore?: ReturnType<typeof ignore>): FileChange[];
 export declare const TEN_MEGABYTES: number;
 /**
- * TODO(v20): Remove this function
- * @deprecated To get projects use {@link retrieveProjectConfigurations} instead. This will be removed in v20.
+ * TODO(v21): Remove this function
+ * @deprecated To get projects use {@link retrieveProjectConfigurations} instead. This will be removed in v21.
  */
 export declare function readWorkspaceConfig(opts: {
     format: 'angularCli' | 'nx';

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

@@ -101,8 +101,8 @@ function defaultReadFileAtRevision(file, revision) {
     }
 }
 /**
- * TODO(v20): Remove this function
- * @deprecated To get projects use {@link retrieveProjectConfigurations} instead. This will be removed in v20.
+ * TODO(v21): Remove this function
+ * @deprecated To get projects use {@link retrieveProjectConfigurations} instead. This will be removed in v21.
  */
 function readWorkspaceConfig(opts) {
     let configuration = null;

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

@@ -11,7 +11,8 @@ export type TaskWithCachedResult = {
     task: Task;
     cachedResult: CachedResult;
 };
-export declare function getCache(nxJson: NxJsonConfiguration, options: DefaultTasksRunnerOptions): DbCache | Cache;
+export declare function dbCacheEnabled(nxJson?: NxJsonConfiguration): boolean;
+export declare function getCache(options: DefaultTasksRunnerOptions): DbCache | Cache;
 export declare class DbCache {
     private readonly options;
     private cache;

package/src/tasks-runner/cache.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Cache = exports.DbCache = void 0;
+exports.dbCacheEnabled = dbCacheEnabled;
 exports.getCache = getCache;
 const workspace_root_1 = require("../utils/workspace-root");
 const path_1 = require("path");
@@ -19,14 +20,17 @@ const update_manager_1 = require("../nx-cloud/update-manager");
 const get_cloud_options_1 = require("../nx-cloud/utilities/get-cloud-options");
 const is_ci_1 = require("../utils/is-ci");
 const output_1 = require("../utils/output");
-function getCache(nxJson, options) {
-    return process.env.NX_DISABLE_DB !== 'true' &&
-        (nxJson.enableDbCache === true || process.env.NX_DB_CACHE === 'true')
+function dbCacheEnabled(nxJson = (0, nx_json_1.readNxJson)()) {
+    return (process.env.NX_DISABLE_DB !== 'true' &&
+        (nxJson.enableDbCache === true || process.env.NX_DB_CACHE === 'true'));
+}
+// Do not change the order of these arguments as this function is used by nx cloud
+function getCache(options) {
+    const nxJson = (0, nx_json_1.readNxJson)();
+    return dbCacheEnabled(nxJson)
         ? new DbCache({
             // Remove this in Nx 21
-            nxCloudRemoteCache: (0, nx_cloud_utils_1.isNxCloudUsed)((0, nx_json_1.readNxJson)())
-                ? options.remoteCache
-                : null,
+            nxCloudRemoteCache: (0, nx_cloud_utils_1.isNxCloudUsed)(nxJson) ? options.remoteCache : null,
         })
         : new Cache(options);
 }

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

@@ -18,9 +18,11 @@ export declare class ProcessTasks {
     private processTasksForMultipleProjects;
     private processTasksForSingleProject;
     private processTasksForDependencies;
+    private createDummyTask;
     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;
+    private filterDummyTasks;
 }
 export declare function createTaskGraph(projectGraph: ProjectGraph, extraTargetDependencies: TargetDependencies, projectNames: string[], targets: string[], configuration: string | undefined, overrides: Object, excludeTaskDependencies?: boolean): TaskGraph;
 export declare function mapTargetDefaultsToDependencies(defaults: TargetDefaults | undefined): TargetDependencies;

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 DUMMY_TASK_TARGET = '__nx_dummy_task__';
 class ProcessTasks {
     constructor(extraTargetDependencies, projectGraph) {
         this.extraTargetDependencies = extraTargetDependencies;
@@ -52,10 +53,11 @@ class ProcessTasks {
                 this.dependencies[d] = this.dependencies[d].filter((dd) => !!initialTasks[dd]);
             }
         }
-        for (const projectName of Object.keys(this.dependencies)) {
-            if (this.dependencies[projectName].length > 1) {
-                this.dependencies[projectName] = [
-                    ...new Set(this.dependencies[projectName]).values(),
+        this.filterDummyTasks();
+        for (const taskId of Object.keys(this.dependencies)) {
+            if (this.dependencies[taskId].length > 0) {
+                this.dependencies[taskId] = [
+                    ...new Set(this.dependencies[taskId].filter((d) => d !== taskId)).values(),
                 ];
             }
         }
@@ -113,6 +115,9 @@ class ProcessTasks {
         }
     }
     processTasksForDependencies(projectUsedToDeriveDependencies, dependencyConfig, configuration, task, taskOverrides, overrides) {
+        if (!this.projectGraph.dependencies.hasOwnProperty(projectUsedToDeriveDependencies)) {
+            return;
+        }
         for (const dep of this.projectGraph.dependencies[projectUsedToDeriveDependencies]) {
             const depProject = this.projectGraph.nodes[dep.target];
             // this is to handle external dependencies
@@ -132,10 +137,20 @@ class ProcessTasks {
                 }
             }
             else {
-                this.processTask(task, depProject.name, configuration, overrides);
+                const dummyId = this.getId(depProject.name, DUMMY_TASK_TARGET, undefined);
+                this.dependencies[task.id].push(dummyId);
+                this.dependencies[dummyId] = [];
+                const noopTask = this.createDummyTask(dummyId, task);
+                this.processTask(noopTask, depProject.name, configuration, overrides);
             }
         }
     }
+    createDummyTask(id, task) {
+        return {
+            ...task,
+            id,
+        };
+    }
     createTask(id, project, target, resolvedConfiguration, overrides) {
         if (!project.data.targets[target]) {
             throw new Error(`Cannot find configuration for task ${project.name}:${target}`);
@@ -173,6 +188,25 @@ class ProcessTasks {
         }
         return id;
     }
+    filterDummyTasks() {
+        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);
+                }
+            }
+            this.dependencies[key] = normalizedDeps;
+        }
+        for (const key of Object.keys(this.dependencies)) {
+            if (key.endsWith(DUMMY_TASK_TARGET)) {
+                delete this.dependencies[key];
+            }
+        }
+    }
 }
 exports.ProcessTasks = ProcessTasks;
 function createTaskGraph(projectGraph, extraTargetDependencies, projectNames, targets, configuration, overrides, excludeTaskDependencies = false) {

package/src/tasks-runner/run-command.js

@@ -511,12 +511,21 @@ function loadTasksRunner(modulePath) {
 }
 function getRunner(nxArgs, nxJson) {
     let runner = nxArgs.runner;
-    runner = runner || 'default';
+    runner = runner ?? 'default';
     if (runner !== 'default' && !nxJson.tasksRunnerOptions?.[runner]) {
         throw new Error(`Could not find runner configuration for ${runner}`);
     }
     const modulePath = getTasksRunnerPath(runner, nxJson);
     try {
+        if (isCustomRunnerPath(modulePath)) {
+            output_1.output.warn({
+                title: `Custom task runners will no longer be supported in Nx 21.`,
+                bodyLines: [
+                    `Use Nx Cloud or the Nx Powerpack caches instead.`,
+                    `For more information, see https://nx.dev/features/powerpack/custom-caching`,
+                ],
+            });
+        }
         const tasksRunner = loadTasksRunner(modulePath);
         return {
             tasksRunner,
@@ -527,6 +536,7 @@ function getRunner(nxArgs, nxJson) {
         throw new Error(`Could not find runner configuration for ${runner}`);
     }
 }
+const defaultTasksRunnerPath = require.resolve('./default-tasks-runner');
 function getTasksRunnerPath(runner, nxJson) {
     let modulePath = nxJson.tasksRunnerOptions?.[runner]?.runner;
     if (modulePath) {
@@ -544,7 +554,7 @@ function getTasksRunnerPath(runner, nxJson) {
         process.env.NX_CLOUD_ACCESS_TOKEN ||
         // Nx Cloud ID specified in nxJson
         nxJson.nxCloudId;
-    return isCloudRunner ? 'nx-cloud' : require.resolve('./default-tasks-runner');
+    return isCloudRunner ? 'nx-cloud' : defaultTasksRunnerPath;
 }
 function getRunnerOptions(runner, nxJson, nxArgs, isCloudDefault) {
     const defaultCacheableOperations = [];
@@ -588,3 +598,6 @@ function getRunnerOptions(runner, nxJson, nxArgs, isCloudDefault) {
     }
     return result;
 }
+function isCustomRunnerPath(modulePath) {
+    return !['nx-cloud', '@nrwl/nx-cloud', defaultTasksRunnerPath].includes(modulePath);
+}

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

@@ -28,7 +28,7 @@ class TaskOrchestrator {
         this.daemon = daemon;
         this.outputStyle = outputStyle;
         this.taskDetails = (0, hash_task_1.getTaskDetails)();
-        this.cache = (0, cache_1.getCache)(this.nxJson, this.options);
+        this.cache = (0, cache_1.getCache)(this.options);
         this.forkedProcessTaskRunner = new forked_process_task_runner_1.ForkedProcessTaskRunner(this.options);
         this.tasksSchedule = new tasks_schedule_1.TasksSchedule(this.projectGraph, this.taskGraph, this.options);
         // region internal state

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

@@ -7,6 +7,9 @@ export interface RawNxArgs extends NxArgs {
 export interface NxArgs {
     targets?: string[];
     configuration?: string;
+    /**
+     * @deprecated Custom task runners will no longer be supported in Nx 21. Use Nx Cloud or Nx Powerpack instead.
+     */
     runner?: string;
     parallel?: number;
     untracked?: boolean;

package/src/utils/git-utils.js

@@ -8,7 +8,7 @@ exports.commitChanges = commitChanges;
 exports.getLatestCommitSha = getLatestCommitSha;
 const child_process_1 = require("child_process");
 const path_1 = require("path");
-const devkit_exports_1 = require("../devkit-exports");
+const logger_1 = require("./logger");
 function execAsync(command, execOptions) {
     return new Promise((res, rej) => {
         (0, child_process_1.exec)(command, execOptions, (err, stdout, stderr) => {
@@ -236,7 +236,7 @@ function commitChanges(commitMessage, directory) {
             // We don't want to throw during create-nx-workspace
             // because maybe there was an error when setting up git
             // initially.
-            devkit_exports_1.logger.verbose(`Git may not be set up correctly for this new workspace.
+            logger_1.logger.verbose(`Git may not be set up correctly for this new workspace.
         ${err}`);
         }
         else {

package/src/migrations/update-15-0-0/prefix-outputs.d.ts

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

package/src/migrations/update-15-0-0/prefix-outputs.js

@@ -1,49 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
-const project_configuration_1 = require("../../generators/utils/project-configuration");
-const nx_json_1 = require("../../generators/utils/nx-json");
-const path_1 = require("path");
-const utils_1 = require("../../tasks-runner/utils");
-const json_1 = require("../../generators/utils/json");
-async function default_1(tree) {
-    // If the workspace doesn't have a nx.json, don't make any changes
-    if (!tree.exists('nx.json')) {
-        return;
-    }
-    const nxJson = (0, nx_json_1.readNxJson)(tree);
-    for (const [projectName, project] of (0, project_configuration_1.getProjects)(tree)) {
-        for (const [_, target] of Object.entries(project.targets ?? {})) {
-            if (!target.outputs) {
-                continue;
-            }
-            target.outputs = (0, utils_1.transformLegacyOutputs)(project.root, target.outputs);
-        }
-        try {
-            (0, project_configuration_1.updateProjectConfiguration)(tree, projectName, project);
-        }
-        catch {
-            if (tree.exists((0, path_1.join)(project.root, 'package.json'))) {
-                (0, json_1.updateJson)(tree, (0, path_1.join)(project.root, 'package.json'), (json) => {
-                    for (const target of Object.values(json.nx?.targets ?? {})) {
-                        if (target.outputs) {
-                            target.outputs = (0, utils_1.transformLegacyOutputs)(project.root, target.outputs);
-                        }
-                    }
-                    return json;
-                });
-            }
-        }
-    }
-    if (nxJson.targetDefaults) {
-        for (const [_, target] of Object.entries(nxJson.targetDefaults)) {
-            if (!target.outputs) {
-                continue;
-            }
-            target.outputs = (0, utils_1.transformLegacyOutputs)('{projectRoot}', target.outputs);
-        }
-        (0, nx_json_1.updateNxJson)(tree, nxJson);
-    }
-    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
-}

package/src/migrations/update-16-0-0/remove-nrwl-cli.d.ts

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

package/src/migrations/update-16-0-0/remove-nrwl-cli.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
-const json_1 = require("../../generators/utils/json");
-async function default_1(tree) {
-    (0, json_1.updateJson)(tree, 'package.json', (json) => {
-        for (const deps of [json.dependencies, json.devDependencies]) {
-            if (deps) {
-                delete deps['@nrwl/cli'];
-            }
-        }
-        return json;
-    });
-    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
-}

package/src/migrations/update-16-0-0/update-depends-on-to-tokens.d.ts

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

package/src/migrations/update-16-0-0/update-depends-on-to-tokens.js

@@ -1,97 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-const project_configuration_1 = require("../../generators/utils/project-configuration");
-const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
-async function default_1(tree) {
-    updateDependsOnAndInputsInsideNxJson(tree);
-    const projectsConfigurations = (0, project_configuration_1.getProjects)(tree);
-    for (const [projectName, projectConfiguration] of projectsConfigurations) {
-        let projectChanged = false;
-        for (const [targetName, targetConfiguration] of Object.entries(projectConfiguration.targets ?? {})) {
-            for (const dependency of targetConfiguration.dependsOn ?? []) {
-                if (typeof dependency !== 'string') {
-                    if (dependency.projects === 'self' ||
-                        dependency.projects === '{self}') {
-                        delete dependency.projects;
-                        projectChanged = true;
-                    }
-                    else if (dependency.projects === 'dependencies' ||
-                        dependency.projects === '{dependencies}') {
-                        delete dependency.projects;
-                        dependency.dependencies = true;
-                        projectChanged = true;
-                    }
-                }
-            }
-            for (let i = 0; i < targetConfiguration.inputs?.length ?? 0; i++) {
-                const input = targetConfiguration.inputs[i];
-                if (typeof input !== 'string') {
-                    if ('projects' in input &&
-                        (input.projects === 'self' || input.projects === '{self}')) {
-                        delete input.projects;
-                        projectChanged = true;
-                    }
-                    else if ('projects' in input &&
-                        (input.projects === 'dependencies' ||
-                            input.projects === '{dependencies}')) {
-                        delete input.projects;
-                        targetConfiguration.inputs[i] = {
-                            ...input,
-                            dependencies: true,
-                        };
-                        projectChanged = true;
-                    }
-                }
-            }
-        }
-        if (projectChanged) {
-            (0, project_configuration_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
-        }
-    }
-    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
-}
-function updateDependsOnAndInputsInsideNxJson(tree) {
-    const nxJson = (0, project_configuration_1.readNxJson)(tree);
-    let nxJsonChanged = false;
-    for (const [target, defaults] of Object.entries(nxJson?.targetDefaults ?? {})) {
-        for (const dependency of defaults.dependsOn ?? []) {
-            if (typeof dependency !== 'string') {
-                if (dependency.projects === 'self' ||
-                    dependency.projects === '{self}') {
-                    delete dependency.projects;
-                    nxJsonChanged = true;
-                }
-                else if (dependency.projects === 'dependencies' ||
-                    dependency.projects === '{dependencies}') {
-                    delete dependency.projects;
-                    dependency.dependencies = true;
-                    nxJsonChanged = true;
-                }
-            }
-        }
-        for (let i = 0; i < defaults.inputs?.length ?? 0; i++) {
-            const input = defaults.inputs[i];
-            if (typeof input !== 'string') {
-                if ('projects' in input &&
-                    (input.projects === 'self' || input.projects === '{self}')) {
-                    delete input.projects;
-                    nxJsonChanged = true;
-                }
-                else if ('projects' in input &&
-                    (input.projects === 'dependencies' ||
-                        input.projects === '{dependencies}')) {
-                    delete input.projects;
-                    defaults.inputs[i] = {
-                        ...input,
-                        dependencies: true,
-                    };
-                    nxJsonChanged = true;
-                }
-            }
-        }
-    }
-    if (nxJsonChanged) {
-        (0, project_configuration_1.updateNxJson)(tree, nxJson);
-    }
-}

package/src/migrations/update-16-0-0/update-nx-cloud-runner.d.ts

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

package/src/migrations/update-16-0-0/update-nx-cloud-runner.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-const project_configuration_1 = require("../../generators/utils/project-configuration");
-const json_1 = require("../../generators/utils/json");
-const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
-async function default_1(tree) {
-    (0, json_1.updateJson)(tree, 'package.json', (json) => {
-        if (json.dependencies && json.dependencies['@nrwl/nx-cloud']) {
-            json.dependencies['nx-cloud'] = json.dependencies['@nrwl/nx-cloud'];
-            delete json.dependencies['@nrwl/nx-cloud'];
-        }
-        if (json.devDependencies && json.devDependencies['@nrwl/nx-cloud']) {
-            json.devDependencies['nx-cloud'] = json.devDependencies['@nrwl/nx-cloud'];
-            delete json.devDependencies['@nrwl/nx-cloud'];
-        }
-        return json;
-    });
-    const nxJson = (0, project_configuration_1.readNxJson)(tree);
-    if (!nxJson)
-        return;
-    for (let opts of Object.values(nxJson.tasksRunnerOptions ?? {})) {
-        if (opts.runner === '@nrwl/nx-cloud') {
-            opts.runner = 'nx-cloud';
-        }
-    }
-    (0, project_configuration_1.updateNxJson)(tree, nxJson);
-    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
-}

package/src/migrations/update-16-2-0/remove-run-commands-output-path.d.ts

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

package/src/migrations/update-16-2-0/remove-run-commands-output-path.js

@@ -1,45 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = removeRunCommandsOutputPath;
-const path_1 = require("../../utils/path");
-const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
-const json_1 = require("../../generators/utils/json");
-const project_configuration_1 = require("../../generators/utils/project-configuration");
-async function removeRunCommandsOutputPath(tree) {
-    for (const [project, configuration] of (0, project_configuration_1.getProjects)(tree).entries()) {
-        const targets = configuration.targets ?? {};
-        let changed = false;
-        for (const [, target] of Object.entries(targets)) {
-            changed ||= updateTargetBlock(target);
-        }
-        if (changed) {
-            (0, project_configuration_1.updateProjectConfiguration)(tree, project, configuration);
-        }
-    }
-    if (tree.exists('nx.json')) {
-        (0, json_1.updateJson)(tree, 'nx.json', (json) => {
-            for (const [, target] of Object.entries(json.targetDefaults ?? {})) {
-                updateTargetBlock(target);
-            }
-            return json;
-        });
-    }
-    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
-}
-function updateTargetBlock(target) {
-    let changed = false;
-    if (target.executor === 'nx:run-commands' && target.options?.outputPath) {
-        changed = true;
-        const outputs = new Set(target.outputs ?? []);
-        outputs.delete('{options.outputPath}');
-        const newOutputs = Array.isArray(target.options.outputPath)
-            ? target.options.outputPath.map((p) => (0, path_1.joinPathFragments)('{workspaceRoot}', p))
-            : [(0, path_1.joinPathFragments)('{workspaceRoot}', target.options.outputPath)];
-        for (const outputPath of newOutputs) {
-            outputs.add(outputPath);
-        }
-        delete target.options.outputPath;
-        target.outputs = Array.from(outputs);
-    }
-    return changed;
-}

package/src/migrations/update-16-8-0/escape-dollar-sign-env-variables.d.ts

@@ -1,12 +0,0 @@
-import { Tree } from '../../generators/tree';
-/**
- * This function escapes dollar sign in env variables
- * It will go through:
- * - '.env', '.local.env', '.env.local'
- * - .env.[target-name], .[target-name].env
- * - .env.[target-name].[configuration-name], .[target-name].[configuration-name].env
- * - .env.[configuration-name], .[configuration-name].env
- * at each project root and workspace root
- * @param tree
- */
-export default function escapeDollarSignEnvVariables(tree: Tree): void;