@modern-js/runtime 2.67.3 → 2.67.5

package/dist/cjs/cli/alias.js

@@ -40,7 +40,7 @@ const builderPluginAlias = ({ entrypoints, internalDirectory, metaName }) => ({
       const entrypointsAlias = {};
       const mainEntrypointsAlias = {};
       entrypoints.forEach((entrypoint) => {
-        entrypointsAlias[`@${metaName}/runtime/registry/${entrypoint.entryName}`] = import_path.default.join(internalDirectory, entrypoint.entryName, import_constants.ENTRY_POINT_REGISTER_FILE_NAME);
+        entrypointsAlias[`@${metaName}/runtime/registry/${entrypoint.entryName}$`] = import_path.default.join(internalDirectory, entrypoint.entryName, import_constants.ENTRY_POINT_REGISTER_FILE_NAME);
         if (entrypoint.isMainEntry) {
           mainEntrypointsAlias[`@${metaName}/runtime/registry`] = import_path.default.join(internalDirectory, entrypoint.entryName, import_constants.ENTRY_POINT_REGISTER_FILE_NAME);
         }

package/dist/cjs/core/server/requestHandler.js

@@ -94,11 +94,13 @@ const createRequestHandler = async (handleRequest, createRequestOptions) => {
       headers: {},
       status: -1
     };
+    const activeDeferreds = /* @__PURE__ */ new Map();
     return import_node.storage.run({
       headers: headersData,
       request,
       monitors: options.monitors,
-      responseProxy
+      responseProxy,
+      activeDeferreds
     }, async () => {
       var _context_routerContext, _context_routerContext1, _context_routerContext2;
       const Root = (0, import_react.createRoot)();

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

@@ -92,7 +92,10 @@ const routerPlugin = () => ({
             /node_modules\/react-router/,
             /node_modules\/react-router-dom/,
             /node_modules\/@remix-run\/router/
-          ]
+          ],
+          globalVars: {
+            "process.env._MODERN_ROUTER_VERSION": "v6"
+          }
         }
       };
     });

package/dist/cjs/router/runtime/DeferredDataScripts.node.js

@@ -32,6 +32,7 @@ const DeferredDataScripts = (props) => {
   const staticContext = props === null || props === void 0 ? void 0 : props.context;
   const useJsonScript = props === null || props === void 0 ? void 0 : props.useJsonScript;
   const hydratedRef = (0, import_react.useRef)(false);
+  const isRouterV7 = process.env._MODERN_ROUTER_VERSION === "v7";
   (0, import_react.useEffect)(() => {
     hydratedRef.current = true;
   }, []);
@@ -39,7 +40,8 @@ const DeferredDataScripts = (props) => {
     if (!staticContext) {
       return null;
     }
-    const activeDeferreds = staticContext.activeDeferreds || [];
+    const originalActiveDeferreds = import_node.storage.useContext().activeDeferreds;
+    const activeDeferreds = !isRouterV7 ? staticContext.activeDeferreds || [] : originalActiveDeferreds;
     const _ROUTER_DATA = {
       loaderData: staticContext.loaderData,
       errors: (0, import_utils.serializeErrors)(staticContext.errors)
@@ -50,7 +52,7 @@ const DeferredDataScripts = (props) => {
       import_constants2.modernInline
     ].join("\n");
     const deferredDataScripts = [];
-    const initialScripts = Object.entries(activeDeferreds).map(([routeId, deferredData]) => {
+    const initialScripts = (activeDeferreds instanceof Map ? Array.from(activeDeferreds.entries()) : Object.entries(activeDeferreds)).map(([routeId, deferredData]) => {
       const pendingKeys = new Set(deferredData.pendingKeys);
       const { deferredKeys } = deferredData;
       const deferredKeyPromiseManifests = deferredKeys.map((key) => {

package/dist/cjs/router/runtime/plugin.js

@@ -75,7 +75,8 @@ const routerPlugin = (userConfig = {}) => {
         Object.defineProperty(context, "routes", {
           get() {
             return routes;
-          }
+          },
+          enumerable: true
         });
       });
       api.wrapRoot((App) => {

package/dist/cjs/router/runtime/plugin.node.js

@@ -118,7 +118,12 @@ const routerPlugin = (userConfig = {}) => {
         const router = (0, import_router.createStaticRouter)(routes, routerContext);
         context.routerContext = routerContext;
         context.remixRouter = router;
-        context.routes = routes;
+        Object.defineProperty(context, "routes", {
+          get() {
+            return routes;
+          },
+          enumerable: true
+        });
       });
       api.wrapRoot((App) => {
         if (!finalRouteConfig) {

package/dist/esm/cli/alias.js

@@ -11,7 +11,7 @@ var builderPluginAlias = function(param) {
         var entrypointsAlias = {};
         var mainEntrypointsAlias = {};
         entrypoints.forEach(function(entrypoint) {
-          entrypointsAlias["@".concat(metaName, "/runtime/registry/").concat(entrypoint.entryName)] = path.join(internalDirectory, entrypoint.entryName, ENTRY_POINT_REGISTER_FILE_NAME);
+          entrypointsAlias["@".concat(metaName, "/runtime/registry/").concat(entrypoint.entryName, "$")] = path.join(internalDirectory, entrypoint.entryName, ENTRY_POINT_REGISTER_FILE_NAME);
           if (entrypoint.isMainEntry) {
             mainEntrypointsAlias["@".concat(metaName, "/runtime/registry")] = path.join(internalDirectory, entrypoint.entryName, ENTRY_POINT_REGISTER_FILE_NAME);
           }

package/dist/esm/core/server/requestHandler.js

@@ -77,20 +77,22 @@ var createRequestHandler = function() {
     return _ts_generator(this, function(_state) {
       requestHandler = function() {
         var _ref2 = _async_to_generator(function(request, options) {
-          var headersData, responseProxy;
+          var headersData, responseProxy, activeDeferreds;
           return _ts_generator(this, function(_state2) {
             headersData = parseHeaders(request);
             responseProxy = {
               headers: {},
               status: -1
             };
+            activeDeferreds = /* @__PURE__ */ new Map();
             return [
               2,
               storage.run({
                 headers: headersData,
                 request,
                 monitors: options.monitors,
-                responseProxy
+                responseProxy,
+                activeDeferreds
               }, /* @__PURE__ */ _async_to_generator(function() {
                 var _context_routerContext, _context_routerContext1, _context_routerContext2, Root, internalRuntimeContext, hooks, routeManifest, context, runBeforeRender, ssrContext, getRedirectResponse, initialData, _context_routerContext3, _context_ssrContext, errors, redirectResponse, htmlTemplate, response;
                 return _ts_generator(this, function(_state3) {

package/dist/esm/router/cli/index.js

@@ -67,7 +67,10 @@ var routerPlugin = function() {
               /node_modules\/react-router/,
               /node_modules\/react-router-dom/,
               /node_modules\/@remix-run\/router/
-            ]
+            ],
+            globalVars: {
+              "process.env._MODERN_ROUTER_VERSION": "v6"
+            }
           }
         };
       });

package/dist/esm/router/runtime/DeferredDataScripts.node.js

@@ -1,6 +1,7 @@
+import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { serializeJson } from "@modern-js/runtime-utils/node";
+import { serializeJson, storage } from "@modern-js/runtime-utils/node";
 import { Await, useAsyncError } from "@modern-js/runtime-utils/router";
 import { Suspense, useEffect, useMemo, useRef } from "react";
 import { ROUTER_DATA_JSON_ID } from "../../core/constants";
@@ -10,6 +11,7 @@ var DeferredDataScripts = function(props) {
   var staticContext = props === null || props === void 0 ? void 0 : props.context;
   var useJsonScript = props === null || props === void 0 ? void 0 : props.useJsonScript;
   var hydratedRef = useRef(false);
+  var isRouterV7 = process.env._MODERN_ROUTER_VERSION === "v7";
   useEffect(function() {
     hydratedRef.current = true;
   }, []);
@@ -17,7 +19,8 @@ var DeferredDataScripts = function(props) {
     if (!staticContext) {
       return null;
     }
-    var activeDeferreds = staticContext.activeDeferreds || [];
+    var originalActiveDeferreds = storage.useContext().activeDeferreds;
+    var activeDeferreds = !isRouterV7 ? staticContext.activeDeferreds || [] : originalActiveDeferreds;
     var _ROUTER_DATA = {
       loaderData: staticContext.loaderData,
       errors: serializeErrors(staticContext.errors)
@@ -28,7 +31,7 @@ var DeferredDataScripts = function(props) {
       modernInline
     ].join("\n");
     var deferredDataScripts = [];
-    var initialScripts = Object.entries(activeDeferreds).map(function(param) {
+    var initialScripts = (_instanceof(activeDeferreds, Map) ? Array.from(activeDeferreds.entries()) : Object.entries(activeDeferreds)).map(function(param) {
       var _param = _sliced_to_array(param, 2), routeId = _param[0], deferredData = _param[1];
       var pendingKeys = new Set(deferredData.pendingKeys);
       var deferredKeys = deferredData.deferredKeys;

package/dist/esm/router/runtime/plugin.js

@@ -53,7 +53,8 @@ var routerPlugin = function() {
         Object.defineProperty(context, "routes", {
           get: function get() {
             return routes;
-          }
+          },
+          enumerable: true
         });
       });
       api.wrapRoot(function(App) {

package/dist/esm/router/runtime/plugin.node.js

@@ -107,7 +107,12 @@ var routerPlugin = function() {
                 router = createStaticRouter(routes, routerContext);
                 context.routerContext = routerContext;
                 context.remixRouter = router;
-                context.routes = routes;
+                Object.defineProperty(context, "routes", {
+                  get: function get() {
+                    return routes;
+                  },
+                  enumerable: true
+                });
                 return [
                   2
                 ];

package/dist/esm-node/cli/alias.js

@@ -7,7 +7,7 @@ const builderPluginAlias = ({ entrypoints, internalDirectory, metaName }) => ({
       const entrypointsAlias = {};
       const mainEntrypointsAlias = {};
       entrypoints.forEach((entrypoint) => {
-        entrypointsAlias[`@${metaName}/runtime/registry/${entrypoint.entryName}`] = path.join(internalDirectory, entrypoint.entryName, ENTRY_POINT_REGISTER_FILE_NAME);
+        entrypointsAlias[`@${metaName}/runtime/registry/${entrypoint.entryName}$`] = path.join(internalDirectory, entrypoint.entryName, ENTRY_POINT_REGISTER_FILE_NAME);
         if (entrypoint.isMainEntry) {
           mainEntrypointsAlias[`@${metaName}/runtime/registry`] = path.join(internalDirectory, entrypoint.entryName, ENTRY_POINT_REGISTER_FILE_NAME);
         }

package/dist/esm-node/core/server/requestHandler.js

@@ -71,11 +71,13 @@ const createRequestHandler = async (handleRequest, createRequestOptions) => {
       headers: {},
       status: -1
     };
+    const activeDeferreds = /* @__PURE__ */ new Map();
     return storage.run({
       headers: headersData,
       request,
       monitors: options.monitors,
-      responseProxy
+      responseProxy,
+      activeDeferreds
     }, async () => {
       var _context_routerContext, _context_routerContext1, _context_routerContext2;
       const Root = createRoot();

package/dist/esm-node/router/cli/index.js

@@ -55,7 +55,10 @@ const routerPlugin = () => ({
             /node_modules\/react-router/,
             /node_modules\/react-router-dom/,
             /node_modules\/@remix-run\/router/
-          ]
+          ],
+          globalVars: {
+            "process.env._MODERN_ROUTER_VERSION": "v6"
+          }
         }
       };
     });

package/dist/esm-node/router/runtime/DeferredDataScripts.node.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { serializeJson } from "@modern-js/runtime-utils/node";
+import { serializeJson, storage } from "@modern-js/runtime-utils/node";
 import { Await, useAsyncError } from "@modern-js/runtime-utils/router";
 import { Suspense, useEffect, useMemo, useRef } from "react";
 import { ROUTER_DATA_JSON_ID } from "../../core/constants";
@@ -9,6 +9,7 @@ const DeferredDataScripts = (props) => {
   const staticContext = props === null || props === void 0 ? void 0 : props.context;
   const useJsonScript = props === null || props === void 0 ? void 0 : props.useJsonScript;
   const hydratedRef = useRef(false);
+  const isRouterV7 = process.env._MODERN_ROUTER_VERSION === "v7";
   useEffect(() => {
     hydratedRef.current = true;
   }, []);
@@ -16,7 +17,8 @@ const DeferredDataScripts = (props) => {
     if (!staticContext) {
       return null;
     }
-    const activeDeferreds = staticContext.activeDeferreds || [];
+    const originalActiveDeferreds = storage.useContext().activeDeferreds;
+    const activeDeferreds = !isRouterV7 ? staticContext.activeDeferreds || [] : originalActiveDeferreds;
     const _ROUTER_DATA = {
       loaderData: staticContext.loaderData,
       errors: serializeErrors(staticContext.errors)
@@ -27,7 +29,7 @@ const DeferredDataScripts = (props) => {
       modernInline
     ].join("\n");
     const deferredDataScripts = [];
-    const initialScripts = Object.entries(activeDeferreds).map(([routeId, deferredData]) => {
+    const initialScripts = (activeDeferreds instanceof Map ? Array.from(activeDeferreds.entries()) : Object.entries(activeDeferreds)).map(([routeId, deferredData]) => {
       const pendingKeys = new Set(deferredData.pendingKeys);
       const { deferredKeys } = deferredData;
       const deferredKeyPromiseManifests = deferredKeys.map((key) => {

package/dist/esm-node/router/runtime/plugin.js

@@ -49,7 +49,8 @@ const routerPlugin = (userConfig = {}) => {
         Object.defineProperty(context, "routes", {
           get() {
             return routes;
-          }
+          },
+          enumerable: true
         });
       });
       api.wrapRoot((App) => {

package/dist/esm-node/router/runtime/plugin.node.js

@@ -84,7 +84,12 @@ const routerPlugin = (userConfig = {}) => {
         const router = createStaticRouter(routes, routerContext);
         context.routerContext = routerContext;
         context.remixRouter = router;
-        context.routes = routes;
+        Object.defineProperty(context, "routes", {
+          get() {
+            return routes;
+          },
+          enumerable: true
+        });
       });
       api.wrapRoot((App) => {
         if (!finalRouteConfig) {

package/dist/types/core/context/runtime.d.ts

@@ -1,4 +1,5 @@
 import type { StaticHandlerContext } from '@modern-js/runtime-utils/remix-router';
+import type { RouteObject } from '@modern-js/runtime-utils/router';
 import type { RouteManifest } from '../../router/runtime/types';
 import { createLoaderManager } from '../loader/loaderManager';
 import type { SSRServerContext, TSSRContext } from '../types';
@@ -20,7 +21,7 @@ export interface RuntimeContext extends BaseRuntimeContext {
 }
 export declare const RuntimeReactContext: import("react").Context<RuntimeContext>;
 export declare const ServerRouterContext: import("react").Context<any>;
-export interface TRuntimeContext extends Partial<BaseRuntimeContext> {
+export interface TRuntimeContext {
     initialData?: Record<string, unknown>;
     isBrowser: boolean;
     context: TSSRContext;
@@ -28,6 +29,7 @@ export interface TRuntimeContext extends Partial<BaseRuntimeContext> {
     request?: SSRServerContext['request'];
     /** @deprecated use context.response field instead */
     response?: SSRServerContext['response'];
+    routes?: RouteObject[];
     [key: string]: any;
 }
 export declare const getInitialContext: (isBrowser?: boolean, routeManifest?: RouteManifest) => RuntimeContext;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.67.3",
+  "version": "2.67.5",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -198,7 +198,7 @@
     "@loadable/babel-plugin": "5.15.3",
     "@loadable/component": "5.15.3",
     "@loadable/server": "5.15.3",
-    "@swc/helpers": "0.5.13",
+    "@swc/helpers": "^0.5.17",
     "@types/loadable__component": "^5.13.4",
     "@types/react-helmet": "^6.1.2",
     "@types/styled-components": "^5.1.14",
@@ -211,13 +211,13 @@
     "react-is": "^18",
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.67.3",
-    "@modern-js/plugin-data-loader": "2.67.3",
-    "@modern-js/plugin-v2": "2.67.3",
-    "@modern-js/render": "2.67.3",
-    "@modern-js/runtime-utils": "2.67.3",
-    "@modern-js/types": "2.67.3",
-    "@modern-js/utils": "2.67.3"
+    "@modern-js/plugin": "2.67.5",
+    "@modern-js/plugin-data-loader": "2.67.5",
+    "@modern-js/plugin-v2": "2.67.5",
+    "@modern-js/render": "2.67.5",
+    "@modern-js/runtime-utils": "2.67.5",
+    "@modern-js/types": "2.67.5",
+    "@modern-js/utils": "2.67.5"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -225,7 +225,7 @@
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
-    "@rsbuild/core": "1.3.10",
+    "@rsbuild/core": "1.3.20",
     "@testing-library/react": "^13.4.0",
     "@types/cookie": "0.6.0",
     "@types/invariant": "^2.2.30",
@@ -240,10 +240,10 @@
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
     "typescript": "^5",
-    "webpack": "^5.98.0",
-    "@modern-js/app-tools": "2.67.3",
-    "@scripts/build": "2.66.0",
-    "@scripts/jest-config": "2.66.0"
+    "webpack": "^5.99.8",
+    "@modern-js/app-tools": "2.67.5",
+    "@scripts/jest-config": "2.66.0",
+    "@scripts/build": "2.66.0"
   },
   "sideEffects": false,
   "publishConfig": {