@bleedingdev/modern-js-ultramodern-create 3.9.0-ultramodern.2 → 3.9.0-ultramodern.21

package/dist/esm/ultramodern-workspace/mf-validation/syntax.js

@@ -1,161 +1,101 @@
-function isEscaped(source, index) {
-    let slashCount = 0;
-    for(let cursor = index - 1; cursor >= 0 && '\\' === source[cursor]; cursor -= 1)slashCount += 1;
-    return slashCount % 2 === 1;
+import { parse, parseExpression } from "@babel/parser";
+function unwrapExpression(node) {
+    while('TSAsExpression' === node.type || 'TSSatisfiesExpression' === node.type || 'TSNonNullExpression' === node.type || 'TSTypeAssertion' === node.type || 'ParenthesizedExpression' === node.type)node = node.expression;
+    return node;
 }
-function skipQuoted(source, start, quote) {
-    for(let index = start + 1; index < source.length; index += 1)if (source[index] === quote && !isEscaped(source, index)) return index + 1;
-    return source.length;
-}
-function skipLineComment(source, start) {
-    const newline = source.indexOf('\n', start + 2);
-    return -1 === newline ? source.length : newline + 1;
-}
-function skipBlockComment(source, start) {
-    const close = source.indexOf('*/', start + 2);
-    return -1 === close ? source.length : close + 2;
-}
-function skipTemplateExpression(source, start) {
-    let depth = 1;
-    for(let index = start + 1; index < source.length; index += 1){
-        const char = source[index];
-        const next = source[index + 1];
-        if ("'" === char) {
-            index = skipQuoted(source, index, "'") - 1;
-            continue;
-        }
-        if ('"' === char) {
-            index = skipQuoted(source, index, '"') - 1;
-            continue;
-        }
-        if ('`' === char) {
-            index = skipTemplate(source, index) - 1;
-            continue;
-        }
-        if ('/' === char && '/' === next) {
-            index = skipLineComment(source, index) - 1;
-            continue;
-        }
-        if ('/' === char && '*' === next) {
-            index = skipBlockComment(source, index) - 1;
-            continue;
-        }
-        if ('{' === char) {
-            depth += 1;
-            continue;
-        }
-        if ('}' === char) {
-            depth -= 1;
-            if (0 === depth) return index + 1;
-        }
-    }
-    return source.length;
-}
-function skipTemplate(source, start) {
-    for(let index = start + 1; index < source.length; index += 1){
-        const char = source[index];
-        const next = source[index + 1];
-        if ('`' === char && !isEscaped(source, index)) return index + 1;
-        if ('$' === char && '{' === next && !isEscaped(source, index)) index = skipTemplateExpression(source, index + 1) - 1;
+function parseStaticExpression(source) {
+    if (void 0 === source) return;
+    try {
+        return unwrapExpression(parseExpression(source, {
+            plugins: [
+                "typescript"
+            ]
+        }));
+    } catch  {
+        return;
     }
-    return source.length;
 }
-function skipSyntax(source, index) {
-    const char = source[index];
-    const next = source[index + 1];
-    if ("'" === char) return skipQuoted(source, index, "'");
-    if ('"' === char) return skipQuoted(source, index, '"');
-    if ('`' === char) return skipTemplate(source, index);
-    if ('/' === char && '/' === next) return skipLineComment(source, index);
-    if ('/' === char && '*' === next) return skipBlockComment(source, index);
-    return index;
+function parseConfigModule(source) {
+    return parse(source, {
+        sourceType: 'module',
+        plugins: [
+            "typescript"
+        ]
+    });
 }
-function findBalanced(source, start, open, close) {
-    let depth = 1;
-    for(let index = start + 1; index < source.length; index += 1){
-        const skipped = skipSyntax(source, index);
-        if (skipped !== index) {
-            index = skipped - 1;
-            continue;
+function locateExportedConfig(source, factory) {
+    const module = parseConfigModule(source);
+    const constants = new Map();
+    const bindingStarts = new Map();
+    const resolvedBindings = new Set();
+    const allowedReferences = new Set();
+    const factories = new Set();
+    const namespaces = new Set();
+    const defaults = [];
+    for (const statement of module.program.body){
+        if ('ImportDeclaration' === statement.type && 'type' !== statement.importKind && '@module-federation/modern-js-v3' === statement.source.value) {
+            for (const specifier of statement.specifiers)if ('ImportNamespaceSpecifier' === specifier.type) namespaces.add(specifier.local.name);
+            else if ('ImportSpecifier' === specifier.type && 'type' !== specifier.importKind && ('Identifier' === specifier.imported.type ? specifier.imported.name : specifier.imported.value) === 'createModuleFederationConfig') factories.add(specifier.local.name);
         }
-        if (source[index] === open) {
-            depth += 1;
-            continue;
+        const declaration = 'ExportNamedDeclaration' === statement.type ? statement.declaration : statement;
+        if (declaration?.type === 'VariableDeclaration' && 'const' === declaration.kind) {
+            for (const binding of declaration.declarations)if ('Identifier' === binding.id.type && binding.init) {
+                constants.set(binding.id.name, binding.init);
+                bindingStarts.set(binding.id.name, binding.id.start);
+            }
         }
-        if (source[index] === close) {
-            depth -= 1;
-            if (0 === depth) return index;
+        if ('ExportDefaultDeclaration' === statement.type) defaults.push(statement.declaration);
+        else if ('ExportNamedDeclaration' === statement.type && !statement.source && 'type' !== statement.exportKind) {
+            for (const specifier of statement.specifiers)if ('ExportSpecifier' === specifier.type && 'type' !== specifier.exportKind && ('Identifier' === specifier.exported.type ? specifier.exported.name : specifier.exported.value) === 'default') defaults.push(specifier.local);
         }
     }
-}
-function skipWhitespaceAndComments(source, start) {
-    let index = start;
-    while(index < source.length){
-        const char = source[index];
-        const next = source[index + 1];
-        if (/\s/u.test(char ?? '')) {
-            index += 1;
-            continue;
-        }
-        if ('/' === char && '/' === next) {
-            index = skipLineComment(source, index);
-            continue;
-        }
-        if ('/' === char && '*' === next) {
-            index = skipBlockComment(source, index);
-            continue;
+    const resolve = (node, seen = new Set())=>{
+        if (!node) return;
+        if ('Identifier' === node.type) {
+            if (seen.has(node.name)) return;
+            seen.add(node.name);
+            resolvedBindings.add(node.name);
+            if (null != node.start) allowedReferences.add(node.start);
+            const bindingStart = bindingStarts.get(node.name);
+            if (null != bindingStart) allowedReferences.add(bindingStart);
+            return resolve(constants.get(node.name), seen);
         }
-        break;
+        if ('TSAsExpression' === node.type || 'TSSatisfiesExpression' === node.type || 'TSNonNullExpression' === node.type || 'TSTypeAssertion' === node.type || 'ParenthesizedExpression' === node.type) return resolve(node.expression, seen);
+        return node;
+    };
+    if (1 !== defaults.length) return;
+    let node = resolve(defaults[0]);
+    if (factory) {
+        if (node?.type !== 'CallExpression' || 1 !== node.arguments.length) return;
+        const callee = node.callee;
+        const supported = 'Identifier' === callee.type && factories.has(callee.name) || 'MemberExpression' === callee.type && !callee.computed && 'Identifier' === callee.object.type && namespaces.has(callee.object.name) && 'Identifier' === callee.property.type && 'createModuleFederationConfig' === callee.property.name;
+        if (!supported) return;
+        const argument = node.arguments[0];
+        if (!argument || 'SpreadElement' === argument.type || 'ArgumentPlaceholder' === argument.type) return;
+        node = resolve(argument);
     }
-    return index;
-}
-function hasIdentifierBoundary(source, start, end) {
-    return !/[$\w]/u.test(source[start - 1] ?? '') && !/[$\w]/u.test(source[end] ?? '');
+    if (node?.type !== 'ObjectExpression' || null == node.start || null == node.end) return;
+    const hasOtherReference = (value)=>{
+        if (!value || 'object' != typeof value) return false;
+        if (Array.isArray(value)) return value.some(hasOtherReference);
+        const entry = value;
+        if ('Identifier' === entry.type && 'string' == typeof entry.name && resolvedBindings.has(entry.name) && ('number' != typeof entry.start || !allowedReferences.has(entry.start))) return true;
+        return Object.entries(entry).some(([key, child])=>'loc' !== key && 'comments' !== key && 'leadingComments' !== key && 'trailingComments' !== key && hasOtherReference(child));
+    };
+    if (hasOtherReference(module.program)) return;
+    return {
+        start: node.start,
+        end: node.end,
+        source: source.slice(node.start, node.end)
+    };
 }
 function locateCreateModuleFederationConfigObject(source) {
-    const callee = 'createModuleFederationConfig';
-    let offset = 0;
-    while(offset < source.length){
-        const index = source.indexOf(callee, offset);
-        if (-1 === index) break;
-        offset = index + callee.length;
-        if (!hasIdentifierBoundary(source, index, offset)) continue;
-        const parenIndex = skipWhitespaceAndComments(source, offset);
-        if ('(' !== source[parenIndex]) continue;
-        const argumentIndex = skipWhitespaceAndComments(source, parenIndex + 1);
-        if ('{' !== source[argumentIndex]) throw new Error('Module Federation config must pass a static object literal to createModuleFederationConfig.');
-        const closeIndex = findBalanced(source, argumentIndex, '{', '}');
-        if (void 0 === closeIndex) throw new Error('Module Federation config object literal is not closed.');
-        return {
-            end: closeIndex + 1,
-            source: source.slice(argumentIndex, closeIndex + 1),
-            start: argumentIndex
-        };
-    }
+    return locateExportedConfig(source, true);
 }
 function findCreateModuleFederationConfigObject(source) {
     return locateCreateModuleFederationConfigObject(source)?.source;
 }
 function findExportDefaultObject(source) {
-    const exportDefault = 'export default';
-    const index = source.indexOf(exportDefault);
-    if (-1 === index) return;
-    const objectStart = skipWhitespaceAndComments(source, index + exportDefault.length);
-    if ('{' !== source[objectStart]) return;
-    const objectEnd = findBalanced(source, objectStart, '{', '}');
-    if (void 0 === objectEnd) throw new Error('Module Federation export default object is not closed.');
-    return source.slice(objectStart, objectEnd + 1);
-}
-function getOuterBlock(source, open, close) {
-    const trimmed = source.trim();
-    if (trimmed[0] !== open) return;
-    const end = findBalanced(trimmed, 0, open, close);
-    if (void 0 === end) return;
-    const suffix = trimmed.slice(end + 1).trim();
-    if ('' !== suffix && !suffix.startsWith('as ') && !suffix.startsWith('satisfies ')) return;
-    return {
-        inner: trimmed.slice(1, end),
-        suffix
-    };
+    return locateExportedConfig(source, false)?.source;
 }
-export { findCreateModuleFederationConfigObject, findExportDefaultObject, getOuterBlock, locateCreateModuleFederationConfigObject, skipSyntax };
+export { findCreateModuleFederationConfigObject, findExportDefaultObject, locateCreateModuleFederationConfigObject, parseConfigModule, parseStaticExpression };

package/dist/esm/ultramodern-workspace/mf-validation.js

@@ -1,3 +1,4 @@
 export { discoverModuleFederationConfigs } from "./mf-validation/discovery.js";
+export { readModuleFederationExposePaths } from "./mf-validation/exposes.js";
 export { inspectModuleFederationConfigSource } from "./mf-validation/inspect.js";
 export { validateModuleFederationTypes } from "./mf-validation/validate.js";

package/dist/esm/ultramodern-workspace/module-federation/config.js

@@ -2,20 +2,24 @@ import { createDispatchWorkerNameEnv, createWorkerBindingEnv, createWorkerBindin
 import { createDeliveryUnitRecord } from "../delivery-unit.js";
 import { appEmitsBrowserUi, appHasApi, createBackendFederationName, createCloudflarePublicUrlEnv, createCloudflareWorkerName, distributedSsrExposes, distributedSsrFragmentRoute, resolveApiPrefix, resolveApiProtocol, resolveRemoteRefs, shellApp } from "../descriptors.js";
 import { renderFileTemplate } from "../fs-io.js";
-import { createRspackChunkLoadingGlobal, createRspackUniqueName } from "../naming.js";
+import { createRspackChunkLoadingGlobal, createRspackUniqueName, relativeRootFor } from "../naming.js";
 import { createCloudflareSecurityContract, formatTsJsonValue } from "../policy.js";
 import { sortJsonValue } from "../types.js";
 import { CLOUDFLARE_COMPATIBILITY_DATE } from "../versions.js";
 import { createModuleFederationRemoteUrlHelpers, createModuleFederationRemotesConfig } from "./remote-refs.js";
 import { createSharedModuleFederationConfig, formatTsObjectLiteral } from "./shared-config.js";
-function createAppModernConfig(scope, app, remotes = [], enableTailwind = true, configuredDevPorts) {
+function createAppModernConfig(scope, app, remotes = [], enableTailwind = true, _configuredDevPorts) {
     const deliveryUnit = createDeliveryUnitRecord(scope, app);
     const emitsUi = appEmitsBrowserUi(app);
-    const bffImport = appHasApi(app) ? "import { bffPlugin } from '@modern-js/plugin-bff';\n" : '';
-    const uiImports = emitsUi ? `import { moduleFederationPlugin } from '@module-federation/modern-js-v3';
+    const bffImport = appHasApi(app) ? "import { bffPlugin } from '@modern-js/plugin-bff-build-extensions';\n" : '';
+    const uiImports = emitsUi ? `import {
+  getBuildConfigEnvironment,
+  resolveDeployTarget,
+} from '@modern-js/app-tools-extensions/config';
+import { moduleFederationPlugin } from '@module-federation/modern-js-v3';
 import { withZephyr as withZephyrRspack } from 'zephyr-rspack-plugin';
 import { ultramodernLocalisedUrls } from './src/routes/ultramodern-route-metadata';
-` : '';
+` : "import {\n  getBuildConfigEnvironment,\n  resolveDeployTarget,\n} from '@modern-js/app-tools-extensions/config';\n";
     const zephyrPluginSource = emitsUi ? `const zephyrRspackPlugin = () => ({
   name: 'ultramodern-zephyr-rspack-plugin',
   pre: ['@modern-js/plugin-module-federation-config'],
@@ -32,16 +36,19 @@ import { ultramodernLocalisedUrls } from './src/routes/ultramodern-route-metadat
     // no account, and is never blocked. This is the framework's "works with or
     // without Zephyr" contract. The plugin stays registered unconditionally
     // (this gate keys on Zephyr's native deploy token, not any UltraModern
-    // opt-out). When deploying, ZE_FAIL_BUILD=true makes an upload failure a
-    // hard build failure.
+    // opt-out). The deploy environment sets ZE_FAIL_BUILD=true next to
+    // ZE_CI_TOKEN so an upload failure is a hard build failure.
     const zephyrCiDeploy =
       (getBuildConfigEnvironment('ZE_CI_TOKEN') ?? '').length > 0;
     if (!zephyrCiDeploy) {
       return;
     }
-    api.modifyRspackConfig(
-      withBuildConfigEnvironment('ZE_FAIL_BUILD', 'true', withZephyrRspack()),
-    );
+    if (getBuildConfigEnvironment('ZE_FAIL_BUILD') !== 'true') {
+      throw new Error(
+        'ZE_CI_TOKEN is set but ZE_FAIL_BUILD is not "true", so a failed Zephyr upload would not fail the deploy. Set ZE_FAIL_BUILD=true in the deploy environment next to ZE_CI_TOKEN.',
+      );
+    }
+    api.modifyRspackConfig(withZephyrRspack());
   },
 });
 
@@ -99,18 +106,7 @@ const defaultAssetPrefix = defaultRemoteAssetPrefix;`;
         assetPrefix: '/',` : `        // Remote dev manifests must publish an absolute publicPath so host
         // shells load remoteEntry.js and exposed chunks from this dev server.
         assetPrefix,`;
-    const developmentPorts = [
-        ...new Set((configuredDevPorts ?? [
-            shellApp.port,
-            app.port,
-            ...remotes.map((remote)=>remote.port)
-        ]).filter((port)=>'number' == typeof port && Number.isFinite(port)))
-    ].toSorted((left, right)=>left - right);
-    const legacyCorsSource = `const moduleFederationDevServerOrigin =
-  envValue('ULTRAMODERN_MF_DEV_ORIGIN') || 'http://localhost:${shellApp.port}';`;
-    const configuredCorsSource = `const moduleFederationDevServerAllowedOrigins = [
-${developmentPorts.map((port)=>`  'http://localhost:${port}',`).join('\n')}
-];`;
+    const configuredCorsSource = "const moduleFederationDevServerAllowedOrigins = Object.values(developmentOverlay.ports).map(localPort => `http://localhost:${localPort}`);";
     const configuredCorsDevServer = `        // MF assets are non-credentialed and only permit configured local app origins.
         server: {
           cors: {
@@ -118,8 +114,7 @@ ${developmentPorts.map((port)=>`  'http://localhost:${port}',`).join('\n')}
             origin: moduleFederationDevServerAllowedOrigins,
           },
         },`;
-    const useConfiguredCorsAllowlist = void 0 !== configuredDevPorts;
-    const configuredCorsHeader = useConfiguredCorsAllowlist ? 1 === developmentPorts.length ? "'Access-Control-Allow-Origin': moduleFederationDevServerAllowedOrigins[0]," : '' : "'Access-Control-Allow-Origin': moduleFederationDevServerOrigin,";
+    const configuredCorsHeader = "...(moduleFederationDevServerAllowedOrigins.length === 1 ? { 'Access-Control-Allow-Origin': moduleFederationDevServerAllowedOrigins[0] } : {}),";
     return renderFileTemplate('workspace/apps/modern.config.ts', {
         value0: `${bffImport}${tailwindImport}`,
         value1: app.id,
@@ -129,7 +124,6 @@ ${developmentPorts.map((port)=>`  'http://localhost:${port}',`).join('\n')}
         value5: createCloudflarePublicUrlEnv(app),
         value6: String(shellApp.port),
         value7: defaultAssetPrefixSource,
-        value8: createCloudflarePublicUrlEnv(app),
         value9: bffConfig,
         value10: CLOUDFLARE_COMPATIBILITY_DATE,
         value11: formatTsJsonValue(sortJsonValue(createCloudflareSecurityContract()), 16),
@@ -140,8 +134,8 @@ ${developmentPorts.map((port)=>`  'http://localhost:${port}',`).join('\n')}
         value16: createRspackUniqueName(app),
         value17: createRspackChunkLoadingGlobal(app),
         value18: tailwindBuilderPluginsConfig,
-        value19: useConfiguredCorsAllowlist ? configuredCorsSource : legacyCorsSource,
-        value20: useConfiguredCorsAllowlist ? configuredCorsDevServer : '',
+        value19: configuredCorsSource,
+        value20: configuredCorsDevServer,
         value21: configuredCorsHeader,
         value22: uiImports,
         value23: zephyrPluginSource,
@@ -149,7 +143,8 @@ ${developmentPorts.map((port)=>`  'http://localhost:${port}',`).join('\n')}
         value25: uiPluginEntries,
         value26: deliveryUnit.unitId,
         value27: deliveryUnit.buildMarker,
-        value28: deliveryUnit.version
+        value28: deliveryUnit.version,
+        value29: relativeRootFor(app.directory)
     });
 }
 function createModuleFederationBridgeConfig(enableBridgeRouter) {
@@ -255,13 +250,13 @@ function createRemoteModuleFederationConfig(scope, app, remotes = [], enableBrid
     const hostOnlyMarker = hasExposes ? '' : '\n// ultramodern-mf: no-exposes';
     const appToolsConfigImports = [
         ...hasRemoteRefs ? [
-            'getBuildConfigEnvironment'
+            'createRemoteManifestUrl'
         ] : [],
         ...hasExposes ? [
             'resolveEffectTsgoCompiler'
         ] : []
     ];
-    const appToolsConfigImport = appToolsConfigImports.length > 0 ? `import { ${appToolsConfigImports.join(', ')} } from '@modern-js/app-tools/config';\n` : '';
+    const appToolsConfigImport = appToolsConfigImports.length > 0 ? `import { ${appToolsConfigImports.join(', ')} } from '@modern-js/app-tools-extensions/config';\n` : '';
     const tsgoCompilerInstance = hasExposes ? `
 const tsgoCompilerInstance =
   resolveEffectTsgoCompiler({ from: import.meta.url });

package/dist/esm/ultramodern-workspace/module-federation/reexport-module.js

@@ -1,67 +1,48 @@
-import { createUltramodernBuildArtifact } from "@modern-js/utils/universal";
+import { createUltramodernBuildArtifact } from "@modern-js/backend-federation-contracts";
 import { createDeliveryUnitRecord } from "../delivery-unit.js";
-function deliveryUnitRecordFor(scope, app) {
-    return app.deliveryUnit ? app.deliveryUnit : createDeliveryUnitRecord(scope, app);
-}
+import { appEmitsBrowserUi, appHasApi } from "../descriptors.js";
 function createUltramodernBuildArtifactJson(scope, app) {
-    const record = deliveryUnitRecordFor(scope, app);
-    return `${JSON.stringify(createUltramodernBuildArtifact(record), null, 2)}\n`;
+    const record = createDeliveryUnitRecord(scope, app);
+    const artifact = createUltramodernBuildArtifact(record);
+    return `${JSON.stringify({
+        ...artifact,
+        deliveryUnit: {
+            ...record,
+            ...artifact.deliveryUnit
+        },
+        surfaces: {
+            api: {
+                ...record,
+                ...artifact.surfaces.api
+            },
+            ui: {
+                ...record,
+                ...artifact.surfaces.ui
+            }
+        }
+    }, null, 2)}\n`;
 }
-function createUltramodernBuildModule(scope, app) {
-    const record = deliveryUnitRecordFor(scope, app);
-    return `declare const ULTRAMODERN_BUILD_MARKER: string;
-declare const ULTRAMODERN_SOURCE_REVISION: string;
+function createUltramodernBuildModule(_scope, app, includeUiMarker = appEmitsBrowserUi(app)) {
+    return `import buildArtifact = require('./ultramodern-build.json');
+import { resolveUltramodernBuildArtifact } from '@modern-js/runtime-extensions/build-identity';
 
-const ultramodernGeneratedBuildArtifact = ${JSON.stringify(createUltramodernBuildArtifact(record), null, 2)} as const;
-const ultramodernBuildMarker =
-  typeof ULTRAMODERN_BUILD_MARKER === 'string'
-    ? ULTRAMODERN_BUILD_MARKER
-    : ultramodernGeneratedBuildArtifact.deliveryUnit.buildMarker;
-const ultramodernSourceRevision =
-  typeof ULTRAMODERN_SOURCE_REVISION === 'string'
-    ? ULTRAMODERN_SOURCE_REVISION
-    : ultramodernGeneratedBuildArtifact.deliveryUnit.sourceRevision;
-const ultramodernBuildArtifact = {
-  ...ultramodernGeneratedBuildArtifact,
-  deliveryUnit: {
-    ...ultramodernGeneratedBuildArtifact.deliveryUnit,
-    build: ultramodernBuildMarker,
-    buildMarker: ultramodernBuildMarker,
-    sourceRevision: ultramodernSourceRevision,
-  },
-  surfaces: {
-    api: {
-      ...ultramodernGeneratedBuildArtifact.surfaces.api,
-      build: ultramodernBuildMarker,
-      buildMarker: ultramodernBuildMarker,
-      sourceRevision: ultramodernSourceRevision,
-    },
-    ui: {
-      ...ultramodernGeneratedBuildArtifact.surfaces.ui,
-      build: ultramodernBuildMarker,
-      buildMarker: ultramodernBuildMarker,
-      sourceRevision: ultramodernSourceRevision,
-    },
-  },
-} as const;
+declare const ULTRAMODERN_BUILD_MARKER: string;
+declare const ULTRAMODERN_SOURCE_REVISION: string;
 
-export { ultramodernBuildArtifact };
+const ultramodernBuildArtifact = resolveUltramodernBuildArtifact(buildArtifact, {
+  buildMarker: () => ULTRAMODERN_BUILD_MARKER,
+  sourceRevision: () => ULTRAMODERN_SOURCE_REVISION,
+});
 
-export const ultramodernDeliveryUnit =
-  ultramodernBuildArtifact.deliveryUnit;
-export const ultramodernVerticalIdentity = ultramodernDeliveryUnit;
-export const ultramodernUiMarker = ultramodernBuildArtifact.surfaces.ui;
-export const ultramodernApiMarker = ultramodernBuildArtifact.surfaces.api;
-`;
+export const ultramodernDeliveryUnit = ultramodernBuildArtifact.deliveryUnit;
+${includeUiMarker ? 'export const ultramodernUiMarker = ultramodernBuildArtifact.surfaces.ui;\n' : ''}${'shell' !== app.kind && appHasApi(app) ? 'export const ultramodernApiMarker = ultramodernBuildArtifact.surfaces.api;\n' : ''}`;
 }
-function createUltramodernBuildReexportModule() {
-    return `export {
-  ultramodernBuildArtifact,
-  ultramodernApiMarker,
-  ultramodernDeliveryUnit,
-  ultramodernUiMarker,
-  ultramodernVerticalIdentity,
-} from '../shared/ultramodern-build';
-`;
+function createUltramodernBuildReexportModule(app, includeUiMarker = appEmitsBrowserUi(app)) {
+    const names = [
+        'ultramodernDeliveryUnit'
+    ];
+    if (includeUiMarker) names.push('ultramodernUiMarker');
+    if ('shell' !== app.kind && appHasApi(app)) names.push('ultramodernApiMarker');
+    return `export { ${names.join(', ')} } from '../shared/ultramodern-build';\n`;
 }
 export { createUltramodernBuildArtifactJson, createUltramodernBuildModule, createUltramodernBuildReexportModule };

package/dist/esm/ultramodern-workspace/module-federation/remote-refs.js

@@ -1,49 +1,7 @@
 import { createCloudflarePublicUrlEnv, createCloudflareWorkerName, createRemoteManifestEnv, remoteDependencyAlias, resolveRemoteRefs } from "../descriptors.js";
 function createModuleFederationRemoteUrlHelpers(app, remotes = [], includeAppToolsImport = true) {
     if (0 === resolveRemoteRefs(app, remotes).length) return '';
-    const appToolsImport = includeAppToolsImport ? "import { getBuildConfigEnvironment } from '@modern-js/app-tools/config';\n\n" : '';
-    return `${appToolsImport}const cloudflareDeployEnabled =
-  getBuildConfigEnvironment('MODERNJS_DEPLOY') === 'cloudflare';
-const cloudflareWorkersDevSubdomain =
-  getBuildConfigEnvironment('ULTRAMODERN_CLOUDFLARE_WORKERS_DEV_SUBDOMAIN')?.trim();
-const requireCloudflarePublicUrls =
-  getBuildConfigEnvironment('ULTRAMODERN_CLOUDFLARE_REQUIRE_PUBLIC_URLS') === 'true';
-
-const createRemoteManifestUrl = (options: {
-  manifestEnv: string;
-  mfName: string;
-  port: number;
-  publicUrlEnv: string;
-  workerName: string;
-}) => {
-  const configuredManifest = getBuildConfigEnvironment(options.manifestEnv)?.trim();
-  if (configuredManifest !== undefined && configuredManifest.length > 0) {
-    return configuredManifest;
-  }
-
-  const configuredPublicUrl = getBuildConfigEnvironment(options.publicUrlEnv)?.trim();
-  if (configuredPublicUrl !== undefined && configuredPublicUrl.length > 0) {
-    return \`\${options.mfName}@\${configuredPublicUrl.replace(/\\/+$/u, '')}/mf-manifest.json\`;
-  }
-
-  if (
-    cloudflareDeployEnabled &&
-    cloudflareWorkersDevSubdomain !== undefined &&
-    cloudflareWorkersDevSubdomain.length > 0
-  ) {
-    return \`\${options.mfName}@https://\${options.workerName}.\${cloudflareWorkersDevSubdomain}.workers.dev/mf-manifest.json\`;
-  }
-
-  if (cloudflareDeployEnabled && requireCloudflarePublicUrls) {
-    throw new Error(
-      \`Cloudflare deploy needs \${options.publicUrlEnv}, \${options.manifestEnv}, or ULTRAMODERN_CLOUDFLARE_WORKERS_DEV_SUBDOMAIN for remote \${options.mfName}.\`,
-    );
-  }
-
-  return \`\${options.mfName}@http://localhost:\${options.port}/mf-manifest.json\`;
-};
-
-`;
+    return includeAppToolsImport ? "import { createRemoteManifestUrl } from '@modern-js/app-tools-extensions/config';\n\n" : '';
 }
 function createModuleFederationRemotesConfig(scope, app, remotes = []) {
     const remoteEntries = resolveRemoteRefs(app, remotes).toSorted((left, right)=>remoteDependencyAlias(left).localeCompare(remoteDependencyAlias(right))).map((remote)=>{