@bleedingdev/modern-js-create 3.5.0-ultramodern.2 → 3.5.0-ultramodern.20

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 { 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;
@@ -130,8 +130,10 @@ function generateUltramodernWorkspace(options) {
         nodeVersion: NODE_VERSION,
         pnpmVersion: PNPM_VERSION,
         nodeFetchVersion: NODE_FETCH_VERSION,
+        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

@@ -6,7 +6,11 @@ import node_path from "node:path";
 import { fileURLToPath } from "node:url";
 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, 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));
@@ -152,6 +156,91 @@ function updateModernDependencies(packageJson, packageSource) {
     }
     return changed;
 }
+const generatedToolingDependencyPins = new Map([
+    [
+        '@effect/tsgo',
+        EFFECT_TSGO_VERSION
+    ],
+    [
+        "@typescript/native-preview",
+        TYPESCRIPT_NATIVE_PREVIEW_VERSION
+    ],
+    [
+        'oxfmt',
+        OXFMT_VERSION
+    ],
+    [
+        'oxlint',
+        OXLINT_VERSION
+    ],
+    [
+        'wrangler',
+        WRANGLER_VERSION
+    ],
+    [
+        'zephyr-agent',
+        ZEPHYR_AGENT_VERSION
+    ],
+    [
+        'zephyr-rspack-plugin',
+        ZEPHYR_RSPACK_PLUGIN_VERSION
+    ]
+]);
+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 moduleFederationBridgeReactPatchPath = `patches/@module-federation__bridge-react@${MODULE_FEDERATION_VERSION}.patch`;
+const moduleFederationBridgeReactPatchSourcePath = node_path.join(createPackageRoot, 'template-workspace', moduleFederationBridgeReactPatchPath);
+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';
+const drizzleOrmDeclarationPatchSourcePath = node_path.join(createPackageRoot, 'template-workspace', drizzleOrmDeclarationPatchPath);
+function updateGeneratedToolingDependencies(packageJson) {
+    let changed = false;
+    for (const section of [
+        'dependencies',
+        'devDependencies',
+        'peerDependencies',
+        'optionalDependencies'
+    ]){
+        const dependencies = packageJson[section];
+        if (!(!dependencies || 'object' != typeof dependencies || Array.isArray(dependencies))) {
+            for (const [packageName, version] of generatedToolingDependencyPins)if (Object.prototype.hasOwnProperty.call(dependencies, packageName) && dependencies[packageName] !== version) {
+                dependencies[packageName] = version;
+                changed = true;
+            }
+        }
+    }
+    return changed;
+}
+const cloudflareModernDeployCommand = 'ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern deploy';
+const cloudflareModernDeploySkipBuildCommand = `${cloudflareModernDeployCommand} --skip-build`;
+const cloudflareWranglerDeployCommand = 'wrangler deploy --config .output/wrangler.json';
+const cloudflareWranglerDeployInvalidSkipBuildCommand = `${cloudflareWranglerDeployCommand} --skip-build`;
+function updateGeneratedPackageScripts(packageJson) {
+    const scripts = packageJson.scripts;
+    if (!scripts || 'object' != typeof scripts || Array.isArray(scripts)) return false;
+    let changed = false;
+    const cloudflareBuild = scripts['cloudflare:build'];
+    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)) {
+        scripts['cloudflare:deploy'] = cloudflareDeploy.replace(cloudflareWranglerDeployInvalidSkipBuildCommand, cloudflareWranglerDeployCommand);
+        changed = true;
+    }
+    return changed;
+}
 function normalizeStrictEffectApiMetadata(value) {
     const api = value.api;
     if (!api || 'object' != typeof api || Array.isArray(api)) return false;
@@ -217,6 +306,200 @@ function normalizeStrictEffectApiMetadata(value) {
     }
     return changed;
 }
+function replaceYamlLine(source, pattern, replacement) {
+    const updated = source.replace(pattern, replacement);
+    return {
+        source: updated,
+        changed: updated !== source
+    };
+}
+function ensureYamlListItem(source, key, item) {
+    const itemLine = `  - '${item}'`;
+    const headerPattern = new RegExp(`^${key}:\\n(?:(?:  - .+\\n)*)`, 'mu');
+    const header = source.match(headerPattern);
+    if (header) {
+        if (header[0].split('\n').includes(itemLine)) return {
+            source,
+            changed: false
+        };
+        return {
+            source: source.replace(headerPattern, `${header[0]}${itemLine}\n`),
+            changed: true
+        };
+    }
+    const block = `${key}:\n${itemLine}\n`;
+    const afterTrustPolicyIgnore = source.replace(/^(trustPolicyIgnoreAfter: .+\n)/mu, `$1${block}`);
+    if (afterTrustPolicyIgnore !== source) return {
+        source: afterTrustPolicyIgnore,
+        changed: true
+    };
+    return {
+        source: `${source.trimEnd()}\n${block}`,
+        changed: true
+    };
+}
+function ensureYamlMapEntry(source, key, entryKey, value) {
+    const entryLine = `  '${entryKey}': ${value}`;
+    const packageName = entryKey.includes('@') ? entryKey.slice(0, entryKey.lastIndexOf('@')) : entryKey;
+    const escapedPackageName = packageName.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
+    const currentEntryPattern = new RegExp(`^ {2}'${escapedPackageName}@[^']+': .+$`, 'mu');
+    const currentEntry = source.match(currentEntryPattern);
+    if (currentEntry) {
+        if (currentEntry[0] === entryLine) return {
+            source,
+            changed: false
+        };
+        return {
+            source: source.replace(currentEntryPattern, entryLine),
+            changed: true
+        };
+    }
+    const headerPattern = new RegExp(`^${key}:\\n(?:(?:  .+\\n)*)`, 'mu');
+    const header = source.match(headerPattern);
+    if (header) {
+        if (header[0].split('\n').includes(entryLine)) return {
+            source,
+            changed: false
+        };
+        return {
+            source: source.replace(headerPattern, `${header[0]}${entryLine}\n`),
+            changed: true
+        };
+    }
+    return {
+        source: `${source.trimEnd()}\n${key}:\n${entryLine}\n`,
+        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');
+    if (node_fs.existsSync(targetPath) && node_fs.readFileSync(targetPath, 'utf-8') === patch) return false;
+    node_fs.mkdirSync(node_path.dirname(targetPath), {
+        recursive: true
+    });
+    node_fs.writeFileSync(targetPath, patch, 'utf-8');
+    return true;
+}
+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, moduleFederationModernJsPatchPath, moduleFederationModernJsPatchSourcePath) || changed;
+    changed = ensureGeneratedPatchFile(workspaceRoot, moduleFederationBridgeReactPatchPath, moduleFederationBridgeReactPatchSourcePath) || changed;
+    changed = ensureGeneratedPatchFile(workspaceRoot, effectDeclarationPatchPath, effectDeclarationPatchSourcePath) || changed;
+    changed = options.includeDrizzleOrmPatch ? ensureGeneratedPatchFile(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed : removeGeneratedPatchFileIfUnchanged(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed;
+    return changed;
+}
+function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
+    const workspaceFile = node_path.join(workspaceRoot, 'pnpm-workspace.yaml');
+    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,
+            `    '@effect/vitest>effect': '${EFFECT_VERSION}'`
+        ],
+        [
+            /^ {2}'@effect\/vitest': .+$/mu,
+            `  '@effect/vitest': ${EFFECT_VITEST_VERSION}`
+        ],
+        [
+            /^ {2}effect: .+$/mu,
+            `  effect: ${EFFECT_VERSION}`
+        ]
+    ];
+    for (const [pattern, replacement] of replacements){
+        const result = replaceYamlLine(source, pattern, replacement);
+        source = result.source;
+        changed = result.changed || changed;
+    }
+    for (const item of strictEffectPackageVersionPolicyExclusions){
+        const packageName = item.slice(0, item.lastIndexOf('@'));
+        const escapedPackageName = packageName.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
+        const currentVersion = replaceYamlLine(source, new RegExp(`^ {2}- '${escapedPackageName}@[^']+'$`, 'gmu'), `  - '${item}'`);
+        source = currentVersion.source;
+        changed = currentVersion.changed || changed;
+        for (const policyKey of [
+            'minimumReleaseAgeExclude',
+            'trustPolicyExclude'
+        ]){
+            const policyExclude = ensureYamlListItem(source, policyKey, item);
+            source = policyExclude.source;
+            changed = policyExclude.changed || changed;
+        }
+    }
+    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 moduleFederationBridgeReactPatch = ensureYamlMapEntry(source, 'patchedDependencies', `@module-federation/bridge-react@${MODULE_FEDERATION_VERSION}`, moduleFederationBridgeReactPatchPath);
+    source = moduleFederationBridgeReactPatch.source;
+    changed = moduleFederationBridgeReactPatch.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;
+    if (changed) node_fs.writeFileSync(workspaceFile, source, 'utf-8');
+    return changed;
+}
 function updateUltramodernConfig(workspaceRoot, packageSource) {
     const configPath = node_path.join(workspaceRoot, '.modernjs/ultramodern.json');
     const config = readJsonFile(configPath);
@@ -236,6 +519,64 @@ function updateUltramodernConfig(workspaceRoot, packageSource) {
     for (const app of config.topology?.apps ?? [])if (app && 'object' == typeof app && !Array.isArray(app)) normalizeStrictEffectApiMetadata(app);
     writeJsonFile(configPath, config);
 }
+function writeJsonIfChanged(filePath, value) {
+    const next = `${JSON.stringify(value, null, 2)}\n`;
+    if (node_fs.existsSync(filePath) && node_fs.readFileSync(filePath, 'utf-8') === next) return false;
+    node_fs.mkdirSync(node_path.dirname(filePath), {
+        recursive: true
+    });
+    node_fs.writeFileSync(filePath, next, 'utf-8');
+    return true;
+}
+function writeTextIfChanged(filePath, value) {
+    if (node_fs.existsSync(filePath) && node_fs.readFileSync(filePath, 'utf-8') === value) return false;
+    node_fs.mkdirSync(node_path.dirname(filePath), {
+        recursive: true
+    });
+    node_fs.writeFileSync(filePath, value, 'utf-8');
+    return true;
+}
+function ensureGeneratedIgnoreRules(workspaceRoot) {
+    const gitignorePath = node_path.join(workspaceRoot, '.gitignore');
+    const existing = node_fs.existsSync(gitignorePath) ? node_fs.readFileSync(gitignorePath, 'utf-8') : '';
+    const lines = 0 === existing.trimEnd().length ? [] : existing.trimEnd().split(/\r?\n/u);
+    let changed = false;
+    for (const rule of [
+        '.mf/',
+        '**/.mf/',
+        'dist-cloudflare/'
+    ])if (!lines.includes(rule)) {
+        lines.push(rule);
+        changed = true;
+    }
+    if (!changed) return false;
+    const next = `${lines.join('\n')}\n`;
+    node_fs.writeFileSync(gitignorePath, next, 'utf-8');
+    return true;
+}
+function updateGeneratedTypeScriptSurfaces(workspaceRoot, config) {
+    let changed = false;
+    const apps = workspaceAppsFromToolingConfig(config);
+    const remotes = apps.filter((app)=>'shell' !== app.kind);
+    changed = writeJsonIfChanged(node_path.join(workspaceRoot, 'tsconfig.base.json'), createTsConfigBase()) || changed;
+    changed = ensureGeneratedIgnoreRules(workspaceRoot) || changed;
+    for (const sharedPackage of [
+        'packages/shared-contracts',
+        'packages/shared-design-tokens'
+    ])changed = writeJsonIfChanged(node_path.join(workspaceRoot, sharedPackage, 'tsconfig.json'), createSharedPackageTsConfig(sharedPackage)) || changed;
+    for (const app of apps){
+        changed = writeJsonIfChanged(node_path.join(workspaceRoot, app.directory, 'tsconfig.json'), createAppTsConfig(app, remotes)) || changed;
+        changed = writeJsonIfChanged(node_path.join(workspaceRoot, app.directory, 'tsconfig.mf-types.json'), createAppMfTypesTsConfig(app)) || changed;
+        changed = writeTextIfChanged(node_path.join(workspaceRoot, app.directory, 'src/modern-app-env.d.ts'), createAppEnvDts(app, remotes)) || changed;
+    }
+    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;
@@ -298,8 +639,10 @@ function runMigrateStrictEffect(args, context) {
   modern-js-create ultramodern migrate-strict-effect --version <version> [--skip-install]
 
 Updates generated UltraModern package-source metadata, Modern package aliases,
-direct Effect API topology metadata, and the pnpm lockfile for strict Effect
-workspaces. Source code still has to pass pnpm api:check and pnpm contract:check.
+framework-owned toolchain pins, direct Effect API topology metadata, strict
+Effect pnpm overrides/trust policy, framework-owned TypeScript config
+surfaces, and the pnpm lockfile. Source code still has to pass pnpm api:check
+and pnpm contract:check.
 `);
         return 0;
     }
@@ -307,6 +650,9 @@ workspaces. Source code still has to pass pnpm api:check and pnpm contract:check
     const packageSource = createMigrationPackageSource(args, current);
     updateUltramodernConfig(context.workspaceRoot, packageSource);
     updateReferenceTopology(context.workspaceRoot);
+    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);
@@ -317,9 +663,17 @@ workspaces. Source code still has to pass pnpm api:check and pnpm contract:check
                 config: './.modernjs/ultramodern.json'
             };
         }
-        if (updateModernDependencies(packageJson, packageSource)) writeJsonFile(packageFile, packageJson);
+        const modernDependenciesChanged = updateModernDependencies(packageJson, packageSource);
+        const toolingDependenciesChanged = updateGeneratedToolingDependencies(packageJson);
+        const generatedScriptsChanged = updateGeneratedPackageScripts(packageJson);
+        const changed = modernDependenciesChanged || toolingDependenciesChanged || generatedScriptsChanged;
+        if (changed) writeJsonFile(packageFile, packageJson);
         else if ('package.json' === relativePackageFile) writeJsonFile(packageFile, packageJson);
     }
+    updateGeneratedPnpmWorkspacePolicy(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/app-files.js

@@ -28,17 +28,14 @@ function createAppEnvDts(app, remotes = []) {
 }
 `;
         })).join('\n');
-    const reactTypeReference = remoteModuleDeclarations ? "/// <reference types='react' />\n" : '';
-    const siteUrlDeclaration = 'declare const ULTRAMODERN_SITE_URL: string;';
-    return `${reactTypeReference}/// <reference types='@modern-js/app-tools/types' />
-
-${siteUrlDeclaration}
-declare module '*.svg' {
-  const url: string;
-  export default url;
-}
-declare module '*.css';
-${remoteModuleDeclarations ? `\n${remoteModuleDeclarations}` : ''}`;
+    const reactTypeImport = remoteModuleDeclarations ? "import type React from 'react';\n" : '';
+    return [
+        `import '@modern-js/app-tools/types';\n${reactTypeImport}`.trimEnd(),
+        `declare global {
+  const ULTRAMODERN_SITE_URL: string;
+}`,
+        remoteModuleDeclarations.trimEnd()
+    ].filter((section)=>section.length > 0).join('\n\n').concat('\n');
 }
 function createAppRuntimeConfig(app, scope, remotes = []) {
     const pluginsConfig = 'shell' === app.kind ? `  plugins: [

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

@@ -26,6 +26,11 @@ function createAppModernConfig(scope, app) {
   (cloudflareDeployEnabled ? '/' : \`http://localhost:\${port}\`);
 const defaultRemoteAssetPrefix = \`\${remoteAssetOrigin.replace(/\\/+$/u, '')}/\`;
 const defaultAssetPrefix = defaultRemoteAssetPrefix;`;
+    const devAssetPrefixSource = 'shell' === app.kind ? `        // Keep shell dev assets origin-relative so the shell works through
+        // tunnels and local previews without rewriting its own chunks.
+        assetPrefix: '/',` : `        // Remote dev manifests must publish an absolute publicPath so host
+        // shells load remoteEntry.js and exposed chunks from this dev server.
+        assetPrefix,`;
     return `// @effect-diagnostics processEnv:off
 import {
   appTools,
@@ -94,8 +99,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 &&
@@ -125,9 +132,7 @@ ${bffConfig}      ...(cloudflareDeployEnabled
           }
         : {}),
       dev: {
-        // Keep dev assets origin-relative too; the default absolute
-        // http://localhost:<port> prefix breaks pages served through tunnels.
-        assetPrefix: '/',
+${devAssetPrefixSource}
       },
       html: {
         outputStructure: 'flat',
@@ -137,13 +142,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

@@ -1,4 +1,5 @@
 import "node:module";
+import node_path from "node:path";
 import { WORKSPACE_PACKAGE_VERSION, modernPackageSpecifier } from "../ultramodern-package-source.js";
 import { appHasApi, remoteDependencyAlias, resolveRemoteRefs, sharedPackages, shellApp, verticalApiApps, zephyrRemoteDependency } from "./descriptors.js";
 import { readFileTemplate } from "./fs-io.js";
@@ -249,7 +250,6 @@ function createTsConfigBase() {
             noFallthroughCasesInSwitch: true,
             noPropertyAccessFromIndexSignature: true,
             noImplicitReturns: true,
-            skipLibCheck: true,
             resolveJsonModule: true,
             plugins: [
                 {
@@ -281,7 +281,7 @@ function createReferences(packageDir, references) {
     return [
         ...new Set(references)
     ].filter((reference)=>reference !== packageDir).map((reference)=>({
-            path: `${relativeRootFor(packageDir)}/${reference}`
+            path: node_path.relative(packageDir, reference).split(node_path.sep).join('/')
         }));
 }
 function createPackageTsConfig(packageDir, options = {}) {
@@ -291,8 +291,6 @@ function createPackageTsConfig(packageDir, options = {}) {
     const include = resolvedOptions.include ?? [
         'src',
         'locales/**/*.json',
-        'modern.config.ts',
-        'module-federation.config.ts',
         'package.json',
         'shared'
     ];
@@ -326,9 +324,9 @@ function createAppTsConfig(app, remotes = []) {
     });
 }
 function createAppMfTypesTsConfig(app) {
-    const exposedFiles = Object.values(app.exposes ?? {}).map((exposePath)=>exposePath.replace(/^\.\//u, ''));
+    const exposedFiles = Object.entries(app.exposes ?? {}).sort(([left], [right])=>'./Route' === left ? -1 : './Route' === right ? 1 : 0).map(([, exposePath])=>exposePath.replace(/^\.\//u, ''));
     return {
-        extends: './tsconfig.json',
+        extends: `${relativeRootFor(app.directory)}/tsconfig.base.json`,
         include: [
             ...new Set([
                 ...exposedFiles,
@@ -359,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,
@@ -372,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 && ${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/versions.js

@@ -12,6 +12,7 @@ const POSTCSS_VERSION = '8.5.15';
 const EFFECT_VERSION = '4.0.0-beta.91';
 const EFFECT_VITEST_VERSION = '4.0.0-beta.91';
 const EFFECT_TSGO_VERSION = '0.14.6';
+const DRIZZLE_ORM_VERSION = '1.0.0-rc.4';
 const TYPESCRIPT_STABLE_VERSION = '6.0.3';
 const TYPESCRIPT_NATIVE_PREVIEW_VERSION = '7.0.0-dev.20260628.1';
 const TYPESCRIPT_VERSION = TYPESCRIPT_STABLE_VERSION;
@@ -36,7 +37,8 @@ const ultramodernWorkspaceVersions = {
     moduleFederation: MODULE_FEDERATION_VERSION,
     effect: EFFECT_VERSION,
     effectVitest: EFFECT_VITEST_VERSION,
+    drizzleOrm: DRIZZLE_ORM_VERSION,
     tailwind: TAILWIND_VERSION,
     tailwindPostcss: TAILWIND_POSTCSS_VERSION
 };
-export { CLOUDFLARE_COMPATIBILITY_DATE, EFFECT_TSGO_VERSION, EFFECT_VERSION, EFFECT_VITEST_VERSION, I18NEXT_VERSION, LEFTHOOK_VERSION, MODULE_FEDERATION_AGENT_SKILLS_COMMIT, MODULE_FEDERATION_VERSION, NODE_FETCH_VERSION, NODE_VERSION, OXFMT_VERSION, OXLINT_VERSION, PNPM_VERSION, POSTCSS_VERSION, REACT_DOM_VERSION, REACT_ROUTER_VERSION, REACT_VERSION, RSTACK_AGENT_SKILLS_COMMIT, TAILWIND_POSTCSS_VERSION, TAILWIND_VERSION, TANSTACK_ROUTER_CORE_VERSION, TANSTACK_ROUTER_VERSION, TYPESCRIPT_NATIVE_PREVIEW_VERSION, TYPESCRIPT_STABLE_VERSION, TYPESCRIPT_VERSION, TYPES_REACT_DOM_VERSION, TYPES_REACT_VERSION, ULTRACITE_VERSION, WRANGLER_VERSION, ZEPHYR_AGENT_VERSION, ZEPHYR_RSPACK_PLUGIN_VERSION, ultramodernWorkspaceVersions };
+export { CLOUDFLARE_COMPATIBILITY_DATE, DRIZZLE_ORM_VERSION, EFFECT_TSGO_VERSION, EFFECT_VERSION, EFFECT_VITEST_VERSION, I18NEXT_VERSION, LEFTHOOK_VERSION, MODULE_FEDERATION_AGENT_SKILLS_COMMIT, MODULE_FEDERATION_VERSION, NODE_FETCH_VERSION, NODE_VERSION, OXFMT_VERSION, OXLINT_VERSION, PNPM_VERSION, POSTCSS_VERSION, REACT_DOM_VERSION, REACT_ROUTER_VERSION, REACT_VERSION, RSTACK_AGENT_SKILLS_COMMIT, TAILWIND_POSTCSS_VERSION, TAILWIND_VERSION, TANSTACK_ROUTER_CORE_VERSION, TANSTACK_ROUTER_VERSION, TYPESCRIPT_NATIVE_PREVIEW_VERSION, TYPESCRIPT_STABLE_VERSION, TYPESCRIPT_VERSION, TYPES_REACT_DOM_VERSION, TYPES_REACT_VERSION, ULTRACITE_VERSION, WRANGLER_VERSION, ZEPHYR_AGENT_VERSION, ZEPHYR_RSPACK_PLUGIN_VERSION, ultramodernWorkspaceVersions };

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, 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,8 @@ function createWorkspaceValidationScript(scope, enableTailwind, remotes = []) {
     const expectedCloudflareSecurity = createCloudflareSecurityContract();
     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 { 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;
@@ -131,8 +131,10 @@ function generateUltramodernWorkspace(options) {
         nodeVersion: NODE_VERSION,
         pnpmVersion: PNPM_VERSION,
         nodeFetchVersion: NODE_FETCH_VERSION,
+        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/types/ultramodern-workspace/versions.d.ts

@@ -16,6 +16,7 @@ export declare const POSTCSS_VERSION = "8.5.15";
 export declare const EFFECT_VERSION = "4.0.0-beta.91";
 export declare const EFFECT_VITEST_VERSION = "4.0.0-beta.91";
 export declare const EFFECT_TSGO_VERSION = "0.14.6";
+export declare const DRIZZLE_ORM_VERSION = "1.0.0-rc.4";
 export declare const TYPESCRIPT_STABLE_VERSION = "6.0.3";
 export declare const TYPESCRIPT_NATIVE_PREVIEW_VERSION = "7.0.0-dev.20260628.1";
 export declare const TYPESCRIPT_VERSION = "6.0.3";
@@ -40,6 +41,7 @@ export declare const ultramodernWorkspaceVersions: {
     moduleFederation: string;
     effect: string;
     effectVitest: string;
+    drizzleOrm: string;
     tailwind: string;
     tailwindPostcss: string;
 };