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

package/dist/cjs/ultramodern-workspace/demo-components.cjs

@@ -248,36 +248,36 @@ ${showcaseItems}
 }
 function createRemotePage(app) {
     const tw = (0, external_naming_cjs_namespaceObject.createTw)((0, external_naming_cjs_namespaceObject.tailwindPrefixForApp)(app));
-    const listEffectItems = `list${(0, external_naming_cjs_namespaceObject.toPascalCase)((0, external_descriptors_cjs_namespaceObject.effectApiStem)(app))}`;
-    const effectBffImport = (0, external_descriptors_cjs_namespaceObject.appHasEffectApi)(app) ? `import { useModernI18n } from '@modern-js/plugin-i18n/runtime';
+    const listApiItems = `list${(0, external_naming_cjs_namespaceObject.toPascalCase)((0, external_descriptors_cjs_namespaceObject.resolveApiStem)(app))}`;
+    const apiImport = (0, external_descriptors_cjs_namespaceObject.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/${(0, external_descriptors_cjs_namespaceObject.effectApiStem)(app)}-client';
+} from '../../api/${(0, external_descriptors_cjs_namespaceObject.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 = (0, external_descriptors_cjs_namespaceObject.appHasEffectApi)(app) ? `  const [effectApiStatus, setEffectApiStatus] = useState('pending');
+    const apiState = (0, external_descriptors_cjs_namespaceObject.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');
           },
         }),
       ),
@@ -289,12 +289,12 @@ import { ultramodernUiMarker } from '../../ultramodern-build';
   }, []);
 
 ` : '';
-    const effectBffMarkup = (0, external_descriptors_cjs_namespaceObject.appHasEffectApi)(app) ? `      <p data-testid="effect-bff-status">{effectApiStatus}</p>
+    const apiMarkup = (0, external_descriptors_cjs_namespaceObject.appHasApi)(app) ? `      <p data-testid="api-status">{apiStatus}</p>
 ` : '';
-    return `${effectBffImport}
+    return `${apiImport}
 export default function ${(0, external_naming_cjs_namespaceObject.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')}">
@@ -315,7 +315,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/cjs/ultramodern-workspace/descriptors.cjs

@@ -28,8 +28,8 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    GENERATED_CONTRACT_PATH: ()=>GENERATED_CONTRACT_PATH,
-    appHasEffectApi: ()=>appHasEffectApi,
+    ULTRAMODERN_CONFIG_PATH: ()=>ULTRAMODERN_CONFIG_PATH,
+    appHasApi: ()=>appHasApi,
     appI18nNamespace: ()=>appI18nNamespace,
     createCloudflarePublicUrlEnv: ()=>createCloudflarePublicUrlEnv,
     createCloudflareWorkerName: ()=>createCloudflareWorkerName,
@@ -38,17 +38,17 @@ __webpack_require__.d(__webpack_exports__, {
     createRemoteManifestEnv: ()=>createRemoteManifestEnv,
     createShellHost: ()=>createShellHost,
     createVerticalDescriptor: ()=>createVerticalDescriptor,
-    effectApiPrefix: ()=>effectApiPrefix,
-    effectApiStem: ()=>effectApiStem,
     remoteDependencyAlias: ()=>remoteDependencyAlias,
+    resolveApiPrefix: ()=>resolveApiPrefix,
+    resolveApiStem: ()=>resolveApiStem,
     resolveRemoteRefs: ()=>resolveRemoteRefs,
     sharedPackages: ()=>sharedPackages,
     shellApp: ()=>shellApp,
-    verticalEffectApps: ()=>verticalEffectApps,
+    verticalApiApps: ()=>verticalApiApps,
     zephyrRemoteDependency: ()=>zephyrRemoteDependency
 });
 const external_naming_cjs_namespaceObject = require("./naming.cjs");
-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',
@@ -125,7 +125,7 @@ function createVerticalDescriptor(name, port) {
             './Route': './src/federation-entry.tsx',
             './Widget': `./src/components/${domain}-widget.tsx`
         },
-        effectApi: {
+        api: {
             stem: domain,
             prefix: `/${domain}-api`,
             consumedBy: [
@@ -136,17 +136,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 ?? `/${(0, external_naming_cjs_namespaceObject.toKebabCase)(target.id)}-api`;
+function resolveApiPrefix(target) {
+    return target.api?.prefix ?? `/${(0, external_naming_cjs_namespaceObject.toKebabCase)(target.id)}-api`;
 }
-function effectApiStem(target) {
-    return target.effectApi?.stem ?? (0, external_naming_cjs_namespaceObject.toKebabCase)(target.id).replace(/-api$/, '');
+function resolveApiStem(target) {
+    return target.api?.stem ?? (0, external_naming_cjs_namespaceObject.toKebabCase)(target.id).replace(/-api$/, '');
 }
-function verticalEffectApps(remotes = []) {
-    return remotes.filter(appHasEffectApi);
+function verticalApiApps(remotes = []) {
+    return remotes.filter(appHasApi);
 }
 function remoteDependencyAlias(remote) {
     return (0, external_naming_cjs_namespaceObject.toCamelCase)(remote.domain ?? remote.id.replace(/^remote-/, ''));
@@ -179,8 +179,8 @@ function createCloudflarePublicUrlEnv(app) {
 function appI18nNamespace(app) {
     return 'shell' === app.kind ? 'shell' : app.domain ?? app.id;
 }
-exports.GENERATED_CONTRACT_PATH = __webpack_exports__.GENERATED_CONTRACT_PATH;
-exports.appHasEffectApi = __webpack_exports__.appHasEffectApi;
+exports.ULTRAMODERN_CONFIG_PATH = __webpack_exports__.ULTRAMODERN_CONFIG_PATH;
+exports.appHasApi = __webpack_exports__.appHasApi;
 exports.appI18nNamespace = __webpack_exports__.appI18nNamespace;
 exports.createCloudflarePublicUrlEnv = __webpack_exports__.createCloudflarePublicUrlEnv;
 exports.createCloudflareWorkerName = __webpack_exports__.createCloudflareWorkerName;
@@ -189,17 +189,17 @@ exports.createNeutralOwnership = __webpack_exports__.createNeutralOwnership;
 exports.createRemoteManifestEnv = __webpack_exports__.createRemoteManifestEnv;
 exports.createShellHost = __webpack_exports__.createShellHost;
 exports.createVerticalDescriptor = __webpack_exports__.createVerticalDescriptor;
-exports.effectApiPrefix = __webpack_exports__.effectApiPrefix;
-exports.effectApiStem = __webpack_exports__.effectApiStem;
 exports.remoteDependencyAlias = __webpack_exports__.remoteDependencyAlias;
+exports.resolveApiPrefix = __webpack_exports__.resolveApiPrefix;
+exports.resolveApiStem = __webpack_exports__.resolveApiStem;
 exports.resolveRemoteRefs = __webpack_exports__.resolveRemoteRefs;
 exports.sharedPackages = __webpack_exports__.sharedPackages;
 exports.shellApp = __webpack_exports__.shellApp;
-exports.verticalEffectApps = __webpack_exports__.verticalEffectApps;
+exports.verticalApiApps = __webpack_exports__.verticalApiApps;
 exports.zephyrRemoteDependency = __webpack_exports__.zephyrRemoteDependency;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "GENERATED_CONTRACT_PATH",
-    "appHasEffectApi",
+    "ULTRAMODERN_CONFIG_PATH",
+    "appHasApi",
     "appI18nNamespace",
     "createCloudflarePublicUrlEnv",
     "createCloudflareWorkerName",
@@ -208,13 +208,13 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "createRemoteManifestEnv",
     "createShellHost",
     "createVerticalDescriptor",
-    "effectApiPrefix",
-    "effectApiStem",
     "remoteDependencyAlias",
+    "resolveApiPrefix",
+    "resolveApiStem",
     "resolveRemoteRefs",
     "sharedPackages",
     "shellApp",
-    "verticalEffectApps",
+    "verticalApiApps",
     "zephyrRemoteDependency"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

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

@@ -113,11 +113,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: external_descriptors_cjs_namespaceObject.GENERATED_CONTRACT_PATH,
+        generatedContractPath: external_descriptors_cjs_namespaceObject.ULTRAMODERN_CONFIG_PATH,
         warnings: options.warnings ?? []
     };
 }
@@ -137,8 +137,8 @@ function createGeneratedAppDescriptor(scope, app) {
                 ...app.exposes
             }
         } : {},
-        ...(0, external_descriptors_cjs_namespaceObject.appHasEffectApi)(app) ? {
-            effectApiPrefix: app.effectApi.prefix
+        ...(0, external_descriptors_cjs_namespaceObject.appHasApi)(app) ? {
+            apiPrefix: app.api.prefix
         } : {}
     };
 }

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

@@ -30,19 +30,23 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     addUltramodernVertical: ()=>external_add_vertical_cjs_namespaceObject.addUltramodernVertical,
     generateUltramodernWorkspace: ()=>external_write_workspace_cjs_namespaceObject.generateUltramodernWorkspace,
+    normalizeUltramodernBridgeConfig: ()=>external_bridge_config_cjs_namespaceObject.normalizeUltramodernBridgeConfig,
     planUltramodernVertical: ()=>external_add_vertical_cjs_namespaceObject.planUltramodernVertical,
     ultramodernWorkspaceVersions: ()=>external_versions_cjs_namespaceObject.ultramodernWorkspaceVersions
 });
 const external_add_vertical_cjs_namespaceObject = require("./add-vertical.cjs");
+const external_bridge_config_cjs_namespaceObject = require("./bridge-config.cjs");
 const external_versions_cjs_namespaceObject = require("./versions.cjs");
 const external_write_workspace_cjs_namespaceObject = require("./write-workspace.cjs");
 exports.addUltramodernVertical = __webpack_exports__.addUltramodernVertical;
 exports.generateUltramodernWorkspace = __webpack_exports__.generateUltramodernWorkspace;
+exports.normalizeUltramodernBridgeConfig = __webpack_exports__.normalizeUltramodernBridgeConfig;
 exports.planUltramodernVertical = __webpack_exports__.planUltramodernVertical;
 exports.ultramodernWorkspaceVersions = __webpack_exports__.ultramodernWorkspaceVersions;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "addUltramodernVertical",
     "generateUltramodernWorkspace",
+    "normalizeUltramodernBridgeConfig",
     "planUltramodernVertical",
     "ultramodernWorkspaceVersions"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];