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

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

@@ -6,8 +6,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));
@@ -187,6 +189,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 [
@@ -322,6 +328,55 @@ 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 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 ensureGeneratedDeclarationPatches(workspaceRoot) {
+    let changed = false;
+    changed = ensureGeneratedPatchFile(workspaceRoot, effectDeclarationPatchPath, effectDeclarationPatchSourcePath) || changed;
+    changed = ensureGeneratedPatchFile(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;
@@ -361,6 +416,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 = ensureYamlMapEntry(source, 'patchedDependencies', `drizzle-orm@${DRIZZLE_ORM_VERSION}`, drizzleOrmDeclarationPatchPath);
+    source = drizzleOrmPatch.source;
+    changed = drizzleOrmPatch.changed || changed;
     if (changed) node_fs.writeFileSync(workspaceFile, source, 'utf-8');
     return changed;
 }
@@ -383,6 +444,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;
@@ -446,8 +558,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;
     }
@@ -455,6 +568,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);
@@ -473,6 +587,7 @@ has to pass pnpm api:check and pnpm contract:check.
         else if ('package.json' === relativePackageFile) writeJsonFile(packageFile, packageJson);
     }
     updateGeneratedPnpmWorkspacePolicy(context.workspaceRoot);
+    ensureGeneratedDeclarationPatches(context.workspaceRoot);
     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/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,

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, NODE_VERSION, PNPM_VERSION } from "./versions.js";
 function createToolWrapperScript(command, extraArgs = []) {
     const commandJson = JSON.stringify(command);
     const extraArgsJson = JSON.stringify(extraArgs);
@@ -128,6 +128,7 @@ function createWorkspaceValidationScript(scope, enableTailwind, remotes = []) {
     const expectedCloudflareSecurity = createCloudflareSecurityContract();
     return renderFileTemplate("workspace-scripts/validate-ultramodern-workspace.mjs", {
         packageScope: scope,
+        effectVersion: EFFECT_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, 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,6 +131,7 @@ function generateUltramodernWorkspace(options) {
         nodeVersion: NODE_VERSION,
         pnpmVersion: PNPM_VERSION,
         nodeFetchVersion: NODE_FETCH_VERSION,
+        drizzleOrmVersion: DRIZZLE_ORM_VERSION,
         effectVersion: EFFECT_VERSION,
         effectVitestVersion: EFFECT_VITEST_VERSION,
         tanstackRouterCoreVersion: TANSTACK_ROUTER_CORE_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;
 };

package/package.json

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

package/template-workspace/.gitignore.handlebars

@@ -4,5 +4,7 @@ build/
 .modernjs/cache/
 .modern-js/
 **/.modern-js/
+.mf/
+**/.mf/
 .modernjs/agent-reference-repos-tmp/
 .codex/reports/