@bleedingdev/modern-js-create 3.5.0-ultramodern.36 → 3.5.0-ultramodern.37

package/package.json

@@ -21,7 +21,7 @@
   "engines": {
     "node": ">=20"
   },
-  "version": "3.5.0-ultramodern.36",
+  "version": "3.5.0-ultramodern.37",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/esm-node/index.js",
   "bin": {
@@ -75,17 +75,18 @@
   ],
   "dependencies": {
     "@modern-js/codesmith": "2.6.9",
-    "oxfmt": "0.56.0",
-    "ultracite": "7.8.3",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.36",
-    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.5.0-ultramodern.36"
+    "oxfmt": "0.58.0",
+    "ultracite": "7.9.3",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.37",
+    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.5.0-ultramodern.37"
   },
   "devDependencies": {
-    "@rslib/core": "0.23.1",
-    "@types/node": "^26.0.1",
-    "@typescript/native-preview": "7.0.0-dev.20260628.1",
-    "tsx": "^4.22.4",
-    "typescript": "^6.0.3",
+    "@rslib/core": "0.23.2",
+    "@types/node": "^26.1.1",
+    "@typescript/native-preview": "7.0.0-dev.20260707.2",
+    "@typescript/typescript6": "6.0.2",
+    "tsx": "^4.23.0",
+    "typescript": "^7.0.2",
     "@scripts/rstest-config": "2.66.0"
   },
   "publishConfig": {
@@ -97,9 +98,10 @@
     "build": "rm -rf dist && rslib build -c rslibconfig.mts && pnpm -w tsgo:dts \"$PWD\"",
     "dev": "rslib build -c rslibconfig.mts -w",
     "start": "node ./dist/esm-node/index.js",
-    "test": "rm -rf dist && rslib build -c rslibconfig.mts && rstest --passWithNoTests"
+    "test": "rm -rf dist && rslib build -c rslibconfig.mts && rstest --passWithNoTests",
+    "type-check": "tsgo --noEmit -p tsconfig.json"
   },
   "ultramodern": {
-    "frameworkVersion": "3.5.0-ultramodern.36"
+    "frameworkVersion": "3.5.0-ultramodern.37"
   }
 }

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 TS7 native-preview through effect-tsgo in project-reference build mode with parallel `--checkers` and `--builders`.
+- `pnpm typecheck` runs stable TS7 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.
@@ -78,7 +78,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 stable `typescript` on TS7 so Modern/Rspack and effect-tsgo use TS-Go by default.
 - 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

@@ -70,10 +70,9 @@ separate matrix jobs so failures are isolated and parallelizable.
 
 Type checking is TS7-first. `pnpm typecheck` runs
 `scripts/ultramodern-typecheck.mts` 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.
+`tsconfig.json` project references, with `--checkers` and `--builders`
+enabled by default. The stable `typescript` package is pinned to TS7 so
+Modern/Rspack type checking uses TS-Go by default.
 
 Read-only agent reference repositories under `repos/` (Effect and
 UltraModern.js source lookup using squashed git subtrees) are an explicit

package/template-workspace/patches/{@module-federation__bridge-react@2.6.0.patch → @module-federation__bridge-react@2.7.0.patch}

@@ -1,8 +1,8 @@
-diff --git a/dist/lazy-load-component-plugin-BYI941I2.mjs b/dist/lazy-load-component-plugin-BYI941I2.mjs
-index dfba15be1e9753e0f164b53cfb22feda13f39ea4..6be1b47903b9f6807bb0111df6c588f0d54ebf53 100644
---- a/dist/lazy-load-component-plugin-BYI941I2.mjs
-+++ b/dist/lazy-load-component-plugin-BYI941I2.mjs
-@@ -235,6 +235,41 @@ function getTargetModuleInfo(id, instance) {
+diff --git a/dist/lazy-load-component-plugin-BjMVNoep.js b/dist/lazy-load-component-plugin-BjMVNoep.js
+index 9f16c3f..bde8e11 100644
+--- a/dist/lazy-load-component-plugin-BjMVNoep.js
++++ b/dist/lazy-load-component-plugin-BjMVNoep.js
+@@ -236,6 +236,41 @@ function getTargetModuleInfo(id, instance) {
      remoteEntry
    };
  }
@@ -31,20 +31,20 @@ index dfba15be1e9753e0f164b53cfb22feda13f39ea4..6be1b47903b9f6807bb0111df6c588f0
 +  );
 +}
 +function StylesheetAsset({ href }) {
-+  const [shouldRender, setShouldRender] = useState(true);
-+  const linkRef = useRef(null);
-+  useEffect(() => {
++  const [shouldRender, setShouldRender] = React.useState(true);
++  const linkRef = React.useRef(null);
++  React.useEffect(() => {
 +    setShouldRender(!hasStylesheetLinkInHead(href, linkRef.current));
 +  }, [href]);
 +  if (!shouldRender) {
 +    return null;
 +  }
-+  return /* @__PURE__ */ React__default.createElement("link", { ref: linkRef, href, rel: "stylesheet", type: "text/css" });
++  return /* @__PURE__ */ React.createElement("link", { ref: linkRef, href, rel: "stylesheet", type: "text/css" });
 +}
  function collectSSRAssets(options) {
    const {
      id,
-@@ -253,15 +288,19 @@ function collectSSRAssets(options) {
+@@ -254,15 +289,19 @@ function collectSSRAssets(options) {
    }
    const { module: targetModule, publicPath, remoteEntry } = moduleAndPublicPath;
    if (injectLink) {
@@ -56,7 +56,7 @@ index dfba15be1e9753e0f164b53cfb22feda13f39ea4..6be1b47903b9f6807bb0111df6c588f0
 +      }
 +      stylesheetHrefs.add(href);
        links.push(
-         /* @__PURE__ */ React__default.createElement(
+         /* @__PURE__ */ React.createElement(
 -          "link",
 +          StylesheetAsset,
            {
@@ -68,11 +68,11 @@ index dfba15be1e9753e0f164b53cfb22feda13f39ea4..6be1b47903b9f6807bb0111df6c588f0
            }
          )
        );
-diff --git a/dist/lazy-load-component-plugin-DG4e3Tib.js b/dist/lazy-load-component-plugin-DG4e3Tib.js
-index 321c9c3cd55bf9d62a6825c9186267dfe28e5e93..867e7237d5a2ea613130c7e1710cdd998924d9db 100644
---- a/dist/lazy-load-component-plugin-DG4e3Tib.js
-+++ b/dist/lazy-load-component-plugin-DG4e3Tib.js
-@@ -236,6 +236,41 @@ function getTargetModuleInfo(id, instance) {
+diff --git a/dist/lazy-load-component-plugin-aj97Vt-4.mjs b/dist/lazy-load-component-plugin-aj97Vt-4.mjs
+index ed1dc8f..fd603ab 100644
+--- a/dist/lazy-load-component-plugin-aj97Vt-4.mjs
++++ b/dist/lazy-load-component-plugin-aj97Vt-4.mjs
+@@ -235,6 +235,41 @@ function getTargetModuleInfo(id, instance) {
      remoteEntry
    };
  }
@@ -101,20 +101,20 @@ index 321c9c3cd55bf9d62a6825c9186267dfe28e5e93..867e7237d5a2ea613130c7e1710cdd99
 +  );
 +}
 +function StylesheetAsset({ href }) {
-+  const [shouldRender, setShouldRender] = React.useState(true);
-+  const linkRef = React.useRef(null);
-+  React.useEffect(() => {
++  const [shouldRender, setShouldRender] = useState(true);
++  const linkRef = useRef(null);
++  useEffect(() => {
 +    setShouldRender(!hasStylesheetLinkInHead(href, linkRef.current));
 +  }, [href]);
 +  if (!shouldRender) {
 +    return null;
 +  }
-+  return /* @__PURE__ */ React.createElement("link", { ref: linkRef, href, rel: "stylesheet", type: "text/css" });
++  return /* @__PURE__ */ React__default.createElement("link", { ref: linkRef, href, rel: "stylesheet", type: "text/css" });
 +}
  function collectSSRAssets(options) {
    const {
      id,
-@@ -254,15 +289,19 @@ function collectSSRAssets(options) {
+@@ -253,15 +288,19 @@ function collectSSRAssets(options) {
    }
    const { module: targetModule, publicPath, remoteEntry } = moduleAndPublicPath;
    if (injectLink) {
@@ -126,7 +126,7 @@ index 321c9c3cd55bf9d62a6825c9186267dfe28e5e93..867e7237d5a2ea613130c7e1710cdd99
 +      }
 +      stylesheetHrefs.add(href);
        links.push(
-         /* @__PURE__ */ React.createElement(
+         /* @__PURE__ */ React__default.createElement(
 -          "link",
 +          StylesheetAsset,
            {

package/template-workspace/patches/@module-federation__dts-plugin@2.7.0.patch

@@ -0,0 +1,37 @@
+diff --git a/dist/DtsWorker-Bt7-_SGH.d.ts b/dist/DtsWorker-Bt7-_SGH.d.ts
+index 3d82f9d..2f82c65 100644
+--- a/dist/DtsWorker-Bt7-_SGH.d.ts
++++ b/dist/DtsWorker-Bt7-_SGH.d.ts
+@@ -1,5 +1,5 @@
+ import { moduleFederationPlugin } from "@module-federation/sdk";
+-import ts from "typescript";
++import ts from "@typescript/typescript6";
+ import { ChildProcess } from "child_process";
+ 
+ //#region \0rolldown/runtime.js
+diff --git a/dist/esm/expose-rpc-CDdqA9PX.mjs b/dist/esm/expose-rpc-CDdqA9PX.mjs
+index 9eae3ff..071b45d 100644
+--- a/dist/esm/expose-rpc-CDdqA9PX.mjs
++++ b/dist/esm/expose-rpc-CDdqA9PX.mjs
+@@ -6,7 +6,7 @@ import { fileURLToPath } from "url";
+ import path, { dirname, extname, isAbsolute, join, normalize, relative, resolve, sep } from "path";
+ import { cp, mkdir, readFile, readdir, rm, stat, writeFile } from "fs/promises";
+ import { utils } from "@module-federation/managers";
+-import typescript from "typescript";
++import typescript from "@typescript/typescript6";
+ import { styleText } from "node:util";
+ import { ENCODE_NAME_PREFIX, MANIFEST_EXT, TEMP_DIR, decodeName, getProcessEnv, inferAutoPublicPath, parseEntry } from "@module-federation/sdk";
+ import { Agent } from "undici";
+diff --git a/dist/expose-rpc-BpRiu3VK.js b/dist/expose-rpc-BpRiu3VK.js
+index 2e81fb9..7688d8b 100644
+--- a/dist/expose-rpc-BpRiu3VK.js
++++ b/dist/expose-rpc-BpRiu3VK.js
+@@ -7,7 +7,7 @@ let path = require("path");
+ path = require_Action.__toESM(path);
+ let fs_promises = require("fs/promises");
+ let _module_federation_managers = require("@module-federation/managers");
+-let typescript = require("typescript");
++let typescript = require("@typescript/typescript6");
+ typescript = require_Action.__toESM(typescript);
+ let node_util = require("node:util");
+ let _module_federation_sdk = require("@module-federation/sdk");

package/template-workspace/patches/{@module-federation__modern-js-v3@2.6.0.patch → @module-federation__modern-js-v3@2.7.0.patch}

@@ -1,8 +1,8 @@
 diff --git a/dist/cjs/cli/configPlugin.js b/dist/cjs/cli/configPlugin.js
-index 0d01ad0..e5485a2 100644
+index 3f1af86..a038365 100644
 --- a/dist/cjs/cli/configPlugin.js
 +++ b/dist/cjs/cli/configPlugin.js
-@@ -212,9 +212,12 @@ var __webpack_exports__ = {};
+@@ -216,9 +216,12 @@ var __webpack_exports__ = {};
          if (!chain.output.get('uniqueName')) chain.output.uniqueName(mfConfig.name);
          const splitChunkConfig = chain.optimization.splitChunks.entries();
          if (!isServer) (0, utils_namespaceObject.autoDeleteSplitChunkCacheGroups)(mfConfig, splitChunkConfig);
@@ -17,40 +17,40 @@ index 0d01ad0..e5485a2 100644
          }
          if ((0, external_utils_js_namespaceObject.isDev)() && 'auto' === chain.output.get('publicPath')) {
              var _modernjsConfig_server;
-diff --git a/dist/esm/cli/configPlugin.mjs b/dist/esm/cli/configPlugin.mjs
-index 3e880c8..93e4290 100644
---- a/dist/esm/cli/configPlugin.mjs
-+++ b/dist/esm/cli/configPlugin.mjs
-@@ -194,9 +194,12 @@ function patchBundlerConfig(options) {
+diff --git a/dist/esm-node/cli/configPlugin.mjs b/dist/esm-node/cli/configPlugin.mjs
+index c238b85..7350973 100644
+--- a/dist/esm-node/cli/configPlugin.mjs
++++ b/dist/esm-node/cli/configPlugin.mjs
+@@ -156,9 +156,12 @@ function patchBundlerConfig(options) {
      if (!chain.output.get('uniqueName')) chain.output.uniqueName(mfConfig.name);
-     var splitChunkConfig = chain.optimization.splitChunks.entries();
+     const splitChunkConfig = chain.optimization.splitChunks.entries();
      if (!isServer) autoDeleteSplitChunkCacheGroups(mfConfig, splitChunkConfig);
--    if (!isServer && enableSSR && splitChunkConfig && (void 0 === splitChunkConfig ? "undefined" : _type_of__(splitChunkConfig)) === 'object' && splitChunkConfig.cacheGroups) {
-+    if (!isServer && enableSSR && splitChunkConfig && (void 0 === splitChunkConfig ? "undefined" : _type_of__(splitChunkConfig)) === 'object' && splitChunkConfig.cacheGroups && void 0 !== splitChunkConfig.chunks && splitChunkConfig.chunks !== 'async') {
-+        var previousChunks = splitChunkConfig.chunks;
+-    if (!isServer && enableSSR && splitChunkConfig && 'object' == typeof splitChunkConfig && splitChunkConfig.cacheGroups) {
++    if (!isServer && enableSSR && splitChunkConfig && 'object' == typeof splitChunkConfig && splitChunkConfig.cacheGroups && splitChunkConfig.chunks !== undefined && splitChunkConfig.chunks !== 'async') {
++        const previousChunks = splitChunkConfig.chunks;
          splitChunkConfig.chunks = 'async';
 -        logger.warn('splitChunks.chunks = async is not allowed with stream SSR mode, it will auto changed to "async"');
 +        if (void 0 !== previousChunks) {
-+            logger.warn("splitChunks.chunks = ".concat(previousChunks, " is not allowed with stream SSR mode, it will auto changed to \"async\""));
++            logger.warn(`splitChunks.chunks = ${previousChunks} is not allowed with stream SSR mode, it will auto changed to "async"`);
 +        }
      }
      if (isDev() && 'auto' === chain.output.get('publicPath')) {
          var _modernjsConfig_server;
-diff --git a/dist/esm-node/cli/configPlugin.mjs b/dist/esm-node/cli/configPlugin.mjs
-index 722f1bb..dcac7ec 100644
---- a/dist/esm-node/cli/configPlugin.mjs
-+++ b/dist/esm-node/cli/configPlugin.mjs
-@@ -165,9 +165,12 @@ function patchBundlerConfig(options) {
+diff --git a/dist/esm/cli/configPlugin.mjs b/dist/esm/cli/configPlugin.mjs
+index c8c2ace..fee11da 100644
+--- a/dist/esm/cli/configPlugin.mjs
++++ b/dist/esm/cli/configPlugin.mjs
+@@ -185,9 +185,12 @@ function patchBundlerConfig(options) {
      if (!chain.output.get('uniqueName')) chain.output.uniqueName(mfConfig.name);
-     const splitChunkConfig = chain.optimization.splitChunks.entries();
+     var splitChunkConfig = chain.optimization.splitChunks.entries();
      if (!isServer) autoDeleteSplitChunkCacheGroups(mfConfig, splitChunkConfig);
--    if (!isServer && enableSSR && splitChunkConfig && 'object' == typeof splitChunkConfig && splitChunkConfig.cacheGroups) {
-+    if (!isServer && enableSSR && splitChunkConfig && 'object' == typeof splitChunkConfig && splitChunkConfig.cacheGroups && splitChunkConfig.chunks !== undefined && splitChunkConfig.chunks !== 'async') {
-+        const previousChunks = splitChunkConfig.chunks;
+-    if (!isServer && enableSSR && splitChunkConfig && (void 0 === splitChunkConfig ? "undefined" : _type_of__(splitChunkConfig)) === 'object' && splitChunkConfig.cacheGroups) {
++    if (!isServer && enableSSR && splitChunkConfig && (void 0 === splitChunkConfig ? "undefined" : _type_of__(splitChunkConfig)) === 'object' && splitChunkConfig.cacheGroups && void 0 !== splitChunkConfig.chunks && splitChunkConfig.chunks !== 'async') {
++        var previousChunks = splitChunkConfig.chunks;
          splitChunkConfig.chunks = 'async';
 -        logger.warn('splitChunks.chunks = async is not allowed with stream SSR mode, it will auto changed to "async"');
 +        if (void 0 !== previousChunks) {
-+            logger.warn(`splitChunks.chunks = ${previousChunks} is not allowed with stream SSR mode, it will auto changed to "async"`);
++            logger.warn("splitChunks.chunks = ".concat(previousChunks, " is not allowed with stream SSR mode, it will auto changed to \"async\""));
 +        }
      }
      if (isDev() && 'auto' === chain.output.get('publicPath')) {

package/template-workspace/patches/@tanstack__router-core@1.171.14.patch

@@ -0,0 +1,123 @@
+diff --git a/dist/cjs/load-matches.cjs b/dist/cjs/load-matches.cjs
+index c09976a..c08e017 100644
+--- a/dist/cjs/load-matches.cjs
++++ b/dist/cjs/load-matches.cjs
+@@ -439,6 +439,7 @@ const loadRouteMatch = async (inner, matchPromises, index) => {
+ 				try {
+ 					await runLoader(inner, matchPromises, matchId, index, route);
+ 					const match = inner.router.getMatch(matchId);
++					if (!match) return;
+ 					match._nonReactive.loaderPromise?.resolve();
+ 					match._nonReactive.loadPromise?.resolve();
+ 					match._nonReactive.loaderPromise = void 0;
+@@ -469,6 +470,7 @@ const loadRouteMatch = async (inner, matchPromises, index) => {
+ 			if (prevMatch.status === "success" && !inner.sync && !prevMatch.preload && shouldReloadInBackground) return prevMatch;
+ 			await prevMatch._nonReactive.loaderPromise;
+ 			const match = inner.router.getMatch(matchId);
++			if (!match) return inner.matches[index];
+ 			const error = match._nonReactive.error || match.error;
+ 			if (error) handleRedirectAndNotFound(inner, match, error);
+ 			if (match.status === "pending") await handleLoader(preload, prevMatch, previousRouteMatchId, match, route);
+@@ -484,6 +486,7 @@ const loadRouteMatch = async (inner, matchPromises, index) => {
+ 		}
+ 	}
+ 	const match = inner.router.getMatch(matchId);
++	if (!match) return inner.matches[index];
+ 	if (!loaderIsRunningAsync) {
+ 		match._nonReactive.loaderPromise?.resolve();
+ 		match._nonReactive.loadPromise?.resolve();
+@@ -500,7 +503,7 @@ const loadRouteMatch = async (inner, matchPromises, index) => {
+ 			isFetching: nextIsFetching,
+ 			invalid: false
+ 		}));
+-		return inner.router.getMatch(matchId);
++		return inner.router.getMatch(matchId) ?? inner.matches[index];
+ 	} else return match;
+ };
+ async function loadMatches(arg) {
+diff --git a/dist/esm/load-matches.js b/dist/esm/load-matches.js
+index bcea2e0..fd9ebbf 100644
+--- a/dist/esm/load-matches.js
++++ b/dist/esm/load-matches.js
+@@ -439,6 +439,7 @@ const loadRouteMatch = async (inner, matchPromises, index) => {
+ 				try {
+ 					await runLoader(inner, matchPromises, matchId, index, route);
+ 					const match = inner.router.getMatch(matchId);
++					if (!match) return;
+ 					match._nonReactive.loaderPromise?.resolve();
+ 					match._nonReactive.loadPromise?.resolve();
+ 					match._nonReactive.loaderPromise = void 0;
+@@ -469,6 +470,7 @@ const loadRouteMatch = async (inner, matchPromises, index) => {
+ 			if (prevMatch.status === "success" && !inner.sync && !prevMatch.preload && shouldReloadInBackground) return prevMatch;
+ 			await prevMatch._nonReactive.loaderPromise;
+ 			const match = inner.router.getMatch(matchId);
++			if (!match) return inner.matches[index];
+ 			const error = match._nonReactive.error || match.error;
+ 			if (error) handleRedirectAndNotFound(inner, match, error);
+ 			if (match.status === "pending") await handleLoader(preload, prevMatch, previousRouteMatchId, match, route);
+@@ -484,6 +486,7 @@ const loadRouteMatch = async (inner, matchPromises, index) => {
+ 		}
+ 	}
+ 	const match = inner.router.getMatch(matchId);
++	if (!match) return inner.matches[index];
+ 	if (!loaderIsRunningAsync) {
+ 		match._nonReactive.loaderPromise?.resolve();
+ 		match._nonReactive.loadPromise?.resolve();
+@@ -500,7 +503,7 @@ const loadRouteMatch = async (inner, matchPromises, index) => {
+ 			isFetching: nextIsFetching,
+ 			invalid: false
+ 		}));
+-		return inner.router.getMatch(matchId);
++		return inner.router.getMatch(matchId) ?? inner.matches[index];
+ 	} else return match;
+ };
+ async function loadMatches(arg) {
+diff --git a/src/load-matches.ts b/src/load-matches.ts
+index f901a0c..76674e0 100644
+--- a/src/load-matches.ts
++++ b/src/load-matches.ts
+@@ -835,7 +835,10 @@ const loadRouteMatch = async (
+       ;(async () => {
+         try {
+           await runLoader(inner, matchPromises, matchId, index, route)
+-          const match = inner.router.getMatch(matchId)!
++          const match = inner.router.getMatch(matchId)
++          if (!match) {
++            return
++          }
+           match._nonReactive.loaderPromise?.resolve()
+           match._nonReactive.loadPromise?.resolve()
+           match._nonReactive.loaderPromise = undefined
+@@ -903,7 +906,10 @@ const loadRouteMatch = async (
+         return prevMatch
+       }
+       await prevMatch._nonReactive.loaderPromise
+-      const match = inner.router.getMatch(matchId)!
++      const match = inner.router.getMatch(matchId)
++      if (!match) {
++        return inner.matches[index]!
++      }
+       const error = match._nonReactive.error || match.error
+       if (error) {
+         handleRedirectAndNotFound(inner, match, error)
+@@ -933,7 +939,10 @@ const loadRouteMatch = async (
+       await handleLoader(preload, prevMatch, previousRouteMatchId, match, route)
+     }
+   }
+-  const match = inner.router.getMatch(matchId)!
++  const match = inner.router.getMatch(matchId)
++  if (!match) {
++    return inner.matches[index]!
++  }
+   if (!loaderIsRunningAsync) {
+     match._nonReactive.loaderPromise?.resolve()
+     match._nonReactive.loadPromise?.resolve()
+@@ -952,7 +961,7 @@ const loadRouteMatch = async (
+       isFetching: nextIsFetching,
+       invalid: false,
+     }))
+-    return inner.router.getMatch(matchId)!
++    return inner.router.getMatch(matchId) ?? inner.matches[index]!
+   } else {
+     return match
+   }

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

@@ -13,8 +13,29 @@ minimumReleaseAgeExclude:
   - '@tanstack/react-router'
   - '@tanstack/router-core'
   - 'typescript'
-  - '@typescript/native-preview'
-  - '@typescript/native-preview-*'
+  - 'typescript@{{typescriptVersion}}'
+  - '@typescript/typescript6@{{typescriptCompilerApiVersion}}'
+  - '@typescript/typescript-aix-ppc64@{{typescriptVersion}}'
+  - '@typescript/typescript-darwin-arm64@{{typescriptVersion}}'
+  - '@typescript/typescript-darwin-x64@{{typescriptVersion}}'
+  - '@typescript/typescript-freebsd-arm64@{{typescriptVersion}}'
+  - '@typescript/typescript-freebsd-x64@{{typescriptVersion}}'
+  - '@typescript/typescript-linux-arm64@{{typescriptVersion}}'
+  - '@typescript/typescript-linux-arm@{{typescriptVersion}}'
+  - '@typescript/typescript-linux-loong64@{{typescriptVersion}}'
+  - '@typescript/typescript-linux-mips64el@{{typescriptVersion}}'
+  - '@typescript/typescript-linux-ppc64@{{typescriptVersion}}'
+  - '@typescript/typescript-linux-riscv64@{{typescriptVersion}}'
+  - '@typescript/typescript-linux-s390x@{{typescriptVersion}}'
+  - '@typescript/typescript-linux-x64@{{typescriptVersion}}'
+  - '@typescript/typescript-netbsd-arm64@{{typescriptVersion}}'
+  - '@typescript/typescript-netbsd-x64@{{typescriptVersion}}'
+  - '@typescript/typescript-openbsd-arm64@{{typescriptVersion}}'
+  - '@typescript/typescript-openbsd-x64@{{typescriptVersion}}'
+  - '@typescript/typescript-sunos-x64@{{typescriptVersion}}'
+  - '@typescript/typescript-win32-arm64@{{typescriptVersion}}'
+  - '@typescript/typescript-win32-x64@{{typescriptVersion}}'
+  - '@rsbuild/plugin-tailwindcss'
   - '@types/react'
   - '@rsbuild/core'
   - '@rsbuild/plugin-react'
@@ -64,6 +85,7 @@ allowBuilds:
   workerd: true
 
 patchedDependencies:
+  '@module-federation/dts-plugin@{{moduleFederationVersion}}': patches/@module-federation__dts-plugin@{{moduleFederationVersion}}.patch
   '@module-federation/modern-js-v3@{{moduleFederationVersion}}': patches/@module-federation__modern-js-v3@{{moduleFederationVersion}}.patch
   '@module-federation/bridge-react@{{moduleFederationVersion}}': patches/@module-federation__bridge-react@{{moduleFederationVersion}}.patch
   '@tanstack/router-core@{{tanstackRouterCoreVersion}}': patches/@tanstack__router-core@{{tanstackRouterCoreVersion}}.patch

package/templates/workspace/apps/modern.config.ts.handlebars

@@ -128,7 +128,7 @@ if (
 export default defineConfig(
   presetUltramodern(
     {
-{{value9}}      ...(cloudflareDeployEnabled
+{{value9}}{{value18}}      ...(cloudflareDeployEnabled
         ? {
             deploy: {
               worker: {

package/templates/workspace-scripts/assert-mf-types.mjs.handlebars

@@ -38,7 +38,7 @@ function readGeneratedContractView() {
                   : [],
                 dts: {
                   compilerInstance:
-                    moduleFederation.dts?.compilerInstance ?? 'tsgo',
+                    moduleFederation.dts?.compilerInstance ?? 'effect-tsgo',
                   tsConfigPath:
                     moduleFederation.dts?.tsConfigPath ??
                     './tsconfig.mf-types.json',
@@ -59,7 +59,7 @@ if (args.includes('--help') || args.includes('-h')) {
   process.stdout.write(`Usage:
   node scripts/assert-mf-types.mts [app-dir...]
 
-Checks that every Module Federation remote with exposed modules emitted a non-empty dist/@mf-types.zip archive and uses the workspace TypeScript compiler.
+Checks that every Module Federation remote with exposed modules emitted a non-empty dist/@mf-types.zip archive and uses the @effect/tsgo compiler.
 `);
   process.exit(0);
 }
@@ -85,10 +85,10 @@ for (const appDir of appDirs) {
   if (
     contractEntry &&
     contractEntry.moduleFederation?.dts?.compilerInstance !==
-      'tsgo'
+      'effect-tsgo'
   ) {
     throw new Error(
-      `Module Federation DTS must use the workspace TypeScript compiler: ${appDir}`,
+      `Module Federation DTS must resolve @effect/tsgo compiler: ${appDir}`,
     );
   }
   if (

package/templates/workspace-scripts/ultramodern-typecheck.mjs

@@ -122,7 +122,7 @@ function resolveTsgoBinary() {
 
   if (result.error) {
     fail(
-      `Unable to run ${cli}. Run pnpm install or set EFFECT_TSGO_BIN to the native-preview tsgo binary.`,
+      `Unable to run ${cli}. Run pnpm install or set EFFECT_TSGO_BIN to a TS-Go binary.`,
     );
   }
   if (result.status !== 0) {

package/templates/workspace-scripts/validate-ultramodern-workspace.mjs.handlebars

@@ -682,7 +682,7 @@ const createAppContract = (app, apps) => ({
       : {}),
     exposes: app.exposes,
     dts: {
-      compilerInstance: 'tsgo',
+      compilerInstance: 'effect-tsgo',
       displayErrorInTerminal: true,
       tsConfigPath: './tsconfig.mf-types.json',
     },
@@ -1761,10 +1761,8 @@ for (const vertical of fullStackVerticals) {
 
 if (tailwindEnabled) {
   requiredPaths.push(
-    'apps/shell-super-app/postcss.config.mjs',
     'apps/shell-super-app/tailwind.config.ts',
     ...fullStackVerticals.flatMap(vertical => [
-      `${vertical.path}/postcss.config.mjs`,
       `${vertical.path}/tailwind.config.ts`,
     ]),
   );
@@ -2158,7 +2156,7 @@ assert(shellContract?.config?.performance?.readinessDiagnostics?.optOut?.env ===
 assert(JSON.stringify(shellContract?.config?.source?.siteUrl?.envFallbackOrder) === JSON.stringify(['MODERN_PUBLIC_SITE_URL', 'ULTRAMODERN_PUBLIC_URL_SHELL_SUPER_APP', 'ULTRAMODERN_CLOUDFLARE_WORKERS_DEV_SUBDOMAIN', 'SHELL_SUPER_APP_PORT']), 'Shell site URL env fallback order is incorrect');
 assert(shellContract?.config?.rspack?.output?.uniqueName === 'shellSuperApp', 'Shell Rspack uniqueName is incorrect');
 assert(shellContract?.config?.rspack?.output?.chunkLoadingGlobal === expectedChunkLoadingGlobal('shellSuperApp'), 'Shell Rspack chunkLoadingGlobal is incorrect');
-assert(shellContract?.moduleFederation?.dts?.compilerInstance === 'tsgo', 'Shell must keep mandatory DTS compiler');
+assert(shellContract?.moduleFederation?.dts?.compilerInstance === 'effect-tsgo', 'Shell must keep mandatory DTS compiler');
 assert(shellContract?.moduleFederation?.dts?.tsConfigPath === './tsconfig.mf-types.json', 'Shell must keep dedicated Module Federation DTS tsconfig');
 assert(shellModuleFederationConfig.includes("tsConfigPath: './tsconfig.mf-types.json'"), 'Shell Module Federation config must use the dedicated DTS tsconfig');
 assert(topology.shell?.cloudflare?.workerName === expectedWorkerName('shell-super-app'), 'Shell topology Cloudflare workerName is incorrect');
@@ -2320,7 +2318,7 @@ for (const vertical of fullStackVerticals) {
   assert(contractEntry?.config?.rspack?.output?.chunkLoadingGlobal === expectedChunkLoadingGlobal(vertical.mfName), `${vertical.id} Rspack chunkLoadingGlobal is incorrect`);
   assert(contractEntry?.moduleFederation?.name === vertical.mfName, `${vertical.id} MF name is incorrect`);
   assert(JSON.stringify(contractEntry?.moduleFederation?.exposes) === JSON.stringify(vertical.exposes), `${vertical.id} MF exposes are incorrect`);
-  assert(contractEntry?.moduleFederation?.dts?.compilerInstance === 'tsgo', `${vertical.id} must keep mandatory DTS compiler`);
+  assert(contractEntry?.moduleFederation?.dts?.compilerInstance === 'effect-tsgo', `${vertical.id} must keep mandatory DTS compiler`);
   assert(contractEntry?.moduleFederation?.dts?.tsConfigPath === './tsconfig.mf-types.json', `${vertical.id} must keep dedicated Module Federation DTS tsconfig`);
   assert(moduleFederationConfig.includes("tsConfigPath: './tsconfig.mf-types.json'"), `${vertical.id} Module Federation config must use the dedicated DTS tsconfig`);
   assert(JSON.stringify(contractEntry?.moduleFederation?.verticalRefs ?? []) === JSON.stringify(vertical.verticalRefs), `${vertical.id} MF verticalRefs are incorrect`);