@bleedingdev/modern-js-create 3.4.0-ultramodern.13 → 3.4.0-ultramodern.15

package/dist/cjs/ultramodern-workspace/add-vertical.cjs

@@ -589,9 +589,9 @@ function addUltramodernVertical(options) {
         },
         ...updatedVerticals
     ]));
-    const afterFiles = (0, external_generation_result_cjs_namespaceObject.createFileSnapshot)(options.workspaceRoot);
-    const { createdPaths, rewrittenPaths } = (0, external_generation_result_cjs_namespaceObject.diffFileSnapshots)(beforeFiles, afterFiles);
-    const result = (0, external_generation_result_cjs_namespaceObject.createGenerationResult)({
+    const preliminaryAfterFiles = (0, external_generation_result_cjs_namespaceObject.createFileSnapshot)(options.workspaceRoot);
+    const preliminaryDiff = (0, external_generation_result_cjs_namespaceObject.diffFileSnapshots)(beforeFiles, preliminaryAfterFiles);
+    const preliminaryResult = (0, external_generation_result_cjs_namespaceObject.createGenerationResult)({
         operation: 'vertical',
         workspaceRoot: options.workspaceRoot,
         packageScope: scope,
@@ -599,15 +599,33 @@ function addUltramodernVertical(options) {
         createdApps: [
             vertical
         ],
-        createdPaths,
-        rewrittenPaths
+        createdPaths: preliminaryDiff.createdPaths,
+        rewrittenPaths: preliminaryDiff.rewrittenPaths
     });
     (0, external_overlays_cjs_namespaceObject.runCodeSmithOverlays)({
         workspaceRoot: options.workspaceRoot,
         overlays: options.overlays,
-        result
+        result: preliminaryResult
+    });
+    const afterOverlaysFiles = (0, external_generation_result_cjs_namespaceObject.createFileSnapshot)(options.workspaceRoot);
+    const changedPaths = (0, external_generation_result_cjs_namespaceObject.diffFileSnapshots)(beforeFiles, afterOverlaysFiles);
+    (0, external_fs_io_cjs_namespaceObject.formatGeneratedWorkspaceFiles)(options.workspaceRoot, [
+        ...changedPaths.createdPaths,
+        ...changedPaths.rewrittenPaths
+    ]);
+    const afterFiles = (0, external_generation_result_cjs_namespaceObject.createFileSnapshot)(options.workspaceRoot);
+    const { createdPaths, rewrittenPaths } = (0, external_generation_result_cjs_namespaceObject.diffFileSnapshots)(beforeFiles, afterFiles);
+    return (0, external_generation_result_cjs_namespaceObject.createGenerationResult)({
+        operation: 'vertical',
+        workspaceRoot: options.workspaceRoot,
+        packageScope: scope,
+        packageSource,
+        createdApps: [
+            vertical
+        ],
+        createdPaths,
+        rewrittenPaths
     });
-    return result;
 }
 exports.addShellWorkspaceDependency = __webpack_exports__.addShellWorkspaceDependency;
 exports.addShellZephyrDependency = __webpack_exports__.addShellZephyrDependency;

package/dist/cjs/ultramodern-workspace/fs-io.cjs

@@ -46,6 +46,7 @@ __webpack_require__.d(__webpack_exports__, {
     createPackageRoot: ()=>createPackageRoot,
     ensureInsideRoot: ()=>ensureInsideRoot,
     fileTemplatesDir: ()=>fileTemplatesDir,
+    formatGeneratedWorkspaceFiles: ()=>formatGeneratedWorkspaceFiles,
     hashFile: ()=>hashFile,
     hashTemplateTree: ()=>hashTemplateTree,
     readFileTemplate: ()=>readFileTemplate,
@@ -58,19 +59,53 @@ __webpack_require__.d(__webpack_exports__, {
     writeJson: ()=>writeJson,
     writeJsonFile: ()=>writeJsonFile
 });
+const external_node_child_process_namespaceObject = require("node:child_process");
 const external_node_crypto_namespaceObject = require("node:crypto");
 var external_node_crypto_default = /*#__PURE__*/ __webpack_require__.n(external_node_crypto_namespaceObject);
 const external_node_fs_namespaceObject = require("node:fs");
 var external_node_fs_default = /*#__PURE__*/ __webpack_require__.n(external_node_fs_namespaceObject);
+const external_node_module_namespaceObject = require("node:module");
 const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
 const external_node_url_namespaceObject = require("node:url");
 const external_create_package_root_cjs_namespaceObject = require("../create-package-root.cjs");
 const external_naming_cjs_namespaceObject = require("./naming.cjs");
 const fs_io_dirname = external_node_path_default().dirname((0, external_node_url_namespaceObject.fileURLToPath)(__rslib_import_meta_url__));
+const fs_io_require = (0, external_node_module_namespaceObject.createRequire)(__rslib_import_meta_url__);
 const createPackageRoot = (0, external_create_package_root_cjs_namespaceObject.resolveCreatePackageRoot)(fs_io_dirname);
 const workspaceTemplateDir = external_node_path_default().join(createPackageRoot, 'template-workspace');
 const fileTemplatesDir = external_node_path_default().join(createPackageRoot, 'templates');
+const preformatConfigDir = '.modern-js';
+const preformatConfigPath = external_node_path_default().join(preformatConfigDir, 'ultramodern-preformat.oxfmt.config.mjs');
+const workspaceOxfmtIgnorePatterns = [
+    '.agents',
+    '.codex/skills',
+    '.output',
+    '**/*.json',
+    'dist',
+    'node_modules',
+    'repos/**',
+    '.modern',
+    '.modernjs',
+    '**/modern-tanstack/**',
+    '**/routeTree.gen.*'
+];
+const formattableExtensions = new Set([
+    '.cjs',
+    '.cts',
+    '.js',
+    '.json',
+    '.jsonc',
+    '.jsx',
+    '.mjs',
+    '.mts',
+    '.md',
+    '.mdx',
+    '.ts',
+    '.tsx',
+    '.yaml',
+    '.yml'
+]);
 function readFileTemplate(relativePath) {
     return external_node_fs_default().readFileSync(external_node_path_default().join(fileTemplatesDir, relativePath), 'utf-8');
 }
@@ -106,6 +141,86 @@ function writeFileReplacing(targetDir, relativePath, content) {
 function writeJson(targetDir, relativePath, value) {
     writeFile(targetDir, relativePath, `${JSON.stringify(value, null, 2)}\n`);
 }
+function formatGeneratedWorkspaceFiles(targetDir, relativePaths) {
+    const oxfmtBin = resolveOxfmtBin();
+    const oxfmtConfigPath = writePreformatConfig(targetDir);
+    const targets = void 0 === relativePaths ? [
+        targetDir,
+        `!${(0, external_naming_cjs_namespaceObject.normalizePath)(external_node_path_default().join(targetDir, 'repos'))}/**`
+    ] : relativePaths.filter((relativePath)=>formattableExtensions.has(external_node_path_default().extname(relativePath))).map((relativePath)=>external_node_path_default().join(targetDir, relativePath));
+    if (0 === targets.length) return void removePreformatConfig(targetDir);
+    try {
+        const result = (0, external_node_child_process_namespaceObject.spawnSync)(process.execPath, [
+            oxfmtBin,
+            '--config',
+            oxfmtConfigPath,
+            '--no-error-on-unmatched-pattern',
+            ...targets
+        ], {
+            cwd: targetDir,
+            encoding: 'utf-8',
+            env: {
+                ...process.env,
+                FORCE_COLOR: '0'
+            }
+        });
+        if (0 !== result.status) {
+            const detail = [
+                result.stderr.trim(),
+                result.stdout.trim()
+            ].filter(Boolean).join('\n');
+            throw new Error([
+                'Failed to format generated UltraModern workspace output.',
+                detail
+            ].filter(Boolean).join('\n'));
+        }
+    } finally{
+        removePreformatConfig(targetDir);
+    }
+}
+function writePreformatConfig(targetDir) {
+    const configPath = external_node_path_default().join(targetDir, preformatConfigPath);
+    external_node_fs_default().mkdirSync(external_node_path_default().dirname(configPath), {
+        recursive: true
+    });
+    const oxfmtUrl = (0, external_node_url_namespaceObject.pathToFileURL)(resolveOxfmtEntry()).href;
+    const ultraciteConfigUrl = (0, external_node_url_namespaceObject.pathToFileURL)(resolveUltraciteOxfmtConfig()).href;
+    external_node_fs_default().writeFileSync(configPath, [
+        `import { defineConfig } from ${JSON.stringify(oxfmtUrl)};`,
+        `import ultracite from ${JSON.stringify(ultraciteConfigUrl)};`,
+        '',
+        'export default defineConfig({',
+        '  extends: [ultracite],',
+        '  ignorePatterns: [',
+        ...workspaceOxfmtIgnorePatterns.map((pattern)=>`    ${JSON.stringify(pattern)},`),
+        '  ],',
+        '  singleQuote: true,',
+        '});',
+        ''
+    ].join('\n'), 'utf-8');
+    return configPath;
+}
+function removePreformatConfig(targetDir) {
+    external_node_fs_default().rmSync(external_node_path_default().join(targetDir, preformatConfigPath), {
+        force: true
+    });
+    try {
+        external_node_fs_default().rmdirSync(external_node_path_default().join(targetDir, preformatConfigDir));
+    } catch  {}
+}
+function resolveOxfmtBin() {
+    const packageJsonPath = fs_io_require.resolve('oxfmt/package.json');
+    const packageJson = JSON.parse(external_node_fs_default().readFileSync(packageJsonPath, 'utf-8'));
+    const binPath = 'string' == typeof packageJson.bin ? packageJson.bin : packageJson.bin?.oxfmt;
+    if ('string' != typeof binPath || 0 === binPath.length) throw new Error('Unable to resolve oxfmt binary from package metadata.');
+    return external_node_path_default().join(external_node_path_default().dirname(packageJsonPath), binPath);
+}
+function resolveOxfmtEntry() {
+    return fs_io_require.resolve('oxfmt');
+}
+function resolveUltraciteOxfmtConfig() {
+    return fs_io_require.resolve('ultracite/oxfmt');
+}
 function renderTemplate(template, data) {
     return template.replace(/\{\{(\w+)\}\}/g, (match, key)=>data[key] ?? match);
 }
@@ -156,6 +271,7 @@ exports.copyRootTemplate = __webpack_exports__.copyRootTemplate;
 exports.createPackageRoot = __webpack_exports__.createPackageRoot;
 exports.ensureInsideRoot = __webpack_exports__.ensureInsideRoot;
 exports.fileTemplatesDir = __webpack_exports__.fileTemplatesDir;
+exports.formatGeneratedWorkspaceFiles = __webpack_exports__.formatGeneratedWorkspaceFiles;
 exports.hashFile = __webpack_exports__.hashFile;
 exports.hashTemplateTree = __webpack_exports__.hashTemplateTree;
 exports.readFileTemplate = __webpack_exports__.readFileTemplate;
@@ -174,6 +290,7 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "createPackageRoot",
     "ensureInsideRoot",
     "fileTemplatesDir",
+    "formatGeneratedWorkspaceFiles",
     "hashFile",
     "hashTemplateTree",
     "readFileTemplate",

package/dist/cjs/ultramodern-workspace/write-workspace.cjs

@@ -192,23 +192,34 @@ function generateUltramodernWorkspace(options) {
     for (const remote of initialVerticals)writeApp(options.targetDir, scope, remote, packageSource, enableTailwind, initialVerticals, bridge);
     writeSharedPackages(options.targetDir, scope);
     (0, external_workspace_scripts_cjs_namespaceObject.writeGeneratedWorkspaceScripts)(options.targetDir, scope, enableTailwind, initialVerticals);
-    const afterFiles = (0, external_generation_result_cjs_namespaceObject.createFileSnapshot)(options.targetDir);
-    const { createdPaths, rewrittenPaths } = (0, external_generation_result_cjs_namespaceObject.diffFileSnapshots)(beforeFiles, afterFiles);
-    const result = (0, external_generation_result_cjs_namespaceObject.createGenerationResult)({
+    const preliminaryAfterFiles = (0, external_generation_result_cjs_namespaceObject.createFileSnapshot)(options.targetDir);
+    const preliminaryDiff = (0, external_generation_result_cjs_namespaceObject.diffFileSnapshots)(beforeFiles, preliminaryAfterFiles);
+    const preliminaryResult = (0, external_generation_result_cjs_namespaceObject.createGenerationResult)({
         operation: 'workspace',
         workspaceRoot: options.targetDir,
         packageScope: scope,
         packageSource,
         createdApps,
-        createdPaths,
-        rewrittenPaths
+        createdPaths: preliminaryDiff.createdPaths,
+        rewrittenPaths: preliminaryDiff.rewrittenPaths
     });
     (0, external_overlays_cjs_namespaceObject.runCodeSmithOverlays)({
         workspaceRoot: options.targetDir,
         overlays: options.overlays,
-        result
+        result: preliminaryResult
+    });
+    (0, external_fs_io_cjs_namespaceObject.formatGeneratedWorkspaceFiles)(options.targetDir);
+    const afterFiles = (0, external_generation_result_cjs_namespaceObject.createFileSnapshot)(options.targetDir);
+    const { createdPaths, rewrittenPaths } = (0, external_generation_result_cjs_namespaceObject.diffFileSnapshots)(beforeFiles, afterFiles);
+    return (0, external_generation_result_cjs_namespaceObject.createGenerationResult)({
+        operation: 'workspace',
+        workspaceRoot: options.targetDir,
+        packageScope: scope,
+        packageSource,
+        createdApps,
+        createdPaths,
+        rewrittenPaths
     });
-    return result;
 }
 exports.createCompactUltramodernConfig = __webpack_exports__.createCompactUltramodernConfig;
 exports.generateUltramodernWorkspace = __webpack_exports__.generateUltramodernWorkspace;

package/dist/esm/ultramodern-workspace/add-vertical.js

@@ -7,7 +7,7 @@ import { createAppEnvDts, createAppRuntimeConfig, createShellFrameComponent } fr
 import { createShellPage, createShellRemoteComponents } from "./demo-components.js";
 import { GENERATED_CONTRACT_PATH, ULTRAMODERN_CONFIG_PATH, appHasEffectApi, appI18nNamespace, createModuleFederationRemoteContracts, createNeutralOwnership, createRemoteManifestEnv, createShellHost, createVerticalDescriptor, effectApiPrefix, remoteDependencyAlias, shellApp, zephyrRemoteDependency } from "./descriptors.js";
 import { createShellEffectClient, effectApiTopologyMetadata } from "./effect-api.js";
-import { readJsonFile, writeFileReplacing, writeJsonFile } from "./fs-io.js";
+import { formatGeneratedWorkspaceFiles, readJsonFile, writeFileReplacing, writeJsonFile } from "./fs-io.js";
 import { createFileSnapshot, createGenerationResult, diffFileSnapshots } from "./generation-result.js";
 import { createAppPublicLocaleMessages } from "./locales.js";
 import { createShellModuleFederationConfig } from "./module-federation.js";
@@ -530,9 +530,9 @@ function addUltramodernVertical(options) {
         },
         ...updatedVerticals
     ]));
-    const afterFiles = createFileSnapshot(options.workspaceRoot);
-    const { createdPaths, rewrittenPaths } = diffFileSnapshots(beforeFiles, afterFiles);
-    const result = createGenerationResult({
+    const preliminaryAfterFiles = createFileSnapshot(options.workspaceRoot);
+    const preliminaryDiff = diffFileSnapshots(beforeFiles, preliminaryAfterFiles);
+    const preliminaryResult = createGenerationResult({
         operation: 'vertical',
         workspaceRoot: options.workspaceRoot,
         packageScope: scope,
@@ -540,14 +540,32 @@ function addUltramodernVertical(options) {
         createdApps: [
             vertical
         ],
-        createdPaths,
-        rewrittenPaths
+        createdPaths: preliminaryDiff.createdPaths,
+        rewrittenPaths: preliminaryDiff.rewrittenPaths
     });
     runCodeSmithOverlays({
         workspaceRoot: options.workspaceRoot,
         overlays: options.overlays,
-        result
+        result: preliminaryResult
+    });
+    const afterOverlaysFiles = createFileSnapshot(options.workspaceRoot);
+    const changedPaths = diffFileSnapshots(beforeFiles, afterOverlaysFiles);
+    formatGeneratedWorkspaceFiles(options.workspaceRoot, [
+        ...changedPaths.createdPaths,
+        ...changedPaths.rewrittenPaths
+    ]);
+    const afterFiles = createFileSnapshot(options.workspaceRoot);
+    const { createdPaths, rewrittenPaths } = diffFileSnapshots(beforeFiles, afterFiles);
+    return createGenerationResult({
+        operation: 'vertical',
+        workspaceRoot: options.workspaceRoot,
+        packageScope: scope,
+        packageSource,
+        createdApps: [
+            vertical
+        ],
+        createdPaths,
+        rewrittenPaths
     });
-    return result;
 }
 export { addShellWorkspaceDependency, addShellZephyrDependency, addUltramodernVertical, assertCanCreate, assertValidVerticalName, existingBridgeConfig, existingPackageSource, existingTailwindEnabled, nextAvailablePort, ownershipEntry, planUltramodernVertical, prepareAddUltramodernVertical, rewriteShellAppFiles, updateRootWorkspaceScripts, verticalTopologyEntry, verticalsFromTopology };

package/dist/esm/ultramodern-workspace/fs-io.js

@@ -1,13 +1,47 @@
+import { spawnSync } from "node:child_process";
 import node_crypto from "node:crypto";
 import node_fs from "node:fs";
+import { createRequire } from "node:module";
 import node_path from "node:path";
-import { fileURLToPath } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import { resolveCreatePackageRoot } from "../create-package-root.js";
 import { normalizePath } from "./naming.js";
 const fs_io_dirname = node_path.dirname(fileURLToPath(import.meta.url));
+const fs_io_require = createRequire(import.meta.url);
 const createPackageRoot = resolveCreatePackageRoot(fs_io_dirname);
 const workspaceTemplateDir = node_path.join(createPackageRoot, 'template-workspace');
 const fileTemplatesDir = node_path.join(createPackageRoot, 'templates');
+const preformatConfigDir = '.modern-js';
+const preformatConfigPath = node_path.join(preformatConfigDir, 'ultramodern-preformat.oxfmt.config.mjs');
+const workspaceOxfmtIgnorePatterns = [
+    '.agents',
+    '.codex/skills',
+    '.output',
+    '**/*.json',
+    'dist',
+    'node_modules',
+    'repos/**',
+    '.modern',
+    '.modernjs',
+    '**/modern-tanstack/**',
+    '**/routeTree.gen.*'
+];
+const formattableExtensions = new Set([
+    '.cjs',
+    '.cts',
+    '.js',
+    '.json',
+    '.jsonc',
+    '.jsx',
+    '.mjs',
+    '.mts',
+    '.md',
+    '.mdx',
+    '.ts',
+    '.tsx',
+    '.yaml',
+    '.yml'
+]);
 function readFileTemplate(relativePath) {
     return node_fs.readFileSync(node_path.join(fileTemplatesDir, relativePath), 'utf-8');
 }
@@ -43,6 +77,86 @@ function writeFileReplacing(targetDir, relativePath, content) {
 function writeJson(targetDir, relativePath, value) {
     writeFile(targetDir, relativePath, `${JSON.stringify(value, null, 2)}\n`);
 }
+function formatGeneratedWorkspaceFiles(targetDir, relativePaths) {
+    const oxfmtBin = resolveOxfmtBin();
+    const oxfmtConfigPath = writePreformatConfig(targetDir);
+    const targets = void 0 === relativePaths ? [
+        targetDir,
+        `!${normalizePath(node_path.join(targetDir, 'repos'))}/**`
+    ] : relativePaths.filter((relativePath)=>formattableExtensions.has(node_path.extname(relativePath))).map((relativePath)=>node_path.join(targetDir, relativePath));
+    if (0 === targets.length) return void removePreformatConfig(targetDir);
+    try {
+        const result = spawnSync(process.execPath, [
+            oxfmtBin,
+            '--config',
+            oxfmtConfigPath,
+            '--no-error-on-unmatched-pattern',
+            ...targets
+        ], {
+            cwd: targetDir,
+            encoding: 'utf-8',
+            env: {
+                ...process.env,
+                FORCE_COLOR: '0'
+            }
+        });
+        if (0 !== result.status) {
+            const detail = [
+                result.stderr.trim(),
+                result.stdout.trim()
+            ].filter(Boolean).join('\n');
+            throw new Error([
+                'Failed to format generated UltraModern workspace output.',
+                detail
+            ].filter(Boolean).join('\n'));
+        }
+    } finally{
+        removePreformatConfig(targetDir);
+    }
+}
+function writePreformatConfig(targetDir) {
+    const configPath = node_path.join(targetDir, preformatConfigPath);
+    node_fs.mkdirSync(node_path.dirname(configPath), {
+        recursive: true
+    });
+    const oxfmtUrl = pathToFileURL(resolveOxfmtEntry()).href;
+    const ultraciteConfigUrl = pathToFileURL(resolveUltraciteOxfmtConfig()).href;
+    node_fs.writeFileSync(configPath, [
+        `import { defineConfig } from ${JSON.stringify(oxfmtUrl)};`,
+        `import ultracite from ${JSON.stringify(ultraciteConfigUrl)};`,
+        '',
+        'export default defineConfig({',
+        '  extends: [ultracite],',
+        '  ignorePatterns: [',
+        ...workspaceOxfmtIgnorePatterns.map((pattern)=>`    ${JSON.stringify(pattern)},`),
+        '  ],',
+        '  singleQuote: true,',
+        '});',
+        ''
+    ].join('\n'), 'utf-8');
+    return configPath;
+}
+function removePreformatConfig(targetDir) {
+    node_fs.rmSync(node_path.join(targetDir, preformatConfigPath), {
+        force: true
+    });
+    try {
+        node_fs.rmdirSync(node_path.join(targetDir, preformatConfigDir));
+    } catch  {}
+}
+function resolveOxfmtBin() {
+    const packageJsonPath = fs_io_require.resolve('oxfmt/package.json');
+    const packageJson = JSON.parse(node_fs.readFileSync(packageJsonPath, 'utf-8'));
+    const binPath = 'string' == typeof packageJson.bin ? packageJson.bin : packageJson.bin?.oxfmt;
+    if ('string' != typeof binPath || 0 === binPath.length) throw new Error('Unable to resolve oxfmt binary from package metadata.');
+    return node_path.join(node_path.dirname(packageJsonPath), binPath);
+}
+function resolveOxfmtEntry() {
+    return fs_io_require.resolve('oxfmt');
+}
+function resolveUltraciteOxfmtConfig() {
+    return fs_io_require.resolve('ultracite/oxfmt');
+}
 function renderTemplate(template, data) {
     return template.replace(/\{\{(\w+)\}\}/g, (match, key)=>data[key] ?? match);
 }
@@ -87,4 +201,4 @@ function readJsonFile(filePath) {
 function writeJsonFile(filePath, value) {
     node_fs.writeFileSync(filePath, `${JSON.stringify(value, null, 2)}\n`, 'utf-8');
 }
-export { assertSafeRelativePath, collectTemplateFiles, copyRootTemplate, createPackageRoot, ensureInsideRoot, fileTemplatesDir, hashFile, hashTemplateTree, readFileTemplate, readJsonFile, renderFileTemplate, renderTemplate, workspaceTemplateDir, writeFile, writeFileReplacing, writeJson, writeJsonFile };
+export { assertSafeRelativePath, collectTemplateFiles, copyRootTemplate, createPackageRoot, ensureInsideRoot, fileTemplatesDir, formatGeneratedWorkspaceFiles, hashFile, hashTemplateTree, readFileTemplate, readJsonFile, renderFileTemplate, renderTemplate, workspaceTemplateDir, writeFile, writeFileReplacing, writeJson, writeJsonFile };

package/dist/esm/ultramodern-workspace/write-workspace.js

@@ -5,7 +5,7 @@ import { createDevelopmentOverlay, createOwnership, createTopology, createUltram
 import { createLayout, createRemoteEntry, createRemoteExposeComponent, createRemotePage, createShellPage, createShellRemoteComponents, remoteComponentOutputPath } from "./demo-components.js";
 import { ULTRAMODERN_CONFIG_PATH, appHasEffectApi, appI18nNamespace, createShellHost, sharedPackages, shellApp } from "./descriptors.js";
 import { createEffectClient, createEffectServiceEntry, createEffectSharedApi, createShellEffectClient } from "./effect-api.js";
-import { copyRootTemplate, writeFile, writeFileReplacing, writeJson } from "./fs-io.js";
+import { copyRootTemplate, formatGeneratedWorkspaceFiles, writeFile, writeFileReplacing, writeJson } from "./fs-io.js";
 import { createFileSnapshot, createGenerationResult, diffFileSnapshots } from "./generation-result.js";
 import { createAppPublicLocaleMessages } from "./locales.js";
 import { createAppModernConfig, createRemoteModuleFederationConfig, createShellModuleFederationConfig, createUltramodernBuildModule, createUltramodernBuildReexportModule } from "./module-federation.js";
@@ -147,22 +147,33 @@ function generateUltramodernWorkspace(options) {
     for (const remote of initialVerticals)writeApp(options.targetDir, scope, remote, packageSource, enableTailwind, initialVerticals, bridge);
     writeSharedPackages(options.targetDir, scope);
     writeGeneratedWorkspaceScripts(options.targetDir, scope, enableTailwind, initialVerticals);
-    const afterFiles = createFileSnapshot(options.targetDir);
-    const { createdPaths, rewrittenPaths } = diffFileSnapshots(beforeFiles, afterFiles);
-    const result = createGenerationResult({
+    const preliminaryAfterFiles = createFileSnapshot(options.targetDir);
+    const preliminaryDiff = diffFileSnapshots(beforeFiles, preliminaryAfterFiles);
+    const preliminaryResult = createGenerationResult({
         operation: 'workspace',
         workspaceRoot: options.targetDir,
         packageScope: scope,
         packageSource,
         createdApps,
-        createdPaths,
-        rewrittenPaths
+        createdPaths: preliminaryDiff.createdPaths,
+        rewrittenPaths: preliminaryDiff.rewrittenPaths
     });
     runCodeSmithOverlays({
         workspaceRoot: options.targetDir,
         overlays: options.overlays,
-        result
+        result: preliminaryResult
+    });
+    formatGeneratedWorkspaceFiles(options.targetDir);
+    const afterFiles = createFileSnapshot(options.targetDir);
+    const { createdPaths, rewrittenPaths } = diffFileSnapshots(beforeFiles, afterFiles);
+    return createGenerationResult({
+        operation: 'workspace',
+        workspaceRoot: options.targetDir,
+        packageScope: scope,
+        packageSource,
+        createdApps,
+        createdPaths,
+        rewrittenPaths
     });
-    return result;
 }
 export { createCompactUltramodernConfig, generateUltramodernWorkspace, writeApp, writeSharedPackages };

package/dist/esm-node/ultramodern-workspace/add-vertical.js

@@ -8,7 +8,7 @@ import { createAppEnvDts, createAppRuntimeConfig, createShellFrameComponent } fr
 import { createShellPage, createShellRemoteComponents } from "./demo-components.js";
 import { GENERATED_CONTRACT_PATH, ULTRAMODERN_CONFIG_PATH, appHasEffectApi, appI18nNamespace, createModuleFederationRemoteContracts, createNeutralOwnership, createRemoteManifestEnv, createShellHost, createVerticalDescriptor, effectApiPrefix, remoteDependencyAlias, shellApp, zephyrRemoteDependency } from "./descriptors.js";
 import { createShellEffectClient, effectApiTopologyMetadata } from "./effect-api.js";
-import { readJsonFile, writeFileReplacing, writeJsonFile } from "./fs-io.js";
+import { formatGeneratedWorkspaceFiles, readJsonFile, writeFileReplacing, writeJsonFile } from "./fs-io.js";
 import { createFileSnapshot, createGenerationResult, diffFileSnapshots } from "./generation-result.js";
 import { createAppPublicLocaleMessages } from "./locales.js";
 import { createShellModuleFederationConfig } from "./module-federation.js";
@@ -531,9 +531,9 @@ function addUltramodernVertical(options) {
         },
         ...updatedVerticals
     ]));
-    const afterFiles = createFileSnapshot(options.workspaceRoot);
-    const { createdPaths, rewrittenPaths } = diffFileSnapshots(beforeFiles, afterFiles);
-    const result = createGenerationResult({
+    const preliminaryAfterFiles = createFileSnapshot(options.workspaceRoot);
+    const preliminaryDiff = diffFileSnapshots(beforeFiles, preliminaryAfterFiles);
+    const preliminaryResult = createGenerationResult({
         operation: 'vertical',
         workspaceRoot: options.workspaceRoot,
         packageScope: scope,
@@ -541,14 +541,32 @@ function addUltramodernVertical(options) {
         createdApps: [
             vertical
         ],
-        createdPaths,
-        rewrittenPaths
+        createdPaths: preliminaryDiff.createdPaths,
+        rewrittenPaths: preliminaryDiff.rewrittenPaths
     });
     runCodeSmithOverlays({
         workspaceRoot: options.workspaceRoot,
         overlays: options.overlays,
-        result
+        result: preliminaryResult
+    });
+    const afterOverlaysFiles = createFileSnapshot(options.workspaceRoot);
+    const changedPaths = diffFileSnapshots(beforeFiles, afterOverlaysFiles);
+    formatGeneratedWorkspaceFiles(options.workspaceRoot, [
+        ...changedPaths.createdPaths,
+        ...changedPaths.rewrittenPaths
+    ]);
+    const afterFiles = createFileSnapshot(options.workspaceRoot);
+    const { createdPaths, rewrittenPaths } = diffFileSnapshots(beforeFiles, afterFiles);
+    return createGenerationResult({
+        operation: 'vertical',
+        workspaceRoot: options.workspaceRoot,
+        packageScope: scope,
+        packageSource,
+        createdApps: [
+            vertical
+        ],
+        createdPaths,
+        rewrittenPaths
     });
-    return result;
 }
 export { addShellWorkspaceDependency, addShellZephyrDependency, addUltramodernVertical, assertCanCreate, assertValidVerticalName, existingBridgeConfig, existingPackageSource, existingTailwindEnabled, nextAvailablePort, ownershipEntry, planUltramodernVertical, prepareAddUltramodernVertical, rewriteShellAppFiles, updateRootWorkspaceScripts, verticalTopologyEntry, verticalsFromTopology };

package/dist/esm-node/ultramodern-workspace/fs-io.js

@@ -1,14 +1,48 @@
 import "node:module";
+import { spawnSync } from "node:child_process";
 import node_crypto from "node:crypto";
 import node_fs from "node:fs";
+import { createRequire } from "node:module";
 import node_path from "node:path";
-import { fileURLToPath } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import { resolveCreatePackageRoot } from "../create-package-root.js";
 import { normalizePath } from "./naming.js";
 const fs_io_dirname = node_path.dirname(fileURLToPath(import.meta.url));
+const fs_io_require = createRequire(import.meta.url);
 const createPackageRoot = resolveCreatePackageRoot(fs_io_dirname);
 const workspaceTemplateDir = node_path.join(createPackageRoot, 'template-workspace');
 const fileTemplatesDir = node_path.join(createPackageRoot, 'templates');
+const preformatConfigDir = '.modern-js';
+const preformatConfigPath = node_path.join(preformatConfigDir, 'ultramodern-preformat.oxfmt.config.mjs');
+const workspaceOxfmtIgnorePatterns = [
+    '.agents',
+    '.codex/skills',
+    '.output',
+    '**/*.json',
+    'dist',
+    'node_modules',
+    'repos/**',
+    '.modern',
+    '.modernjs',
+    '**/modern-tanstack/**',
+    '**/routeTree.gen.*'
+];
+const formattableExtensions = new Set([
+    '.cjs',
+    '.cts',
+    '.js',
+    '.json',
+    '.jsonc',
+    '.jsx',
+    '.mjs',
+    '.mts',
+    '.md',
+    '.mdx',
+    '.ts',
+    '.tsx',
+    '.yaml',
+    '.yml'
+]);
 function readFileTemplate(relativePath) {
     return node_fs.readFileSync(node_path.join(fileTemplatesDir, relativePath), 'utf-8');
 }
@@ -44,6 +78,86 @@ function writeFileReplacing(targetDir, relativePath, content) {
 function writeJson(targetDir, relativePath, value) {
     writeFile(targetDir, relativePath, `${JSON.stringify(value, null, 2)}\n`);
 }
+function formatGeneratedWorkspaceFiles(targetDir, relativePaths) {
+    const oxfmtBin = resolveOxfmtBin();
+    const oxfmtConfigPath = writePreformatConfig(targetDir);
+    const targets = void 0 === relativePaths ? [
+        targetDir,
+        `!${normalizePath(node_path.join(targetDir, 'repos'))}/**`
+    ] : relativePaths.filter((relativePath)=>formattableExtensions.has(node_path.extname(relativePath))).map((relativePath)=>node_path.join(targetDir, relativePath));
+    if (0 === targets.length) return void removePreformatConfig(targetDir);
+    try {
+        const result = spawnSync(process.execPath, [
+            oxfmtBin,
+            '--config',
+            oxfmtConfigPath,
+            '--no-error-on-unmatched-pattern',
+            ...targets
+        ], {
+            cwd: targetDir,
+            encoding: 'utf-8',
+            env: {
+                ...process.env,
+                FORCE_COLOR: '0'
+            }
+        });
+        if (0 !== result.status) {
+            const detail = [
+                result.stderr.trim(),
+                result.stdout.trim()
+            ].filter(Boolean).join('\n');
+            throw new Error([
+                'Failed to format generated UltraModern workspace output.',
+                detail
+            ].filter(Boolean).join('\n'));
+        }
+    } finally{
+        removePreformatConfig(targetDir);
+    }
+}
+function writePreformatConfig(targetDir) {
+    const configPath = node_path.join(targetDir, preformatConfigPath);
+    node_fs.mkdirSync(node_path.dirname(configPath), {
+        recursive: true
+    });
+    const oxfmtUrl = pathToFileURL(resolveOxfmtEntry()).href;
+    const ultraciteConfigUrl = pathToFileURL(resolveUltraciteOxfmtConfig()).href;
+    node_fs.writeFileSync(configPath, [
+        `import { defineConfig } from ${JSON.stringify(oxfmtUrl)};`,
+        `import ultracite from ${JSON.stringify(ultraciteConfigUrl)};`,
+        '',
+        'export default defineConfig({',
+        '  extends: [ultracite],',
+        '  ignorePatterns: [',
+        ...workspaceOxfmtIgnorePatterns.map((pattern)=>`    ${JSON.stringify(pattern)},`),
+        '  ],',
+        '  singleQuote: true,',
+        '});',
+        ''
+    ].join('\n'), 'utf-8');
+    return configPath;
+}
+function removePreformatConfig(targetDir) {
+    node_fs.rmSync(node_path.join(targetDir, preformatConfigPath), {
+        force: true
+    });
+    try {
+        node_fs.rmdirSync(node_path.join(targetDir, preformatConfigDir));
+    } catch  {}
+}
+function resolveOxfmtBin() {
+    const packageJsonPath = fs_io_require.resolve('oxfmt/package.json');
+    const packageJson = JSON.parse(node_fs.readFileSync(packageJsonPath, 'utf-8'));
+    const binPath = 'string' == typeof packageJson.bin ? packageJson.bin : packageJson.bin?.oxfmt;
+    if ('string' != typeof binPath || 0 === binPath.length) throw new Error('Unable to resolve oxfmt binary from package metadata.');
+    return node_path.join(node_path.dirname(packageJsonPath), binPath);
+}
+function resolveOxfmtEntry() {
+    return fs_io_require.resolve('oxfmt');
+}
+function resolveUltraciteOxfmtConfig() {
+    return fs_io_require.resolve('ultracite/oxfmt');
+}
 function renderTemplate(template, data) {
     return template.replace(/\{\{(\w+)\}\}/g, (match, key)=>data[key] ?? match);
 }
@@ -88,4 +202,4 @@ function readJsonFile(filePath) {
 function writeJsonFile(filePath, value) {
     node_fs.writeFileSync(filePath, `${JSON.stringify(value, null, 2)}\n`, 'utf-8');
 }
-export { assertSafeRelativePath, collectTemplateFiles, copyRootTemplate, createPackageRoot, ensureInsideRoot, fileTemplatesDir, hashFile, hashTemplateTree, readFileTemplate, readJsonFile, renderFileTemplate, renderTemplate, workspaceTemplateDir, writeFile, writeFileReplacing, writeJson, writeJsonFile };
+export { assertSafeRelativePath, collectTemplateFiles, copyRootTemplate, createPackageRoot, ensureInsideRoot, fileTemplatesDir, formatGeneratedWorkspaceFiles, hashFile, hashTemplateTree, readFileTemplate, readJsonFile, renderFileTemplate, renderTemplate, workspaceTemplateDir, writeFile, writeFileReplacing, writeJson, writeJsonFile };

package/dist/esm-node/ultramodern-workspace/write-workspace.js

@@ -6,7 +6,7 @@ import { createDevelopmentOverlay, createOwnership, createTopology, createUltram
 import { createLayout, createRemoteEntry, createRemoteExposeComponent, createRemotePage, createShellPage, createShellRemoteComponents, remoteComponentOutputPath } from "./demo-components.js";
 import { ULTRAMODERN_CONFIG_PATH, appHasEffectApi, appI18nNamespace, createShellHost, sharedPackages, shellApp } from "./descriptors.js";
 import { createEffectClient, createEffectServiceEntry, createEffectSharedApi, createShellEffectClient } from "./effect-api.js";
-import { copyRootTemplate, writeFile, writeFileReplacing, writeJson } from "./fs-io.js";
+import { copyRootTemplate, formatGeneratedWorkspaceFiles, writeFile, writeFileReplacing, writeJson } from "./fs-io.js";
 import { createFileSnapshot, createGenerationResult, diffFileSnapshots } from "./generation-result.js";
 import { createAppPublicLocaleMessages } from "./locales.js";
 import { createAppModernConfig, createRemoteModuleFederationConfig, createShellModuleFederationConfig, createUltramodernBuildModule, createUltramodernBuildReexportModule } from "./module-federation.js";
@@ -148,22 +148,33 @@ function generateUltramodernWorkspace(options) {
     for (const remote of initialVerticals)writeApp(options.targetDir, scope, remote, packageSource, enableTailwind, initialVerticals, bridge);
     writeSharedPackages(options.targetDir, scope);
     writeGeneratedWorkspaceScripts(options.targetDir, scope, enableTailwind, initialVerticals);
-    const afterFiles = createFileSnapshot(options.targetDir);
-    const { createdPaths, rewrittenPaths } = diffFileSnapshots(beforeFiles, afterFiles);
-    const result = createGenerationResult({
+    const preliminaryAfterFiles = createFileSnapshot(options.targetDir);
+    const preliminaryDiff = diffFileSnapshots(beforeFiles, preliminaryAfterFiles);
+    const preliminaryResult = createGenerationResult({
         operation: 'workspace',
         workspaceRoot: options.targetDir,
         packageScope: scope,
         packageSource,
         createdApps,
-        createdPaths,
-        rewrittenPaths
+        createdPaths: preliminaryDiff.createdPaths,
+        rewrittenPaths: preliminaryDiff.rewrittenPaths
     });
     runCodeSmithOverlays({
         workspaceRoot: options.targetDir,
         overlays: options.overlays,
-        result
+        result: preliminaryResult
+    });
+    formatGeneratedWorkspaceFiles(options.targetDir);
+    const afterFiles = createFileSnapshot(options.targetDir);
+    const { createdPaths, rewrittenPaths } = diffFileSnapshots(beforeFiles, afterFiles);
+    return createGenerationResult({
+        operation: 'workspace',
+        workspaceRoot: options.targetDir,
+        packageScope: scope,
+        packageSource,
+        createdApps,
+        createdPaths,
+        rewrittenPaths
     });
-    return result;
 }
 export { createCompactUltramodernConfig, generateUltramodernWorkspace, writeApp, writeSharedPackages };

package/dist/types/ultramodern-workspace/fs-io.d.ts

@@ -9,6 +9,7 @@ export declare function ensureInsideRoot(root: string, targetPath: string): void
 export declare function writeFile(targetDir: string, relativePath: string, content: string): void;
 export declare function writeFileReplacing(targetDir: string, relativePath: string, content: string): void;
 export declare function writeJson(targetDir: string, relativePath: string, value: JsonValue): void;
+export declare function formatGeneratedWorkspaceFiles(targetDir: string, relativePaths?: readonly string[]): void;
 export declare function renderTemplate(template: string, data: Record<string, string>): string;
 export declare function collectTemplateFiles(dir: string): string[];
 export declare function hashFile(filePath: string): string;

package/package.json

@@ -21,7 +21,7 @@
   "engines": {
     "node": ">=20"
   },
-  "version": "3.4.0-ultramodern.13",
+  "version": "3.4.0-ultramodern.15",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/esm-node/index.js",
   "bin": {
@@ -75,7 +75,9 @@
   ],
   "dependencies": {
     "@modern-js/codesmith": "2.6.9",
-    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.4.0-ultramodern.13"
+    "oxfmt": "0.55.0",
+    "ultracite": "7.8.3",
+    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.4.0-ultramodern.15"
   },
   "devDependencies": {
     "@rslib/core": "0.23.0",
@@ -97,6 +99,6 @@
     "test": "rm -rf dist && rslib build -c rslibconfig.mts && rstest --passWithNoTests"
   },
   "ultramodern": {
-    "frameworkVersion": "3.4.0-ultramodern.13"
+    "frameworkVersion": "3.4.0-ultramodern.15"
   }
 }