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

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

@@ -0,0 +1,114 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.recordInitWrite = recordInitWrite;
+exports.formatInitWrites = formatInitWrites;
+const tslib_1 = require("tslib");
+const node_fs_1 = require("node:fs");
+const path = tslib_1.__importStar(require("node:path"));
+const chunkify_1 = require("../../../utils/chunkify");
+const formatters_1 = require("../../../utils/formatters");
+const oxfmt_1 = require("../../../utils/formatters/oxfmt");
+const prettier_1 = require("../../../utils/formatters/prettier");
+const output_1 = require("../../../utils/output");
+/**
+ * Paths `nx init` has created or modified.
+ *
+ * Module state because init's flows write from many call sites across
+ * several files, a number behind early returns; the alternative is threading
+ * a collector through every one.
+ */
+const writtenFiles = new Set();
+/**
+ * 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.
+ */
+function recordInitWrite(filePath) {
+    writtenFiles.add(filePath);
+}
+/**
+ * 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.
+ */
+async function formatInitWrites(repoRoot, 
+// `nx import` drains this set too, and a user who never ran `nx init` should
+// not be told `nx init` failed.
+command = 'nx init') {
+    const recorded = [...writtenFiles];
+    // Cleared unconditionally: a second init in the same process must not
+    // reformat the first one's files.
+    writtenFiles.clear();
+    if (process.env.NX_SKIP_FORMAT === 'true' || recorded.length === 0) {
+        return;
+    }
+    // Repo-relative with `repoRoot` as cwd, so paths stay short and resolve
+    // against the repo. That also pins oxfmt's `.editorconfig` lookup, which it
+    // does once from the working directory; it does not pin config discovery.
+    //
+    // De-duplicated *after* normalising: the same file is routinely recorded
+    // both as `'nx.json'` and as `join(repoRoot, 'nx.json')`, which are two Set
+    // keys for one file.
+    const files = [
+        ...new Set(recorded.map((file) => path
+            .relative(repoRoot, path.resolve(repoRoot, file))
+            .split(path.sep)
+            .join('/'))),
+    ].filter((file) => file &&
+        !file.startsWith('../') &&
+        !path.isAbsolute(file) &&
+        (0, node_fs_1.existsSync)(path.join(repoRoot, file)));
+    if (files.length === 0) {
+        return;
+    }
+    // `detectFormatter` reads package.json, so it belongs inside the try - a
+    // workspace whose package.json cannot be parsed must not fail an init that
+    // already finished.
+    //
+    // Chunked as `nx format` chunks: the Angular flow records a `project.json`
+    // per project. The prettier path is sized against its quoted length; oxfmt
+    // goes through execFile and gets raw paths.
+    let formatter = null;
+    try {
+        formatter = (0, formatters_1.detectFormatter)(repoRoot);
+        if (!formatter) {
+            return;
+        }
+        if (formatter === 'oxfmt') {
+            for (const chunk of (0, chunkify_1.chunkify)(files)) {
+                if (chunk.length) {
+                    (0, oxfmt_1.writeWithOxfmt)(chunk, repoRoot);
+                }
+            }
+        }
+        else {
+            // oxfmt needs no equivalent filter - it silently skips file types it
+            // does not handle and exits 0. prettier still formats the rest of the
+            // batch, but exits 2 on one unsupported file, which would end a
+            // successful init with a spurious warning and prettier's own stderr.
+            const supported = await (0, prettier_1.filterToPrettierSupportedFiles)(files);
+            for (const chunk of (0, chunkify_1.chunkify)(supported, undefined, (pattern) => (0, prettier_1.quoteForShell)(pattern).length)) {
+                if (chunk.length) {
+                    (0, prettier_1.writeWithPrettier)(chunk, repoRoot);
+                }
+            }
+        }
+    }
+    catch (e) {
+        output_1.output.warn({
+            title: formatter
+                ? `Could not format the files ${command} wrote with ${formatter}.`
+                : `Could not work out which formatter to use for the files ${command} wrote.`,
+            bodyLines: [
+                ...(e?.message ? [e.message] : []),
+                'Run "nx format:write" to format them.',
+            ],
+        });
+    }
+}

package/dist/src/command-line/init/implementation/utils.js

@@ -26,6 +26,7 @@ const acknowledge_build_scripts_1 = require("../../../utils/acknowledge-build-sc
 const path_2 = require("../../../utils/path");
 const versions_1 = require("../../../utils/versions");
 const fs_1 = require("fs");
+const format_1 = require("./format");
 const connect_to_nx_cloud_1 = require("../../../nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud");
 const connect_to_nx_cloud_2 = require("../../nx-cloud/connect/connect-to-nx-cloud");
 const deduce_default_base_1 = require("./deduce-default-base");
@@ -71,6 +72,7 @@ function createNxJsonFile(repoRoot, topologicalTargets, cacheableOperations, scr
         nxJson.defaultBase ??= defaultBase;
     }
     (0, fileutils_1.writeJsonFile)(nxJsonPath, nxJson);
+    (0, format_1.recordInitWrite)(nxJsonPath);
 }
 /**
  * Locate-by-target upsert against an in-memory `targetDefaults` map. Merges
@@ -221,6 +223,7 @@ function addDepsToPackageJson(repoRoot, packageManager, additionalPackages) {
         }
     }
     (0, fileutils_1.writeJsonFile)(path, json);
+    (0, format_1.recordInitWrite)(path);
     // nx has a postinstall script, which pnpm 11+ refuses to install
     // unacknowledged.
     (0, acknowledge_build_scripts_1.acknowledgeBuildScripts)(repoRoot, packageManager, { nx: true });
@@ -351,6 +354,7 @@ function setNeverConnectToCloud(repoRoot) {
     const nxJson = (0, fileutils_1.readJsonFile)(nxJsonPath);
     nxJson.neverConnectToCloud = true;
     (0, fileutils_1.writeJsonFile)(nxJsonPath, nxJson);
+    (0, format_1.recordInitWrite)(nxJsonPath);
 }
 function addVsCodeRecommendedExtensions(repoRoot, extensions) {
     const vsCodeExtensionsPath = (0, path_1.join)(repoRoot, '.vscode/extensions.json');
@@ -363,9 +367,11 @@ function addVsCodeRecommendedExtensions(repoRoot, extensions) {
             }
         });
         (0, fileutils_1.writeJsonFile)(vsCodeExtensionsPath, vsCodeExtensionsJson);
+        (0, format_1.recordInitWrite)(vsCodeExtensionsPath);
     }
     else {
         (0, fileutils_1.writeJsonFile)(vsCodeExtensionsPath, { recommendations: extensions });
+        (0, format_1.recordInitWrite)(vsCodeExtensionsPath);
     }
 }
 function markRootPackageJsonAsNxProjectLegacy(repoRoot, cacheableScripts, pmc) {
@@ -386,6 +392,7 @@ function markRootPackageJsonAsNxProjectLegacy(repoRoot, cacheableScripts, pmc) {
         }
     }
     (0, fileutils_1.writeJsonFile)(`package.json`, json);
+    (0, format_1.recordInitWrite)('package.json');
 }
 function markPackageJsonAsNxProject(packageJsonPath) {
     const json = (0, fileutils_1.readJsonFile)(packageJsonPath);
@@ -394,6 +401,7 @@ function markPackageJsonAsNxProject(packageJsonPath) {
     }
     json.nx = {};
     (0, fileutils_1.writeJsonFile)(packageJsonPath, json);
+    (0, format_1.recordInitWrite)(packageJsonPath);
 }
 function printFinalMessage({ learnMoreLink, appendLines, }) {
     output_1.output.success({

package/dist/src/command-line/init/init-v1.js

@@ -14,6 +14,7 @@ const child_process_2 = require("../../utils/child-process");
 const fileutils_1 = require("../../utils/fileutils");
 const versions_1 = require("../../utils/versions");
 const utils_1 = require("./implementation/utils");
+const format_1 = require("./implementation/format");
 async function initHandler(options) {
     // strip the 'init' command itself so we don't forward it
     const args = process.argv.slice(3).join(' ');
@@ -23,11 +24,13 @@ async function initHandler(options) {
     }
     if (options.useDotNxInstallation === true) {
         setupDotNxInstallation(version);
+        await (0, format_1.formatInitWrites)(process.cwd());
     }
     else if ((0, fs_1.existsSync)('package.json')) {
         const packageJson = (0, fileutils_1.readJsonFile)('package.json');
         if ((0, fs_1.existsSync)('angular.json')) {
             await (0, angular_1.addNxToAngularCliRepo)(options);
+            await (0, format_1.formatInitWrites)(process.cwd());
             (0, utils_1.printFinalMessage)({
                 learnMoreLink: 'https://nx.dev/recipes/angular/migration/angular',
             });
@@ -35,6 +38,7 @@ async function initHandler(options) {
         }
         else if (isNestCLI(packageJson)) {
             await (0, add_nx_to_nest_1.addNxToNest)(options, packageJson);
+            await (0, format_1.formatInitWrites)(process.cwd());
             (0, utils_1.printFinalMessage)({
                 learnMoreLink: 'https://nx.dev/recipes/adopting-nx/adding-to-monorepo',
             });
@@ -42,12 +46,14 @@ async function initHandler(options) {
         }
         else if ((0, utils_1.isMonorepo)(packageJson)) {
             await (0, add_nx_to_monorepo_1.addNxToMonorepo)({ ...options, legacy: true });
+            await (0, format_1.formatInitWrites)(process.cwd());
             (0, utils_1.printFinalMessage)({
                 learnMoreLink: 'https://nx.dev/recipes/adopting-nx/adding-to-monorepo',
             });
         }
         else {
             await (0, add_nx_to_npm_repo_1.addNxToNpmRepo)({ ...options, legacy: true });
+            await (0, format_1.formatInitWrites)(process.cwd());
             (0, utils_1.printFinalMessage)({
                 learnMoreLink: 'https://nx.dev/recipes/adopting-nx/adding-to-existing-project',
             });
@@ -63,6 +69,7 @@ async function initHandler(options) {
         })) === 'true';
         if (useDotNxFolder) {
             setupDotNxInstallation(version);
+            await (0, format_1.formatInitWrites)(process.cwd());
         }
         else {
             (0, child_process_1.execSync)(`npx --yes create-nx-workspace@${version} ${args}`, {

package/dist/src/command-line/init/init-v2.js

@@ -20,6 +20,7 @@ const configure_plugins_1 = require("./configure-plugins");
 const ai_agent_prompts_1 = require("./ai-agent-prompts");
 const set_up_ai_agents_1 = require("../../ai/set-up-ai-agents/set-up-ai-agents");
 const tree_1 = require("../../generators/tree");
+const format_1 = require("./implementation/format");
 const add_nx_to_monorepo_1 = require("./implementation/add-nx-to-monorepo");
 const add_nx_to_npm_repo_1 = require("./implementation/add-nx-to-npm-repo");
 const add_nx_to_turborepo_1 = require("./implementation/add-nx-to-turborepo");
@@ -148,6 +149,7 @@ async function runInit(options, baseMeta) {
             ...options,
             integrated: !!options.integrated,
         });
+        await (0, format_1.formatInitWrites)(process.cwd());
         (0, utils_1.printFinalMessage)({
             learnMoreLink: 'https://nx.dev/technologies/angular/migration/angular',
         });
@@ -180,6 +182,7 @@ async function runInit(options, baseMeta) {
                 version: '0.0.0',
                 private: true,
             });
+            (0, format_1.recordInitWrite)('package.json');
         }
         else {
             options.useDotNxInstallation = true;
@@ -213,6 +216,7 @@ async function runInit(options, baseMeta) {
         await (0, add_nx_to_turborepo_1.addNxToTurborepo)({
             interactive: options.interactive,
         });
+        await (0, format_1.formatInitWrites)(process.cwd());
         (0, utils_1.printFinalMessage)({
             learnMoreLink: 'https://nx.dev/recipes/adopting-nx/from-turborepo',
         });
@@ -287,6 +291,9 @@ async function runInit(options, baseMeta) {
                     reason: getPluginReason(name),
                 }));
                 (0, ai_output_1.logProgress)('detecting', `Detected ${detectedPluginNames.length} plugin(s): ${detectedPluginNames.join(', ')}`);
+                // This path exits without reaching the drain below, and `nx.json` has
+                // already been written by now.
+                await (0, format_1.formatInitWrites)(repoRoot);
                 (0, ai_output_1.writeAiOutput)((0, ai_output_1.buildNeedsInputResult)(detectedPlugins));
                 process.exit(0);
             }
@@ -365,6 +372,10 @@ async function runInit(options, baseMeta) {
             pluginsInstalled: pluginsToInstall.join(','),
         },
     });
+    // Before the AI record, not after: the formatters write to stdout
+    // (`--list-different`, oxfmt's summary), which would otherwise land after the
+    // NDJSON result and corrupt the tail an agent parses.
+    await (0, format_1.formatInitWrites)(repoRoot);
     // Output success result for AI agents
     if (aiMode) {
         (0, ai_output_1.writeAiOutput)((0, ai_output_1.buildSuccessResult)({

package/dist/src/command-line/migrate/migrate.d.ts

@@ -65,6 +65,8 @@ export declare class Migrator {
     private readonly packageUpdates;
     private readonly collectedVersions;
     private readonly promptAnswers;
+    private readonly pendingPackageJsonUpdates;
+    private readonly appliedPackageJsonUpdates;
     private readonly nxInstallation;
     private minVersionWithSkippedUpdates;
     constructor(opts: MigratorOptions);
@@ -87,6 +89,8 @@ export declare class Migrator {
     }>;
     private createMigrateJson;
     private buildPackageJsonUpdates;
+    private applyPackageJsonUpdate;
+    private applyPendingPackageJsonUpdates;
     private resolveVersionForCascade;
     private populatePackageJsonUpdatesAndGetPackagesToCheck;
     private getPackageJsonUpdatesFromMigrationConfig;

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

@@ -47,7 +47,7 @@ const configuration_1 = require("../../config/configuration");
 const child_process_2 = require("../../utils/child-process");
 const client_1 = require("../../daemon/client/client");
 const nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
-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 provenance_1 = require("../../utils/provenance");
 const catalog_1 = require("../../utils/catalog");
 const migrate_analytics_1 = require("./migrate-analytics");
@@ -113,6 +113,8 @@ class Migrator {
         this.packageUpdates = {};
         this.collectedVersions = {};
         this.promptAnswers = {};
+        this.pendingPackageJsonUpdates = new Map();
+        this.appliedPackageJsonUpdates = new Set();
         if ((opts.include === 'required' || opts.include === 'optional') &&
             !opts.requiredPackages) {
             throw new Error(`Error: 'requiredPackages' is required when 'include' is '${opts.include}'.`);
@@ -140,6 +142,7 @@ class Migrator {
             version: targetVersion,
             addToPackageJson: false,
         });
+        await this.applyPendingPackageJsonUpdates();
         this.applyIncludeFilter();
         const { migrations, promptContents } = await this.createMigrateJson();
         return {
@@ -185,29 +188,66 @@ class Migrator {
         for (const packageToCheck of packagesToCheck) {
             const filteredUpdates = {};
             for (const [packageUpdateKey, packageUpdate] of Object.entries(packageToCheck.updates)) {
-                if (this.areRequirementsMet(packageUpdate.requires) &&
-                    !this.areIncompatiblePackagesPresent(packageUpdate.incompatibleWith) &&
-                    (!this.interactive ||
-                        (await this.runPackageJsonUpdatesConfirmationPrompt(packageUpdate, packageUpdateKey, packageToCheck.package)))) {
-                    const updateEntries = Object.entries(packageUpdate.packages);
-                    // Validate all up front so invalid metadata fails fast, before any
-                    // resolution does I/O.
-                    for (const [name, update] of updateEntries) {
-                        this.validatePackageUpdateVersion(packageToCheck.package, name, update);
-                    }
-                    // Resolve serially: resolution can prompt (pnpm strict cooldown) and
-                    // append to minimumReleaseAgeExclude, so a serial loop avoids
-                    // overlapping prompts and keeps packageUpdates ordering stable.
-                    for (const [name, update] of updateEntries) {
-                        const resolvedUpdate = {
-                            ...update,
-                            version: await this.resolveVersionForCascade(name, update.version),
-                        };
-                        filteredUpdates[name] = resolvedUpdate;
-                        this.packageUpdates[name] = resolvedUpdate;
-                    }
+                Object.assign(filteredUpdates, await this.applyPackageJsonUpdate(packageToCheck.package, packageUpdateKey, packageUpdate));
+            }
+            await Promise.all(Object.entries(filteredUpdates).map(([name, update]) => this.buildPackageJsonUpdates(name, update)));
+        }
+    }
+    async applyPackageJsonUpdate(sourcePackage, packageUpdateKey, packageUpdate) {
+        const appliedKey = JSON.stringify([sourcePackage, packageUpdateKey]);
+        if (this.appliedPackageJsonUpdates.has(appliedKey)) {
+            this.pendingPackageJsonUpdates.delete(appliedKey);
+            return {};
+        }
+        if (!this.areRequirementsMet(packageUpdate.requires) ||
+            this.areIncompatiblePackagesPresent(packageUpdate.incompatibleWith)) {
+            this.pendingPackageJsonUpdates.set(appliedKey, {
+                package: sourcePackage,
+                key: packageUpdateKey,
+                update: packageUpdate,
+            });
+            return {};
+        }
+        this.pendingPackageJsonUpdates.delete(appliedKey);
+        if (this.interactive &&
+            !(await this.runPackageJsonUpdatesConfirmationPrompt(packageUpdate, packageUpdateKey, sourcePackage))) {
+            return {};
+        }
+        this.appliedPackageJsonUpdates.add(appliedKey);
+        const updateEntries = Object.entries(packageUpdate.packages);
+        // Validate all up front so invalid metadata fails fast, before any
+        // resolution does I/O.
+        for (const [name, update] of updateEntries) {
+            this.validatePackageUpdateVersion(sourcePackage, name, update);
+        }
+        const filteredUpdates = {};
+        // Resolve serially: resolution can prompt (pnpm strict cooldown) and append
+        // to minimumReleaseAgeExclude, so a serial loop avoids overlapping prompts
+        // and keeps packageUpdates ordering stable.
+        for (const [name, update] of updateEntries) {
+            const resolvedUpdate = {
+                ...update,
+                version: await this.resolveVersionForCascade(name, update.version),
+            };
+            this.addPackageUpdate(name, resolvedUpdate);
+            filteredUpdates[name] = this.packageUpdates[name];
+        }
+        return filteredUpdates;
+    }
+    async applyPendingPackageJsonUpdates() {
+        while (this.pendingPackageJsonUpdates.size) {
+            let applied = false;
+            const filteredUpdates = {};
+            for (const pending of [...this.pendingPackageJsonUpdates.values()]) {
+                const updates = await this.applyPackageJsonUpdate(pending.package, pending.key, pending.update);
+                if (Object.keys(updates).length) {
+                    applied = true;
+                    Object.assign(filteredUpdates, updates);
                 }
             }
+            if (!applied) {
+                return;
+            }
             await Promise.all(Object.entries(filteredUpdates).map(([name, update]) => this.buildPackageJsonUpdates(name, update)));
         }
     }
@@ -411,7 +451,7 @@ class Migrator {
     }
     addPackageUpdate(name, packageUpdate) {
         if (!this.packageUpdates[name] ||
-            this.gt(packageUpdate.version, this.packageUpdates[name].version)) {
+            !this.lt(packageUpdate.version, this.packageUpdates[name].version)) {
             this.packageUpdates[name] = packageUpdate;
         }
     }
@@ -1387,7 +1427,7 @@ async function formatCatalogDefinitionFiles(manager, root) {
             content: (0, fs_1.readFileSync)(absolutePath, 'utf-8'),
         };
     });
-    const results = await (0, format_changed_files_with_prettier_if_available_1.formatFilesWithPrettierIfAvailable)(catalogDefinitionFiles.map(({ path, content }) => ({ path, content })), root, { silent: true });
+    const results = await (0, format_changed_files_1.formatFileContents)(catalogDefinitionFiles.map(({ path, content }) => ({ path, content })), root, { silent: true });
     for (const { path, absolutePath, content } of catalogDefinitionFiles) {
         (0, fs_1.writeFileSync)(absolutePath, results.has(path) ? results.get(path) : content, { encoding: 'utf-8' });
     }

package/dist/src/command-line/release/version.js

@@ -9,7 +9,7 @@ const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
 const nx_json_1 = require("../../config/nx-json");
 const run_commands_impl_1 = require("../../executors/run-commands/run-commands.impl");
-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 tree_1 = require("../../generators/tree");
 const file_map_utils_1 = require("../../project-graph/file-map-utils");
 const project_graph_1 = require("../../project-graph/project-graph");
@@ -178,7 +178,7 @@ function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
         const manifestsToExcludeFromFormatting = new Set(Array.from(releaseGraph.projectsToVersionActions.values()).flatMap((versionActions) => versionActions.excludeManifestsFromFormatting
             ? versionActions.manifestsToUpdate.map(({ manifestPath }) => manifestPath)
             : []));
-        await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree, {
+        await (0, format_changed_files_1.formatChangedFiles)(tree, {
             silent: true,
             excludePaths: manifestsToExcludeFromFormatting,
         });

package/dist/src/daemon/client/client.js

@@ -180,12 +180,21 @@ class DaemonClient {
         return await this.sendToDaemonViaQueue({ type: 'REQUEST_FILE_DATA' });
     }
     hashTasks(runnerOptions, tasks, taskGraph, perTaskEnvs, cwd, collectInputs) {
+        // Task results get written back onto these task objects as the run
+        // progresses — hash/hashDetails/timestamps by hashing and the
+        // orchestrator, terminalOutput by the Nx Cloud life cycle (untyped) —
+        // so a later message would otherwise re-ship every earlier result.
+        const trimmedTasks = {};
+        for (const [id, t] of Object.entries(taskGraph.tasks)) {
+            const { hash, hashDetails, startTime, endTime, terminalOutput, ...strippedTask } = t;
+            trimmedTasks[id] = strippedTask;
+        }
         return this.sendToDaemonViaQueue({
             type: 'HASH_TASKS',
             runnerOptions,
             perTaskEnvs,
-            tasks,
-            taskGraph,
+            tasks: tasks.map((t) => trimmedTasks[t.id]),
+            taskGraph: { ...taskGraph, tasks: trimmedTasks },
             cwd,
             collectInputs,
         });

package/dist/src/devkit-internals.d.ts

@@ -27,7 +27,7 @@ export { readProjectConfigurationsFromRootMap } from './project-graph/utils/proj
 export { findMatchingConfigFiles } from './project-graph/utils/project-configuration-utils';
 export { findMatchingProjects } from './utils/find-matching-projects';
 export { readTargetDefaultsForTarget } from './project-graph/utils/project-configuration/target-defaults';
-export { createGitIgnoreChecker, createPrettierIgnoreChecker, type TreeIgnoreChecker, } from './utils/ignore';
+export { createGitIgnoreChecker, createOxfmtIgnoreChecker, createPrettierIgnoreChecker, type TreeIgnoreChecker, } from './utils/ignore';
 export { splitTarget } from './utils/split-target';
 export { selectPrompt, multiselectPrompt, textPrompt, confirmationPrompt, type Choice as PromptChoice, } from './utils/prompt-helpers';
 export { combineOptionsForExecutor } from './utils/params';
@@ -44,7 +44,10 @@ export * from './project-graph/error-types';
 export { registerTsProject, loadTsFile, forceRegisterEsmLoader, requireWithTsconfigFallback, } from './plugins/js/utils/register';
 export { interpolate } from './tasks-runner/utils';
 export { isCI } from './utils/is-ci';
-export { isUsingPrettierInTree } from './utils/is-using-prettier';
+export { isUsingPrettierInTree, prettierConfigFiles, } from './utils/formatters/prettier';
+export { detectFormatter, detectFormatterInTree } from './utils/formatters';
+export type { FormatterType } from './utils/formatters';
+export { formatFilesWithOxfmt, oxfmtConfigFiles, } from './utils/formatters/oxfmt';
 export { readYamlFile } from './utils/fileutils';
 export { globalSpinner } from './utils/spinner';
 export { signalToCode } from './utils/exit-codes';

package/dist/src/devkit-internals.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImplementationResolutionError = exports.resolveSchema = exports.resolveImplementation = exports.emitPluginWorkerLog = exports.safeWriteFileCache = exports.PluginCache = exports.handleImport = exports.signalToCode = exports.globalSpinner = exports.readYamlFile = exports.isUsingPrettierInTree = exports.isCI = exports.interpolate = exports.requireWithTsconfigFallback = exports.forceRegisterEsmLoader = exports.loadTsFile = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappings = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashMultiGlobWithWorkspaceContext = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.installPackageToTmpAsync = exports.installPackageToTmp = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.confirmationPrompt = exports.textPrompt = exports.multiselectPrompt = exports.selectPrompt = exports.splitTarget = exports.createPrettierIgnoreChecker = exports.createGitIgnoreChecker = exports.readTargetDefaultsForTarget = exports.findMatchingProjects = exports.findMatchingConfigFiles = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.parseExecutor = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
-exports.isWholeFileChange = exports.isLockFileChange = exports.isDeletedFileChange = exports.defaultFileRead = exports.calculateFileChanges = exports.WholeFileChange = exports.TEN_MEGABYTES = exports.LockFileChange = exports.DeletedFileChange = exports.buildPackageJsonWorkspacesMatcher = exports.buildPackageJsonPatterns = exports.getGlobPatternsFromPackageManagerWorkspaces = exports.registerTsConfigPaths = exports.getWorkspacePackagesFromGraph = exports.isBuiltinModuleImport = exports.TargetProjectLocator = exports.findProjectsNpmDependencies = exports.createPackageJson = exports.getLockFileName = exports.createLockFile = exports.createNxCloudOnboardingURL = exports.getNxCloudAppOnBoardingUrl = exports.createNxCloudOnboardingURLForWelcomeApp = exports.connectToNxCloud = exports.killProcessTreeGraceful = exports.getTargetInputs = exports.filterUsingGlobPatterns = exports.hashFile = exports.getRelativeProjectJsonSchemaPath = exports.FsTree = exports.LARGE_BUFFER = exports.daemonClient = exports.isProjectGraphProjectNode = exports.isProjectGraphExternalNode = exports.fileDataDepType = exports.fileDataDepTarget = exports.BatchFunctionRunner = exports.getGeneratorInformation = exports.setupAiAgentsGenerator = exports.toOldFormat = exports.toNewFormat = exports.runCommandsExecutor = exports.acknowledgeBuildScripts = exports.getCatalogDependenciesFromPackageJson = exports.getCatalogManager = exports.checkFilesAreOutputs = exports.checkFilesAreInputs = exports.PromptResolutionError = exports.resolvePrompt = exports.SchemaResolutionError = void 0;
-exports.getNxRequirePaths = exports.combineGlobPatterns = exports.getLatestCommitSha = exports.readFileIfExisting = exports.isRelativePath = exports.fileExists = exports.directoryExists = exports.createDirectory = exports.deduceDefaultBase = exports.codeFrameColumns = exports.runNxSync = exports.workspaceDataDirectory = exports.getLastValueFromAsyncIterableIterator = exports.validateOutputs = exports.unparse = exports.transformLegacyOutputs = exports.shouldStreamOutput = exports.removeTasksFromTaskGraph = exports.readProjectAndTargetFromTargetString = exports.normalizeTargetDependencyWithStringProjects = exports.normalizeDependencyConfigProjects = exports.normalizeDependencyConfigDefinition = exports.isCacheableTask = exports.getUnparsedOverrideArgs = exports.getTargetConfigurationForTask = exports.getSerializedArgsForTask = exports.getPrintableCommandArgsForTask = exports.getOutputs = exports.getExecutorNameForTask = exports.getExecutorForTask = exports.getDependencyConfigs = exports.getCustomHasher = exports.getCliPath = exports.expandWildcardTargetConfiguration = exports.expandInitiatingTasksThroughNoop = exports.expandDependencyConfigSyntaxSugar = exports.createTaskId = exports.calculateReverseDeps = exports.createRunManyDynamicOutputRenderer = exports.CompositeLifeCycle = exports.RemoteCacheV2 = exports.Cache = exports.readCachedProjectConfiguration = exports.preventRecursionInGraphConstruction = exports.handleProjectGraphError = exports.createProjectGraphAndSourceMapsAsync = exports.buildProjectGraphAndSourceMapsWithoutDaemon = exports.isNpmProject = exports.readFileMapCache = exports.readPackageJson = void 0;
-exports.safeSpawn = exports.safeExecFileSync = exports.workspaceRootInner = exports.setWorkspaceRoot = exports.setupWorkspaceContext = exports.resetWorkspaceContext = exports.globWithWorkspaceContext = exports.getFilesInDirectoryUsingContext = exports.nxVersion = exports.SyncError = exports.getSourceDirOfDependentProjects = exports.findAllProjectNodeDependencies = exports.findInstalledPlugins = exports.deriveGroupNameFromTarget = exports.readNxMigrateConfig = exports.isNxCloudUsed = exports.getNxCloudUrl = exports.orange = exports.NX_PREFIX = void 0;
+exports.handleImport = exports.signalToCode = exports.globalSpinner = exports.readYamlFile = exports.oxfmtConfigFiles = exports.formatFilesWithOxfmt = exports.detectFormatterInTree = exports.detectFormatter = exports.prettierConfigFiles = exports.isUsingPrettierInTree = exports.isCI = exports.interpolate = exports.requireWithTsconfigFallback = exports.forceRegisterEsmLoader = exports.loadTsFile = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappings = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashMultiGlobWithWorkspaceContext = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.installPackageToTmpAsync = exports.installPackageToTmp = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.confirmationPrompt = exports.textPrompt = exports.multiselectPrompt = exports.selectPrompt = exports.splitTarget = exports.createPrettierIgnoreChecker = exports.createOxfmtIgnoreChecker = exports.createGitIgnoreChecker = exports.readTargetDefaultsForTarget = exports.findMatchingProjects = exports.findMatchingConfigFiles = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.parseExecutor = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
+exports.TEN_MEGABYTES = exports.LockFileChange = exports.DeletedFileChange = exports.buildPackageJsonWorkspacesMatcher = exports.buildPackageJsonPatterns = exports.getGlobPatternsFromPackageManagerWorkspaces = exports.registerTsConfigPaths = exports.getWorkspacePackagesFromGraph = exports.isBuiltinModuleImport = exports.TargetProjectLocator = exports.findProjectsNpmDependencies = exports.createPackageJson = exports.getLockFileName = exports.createLockFile = exports.createNxCloudOnboardingURL = exports.getNxCloudAppOnBoardingUrl = exports.createNxCloudOnboardingURLForWelcomeApp = exports.connectToNxCloud = exports.killProcessTreeGraceful = exports.getTargetInputs = exports.filterUsingGlobPatterns = exports.hashFile = exports.getRelativeProjectJsonSchemaPath = exports.FsTree = exports.LARGE_BUFFER = exports.daemonClient = exports.isProjectGraphProjectNode = exports.isProjectGraphExternalNode = exports.fileDataDepType = exports.fileDataDepTarget = exports.BatchFunctionRunner = exports.getGeneratorInformation = exports.setupAiAgentsGenerator = exports.toOldFormat = exports.toNewFormat = exports.runCommandsExecutor = exports.acknowledgeBuildScripts = exports.getCatalogDependenciesFromPackageJson = exports.getCatalogManager = exports.checkFilesAreOutputs = exports.checkFilesAreInputs = exports.PromptResolutionError = exports.resolvePrompt = exports.SchemaResolutionError = exports.ImplementationResolutionError = exports.resolveSchema = exports.resolveImplementation = exports.emitPluginWorkerLog = exports.safeWriteFileCache = exports.PluginCache = void 0;
+exports.directoryExists = exports.createDirectory = exports.deduceDefaultBase = exports.codeFrameColumns = exports.runNxSync = exports.workspaceDataDirectory = exports.getLastValueFromAsyncIterableIterator = exports.validateOutputs = exports.unparse = exports.transformLegacyOutputs = exports.shouldStreamOutput = exports.removeTasksFromTaskGraph = exports.readProjectAndTargetFromTargetString = exports.normalizeTargetDependencyWithStringProjects = exports.normalizeDependencyConfigProjects = exports.normalizeDependencyConfigDefinition = exports.isCacheableTask = exports.getUnparsedOverrideArgs = exports.getTargetConfigurationForTask = exports.getSerializedArgsForTask = exports.getPrintableCommandArgsForTask = exports.getOutputs = exports.getExecutorNameForTask = exports.getExecutorForTask = exports.getDependencyConfigs = exports.getCustomHasher = exports.getCliPath = exports.expandWildcardTargetConfiguration = exports.expandInitiatingTasksThroughNoop = exports.expandDependencyConfigSyntaxSugar = exports.createTaskId = exports.calculateReverseDeps = exports.createRunManyDynamicOutputRenderer = exports.CompositeLifeCycle = exports.RemoteCacheV2 = exports.Cache = exports.readCachedProjectConfiguration = exports.preventRecursionInGraphConstruction = exports.handleProjectGraphError = exports.createProjectGraphAndSourceMapsAsync = exports.buildProjectGraphAndSourceMapsWithoutDaemon = exports.isNpmProject = exports.readFileMapCache = exports.readPackageJson = exports.isWholeFileChange = exports.isLockFileChange = exports.isDeletedFileChange = exports.defaultFileRead = exports.calculateFileChanges = exports.WholeFileChange = void 0;
+exports.safeSpawn = exports.safeExecFileSync = exports.workspaceRootInner = exports.setWorkspaceRoot = exports.setupWorkspaceContext = exports.resetWorkspaceContext = exports.globWithWorkspaceContext = exports.getFilesInDirectoryUsingContext = exports.nxVersion = exports.SyncError = exports.getSourceDirOfDependentProjects = exports.findAllProjectNodeDependencies = exports.findInstalledPlugins = exports.deriveGroupNameFromTarget = exports.readNxMigrateConfig = exports.isNxCloudUsed = exports.getNxCloudUrl = exports.orange = exports.NX_PREFIX = exports.getNxRequirePaths = exports.combineGlobPatterns = exports.getLatestCommitSha = exports.readFileIfExisting = exports.isRelativePath = exports.fileExists = void 0;
 const tslib_1 = require("tslib");
 /**
  * Note to developers: STOP! These are nx internals, not part of the public
@@ -52,6 +52,7 @@ Object.defineProperty(exports, "readTargetDefaultsForTarget", { enumerable: true
 // them.
 var ignore_1 = require("./utils/ignore");
 Object.defineProperty(exports, "createGitIgnoreChecker", { enumerable: true, get: function () { return ignore_1.createGitIgnoreChecker; } });
+Object.defineProperty(exports, "createOxfmtIgnoreChecker", { enumerable: true, get: function () { return ignore_1.createOxfmtIgnoreChecker; } });
 Object.defineProperty(exports, "createPrettierIgnoreChecker", { enumerable: true, get: function () { return ignore_1.createPrettierIgnoreChecker; } });
 var split_target_1 = require("./utils/split-target");
 Object.defineProperty(exports, "splitTarget", { enumerable: true, get: function () { return split_target_1.splitTarget; } });
@@ -95,8 +96,15 @@ 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; } });
-var is_using_prettier_1 = require("./utils/is-using-prettier");
-Object.defineProperty(exports, "isUsingPrettierInTree", { enumerable: true, get: function () { return is_using_prettier_1.isUsingPrettierInTree; } });
+var prettier_1 = require("./utils/formatters/prettier");
+Object.defineProperty(exports, "isUsingPrettierInTree", { enumerable: true, get: function () { return prettier_1.isUsingPrettierInTree; } });
+Object.defineProperty(exports, "prettierConfigFiles", { enumerable: true, get: function () { return prettier_1.prettierConfigFiles; } });
+var formatters_1 = require("./utils/formatters");
+Object.defineProperty(exports, "detectFormatter", { enumerable: true, get: function () { return formatters_1.detectFormatter; } });
+Object.defineProperty(exports, "detectFormatterInTree", { enumerable: true, get: function () { return formatters_1.detectFormatterInTree; } });
+var oxfmt_1 = require("./utils/formatters/oxfmt");
+Object.defineProperty(exports, "formatFilesWithOxfmt", { enumerable: true, get: function () { return oxfmt_1.formatFilesWithOxfmt; } });
+Object.defineProperty(exports, "oxfmtConfigFiles", { enumerable: true, get: function () { return oxfmt_1.oxfmtConfigFiles; } });
 var fileutils_1 = require("./utils/fileutils");
 Object.defineProperty(exports, "readYamlFile", { enumerable: true, get: function () { return fileutils_1.readYamlFile; } });
 var spinner_1 = require("./utils/spinner");

package/dist/src/generators/internal-utils/{format-changed-files-with-prettier-if-available.d.ts → format-changed-files.d.ts}

@@ -1,14 +1,14 @@
 import type { Tree } from '../tree';
 /**
- * Formats all the created or updated files using Prettier
+ * Formats all the created or updated files using the configured formatter
  * @param tree - the file system tree
  *
  * @remarks
- * Set the environment variable `NX_SKIP_FORMAT` to `true` to skip Prettier
- * formatting. This is useful for repositories that use alternative formatters
- * like Biome, dprint, or have custom formatting requirements.
+ * Set the environment variable `NX_SKIP_FORMAT` to `true` to skip
+ * formatting. This is useful for repositories that format with a tool Nx does
+ * not drive (Biome, dprint) or that have custom formatting requirements.
  */
-export declare function formatChangedFilesWithPrettierIfAvailable(tree: Tree, options?: {
+export declare function formatChangedFiles(tree: Tree, options?: {
     silent?: boolean;
     /**
      * Tree-relative paths to leave untouched. Both platform-native and
@@ -16,7 +16,7 @@ export declare function formatChangedFilesWithPrettierIfAvailable(tree: Tree, op
      */
     excludePaths?: Set<string>;
 }): Promise<void>;
-export declare function formatFilesWithPrettierIfAvailable(files: {
+export declare function formatFileContents(files: {
     path: string;
     content: string | Buffer;
 }[], root: string, options?: {