nx 17.0.3 → 17.0.5

package/src/hasher/task-hasher.js

@@ -1,17 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.filterUsingGlobPatterns = exports.expandNamedInput = exports.getInputs = exports.extractPatternsFromFileSets = exports.getTargetInputs = exports.getNamedInputs = exports.InProcessTaskHasher = exports.DaemonBasedTaskHasher = void 0;
-const child_process_1 = require("child_process");
-const minimatch = require("minimatch");
-const hasher_1 = require("../plugins/js/hasher/hasher");
-const find_project_for_path_1 = require("../project-graph/utils/find-project-for-path");
-const find_matching_projects_1 = require("../utils/find-matching-projects");
+exports.filterUsingGlobPatterns = exports.expandNamedInput = exports.expandSingleProjectInputs = exports.isDepsOutput = exports.isSelfInput = exports.getInputs = exports.extractPatternsFromFileSets = exports.getTargetInputs = exports.getNamedInputs = exports.InProcessTaskHasher = exports.DaemonBasedTaskHasher = void 0;
 const file_hasher_1 = require("./file-hasher");
-const utils_1 = require("../tasks-runner/utils");
+const node_task_hasher_impl_1 = require("./node-task-hasher-impl");
+const minimatch_1 = require("minimatch");
+const native_task_hasher_impl_1 = require("./native-task-hasher-impl");
 const workspace_root_1 = require("../utils/workspace-root");
-const path_1 = require("path");
-const project_graph_utils_1 = require("../utils/project-graph-utils");
-const native_1 = require("../native");
 class DaemonBasedTaskHasher {
     constructor(daemonClient, runnerOptions) {
         this.daemonClient = daemonClient;
@@ -26,12 +20,14 @@ class DaemonBasedTaskHasher {
 }
 exports.DaemonBasedTaskHasher = DaemonBasedTaskHasher;
 class InProcessTaskHasher {
-    constructor(projectFileMap, allWorkspaceFiles, projectGraph, nxJson, options) {
+    constructor(projectFileMap, allWorkspaceFiles, projectGraph, nxJson, externalRustReferences, options) {
         this.projectFileMap = projectFileMap;
         this.allWorkspaceFiles = allWorkspaceFiles;
         this.projectGraph = projectGraph;
         this.nxJson = nxJson;
+        this.externalRustReferences = externalRustReferences;
         this.options = options;
+        this.useNativeTaskHasher = process.env.NX_NATIVE_TASK_HASHER !== 'false';
         const legacyRuntimeInputs = (this.options && this.options.runtimeCacheInputs
             ? this.options.runtimeCacheInputs
             : []).map((r) => ({ runtime: r }));
@@ -44,13 +40,28 @@ class InProcessTaskHasher {
             '.gitignore',
             '.nxignore',
         ].map((d) => ({ fileset: `{workspaceRoot}/${d}` }));
-        this.taskHasher = new TaskHasherImpl(nxJson, legacyRuntimeInputs, legacyFilesetInputs, this.projectFileMap, this.allWorkspaceFiles, this.projectGraph, { selectivelyHashTsConfig: this.options.selectivelyHashTsConfig ?? false });
+        this.taskHasher = !this.useNativeTaskHasher
+            ? new node_task_hasher_impl_1.NodeTaskHasherImpl(nxJson, legacyRuntimeInputs, legacyFilesetInputs, this.projectFileMap, this.allWorkspaceFiles, this.projectGraph, {
+                selectivelyHashTsConfig: this.options?.selectivelyHashTsConfig ?? false,
+            })
+            : new native_task_hasher_impl_1.NativeTaskHasherImpl(workspace_root_1.workspaceRoot, nxJson, this.projectGraph, this.externalRustReferences, {
+                selectivelyHashTsConfig: this.options?.selectivelyHashTsConfig ?? false,
+            });
     }
     async hashTasks(tasks, taskGraph, env) {
-        return await Promise.all(tasks.map((t) => this.hashTask(t, taskGraph, env)));
+        if (this.useNativeTaskHasher) {
+            const hashes = await this.taskHasher.hashTasks(tasks, taskGraph, env ?? process.env);
+            return tasks.map((task, index) => this.createHashDetails(task, hashes[index]));
+        }
+        else {
+            return await Promise.all(tasks.map((t) => this.hashTask(t, taskGraph, env)));
+        }
     }
     async hashTask(task, taskGraph, env) {
-        const res = await this.taskHasher.hashTask(task, taskGraph, env ?? process.env, [task.target.project]);
+        const res = await this.taskHasher.hashTask(task, taskGraph, env ?? process.env);
+        return this.createHashDetails(task, res);
+    }
+    createHashDetails(task, res) {
         const command = this.hashCommand(task);
         return {
             value: (0, file_hasher_1.hashArray)([res.value, command]),
@@ -88,418 +99,6 @@ const DEFAULT_INPUTS = [
         input: 'default',
     },
 ];
-class TaskHasherImpl {
-    constructor(nxJson, legacyRuntimeInputs, legacyFilesetInputs, projectFileMap, allWorkspaceFiles, projectGraph, options) {
-        this.nxJson = nxJson;
-        this.legacyRuntimeInputs = legacyRuntimeInputs;
-        this.legacyFilesetInputs = legacyFilesetInputs;
-        this.projectFileMap = projectFileMap;
-        this.allWorkspaceFiles = allWorkspaceFiles;
-        this.projectGraph = projectGraph;
-        this.options = options;
-        this.filesetHashes = {};
-        this.runtimeHashes = {};
-        this.externalDependencyHashes = new Map();
-        this.projectRootMappings = (0, find_project_for_path_1.createProjectRootMappings)(this.projectGraph.nodes);
-        // External Dependencies are all calculated up front in a deterministic order
-        this.calculateExternalDependencyHashes();
-    }
-    async hashTask(task, taskGraph, env, visited) {
-        return Promise.resolve().then(async () => {
-            const { selfInputs, depsInputs, depsOutputs, projectInputs } = getInputs(task, this.projectGraph, this.nxJson);
-            const selfAndInputs = await this.hashSelfAndDepsInputs(task.target.project, task, selfInputs, depsInputs, depsOutputs, projectInputs, taskGraph, env, visited);
-            const target = this.hashTarget(task.target.project, task.target.target, selfInputs);
-            if (target) {
-                return this.combinePartialHashes([selfAndInputs, target]);
-            }
-            return selfAndInputs;
-        });
-    }
-    async hashNamedInputForDependencies(projectName, task, namedInput, taskGraph, env, visited) {
-        const projectNode = this.projectGraph.nodes[projectName];
-        const namedInputs = {
-            default: [{ fileset: '{projectRoot}/**/*' }],
-            ...this.nxJson.namedInputs,
-            ...projectNode.data.namedInputs,
-        };
-        const expandedInputs = expandNamedInput(namedInput, namedInputs);
-        const selfInputs = expandedInputs.filter(isSelfInput);
-        const depsOutputs = expandedInputs.filter(isDepsOutput);
-        const depsInputs = [{ input: namedInput, dependencies: true }]; // true is boolean by default
-        return this.hashSelfAndDepsInputs(projectName, task, selfInputs, depsInputs, depsOutputs, [], taskGraph, env, visited);
-    }
-    async hashSelfAndDepsInputs(projectName, task, selfInputs, depsInputs, depsOutputs, projectInputs, taskGraph, env, visited) {
-        const projectGraphDeps = this.projectGraph.dependencies[projectName] ?? [];
-        // we don't want random order of dependencies to change the hash
-        projectGraphDeps.sort((a, b) => a.target.localeCompare(b.target));
-        const self = await this.hashSingleProjectInputs(projectName, selfInputs, env);
-        const deps = await this.hashDepsInputs(task, depsInputs, projectGraphDeps, taskGraph, env, visited);
-        const depsOut = await this.hashDepsOutputs(task, depsOutputs, taskGraph);
-        const projects = await this.hashProjectInputs(projectInputs, env);
-        return this.combinePartialHashes([
-            ...self,
-            ...deps,
-            ...projects,
-            ...depsOut,
-        ]);
-    }
-    combinePartialHashes(partialHashes) {
-        if (partialHashes.length === 1) {
-            return partialHashes[0];
-        }
-        const details = {};
-        const hashValues = [];
-        for (const partial of partialHashes) {
-            hashValues.push(partial.value);
-            Object.assign(details, partial.details);
-        }
-        const value = (0, file_hasher_1.hashArray)(hashValues);
-        return { value, details };
-    }
-    async hashDepsInputs(task, inputs, projectGraphDeps, taskGraph, env, visited) {
-        return (await Promise.all(inputs.map(async (input) => {
-            return await Promise.all(projectGraphDeps.map(async (d) => {
-                if (visited.indexOf(d.target) > -1) {
-                    return null;
-                }
-                else {
-                    visited.push(d.target);
-                    if (this.projectGraph.nodes[d.target]) {
-                        return await this.hashNamedInputForDependencies(d.target, task, input.input || 'default', taskGraph, env, visited);
-                    }
-                    else {
-                        return this.getExternalDependencyHash(d.target);
-                    }
-                }
-            }));
-        })))
-            .flat()
-            .filter((r) => !!r);
-    }
-    async hashDepsOutputs(task, depsOutputs, taskGraph) {
-        if (depsOutputs.length === 0) {
-            return [];
-        }
-        const result = [];
-        for (const { dependentTasksOutputFiles, transitive } of depsOutputs) {
-            result.push(...(await this.hashDepOuputs(task, dependentTasksOutputFiles, taskGraph, transitive)));
-        }
-        return result;
-    }
-    async hashDepOuputs(task, dependentTasksOutputFiles, taskGraph, transitive) {
-        // task has no dependencies
-        if (!taskGraph.dependencies[task.id]) {
-            return [];
-        }
-        const partialHashes = [];
-        for (const d of taskGraph.dependencies[task.id]) {
-            const childTask = taskGraph.tasks[d];
-            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 ||
-                minimatch(p, dependentTasksOutputFiles, { dot: true }));
-            const hashDetails = {};
-            const hashes = [];
-            for (const [file, hash] of this.hashFiles(filteredFiles.map((p) => (0, path_1.join)(workspace_root_1.workspaceRoot, p)))) {
-                hashes.push(hash);
-            }
-            let hash = (0, file_hasher_1.hashArray)(hashes);
-            partialHashes.push({
-                value: hash,
-                details: {
-                    [`${dependentTasksOutputFiles}:${outputs.join(',')}`]: hash,
-                },
-            });
-            if (transitive) {
-                partialHashes.push(...(await this.hashDepOuputs(childTask, dependentTasksOutputFiles, taskGraph, transitive)));
-            }
-        }
-        return partialHashes;
-    }
-    hashFiles(files) {
-        const r = new Map();
-        for (let f of files) {
-            r.set(f, (0, native_1.hashFile)(f));
-        }
-        return r;
-    }
-    getExternalDependencyHash(externalNodeName) {
-        const combinedHash = this.combinePartialHashes(this.externalDependencyHashes.get(externalNodeName));
-        // Set the combined hash into the hashes so it's not recalculated next time
-        this.externalDependencyHashes.set(externalNodeName, [combinedHash]);
-        return combinedHash;
-    }
-    hashSingleExternalDependency(externalNodeName) {
-        const node = this.projectGraph.externalNodes[externalNodeName];
-        if (node.data.hash) {
-            // we already know the hash of this dependency
-            return {
-                value: node.data.hash,
-                details: {
-                    [externalNodeName]: node.data.hash,
-                },
-            };
-        }
-        else {
-            // we take version as a hash
-            return {
-                value: node.data.version,
-                details: {
-                    [externalNodeName]: node.data.version,
-                },
-            };
-        }
-    }
-    hashExternalDependency(externalNodeName) {
-        const partialHashes = new Set();
-        partialHashes.add(this.hashSingleExternalDependency(externalNodeName));
-        const deps = (0, project_graph_utils_1.findAllProjectNodeDependencies)(externalNodeName, this.projectGraph, true);
-        for (const dep of deps) {
-            partialHashes.add(this.hashSingleExternalDependency(dep));
-        }
-        return Array.from(partialHashes);
-    }
-    hashTarget(projectName, targetName, selfInputs) {
-        const projectNode = this.projectGraph.nodes[projectName];
-        const target = projectNode.data.targets[targetName];
-        if (!target) {
-            return;
-        }
-        let hash;
-        // we can only vouch for @nx packages's executor dependencies
-        // if it's "run commands" or third-party we skip traversing since we have no info what this command depends on
-        if (target.executor.startsWith(`@nrwl/`) ||
-            target.executor.startsWith(`@nx/`)) {
-            const executorPackage = target.executor.split(':')[0];
-            const executorNodeName = this.findExternalDependencyNodeName(executorPackage);
-            // This is either a local plugin or a non-existent executor
-            if (!executorNodeName) {
-                // TODO: This should not return null if it is a local plugin's executor
-                return null;
-            }
-            return this.getExternalDependencyHash(executorNodeName);
-        }
-        else {
-            // use command external dependencies if available to construct the hash
-            const partialHashes = [];
-            let hasCommandExternalDependencies = false;
-            for (const input of selfInputs) {
-                if (input['externalDependencies']) {
-                    // if we have externalDependencies with empty array we still want to override the default hash
-                    hasCommandExternalDependencies = true;
-                    const externalDependencies = input['externalDependencies'];
-                    for (let dep of externalDependencies) {
-                        dep = this.findExternalDependencyNodeName(dep);
-                        if (!dep) {
-                            throw new Error(`The externalDependency "${dep}" for "${projectName}:${targetName}" could not be found`);
-                        }
-                        partialHashes.push(this.getExternalDependencyHash(dep));
-                    }
-                }
-            }
-            if (hasCommandExternalDependencies) {
-                return this.combinePartialHashes(partialHashes);
-            }
-            else {
-                // cache the hash of the entire external dependencies tree
-                if (this.allExternalDependenciesHash) {
-                    return this.allExternalDependenciesHash;
-                }
-                else {
-                    hash = (0, file_hasher_1.hashObject)(this.projectGraph.externalNodes);
-                    this.allExternalDependenciesHash = {
-                        value: hash,
-                        details: {
-                            AllExternalDependencies: hash,
-                        },
-                    };
-                    return this.allExternalDependenciesHash;
-                }
-            }
-        }
-    }
-    findExternalDependencyNodeName(packageName) {
-        if (this.projectGraph.externalNodes[packageName]) {
-            return packageName;
-        }
-        if (this.projectGraph.externalNodes[`npm:${packageName}`]) {
-            return `npm:${packageName}`;
-        }
-        for (const node of Object.values(this.projectGraph.externalNodes)) {
-            if (node.data.packageName === packageName) {
-                return node.name;
-            }
-        }
-        // not found
-        return null;
-    }
-    async hashSingleProjectInputs(projectName, inputs, env) {
-        const filesets = extractPatternsFromFileSets(inputs);
-        const projectFilesets = [];
-        const workspaceFilesets = [];
-        let invalidFilesetNoPrefix = null;
-        let invalidFilesetWorkspaceRootNegative = null;
-        for (let f of filesets) {
-            if (f.startsWith('{projectRoot}/') || f.startsWith('!{projectRoot}/')) {
-                projectFilesets.push(f);
-            }
-            else if (f.startsWith('{workspaceRoot}/') ||
-                f.startsWith('!{workspaceRoot}/')) {
-                workspaceFilesets.push(f);
-            }
-            else {
-                invalidFilesetNoPrefix = f;
-            }
-        }
-        if (invalidFilesetNoPrefix) {
-            throw new Error([
-                `"${invalidFilesetNoPrefix}" is an invalid fileset.`,
-                'All filesets have to start with either {workspaceRoot} or {projectRoot}.',
-                'For instance: "!{projectRoot}/**/*.spec.ts" or "{workspaceRoot}/package.json".',
-                `If "${invalidFilesetNoPrefix}" is a named input, make sure it is defined in, for instance, nx.json.`,
-            ].join('\n'));
-        }
-        if (invalidFilesetWorkspaceRootNegative) {
-            throw new Error([
-                `"${invalidFilesetWorkspaceRootNegative}" is an invalid fileset.`,
-                'It is not possible to negative filesets starting with {workspaceRoot}.',
-            ].join('\n'));
-        }
-        const notFilesets = inputs.filter((r) => !r['fileset']);
-        return Promise.all([
-            this.hashProjectFileset(projectName, projectFilesets),
-            this.hashProjectConfig(projectName),
-            this.hashTsConfig(projectName),
-            ...[
-                ...workspaceFilesets,
-                ...this.legacyFilesetInputs.map((r) => r.fileset),
-            ].map((fileset) => this.hashRootFileset(fileset)),
-            ...[...notFilesets, ...this.legacyRuntimeInputs].map((r) => r['runtime']
-                ? this.hashRuntime(env, r['runtime'])
-                : this.hashEnv(env, r['env'])),
-        ]);
-    }
-    async hashProjectInputs(projectInputs, env) {
-        const partialHashes = [];
-        for (const input of projectInputs) {
-            const projects = (0, find_matching_projects_1.findMatchingProjects)(input.projects, this.projectGraph.nodes);
-            for (const project of projects) {
-                const namedInputs = getNamedInputs(this.nxJson, this.projectGraph.nodes[project]);
-                const expandedInput = expandSingleProjectInputs([{ input: input.input }], namedInputs);
-                partialHashes.push(this.hashSingleProjectInputs(project, expandedInput, env));
-            }
-        }
-        return Promise.all(partialHashes).then((hashes) => hashes.flat());
-    }
-    async hashRootFileset(fileset) {
-        const mapKey = fileset;
-        const withoutWorkspaceRoot = fileset.substring(16);
-        if (!this.filesetHashes[mapKey]) {
-            this.filesetHashes[mapKey] = new Promise(async (res) => {
-                const parts = [];
-                const matchingFile = this.allWorkspaceFiles.find((t) => t.file === withoutWorkspaceRoot);
-                if (matchingFile) {
-                    parts.push(matchingFile.hash);
-                }
-                else {
-                    this.allWorkspaceFiles
-                        .filter((f) => minimatch(f.file, withoutWorkspaceRoot))
-                        .forEach((f) => {
-                        parts.push(f.hash);
-                    });
-                }
-                const value = (0, file_hasher_1.hashArray)(parts);
-                res({
-                    value,
-                    details: { [mapKey]: value },
-                });
-            });
-        }
-        return this.filesetHashes[mapKey];
-    }
-    hashProjectConfig(projectName) {
-        const p = this.projectGraph.nodes[projectName];
-        const projectConfig = (0, file_hasher_1.hashArray)([
-            JSON.stringify({ ...p.data, files: undefined }),
-        ]);
-        return {
-            value: projectConfig,
-            details: {
-                [`${projectName}:ProjectConfiguration`]: projectConfig,
-            },
-        };
-    }
-    hashTsConfig(projectName) {
-        const p = this.projectGraph.nodes[projectName];
-        const tsConfig = (0, file_hasher_1.hashArray)([
-            (0, hasher_1.hashTsConfig)(p, this.projectRootMappings, this.options),
-        ]);
-        return {
-            value: tsConfig,
-            details: {
-                [`${projectName}:TsConfig`]: tsConfig,
-            },
-        };
-    }
-    async hashProjectFileset(projectName, filesetPatterns) {
-        const mapKey = `${projectName}:${filesetPatterns.join(',')}`;
-        if (!this.filesetHashes[mapKey]) {
-            this.filesetHashes[mapKey] = new Promise(async (res) => {
-                const p = this.projectGraph.nodes[projectName];
-                const filteredFiles = filterUsingGlobPatterns(p.data.root, this.projectFileMap[projectName] || [], filesetPatterns);
-                const files = [];
-                for (const { file, hash } of filteredFiles) {
-                    files.push(file, hash);
-                }
-                const value = (0, file_hasher_1.hashArray)(files);
-                res({
-                    value,
-                    details: { [mapKey]: value },
-                });
-            });
-        }
-        return this.filesetHashes[mapKey];
-    }
-    async hashRuntime(env, runtime) {
-        const env_key = JSON.stringify(env);
-        const mapKey = `runtime:${runtime}-${env_key}`;
-        if (!this.runtimeHashes[mapKey]) {
-            this.runtimeHashes[mapKey] = new Promise((res, rej) => {
-                (0, child_process_1.exec)(runtime, {
-                    windowsHide: true,
-                    cwd: workspace_root_1.workspaceRoot,
-                    env,
-                }, (err, stdout, stderr) => {
-                    if (err) {
-                        rej(new Error(`Nx failed to execute {runtime: '${runtime}'}. ${err}.`));
-                    }
-                    else {
-                        const value = (0, file_hasher_1.hashArray)([`${stdout}${stderr}`.trim()]);
-                        res({
-                            details: { [`runtime:${runtime}`]: value },
-                            value,
-                        });
-                    }
-                });
-            });
-        }
-        return this.runtimeHashes[mapKey];
-    }
-    async hashEnv(env, envVarName) {
-        const value = (0, file_hasher_1.hashArray)([env[envVarName] ?? '']);
-        return {
-            details: { [`env:${envVarName}`]: value },
-            value,
-        };
-    }
-    calculateExternalDependencyHashes() {
-        const keys = Object.keys(this.projectGraph.externalNodes);
-        for (const externalNodeName of keys) {
-            this.externalDependencyHashes.set(externalNodeName, this.hashExternalDependency(externalNodeName));
-        }
-    }
-}
 function getNamedInputs(nxJson, project) {
     return {
         default: [{ fileset: '{projectRoot}/**/*' }],
@@ -582,9 +181,11 @@ function splitInputsIntoSelfAndDependencies(inputs, namedInputs) {
 function isSelfInput(input) {
     return !('dependentTasksOutputFiles' in input);
 }
+exports.isSelfInput = isSelfInput;
 function isDepsOutput(input) {
     return 'dependentTasksOutputFiles' in input;
 }
+exports.isDepsOutput = isDepsOutput;
 function expandSingleProjectInputs(inputs, namedInputs) {
     const expanded = [];
     for (const d of inputs) {
@@ -616,6 +217,7 @@ function expandSingleProjectInputs(inputs, namedInputs) {
     }
     return expanded;
 }
+exports.expandSingleProjectInputs = expandSingleProjectInputs;
 function expandNamedInput(input, namedInputs) {
     namedInputs ||= {};
     if (!namedInputs[input])
@@ -654,11 +256,11 @@ function filterUsingGlobPatterns(root, files, patterns) {
             matchedPositive = true;
         }
         else {
-            matchedPositive = positive.some((pattern) => minimatch(f.file, pattern));
+            matchedPositive = positive.some((pattern) => (0, minimatch_1.minimatch)(f.file, pattern));
         }
         if (!matchedPositive)
             return false;
-        return negative.every((pattern) => minimatch(f.file, pattern));
+        return negative.every((pattern) => (0, minimatch_1.minimatch)(f.file, pattern));
     });
 }
 exports.filterUsingGlobPatterns = filterUsingGlobPatterns;

package/src/migrations/update-15-0-0/migrate-to-inputs.js

@@ -7,11 +7,11 @@ const path_1 = require("../../utils/path");
 const path_2 = require("path");
 const json_1 = require("../../generators/utils/json");
 const skippedFiles = [
-    'package.json',
-    'babel.config.json',
-    'karma.conf.js',
-    'jest.preset.js',
-    '.storybook',
+    'package.json', // Not to be added to filesets
+    'babel.config.json', // Will be handled by various plugins
+    'karma.conf.js', // Will be handled by @nx/angular
+    'jest.preset.js', // Will be handled by @nx/jest
+    '.storybook', // Will be handled by @nx/storybook
     // Will be handled by @nx/eslint
     '.eslintrc.json',
     '.eslintrc.js',

package/src/migrations/update-15-1-0/set-project-names.js

@@ -5,9 +5,10 @@ const path_1 = require("path");
 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");
 const retrieve_workspace_files_1 = require("../../project-graph/utils/retrieve-workspace-files");
+const nx_plugin_1 = require("../../utils/nx-plugin");
 async function default_1(tree) {
     const nxJson = (0, nx_json_1.readNxJson)(tree);
-    const projectFiles = await (0, retrieve_workspace_files_1.retrieveProjectConfigurationPaths)(tree.root, nxJson);
+    const projectFiles = await (0, retrieve_workspace_files_1.retrieveProjectConfigurationPaths)(tree.root, await (0, nx_plugin_1.loadNxPlugins)(nxJson?.plugins));
     const projectJsons = projectFiles.filter((f) => f.endsWith('project.json'));
     for (let f of projectJsons) {
         const projectJson = (0, json_1.readJson)(tree, f);

package/src/migrations/update-15-8-2/update-nxw.js

@@ -1,11 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const add_nx_scripts_1 = require("../../command-line/init/implementation/dot-nx/add-nx-scripts");
-const path_1 = require("../../utils/path");
+const update_nxw_1 = require("../../utils/update-nxw");
 async function default_1(tree) {
-    const wrapperPath = (0, path_1.normalizePath)((0, add_nx_scripts_1.nxWrapperPath)());
-    if (tree.exists(wrapperPath)) {
-        tree.write(wrapperPath, (0, add_nx_scripts_1.getNxWrapperContents)());
-    }
+    (0, update_nxw_1.updateNxw)(tree);
 }
 exports.default = default_1;

package/src/migrations/update-17-0-0/rm-default-collection-npm-scope.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
 const nx_json_1 = require("../../generators/utils/nx-json");
 const json_1 = require("../../generators/utils/json");
-const logger_1 = require("../../utils/logger");
+const output_1 = require("../../utils/output");
 const path_1 = require("../../utils/path");
 async function update(tree) {
     if (!tree.exists('nx.json')) {
@@ -37,7 +37,7 @@ function warnNpmScopeHasChanged(tree, nxJson) {
     }
     const packageJsonName = (0, json_1.readJson)(tree, 'package.json').name;
     if (newScope) {
-        logger_1.logger.warn({
+        output_1.output.warn({
             title: 'npmScope has been removed from nx.json',
             bodyLines: [
                 'This will now be read from package.json',
@@ -50,7 +50,7 @@ function warnNpmScopeHasChanged(tree, nxJson) {
     }
     else {
         // There is no scope in package.json
-        logger_1.logger.warn({
+        output_1.output.warn({
             title: 'npmScope has been removed from nx.json',
             bodyLines: [
                 'This will now be read from package.json',