@bleedingdev/modern-js-create 3.5.0-ultramodern.12 → 3.5.0-ultramodern.14

package/dist/cjs/ultramodern-tooling/commands.cjs

@@ -54,6 +54,7 @@ const external_create_package_root_cjs_namespaceObject = require("../create-pack
 const external_ultramodern_package_source_cjs_namespaceObject = require("../ultramodern-package-source.cjs");
 const app_files_cjs_namespaceObject = require("../ultramodern-workspace/app-files.cjs");
 const mf_validation_cjs_namespaceObject = require("../ultramodern-workspace/mf-validation.cjs");
+const module_federation_cjs_namespaceObject = require("../ultramodern-workspace/module-federation.cjs");
 const package_json_cjs_namespaceObject = require("../ultramodern-workspace/package-json.cjs");
 const versions_cjs_namespaceObject = require("../ultramodern-workspace/versions.cjs");
 const workspace_scripts_cjs_namespaceObject = require("../ultramodern-workspace/workspace-scripts.cjs");
@@ -235,6 +236,8 @@ const strictEffectPackageVersionPolicyExclusions = [
     `effect@${versions_cjs_namespaceObject.EFFECT_VERSION}`,
     `@effect/opentelemetry@${versions_cjs_namespaceObject.EFFECT_VERSION}`
 ];
+const moduleFederationModernJsPatchPath = `patches/@module-federation__modern-js-v3@${versions_cjs_namespaceObject.MODULE_FEDERATION_VERSION}.patch`;
+const moduleFederationModernJsPatchSourcePath = external_node_path_default().join(createPackageRoot, 'template-workspace', moduleFederationModernJsPatchPath);
 const effectDeclarationPatchPath = 'patches/effect-schema-error-type-id.patch';
 const effectDeclarationPatchSourcePath = external_node_path_default().join(createPackageRoot, 'template-workspace', effectDeclarationPatchPath);
 const drizzleOrmDeclarationPatchPath = 'patches/drizzle-orm-ts7-strict-declarations.patch';
@@ -266,9 +269,14 @@ function updateGeneratedPackageScripts(packageJson) {
     if (!scripts || 'object' != typeof scripts || Array.isArray(scripts)) return false;
     let changed = false;
     const cloudflareBuild = scripts['cloudflare:build'];
-    if ('string' == typeof cloudflareBuild && cloudflareBuild.includes(cloudflareModernDeployCommand) && !cloudflareBuild.includes(cloudflareModernDeploySkipBuildCommand)) {
-        scripts['cloudflare:build'] = cloudflareBuild.replace(cloudflareModernDeployCommand, cloudflareModernDeploySkipBuildCommand);
-        changed = true;
+    if ('string' == typeof cloudflareBuild) {
+        let nextCloudflareBuild = cloudflareBuild;
+        if (nextCloudflareBuild.includes(cloudflareModernDeployCommand) && !nextCloudflareBuild.includes(cloudflareModernDeploySkipBuildCommand)) nextCloudflareBuild = nextCloudflareBuild.replace(cloudflareModernDeployCommand, cloudflareModernDeploySkipBuildCommand);
+        nextCloudflareBuild = nextCloudflareBuild.replace(/ && node \S*scripts\/generate-public-surface-assets\.m[ct]s --app [^&]+ --target dist(?= && ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern deploy --skip-build)/u, '');
+        if (nextCloudflareBuild !== cloudflareBuild) {
+            scripts['cloudflare:build'] = nextCloudflareBuild;
+            changed = true;
+        }
     }
     const cloudflareDeploy = scripts['cloudflare:deploy'];
     if ('string' == typeof cloudflareDeploy && cloudflareDeploy.includes(cloudflareWranglerDeployInvalidSkipBuildCommand)) {
@@ -475,6 +483,7 @@ function workspaceUsesDependency(workspaceRoot, packageName) {
 }
 function ensureGeneratedDeclarationPatches(workspaceRoot, options) {
     let changed = false;
+    changed = ensureGeneratedPatchFile(workspaceRoot, moduleFederationModernJsPatchPath, moduleFederationModernJsPatchSourcePath) || changed;
     changed = ensureGeneratedPatchFile(workspaceRoot, effectDeclarationPatchPath, effectDeclarationPatchSourcePath) || changed;
     changed = options.includeDrizzleOrmPatch ? ensureGeneratedPatchFile(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed : removeGeneratedPatchFileIfUnchanged(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed;
     return changed;
@@ -522,6 +531,9 @@ function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
     const effectPatch = ensureYamlMapEntry(source, 'patchedDependencies', `effect@${versions_cjs_namespaceObject.EFFECT_VERSION}`, effectDeclarationPatchPath);
     source = effectPatch.source;
     changed = effectPatch.changed || changed;
+    const moduleFederationModernJsPatch = ensureYamlMapEntry(source, 'patchedDependencies', `@module-federation/modern-js-v3@${versions_cjs_namespaceObject.MODULE_FEDERATION_VERSION}`, moduleFederationModernJsPatchPath);
+    source = moduleFederationModernJsPatch.source;
+    changed = moduleFederationModernJsPatch.changed || changed;
     const drizzleOrmPatch = usesDrizzleOrm ? ensureYamlMapEntry(source, 'patchedDependencies', `drizzle-orm@${versions_cjs_namespaceObject.DRIZZLE_ORM_VERSION}`, drizzleOrmDeclarationPatchPath) : removeYamlMapEntry(source, `drizzle-orm@${versions_cjs_namespaceObject.DRIZZLE_ORM_VERSION}`);
     source = drizzleOrmPatch.source;
     changed = drizzleOrmPatch.changed || changed;
@@ -571,7 +583,8 @@ function ensureGeneratedIgnoreRules(workspaceRoot) {
     let changed = false;
     for (const rule of [
         '.mf/',
-        '**/.mf/'
+        '**/.mf/',
+        'dist-cloudflare/'
     ])if (!lines.includes(rule)) {
         lines.push(rule);
         changed = true;
@@ -598,6 +611,12 @@ function updateGeneratedTypeScriptSurfaces(workspaceRoot, config) {
     }
     return changed;
 }
+function updateGeneratedModernConfigs(workspaceRoot, config) {
+    let changed = false;
+    const apps = (0, external_config_cjs_namespaceObject.workspaceAppsFromToolingConfig)(config);
+    for (const app of apps)changed = writeTextIfChanged(external_node_path_default().join(workspaceRoot, app.directory, 'modern.config.ts'), (0, module_federation_cjs_namespaceObject.createAppModernConfig)(config.workspace.packageScope, app)) || changed;
+    return changed;
+}
 function updateReferenceTopology(workspaceRoot) {
     const topologyPath = external_node_path_default().join(workspaceRoot, 'topology/reference-topology.json');
     if (!external_node_fs_default().existsSync(topologyPath)) return false;
@@ -671,7 +690,9 @@ and pnpm contract:check.
     const packageSource = createMigrationPackageSource(args, current);
     updateUltramodernConfig(context.workspaceRoot, packageSource);
     updateReferenceTopology(context.workspaceRoot);
-    updateGeneratedTypeScriptSurfaces(context.workspaceRoot, current);
+    const migrated = (0, external_config_cjs_namespaceObject.readUltramodernConfig)(context.workspaceRoot);
+    updateGeneratedTypeScriptSurfaces(context.workspaceRoot, migrated);
+    updateGeneratedModernConfigs(context.workspaceRoot, migrated);
     for (const relativePackageFile of listWorkspacePackageFiles(context.workspaceRoot)){
         const packageFile = external_node_path_default().join(context.workspaceRoot, relativePackageFile);
         const packageJson = readJsonFile(packageFile);

package/dist/cjs/ultramodern-workspace/module-federation.cjs

@@ -144,8 +144,10 @@ ${defaultAssetPrefixSource}
 // load remoteEntry.js and exposed chunks from the remote origin, not the host.
 const assetPrefix =
   configuredModernAssetPrefix || configuredUltramodernAssetPrefix || defaultAssetPrefix;
-const buildCacheTarget = cloudflareDeployEnabled ? 'cloudflare' : 'web';
-const buildCacheDirectory = \`node_modules/.cache/rspack-\${appId}-\${buildCacheTarget}\`;
+const buildTarget = cloudflareDeployEnabled ? 'cloudflare' : 'web';
+const buildOutputRoot = cloudflareDeployEnabled ? 'dist-cloudflare' : 'dist';
+const buildTempDirectory = \`node_modules/.modern-js-\${appId}-\${buildTarget}\`;
+const buildCacheDirectory = \`node_modules/.cache/rspack-\${appId}-\${buildTarget}\`;
 
 if (
   cloudflareDeployEnabled &&
@@ -187,13 +189,15 @@ ${bffConfig}      ...(cloudflareDeployEnabled
         disableTsChecker: false,
         distPath: {
           html: './',
+          root: buildOutputRoot,
         },
         polyfill: 'off',
         splitRouteChunks: true,
+        tempDir: buildTempDirectory,
       },
       performance: {
         buildCache: {
-          cacheDigest: [appId, buildCacheTarget],
+          cacheDigest: [appId, buildTarget],
           cacheDirectory: buildCacheDirectory,
         },
         rsdoctor: {

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

@@ -412,7 +412,6 @@ function createRootTsConfig(apps = []) {
 }
 function createAppPackage(scope, app, packageSource, enableTailwind, remotes = [], bridge) {
     const publicSurfaceBuildCommand = (0, external_public_surface_cjs_namespaceObject.createPublicSurfaceGenerationCommand)(app, 'dist');
-    const publicSurfaceCloudflareBuildCommand = (0, external_public_surface_cjs_namespaceObject.createPublicSurfaceGenerationCommand)(app, 'dist');
     const publicSurfaceCloudflareOutputCommand = (0, external_public_surface_cjs_namespaceObject.createPublicSurfaceGenerationCommand)(app, 'cloudflare');
     const packageExports = Object.fromEntries(Object.entries(app.exposes ?? {}).map(([expose, source])=>[
             expose,
@@ -425,7 +424,7 @@ function createAppPackage(scope, app, packageSource, enableTailwind, remotes = [
         scripts: {
             dev: 'modern dev',
             build: app.exposes ? `ULTRAMODERN_ZEPHYR=false modern build && ${publicSurfaceBuildCommand} && node ${(0, external_naming_cjs_namespaceObject.relativeRootFor)(app.directory)}/scripts/assert-mf-types.mts` : `ULTRAMODERN_ZEPHYR=false modern build && ${publicSurfaceBuildCommand}`,
-            'cloudflare:build': `ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern build && ${publicSurfaceCloudflareBuildCommand} && ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern deploy --skip-build && ${publicSurfaceCloudflareOutputCommand}`,
+            'cloudflare:build': `ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern build && ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern deploy --skip-build && ${publicSurfaceCloudflareOutputCommand}`,
             'cloudflare:deploy': 'ULTRAMODERN_CLOUDFLARE_REQUIRE_PUBLIC_URLS=true pnpm run cloudflare:build && wrangler deploy --config .output/wrangler.json',
             'cloudflare:preview': 'pnpm run cloudflare:build && wrangler dev --config .output/wrangler.json',
             'cloudflare:proof': `node ${(0, external_naming_cjs_namespaceObject.relativeRootFor)(app.directory)}/scripts/proof-cloudflare-version.mts --app ${app.id}`,

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

@@ -175,6 +175,7 @@ function createWorkspaceValidationScript(scope, enableTailwind, remotes = []) {
     return (0, external_fs_io_cjs_namespaceObject.renderFileTemplate)("workspace-scripts/validate-ultramodern-workspace.mjs", {
         packageScope: scope,
         effectVersion: external_versions_cjs_namespaceObject.EFFECT_VERSION,
+        moduleFederationVersion: external_versions_cjs_namespaceObject.MODULE_FEDERATION_VERSION,
         nodeVersion: external_versions_cjs_namespaceObject.NODE_VERSION,
         pnpmVersion: external_versions_cjs_namespaceObject.PNPM_VERSION,
         tailwindEnabledJson: JSON.stringify(enableTailwind),

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

@@ -178,6 +178,7 @@ function generateUltramodernWorkspace(options) {
         drizzleOrmVersion: external_versions_cjs_namespaceObject.DRIZZLE_ORM_VERSION,
         effectVersion: external_versions_cjs_namespaceObject.EFFECT_VERSION,
         effectVitestVersion: external_versions_cjs_namespaceObject.EFFECT_VITEST_VERSION,
+        moduleFederationVersion: external_versions_cjs_namespaceObject.MODULE_FEDERATION_VERSION,
         tanstackRouterCoreVersion: external_versions_cjs_namespaceObject.TANSTACK_ROUTER_CORE_VERSION,
         tanstackRouterVersion: external_versions_cjs_namespaceObject.TANSTACK_ROUTER_VERSION,
         typescriptVersion: external_versions_cjs_namespaceObject.TYPESCRIPT_VERSION,

package/dist/esm/ultramodern-tooling/commands.js

@@ -7,8 +7,9 @@ import { resolveCreatePackageRoot } from "../create-package-root.js";
 import { BLEEDINGDEV_PACKAGE_NAME_PREFIX, BLEEDINGDEV_PACKAGE_SCOPE, ULTRAMODERN_SINGLE_APP_MODERN_PACKAGES, ULTRAMODERN_WORKSPACE_MODERN_PACKAGES, WORKSPACE_PACKAGE_VERSION, modernPackageSpecifier } from "../ultramodern-package-source.js";
 import { createAppEnvDts } from "../ultramodern-workspace/app-files.js";
 import { validateModuleFederationTypes } from "../ultramodern-workspace/mf-validation.js";
+import { createAppModernConfig } from "../ultramodern-workspace/module-federation.js";
 import { createAppMfTypesTsConfig, createAppTsConfig, createSharedPackageTsConfig, createTsConfigBase } from "../ultramodern-workspace/package-json.js";
-import { DRIZZLE_ORM_VERSION, EFFECT_TSGO_VERSION, EFFECT_VERSION, EFFECT_VITEST_VERSION, OXFMT_VERSION, OXLINT_VERSION, TYPESCRIPT_NATIVE_PREVIEW_VERSION, WRANGLER_VERSION, ZEPHYR_AGENT_VERSION, ZEPHYR_RSPACK_PLUGIN_VERSION } from "../ultramodern-workspace/versions.js";
+import { DRIZZLE_ORM_VERSION, EFFECT_TSGO_VERSION, EFFECT_VERSION, EFFECT_VITEST_VERSION, MODULE_FEDERATION_VERSION, OXFMT_VERSION, OXLINT_VERSION, TYPESCRIPT_NATIVE_PREVIEW_VERSION, WRANGLER_VERSION, ZEPHYR_AGENT_VERSION, ZEPHYR_RSPACK_PLUGIN_VERSION } from "../ultramodern-workspace/versions.js";
 import { createWorkspaceValidationScript } from "../ultramodern-workspace/workspace-scripts.js";
 import { readUltramodernConfig, workspaceAppsFromToolingConfig } from "./config.js";
 const commands_dirname = node_path.dirname(fileURLToPath(import.meta.url));
@@ -188,6 +189,8 @@ const strictEffectPackageVersionPolicyExclusions = [
     `effect@${EFFECT_VERSION}`,
     `@effect/opentelemetry@${EFFECT_VERSION}`
 ];
+const moduleFederationModernJsPatchPath = `patches/@module-federation__modern-js-v3@${MODULE_FEDERATION_VERSION}.patch`;
+const moduleFederationModernJsPatchSourcePath = node_path.join(createPackageRoot, 'template-workspace', moduleFederationModernJsPatchPath);
 const effectDeclarationPatchPath = 'patches/effect-schema-error-type-id.patch';
 const effectDeclarationPatchSourcePath = node_path.join(createPackageRoot, 'template-workspace', effectDeclarationPatchPath);
 const drizzleOrmDeclarationPatchPath = 'patches/drizzle-orm-ts7-strict-declarations.patch';
@@ -219,9 +222,14 @@ function updateGeneratedPackageScripts(packageJson) {
     if (!scripts || 'object' != typeof scripts || Array.isArray(scripts)) return false;
     let changed = false;
     const cloudflareBuild = scripts['cloudflare:build'];
-    if ('string' == typeof cloudflareBuild && cloudflareBuild.includes(cloudflareModernDeployCommand) && !cloudflareBuild.includes(cloudflareModernDeploySkipBuildCommand)) {
-        scripts['cloudflare:build'] = cloudflareBuild.replace(cloudflareModernDeployCommand, cloudflareModernDeploySkipBuildCommand);
-        changed = true;
+    if ('string' == typeof cloudflareBuild) {
+        let nextCloudflareBuild = cloudflareBuild;
+        if (nextCloudflareBuild.includes(cloudflareModernDeployCommand) && !nextCloudflareBuild.includes(cloudflareModernDeploySkipBuildCommand)) nextCloudflareBuild = nextCloudflareBuild.replace(cloudflareModernDeployCommand, cloudflareModernDeploySkipBuildCommand);
+        nextCloudflareBuild = nextCloudflareBuild.replace(/ && node \S*scripts\/generate-public-surface-assets\.m[ct]s --app [^&]+ --target dist(?= && ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern deploy --skip-build)/u, '');
+        if (nextCloudflareBuild !== cloudflareBuild) {
+            scripts['cloudflare:build'] = nextCloudflareBuild;
+            changed = true;
+        }
     }
     const cloudflareDeploy = scripts['cloudflare:deploy'];
     if ('string' == typeof cloudflareDeploy && cloudflareDeploy.includes(cloudflareWranglerDeployInvalidSkipBuildCommand)) {
@@ -428,6 +436,7 @@ function workspaceUsesDependency(workspaceRoot, packageName) {
 }
 function ensureGeneratedDeclarationPatches(workspaceRoot, options) {
     let changed = false;
+    changed = ensureGeneratedPatchFile(workspaceRoot, moduleFederationModernJsPatchPath, moduleFederationModernJsPatchSourcePath) || changed;
     changed = ensureGeneratedPatchFile(workspaceRoot, effectDeclarationPatchPath, effectDeclarationPatchSourcePath) || changed;
     changed = options.includeDrizzleOrmPatch ? ensureGeneratedPatchFile(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed : removeGeneratedPatchFileIfUnchanged(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed;
     return changed;
@@ -475,6 +484,9 @@ function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
     const effectPatch = ensureYamlMapEntry(source, 'patchedDependencies', `effect@${EFFECT_VERSION}`, effectDeclarationPatchPath);
     source = effectPatch.source;
     changed = effectPatch.changed || changed;
+    const moduleFederationModernJsPatch = ensureYamlMapEntry(source, 'patchedDependencies', `@module-federation/modern-js-v3@${MODULE_FEDERATION_VERSION}`, moduleFederationModernJsPatchPath);
+    source = moduleFederationModernJsPatch.source;
+    changed = moduleFederationModernJsPatch.changed || changed;
     const drizzleOrmPatch = usesDrizzleOrm ? ensureYamlMapEntry(source, 'patchedDependencies', `drizzle-orm@${DRIZZLE_ORM_VERSION}`, drizzleOrmDeclarationPatchPath) : removeYamlMapEntry(source, `drizzle-orm@${DRIZZLE_ORM_VERSION}`);
     source = drizzleOrmPatch.source;
     changed = drizzleOrmPatch.changed || changed;
@@ -524,7 +536,8 @@ function ensureGeneratedIgnoreRules(workspaceRoot) {
     let changed = false;
     for (const rule of [
         '.mf/',
-        '**/.mf/'
+        '**/.mf/',
+        'dist-cloudflare/'
     ])if (!lines.includes(rule)) {
         lines.push(rule);
         changed = true;
@@ -551,6 +564,12 @@ function updateGeneratedTypeScriptSurfaces(workspaceRoot, config) {
     }
     return changed;
 }
+function updateGeneratedModernConfigs(workspaceRoot, config) {
+    let changed = false;
+    const apps = workspaceAppsFromToolingConfig(config);
+    for (const app of apps)changed = writeTextIfChanged(node_path.join(workspaceRoot, app.directory, 'modern.config.ts'), createAppModernConfig(config.workspace.packageScope, app)) || changed;
+    return changed;
+}
 function updateReferenceTopology(workspaceRoot) {
     const topologyPath = node_path.join(workspaceRoot, 'topology/reference-topology.json');
     if (!node_fs.existsSync(topologyPath)) return false;
@@ -624,7 +643,9 @@ and pnpm contract:check.
     const packageSource = createMigrationPackageSource(args, current);
     updateUltramodernConfig(context.workspaceRoot, packageSource);
     updateReferenceTopology(context.workspaceRoot);
-    updateGeneratedTypeScriptSurfaces(context.workspaceRoot, current);
+    const migrated = readUltramodernConfig(context.workspaceRoot);
+    updateGeneratedTypeScriptSurfaces(context.workspaceRoot, migrated);
+    updateGeneratedModernConfigs(context.workspaceRoot, migrated);
     for (const relativePackageFile of listWorkspacePackageFiles(context.workspaceRoot)){
         const packageFile = node_path.join(context.workspaceRoot, relativePackageFile);
         const packageJson = readJsonFile(packageFile);

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

@@ -93,8 +93,10 @@ ${defaultAssetPrefixSource}
 // load remoteEntry.js and exposed chunks from the remote origin, not the host.
 const assetPrefix =
   configuredModernAssetPrefix || configuredUltramodernAssetPrefix || defaultAssetPrefix;
-const buildCacheTarget = cloudflareDeployEnabled ? 'cloudflare' : 'web';
-const buildCacheDirectory = \`node_modules/.cache/rspack-\${appId}-\${buildCacheTarget}\`;
+const buildTarget = cloudflareDeployEnabled ? 'cloudflare' : 'web';
+const buildOutputRoot = cloudflareDeployEnabled ? 'dist-cloudflare' : 'dist';
+const buildTempDirectory = \`node_modules/.modern-js-\${appId}-\${buildTarget}\`;
+const buildCacheDirectory = \`node_modules/.cache/rspack-\${appId}-\${buildTarget}\`;
 
 if (
   cloudflareDeployEnabled &&
@@ -136,13 +138,15 @@ ${bffConfig}      ...(cloudflareDeployEnabled
         disableTsChecker: false,
         distPath: {
           html: './',
+          root: buildOutputRoot,
         },
         polyfill: 'off',
         splitRouteChunks: true,
+        tempDir: buildTempDirectory,
       },
       performance: {
         buildCache: {
-          cacheDigest: [appId, buildCacheTarget],
+          cacheDigest: [appId, buildTarget],
           cacheDirectory: buildCacheDirectory,
         },
         rsdoctor: {

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

@@ -356,7 +356,6 @@ function createRootTsConfig(apps = []) {
 }
 function createAppPackage(scope, app, packageSource, enableTailwind, remotes = [], bridge) {
     const publicSurfaceBuildCommand = createPublicSurfaceGenerationCommand(app, 'dist');
-    const publicSurfaceCloudflareBuildCommand = createPublicSurfaceGenerationCommand(app, 'dist');
     const publicSurfaceCloudflareOutputCommand = createPublicSurfaceGenerationCommand(app, 'cloudflare');
     const packageExports = Object.fromEntries(Object.entries(app.exposes ?? {}).map(([expose, source])=>[
             expose,
@@ -369,7 +368,7 @@ function createAppPackage(scope, app, packageSource, enableTailwind, remotes = [
         scripts: {
             dev: 'modern dev',
             build: app.exposes ? `ULTRAMODERN_ZEPHYR=false modern build && ${publicSurfaceBuildCommand} && node ${relativeRootFor(app.directory)}/scripts/assert-mf-types.mts` : `ULTRAMODERN_ZEPHYR=false modern build && ${publicSurfaceBuildCommand}`,
-            'cloudflare:build': `ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern build && ${publicSurfaceCloudflareBuildCommand} && ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern deploy --skip-build && ${publicSurfaceCloudflareOutputCommand}`,
+            'cloudflare:build': `ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern build && ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern deploy --skip-build && ${publicSurfaceCloudflareOutputCommand}`,
             'cloudflare:deploy': 'ULTRAMODERN_CLOUDFLARE_REQUIRE_PUBLIC_URLS=true pnpm run cloudflare:build && wrangler deploy --config .output/wrangler.json',
             'cloudflare:preview': 'pnpm run cloudflare:build && wrangler dev --config .output/wrangler.json',
             'cloudflare:proof': `node ${relativeRootFor(app.directory)}/scripts/proof-cloudflare-version.mts --app ${app.id}`,

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

@@ -8,7 +8,7 @@ import { packageName, tailwindPrefixForApp } from "./naming.js";
 import { createCloudflareSecurityContract } from "./policy.js";
 import { publicSurfaceManagedSourceAssetPaths } from "./public-surface.js";
 import { createLocalisedUrlsMap, createRouteMetaFilePath, createRouteOwnedI18nPaths, createRoutePageFilePath } from "./routes.js";
-import { CLOUDFLARE_COMPATIBILITY_DATE, EFFECT_VERSION, NODE_VERSION, PNPM_VERSION } from "./versions.js";
+import { CLOUDFLARE_COMPATIBILITY_DATE, EFFECT_VERSION, MODULE_FEDERATION_VERSION, NODE_VERSION, PNPM_VERSION } from "./versions.js";
 function createToolWrapperScript(command, extraArgs = []) {
     const commandJson = JSON.stringify(command);
     const extraArgsJson = JSON.stringify(extraArgs);
@@ -128,6 +128,7 @@ function createWorkspaceValidationScript(scope, enableTailwind, remotes = []) {
     return renderFileTemplate("workspace-scripts/validate-ultramodern-workspace.mjs", {
         packageScope: scope,
         effectVersion: EFFECT_VERSION,
+        moduleFederationVersion: MODULE_FEDERATION_VERSION,
         nodeVersion: NODE_VERSION,
         pnpmVersion: PNPM_VERSION,
         tailwindEnabledJson: JSON.stringify(enableTailwind),

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

@@ -14,7 +14,7 @@ import { runCodeSmithOverlays } from "./overlays.js";
 import { createAppMfTypesTsConfig, createAppPackage, createAppTsConfig, createRootPackageJson, createRootTsConfig, createSharedContractsIndex, createSharedPackage, createSharedPackageTsConfig, createTsConfigBase } from "./package-json.js";
 import { resolvePackageSource } from "./package-source.js";
 import { createPublicWebAppArtifacts } from "./public-surface.js";
-import { DRIZZLE_ORM_VERSION, EFFECT_VERSION, EFFECT_VITEST_VERSION, NODE_FETCH_VERSION, NODE_VERSION, PNPM_VERSION, TANSTACK_ROUTER_CORE_VERSION, TANSTACK_ROUTER_VERSION, TYPESCRIPT_VERSION } from "./versions.js";
+import { DRIZZLE_ORM_VERSION, EFFECT_VERSION, EFFECT_VITEST_VERSION, MODULE_FEDERATION_VERSION, NODE_FETCH_VERSION, NODE_VERSION, PNPM_VERSION, TANSTACK_ROUTER_CORE_VERSION, TANSTACK_ROUTER_VERSION, TYPESCRIPT_VERSION } from "./versions.js";
 import { writeGeneratedWorkspaceScripts } from "./workspace-scripts.js";
 function writeApp(targetDir, scope, app, packageSource, enableTailwind, remotes = [], bridge) {
     const resolvedApp = 'shell' === app.kind ? createShellHost(remotes) : app;
@@ -133,6 +133,7 @@ function generateUltramodernWorkspace(options) {
         drizzleOrmVersion: DRIZZLE_ORM_VERSION,
         effectVersion: EFFECT_VERSION,
         effectVitestVersion: EFFECT_VITEST_VERSION,
+        moduleFederationVersion: MODULE_FEDERATION_VERSION,
         tanstackRouterCoreVersion: TANSTACK_ROUTER_CORE_VERSION,
         tanstackRouterVersion: TANSTACK_ROUTER_VERSION,
         typescriptVersion: TYPESCRIPT_VERSION,

package/dist/esm-node/ultramodern-tooling/commands.js

@@ -8,8 +8,9 @@ import { resolveCreatePackageRoot } from "../create-package-root.js";
 import { BLEEDINGDEV_PACKAGE_NAME_PREFIX, BLEEDINGDEV_PACKAGE_SCOPE, ULTRAMODERN_SINGLE_APP_MODERN_PACKAGES, ULTRAMODERN_WORKSPACE_MODERN_PACKAGES, WORKSPACE_PACKAGE_VERSION, modernPackageSpecifier } from "../ultramodern-package-source.js";
 import { createAppEnvDts } from "../ultramodern-workspace/app-files.js";
 import { validateModuleFederationTypes } from "../ultramodern-workspace/mf-validation.js";
+import { createAppModernConfig } from "../ultramodern-workspace/module-federation.js";
 import { createAppMfTypesTsConfig, createAppTsConfig, createSharedPackageTsConfig, createTsConfigBase } from "../ultramodern-workspace/package-json.js";
-import { DRIZZLE_ORM_VERSION, EFFECT_TSGO_VERSION, EFFECT_VERSION, EFFECT_VITEST_VERSION, OXFMT_VERSION, OXLINT_VERSION, TYPESCRIPT_NATIVE_PREVIEW_VERSION, WRANGLER_VERSION, ZEPHYR_AGENT_VERSION, ZEPHYR_RSPACK_PLUGIN_VERSION } from "../ultramodern-workspace/versions.js";
+import { DRIZZLE_ORM_VERSION, EFFECT_TSGO_VERSION, EFFECT_VERSION, EFFECT_VITEST_VERSION, MODULE_FEDERATION_VERSION, OXFMT_VERSION, OXLINT_VERSION, TYPESCRIPT_NATIVE_PREVIEW_VERSION, WRANGLER_VERSION, ZEPHYR_AGENT_VERSION, ZEPHYR_RSPACK_PLUGIN_VERSION } from "../ultramodern-workspace/versions.js";
 import { createWorkspaceValidationScript } from "../ultramodern-workspace/workspace-scripts.js";
 import { readUltramodernConfig, workspaceAppsFromToolingConfig } from "./config.js";
 const commands_dirname = node_path.dirname(fileURLToPath(import.meta.url));
@@ -189,6 +190,8 @@ const strictEffectPackageVersionPolicyExclusions = [
     `effect@${EFFECT_VERSION}`,
     `@effect/opentelemetry@${EFFECT_VERSION}`
 ];
+const moduleFederationModernJsPatchPath = `patches/@module-federation__modern-js-v3@${MODULE_FEDERATION_VERSION}.patch`;
+const moduleFederationModernJsPatchSourcePath = node_path.join(createPackageRoot, 'template-workspace', moduleFederationModernJsPatchPath);
 const effectDeclarationPatchPath = 'patches/effect-schema-error-type-id.patch';
 const effectDeclarationPatchSourcePath = node_path.join(createPackageRoot, 'template-workspace', effectDeclarationPatchPath);
 const drizzleOrmDeclarationPatchPath = 'patches/drizzle-orm-ts7-strict-declarations.patch';
@@ -220,9 +223,14 @@ function updateGeneratedPackageScripts(packageJson) {
     if (!scripts || 'object' != typeof scripts || Array.isArray(scripts)) return false;
     let changed = false;
     const cloudflareBuild = scripts['cloudflare:build'];
-    if ('string' == typeof cloudflareBuild && cloudflareBuild.includes(cloudflareModernDeployCommand) && !cloudflareBuild.includes(cloudflareModernDeploySkipBuildCommand)) {
-        scripts['cloudflare:build'] = cloudflareBuild.replace(cloudflareModernDeployCommand, cloudflareModernDeploySkipBuildCommand);
-        changed = true;
+    if ('string' == typeof cloudflareBuild) {
+        let nextCloudflareBuild = cloudflareBuild;
+        if (nextCloudflareBuild.includes(cloudflareModernDeployCommand) && !nextCloudflareBuild.includes(cloudflareModernDeploySkipBuildCommand)) nextCloudflareBuild = nextCloudflareBuild.replace(cloudflareModernDeployCommand, cloudflareModernDeploySkipBuildCommand);
+        nextCloudflareBuild = nextCloudflareBuild.replace(/ && node \S*scripts\/generate-public-surface-assets\.m[ct]s --app [^&]+ --target dist(?= && ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern deploy --skip-build)/u, '');
+        if (nextCloudflareBuild !== cloudflareBuild) {
+            scripts['cloudflare:build'] = nextCloudflareBuild;
+            changed = true;
+        }
     }
     const cloudflareDeploy = scripts['cloudflare:deploy'];
     if ('string' == typeof cloudflareDeploy && cloudflareDeploy.includes(cloudflareWranglerDeployInvalidSkipBuildCommand)) {
@@ -429,6 +437,7 @@ function workspaceUsesDependency(workspaceRoot, packageName) {
 }
 function ensureGeneratedDeclarationPatches(workspaceRoot, options) {
     let changed = false;
+    changed = ensureGeneratedPatchFile(workspaceRoot, moduleFederationModernJsPatchPath, moduleFederationModernJsPatchSourcePath) || changed;
     changed = ensureGeneratedPatchFile(workspaceRoot, effectDeclarationPatchPath, effectDeclarationPatchSourcePath) || changed;
     changed = options.includeDrizzleOrmPatch ? ensureGeneratedPatchFile(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed : removeGeneratedPatchFileIfUnchanged(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed;
     return changed;
@@ -476,6 +485,9 @@ function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
     const effectPatch = ensureYamlMapEntry(source, 'patchedDependencies', `effect@${EFFECT_VERSION}`, effectDeclarationPatchPath);
     source = effectPatch.source;
     changed = effectPatch.changed || changed;
+    const moduleFederationModernJsPatch = ensureYamlMapEntry(source, 'patchedDependencies', `@module-federation/modern-js-v3@${MODULE_FEDERATION_VERSION}`, moduleFederationModernJsPatchPath);
+    source = moduleFederationModernJsPatch.source;
+    changed = moduleFederationModernJsPatch.changed || changed;
     const drizzleOrmPatch = usesDrizzleOrm ? ensureYamlMapEntry(source, 'patchedDependencies', `drizzle-orm@${DRIZZLE_ORM_VERSION}`, drizzleOrmDeclarationPatchPath) : removeYamlMapEntry(source, `drizzle-orm@${DRIZZLE_ORM_VERSION}`);
     source = drizzleOrmPatch.source;
     changed = drizzleOrmPatch.changed || changed;
@@ -525,7 +537,8 @@ function ensureGeneratedIgnoreRules(workspaceRoot) {
     let changed = false;
     for (const rule of [
         '.mf/',
-        '**/.mf/'
+        '**/.mf/',
+        'dist-cloudflare/'
     ])if (!lines.includes(rule)) {
         lines.push(rule);
         changed = true;
@@ -552,6 +565,12 @@ function updateGeneratedTypeScriptSurfaces(workspaceRoot, config) {
     }
     return changed;
 }
+function updateGeneratedModernConfigs(workspaceRoot, config) {
+    let changed = false;
+    const apps = workspaceAppsFromToolingConfig(config);
+    for (const app of apps)changed = writeTextIfChanged(node_path.join(workspaceRoot, app.directory, 'modern.config.ts'), createAppModernConfig(config.workspace.packageScope, app)) || changed;
+    return changed;
+}
 function updateReferenceTopology(workspaceRoot) {
     const topologyPath = node_path.join(workspaceRoot, 'topology/reference-topology.json');
     if (!node_fs.existsSync(topologyPath)) return false;
@@ -625,7 +644,9 @@ and pnpm contract:check.
     const packageSource = createMigrationPackageSource(args, current);
     updateUltramodernConfig(context.workspaceRoot, packageSource);
     updateReferenceTopology(context.workspaceRoot);
-    updateGeneratedTypeScriptSurfaces(context.workspaceRoot, current);
+    const migrated = readUltramodernConfig(context.workspaceRoot);
+    updateGeneratedTypeScriptSurfaces(context.workspaceRoot, migrated);
+    updateGeneratedModernConfigs(context.workspaceRoot, migrated);
     for (const relativePackageFile of listWorkspacePackageFiles(context.workspaceRoot)){
         const packageFile = node_path.join(context.workspaceRoot, relativePackageFile);
         const packageJson = readJsonFile(packageFile);

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

@@ -94,8 +94,10 @@ ${defaultAssetPrefixSource}
 // load remoteEntry.js and exposed chunks from the remote origin, not the host.
 const assetPrefix =
   configuredModernAssetPrefix || configuredUltramodernAssetPrefix || defaultAssetPrefix;
-const buildCacheTarget = cloudflareDeployEnabled ? 'cloudflare' : 'web';
-const buildCacheDirectory = \`node_modules/.cache/rspack-\${appId}-\${buildCacheTarget}\`;
+const buildTarget = cloudflareDeployEnabled ? 'cloudflare' : 'web';
+const buildOutputRoot = cloudflareDeployEnabled ? 'dist-cloudflare' : 'dist';
+const buildTempDirectory = \`node_modules/.modern-js-\${appId}-\${buildTarget}\`;
+const buildCacheDirectory = \`node_modules/.cache/rspack-\${appId}-\${buildTarget}\`;
 
 if (
   cloudflareDeployEnabled &&
@@ -137,13 +139,15 @@ ${bffConfig}      ...(cloudflareDeployEnabled
         disableTsChecker: false,
         distPath: {
           html: './',
+          root: buildOutputRoot,
         },
         polyfill: 'off',
         splitRouteChunks: true,
+        tempDir: buildTempDirectory,
       },
       performance: {
         buildCache: {
-          cacheDigest: [appId, buildCacheTarget],
+          cacheDigest: [appId, buildTarget],
           cacheDirectory: buildCacheDirectory,
         },
         rsdoctor: {

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

@@ -357,7 +357,6 @@ function createRootTsConfig(apps = []) {
 }
 function createAppPackage(scope, app, packageSource, enableTailwind, remotes = [], bridge) {
     const publicSurfaceBuildCommand = createPublicSurfaceGenerationCommand(app, 'dist');
-    const publicSurfaceCloudflareBuildCommand = createPublicSurfaceGenerationCommand(app, 'dist');
     const publicSurfaceCloudflareOutputCommand = createPublicSurfaceGenerationCommand(app, 'cloudflare');
     const packageExports = Object.fromEntries(Object.entries(app.exposes ?? {}).map(([expose, source])=>[
             expose,
@@ -370,7 +369,7 @@ function createAppPackage(scope, app, packageSource, enableTailwind, remotes = [
         scripts: {
             dev: 'modern dev',
             build: app.exposes ? `ULTRAMODERN_ZEPHYR=false modern build && ${publicSurfaceBuildCommand} && node ${relativeRootFor(app.directory)}/scripts/assert-mf-types.mts` : `ULTRAMODERN_ZEPHYR=false modern build && ${publicSurfaceBuildCommand}`,
-            'cloudflare:build': `ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern build && ${publicSurfaceCloudflareBuildCommand} && ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern deploy --skip-build && ${publicSurfaceCloudflareOutputCommand}`,
+            'cloudflare:build': `ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern build && ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern deploy --skip-build && ${publicSurfaceCloudflareOutputCommand}`,
             'cloudflare:deploy': 'ULTRAMODERN_CLOUDFLARE_REQUIRE_PUBLIC_URLS=true pnpm run cloudflare:build && wrangler deploy --config .output/wrangler.json',
             'cloudflare:preview': 'pnpm run cloudflare:build && wrangler dev --config .output/wrangler.json',
             'cloudflare:proof': `node ${relativeRootFor(app.directory)}/scripts/proof-cloudflare-version.mts --app ${app.id}`,

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

@@ -9,7 +9,7 @@ import { packageName, tailwindPrefixForApp } from "./naming.js";
 import { createCloudflareSecurityContract } from "./policy.js";
 import { publicSurfaceManagedSourceAssetPaths } from "./public-surface.js";
 import { createLocalisedUrlsMap, createRouteMetaFilePath, createRouteOwnedI18nPaths, createRoutePageFilePath } from "./routes.js";
-import { CLOUDFLARE_COMPATIBILITY_DATE, EFFECT_VERSION, NODE_VERSION, PNPM_VERSION } from "./versions.js";
+import { CLOUDFLARE_COMPATIBILITY_DATE, EFFECT_VERSION, MODULE_FEDERATION_VERSION, NODE_VERSION, PNPM_VERSION } from "./versions.js";
 function createToolWrapperScript(command, extraArgs = []) {
     const commandJson = JSON.stringify(command);
     const extraArgsJson = JSON.stringify(extraArgs);
@@ -129,6 +129,7 @@ function createWorkspaceValidationScript(scope, enableTailwind, remotes = []) {
     return renderFileTemplate("workspace-scripts/validate-ultramodern-workspace.mjs", {
         packageScope: scope,
         effectVersion: EFFECT_VERSION,
+        moduleFederationVersion: MODULE_FEDERATION_VERSION,
         nodeVersion: NODE_VERSION,
         pnpmVersion: PNPM_VERSION,
         tailwindEnabledJson: JSON.stringify(enableTailwind),

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

@@ -15,7 +15,7 @@ import { runCodeSmithOverlays } from "./overlays.js";
 import { createAppMfTypesTsConfig, createAppPackage, createAppTsConfig, createRootPackageJson, createRootTsConfig, createSharedContractsIndex, createSharedPackage, createSharedPackageTsConfig, createTsConfigBase } from "./package-json.js";
 import { resolvePackageSource } from "./package-source.js";
 import { createPublicWebAppArtifacts } from "./public-surface.js";
-import { DRIZZLE_ORM_VERSION, EFFECT_VERSION, EFFECT_VITEST_VERSION, NODE_FETCH_VERSION, NODE_VERSION, PNPM_VERSION, TANSTACK_ROUTER_CORE_VERSION, TANSTACK_ROUTER_VERSION, TYPESCRIPT_VERSION } from "./versions.js";
+import { DRIZZLE_ORM_VERSION, EFFECT_VERSION, EFFECT_VITEST_VERSION, MODULE_FEDERATION_VERSION, NODE_FETCH_VERSION, NODE_VERSION, PNPM_VERSION, TANSTACK_ROUTER_CORE_VERSION, TANSTACK_ROUTER_VERSION, TYPESCRIPT_VERSION } from "./versions.js";
 import { writeGeneratedWorkspaceScripts } from "./workspace-scripts.js";
 function writeApp(targetDir, scope, app, packageSource, enableTailwind, remotes = [], bridge) {
     const resolvedApp = 'shell' === app.kind ? createShellHost(remotes) : app;
@@ -134,6 +134,7 @@ function generateUltramodernWorkspace(options) {
         drizzleOrmVersion: DRIZZLE_ORM_VERSION,
         effectVersion: EFFECT_VERSION,
         effectVitestVersion: EFFECT_VITEST_VERSION,
+        moduleFederationVersion: MODULE_FEDERATION_VERSION,
         tanstackRouterCoreVersion: TANSTACK_ROUTER_CORE_VERSION,
         tanstackRouterVersion: TANSTACK_ROUTER_VERSION,
         typescriptVersion: TYPESCRIPT_VERSION,

package/package.json

@@ -21,7 +21,7 @@
   "engines": {
     "node": ">=20"
   },
-  "version": "3.5.0-ultramodern.12",
+  "version": "3.5.0-ultramodern.14",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/esm-node/index.js",
   "bin": {
@@ -77,7 +77,7 @@
     "@modern-js/codesmith": "2.6.9",
     "oxfmt": "0.56.0",
     "ultracite": "7.8.3",
-    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.5.0-ultramodern.12"
+    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.5.0-ultramodern.14"
   },
   "devDependencies": {
     "@rslib/core": "0.23.1",
@@ -99,6 +99,6 @@
     "test": "rm -rf dist && rslib build -c rslibconfig.mts && rstest --passWithNoTests"
   },
   "ultramodern": {
-    "frameworkVersion": "3.5.0-ultramodern.12"
+    "frameworkVersion": "3.5.0-ultramodern.14"
   }
 }

package/template-workspace/.gitignore.handlebars

@@ -1,5 +1,6 @@
 node_modules/
 dist/
+dist-cloudflare/
 build/
 .modernjs/cache/
 .modern-js/

package/template-workspace/patches/@module-federation__modern-js-v3@2.6.0.patch

@@ -0,0 +1,57 @@
+diff --git a/dist/cjs/cli/configPlugin.js b/dist/cjs/cli/configPlugin.js
+index 0d01ad0..e5485a2 100644
+--- a/dist/cjs/cli/configPlugin.js
++++ b/dist/cjs/cli/configPlugin.js
+@@ -212,9 +212,12 @@ var __webpack_exports__ = {};
+         if (!chain.output.get('uniqueName')) chain.output.uniqueName(mfConfig.name);
+         const splitChunkConfig = chain.optimization.splitChunks.entries();
+         if (!isServer) (0, utils_namespaceObject.autoDeleteSplitChunkCacheGroups)(mfConfig, splitChunkConfig);
+-        if (!isServer && enableSSR && splitChunkConfig && 'object' == typeof splitChunkConfig && splitChunkConfig.cacheGroups) {
++        if (!isServer && enableSSR && splitChunkConfig && 'object' == typeof splitChunkConfig && splitChunkConfig.cacheGroups && splitChunkConfig.chunks !== undefined && splitChunkConfig.chunks !== 'async') {
++            const previousChunks = splitChunkConfig.chunks;
+             splitChunkConfig.chunks = 'async';
+-            external_logger_js_default().warn('splitChunks.chunks = async is not allowed with stream SSR mode, it will auto changed to "async"');
++            if (void 0 !== previousChunks) {
++                external_logger_js_default().warn(`splitChunks.chunks = ${previousChunks} is not allowed with stream SSR mode, it will auto changed to "async"`);
++            }
+         }
+         if ((0, external_utils_js_namespaceObject.isDev)() && 'auto' === chain.output.get('publicPath')) {
+             var _modernjsConfig_server;
+diff --git a/dist/esm/cli/configPlugin.mjs b/dist/esm/cli/configPlugin.mjs
+index 3e880c8..93e4290 100644
+--- a/dist/esm/cli/configPlugin.mjs
++++ b/dist/esm/cli/configPlugin.mjs
+@@ -194,9 +194,12 @@ function patchBundlerConfig(options) {
+     if (!chain.output.get('uniqueName')) chain.output.uniqueName(mfConfig.name);
+     var splitChunkConfig = chain.optimization.splitChunks.entries();
+     if (!isServer) autoDeleteSplitChunkCacheGroups(mfConfig, splitChunkConfig);
+-    if (!isServer && enableSSR && splitChunkConfig && (void 0 === splitChunkConfig ? "undefined" : _type_of__(splitChunkConfig)) === 'object' && splitChunkConfig.cacheGroups) {
++    if (!isServer && enableSSR && splitChunkConfig && (void 0 === splitChunkConfig ? "undefined" : _type_of__(splitChunkConfig)) === 'object' && splitChunkConfig.cacheGroups && void 0 !== splitChunkConfig.chunks && splitChunkConfig.chunks !== 'async') {
++        var previousChunks = splitChunkConfig.chunks;
+         splitChunkConfig.chunks = 'async';
+-        logger.warn('splitChunks.chunks = async is not allowed with stream SSR mode, it will auto changed to "async"');
++        if (void 0 !== previousChunks) {
++            logger.warn("splitChunks.chunks = ".concat(previousChunks, " is not allowed with stream SSR mode, it will auto changed to \"async\""));
++        }
+     }
+     if (isDev() && 'auto' === chain.output.get('publicPath')) {
+         var _modernjsConfig_server;
+diff --git a/dist/esm-node/cli/configPlugin.mjs b/dist/esm-node/cli/configPlugin.mjs
+index 722f1bb..dcac7ec 100644
+--- a/dist/esm-node/cli/configPlugin.mjs
++++ b/dist/esm-node/cli/configPlugin.mjs
+@@ -165,9 +165,12 @@ function patchBundlerConfig(options) {
+     if (!chain.output.get('uniqueName')) chain.output.uniqueName(mfConfig.name);
+     const splitChunkConfig = chain.optimization.splitChunks.entries();
+     if (!isServer) autoDeleteSplitChunkCacheGroups(mfConfig, splitChunkConfig);
+-    if (!isServer && enableSSR && splitChunkConfig && 'object' == typeof splitChunkConfig && splitChunkConfig.cacheGroups) {
++    if (!isServer && enableSSR && splitChunkConfig && 'object' == typeof splitChunkConfig && splitChunkConfig.cacheGroups && splitChunkConfig.chunks !== undefined && splitChunkConfig.chunks !== 'async') {
++        const previousChunks = splitChunkConfig.chunks;
+         splitChunkConfig.chunks = 'async';
+-        logger.warn('splitChunks.chunks = async is not allowed with stream SSR mode, it will auto changed to "async"');
++        if (void 0 !== previousChunks) {
++            logger.warn(`splitChunks.chunks = ${previousChunks} is not allowed with stream SSR mode, it will auto changed to "async"`);
++        }
+     }
+     if (isDev() && 'auto' === chain.output.get('publicPath')) {
+         var _modernjsConfig_server;

package/template-workspace/pnpm-workspace.yaml.handlebars

@@ -62,5 +62,6 @@ allowBuilds:
   workerd: true
 
 patchedDependencies:
+  '@module-federation/modern-js-v3@{{moduleFederationVersion}}': patches/@module-federation__modern-js-v3@{{moduleFederationVersion}}.patch
   '@tanstack/router-core@{{tanstackRouterCoreVersion}}': patches/@tanstack__router-core@{{tanstackRouterCoreVersion}}.patch
   'effect@{{effectVersion}}': patches/effect-schema-error-type-id.patch

package/templates/workspace-scripts/validate-ultramodern-workspace.mjs.handlebars

@@ -1363,12 +1363,17 @@ const extractAssetPrefixExpression = modernConfig => {
   assert(match?.groups?.expression, 'modern.config.ts must assign assetPrefix');
   return match.groups.expression;
 };
-const assertBuildCacheBase = (appId, modernConfig) => {
+const assertTargetIsolatedBuildArtifacts = (appId, modernConfig) => {
   assert(
-    modernConfig.includes("const buildCacheTarget = cloudflareDeployEnabled ? 'cloudflare' : 'web';") &&
-      modernConfig.includes('const buildCacheDirectory = `node_modules/.cache/rspack-${appId}-${buildCacheTarget}`;') &&
+    modernConfig.includes("const buildTarget = cloudflareDeployEnabled ? 'cloudflare' : 'web';") &&
+      modernConfig.includes("const buildOutputRoot = cloudflareDeployEnabled ? 'dist-cloudflare' : 'dist';") &&
+      modernConfig.includes('const buildTempDirectory = `node_modules/.modern-js-${appId}-${buildTarget}`;') &&
+      modernConfig.includes('const buildCacheDirectory = `node_modules/.cache/rspack-${appId}-${buildTarget}`;') &&
+      modernConfig.includes('root: buildOutputRoot,') &&
+      modernConfig.includes('tempDir: buildTempDirectory,') &&
+      modernConfig.includes('cacheDigest: [appId, buildTarget],') &&
       modernConfig.includes('cacheDirectory: buildCacheDirectory,'),
-    `${appId} must provide a per-app/per-target Rspack cache base directory`,
+    `${appId} must isolate build output, Modern temp files, and Rspack cache by app and build target`,
   );
 };
 const assertCloudflareBuildSkipsDeployRebuild = (appId, packageJson) => {
@@ -1378,6 +1383,12 @@ const assertCloudflareBuildSkipsDeployRebuild = (appId, packageJson) => {
     ),
     `${appId} cloudflare:build must deploy with --skip-build after the explicit Cloudflare build`,
   );
+  assert(
+    !packageJson.scripts?.['cloudflare:build']?.includes(
+      '--target dist && ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern deploy',
+    ),
+    `${appId} cloudflare:build must not write public-surface assets into the normal web dist before deploy`,
+  );
 };
 const stripYamlInlineComment = value => {
   let quote = undefined;
@@ -1492,6 +1503,7 @@ const requiredPaths = [
   '.gitignore',
   'package.json',
   'pnpm-workspace.yaml',
+  'patches/@module-federation__modern-js-v3@{{moduleFederationVersion}}.patch',
   'patches/effect-schema-error-type-id.patch',
   'tsconfig.json',
   'tsconfig.base.json',
@@ -1569,6 +1581,12 @@ for (const requiredPath of requiredPaths) {
   assertExists(requiredPath);
 }
 const pnpmWorkspace = readText('pnpm-workspace.yaml');
+assert(
+  pnpmWorkspace.includes(
+    "'@module-federation/modern-js-v3@{{moduleFederationVersion}}': patches/@module-federation__modern-js-v3@{{moduleFederationVersion}}.patch",
+  ),
+  'pnpm-workspace.yaml must patch the generated Module Federation Modern.js integration cohort',
+);
 assert(
   pnpmWorkspace.includes(
     "'effect@{{effectVersion}}': patches/effect-schema-error-type-id.patch",
@@ -1795,6 +1813,7 @@ const shellRouteHead = readText('apps/shell-super-app/src/routes/ultramodern-rou
 const shellRouteMetadata = readText('apps/shell-super-app/src/routes/ultramodern-route-metadata.ts');
 assert(/^\.mf\/$/mu.test(gitignore), 'Generated .gitignore must ignore root Module Federation diagnostics');
 assert(/^\*\*\/\.mf\/$/mu.test(gitignore), 'Generated .gitignore must ignore per-app Module Federation diagnostics');
+assert(/^dist-cloudflare\/$/mu.test(gitignore), 'Generated .gitignore must ignore Cloudflare build output');
 assert(shellModernAppEnv.includes("import '@modern-js/app-tools/types';"), 'Shell app env must import the framework-owned app ambient type bundle through module resolution');
 assert(/declare global \{\s*const ULTRAMODERN_SITE_URL: string;\s*\}/u.test(shellModernAppEnv), 'Shell app env must keep generated globals explicit after importing app ambient types');
 assert(!shellModernAppEnv.includes("declare module '*.svg'"), 'Shell app env must not redeclare framework-owned svg asset modules');
@@ -1818,7 +1837,7 @@ assert(shellPackage.dependencies?.['@modern-js/plugin-i18n'] === expectedModernP
 assert(shellPackage.dependencies?.['@modern-js/plugin-tanstack'] === expectedModernPackageSpecifier('@modern-js/plugin-tanstack'), 'Shell plugin-tanstack dependency must match package source metadata');
 assert(shellPackage.dependencies?.['@modern-js/runtime'] === expectedModernPackageSpecifier('@modern-js/runtime'), 'Shell runtime dependency must match package source metadata');
 assert(shellPackage.scripts?.['cloudflare:deploy'] === 'ULTRAMODERN_CLOUDFLARE_REQUIRE_PUBLIC_URLS=true pnpm run cloudflare:build && wrangler deploy --config .output/wrangler.json', 'Shell must expose cloudflare:deploy');
-assertBuildCacheBase('shell-super-app', shellModernConfig);
+assertTargetIsolatedBuildArtifacts('shell-super-app', shellModernConfig);
 assertCloudflareBuildSkipsDeployRebuild('shell-super-app', shellPackage);
 const shellContract = generatedContract.apps?.find(app => app.id === 'shell-super-app');
 assert(shellContract?.deploy?.cloudflare?.workerName === expectedWorkerName('shell-super-app'), 'Shell Cloudflare workerName is incorrect');
@@ -1901,7 +1920,7 @@ for (const vertical of fullStackVerticals) {
   assert(routeMetadata.includes("authoring: 'colocated-route-meta'"), `${vertical.id} route metadata manifest must advertise colocated authoring`);
   assert(packageJson.name === vertical.packageName, `${vertical.id} package name is incorrect`);
   assert(packageJson.scripts?.['cloudflare:deploy'] === 'ULTRAMODERN_CLOUDFLARE_REQUIRE_PUBLIC_URLS=true pnpm run cloudflare:build && wrangler deploy --config .output/wrangler.json', `${vertical.id} must expose cloudflare:deploy`);
-  assertBuildCacheBase(vertical.id, modernConfig);
+  assertTargetIsolatedBuildArtifacts(vertical.id, modernConfig);
   assertCloudflareBuildSkipsDeployRebuild(vertical.id, packageJson);
   assert(packageJson.scripts?.['cloudflare:proof']?.includes(`--app ${vertical.id}`), `${vertical.id} must expose cloudflare:proof`);
   assert(packageJson.devDependencies?.['@modern-js/app-tools'] === expectedModernPackageSpecifier('@modern-js/app-tools'), `${vertical.id} app-tools dependency must match package source metadata`);