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

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

@@ -52,7 +52,9 @@ var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_no
 const external_node_url_namespaceObject = require("node:url");
 const external_create_package_root_cjs_namespaceObject = require("../create-package-root.cjs");
 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 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");
 const external_config_cjs_namespaceObject = require("./config.cjs");
@@ -233,6 +235,10 @@ const strictEffectPackageVersionPolicyExclusions = [
     `effect@${versions_cjs_namespaceObject.EFFECT_VERSION}`,
     `@effect/opentelemetry@${versions_cjs_namespaceObject.EFFECT_VERSION}`
 ];
+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';
+const drizzleOrmDeclarationPatchSourcePath = external_node_path_default().join(createPackageRoot, 'template-workspace', drizzleOrmDeclarationPatchPath);
 function updateGeneratedToolingDependencies(packageJson) {
     let changed = false;
     for (const section of [
@@ -368,11 +374,117 @@ function ensureYamlListItem(source, key, item) {
         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 = external_node_path_default().join(workspaceRoot, relativePatchPath);
+    const patch = external_node_fs_default().readFileSync(sourcePatchPath, 'utf-8');
+    if (external_node_fs_default().existsSync(targetPath) && external_node_fs_default().readFileSync(targetPath, 'utf-8') === patch) return false;
+    external_node_fs_default().mkdirSync(external_node_path_default().dirname(targetPath), {
+        recursive: true
+    });
+    external_node_fs_default().writeFileSync(targetPath, patch, 'utf-8');
+    return true;
+}
+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 = options.includeDrizzleOrmPatch ? ensureGeneratedPatchFile(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed : removeGeneratedPatchFileIfUnchanged(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed;
+    return changed;
+}
 function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
     const workspaceFile = external_node_path_default().join(workspaceRoot, 'pnpm-workspace.yaml');
     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,
@@ -407,6 +519,12 @@ function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
             changed = policyExclude.changed || changed;
         }
     }
+    const effectPatch = ensureYamlMapEntry(source, 'patchedDependencies', `effect@${versions_cjs_namespaceObject.EFFECT_VERSION}`, effectDeclarationPatchPath);
+    source = effectPatch.source;
+    changed = effectPatch.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;
     if (changed) external_node_fs_default().writeFileSync(workspaceFile, source, 'utf-8');
     return changed;
 }
@@ -429,6 +547,57 @@ 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 (external_node_fs_default().existsSync(filePath) && external_node_fs_default().readFileSync(filePath, 'utf-8') === next) return false;
+    external_node_fs_default().mkdirSync(external_node_path_default().dirname(filePath), {
+        recursive: true
+    });
+    external_node_fs_default().writeFileSync(filePath, next, 'utf-8');
+    return true;
+}
+function writeTextIfChanged(filePath, value) {
+    if (external_node_fs_default().existsSync(filePath) && external_node_fs_default().readFileSync(filePath, 'utf-8') === value) return false;
+    external_node_fs_default().mkdirSync(external_node_path_default().dirname(filePath), {
+        recursive: true
+    });
+    external_node_fs_default().writeFileSync(filePath, value, 'utf-8');
+    return true;
+}
+function ensureGeneratedIgnoreRules(workspaceRoot) {
+    const gitignorePath = external_node_path_default().join(workspaceRoot, '.gitignore');
+    const existing = external_node_fs_default().existsSync(gitignorePath) ? external_node_fs_default().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/'
+    ])if (!lines.includes(rule)) {
+        lines.push(rule);
+        changed = true;
+    }
+    if (!changed) return false;
+    const next = `${lines.join('\n')}\n`;
+    external_node_fs_default().writeFileSync(gitignorePath, next, 'utf-8');
+    return true;
+}
+function updateGeneratedTypeScriptSurfaces(workspaceRoot, config) {
+    let changed = false;
+    const apps = (0, external_config_cjs_namespaceObject.workspaceAppsFromToolingConfig)(config);
+    const remotes = apps.filter((app)=>'shell' !== app.kind);
+    changed = writeJsonIfChanged(external_node_path_default().join(workspaceRoot, 'tsconfig.base.json'), (0, package_json_cjs_namespaceObject.createTsConfigBase)()) || changed;
+    changed = ensureGeneratedIgnoreRules(workspaceRoot) || changed;
+    for (const sharedPackage of [
+        'packages/shared-contracts',
+        'packages/shared-design-tokens'
+    ])changed = writeJsonIfChanged(external_node_path_default().join(workspaceRoot, sharedPackage, 'tsconfig.json'), (0, package_json_cjs_namespaceObject.createSharedPackageTsConfig)(sharedPackage)) || changed;
+    for (const app of apps){
+        changed = writeJsonIfChanged(external_node_path_default().join(workspaceRoot, app.directory, 'tsconfig.json'), (0, package_json_cjs_namespaceObject.createAppTsConfig)(app, remotes)) || changed;
+        changed = writeJsonIfChanged(external_node_path_default().join(workspaceRoot, app.directory, 'tsconfig.mf-types.json'), (0, package_json_cjs_namespaceObject.createAppMfTypesTsConfig)(app)) || changed;
+        changed = writeTextIfChanged(external_node_path_default().join(workspaceRoot, app.directory, 'src/modern-app-env.d.ts'), (0, app_files_cjs_namespaceObject.createAppEnvDts)(app, remotes)) || 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;
@@ -492,8 +661,9 @@ function runMigrateStrictEffect(args, context) {
 
 Updates generated UltraModern package-source metadata, Modern package aliases,
 framework-owned toolchain pins, direct Effect API topology metadata, strict
-Effect pnpm overrides/trust policy, and the pnpm lockfile. Source code still
-has to pass pnpm api:check and pnpm contract:check.
+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;
     }
@@ -501,6 +671,7 @@ has to pass pnpm api:check and pnpm contract:check.
     const packageSource = createMigrationPackageSource(args, current);
     updateUltramodernConfig(context.workspaceRoot, packageSource);
     updateReferenceTopology(context.workspaceRoot);
+    updateGeneratedTypeScriptSurfaces(context.workspaceRoot, current);
     for (const relativePackageFile of listWorkspacePackageFiles(context.workspaceRoot)){
         const packageFile = external_node_path_default().join(context.workspaceRoot, relativePackageFile);
         const packageJson = readJsonFile(packageFile);
@@ -519,6 +690,9 @@ has to pass pnpm api:check and pnpm contract:check.
         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/cjs/ultramodern-workspace/app-files.cjs

@@ -71,17 +71,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/cjs/ultramodern-workspace/package-json.cjs

@@ -1,5 +1,14 @@
 "use strict";
 var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
 (()=>{
     __webpack_require__.d = (exports1, getters, values)=>{
         var define = (defs, kind)=>{
@@ -44,6 +53,8 @@ __webpack_require__.d(__webpack_exports__, {
     createZephyrDependencies: ()=>createZephyrDependencies,
     effectDiagnostics: ()=>effectDiagnostics
 });
+const external_node_path_namespaceObject = require("node:path");
+var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
 const external_ultramodern_package_source_cjs_namespaceObject = require("../ultramodern-package-source.cjs");
 const external_descriptors_cjs_namespaceObject = require("./descriptors.cjs");
 const external_fs_io_cjs_namespaceObject = require("./fs-io.cjs");
@@ -294,7 +305,6 @@ function createTsConfigBase() {
             noFallthroughCasesInSwitch: true,
             noPropertyAccessFromIndexSignature: true,
             noImplicitReturns: true,
-            skipLibCheck: true,
             resolveJsonModule: true,
             plugins: [
                 {
@@ -326,7 +336,7 @@ function createReferences(packageDir, references) {
     return [
         ...new Set(references)
     ].filter((reference)=>reference !== packageDir).map((reference)=>({
-            path: `${(0, external_naming_cjs_namespaceObject.relativeRootFor)(packageDir)}/${reference}`
+            path: external_node_path_default().relative(packageDir, reference).split(external_node_path_default().sep).join('/')
         }));
 }
 function createPackageTsConfig(packageDir, options = {}) {
@@ -336,8 +346,6 @@ function createPackageTsConfig(packageDir, options = {}) {
     const include = resolvedOptions.include ?? [
         'src',
         'locales/**/*.json',
-        'modern.config.ts',
-        'module-federation.config.ts',
         'package.json',
         'shared'
     ];
@@ -371,9 +379,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: `${(0, external_naming_cjs_namespaceObject.relativeRootFor)(app.directory)}/tsconfig.base.json`,
         include: [
             ...new Set([
                 ...exposedFiles,

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

@@ -40,6 +40,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;
@@ -64,11 +65,13 @@ const ultramodernWorkspaceVersions = {
     moduleFederation: MODULE_FEDERATION_VERSION,
     effect: EFFECT_VERSION,
     effectVitest: EFFECT_VITEST_VERSION,
+    drizzleOrm: DRIZZLE_ORM_VERSION,
     tailwind: TAILWIND_VERSION,
     tailwindPostcss: TAILWIND_POSTCSS_VERSION
 };
 __webpack_require__.d(__webpack_exports__, {}, {
     CLOUDFLARE_COMPATIBILITY_DATE: CLOUDFLARE_COMPATIBILITY_DATE,
+    DRIZZLE_ORM_VERSION: DRIZZLE_ORM_VERSION,
     EFFECT_TSGO_VERSION: EFFECT_TSGO_VERSION,
     EFFECT_VERSION: EFFECT_VERSION,
     EFFECT_VITEST_VERSION: EFFECT_VITEST_VERSION,
@@ -102,6 +105,7 @@ __webpack_require__.d(__webpack_exports__, {}, {
     ultramodernWorkspaceVersions: ultramodernWorkspaceVersions
 });
 exports.CLOUDFLARE_COMPATIBILITY_DATE = __webpack_exports__.CLOUDFLARE_COMPATIBILITY_DATE;
+exports.DRIZZLE_ORM_VERSION = __webpack_exports__.DRIZZLE_ORM_VERSION;
 exports.EFFECT_TSGO_VERSION = __webpack_exports__.EFFECT_TSGO_VERSION;
 exports.EFFECT_VERSION = __webpack_exports__.EFFECT_VERSION;
 exports.EFFECT_VITEST_VERSION = __webpack_exports__.EFFECT_VITEST_VERSION;
@@ -135,6 +139,7 @@ exports.ZEPHYR_RSPACK_PLUGIN_VERSION = __webpack_exports__.ZEPHYR_RSPACK_PLUGIN_
 exports.ultramodernWorkspaceVersions = __webpack_exports__.ultramodernWorkspaceVersions;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "CLOUDFLARE_COMPATIBILITY_DATE",
+    "DRIZZLE_ORM_VERSION",
     "EFFECT_TSGO_VERSION",
     "EFFECT_VERSION",
     "EFFECT_VITEST_VERSION",

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

@@ -174,6 +174,7 @@ function createWorkspaceValidationScript(scope, enableTailwind, remotes = []) {
     const expectedCloudflareSecurity = (0, external_policy_cjs_namespaceObject.createCloudflareSecurityContract)();
     return (0, external_fs_io_cjs_namespaceObject.renderFileTemplate)("workspace-scripts/validate-ultramodern-workspace.mjs", {
         packageScope: scope,
+        effectVersion: external_versions_cjs_namespaceObject.EFFECT_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

@@ -175,6 +175,7 @@ function generateUltramodernWorkspace(options) {
         nodeVersion: external_versions_cjs_namespaceObject.NODE_VERSION,
         pnpmVersion: external_versions_cjs_namespaceObject.PNPM_VERSION,
         nodeFetchVersion: external_versions_cjs_namespaceObject.NODE_FETCH_VERSION,
+        drizzleOrmVersion: external_versions_cjs_namespaceObject.DRIZZLE_ORM_VERSION,
         effectVersion: external_versions_cjs_namespaceObject.EFFECT_VERSION,
         effectVitestVersion: external_versions_cjs_namespaceObject.EFFECT_VITEST_VERSION,
         tanstackRouterCoreVersion: external_versions_cjs_namespaceObject.TANSTACK_ROUTER_CORE_VERSION,

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

@@ -5,8 +5,10 @@ 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 { 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 { 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";
 import { readUltramodernConfig, workspaceAppsFromToolingConfig } from "./config.js";
 const commands_dirname = node_path.dirname(fileURLToPath(import.meta.url));
@@ -186,6 +188,10 @@ const strictEffectPackageVersionPolicyExclusions = [
     `effect@${EFFECT_VERSION}`,
     `@effect/opentelemetry@${EFFECT_VERSION}`
 ];
+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 [
@@ -321,11 +327,117 @@ function ensureYamlListItem(source, key, item) {
         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, 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,
@@ -360,6 +472,12 @@ function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
             changed = policyExclude.changed || changed;
         }
     }
+    const effectPatch = ensureYamlMapEntry(source, 'patchedDependencies', `effect@${EFFECT_VERSION}`, effectDeclarationPatchPath);
+    source = effectPatch.source;
+    changed = effectPatch.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;
 }
@@ -382,6 +500,57 @@ 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/'
+    ])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 updateReferenceTopology(workspaceRoot) {
     const topologyPath = node_path.join(workspaceRoot, 'topology/reference-topology.json');
     if (!node_fs.existsSync(topologyPath)) return false;
@@ -445,8 +614,9 @@ function runMigrateStrictEffect(args, context) {
 
 Updates generated UltraModern package-source metadata, Modern package aliases,
 framework-owned toolchain pins, direct Effect API topology metadata, strict
-Effect pnpm overrides/trust policy, and the pnpm lockfile. Source code still
-has to pass pnpm api:check and pnpm contract:check.
+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;
     }
@@ -454,6 +624,7 @@ has to pass pnpm api:check and pnpm contract:check.
     const packageSource = createMigrationPackageSource(args, current);
     updateUltramodernConfig(context.workspaceRoot, packageSource);
     updateReferenceTopology(context.workspaceRoot);
+    updateGeneratedTypeScriptSurfaces(context.workspaceRoot, current);
     for (const relativePackageFile of listWorkspacePackageFiles(context.workspaceRoot)){
         const packageFile = node_path.join(context.workspaceRoot, relativePackageFile);
         const packageJson = readJsonFile(packageFile);
@@ -472,6 +643,9 @@ has to pass pnpm api:check and pnpm contract:check.
         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/ultramodern-workspace/app-files.js

@@ -27,17 +27,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: [