@bleedingdev/modern-js-create 3.4.0-ultramodern.1 → 3.4.0-ultramodern.3

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

@@ -1,11 +1,11 @@
 import "node:module";
 import { WORKSPACE_PACKAGE_VERSION, modernPackageSpecifier } from "../ultramodern-package-source.js";
-import { appHasEffectApi, remoteDependencyAlias, resolveRemoteRefs, shellApp, verticalEffectApps, zephyrRemoteDependency } from "./descriptors.js";
+import { appHasEffectApi, remoteDependencyAlias, resolveRemoteRefs, sharedPackages, shellApp, verticalEffectApps, zephyrRemoteDependency } from "./descriptors.js";
 import { readFileTemplate } from "./fs-io.js";
 import { packageName, relativeRootFor } from "./naming.js";
 import { createPublicSurfaceGenerationCommand } from "./public-surface.js";
 import { EFFECT_TSGO_VERSION, I18NEXT_VERSION, LEFTHOOK_VERSION, MODULE_FEDERATION_VERSION, NODE_FETCH_VERSION, OXFMT_VERSION, OXLINT_VERSION, PNPM_VERSION, POSTCSS_VERSION, REACT_DOM_VERSION, REACT_ROUTER_VERSION, REACT_VERSION, TAILWIND_POSTCSS_VERSION, TAILWIND_VERSION, TANSTACK_ROUTER_VERSION, TYPESCRIPT_NATIVE_PREVIEW_VERSION, TYPESCRIPT_VERSION, TYPES_REACT_DOM_VERSION, TYPES_REACT_VERSION, ULTRACITE_VERSION, WRANGLER_VERSION, ZEPHYR_AGENT_VERSION, ZEPHYR_RSPACK_PLUGIN_VERSION } from "./versions.js";
-const effectTsgoTypecheckCommand = "node -e \"const fs = require('node:fs'); const { execFileSync, spawnSync } = require('node:child_process'); const bin = execFileSync('effect-tsgo', ['get-exe-path'], { encoding: 'utf8' }).trim(); if (process.platform !== 'win32') fs.chmodSync(bin, 0o755); const result = spawnSync(bin, ['--noEmit', '-p', 'tsconfig.json'], { stdio: 'inherit' }); process.exit(result.status ?? 1);\"";
+const createEffectTsgoTypecheckCommand = (packageDir)=>`node ${relativeRootFor(packageDir)}/scripts/ultramodern-typecheck.mjs --project tsconfig.json`;
 const effectDiagnostics = [
     'anyUnknownInErrorContext',
     'classSelfMismatch',
@@ -151,7 +151,7 @@ function createRootPackageJson(scope, packageSource, remotes = []) {
             'format:check': "oxfmt --check . '!repos/**'",
             lint: 'oxlint apps verticals packages',
             'lint:fix': 'oxlint apps verticals packages --fix',
-            typecheck: `pnpm -r --filter "@${scope}/*" typecheck`,
+            typecheck: "node ./scripts/ultramodern-typecheck.mjs --build tsconfig.json",
             'cloudflare:build': `${remoteCloudflareBuildPrefix}pnpm --filter "./apps/shell-super-app" run cloudflare:build && pnpm mf:types`,
             'cloudflare:deploy': `${remoteCloudflareDeployPrefix}pnpm --filter "./apps/shell-super-app" run cloudflare:deploy`,
             'cloudflare:proof': "node ./scripts/proof-cloudflare-version.mjs --out .codex/reports/cloudflare-version-proof/public-url-proof.json",
@@ -252,17 +252,69 @@ function createTsConfigBase() {
         }
     };
 }
-function createPackageTsConfig(packageDir, includeApi = false) {
-    const include = [
+function createTsBuildInfoFile(packageDir) {
+    const cacheKey = packageDir.replace(/[^a-zA-Z0-9._-]+/gu, '__');
+    return `${relativeRootFor(packageDir)}/node_modules/.cache/tsgo/${cacheKey}.tsbuildinfo`;
+}
+function createReferences(packageDir, references) {
+    return [
+        ...new Set(references)
+    ].filter((reference)=>reference !== packageDir).map((reference)=>({
+            path: `${relativeRootFor(packageDir)}/${reference}`
+        }));
+}
+function createPackageTsConfig(packageDir, options = {}) {
+    const resolvedOptions = 'boolean' == typeof options ? {
+        includeApi: options
+    } : options;
+    const include = resolvedOptions.include ?? [
         'src',
         'modern.config.ts',
         'module-federation.config.ts'
     ];
-    if (includeApi) include.push('api', 'shared');
-    return {
+    if (resolvedOptions.includeApi) include.push('api', 'shared');
+    const references = createReferences(packageDir, resolvedOptions.references ?? []);
+    const tsconfig = {
         extends: `${relativeRootFor(packageDir)}/tsconfig.base.json`,
+        compilerOptions: {
+            composite: true,
+            incremental: true,
+            tsBuildInfoFile: createTsBuildInfoFile(packageDir)
+        },
         include
     };
+    if (references.length > 0) tsconfig.references = references;
+    return tsconfig;
+}
+function createAppTsConfig(app, remotes = []) {
+    const references = [
+        ...sharedPackages.map((sharedPackage)=>sharedPackage.directory),
+        ...'shell' === app.kind ? verticalEffectApps(remotes).map((remote)=>remote.directory) : resolveRemoteRefs(app, remotes).map((remote)=>remote.directory)
+    ];
+    return createPackageTsConfig(app.directory, {
+        includeApi: appHasEffectApi(app),
+        references
+    });
+}
+function createSharedPackageTsConfig(packageDir) {
+    return createPackageTsConfig(packageDir, {
+        include: [
+            'src'
+        ]
+    });
+}
+function createRootTsConfig(apps = []) {
+    return {
+        files: [],
+        references: [
+            ...sharedPackages.map((sharedPackage)=>({
+                    path: sharedPackage.directory
+                })),
+            ...apps.map((app)=>({
+                    path: app.directory
+                }))
+        ]
+    };
 }
 function createAppPackage(scope, app, packageSource, enableTailwind, remotes = []) {
     const publicSurfaceBuildCommand = createPublicSurfaceGenerationCommand(app, 'dist');
@@ -284,7 +336,7 @@ function createAppPackage(scope, app, packageSource, enableTailwind, remotes = [
             'cloudflare:preview': 'pnpm run cloudflare:build && wrangler dev --config .output/wrangler.json',
             'cloudflare:proof': `node ${relativeRootFor(app.directory)}/scripts/proof-cloudflare-version.mjs --app ${app.id}`,
             serve: 'modern serve',
-            typecheck: effectTsgoTypecheckCommand
+            typecheck: createEffectTsgoTypecheckCommand(app.directory)
         },
         modernjs: {
             preset: 'presetUltramodern',
@@ -320,7 +372,7 @@ function createSharedPackage(scope, id, description) {
             '.': './src/index.ts'
         },
         scripts: {
-            typecheck: effectTsgoTypecheckCommand
+            typecheck: createEffectTsgoTypecheckCommand(`packages/${id}`)
         },
         devDependencies: {
             '@effect/tsgo': EFFECT_TSGO_VERSION,
@@ -336,4 +388,4 @@ function createSharedPackage(scope, id, description) {
 function createSharedContractsIndex() {
     return readFileTemplate('packages/shared-contracts-index.ts');
 }
-export { appDependencies, appDevDependencies, createAppPackage, createPackageTsConfig, createRootPackageJson, createSharedContractsIndex, createSharedPackage, createTsConfigBase, createZephyrDependencies, effectDiagnostics, effectTsgoTypecheckCommand };
+export { appDependencies, appDevDependencies, createAppPackage, createAppTsConfig, createEffectTsgoTypecheckCommand, createPackageTsConfig, createRootPackageJson, createRootTsConfig, createSharedContractsIndex, createSharedPackage, createSharedPackageTsConfig, createTsConfigBase, createZephyrDependencies, effectDiagnostics };

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

@@ -10,9 +10,8 @@ const TAILWIND_POSTCSS_VERSION = '4.3.1';
 const POSTCSS_VERSION = '8.5.15';
 const EFFECT_TSGO_VERSION = '0.14.6';
 const TYPESCRIPT_STABLE_VERSION = '6.0.3';
-const TYPESCRIPT_7_VERSION = '7.0.1-rc';
-const TYPESCRIPT_VERSION = TYPESCRIPT_STABLE_VERSION;
 const TYPESCRIPT_NATIVE_PREVIEW_VERSION = '7.0.0-dev.20260624.1';
+const TYPESCRIPT_VERSION = TYPESCRIPT_STABLE_VERSION;
 const OXLINT_VERSION = '1.71.0';
 const OXFMT_VERSION = '0.55.0';
 const ULTRACITE_VERSION = '7.8.3';
@@ -34,4 +33,4 @@ const ultramodernWorkspaceVersions = {
     tailwind: TAILWIND_VERSION,
     tailwindPostcss: TAILWIND_POSTCSS_VERSION
 };
-export { CLOUDFLARE_COMPATIBILITY_DATE, EFFECT_TSGO_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_VERSION, TYPESCRIPT_7_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, EFFECT_TSGO_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_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

@@ -80,6 +80,9 @@ function createPerformanceReadinessConfigScript() {
 function createPerformanceReadinessScript() {
     return readFileTemplate("workspace-scripts/ultramodern-performance-readiness.mjs");
 }
+function createUltramodernTypecheckScript() {
+    return readFileTemplate("workspace-scripts/ultramodern-typecheck.mjs");
+}
 function writeGeneratedWorkspaceScripts(targetDir, scope, enableTailwind, remotes = []) {
     writeFileReplacing(targetDir, "scripts/assert-mf-types.mjs", createAssertMfTypesScript(remotes));
     writeFileReplacing(targetDir, "scripts/validate-ultramodern-workspace.mjs", createWorkspaceValidationScript(scope, enableTailwind, remotes));
@@ -89,5 +92,6 @@ function writeGeneratedWorkspaceScripts(targetDir, scope, enableTailwind, remote
     writeFileReplacing(targetDir, "scripts/proof-cloudflare-version.mjs", createCloudflareVersionProofScript());
     writeFileReplacing(targetDir, "scripts/ultramodern-performance-readiness.config.mjs", createPerformanceReadinessConfigScript());
     writeFileReplacing(targetDir, "scripts/ultramodern-performance-readiness.mjs", createPerformanceReadinessScript());
+    writeFileReplacing(targetDir, "scripts/ultramodern-typecheck.mjs", createUltramodernTypecheckScript());
 }
-export { createAssertMfTypesScript, createCloudflareProofHelperScript, createCloudflareVersionProofScript, createPerformanceReadinessConfigScript, createPerformanceReadinessScript, createPublicSurfaceAssetsScript, createWorkspaceI18nBoundaryValidationScript, createWorkspaceValidationScript, writeGeneratedWorkspaceScripts };
+export { createAssertMfTypesScript, createCloudflareProofHelperScript, createCloudflareVersionProofScript, createPerformanceReadinessConfigScript, createPerformanceReadinessScript, createPublicSurfaceAssetsScript, createUltramodernTypecheckScript, createWorkspaceI18nBoundaryValidationScript, createWorkspaceValidationScript, writeGeneratedWorkspaceScripts };

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

@@ -9,9 +9,9 @@ import { copyRootTemplate, writeFile, writeJson } from "./fs-io.js";
 import { createFileSnapshot, createGenerationResult, diffFileSnapshots } from "./generation-result.js";
 import { createAppPublicLocaleMessages } from "./locales.js";
 import { createAppModernConfig, createRemoteModuleFederationConfig, createShellModuleFederationConfig, createUltramodernBuildModule } from "./module-federation.js";
-import { assertUniqueTailwindPrefixes, relativeRootFor, toPackageScope } from "./naming.js";
+import { assertUniqueTailwindPrefixes, toPackageScope } from "./naming.js";
 import { runCodeSmithOverlays } from "./overlays.js";
-import { createAppPackage, createPackageTsConfig, createRootPackageJson, createSharedContractsIndex, createSharedPackage, createTsConfigBase } from "./package-json.js";
+import { 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 { NODE_FETCH_VERSION, NODE_VERSION, PNPM_VERSION, TANSTACK_ROUTER_VERSION, TYPESCRIPT_VERSION } from "./versions.js";
@@ -23,7 +23,7 @@ function writeApp(targetDir, scope, app, packageSource, enableTailwind, remotes
         writeFile(targetDir, `${resolvedApp.directory}/${relativePath}`, content);
     };
     writeJson(targetDir, `${resolvedApp.directory}/package.json`, createAppPackage(scope, resolvedApp, packageSource, enableTailwind, remotes));
-    writeJson(targetDir, `${resolvedApp.directory}/tsconfig.json`, createPackageTsConfig(resolvedApp.directory, appHasEffectApi(resolvedApp)));
+    writeJson(targetDir, `${resolvedApp.directory}/tsconfig.json`, createAppTsConfig(resolvedApp, remotes));
     writeFile(targetDir, `${resolvedApp.directory}/src/modern-app-env.d.ts`, createAppEnvDts(resolvedApp, remotes));
     writeFile(targetDir, `${resolvedApp.directory}/src/ultramodern-build.ts`, createUltramodernBuildModule(scope, resolvedApp));
     writeFile(targetDir, publicWeb.jsonLdHelperFile.path, publicWeb.jsonLdHelperFile.content);
@@ -66,12 +66,7 @@ function writeApp(targetDir, scope, app, packageSource, enableTailwind, remotes
 function writeSharedPackages(targetDir, scope) {
     for (const sharedPackage of sharedPackages){
         writeJson(targetDir, `${sharedPackage.directory}/package.json`, createSharedPackage(scope, sharedPackage.id, sharedPackage.description));
-        writeJson(targetDir, `${sharedPackage.directory}/tsconfig.json`, {
-            extends: `${relativeRootFor(sharedPackage.directory)}/tsconfig.base.json`,
-            include: [
-                'src'
-            ]
-        });
+        writeJson(targetDir, `${sharedPackage.directory}/tsconfig.json`, createSharedPackageTsConfig(sharedPackage.directory));
     }
     writeFile(targetDir, 'packages/shared-contracts/src/index.ts', createSharedContractsIndex());
     writeFile(targetDir, 'packages/shared-design-tokens/src/index.ts', `export const sharedDesignTokens = {
@@ -113,6 +108,7 @@ function generateUltramodernWorkspace(options) {
     });
     writeJson(options.targetDir, 'package.json', createRootPackageJson(scope, packageSource, initialVerticals));
     writeJson(options.targetDir, 'tsconfig.base.json', createTsConfigBase());
+    writeJson(options.targetDir, 'tsconfig.json', createRootTsConfig(createdApps));
     writeJson(options.targetDir, 'topology/reference-topology.json', createTopology(scope, initialVerticals));
     writeJson(options.targetDir, 'topology/ownership.json', createOwnership(scope, initialVerticals));
     writeJson(options.targetDir, 'topology/local-overlays/development.json', createDevelopmentOverlay(initialVerticals));

package/dist/types/ultramodern-workspace/package-json.d.ts

@@ -1,12 +1,21 @@
 import type { JsonValue, ResolvedPackageSource, WorkspaceApp } from './types';
-export declare const effectTsgoTypecheckCommand = "node -e \"const fs = require('node:fs'); const { execFileSync, spawnSync } = require('node:child_process'); const bin = execFileSync('effect-tsgo', ['get-exe-path'], { encoding: 'utf8' }).trim(); if (process.platform !== 'win32') fs.chmodSync(bin, 0o755); const result = spawnSync(bin, ['--noEmit', '-p', 'tsconfig.json'], { stdio: 'inherit' }); process.exit(result.status ?? 1);\"";
+export declare const createEffectTsgoTypecheckCommand: (packageDir: string) => string;
 export declare const effectDiagnostics: string[];
 export declare function appDependencies(scope: string, packageSource: ResolvedPackageSource, app: WorkspaceApp, remotes?: WorkspaceApp[]): Record<string, string>;
 export declare function appDevDependencies(packageSource: ResolvedPackageSource, enableTailwind: boolean): Record<string, string>;
 export declare function createRootPackageJson(scope: string, packageSource: ResolvedPackageSource, remotes?: WorkspaceApp[]): JsonValue;
 export declare function createZephyrDependencies(scope: string, app: WorkspaceApp, remotes?: WorkspaceApp[]): JsonValue;
 export declare function createTsConfigBase(): JsonValue;
-export declare function createPackageTsConfig(packageDir: string, includeApi?: boolean): JsonValue;
+type CreatePackageTsConfigOptions = {
+    include?: string[];
+    includeApi?: boolean;
+    references?: string[];
+};
+export declare function createPackageTsConfig(packageDir: string, options?: CreatePackageTsConfigOptions | boolean): JsonValue;
+export declare function createAppTsConfig(app: WorkspaceApp, remotes?: WorkspaceApp[]): JsonValue;
+export declare function createSharedPackageTsConfig(packageDir: string): JsonValue;
+export declare function createRootTsConfig(apps?: WorkspaceApp[]): JsonValue;
 export declare function createAppPackage(scope: string, app: WorkspaceApp, packageSource: ResolvedPackageSource, enableTailwind: boolean, remotes?: WorkspaceApp[]): JsonValue;
 export declare function createSharedPackage(scope: string, id: string, description: string): JsonValue;
 export declare function createSharedContractsIndex(): string;
+export {};

package/dist/types/ultramodern-workspace/versions.d.ts

@@ -14,9 +14,8 @@ export declare const TAILWIND_POSTCSS_VERSION = "4.3.1";
 export declare const POSTCSS_VERSION = "8.5.15";
 export declare const EFFECT_TSGO_VERSION = "0.14.6";
 export declare const TYPESCRIPT_STABLE_VERSION = "6.0.3";
-export declare const TYPESCRIPT_7_VERSION = "7.0.1-rc";
-export declare const TYPESCRIPT_VERSION = "6.0.3";
 export declare const TYPESCRIPT_NATIVE_PREVIEW_VERSION = "7.0.0-dev.20260624.1";
+export declare const TYPESCRIPT_VERSION = "6.0.3";
 export declare const OXLINT_VERSION = "1.71.0";
 export declare const OXFMT_VERSION = "0.55.0";
 export declare const ULTRACITE_VERSION = "7.8.3";

package/dist/types/ultramodern-workspace/workspace-scripts.d.ts

@@ -7,4 +7,5 @@ export declare function createCloudflareProofHelperScript(): string;
 export declare function createCloudflareVersionProofScript(): string;
 export declare function createPerformanceReadinessConfigScript(): string;
 export declare function createPerformanceReadinessScript(): string;
+export declare function createUltramodernTypecheckScript(): string;
 export declare function writeGeneratedWorkspaceScripts(targetDir: string, scope: string, enableTailwind: boolean, remotes?: WorkspaceApp[]): void;

package/package.json

@@ -21,7 +21,7 @@
   "engines": {
     "node": ">=20"
   },
-  "version": "3.4.0-ultramodern.1",
+  "version": "3.4.0-ultramodern.3",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/esm-node/index.js",
   "bin": {
@@ -75,11 +75,11 @@
   ],
   "dependencies": {
     "@modern-js/codesmith": "2.6.9",
-    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.4.0-ultramodern.1"
+    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.4.0-ultramodern.3"
   },
   "devDependencies": {
     "@rslib/core": "0.23.0",
-    "@types/node": "^26.0.0",
+    "@types/node": "^26.0.1",
     "@typescript/native-preview": "7.0.0-dev.20260624.1",
     "tsx": "^4.22.4",
     "typescript": "^6.0.3",
@@ -97,6 +97,6 @@
     "test": "rm -rf dist && rslib build -c rslibconfig.mts && rstest --passWithNoTests"
   },
   "ultramodern": {
-    "frameworkVersion": "3.4.0-ultramodern.1"
+    "frameworkVersion": "3.4.0-ultramodern.3"
   }
 }

package/template-workspace/AGENTS.md.handlebars

@@ -12,7 +12,7 @@ baseline; do not reintroduce Corepack or older pnpm aliases.
 
 - `pnpm lint` runs Oxlint with the Ultracite preset.
 - `pnpm format` runs oxfmt.
-- `pnpm typecheck` runs effect-tsgo as the TypeScript checker.
+- `pnpm typecheck` runs TS7 native-preview through effect-tsgo in project-reference build mode with parallel `--checkers` and `--builders`.
 - `pnpm i18n:boundaries` verifies workspace source boundaries through `@modern-js/code-tools`.
 - `pnpm contract:check` verifies the generated workspace contract.
 - `pnpm mf:types` verifies Module Federation type outputs after builds.
@@ -72,6 +72,7 @@ Agents may read files under `repos/` to understand upstream patterns, APIs, and
 ## Project Priorities
 
 - Keep `presetUltramodern` as the single preset.
+- Maximize TS7 latest dev usage through `@typescript/native-preview` and TS-Go. Keep classic `typescript` on latest TS6 only for compatibility peers and tooling that cannot consume native-preview yet.
 - Keep the initial workspace shell-only unless a user explicitly asks for a
   starter vertical.
 - Use `create <domain> --vertical` as the growth path for real business

package/template-workspace/README.md.handlebars

@@ -68,6 +68,13 @@ Generated CI does not call the local aggregate. It runs format, lint,
 typecheck, skills, i18n boundary validation, contract validation, and build as
 separate matrix jobs so failures are isolated and parallelizable.
 
+Type checking is TS7-first. `pnpm typecheck` runs
+`scripts/ultramodern-typecheck.mjs` in TS-Go build mode over
+`tsconfig.json` project references, with native-preview `--checkers` and
+`--builders` enabled by default. `@typescript/native-preview` is the TS7 latest
+dev compiler lane. The classic `typescript` package is pinned to latest TS6
+only where compatibility peers or tooling still require it.
+
 Read-only agent reference repositories under `repos/` (Effect and
 UltraModern.js source lookup using squashed git subtrees) are an explicit
 opt-in step: run `pnpm agents:refs:install` when you want them. `pnpm install`

package/template-workspace/oxfmt.config.ts

@@ -5,13 +5,15 @@ export default defineConfig({
   extends: [ultracite],
   ignorePatterns: [
     '.agents',
+    '.output',
     '**/*.json',
     'dist',
     'node_modules',
     'repos/**',
     '.modern',
     '.modernjs',
-    '**/routeTree.gen.ts',
+    '**/modern-tanstack/**',
+    '**/routeTree.gen.*',
   ],
   singleQuote: true,
 });

package/template-workspace/oxlint.config.ts

@@ -10,11 +10,13 @@ export default defineConfig({
   extends: [core, react],
   ignorePatterns: [
     '.agents',
+    '.output',
     'dist',
     'node_modules',
     'repos/**',
     '.modern',
     '.modernjs',
-    '**/routeTree.gen.ts',
+    '**/modern-tanstack/**',
+    '**/routeTree.gen.*',
   ],
 });

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

@@ -14,6 +14,14 @@ minimumReleaseAgeExclude:
   - '@typescript/native-preview'
   - '@typescript/native-preview-*'
   - '@types/react'
+  - '@rsbuild/core'
+  - '@rsbuild/plugin-react'
+  - '@rsbuild/plugin-type-check'
+  - '@rspack/binding'
+  - '@rspack/binding-*'
+  - '@rspack/core'
+  - '@rspack/plugin-react-refresh'
+  - 'ts-checker-rspack-plugin'
 trustPolicy: no-downgrade
 trustPolicyIgnoreAfter: 1440
 blockExoticSubdeps: true

package/template-workspace/scripts/bootstrap-agent-skills.mjs

@@ -20,13 +20,30 @@ const cloneTimeoutMs = Number.parseInt(
 
 const readJson = filePath => JSON.parse(fs.readFileSync(filePath, 'utf-8'));
 
-const run = (command, args, options = {}) =>
-  execFileSync(command, args, {
+const commandOverrideEnv = {
+  gh: 'ULTRAMODERN_GH_BIN',
+  git: 'ULTRAMODERN_GIT_BIN',
+  lefthook: 'ULTRAMODERN_LEFTHOOK_BIN',
+};
+
+const resolveCommand = command => {
+  const overrideEnv = commandOverrideEnv[command];
+  return overrideEnv ? (process.env[overrideEnv] ?? command) : command;
+};
+
+const requiresCommandShell = command =>
+  process.platform === 'win32' && /\.(?:bat|cmd)$/iu.test(command);
+
+const run = (command, args, options = {}) => {
+  const resolvedCommand = resolveCommand(command);
+  return execFileSync(resolvedCommand, args, {
     cwd: options.cwd ?? root,
     encoding: 'utf-8',
+    shell: requiresCommandShell(resolvedCommand),
     stdio: options.stdio ?? ['ignore', 'pipe', 'pipe'],
     timeout: options.timeout,
   });
+};
 
 const commandExists = command => {
   try {
@@ -47,17 +64,18 @@ const requireGit = () => {
   );
 };
 
-const isInsideGitWorkTree = () => {
+const gitTopLevel = () => {
   try {
-    return run('git', ['rev-parse', '--is-inside-work-tree']).trim() === 'true';
+    return run('git', ['rev-parse', '--show-toplevel']).trim();
   } catch {
-    return false;
+    return undefined;
   }
 };
 
 const initializeGitRepository = () => {
-  if (isInsideGitWorkTree()) {
-    return;
+  const topLevel = gitTopLevel();
+  if (topLevel !== undefined) {
+    return path.resolve(topLevel) === root;
   }
 
   try {
@@ -66,9 +84,24 @@ const initializeGitRepository = () => {
     run('git', ['init'], { stdio: 'inherit' });
     run('git', ['branch', '-M', 'main'], { stdio: 'inherit' });
   }
+  return true;
 };
 
 const installLefthook = () => {
+  if (!commandExists('git')) {
+    console.warn(
+      'Skipping lefthook hook installation because git is not available. Install git and run lefthook install from the generated workspace root to enable local hooks.',
+    );
+    return;
+  }
+
+  if (!initializeGitRepository()) {
+    console.log(
+      'Skipping lefthook hook installation because this generated workspace is nested inside another Git worktree. Run git init from the generated workspace root before installing hooks if you want workspace-local hooks.',
+    );
+    return;
+  }
+
   try {
     run('lefthook', ['install'], { stdio: 'inherit' });
   } catch (error) {
@@ -199,8 +232,8 @@ if (checkOnly) {
   }
 
   if (missingCloneInstalled.length > 0) {
-    console.warn(
-      `Clone-installed agent skills not present: ${missingCloneInstalled.join(', ')}. Run pnpm skills:install to fetch them.`,
+    console.log(
+      `Advisory: clone-installed agent skills are not present: ${missingCloneInstalled.join(', ')}. This is expected in CI, nested generated workspaces, and postinstall-only installs; run pnpm skills:install when you need those skills.`,
     );
   } else {
     console.log('All pinned agent skills are installed.');
@@ -218,7 +251,6 @@ if (postinstall && !cloneOptIn) {
 
 fs.mkdirSync(installDir, { recursive: true });
 requireGit();
-initializeGitRepository();
 
 for (const source of [...requiredCloneSources, ...optionalCloneSources]) {
   const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ultramodern-skills-'));

package/templates/app/shell-frame.tsx

@@ -7,8 +7,7 @@ interface ShellFrameProps {
 }
 
 export default function ShellFrame({ children }: ShellFrameProps) {
-  const { i18nInstance, language } = useModernI18n();
-  const t = i18nInstance['t'].bind(i18nInstance);
+  const { language, t } = useModernI18n();
   const { alternates } = useLocalizedLocation();
 
   return (

package/templates/app/ultramodern-route-head.tsx.handlebars

@@ -9,11 +9,17 @@ const appName = {{appDisplayNameJson}};
 const fallbackLanguage = 'en';
 const supportedLanguages = ['en', 'cs'] as const;
 type SupportedLanguage = (typeof supportedLanguages)[number];
-type RouteMetadata = (typeof ultramodernRouteMetadata)[number] & {
+type GeneratedRouteMetadata = (typeof ultramodernRouteMetadata)[number];
+type RouteMetadata = Omit<
+  GeneratedRouteMetadata,
+  'indexable' | 'jsonLd' | 'public'
+> & {
+  readonly indexable: boolean;
   readonly jsonLd?: RouteJsonLd;
+  readonly public: boolean;
 };
 
-const routeMetadata = ultramodernRouteMetadata as readonly RouteMetadata[];
+const routeMetadata: readonly RouteMetadata[] = ultramodernRouteMetadata;
 
 const isSupportedLanguage = (value: string): value is SupportedLanguage =>
   supportedLanguages.includes(value as SupportedLanguage);
@@ -84,6 +90,11 @@ const resolveRouteMetadata = (pathname: string) => {
   return routeMetadata[0];
 };
 
+const isPublicIndexableRoute = (
+  route: RouteMetadata | undefined,
+): route is RouteMetadata =>
+  route !== undefined && route.public && route.indexable;
+
 const absoluteUrl = (pathname: string) => {
   const origin = ULTRAMODERN_SITE_URL.replace(/\/+$/u, '');
   return `${origin}${pathname}`;
@@ -93,18 +104,18 @@ const sanitiseJsonLd = (value: RouteJsonLd) =>
   JSON.stringify(value).replaceAll('<', '\\u003c');
 
 export const UltramodernRouteHead = () => {
-  const { i18nInstance } = useModernI18n();
-  const t = i18nInstance['t'].bind(i18nInstance);
+  const { language, t } = useModernI18n();
   const { canonical, alternates } = useLocalizedLocation();
   const route = resolveRouteMetadata(canonical);
-  const title = route ? t(route.titleKey) : appName;
-  const description = route ? t(route.descriptionKey) : appName;
+  const title = route === undefined ? appName : t(route.titleKey);
+  const description =
+    route === undefined ? appName : t(route.descriptionKey);
   const canonicalUrl = absoluteUrl(alternates[fallbackLanguage] ?? `/${fallbackLanguage}`);
-  const indexable = route?.public === true && route?.indexable === true;
-  const jsonLd = indexable ? route?.jsonLd : undefined;
+  const indexable = isPublicIndexableRoute(route);
+  const jsonLd = route?.jsonLd;
 
   return (
-    <Helmet htmlAttributes={{ lang: i18nInstance.language ?? fallbackLanguage }}>
+    <Helmet htmlAttributes={{ lang: language ?? fallbackLanguage }}>
       <title>{title}</title>
       <meta content={description} name="description" />
       <meta content={indexable ? 'index, follow' : 'noindex, nofollow'} name="robots" />
@@ -128,13 +139,13 @@ export const UltramodernRouteHead = () => {
           <meta content={description} property="og:description" />
           <meta content={canonicalUrl} property="og:url" />
           <meta content="website" property="og:type" />
-          <meta content={i18nInstance.language ?? fallbackLanguage} property="og:locale" />
+          <meta content={language ?? fallbackLanguage} property="og:locale" />
           <meta content="summary_large_image" name="twitter:card" />
           <meta content={title} name="twitter:title" />
           <meta content={description} name="twitter:description" />
-          {jsonLd && (
+          {jsonLd !== undefined ? (
             <script type="application/ld+json">{sanitiseJsonLd(jsonLd)}</script>
-          )}
+          ) : null}
         </>
       )}
     </Helmet>