nx 23.2.0-beta.8 → 23.2.0-beta.9

package/dist/src/ai/set-up-ai-agents/set-up-ai-agents.js

@@ -7,7 +7,7 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const semver_1 = require("semver");
 const smol_toml_1 = tslib_1.__importDefault(require("smol-toml"));
-const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
+const format_changed_files_1 = require("../../generators/internal-utils/format-changed-files");
 const generate_files_1 = require("../../generators/utils/generate-files");
 const json_1 = require("../../generators/utils/json");
 const native_1 = require("../../native");
@@ -234,7 +234,7 @@ async function setupAiAgentsGeneratorImpl(tree, options) {
     (0, ignore_1.addEntryToGitIgnore)(tree, (0, path_1.join)(options.directory, '.gitignore'), '.nx/polygraph');
     (0, ignore_1.addEntryToGitIgnore)(tree, (0, path_1.join)(options.directory, '.gitignore'), '.claude/worktrees');
     (0, ignore_1.addEntryToGitIgnore)(tree, (0, path_1.join)(options.directory, '.gitignore'), '.claude/settings.local.json');
-    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
+    await (0, format_changed_files_1.formatChangedFiles)(tree);
     // we use the check variable to determine if we should actually make changes or just report what would be changed
     return async (check = false) => {
         const messages = [];

package/dist/src/command-line/format/format.js

@@ -2,9 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.format = format;
 const tslib_1 = require("tslib");
-const node_child_process_1 = require("node:child_process");
 const path = tslib_1.__importStar(require("node:path"));
-const semver_1 = require("semver");
 const configuration_1 = require("../../config/configuration");
 const typescript_1 = require("../../plugins/js/utils/typescript");
 const affected_project_graph_1 = require("../../project-graph/affected/affected-project-graph");
@@ -13,59 +11,81 @@ const project_graph_1 = require("../../project-graph/project-graph");
 const chunkify_1 = require("../../utils/chunkify");
 const command_line_utils_1 = require("../../utils/command-line-utils");
 const fileutils_1 = require("../../utils/fileutils");
-const handle_import_1 = require("../../utils/handle-import");
+const formatters_1 = require("../../utils/formatters");
+const oxfmt_1 = require("../../utils/formatters/oxfmt");
+const prettier_1 = require("../../utils/formatters/prettier");
 const ignore_1 = require("../../utils/ignore");
 const object_sort_1 = require("../../utils/object-sort");
 const output_1 = require("../../utils/output");
-const package_json_1 = require("../../utils/package-json");
 const workspace_root_1 = require("../../utils/workspace-root");
+/**
+ * A table, not a `switch`: this lookup sits inside a `try` whose `catch`
+ * reports "configured but not installed", and a `never` arm would throw into
+ * that catch and be misreported. A missing member is a compile error here.
+ */
+const resolveFormatterBin = {
+    oxfmt: oxfmt_1.getOxfmtBinPath,
+    prettier: prettier_1.getPrettierPath,
+};
 async function format(command, args) {
-    let prettier;
+    const formatterType = (0, formatters_1.detectFormatter)(workspace_root_1.workspaceRoot);
+    if (!formatterType) {
+        output_1.output.warn({
+            title: 'No formatter configured.',
+            bodyLines: ['Install oxfmt or prettier to enable formatting.'],
+        });
+        return;
+    }
+    // Detection reads configuration only, so a workspace can be configured for a
+    // formatter that is not installed - a fresh clone, `--omit=dev` CI, a pruned
+    // node_modules. Resolving now turns a raw MODULE_NOT_FOUND into something
+    // actionable.
     try {
-        prettier = await (0, handle_import_1.handleImport)('prettier');
+        resolveFormatterBin[formatterType]();
     }
     catch {
         output_1.output.error({
-            title: 'Prettier is not installed.',
+            title: `${formatterType} is configured for this workspace but is not installed.`,
             bodyLines: [
-                `Please install "prettier" and try again, or don't run the "nx format:${command}" command.`,
+                `Install "${formatterType}" and try again, or remove its configuration to disable "nx format:${command}".`,
             ],
         });
         process.exit(1);
     }
     const { nxArgs } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'affected', { printWarnings: false }, (0, configuration_1.readNxJson)());
-    const patterns = (await getPatterns(prettier, { ...args, ...nxArgs })).map((p) => {
-        // On non-Windows, escape $ to prevent shell variable interpolation
-        // (the shell consumes one \, so \\$ becomes \$ which the shell treats as literal $)
-        // On Windows (cmd.exe), $ is not a special character, so escaping it would
-        // cause prettier to look for a file with a literal \$ in the name
-        // prettier-ignore
-        const escaped = process.platform !== 'win32' ? p.replace(/\$/g, '\\\$') : p;
-        return `"${escaped}"`;
+    // Patterns are kept raw here. Prettier is invoked through a shell so it
+    // quotes them at the call site; oxfmt is invoked with execFile and needs
+    // the unquoted paths.
+    const patterns = await getPatterns(formatterType, {
+        ...args,
+        ...nxArgs,
     });
-    // Chunkify the patterns array to prevent crashing the windows terminal
-    const chunkList = (0, chunkify_1.chunkify)(patterns);
+    // Chunkify the patterns array to prevent crashing the windows terminal.
+    // The prettier path quotes each pattern on its way to the shell, so size the
+    // chunks against that; oxfmt goes through execFile and gets them raw.
+    const chunkList = (0, chunkify_1.chunkify)(patterns, undefined, formatterType === 'prettier'
+        ? (pattern) => (0, prettier_1.quoteForShell)(pattern).length
+        : undefined);
     switch (command) {
         case 'write':
             if (nxArgs.sortRootTsconfigPaths) {
                 sortTsConfig();
             }
             addRootConfigFiles(chunkList, nxArgs);
-            chunkList.forEach((chunk) => write(prettier, chunk));
+            chunkList.forEach((chunk) => write(formatterType, chunk));
             break;
         case 'check': {
             const filesWithDifferentFormatting = [];
             for (const chunk of chunkList) {
-                const files = await check(chunk);
+                const files = await check(formatterType, chunk);
                 filesWithDifferentFormatting.push(...files);
             }
             if (filesWithDifferentFormatting.length > 0) {
                 if (nxArgs.verbose) {
                     output_1.output.error({
-                        title: 'The following files are not formatted correctly based on your Prettier configuration',
+                        title: 'The following files are not formatted correctly',
                         bodyLines: [
                             '- Run "nx format:write" and commit the resulting diff to fix these files.',
-                            '- Please note, Prettier does not support a native way to diff the output of its check logic (https://github.com/prettier/prettier/issues/6885).',
                             '',
                             ...filesWithDifferentFormatting,
                         ],
@@ -80,7 +100,7 @@ async function format(command, args) {
         }
     }
 }
-async function getPatterns(prettier, args) {
+async function getPatterns(formatterType, args) {
     const allFilesPattern = ['.'];
     if (args.all) {
         return allFilesPattern;
@@ -91,16 +111,16 @@ async function getPatterns(prettier, args) {
             return getPatternsFromProjects(args.projects, graph);
         }
         const p = (0, command_line_utils_1.parseFiles)(args);
-        const supportedExtensions = new Set((await prettier.getSupportInfo()).languages
-            .flatMap((language) => language.extensions)
-            .filter((extension) => !!extension)
-            // Prettier supports ".swcrc" as a file instead of an extension
-            // So we add ".swcrc" as a supported extension manually
-            // which allows it to be considered for calculating "patterns"
-            .concat('.swcrc'));
-        const patterns = p.files
+        // Deleted files still show up in the changed-file set, and neither
+        // formatter should be handed a path that is no longer there.
+        let patterns = p.files
             .map((f) => path.relative(workspace_root_1.workspaceRoot, f))
-            .filter((f) => (0, fileutils_1.fileExists)(f) && supportedExtensions.has(path.extname(f)));
+            .filter((f) => (0, fileutils_1.fileExists)(f));
+        if (formatterType === 'prettier') {
+            // oxfmt needs no equivalent filter - it silently skips file types it
+            // does not handle, and its base args keep an all-skipped run green.
+            patterns = await (0, prettier_1.filterToPrettierSupportedFiles)(patterns);
+        }
         // exclude patterns in .nxignore or .gitignore
         const nonIgnoredPatterns = (0, ignore_1.getIgnoreObject)().filter(patterns);
         if (args.libsAndApps) {
@@ -130,13 +150,10 @@ function addRootConfigFiles(chunkList, nxArgs) {
     }
     const chunk = [];
     const addToChunkIfNeeded = (file) => {
-        if (chunkList.every((c) => !c.includes(`"${file}"`))) {
+        if (chunkList.every((c) => !c.includes(file))) {
             chunk.push(file);
         }
     };
-    // if (workspaceJsonPath) {
-    //   addToChunkIfNeeded(workspaceJsonPath);
-    // }
     ['nx.json', (0, typescript_1.getRootTsConfigFileName)()]
         .filter(Boolean)
         .forEach(addToChunkIfNeeded);
@@ -147,49 +164,43 @@ function addRootConfigFiles(chunkList, nxArgs) {
 function getPatternsFromProjects(projects, projectGraph) {
     return (0, command_line_utils_1.getProjectRoots)(projects, projectGraph);
 }
-function write(prettier, patterns) {
-    if (patterns.length > 0) {
-        const [swcrcPatterns, regularPatterns] = patterns.reduce((result, pattern) => {
-            result[pattern.includes('.swcrc') ? 0 : 1].push(pattern);
-            return result;
-        }, [[], []]);
-        const prettierPath = getPrettierPath();
-        const listDifferentArg = shouldUseListDifferent(prettier.version)
-            ? '--list-different '
-            : '';
-        (0, node_child_process_1.execSync)(`node "${prettierPath}" --write ${listDifferentArg}${regularPatterns.join(' ')}`, {
-            stdio: [0, 1, 2],
-            windowsHide: true,
-        });
-        if (swcrcPatterns.length > 0) {
-            (0, node_child_process_1.execSync)(`node "${prettierPath}" --write ${listDifferentArg}${swcrcPatterns.join(' ')} --parser json`, {
-                stdio: [0, 1, 2],
-                windowsHide: true,
-            });
+function write(formatterType, patterns) {
+    if (patterns.length === 0) {
+        return;
+    }
+    switch (formatterType) {
+        case 'oxfmt':
+            (0, oxfmt_1.writeWithOxfmt)(patterns);
+            break;
+        case 'prettier':
+            (0, prettier_1.writeWithPrettier)(patterns);
+            break;
+        default: {
+            // Without this, an unhandled formatter makes `nx format:write` exit 0
+            // having formatted nothing, while `check()` throws - the two halves of
+            // the same command disagreeing.
+            const unhandled = formatterType;
+            throw new Error(`Unhandled formatter: ${unhandled}`);
         }
     }
 }
-async function check(patterns) {
+async function check(formatterType, patterns) {
     if (patterns.length === 0) {
         return [];
     }
-    const prettierPath = getPrettierPath();
-    return new Promise((resolve, reject) => {
-        (0, node_child_process_1.exec)(`node "${prettierPath}" --list-different ${patterns.join(' ')}`, { encoding: 'utf-8', windowsHide: true }, (error, stdout) => {
-            if (error) {
-                // The command failed because Prettier threw an error.
-                if (stdout.length === 0) {
-                    reject(error);
-                }
-                // The command failed so there are files with different formatting. Prettier writes them to stdout, newline separated.
-                resolve(stdout.trim().split('\n'));
-            }
-            else {
-                // The command succeeded so there are no files with different formatting
-                resolve([]);
-            }
-        });
-    });
+    switch (formatterType) {
+        case 'oxfmt':
+            return (0, oxfmt_1.checkWithOxfmt)(patterns);
+        case 'prettier':
+            return (0, prettier_1.checkWithPrettier)(patterns);
+        default: {
+            // `strict: false` does not make a missing case an error on its own, but
+            // it does reject this assignment - so adding a formatter fails to compile
+            // here instead of returning undefined into a caller that spreads it.
+            const unhandled = formatterType;
+            throw new Error(`Unhandled formatter: ${unhandled}`);
+        }
+    }
 }
 function sortTsConfig() {
     try {
@@ -203,31 +214,3 @@ function sortTsConfig() {
         // catch noop
     }
 }
-let prettierPath;
-function getPrettierPath() {
-    if (prettierPath) {
-        return prettierPath;
-    }
-    const { packageJson, path: packageJsonPath } = (0, package_json_1.readModulePackageJson)('prettier');
-    const bin = packageJson.bin;
-    const binPath = typeof bin === 'string' ? bin : bin?.['prettier'];
-    if (!binPath) {
-        throw new Error(`Could not find prettier binary in ${packageJsonPath}`);
-    }
-    prettierPath = path.resolve(path.dirname(packageJsonPath), binPath);
-    return prettierPath;
-}
-let useListDifferent;
-/**
- * Determines if --list-different should be used with --write.
- * Prettier 4+ and 3.6.x with experimental CLI don't support combining these flags.
- */
-function shouldUseListDifferent(prettierVersion) {
-    if (useListDifferent !== undefined) {
-        return useListDifferent;
-    }
-    const prettierMajor = (0, semver_1.major)(prettierVersion);
-    const isExperimentalCli = process.env.PRETTIER_EXPERIMENTAL_CLI === '1';
-    useListDifferent = prettierMajor < 4 && !isExperimentalCli;
-    return useListDifferent;
-}

package/dist/src/command-line/import/import.js

@@ -23,6 +23,7 @@ const prepare_source_repo_1 = require("./utils/prepare-source-repo");
 const merge_remote_source_1 = require("./utils/merge-remote-source");
 const minimatch_1 = require("minimatch");
 const configure_plugins_1 = require("../init/configure-plugins");
+const format_1 = require("../init/implementation/format");
 const check_compatible_with_plugins_1 = require("../init/implementation/check-compatible-with-plugins");
 const native_1 = require("../../native");
 const ai_output_1 = require("./utils/ai-output");
@@ -260,6 +261,7 @@ async function importHandler(options) {
             const incompatiblePlugins = await (0, check_compatible_with_plugins_1.checkCompatibleWithPlugins)();
             if (Object.keys(incompatiblePlugins).length > 0) {
                 (0, check_compatible_with_plugins_1.updatePluginsInNxJson)(workspace_root_1.workspaceRoot, incompatiblePlugins);
+                await (0, format_1.formatInitWrites)(workspace_root_1.workspaceRoot, 'nx import');
                 await destinationGitClient.amendCommit();
             }
         }
@@ -268,6 +270,7 @@ async function importHandler(options) {
             if (installed) {
                 const { succeededPlugins } = await (0, configure_plugins_1.configurePlugins)(plugins, updatePackageScripts, pmc, workspace_root_1.workspaceRoot, verbose);
                 if (succeededPlugins.length > 0) {
+                    await (0, format_1.formatInitWrites)(workspace_root_1.workspaceRoot, 'nx import');
                     await destinationGitClient.amendCommit();
                 }
             }
@@ -434,6 +437,7 @@ async function handlePluginOnlyMode(options, destinationGitClient, verbose) {
         if (installed) {
             const { succeededPlugins } = await (0, configure_plugins_1.configurePlugins)(plugins, updatePackageScripts, pmc, workspace_root_1.workspaceRoot, verbose);
             if (succeededPlugins.length > 0) {
+                await (0, format_1.formatInitWrites)(workspace_root_1.workspaceRoot, 'nx import');
                 await destinationGitClient.amendCommit();
             }
         }
@@ -468,6 +472,7 @@ async function runInstallDestinationRepo(packageManager, destinationGitClient) {
             title: 'Installing dependencies for imported code',
         });
         (0, utils_1.runInstall)(workspace_root_1.workspaceRoot, packageManager, (0, package_manager_1.getPackageManagerCommand)(packageManager));
+        await (0, format_1.formatInitWrites)(workspace_root_1.workspaceRoot, 'nx import');
         await destinationGitClient.amendCommit();
     }
     catch (e) {
@@ -484,6 +489,7 @@ async function runPluginsInstall(plugins, pmc, destinationGitClient) {
     output_1.output.log({ title: 'Installing Plugins' });
     try {
         (0, configure_plugins_1.installPluginPackages)(workspace_root_1.workspaceRoot, pmc, plugins);
+        await (0, format_1.formatInitWrites)(workspace_root_1.workspaceRoot, 'nx import');
         await destinationGitClient.amendCommit();
     }
     catch (e) {
@@ -561,6 +567,12 @@ async function handleMissingWorkspacesEntry(pm, pmc, pkgPath, destinationGitClie
             return;
         }
         (0, package_manager_1.addPackagePathToWorkspaces)(pkgPath, pm, workspaces, workspace_root_1.workspaceRoot);
+        // That helper is shared, so it does not record for us - without this the
+        // drain below has nothing to do and the rewritten file ships unformatted.
+        // It writes pnpm-workspace.yaml for pnpm and package.json for the rest, so
+        // recording package.json unconditionally records a file it never touched.
+        (0, format_1.recordInitWrite)((0, path_1.join)(workspace_root_1.workspaceRoot, pm === 'pnpm' ? 'pnpm-workspace.yaml' : 'package.json'));
+        await (0, format_1.formatInitWrites)(workspace_root_1.workspaceRoot, 'nx import');
         await destinationGitClient.amendCommit();
         output_1.output.success({
             title: `Project added in workspaces`,

package/dist/src/command-line/init/configure-plugins.js

@@ -19,6 +19,7 @@ const configuration_1 = require("../../config/configuration");
 const versions_1 = require("../../utils/versions");
 const child_process_1 = require("../../utils/child-process");
 const fileutils_1 = require("../../utils/fileutils");
+const format_1 = require("./implementation/format");
 const spinner_1 = require("../../utils/spinner");
 function installPluginPackages(repoRoot, pmc = (0, package_manager_1.getPackageManagerCommand)(), plugins) {
     if (plugins.length === 0) {
@@ -35,7 +36,9 @@ function installPluginPackages(repoRoot, pmc = (0, package_manager_1.getPackageM
         for (const plugin of plugins) {
             nxJson.installation.plugins[plugin] = versions_1.nxVersion;
         }
-        (0, fileutils_1.writeJsonFile)((0, path_1.join)(repoRoot, 'nx.json'), nxJson);
+        const nxJsonPath = (0, path_1.join)(repoRoot, 'nx.json');
+        (0, fileutils_1.writeJsonFile)(nxJsonPath, nxJson);
+        (0, format_1.recordInitWrite)(nxJsonPath);
         try {
             (0, child_process_1.runNxSync)('--version', { stdio: 'pipe' });
         }

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

@@ -4,6 +4,7 @@ exports.addNxToNest = addNxToNest;
 const prompt_helpers_1 = require("../../../utils/prompt-helpers");
 const node_fs_1 = require("node:fs");
 const path_1 = require("path");
+const format_1 = require("./format");
 const fileutils_1 = require("../../../utils/fileutils");
 const output_1 = require("../../../utils/output");
 const package_manager_1 = require("../../../utils/package-manager");
@@ -101,6 +102,7 @@ function addNestPluginToPackageJson(repoRoot) {
     json.devDependencies['@nx/nest'] = versions_1.nxVersion;
     json.devDependencies['@nx/jest'] = versions_1.nxVersion;
     (0, fileutils_1.writeJsonFile)(path, json);
+    (0, format_1.recordInitWrite)(path);
 }
 function createProjectJson(repoRoot, packageJson, nestCLIOptions) {
     const packageName = packageJson.name;
@@ -181,6 +183,7 @@ function createProjectJson(repoRoot, packageJson, nestCLIOptions) {
         addJestTargets(repoRoot, packageName, json, packageJson);
     }
     (0, fileutils_1.writeJsonFile)(path, json);
+    (0, format_1.recordInitWrite)(path);
 }
 function getJestOptions(isE2E, repoRoot, packageName, existingOptions) {
     // try get the e2e json if we find it
@@ -217,6 +220,7 @@ function tryCreateJestPreset(repoRoot) {
 const nxPreset = require('@nx/jest/preset').default;
 module.exports = {...nxPreset};
 `, 'utf8');
+        (0, format_1.recordInitWrite)(jestPresetPath);
         return true;
     }
     return false;
@@ -231,7 +235,9 @@ function addJestTargets(repoRoot, packageName, projectJson, packageJson) {
         unitTestOptions['preset'] = e2eTestOptions['preset'] = './jest.preset.js';
     }
     (0, node_fs_1.writeFileSync)(unitTestConfigPath, `export default ${JSON.stringify(unitTestOptions, null, 2)}`, 'utf8');
+    (0, format_1.recordInitWrite)(unitTestConfigPath);
     (0, node_fs_1.writeFileSync)(e2eTestConfigPath, `export default ${JSON.stringify(e2eTestOptions, null, 2)}`, 'utf8');
+    (0, format_1.recordInitWrite)(e2eTestConfigPath);
     projectJson.targets['test'] = {
         executor: '@nx/jest:jest',
         outputs: [`{workspaceRoot}/coverage/${packageName}`],
@@ -261,6 +267,7 @@ function addNrwlJsPluginsConfig(repoRoot) {
         };
     }
     (0, fileutils_1.writeJsonFile)(path, json);
+    (0, format_1.recordInitWrite)(path);
 }
 function updatePackageJsonScripts(repoRoot, isJS) {
     const path = (0, path_1.join)(repoRoot, `package.json`);
@@ -297,6 +304,7 @@ function updatePackageJsonScripts(repoRoot, isJS) {
         }
     }
     (0, fileutils_1.writeJsonFile)(path, json);
+    (0, format_1.recordInitWrite)(path);
 }
 function updateTsConfig(repoRoot, sourceRoot) {
     const path = (0, path_1.join)(repoRoot, `tsconfig.build.json`);
@@ -308,6 +316,7 @@ function updateTsConfig(repoRoot, sourceRoot) {
         json.include = [];
     json.include.push(`${sourceRoot}/**/*.ts`);
     (0, fileutils_1.writeJsonFile)(path, json);
+    (0, format_1.recordInitWrite)(path);
 }
 function removeFile(repoRoot, file) {
     const path = (0, path_1.join)(repoRoot, file);

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

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addNxToTurborepo = addNxToTurborepo;
-const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const fileutils_1 = require("../../../utils/fileutils");
-const handle_import_1 = require("../../../utils/handle-import");
 const output_1 = require("../../../utils/output");
 const package_manager_1 = require("../../../utils/package-manager");
+const format_1 = require("./format");
 const utils_1 = require("./utils");
 async function addNxToTurborepo(_options) {
     const repoRoot = process.cwd();
@@ -27,21 +26,8 @@ async function addNxToTurborepo(_options) {
     });
     let nxJson = (0, utils_1.createNxJsonFromTurboJson)((0, fileutils_1.readJsonFile)('turbo.json'));
     const nxJsonPath = (0, node_path_1.join)(repoRoot, 'nx.json');
-    // Turborepo workspaces usually have prettier installed, so try and match the formatting before writing the file
-    try {
-        const prettier = await (0, handle_import_1.handleImport)('prettier');
-        const config = await prettier.resolveConfig(repoRoot);
-        (0, node_fs_1.writeFileSync)(nxJsonPath, 
-        // @ts-ignore - Always await prettier.format, in modern versions it's async
-        await prettier.format(JSON.stringify(nxJson, null, 2), {
-            ...(config ?? {}),
-            parser: 'json',
-        }));
-    }
-    catch (err) {
-        // Apply fallback JSON write
-        (0, fileutils_1.writeJsonFile)(nxJsonPath, nxJson);
-    }
+    (0, fileutils_1.writeJsonFile)(nxJsonPath, nxJson);
+    (0, format_1.recordInitWrite)(nxJsonPath);
     const packageManager = (0, package_manager_1.detectPackageManager)(repoRoot);
     const pmc = (0, package_manager_1.getPackageManagerCommand)(packageManager);
     (0, utils_1.updateGitIgnore)(repoRoot);

package/dist/src/command-line/init/implementation/angular/index.js

@@ -14,6 +14,7 @@ const integrated_workspace_1 = require("./integrated-workspace");
 const legacy_angular_versions_1 = require("./legacy-angular-versions");
 const standalone_workspace_1 = require("./standalone-workspace");
 const connect_to_nx_cloud_1 = require("../../../nx-cloud/connect/connect-to-nx-cloud");
+const format_1 = require("../format");
 const defaultCacheableOperations = [
     'build',
     'server',
@@ -29,6 +30,8 @@ async function addNxToAngularCliRepo(options) {
     if (legacyMigrationFn) {
         output_1.output.log({ title: '💽 Running migration for a legacy Angular version' });
         await legacyMigrationFn();
+        // The exit skips the caller's drain, so format the recorded writes here.
+        await (0, format_1.formatInitWrites)(repoRoot);
         process.exit(0);
     }
     output_1.output.success({
@@ -104,6 +107,7 @@ function addPluginDependencies() {
     }
     packageJson.devDependencies = (0, object_sort_1.sortObjectByKeys)(packageJson.devDependencies);
     (0, fileutils_1.writeJsonFile)(packageJsonPath, packageJson);
+    (0, format_1.recordInitWrite)(packageJsonPath);
 }
 async function setupWorkspace(cacheableOperations, isIntegratedMigration) {
     (0, utils_1.updateGitIgnore)(repoRoot);

package/dist/src/command-line/init/implementation/angular/legacy-angular-versions.js

@@ -12,6 +12,7 @@ const package_json_1 = require("../../../../utils/package-json");
 const package_manager_1 = require("../../../../utils/package-manager");
 const connect_to_nx_cloud_1 = require("../../../nx-cloud/connect/connect-to-nx-cloud");
 const utils_1 = require("../utils");
+const format_1 = require("../format");
 // map of Angular major versions to Nx versions to use for legacy `nx init` migrations,
 // key is major Angular version and value is Nx version to use
 const nxAngularLegacyVersionMap = {
@@ -141,6 +142,7 @@ async function installDependencies(repoRoot, pkgInfo, pmc) {
         json.dependencies = (0, object_sort_1.sortObjectByKeys)(json.dependencies);
     }
     (0, fileutils_1.writeJsonFile)(`package.json`, json);
+    (0, format_1.recordInitWrite)('package.json');
     (0, child_process_1.execSync)(pmc.install, { stdio: [0, 1, 2], windowsHide: true });
 }
 async function resolvePackageVersion(packageName, version) {

package/dist/src/command-line/init/implementation/angular/standalone-workspace.js

@@ -7,6 +7,7 @@ const angular_json_1 = require("../../../../adapter/angular-json");
 const fileutils_1 = require("../../../../utils/fileutils");
 const path_1 = require("../../../../utils/path");
 const utils_1 = require("../utils");
+const format_1 = require("../format");
 async function setupStandaloneWorkspace(repoRoot, cacheableOperations, workspaceTargets) {
     const angularJsonPath = (0, node_path_1.join)(repoRoot, 'angular.json');
     const angularJson = (0, fileutils_1.readJsonFile)(angularJsonPath);
@@ -25,12 +26,14 @@ async function setupStandaloneWorkspace(repoRoot, cacheableOperations, workspace
     const projects = (0, angular_json_1.toNewFormat)(angularJson).projects;
     for (const [projectName, project] of Object.entries(projects ?? {})) {
         updateProjectOutputs(repoRoot, projectName, project, cacheableOperations);
-        (0, fileutils_1.writeJsonFile)((0, node_path_1.join)(project.root, 'project.json'), {
+        const projectJsonPath = (0, node_path_1.join)(project.root, 'project.json');
+        (0, fileutils_1.writeJsonFile)(projectJsonPath, {
             $schema: (0, path_1.normalizePath)((0, node_path_1.relative)((0, node_path_1.join)(repoRoot, project.root), (0, node_path_1.join)(repoRoot, 'node_modules/nx/schemas/project-schema.json'))),
             name: projectName,
             ...project,
             root: undefined,
         });
+        (0, format_1.recordInitWrite)(projectJsonPath);
     }
     (0, fs_1.unlinkSync)(angularJsonPath);
 }
@@ -91,7 +94,9 @@ function createNxJson(repoRoot, angularJson, cacheableOperations, { eslintProjec
     if (Object.keys(defaults).length > 0) {
         nxJson.targetDefaults = defaults;
     }
-    (0, fileutils_1.writeJsonFile)((0, node_path_1.join)(repoRoot, 'nx.json'), nxJson);
+    const nxJsonPath = (0, node_path_1.join)(repoRoot, 'nx.json');
+    (0, fileutils_1.writeJsonFile)(nxJsonPath, nxJson);
+    (0, format_1.recordInitWrite)(nxJsonPath);
 }
 function updateProjectOutputs(repoRoot, projectName, project, cacheableOperations) {
     Object.entries(project.targets ?? {}).forEach(([targetName, target]) => {
@@ -195,4 +200,5 @@ function replaceNgWithNxInPackageJsonScripts(repoRoot) {
             .replace(/ ng /g, ' nx ');
     });
     (0, fileutils_1.writeJsonFile)(packageJsonPath, packageJson);
+    (0, format_1.recordInitWrite)(packageJsonPath);
 }

package/dist/src/command-line/init/implementation/check-compatible-with-plugins.js

@@ -8,6 +8,7 @@ const picocolors_1 = require("picocolors");
 const error_types_1 = require("../../../project-graph/error-types");
 const workspace_root_1 = require("../../../utils/workspace-root");
 const fileutils_1 = require("../../../utils/fileutils");
+const format_1 = require("./format");
 const output_1 = require("../../../utils/output");
 const project_graph_1 = require("../../../project-graph/project-graph");
 /**
@@ -131,4 +132,5 @@ function updatePluginsInNxJson(root = workspace_root_1.workspaceRoot, pluginToEx
         nxJson.plugins[pluginIndex] = plugin;
     });
     (0, fileutils_1.writeJsonFile)(nxJsonPath, nxJson);
+    (0, format_1.recordInitWrite)(nxJsonPath);
 }

package/dist/src/command-line/init/implementation/dot-nx/add-nx-scripts.js

@@ -12,6 +12,7 @@ exports.getBatchScriptContents = getBatchScriptContents;
 exports.sanitizeWrapperScript = sanitizeWrapperScript;
 const tslib_1 = require("tslib");
 const child_process_1 = require("child_process");
+const format_1 = require("../format");
 const fs_1 = require("fs");
 const path = tslib_1.__importStar(require("path"));
 const semver_1 = require("semver");
@@ -101,6 +102,10 @@ function writeMinimalNxJson(host, version) {
                 version: normalizeVersionForNxJson('nx', version),
             },
         });
+        (0, format_1.recordInitWrite)('nx.json');
+        // Only this file. The wrapper scripts written by `generateDotNxSetup`
+        // above (`.nx/nxw.js`, `nx`, `nx.bat`) are deliberately left out: they are
+        // vendored artifacts, and two of them have no formatter at all.
     }
 }
 function updateGitIgnore(host) {

package/dist/src/command-line/init/implementation/format.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Records a file for `formatInitWrites`. Only for files a formatter handles -
+ * `.gitignore` and the vendored `.nx` scripts are left out rather than
+ * filtered later.
+ *
+ * Two recording helpers are shared with `nx import`, which drains before each
+ * commit amend; draining after one would leave the formatting uncommitted.
+ * The drain is a no-op when empty.
+ */
+export declare function recordInitWrite(filePath: string): void;
+/**
+ * Formats what init just wrote and nothing else: an existing repo's other
+ * files are not init's to reformat.
+ *
+ * Never fatal - the repo is already initialised, so a formatter that cannot
+ * run costs a `nx format` the user can run themselves, not their setup.
+ */
+export declare function formatInitWrites(repoRoot: string, command?: string): Promise<void>;