@bleedingdev/modern-js-create 3.5.0-ultramodern.11 → 3.5.0-ultramodern.13

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");
@@ -266,9 +267,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)) {
@@ -407,6 +413,19 @@ function ensureYamlMapEntry(source, key, entryKey, value) {
         changed: true
     };
 }
+function removeYamlMapEntry(source, entryKey) {
+    const packageName = entryKey.includes('@') ? entryKey.slice(0, entryKey.lastIndexOf('@')) : entryKey;
+    const escapedPackageName = packageName.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
+    const currentEntryPattern = new RegExp(`^ {2}'${escapedPackageName}@[^']+': .+\\n?`, 'mu');
+    if (!currentEntryPattern.test(source)) return {
+        source,
+        changed: false
+    };
+    return {
+        source: source.replace(currentEntryPattern, ''),
+        changed: true
+    };
+}
 function ensureGeneratedPatchFile(workspaceRoot, relativePatchPath, sourcePatchPath) {
     const targetPath = external_node_path_default().join(workspaceRoot, relativePatchPath);
     const patch = external_node_fs_default().readFileSync(sourcePatchPath, 'utf-8');
@@ -417,10 +436,53 @@ function ensureGeneratedPatchFile(workspaceRoot, relativePatchPath, sourcePatchP
     external_node_fs_default().writeFileSync(targetPath, patch, 'utf-8');
     return true;
 }
-function ensureGeneratedDeclarationPatches(workspaceRoot) {
+function removeGeneratedPatchFileIfUnchanged(workspaceRoot, relativePatchPath, sourcePatchPath) {
+    const targetPath = external_node_path_default().join(workspaceRoot, relativePatchPath);
+    if (!external_node_fs_default().existsSync(targetPath)) return false;
+    const patch = external_node_fs_default().readFileSync(sourcePatchPath, 'utf-8');
+    if (external_node_fs_default().readFileSync(targetPath, 'utf-8') !== patch) return false;
+    external_node_fs_default().rmSync(targetPath);
+    return true;
+}
+function workspaceUsesDependency(workspaceRoot, packageName) {
+    const packageJsonPaths = [
+        external_node_path_default().join(workspaceRoot, 'package.json')
+    ];
+    for (const workspaceDir of [
+        'apps',
+        'verticals',
+        'packages'
+    ]){
+        const absoluteWorkspaceDir = external_node_path_default().join(workspaceRoot, workspaceDir);
+        if (external_node_fs_default().existsSync(absoluteWorkspaceDir)) for (const entry of external_node_fs_default().readdirSync(absoluteWorkspaceDir, {
+            withFileTypes: true
+        })){
+            if (!entry.isDirectory()) continue;
+            const packageJsonPath = external_node_path_default().join(absoluteWorkspaceDir, entry.name, 'package.json');
+            if (external_node_fs_default().existsSync(packageJsonPath)) packageJsonPaths.push(packageJsonPath);
+        }
+    }
+    for (const packageJsonPath of packageJsonPaths){
+        const packageJson = JSON.parse(external_node_fs_default().readFileSync(packageJsonPath, 'utf-8'));
+        for (const field of [
+            'dependencies',
+            'devDependencies',
+            'peerDependencies',
+            'optionalDependencies'
+        ]){
+            const dependencies = packageJson[field];
+            if (dependencies && 'object' == typeof dependencies) {
+                if (Object.prototype.hasOwnProperty.call(dependencies, packageName)) return true;
+                for (const specifier of Object.values(dependencies))if ('string' == typeof specifier && specifier.startsWith(`npm:${packageName}@`)) return true;
+            }
+        }
+    }
+    return false;
+}
+function ensureGeneratedDeclarationPatches(workspaceRoot, options) {
     let changed = false;
     changed = ensureGeneratedPatchFile(workspaceRoot, effectDeclarationPatchPath, effectDeclarationPatchSourcePath) || changed;
-    changed = ensureGeneratedPatchFile(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed;
+    changed = options.includeDrizzleOrmPatch ? ensureGeneratedPatchFile(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed : removeGeneratedPatchFileIfUnchanged(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed;
     return changed;
 }
 function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
@@ -428,6 +490,7 @@ function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
     if (!external_node_fs_default().existsSync(workspaceFile)) return false;
     let source = external_node_fs_default().readFileSync(workspaceFile, 'utf-8');
     let changed = false;
+    const usesDrizzleOrm = workspaceUsesDependency(workspaceRoot, 'drizzle-orm');
     const replacements = [
         [
             /^ {4}'@effect\/vitest>effect': .+$/mu,
@@ -465,7 +528,7 @@ function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
     const effectPatch = ensureYamlMapEntry(source, 'patchedDependencies', `effect@${versions_cjs_namespaceObject.EFFECT_VERSION}`, effectDeclarationPatchPath);
     source = effectPatch.source;
     changed = effectPatch.changed || changed;
-    const drizzleOrmPatch = ensureYamlMapEntry(source, 'patchedDependencies', `drizzle-orm@${versions_cjs_namespaceObject.DRIZZLE_ORM_VERSION}`, drizzleOrmDeclarationPatchPath);
+    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;
     if (changed) external_node_fs_default().writeFileSync(workspaceFile, source, 'utf-8');
@@ -514,7 +577,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;
@@ -541,6 +605,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;
@@ -614,7 +684,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);
@@ -633,7 +705,9 @@ and pnpm contract:check.
         else if ('package.json' === relativePackageFile) writeJsonFile(packageFile, packageJson);
     }
     updateGeneratedPnpmWorkspacePolicy(context.workspaceRoot);
-    ensureGeneratedDeclarationPatches(context.workspaceRoot);
+    ensureGeneratedDeclarationPatches(context.workspaceRoot, {
+        includeDrizzleOrmPatch: workspaceUsesDependency(context.workspaceRoot, 'drizzle-orm')
+    });
     if (!hasFlag(args, '--skip-install')) {
         const status = runPnpmLockfileRefresh(context);
         if (0 !== status) return status;

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/esm/ultramodern-tooling/commands.js

@@ -7,6 +7,7 @@ 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 { createWorkspaceValidationScript } from "../ultramodern-workspace/workspace-scripts.js";
@@ -219,9 +220,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)) {
@@ -360,6 +366,19 @@ function ensureYamlMapEntry(source, key, entryKey, value) {
         changed: true
     };
 }
+function removeYamlMapEntry(source, entryKey) {
+    const packageName = entryKey.includes('@') ? entryKey.slice(0, entryKey.lastIndexOf('@')) : entryKey;
+    const escapedPackageName = packageName.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
+    const currentEntryPattern = new RegExp(`^ {2}'${escapedPackageName}@[^']+': .+\\n?`, 'mu');
+    if (!currentEntryPattern.test(source)) return {
+        source,
+        changed: false
+    };
+    return {
+        source: source.replace(currentEntryPattern, ''),
+        changed: true
+    };
+}
 function ensureGeneratedPatchFile(workspaceRoot, relativePatchPath, sourcePatchPath) {
     const targetPath = node_path.join(workspaceRoot, relativePatchPath);
     const patch = node_fs.readFileSync(sourcePatchPath, 'utf-8');
@@ -370,10 +389,53 @@ function ensureGeneratedPatchFile(workspaceRoot, relativePatchPath, sourcePatchP
     node_fs.writeFileSync(targetPath, patch, 'utf-8');
     return true;
 }
-function ensureGeneratedDeclarationPatches(workspaceRoot) {
+function removeGeneratedPatchFileIfUnchanged(workspaceRoot, relativePatchPath, sourcePatchPath) {
+    const targetPath = node_path.join(workspaceRoot, relativePatchPath);
+    if (!node_fs.existsSync(targetPath)) return false;
+    const patch = node_fs.readFileSync(sourcePatchPath, 'utf-8');
+    if (node_fs.readFileSync(targetPath, 'utf-8') !== patch) return false;
+    node_fs.rmSync(targetPath);
+    return true;
+}
+function workspaceUsesDependency(workspaceRoot, packageName) {
+    const packageJsonPaths = [
+        node_path.join(workspaceRoot, 'package.json')
+    ];
+    for (const workspaceDir of [
+        'apps',
+        'verticals',
+        'packages'
+    ]){
+        const absoluteWorkspaceDir = node_path.join(workspaceRoot, workspaceDir);
+        if (node_fs.existsSync(absoluteWorkspaceDir)) for (const entry of node_fs.readdirSync(absoluteWorkspaceDir, {
+            withFileTypes: true
+        })){
+            if (!entry.isDirectory()) continue;
+            const packageJsonPath = node_path.join(absoluteWorkspaceDir, entry.name, 'package.json');
+            if (node_fs.existsSync(packageJsonPath)) packageJsonPaths.push(packageJsonPath);
+        }
+    }
+    for (const packageJsonPath of packageJsonPaths){
+        const packageJson = JSON.parse(node_fs.readFileSync(packageJsonPath, 'utf-8'));
+        for (const field of [
+            'dependencies',
+            'devDependencies',
+            'peerDependencies',
+            'optionalDependencies'
+        ]){
+            const dependencies = packageJson[field];
+            if (dependencies && 'object' == typeof dependencies) {
+                if (Object.prototype.hasOwnProperty.call(dependencies, packageName)) return true;
+                for (const specifier of Object.values(dependencies))if ('string' == typeof specifier && specifier.startsWith(`npm:${packageName}@`)) return true;
+            }
+        }
+    }
+    return false;
+}
+function ensureGeneratedDeclarationPatches(workspaceRoot, options) {
     let changed = false;
     changed = ensureGeneratedPatchFile(workspaceRoot, effectDeclarationPatchPath, effectDeclarationPatchSourcePath) || changed;
-    changed = ensureGeneratedPatchFile(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed;
+    changed = options.includeDrizzleOrmPatch ? ensureGeneratedPatchFile(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed : removeGeneratedPatchFileIfUnchanged(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed;
     return changed;
 }
 function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
@@ -381,6 +443,7 @@ function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
     if (!node_fs.existsSync(workspaceFile)) return false;
     let source = node_fs.readFileSync(workspaceFile, 'utf-8');
     let changed = false;
+    const usesDrizzleOrm = workspaceUsesDependency(workspaceRoot, 'drizzle-orm');
     const replacements = [
         [
             /^ {4}'@effect\/vitest>effect': .+$/mu,
@@ -418,7 +481,7 @@ function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
     const effectPatch = ensureYamlMapEntry(source, 'patchedDependencies', `effect@${EFFECT_VERSION}`, effectDeclarationPatchPath);
     source = effectPatch.source;
     changed = effectPatch.changed || changed;
-    const drizzleOrmPatch = ensureYamlMapEntry(source, 'patchedDependencies', `drizzle-orm@${DRIZZLE_ORM_VERSION}`, drizzleOrmDeclarationPatchPath);
+    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;
     if (changed) node_fs.writeFileSync(workspaceFile, source, 'utf-8');
@@ -467,7 +530,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;
@@ -494,6 +558,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;
@@ -567,7 +637,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);
@@ -586,7 +658,9 @@ and pnpm contract:check.
         else if ('package.json' === relativePackageFile) writeJsonFile(packageFile, packageJson);
     }
     updateGeneratedPnpmWorkspacePolicy(context.workspaceRoot);
-    ensureGeneratedDeclarationPatches(context.workspaceRoot);
+    ensureGeneratedDeclarationPatches(context.workspaceRoot, {
+        includeDrizzleOrmPatch: workspaceUsesDependency(context.workspaceRoot, 'drizzle-orm')
+    });
     if (!hasFlag(args, '--skip-install')) {
         const status = runPnpmLockfileRefresh(context);
         if (0 !== status) return status;

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-node/ultramodern-tooling/commands.js

@@ -8,6 +8,7 @@ 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 { createWorkspaceValidationScript } from "../ultramodern-workspace/workspace-scripts.js";
@@ -220,9 +221,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)) {
@@ -361,6 +367,19 @@ function ensureYamlMapEntry(source, key, entryKey, value) {
         changed: true
     };
 }
+function removeYamlMapEntry(source, entryKey) {
+    const packageName = entryKey.includes('@') ? entryKey.slice(0, entryKey.lastIndexOf('@')) : entryKey;
+    const escapedPackageName = packageName.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
+    const currentEntryPattern = new RegExp(`^ {2}'${escapedPackageName}@[^']+': .+\\n?`, 'mu');
+    if (!currentEntryPattern.test(source)) return {
+        source,
+        changed: false
+    };
+    return {
+        source: source.replace(currentEntryPattern, ''),
+        changed: true
+    };
+}
 function ensureGeneratedPatchFile(workspaceRoot, relativePatchPath, sourcePatchPath) {
     const targetPath = node_path.join(workspaceRoot, relativePatchPath);
     const patch = node_fs.readFileSync(sourcePatchPath, 'utf-8');
@@ -371,10 +390,53 @@ function ensureGeneratedPatchFile(workspaceRoot, relativePatchPath, sourcePatchP
     node_fs.writeFileSync(targetPath, patch, 'utf-8');
     return true;
 }
-function ensureGeneratedDeclarationPatches(workspaceRoot) {
+function removeGeneratedPatchFileIfUnchanged(workspaceRoot, relativePatchPath, sourcePatchPath) {
+    const targetPath = node_path.join(workspaceRoot, relativePatchPath);
+    if (!node_fs.existsSync(targetPath)) return false;
+    const patch = node_fs.readFileSync(sourcePatchPath, 'utf-8');
+    if (node_fs.readFileSync(targetPath, 'utf-8') !== patch) return false;
+    node_fs.rmSync(targetPath);
+    return true;
+}
+function workspaceUsesDependency(workspaceRoot, packageName) {
+    const packageJsonPaths = [
+        node_path.join(workspaceRoot, 'package.json')
+    ];
+    for (const workspaceDir of [
+        'apps',
+        'verticals',
+        'packages'
+    ]){
+        const absoluteWorkspaceDir = node_path.join(workspaceRoot, workspaceDir);
+        if (node_fs.existsSync(absoluteWorkspaceDir)) for (const entry of node_fs.readdirSync(absoluteWorkspaceDir, {
+            withFileTypes: true
+        })){
+            if (!entry.isDirectory()) continue;
+            const packageJsonPath = node_path.join(absoluteWorkspaceDir, entry.name, 'package.json');
+            if (node_fs.existsSync(packageJsonPath)) packageJsonPaths.push(packageJsonPath);
+        }
+    }
+    for (const packageJsonPath of packageJsonPaths){
+        const packageJson = JSON.parse(node_fs.readFileSync(packageJsonPath, 'utf-8'));
+        for (const field of [
+            'dependencies',
+            'devDependencies',
+            'peerDependencies',
+            'optionalDependencies'
+        ]){
+            const dependencies = packageJson[field];
+            if (dependencies && 'object' == typeof dependencies) {
+                if (Object.prototype.hasOwnProperty.call(dependencies, packageName)) return true;
+                for (const specifier of Object.values(dependencies))if ('string' == typeof specifier && specifier.startsWith(`npm:${packageName}@`)) return true;
+            }
+        }
+    }
+    return false;
+}
+function ensureGeneratedDeclarationPatches(workspaceRoot, options) {
     let changed = false;
     changed = ensureGeneratedPatchFile(workspaceRoot, effectDeclarationPatchPath, effectDeclarationPatchSourcePath) || changed;
-    changed = ensureGeneratedPatchFile(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed;
+    changed = options.includeDrizzleOrmPatch ? ensureGeneratedPatchFile(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed : removeGeneratedPatchFileIfUnchanged(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed;
     return changed;
 }
 function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
@@ -382,6 +444,7 @@ function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
     if (!node_fs.existsSync(workspaceFile)) return false;
     let source = node_fs.readFileSync(workspaceFile, 'utf-8');
     let changed = false;
+    const usesDrizzleOrm = workspaceUsesDependency(workspaceRoot, 'drizzle-orm');
     const replacements = [
         [
             /^ {4}'@effect\/vitest>effect': .+$/mu,
@@ -419,7 +482,7 @@ function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
     const effectPatch = ensureYamlMapEntry(source, 'patchedDependencies', `effect@${EFFECT_VERSION}`, effectDeclarationPatchPath);
     source = effectPatch.source;
     changed = effectPatch.changed || changed;
-    const drizzleOrmPatch = ensureYamlMapEntry(source, 'patchedDependencies', `drizzle-orm@${DRIZZLE_ORM_VERSION}`, drizzleOrmDeclarationPatchPath);
+    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;
     if (changed) node_fs.writeFileSync(workspaceFile, source, 'utf-8');
@@ -468,7 +531,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;
@@ -495,6 +559,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;
@@ -568,7 +638,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);
@@ -587,7 +659,9 @@ and pnpm contract:check.
         else if ('package.json' === relativePackageFile) writeJsonFile(packageFile, packageJson);
     }
     updateGeneratedPnpmWorkspacePolicy(context.workspaceRoot);
-    ensureGeneratedDeclarationPatches(context.workspaceRoot);
+    ensureGeneratedDeclarationPatches(context.workspaceRoot, {
+        includeDrizzleOrmPatch: workspaceUsesDependency(context.workspaceRoot, 'drizzle-orm')
+    });
     if (!hasFlag(args, '--skip-install')) {
         const status = runPnpmLockfileRefresh(context);
         if (0 !== status) return status;

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/package.json

@@ -21,7 +21,7 @@
   "engines": {
     "node": ">=20"
   },
-  "version": "3.5.0-ultramodern.11",
+  "version": "3.5.0-ultramodern.13",
   "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.11"
+    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.5.0-ultramodern.13"
   },
   "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.11"
+    "frameworkVersion": "3.5.0-ultramodern.13"
   }
 }

package/template-workspace/.gitignore.handlebars

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

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

@@ -63,5 +63,4 @@ allowBuilds:
 
 patchedDependencies:
   '@tanstack/router-core@{{tanstackRouterCoreVersion}}': patches/@tanstack__router-core@{{tanstackRouterCoreVersion}}.patch
-  'drizzle-orm@{{drizzleOrmVersion}}': patches/drizzle-orm-ts7-strict-declarations.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;
@@ -1795,6 +1806,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 +1830,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 +1913,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`);