@bleedingdev/modern-js-runtime 3.2.0-ultramodern.12 → 3.2.0-ultramodern.121

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.2.0-ultramodern.12",
+  "version": "3.2.0-ultramodern.121",
   "engines": {
     "node": ">=20"
   },
@@ -63,6 +63,14 @@
       "types": "./dist/types/exports/head.d.ts",
       "default": "./dist/esm/exports/head.mjs"
     },
+    "./boundary-debugger": {
+      "types": "./dist/types/boundary-debugger/index.d.ts",
+      "default": "./dist/esm/boundary-debugger/index.mjs"
+    },
+    "./module-federation": {
+      "types": "./dist/types/module-federation/index.d.ts",
+      "default": "./dist/esm/module-federation/index.mjs"
+    },
     "./ssr": {
       "types": "./dist/types/core/server/index.d.ts",
       "default": "./dist/esm/core/server/index.mjs"
@@ -168,6 +176,12 @@
       "head": [
         "./dist/types/exports/head.d.ts"
       ],
+      "boundary-debugger": [
+        "./dist/types/boundary-debugger/index.d.ts"
+      ],
+      "module-federation": [
+        "./dist/types/module-federation/index.d.ts"
+      ],
       "document": [
         "./dist/types/document/index.d.ts"
       ],
@@ -212,46 +226,42 @@
   "dependencies": {
     "@loadable/component": "5.16.7",
     "@loadable/server": "5.16.7",
-    "@swc/core": "1.15.33",
-    "@swc/helpers": "^0.5.21",
-    "@swc/plugin-loadable-components": "^11.9.0",
-    "@tanstack/react-router": "1.170.1",
-    "@tanstack/router-core": "1.170.1",
+    "@swc/core": "1.15.41",
+    "@swc/helpers": "^0.5.23",
+    "@swc/plugin-loadable-components": "^11.12.0",
     "@types/loadable__component": "^5.13.10",
-    "@types/react-helmet": "^6.1.11",
     "cookie": "1.1.1",
     "entities": "^8.0.0",
     "es-module-lexer": "^2.1.0",
     "esbuild": "^0.28.0",
     "invariant": "^2.2.4",
-    "isbot": "5.1.40",
-    "react-helmet": "^6.1.0",
-    "react-is": "^19.2.6",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.12",
-    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.2.0-ultramodern.12",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.2.0-ultramodern.12",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.12",
-    "@modern-js/render": "npm:@bleedingdev/modern-js-render@3.2.0-ultramodern.12",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.12"
+    "isbot": "5.1.42",
+    "react-helmet-async": "3.0.0",
+    "react-is": "^19.2.7",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.121",
+    "@modern-js/render": "npm:@bleedingdev/modern-js-render@3.2.0-ultramodern.121",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.121",
+    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.2.0-ultramodern.121",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.2.0-ultramodern.121",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.121"
   },
   "peerDependencies": {
-    "react": "^19.2.6",
-    "react-dom": "^19.2.6"
+    "react": "^19.2.7",
+    "react-dom": "^19.2.7"
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.4.2",
-    "@rsbuild/core": "2.0.6",
-    "@rslib/core": "0.21.5",
-    "@tanstack/history": "1.162.0",
+    "@rsbuild/core": "2.0.11",
+    "@rslib/core": "0.22.0",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/invariant": "^2.2.37",
     "@types/loadable__server": "5.12.11",
-    "@types/node": "^25.8.0",
-    "@typescript/native-preview": "7.0.0-dev.20260516.1",
-    "react": "^19.2.6",
-    "react-dom": "^19.2.6",
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.2.0-ultramodern.12",
+    "@types/node": "^25.9.3",
+    "@typescript/native-preview": "7.0.0-dev.20260610.1",
+    "react": "^19.2.7",
+    "react-dom": "^19.2.7",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.2.0-ultramodern.121",
     "@scripts/rstest-config": "2.66.0"
   },
   "sideEffects": false,
@@ -261,7 +271,7 @@
   },
   "scripts": {
     "dev": "rslib build --watch",
-    "build": "rslib build && pnpm run gen-static",
+    "build": "rslib build && pnpm run gen-static && pnpm -w tsgo:dts \"$PWD\"",
     "gen-static": "node --disable-warning=ExperimentalWarning --experimental-strip-types ./scripts/gen-static.mts",
     "test": "rstest"
   }

package/rstest.config.mts

@@ -23,9 +23,8 @@ export default {
       name: 'plugin-runtime-node',
       testEnvironment: 'node',
       exclude: [
+        'tests/boundary-debugger/client.test.tsx',
         'tests/router/prefetch.test.tsx',
-        'tests/router/tanstackPrefetchLink.test.tsx',
-        'tests/router/dataMutation.test.tsx',
       ],
       extends: commonConfig,
       plugins: [
@@ -51,9 +50,8 @@ export default {
       name: 'plugin-runtime-client',
       testEnvironment: 'happy-dom',
       include: [
+        'tests/boundary-debugger/client.test.tsx',
         'tests/router/prefetch.test.tsx',
-        'tests/router/tanstackPrefetchLink.test.tsx',
-        'tests/router/dataMutation.test.tsx',
       ],
       extends: commonConfig,
       plugins: [

package/dist/cjs/router/cli/code/tanstackTypes.js

@@ -1,378 +0,0 @@
-"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, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
-    };
-})();
-(()=>{
-    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
-})();
-(()=>{
-    __webpack_require__.r = (exports1)=>{
-        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
-            value: 'Module'
-        });
-        Object.defineProperty(exports1, '__esModule', {
-            value: true
-        });
-    };
-})();
-var __webpack_exports__ = {};
-__webpack_require__.r(__webpack_exports__);
-__webpack_require__.d(__webpack_exports__, {
-    generateTanstackRouterTypesSourceForEntry: ()=>generateTanstackRouterTypesSourceForEntry,
-    isTanstackRouterFrameworkEnabled: ()=>isTanstackRouterFrameworkEnabled
-});
-const utils_namespaceObject = require("@modern-js/utils");
-const external_path_namespaceObject = require("path");
-var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
-const external_makeLegalIdentifier_js_namespaceObject = require("./makeLegalIdentifier.js");
-const external_utils_js_namespaceObject = require("./utils.js");
-const JS_OR_TS_EXTS = [
-    '.js',
-    '.jsx',
-    '.ts',
-    '.tsx',
-    '.mjs',
-    '.mts',
-    '.cjs',
-    '.cts'
-];
-function toTanstackPath(pathname) {
-    return pathname.split('/').map((segment)=>{
-        if (!segment) return segment;
-        if ('*' === segment) return '$';
-        if (segment.startsWith(':')) {
-            const name = segment.slice(1);
-            if (name.endsWith('?')) return `{-$${name.slice(0, -1)}}`;
-            return `$${name}`;
-        }
-        return segment;
-    }).join('/');
-}
-async function resolveFileNoExt(inputNoExtPath) {
-    const file = (0, utils_namespaceObject.findExists)(JS_OR_TS_EXTS.map((ext)=>`${inputNoExtPath}${ext}`));
-    return file ? (0, external_utils_js_namespaceObject.getPathWithoutExt)(file) : null;
-}
-function quote(str) {
-    return JSON.stringify(str);
-}
-function normalizeRelativeImport(p) {
-    const normalized = (0, utils_namespaceObject.formatImportPath)((0, utils_namespaceObject.slash)(p));
-    if (normalized.startsWith('.')) return normalized;
-    return `./${normalized}`;
-}
-function pickModernLoaderModule(route) {
-    const loaderPath = route.data || route.loader;
-    if (!loaderPath || 'string' != typeof loaderPath) return null;
-    const inline = Boolean(route.data);
-    return {
-        loaderPath,
-        inline
-    };
-}
-function isPathlessLayout(route) {
-    return 'nested' === route.type && 'boolean' != typeof route.index && void 0 === route.path;
-}
-function isIndexRoute(route) {
-    return 'nested' === route.type && Boolean(route.index);
-}
-function createRouteStaticDataSnippet(opts) {
-    const staticDataLines = [];
-    if (opts.modernRouteId) staticDataLines.push(`modernRouteId: ${quote(opts.modernRouteId)},`);
-    if (opts.loaderName) staticDataLines.push(`modernRouteLoader: ${opts.loaderName},`);
-    if (opts.actionName) staticDataLines.push(`modernRouteAction: ${opts.actionName},`);
-    if (!staticDataLines.length) return null;
-    return `staticData: createRouteStaticData({\n    ${staticDataLines.join('\n    ')}\n  }),`;
-}
-async function isTanstackRouterFrameworkEnabled(appContext) {
-    const runtimeConfigBase = external_path_default().join(appContext.srcDirectory, appContext.runtimeConfigFile);
-    const runtimeConfigFile = (0, utils_namespaceObject.findExists)(JS_OR_TS_EXTS.map((ext)=>`${runtimeConfigBase}${ext}`));
-    if (!runtimeConfigFile) return false;
-    try {
-        const content = await utils_namespaceObject.fs.readFile(runtimeConfigFile, 'utf-8');
-        return /framework\s*:\s*['"]tanstack['"]/.test(content);
-    } catch  {
-        return false;
-    }
-}
-async function generateTanstackRouterTypesSourceForEntry(opts) {
-    const { appContext, entryName, routes } = opts;
-    const outDir = external_path_default().join(appContext.srcDirectory, 'modern-tanstack', entryName);
-    const rootModern = routes.find((r)=>r && 'nested' === r.type && r.isRoot);
-    const topLevel = rootModern ? rootModern.children || [] : routes;
-    const imports = [];
-    const statements = [];
-    const loaderImportMap = new Map();
-    let loaderIndex = 0;
-    let routeIndex = 0;
-    const getImportNamesForLoader = async (aliasedNoExtPath, inline, hasAction)=>{
-        const key = `${inline ? 'inline' : 'default'}:${hasAction ? 'action' : 'loader'}:${aliasedNoExtPath}`;
-        const existing = loaderImportMap.get(key);
-        if (existing) return {
-            loaderName: existing,
-            actionName: hasAction ? existing.replace(/^loader_/, 'action_') : null
-        };
-        const prefix = `${appContext.internalSrcAlias}/`;
-        let absNoExt = null;
-        if (aliasedNoExtPath.startsWith(prefix)) {
-            const rel = aliasedNoExtPath.slice(prefix.length);
-            absNoExt = external_path_default().join(appContext.srcDirectory, rel);
-        } else absNoExt = external_path_default().isAbsolute(aliasedNoExtPath) ? aliasedNoExtPath : external_path_default().join(appContext.srcDirectory, aliasedNoExtPath);
-        const resolvedNoExt = await resolveFileNoExt(absNoExt);
-        if (!resolvedNoExt) return null;
-        const relImport = normalizeRelativeImport(external_path_default().relative(outDir, resolvedNoExt));
-        const importName = `loader_${loaderIndex++}`;
-        const actionName = hasAction ? importName.replace(/^loader_/, 'action_') : null;
-        if (inline) {
-            const specifiers = [
-                `loader as ${importName}`
-            ];
-            if (actionName) specifiers.push(`action as ${actionName}`);
-            imports.push(`import { ${specifiers.join(', ')} } from ${quote(relImport)};`);
-        } else imports.push(`import ${importName} from ${quote(relImport)};`);
-        loaderImportMap.set(key, importName);
-        return {
-            loaderName: importName,
-            actionName
-        };
-    };
-    const createRouteVarName = (route)=>{
-        const id = route.id;
-        const base = id ? (0, external_makeLegalIdentifier_js_namespaceObject.makeLegalIdentifier)(id) : `r_${routeIndex++}`;
-        return `route_${base}`;
-    };
-    const buildRoute = async (opts)=>{
-        const { parentVar, route } = opts;
-        const varName = createRouteVarName(route);
-        const loaderInfo = pickModernLoaderModule(route);
-        const routeAction = route.action;
-        const loaderImports = loaderInfo ? await getImportNamesForLoader(loaderInfo.loaderPath, loaderInfo.inline, Boolean(loaderInfo.inline && routeAction === loaderInfo.loaderPath)) : null;
-        const loaderName = loaderImports?.loaderName || null;
-        const actionName = loaderImports?.actionName || null;
-        const rawPath = route.path;
-        const hasSplat = 'string' == typeof rawPath && rawPath.includes('*');
-        const routeOpts = [
-            `getParentRoute: () => ${parentVar},`
-        ];
-        if (isPathlessLayout(route)) {
-            const id = route.id;
-            routeOpts.push(`id: ${quote(id || 'pathless')},`);
-        } else {
-            const p = isIndexRoute(route) ? '/' : toTanstackPath(rawPath || '');
-            routeOpts.push(`path: ${quote(p)},`);
-        }
-        if (loaderName) routeOpts.push(`loader: modernLoaderToTanstack({ hasSplat: ${hasSplat} }, ${loaderName}),`);
-        const staticDataSnippet = createRouteStaticDataSnippet({
-            modernRouteId: route.id,
-            loaderName,
-            actionName
-        });
-        if (staticDataSnippet) routeOpts.push(staticDataSnippet);
-        statements.push(`const ${varName} = createRoute({\n  ${routeOpts.join('\n  ')}\n});`);
-        const children = route.children;
-        if (children && children.length > 0) {
-            const childVars = await Promise.all(children.map((child)=>buildRoute({
-                    parentVar: varName,
-                    route: child
-                })));
-            statements.push(`${varName}.addChildren([${childVars.join(', ')}]);`);
-        }
-        return varName;
-    };
-    const rootLoaderInfo = rootModern ? pickModernLoaderModule(rootModern) : null;
-    const rootAction = rootModern?.action;
-    const rootLoaderImports = rootLoaderInfo?.loaderPath ? await getImportNamesForLoader(rootLoaderInfo.loaderPath, rootLoaderInfo.inline, Boolean(rootLoaderInfo.inline && rootAction === rootLoaderInfo.loaderPath)) : null;
-    const rootLoaderName = rootLoaderImports?.loaderName || null;
-    const rootActionName = rootLoaderImports?.actionName || null;
-    const topLevelVars = await Promise.all(topLevel.map((route)=>buildRoute({
-            parentVar: 'rootRoute',
-            route
-        })));
-    const rootOpts = [];
-    if (rootLoaderName) rootOpts.push(`loader: modernLoaderToTanstack({ hasSplat: false }, ${rootLoaderName}),`);
-    const routerGenTs = `/* eslint-disable */
-// This file is auto-generated by Modern.js. Do not edit manually.
-
-import {
-  createMemoryHistory,
-  createRootRouteWithContext,
-  createRoute,
-  createRouter,
-  notFound,
-  redirect,
-} from '@modern-js/runtime/tanstack-router';
-
-type ModernRouterContext = {
-  request?: Request;
-  requestContext?: unknown;
-};
-
-function isResponse(value: unknown): value is Response {
-  return (
-    value != null &&
-    typeof value === 'object' &&
-    typeof (value as any).status === 'number' &&
-    typeof (value as any).headers === 'object'
-  );
-}
-
-const redirectStatusCodes = new Set([301, 302, 303, 307, 308]);
-function isRedirectResponse(res: Response) {
-  return redirectStatusCodes.has(res.status);
-}
-
-function throwTanstackRedirect(location: string) {
-  const target = location || '/';
-  try {
-    void new URL(target);
-    throw redirect({ href: target });
-  } catch {
-    throw redirect({ to: target });
-  }
-}
-
-function mapParamsForModernLoader(params: Record<string, string>, hasSplat: boolean) {
-  if (!hasSplat) {
-    return params;
-  }
-
-  const { _splat, ...rest } = params as any;
-  if (typeof _splat !== 'undefined') {
-    return { ...rest, '*': _splat };
-  }
-  return rest;
-}
-
-function createRouteStaticData(opts: {
-  modernRouteId?: string;
-  modernRouteAction?: unknown;
-  modernRouteLoader?: unknown;
-}) {
-  const staticData: Record<string, unknown> = {};
-
-  if (opts.modernRouteId) {
-    staticData.modernRouteId = opts.modernRouteId;
-  }
-
-  if (opts.modernRouteLoader) {
-    staticData.modernRouteLoader = opts.modernRouteLoader;
-  }
-
-  if (opts.modernRouteAction) {
-    staticData.modernRouteAction = opts.modernRouteAction;
-  }
-
-  return Object.keys(staticData).length > 0 ? staticData : undefined;
-}
-
-function modernLoaderToTanstack<TLoader extends (args: any) => any>(
-  opts: { hasSplat: boolean },
-  modernLoader: TLoader,
-) {
-  type LoaderResult = Awaited<ReturnType<TLoader>>;
-
-  return async (ctx: any): Promise<LoaderResult> => {
-    try {
-      const signal: AbortSignal =
-        ctx?.abortController?.signal ||
-        ctx?.signal ||
-        new AbortController().signal;
-      const baseRequest: Request | undefined =
-        ctx?.context?.request instanceof Request ? ctx.context.request : undefined;
-
-      const href =
-        typeof ctx?.location === 'string'
-          ? ctx.location
-          : ctx?.location?.publicHref ||
-            ctx?.location?.href ||
-            ctx?.location?.url?.href ||
-            '';
-
-      const request = baseRequest
-        ? new Request(baseRequest, { signal })
-        : new Request(href, { signal });
-
-      const params = mapParamsForModernLoader(ctx?.params || {}, opts.hasSplat);
-
-      const result = await (modernLoader as any)({
-        request,
-        params,
-        context: ctx?.context?.requestContext,
-      });
-
-      if (isResponse(result)) {
-        if (isRedirectResponse(result)) {
-          const location = result.headers.get('Location') || '/';
-          throwTanstackRedirect(location);
-        }
-        if (result.status === 404) {
-          throw notFound();
-        }
-      }
-
-      return result as LoaderResult;
-    } catch (err) {
-      if (isResponse(err)) {
-        if (isRedirectResponse(err)) {
-          const location = err.headers.get('Location') || '/';
-          throwTanstackRedirect(location);
-        }
-        if (err.status === 404) {
-          throw notFound();
-        }
-      }
-      throw err;
-    }
-  };
-}
-
-${imports.join('\n')}
-
-export const rootRoute = createRootRouteWithContext<ModernRouterContext>()({
-  ${rootOpts.join('\n  ')}
-  ${createRouteStaticDataSnippet({
-        modernRouteId: rootModern?.id,
-        loaderName: rootLoaderName,
-        actionName: rootActionName
-    }) || ''}
-});
-
-${statements.join('\n\n')}
-
-export const routeTree = rootRoute.addChildren([${topLevelVars.join(', ')}]);
-
-export const router = createRouter({
-  routeTree,
-  history: createMemoryHistory({
-    initialEntries: ['/'],
-  }),
-  context: {} as ModernRouterContext,
-});
-`;
-    return {
-        routerGenTs
-    };
-}
-exports.generateTanstackRouterTypesSourceForEntry = __webpack_exports__.generateTanstackRouterTypesSourceForEntry;
-exports.isTanstackRouterFrameworkEnabled = __webpack_exports__.isTanstackRouterFrameworkEnabled;
-for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "generateTanstackRouterTypesSourceForEntry",
-    "isTanstackRouterFrameworkEnabled"
-].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
-Object.defineProperty(exports, '__esModule', {
-    value: true
-});

package/dist/cjs/router/runtime/tanstack/basepathRewrite.js

@@ -1,62 +0,0 @@
-"use strict";
-var __webpack_require__ = {};
-(()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
-    };
-})();
-(()=>{
-    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
-})();
-(()=>{
-    __webpack_require__.r = (exports1)=>{
-        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
-            value: 'Module'
-        });
-        Object.defineProperty(exports1, '__esModule', {
-            value: true
-        });
-    };
-})();
-var __webpack_exports__ = {};
-__webpack_require__.r(__webpack_exports__);
-__webpack_require__.d(__webpack_exports__, {
-    createModernBasepathRewrite: ()=>createModernBasepathRewrite
-});
-function normalizeBasepath(basepath) {
-    if (!basepath) return '/';
-    let normalized = basepath.startsWith('/') ? basepath : `/${basepath}`;
-    if (normalized.length > 1 && normalized.endsWith('/')) normalized = normalized.slice(0, -1);
-    return normalized || '/';
-}
-function createModernBasepathRewrite(basepath, caseSensitive = false) {
-    const normalizedBasepath = normalizeBasepath(basepath);
-    if ('/' === normalizedBasepath) return;
-    const normalizedBasepathWithSlash = `${normalizedBasepath}/`;
-    const checkBasepath = caseSensitive ? normalizedBasepath : normalizedBasepath.toLowerCase();
-    const checkBasepathWithSlash = caseSensitive ? normalizedBasepathWithSlash : normalizedBasepathWithSlash.toLowerCase();
-    return {
-        input: ({ url })=>{
-            const pathname = caseSensitive ? url.pathname : url.pathname.toLowerCase();
-            if (pathname === checkBasepath) url.pathname = '/';
-            else if (pathname.startsWith(checkBasepathWithSlash)) url.pathname = url.pathname.slice(normalizedBasepath.length) || '/';
-            return url;
-        },
-        output: ({ url })=>{
-            const pathname = url.pathname || '/';
-            if ('/' === pathname) url.pathname = normalizedBasepath;
-            else url.pathname = `${normalizedBasepath}${pathname.startsWith('/') ? '' : '/'}${pathname}`;
-            return url;
-        }
-    };
-}
-exports.createModernBasepathRewrite = __webpack_exports__.createModernBasepathRewrite;
-for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "createModernBasepathRewrite"
-].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
-Object.defineProperty(exports, '__esModule', {
-    value: true
-});