@bleedingdev/modern-js-runtime 3.2.0-ultramodern.99 → 3.4.0-ultramodern.1

package/dist/cjs/module-federation/index.js

@@ -0,0 +1,178 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
+    };
+})();
+(()=>{
+    __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__);
+const MODULE_FEDERATION_FALLBACK_SIGNAL_EVENT = 'modernjs:mf-runtime-fallback';
+const MODULE_FEDERATION_RECOVERY_SIGNAL_EVENT = 'modernjs:mf-runtime-recovery';
+const DEFAULT_RUNTIME_FALLBACK_SIGNAL_ENDPOINT = '/_modern/contract-gates/runtime-fallback';
+const DEFAULT_RUNTIME_FALLBACK_SIGNAL_AUTH_HEADER = 'x-modernjs-runtime-signal-token';
+class ModuleFederationRemoteLoadTimeoutError extends Error {
+    constructor(remote, timeoutMs){
+        super(`Loading remote "${remote}" timed out after ${timeoutMs}ms`);
+        this.name = 'ModuleFederationRemoteLoadTimeoutError';
+    }
+}
+class ModuleFederationRemoteLoadError extends Error {
+    constructor(remote, attempts, causeError){
+        super(`Unable to load remote "${remote}" after ${attempts} attempt${attempts > 1 ? 's' : ''}: ${causeError.message}`);
+        this.name = 'ModuleFederationRemoteLoadError';
+        this.remote = remote;
+        this.attempts = attempts;
+        this.causeError = causeError;
+    }
+}
+class ModuleFederationRemoteComponentContractError extends Error {
+    constructor(remote, exportName){
+        super(`Remote "${remote}" export "${exportName}" is not a valid React component`);
+        this.name = 'ModuleFederationRemoteComponentContractError';
+    }
+}
+function toError(error) {
+    if (error instanceof Error) return error;
+    return new Error('string' == typeof error ? error : 'Unknown remote load error');
+}
+function classifyModuleFederationFallback(error) {
+    const normalizedError = toError(error);
+    if (normalizedError instanceof ModuleFederationRemoteLoadError) return classifyModuleFederationFallback(normalizedError.causeError);
+    if (normalizedError instanceof ModuleFederationRemoteLoadTimeoutError) return 'timeout';
+    if (normalizedError instanceof ModuleFederationRemoteComponentContractError) return 'contract';
+    const message = normalizedError.message;
+    if (/version|requiredVersion|singleton|share scope|shared module/i.test(message)) return 'version-skew';
+    if (/network|fetch|script|timeout|chunk|loading/i.test(message)) return 'network';
+    return 'remote-unavailable';
+}
+function createModuleFederationFallbackTelemetry(input) {
+    const error = void 0 !== input.error ? toError(input.error) : void 0;
+    const status = input.status ?? 'degraded';
+    const eventName = input.eventName ?? ('recovered' === status ? MODULE_FEDERATION_RECOVERY_SIGNAL_EVENT : MODULE_FEDERATION_FALLBACK_SIGNAL_EVENT);
+    const metadata = {
+        ...input.metadata ?? {},
+        classification: input.classification,
+        remote: input.remote,
+        status
+    };
+    if (void 0 !== input.exportName) metadata.exportName = input.exportName;
+    if (void 0 !== input.runtimeDigest) metadata.runtimeDigest = input.runtimeDigest;
+    if (void 0 !== error) {
+        metadata.errorName = error.name;
+        metadata.errorMessage = error.message;
+    }
+    const payload = {
+        appName: input.appName,
+        eventName,
+        metadata,
+        phase: input.phase,
+        reason: input.classification,
+        schemaVersion: 1
+    };
+    if (void 0 !== input.entry) payload.entry = input.entry;
+    if (void 0 !== input.runtimeDigest) payload.runtimeDigest = input.runtimeDigest;
+    return payload;
+}
+function toModuleFederationFallbackAttributes(payload) {
+    return {
+        'data-mf-fallback-app': payload.appName,
+        'data-mf-fallback-classification': payload.reason,
+        'data-mf-fallback-phase': payload.phase,
+        'data-mf-fallback-remote': String(payload.metadata.remote),
+        'data-mf-fallback-status': String(payload.metadata.status),
+        'data-mf-telemetry-event': payload.eventName
+    };
+}
+async function emitModuleFederationFallbackTelemetry(input, options = {}) {
+    const payload = createModuleFederationFallbackTelemetry(input);
+    if ("u" > typeof window && 'function' == typeof window.dispatchEvent && "u" > typeof CustomEvent) window.dispatchEvent(new CustomEvent(payload.eventName, {
+        detail: payload
+    }));
+    const shouldPost = true === options.postSignal || Boolean(options.endpoint);
+    if (!shouldPost) return {
+        dispatched: true,
+        posted: false
+    };
+    const fetchImpl = options.fetchImpl ?? globalThis.fetch;
+    if ('function' != typeof fetchImpl) return {
+        dispatched: true,
+        posted: false
+    };
+    const headers = new Headers({
+        'content-type': 'application/json'
+    });
+    if (void 0 !== options.authToken && options.authToken.length > 0) headers.set(options.authHeaderName ?? DEFAULT_RUNTIME_FALLBACK_SIGNAL_AUTH_HEADER, options.authToken);
+    const response = await fetchImpl(options.endpoint ?? DEFAULT_RUNTIME_FALLBACK_SIGNAL_ENDPOINT, {
+        body: JSON.stringify(payload),
+        headers,
+        method: 'POST',
+        keepalive: true
+    });
+    return {
+        dispatched: true,
+        posted: true,
+        postStatus: response.status
+    };
+}
+__webpack_require__.d(__webpack_exports__, {
+    ModuleFederationRemoteComponentContractError: ()=>ModuleFederationRemoteComponentContractError,
+    ModuleFederationRemoteLoadError: ()=>ModuleFederationRemoteLoadError,
+    ModuleFederationRemoteLoadTimeoutError: ()=>ModuleFederationRemoteLoadTimeoutError,
+    classifyModuleFederationFallback: ()=>classifyModuleFederationFallback,
+    createModuleFederationFallbackTelemetry: ()=>createModuleFederationFallbackTelemetry,
+    emitModuleFederationFallbackTelemetry: ()=>emitModuleFederationFallbackTelemetry,
+    toModuleFederationFallbackAttributes: ()=>toModuleFederationFallbackAttributes
+}, {
+    DEFAULT_RUNTIME_FALLBACK_SIGNAL_AUTH_HEADER: DEFAULT_RUNTIME_FALLBACK_SIGNAL_AUTH_HEADER,
+    DEFAULT_RUNTIME_FALLBACK_SIGNAL_ENDPOINT: DEFAULT_RUNTIME_FALLBACK_SIGNAL_ENDPOINT,
+    MODULE_FEDERATION_FALLBACK_SIGNAL_EVENT: MODULE_FEDERATION_FALLBACK_SIGNAL_EVENT,
+    MODULE_FEDERATION_RECOVERY_SIGNAL_EVENT: MODULE_FEDERATION_RECOVERY_SIGNAL_EVENT
+});
+exports.DEFAULT_RUNTIME_FALLBACK_SIGNAL_AUTH_HEADER = __webpack_exports__.DEFAULT_RUNTIME_FALLBACK_SIGNAL_AUTH_HEADER;
+exports.DEFAULT_RUNTIME_FALLBACK_SIGNAL_ENDPOINT = __webpack_exports__.DEFAULT_RUNTIME_FALLBACK_SIGNAL_ENDPOINT;
+exports.MODULE_FEDERATION_FALLBACK_SIGNAL_EVENT = __webpack_exports__.MODULE_FEDERATION_FALLBACK_SIGNAL_EVENT;
+exports.MODULE_FEDERATION_RECOVERY_SIGNAL_EVENT = __webpack_exports__.MODULE_FEDERATION_RECOVERY_SIGNAL_EVENT;
+exports.ModuleFederationRemoteComponentContractError = __webpack_exports__.ModuleFederationRemoteComponentContractError;
+exports.ModuleFederationRemoteLoadError = __webpack_exports__.ModuleFederationRemoteLoadError;
+exports.ModuleFederationRemoteLoadTimeoutError = __webpack_exports__.ModuleFederationRemoteLoadTimeoutError;
+exports.classifyModuleFederationFallback = __webpack_exports__.classifyModuleFederationFallback;
+exports.createModuleFederationFallbackTelemetry = __webpack_exports__.createModuleFederationFallbackTelemetry;
+exports.emitModuleFederationFallbackTelemetry = __webpack_exports__.emitModuleFederationFallbackTelemetry;
+exports.toModuleFederationFallbackAttributes = __webpack_exports__.toModuleFederationFallbackAttributes;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "DEFAULT_RUNTIME_FALLBACK_SIGNAL_AUTH_HEADER",
+    "DEFAULT_RUNTIME_FALLBACK_SIGNAL_ENDPOINT",
+    "MODULE_FEDERATION_FALLBACK_SIGNAL_EVENT",
+    "MODULE_FEDERATION_RECOVERY_SIGNAL_EVENT",
+    "ModuleFederationRemoteComponentContractError",
+    "ModuleFederationRemoteLoadError",
+    "ModuleFederationRemoteLoadTimeoutError",
+    "classifyModuleFederationFallback",
+    "createModuleFederationFallbackTelemetry",
+    "emitModuleFederationFallbackTelemetry",
+    "toModuleFederationFallbackAttributes"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/react-server.js

@@ -1,11 +1,15 @@
 "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__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{

package/dist/cjs/router/cli/code/getClientRoutes/getRoutes.js

@@ -10,11 +10,15 @@ 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__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{

package/dist/cjs/router/cli/code/getClientRoutes/index.js

@@ -1,11 +1,15 @@
 "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__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{

package/dist/cjs/router/cli/code/getClientRoutes/utils.js

@@ -10,11 +10,15 @@ 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__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{

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

@@ -10,11 +10,15 @@ 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__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{
@@ -46,7 +50,6 @@ const constants_js_namespaceObject = require("../../../cli/constants.js");
 const mode_js_namespaceObject = require("../../../cli/ssr/mode.js");
 const external_constants_js_namespaceObject = require("../constants.js");
 const external_nestedRoutes_js_namespaceObject = require("./nestedRoutes.js");
-const external_tanstackTypes_js_namespaceObject = require("./tanstackTypes.js");
 const external_templates_js_namespaceObject = require("./templates.js");
 const external_utils_js_namespaceObject = require("./utils.js");
 async function generateRoutesForEntry(entrypoint, appContext) {
@@ -81,42 +84,15 @@ async function generateRoutesForEntry(entrypoint, appContext) {
     }
     return routes;
 }
-const generateCode = async (appContext, config, entrypoints, api, options)=>{
+const generateCode = async (appContext, config, entrypoints, api)=>{
     const { internalDirectory, srcDirectory, internalSrcAlias, packageName } = appContext;
     const hooks = api.getHooks();
-    const enableTanstackTypes = options?.enableTanstackTypes ?? await (0, external_tanstackTypes_js_namespaceObject.isTanstackRouterFrameworkEnabled)(appContext);
     const generatedRoutesByEntry = {};
+    const eagerRouteComponentFilesByEntry = new Map();
     await Promise.all(entrypoints.map(generateEntryCode));
-    if (enableTanstackTypes) {
-        const allEntries = Array.from(new Set(entrypoints.map((e)=>e.entryName).filter(Boolean)));
-        const mainEntry = entrypoints.find((e)=>e.isMainEntry)?.entryName;
-        const registerEntries = allEntries.sort((a, b)=>{
-            if (mainEntry && a === mainEntry) return -1;
-            if (mainEntry && b === mainEntry) return 1;
-            return a.localeCompare(b);
-        });
-        if (registerEntries.length > 0) {
-            const registerDtsPath = external_path_default().join(srcDirectory, 'modern-tanstack', 'register.gen.d.ts');
-            const importStatements = registerEntries.map((entryName, index)=>`import type { router as router${index} } from './${entryName}/router.gen';`).join('\n');
-            const routerUnionType = registerEntries.map((_, index)=>`typeof router${index}`).join(' | ');
-            const registerContent = `// This file is auto-generated by Modern.js. Do not edit manually.
-
-${importStatements}
-
-declare module '@modern-js/runtime/tanstack-router' {
-  interface Register {
-    router: ${routerUnionType};
-  }
-}
-`;
-            try {
-                const prev = await utils_namespaceObject.fs.pathExists(registerDtsPath) ? await utils_namespaceObject.fs.readFile(registerDtsPath, 'utf-8') : null;
-                if (prev !== registerContent) await utils_namespaceObject.fs.outputFile(registerDtsPath, registerContent, 'utf-8');
-            } catch  {
-                await utils_namespaceObject.fs.outputFile(registerDtsPath, registerContent, 'utf-8');
-            }
-        }
-    }
+    api.updateAppContext({
+        eagerRouteComponentFilesByEntry
+    });
     async function generateEntryCode(entrypoint) {
         const { entryName, isMainEntry, isAutoMount, pageRoutesEntry, nestedRoutesEntry } = entrypoint;
         const { metaName } = api.getAppContext();
@@ -147,6 +123,8 @@ declare module '@modern-js/runtime/tanstack-router' {
                     routes: markedRoutes
                 });
                 generatedRoutesByEntry[entryName] = routes;
+                const routeEagerFilesForEntry = (0, utils_namespaceObject.collectRouteComponentFiles)(routes, srcDirectory, internalSrcAlias);
+                eagerRouteComponentFilesByEntry.set(entryName, routeEagerFilesForEntry);
                 if ('stream' === ssrMode) {
                     const hasPageRoute = routes.some((route)=>'type' in route && 'page' === route.type);
                     if (hasPageRoute) {
@@ -198,20 +176,6 @@ declare module '@modern-js/runtime/tanstack-router' {
                     await utils_namespaceObject.fs.outputFile(serverLoaderFile, serverLoaderCombined);
                 }
                 await utils_namespaceObject.fs.outputFile(external_path_default().resolve(internalDirectory, `./${entryName}/${external_constants_js_namespaceObject.FILE_SYSTEM_ROUTES_FILE_NAME}`), code, 'utf8');
-                if (enableTanstackTypes) {
-                    const { routerGenTs } = await (0, external_tanstackTypes_js_namespaceObject.generateTanstackRouterTypesSourceForEntry)({
-                        appContext,
-                        entryName,
-                        routes: routes
-                    });
-                    const outPath = external_path_default().join(srcDirectory, 'modern-tanstack', entryName, 'router.gen.ts');
-                    try {
-                        const prev = await utils_namespaceObject.fs.pathExists(outPath) ? await utils_namespaceObject.fs.readFile(outPath, 'utf-8') : null;
-                        if (prev !== routerGenTs) await utils_namespaceObject.fs.outputFile(outPath, routerGenTs, 'utf-8');
-                    } catch  {
-                        await utils_namespaceObject.fs.outputFile(outPath, routerGenTs, 'utf-8');
-                    }
-                }
             }
         }
     }

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

@@ -10,11 +10,15 @@ 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__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{

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

@@ -1,11 +1,15 @@
 "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__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{
@@ -23,9 +27,6 @@ var __webpack_require__ = {};
 })();
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
-__webpack_require__.d(__webpack_exports__, {
-    makeLegalIdentifier: ()=>makeLegalIdentifier
-});
 const reservedWords = 'break case class catch const continue debugger default delete do else export extends finally for function if import in instanceof let new return super switch this throw try typeof var void while with yield enum await implements package protected static interface private public';
 const builtins = 'arguments Infinity NaN undefined null true false eval uneval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Symbol Error EvalError InternalError RangeError ReferenceError SyntaxError TypeError URIError Number Math Date String RegExp Array Int8Array Uint8Array Uint8ClampedArray Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array Map Set WeakMap WeakSet SIMD ArrayBuffer DataView JSON Promise Generator GeneratorFunction Reflect Proxy Intl';
 const forbidList = new Set(`${reservedWords} ${builtins}`.split(' '));
@@ -34,6 +35,9 @@ function makeLegalIdentifier(str) {
     if (/\d/.test(identifier[0]) || forbidList.has(identifier)) return `_${identifier}`;
     return identifier || '_';
 }
+__webpack_require__.d(__webpack_exports__, {
+    makeLegalIdentifier: ()=>makeLegalIdentifier
+});
 exports.makeLegalIdentifier = __webpack_exports__.makeLegalIdentifier;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "makeLegalIdentifier"

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

@@ -1,11 +1,15 @@
 "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__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{

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

@@ -10,11 +10,15 @@ 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__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{
@@ -141,20 +145,7 @@ const fileSystemRoutes = async ({ metaName, routes, ssrMode, nestedRoutesEntry,
     const loadersMapFile = external_path_default().join(internalDirectory, entryName, external_constants_js_namespaceObject.TEMP_LOADERS_DIR, 'map.json');
     const importLazyCode = `
     import { lazy } from "react";
-    import * as loadableModule from "@${metaName}/runtime/loadable"
-
-    const resolveLoadableExport = module => {
-      const candidates = [module, module.default, module.default?.default];
-      const loadable = candidates.find(candidate => typeof candidate === 'function');
-
-      if (!loadable) {
-        throw new TypeError('Modern.js runtime loadable export must resolve to a function');
-      }
-
-      return loadable;
-    };
-    const loadable = resolveLoadableExport(loadableModule);
-    const loadableLazy = loadableModule.lazy || loadableModule.default?.lazy || loadable.lazy;
+    import loadable, { lazy as loadableLazy } from "@${metaName}/runtime/loadable"
   `;
     let rootLayoutCode = "";
     const getDataLoaderPath = ({ loaderId, clientData, action, inline, routeId, inValidSSRRoute })=>{

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

@@ -10,11 +10,15 @@ 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__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{

package/dist/cjs/router/cli/config-routes/converter.js

@@ -10,11 +10,15 @@ 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__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{

package/dist/cjs/router/cli/config-routes/parseRouteConfig.js

@@ -10,11 +10,15 @@ 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__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{

package/dist/cjs/router/cli/constants.js

@@ -1,11 +1,15 @@
 "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__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{
@@ -23,20 +27,6 @@ var __webpack_require__ = {};
 })();
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
-__webpack_require__.d(__webpack_exports__, {
-    ACTION_EXPORT_NAME: ()=>ACTION_EXPORT_NAME,
-    APP_CONFIG_NAME: ()=>APP_CONFIG_NAME,
-    APP_INIT_EXPORTED: ()=>APP_INIT_EXPORTED,
-    FILE_SYSTEM_ROUTES_COMPONENTS_DIR: ()=>FILE_SYSTEM_ROUTES_COMPONENTS_DIR,
-    FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP: ()=>FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP,
-    FILE_SYSTEM_ROUTES_FILE_NAME: ()=>FILE_SYSTEM_ROUTES_FILE_NAME,
-    FILE_SYSTEM_ROUTES_IGNORED_REGEX: ()=>FILE_SYSTEM_ROUTES_IGNORED_REGEX,
-    FILE_SYSTEM_ROUTES_INDEX: ()=>FILE_SYSTEM_ROUTES_INDEX,
-    LOADER_EXPORT_NAME: ()=>LOADER_EXPORT_NAME,
-    NESTED_ROUTE: ()=>NESTED_ROUTE,
-    NESTED_ROUTES_DIR: ()=>NESTED_ROUTES_DIR,
-    TEMP_LOADERS_DIR: ()=>TEMP_LOADERS_DIR
-});
 const NESTED_ROUTES_DIR = 'routes';
 const FILE_SYSTEM_ROUTES_FILE_NAME = 'routes.js';
 const LOADER_EXPORT_NAME = 'loader';
@@ -68,6 +58,20 @@ const NESTED_ROUTE = {
     ERROR_FILE: 'error',
     LOADER_FILE: 'loader'
 };
+__webpack_require__.d(__webpack_exports__, {}, {
+    ACTION_EXPORT_NAME: ACTION_EXPORT_NAME,
+    APP_CONFIG_NAME: APP_CONFIG_NAME,
+    APP_INIT_EXPORTED: APP_INIT_EXPORTED,
+    FILE_SYSTEM_ROUTES_COMPONENTS_DIR: FILE_SYSTEM_ROUTES_COMPONENTS_DIR,
+    FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP: FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP,
+    FILE_SYSTEM_ROUTES_FILE_NAME: FILE_SYSTEM_ROUTES_FILE_NAME,
+    FILE_SYSTEM_ROUTES_IGNORED_REGEX: FILE_SYSTEM_ROUTES_IGNORED_REGEX,
+    FILE_SYSTEM_ROUTES_INDEX: FILE_SYSTEM_ROUTES_INDEX,
+    LOADER_EXPORT_NAME: LOADER_EXPORT_NAME,
+    NESTED_ROUTE: NESTED_ROUTE,
+    NESTED_ROUTES_DIR: NESTED_ROUTES_DIR,
+    TEMP_LOADERS_DIR: TEMP_LOADERS_DIR
+});
 exports.ACTION_EXPORT_NAME = __webpack_exports__.ACTION_EXPORT_NAME;
 exports.APP_CONFIG_NAME = __webpack_exports__.APP_CONFIG_NAME;
 exports.APP_INIT_EXPORTED = __webpack_exports__.APP_INIT_EXPORTED;

package/dist/cjs/router/cli/entry.js

@@ -10,11 +10,15 @@ 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__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{