@bleedingdev/modern-js-create 3.4.0-ultramodern.8 → 3.5.0-ultramodern.0

package/dist/esm/ultramodern-workspace/demo-components.js

@@ -1,4 +1,4 @@
-import { appHasEffectApi, effectApiStem, remoteDependencyAlias, shellApp } from "./descriptors.js";
+import { appHasApi, remoteDependencyAlias, resolveApiStem, shellApp } from "./descriptors.js";
 import { createTw, packageName, tailwindPrefixForApp, toPascalCase } from "./naming.js";
 function createShellPage(remotes = []) {
     const tw = createTw(tailwindPrefixForApp(shellApp));
@@ -209,36 +209,36 @@ ${showcaseItems}
 }
 function createRemotePage(app) {
     const tw = createTw(tailwindPrefixForApp(app));
-    const listEffectItems = `list${toPascalCase(effectApiStem(app))}`;
-    const effectBffImport = appHasEffectApi(app) ? `import { useModernI18n } from '@modern-js/plugin-i18n/runtime';
+    const listApiItems = `list${toPascalCase(resolveApiStem(app))}`;
+    const apiImport = appHasApi(app) ? `import { useModernI18n } from '@modern-js/plugin-i18n/runtime';
 import { Link } from '@modern-js/plugin-tanstack/runtime';
 import { useEffect, useState } from 'react';
 import {
   Effect,
-  ${listEffectItems},
+  ${listApiItems},
   runEffectRequest,
-} from '../../effect/${effectApiStem(app)}-client';
+} from '../../api/${resolveApiStem(app)}-client';
 import { UltramodernRouteHead } from '../ultramodern-route-head';
 import { ultramodernUiMarker } from '../../ultramodern-build';
 ` : "import { useModernI18n } from '@modern-js/plugin-i18n/runtime';\nimport { Link } from '@modern-js/plugin-tanstack/runtime';\nimport { UltramodernRouteHead } from '../ultramodern-route-head';\nimport { ultramodernUiMarker } from '../../ultramodern-build';\n";
-    const effectBffState = appHasEffectApi(app) ? `  const [effectApiStatus, setEffectApiStatus] = useState('pending');
+    const apiState = appHasApi(app) ? `  const [apiStatus, setApiStatus] = useState('pending');
 
   useEffect(() => {
     let cancelled = false;
     void runEffectRequest(
-      ${listEffectItems}({ limit: 1 }).pipe(
+      ${listApiItems}({ limit: 1 }).pipe(
         Effect.match({
           onFailure: () => {
             if (cancelled) {
               return;
             }
-            setEffectApiStatus('unavailable');
+            setApiStatus('unavailable');
           },
           onSuccess: data => {
             if (cancelled) {
               return;
             }
-            setEffectApiStatus(data.items.at(0)?.title ?? 'empty');
+            setApiStatus(data.items.at(0)?.title ?? 'empty');
           },
         }),
       ),
@@ -250,12 +250,12 @@ import { ultramodernUiMarker } from '../../ultramodern-build';
   }, []);
 
 ` : '';
-    const effectBffMarkup = appHasEffectApi(app) ? `      <p data-testid="effect-bff-status">{effectApiStatus}</p>
+    const apiMarkup = appHasApi(app) ? `      <p data-testid="api-status">{apiStatus}</p>
 ` : '';
-    return `${effectBffImport}
+    return `${apiImport}
 export default function ${toPascalCase(app.id)}Home() {
   const { language, supportedLanguages, t } = useModernI18n();
-${effectBffState}  return (
+${apiState}  return (
     <main className="${tw('min-h-screen bg-um-canvas px-4 py-6 text-um-foreground sm:px-8')}">
       <UltramodernRouteHead />
       <nav aria-label={t('${app.domain}.language.switcher')} className="${tw('flex gap-3')}">
@@ -276,7 +276,7 @@ ${effectBffState}  return (
       <p className="${tw('sr-only')}" data-build-marker={ultramodernUiMarker.build} data-testid="ultramodern-ui-marker">
         {ultramodernUiMarker.appId}:{ultramodernUiMarker.version}
       </p>
-${effectBffMarkup}    </main>
+${apiMarkup}    </main>
   );
 }
 `;

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

@@ -1,5 +1,5 @@
 import { packageName, toCamelCase, toEnvSegment, toKebabCase, toPascalCase } from "./naming.js";
-const GENERATED_CONTRACT_PATH = '.modernjs/ultramodern-generated-contract.json';
+const ULTRAMODERN_CONFIG_PATH = '.modernjs/ultramodern.json';
 const shellApp = {
     id: 'shell-super-app',
     directory: 'apps/shell-super-app',
@@ -76,7 +76,7 @@ function createVerticalDescriptor(name, port) {
             './Route': './src/federation-entry.tsx',
             './Widget': `./src/components/${domain}-widget.tsx`
         },
-        effectApi: {
+        api: {
             stem: domain,
             prefix: `/${domain}-api`,
             consumedBy: [
@@ -87,17 +87,17 @@ function createVerticalDescriptor(name, port) {
         ownership: createNeutralOwnership(id)
     };
 }
-function appHasEffectApi(app) {
-    return void 0 !== app.effectApi;
+function appHasApi(app) {
+    return void 0 !== app.api;
 }
-function effectApiPrefix(target) {
-    return target.effectApi?.prefix ?? `/${toKebabCase(target.id)}-api`;
+function resolveApiPrefix(target) {
+    return target.api?.prefix ?? `/${toKebabCase(target.id)}-api`;
 }
-function effectApiStem(target) {
-    return target.effectApi?.stem ?? toKebabCase(target.id).replace(/-api$/, '');
+function resolveApiStem(target) {
+    return target.api?.stem ?? toKebabCase(target.id).replace(/-api$/, '');
 }
-function verticalEffectApps(remotes = []) {
-    return remotes.filter(appHasEffectApi);
+function verticalApiApps(remotes = []) {
+    return remotes.filter(appHasApi);
 }
 function remoteDependencyAlias(remote) {
     return toCamelCase(remote.domain ?? remote.id.replace(/^remote-/, ''));
@@ -130,4 +130,4 @@ function createCloudflarePublicUrlEnv(app) {
 function appI18nNamespace(app) {
     return 'shell' === app.kind ? 'shell' : app.domain ?? app.id;
 }
-export { GENERATED_CONTRACT_PATH, appHasEffectApi, appI18nNamespace, createCloudflarePublicUrlEnv, createCloudflareWorkerName, createModuleFederationRemoteContracts, createNeutralOwnership, createRemoteManifestEnv, createShellHost, createVerticalDescriptor, effectApiPrefix, effectApiStem, remoteDependencyAlias, resolveRemoteRefs, sharedPackages, shellApp, verticalEffectApps, zephyrRemoteDependency };
+export { ULTRAMODERN_CONFIG_PATH, appHasApi, appI18nNamespace, createCloudflarePublicUrlEnv, createCloudflareWorkerName, createModuleFederationRemoteContracts, createNeutralOwnership, createRemoteManifestEnv, createShellHost, createVerticalDescriptor, remoteDependencyAlias, resolveApiPrefix, resolveApiStem, resolveRemoteRefs, sharedPackages, shellApp, verticalApiApps, zephyrRemoteDependency };

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/generation-result.js

@@ -1,7 +1,7 @@
 import node_crypto from "node:crypto";
 import node_fs from "node:fs";
 import node_path from "node:path";
-import { GENERATED_CONTRACT_PATH, appHasEffectApi } from "./descriptors.js";
+import { ULTRAMODERN_CONFIG_PATH, appHasApi } from "./descriptors.js";
 import { normalizePath, packageName } from "./naming.js";
 const ignoredSnapshotDirectories = new Set([
     '.git',
@@ -67,11 +67,11 @@ function createGenerationResult(options) {
                 app.id,
                 app.moduleFederationName
             ])),
-        effectApiPrefixes: Object.fromEntries(createdApps.filter((app)=>app.effectApiPrefix).map((app)=>[
+        apiPrefixes: Object.fromEntries(createdApps.filter((app)=>app.apiPrefix).map((app)=>[
                 app.id,
-                app.effectApiPrefix
+                app.apiPrefix
             ])),
-        generatedContractPath: GENERATED_CONTRACT_PATH,
+        generatedContractPath: ULTRAMODERN_CONFIG_PATH,
         warnings: options.warnings ?? []
     };
 }
@@ -91,8 +91,8 @@ function createGeneratedAppDescriptor(scope, app) {
                 ...app.exposes
             }
         } : {},
-        ...appHasEffectApi(app) ? {
-            effectApiPrefix: app.effectApi.prefix
+        ...appHasApi(app) ? {
+            apiPrefix: app.api.prefix
         } : {}
     };
 }

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

@@ -1,3 +1,4 @@
 export { addUltramodernVertical, planUltramodernVertical } from "./add-vertical.js";
+export { normalizeUltramodernBridgeConfig } from "./bridge-config.js";
 export { ultramodernWorkspaceVersions } from "./versions.js";
 export { generateUltramodernWorkspace } from "./write-workspace.js";