@modern-js/runtime 2.34.0 → 2.35.1

package/dist/esm/ssr/serverRender/renderToString/loadable.js

@@ -4,11 +4,10 @@ import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { ChunkExtractor } from "@loadable/server";
 import { attributesToString, getLoadableScripts } from "../utils";
 var extname = function(uri) {
-  var _uri;
   if (typeof uri !== "string" || !uri.includes(".")) {
     return "";
   }
-  return ".".concat((_uri = uri) === null || _uri === void 0 ? void 0 : _uri.split(".").pop()) || "";
+  return ".".concat(uri === null || uri === void 0 ? void 0 : uri.split(".").pop()) || "";
 };
 var LoadableCollector = /* @__PURE__ */ function() {
   "use strict";
@@ -45,35 +44,38 @@ var LoadableCollector = /* @__PURE__ */ function() {
         var extractor = this.extractor;
         var chunks = extractor.getChunkAssets(extractor.chunks);
         chunksMap.js = (chunksMap.js || "") + getLoadableScripts(extractor);
+        var attributes = this.generateAttributes();
         var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
         try {
           for (var _iterator = chunks[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
             var v = _step.value;
-            var fileType = extname(v.url).slice(1);
-            var attributes = {};
-            var crossorigin = config.crossorigin, _config_scriptLoading = config.scriptLoading, scriptLoading = _config_scriptLoading === void 0 ? "defer" : _config_scriptLoading;
-            if (crossorigin) {
-              attributes.crossorigin = crossorigin === true ? "anonymous" : crossorigin;
-            }
-            switch (scriptLoading) {
-              case "defer":
-                attributes.defer = true;
-                break;
-              case "module":
-                attributes.type = "module";
-                break;
-              default:
+            if (!v.url) {
+              continue;
             }
+            var fileType = extname(v.url).slice(1);
             if (fileType === "js") {
               var jsChunkReg = new RegExp('<script .*src="'.concat(v.url, '".*>'));
               if (!jsChunkReg.test(template)) {
+                var _config_scriptLoading = config.scriptLoading, scriptLoading = _config_scriptLoading === void 0 ? "defer" : _config_scriptLoading;
+                switch (scriptLoading) {
+                  case "defer":
+                    attributes.defer = true;
+                    break;
+                  case "module":
+                    attributes.type = "module";
+                    break;
+                  default:
+                }
                 attributes.nonce = nonce;
                 var attrsStr = attributesToString(attributes);
                 chunksMap[fileType] += "<script".concat(attrsStr, ' src="').concat(v.url, '"></script>');
               }
             } else if (fileType === "css") {
-              var attrsStr1 = attributesToString(attributes);
-              chunksMap[fileType] += "<link".concat(attrsStr1, ' href="').concat(v.url, '" rel="stylesheet" />');
+              var cssChunkReg = new RegExp('<link .*href="'.concat(v.url, '".*>'));
+              if (!cssChunkReg.test(template)) {
+                var attrsStr1 = attributesToString(attributes);
+                chunksMap[fileType] += "<link".concat(attrsStr1, ' href="').concat(v.url, '" rel="stylesheet" />');
+              }
             }
           }
         } catch (err) {
@@ -91,6 +93,18 @@ var LoadableCollector = /* @__PURE__ */ function() {
           }
         }
       }
+    },
+    {
+      key: "generateAttributes",
+      value: function generateAttributes() {
+        var config = this.options.config;
+        var crossorigin = config.crossorigin;
+        var attributes = {};
+        if (crossorigin) {
+          attributes.crossorigin = crossorigin === true ? "anonymous" : crossorigin;
+        }
+        return attributes;
+      }
     }
   ]);
   return LoadableCollector2;

package/dist/esm/ssr/serverRender/tracker.js

@@ -4,11 +4,14 @@ export var SSRTimings;
   SSRTimings2[SSRTimings2["SSR_RENDER_TOTAL"] = 0] = "SSR_RENDER_TOTAL";
   SSRTimings2[SSRTimings2["SSR_PREFETCH"] = 1] = "SSR_PREFETCH";
   SSRTimings2[SSRTimings2["SSR_RENDER_HTML"] = 2] = "SSR_RENDER_HTML";
+  SSRTimings2[SSRTimings2["SSR_RENDER_SHELL"] = 3] = "SSR_RENDER_SHELL";
 })(SSRTimings || (SSRTimings = {}));
 export var SSRErrors;
 (function(SSRErrors2) {
   SSRErrors2[SSRErrors2["PREFETCH"] = 0] = "PREFETCH";
   SSRErrors2[SSRErrors2["RENDER_HTML"] = 1] = "RENDER_HTML";
+  SSRErrors2[SSRErrors2["RENDER_STREAM"] = 2] = "RENDER_STREAM";
+  SSRErrors2[SSRErrors2["RENDER_SHELL"] = 3] = "RENDER_SHELL";
 })(SSRErrors || (SSRErrors = {}));
 var _obj;
 var errors = (_obj = {}, _define_property(_obj, SSRErrors.PREFETCH, {
@@ -19,6 +22,12 @@ var errors = (_obj = {}, _define_property(_obj, SSRErrors.PREFETCH, {
   reporter: "SSR Error - App Render To HTML",
   logger: "App Render To HTML",
   metrics: "app.render.html.error"
+}), _define_property(_obj, SSRErrors.RENDER_STREAM, {
+  reporter: "SSR Error - App Render To Streaming",
+  logger: "An error occurs during streaming SSR",
+  metrics: "app.render.streaming.error"
+}), _define_property(_obj, SSRErrors.RENDER_SHELL, {
+  metrics: "app.render.streaming.shell.error"
 }), _obj);
 var _obj1;
 var timings = (_obj1 = {}, _define_property(_obj1, SSRTimings.SSR_PREFETCH, {
@@ -36,6 +45,8 @@ var timings = (_obj1 = {}, _define_property(_obj1, SSRTimings.SSR_PREFETCH, {
   serverTiming: "ssr-render-total",
   metrics: "app.render.cost",
   logger: "App Render Total cost = %d ms"
+}), _define_property(_obj1, SSRTimings.SSR_RENDER_SHELL, {
+  reporter: "ssr-render-shell"
 }), _obj1);
 export function createSSRTracker(param) {
   var reporter = param.reporter, serverTiming = param.serverTiming, metrics = param.metrics, logger = param.logger;

package/dist/esm-node/core/compatible.js

@@ -48,16 +48,15 @@ export const createApp = ({ plugins, props: globalProps }) => {
     }, {
       onLast: ({ App: App2 }) => {
         const WrapComponent = ({ context, ...props }) => {
-          var _contextValue;
           let contextValue = context;
-          if (!((_contextValue = contextValue) === null || _contextValue === void 0 ? void 0 : _contextValue.runner)) {
+          if (!(contextValue === null || contextValue === void 0 ? void 0 : contextValue.runner)) {
             contextValue = getInitialContext(runner);
             runner.init({
               context: contextValue
             }, {
               onLast: ({ context: context1 }) => {
-                var _App_init, _App;
-                return (_App = App2) === null || _App === void 0 ? void 0 : (_App_init = _App.init) === null || _App_init === void 0 ? void 0 : _App_init.call(_App, context1);
+                var _App_init;
+                return App2 === null || App2 === void 0 ? void 0 : (_App_init = App2.init) === null || _App_init === void 0 ? void 0 : _App_init.call(App2, context1);
               }
             });
           }
@@ -93,8 +92,8 @@ export const bootstrap = async (BootApp, id, root, ReactDOM) => {
     context: _context
   }, {
     onLast: ({ context: context1 }) => {
-      var _App_init, _App;
-      return (_App = App) === null || _App === void 0 ? void 0 : (_App_init = _App.init) === null || _App_init === void 0 ? void 0 : _App_init.call(_App, context1);
+      var _App_init;
+      return App === null || App === void 0 ? void 0 : (_App_init = App.init) === null || _App_init === void 0 ? void 0 : _App_init.call(App, context1);
     }
   });
   if (!id) {
@@ -105,9 +104,9 @@ export const bootstrap = async (BootApp, id, root, ReactDOM) => {
   const isBrowser = typeof window !== "undefined" && window.name !== "nodejs";
   if (isBrowser) {
     if (isClientArgs(id)) {
-      var _ssrData_data, _ssrData, _ssrData1, _ssrData_data1, _ssrData2;
+      var _ssrData_data, _ssrData_data1;
       const ssrData = window._SSR_DATA;
-      const loadersData = ((_ssrData = ssrData) === null || _ssrData === void 0 ? void 0 : (_ssrData_data = _ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
+      const loadersData = (ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data = ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
       const initialLoadersState = Object.keys(loadersData).reduce((res, key) => {
         const loaderData = loadersData[key];
         if (loaderData.loading !== false) {
@@ -121,10 +120,10 @@ export const bootstrap = async (BootApp, id, root, ReactDOM) => {
           skipStatic: true
         }),
         ...ssrData ? {
-          ssrContext: (_ssrData1 = ssrData) === null || _ssrData1 === void 0 ? void 0 : _ssrData1.context
+          ssrContext: ssrData === null || ssrData === void 0 ? void 0 : ssrData.context
         } : {}
       });
-      context.initialData = (_ssrData2 = ssrData) === null || _ssrData2 === void 0 ? void 0 : (_ssrData_data1 = _ssrData2.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
+      context.initialData = ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data1 = ssrData.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
       const initialData = await runInit(context);
       if (initialData) {
         context.initialData = initialData;

package/dist/esm-node/core/loader/useLoader.js

@@ -14,7 +14,7 @@ const useLoader = (loaderFn, options = {
     delete options._cache;
   }
   const load = useCallback((params) => {
-    var _unlistenLoaderChangeRef_current, _unlistenLoaderChangeRef, _window__SSR_DATA_data_loadersData_id, _window__SSR_DATA_data, _window__SSR_DATA, _window, _loaderRef_current;
+    var _unlistenLoaderChangeRef_current, _window__SSR_DATA_data_loadersData_id, _window__SSR_DATA_data, _window__SSR_DATA, _window, _loaderRef_current;
     if (typeof params === "undefined") {
       var _loaderRef_current1;
       return (_loaderRef_current1 = loaderRef.current) === null || _loaderRef_current1 === void 0 ? void 0 : _loaderRef_current1.load();
@@ -34,7 +34,7 @@ const useLoader = (loaderFn, options = {
       params
     });
     loaderRef.current = loaderManager.get(id);
-    (_unlistenLoaderChangeRef_current = (_unlistenLoaderChangeRef = unlistenLoaderChangeRef).current) === null || _unlistenLoaderChangeRef_current === void 0 ? void 0 : _unlistenLoaderChangeRef_current.call(_unlistenLoaderChangeRef);
+    (_unlistenLoaderChangeRef_current = unlistenLoaderChangeRef.current) === null || _unlistenLoaderChangeRef_current === void 0 ? void 0 : _unlistenLoaderChangeRef_current.call(unlistenLoaderChangeRef);
     if (isSSRRender) {
       return void 0;
     }
@@ -48,12 +48,12 @@ const useLoader = (loaderFn, options = {
     unlistenLoaderChangeRef.current = (_loaderRef_current = loaderRef.current) === null || _loaderRef_current === void 0 ? void 0 : _loaderRef_current.onChange((_status, _result) => {
       setResult(_result);
       if (_status === LoaderStatus.fulfilled) {
-        var _options_onSuccess, _options;
-        (_options = options) === null || _options === void 0 ? void 0 : (_options_onSuccess = _options.onSuccess) === null || _options_onSuccess === void 0 ? void 0 : _options_onSuccess.call(_options, _result.data);
+        var _options_onSuccess;
+        options === null || options === void 0 ? void 0 : (_options_onSuccess = options.onSuccess) === null || _options_onSuccess === void 0 ? void 0 : _options_onSuccess.call(options, _result.data);
       }
       if (_status === LoaderStatus.rejected) {
-        var _options_onError, _options1;
-        (_options1 = options) === null || _options1 === void 0 ? void 0 : (_options_onError = _options1.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(_options1, _result.error);
+        var _options_onError;
+        options === null || options === void 0 ? void 0 : (_options_onError = options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(options, _result.error);
       }
     });
     return res;
@@ -61,8 +61,8 @@ const useLoader = (loaderFn, options = {
     options.skip
   ]);
   useEffect(() => () => {
-    var _unlistenLoaderChangeRef_current, _unlistenLoaderChangeRef;
-    (_unlistenLoaderChangeRef_current = (_unlistenLoaderChangeRef = unlistenLoaderChangeRef).current) === null || _unlistenLoaderChangeRef_current === void 0 ? void 0 : _unlistenLoaderChangeRef_current.call(_unlistenLoaderChangeRef);
+    var _unlistenLoaderChangeRef_current;
+    (_unlistenLoaderChangeRef_current = unlistenLoaderChangeRef.current) === null || _unlistenLoaderChangeRef_current === void 0 ? void 0 : _unlistenLoaderChangeRef_current.call(unlistenLoaderChangeRef);
   }, []);
   useMemo(() => {
     var _options_params;

package/dist/esm-node/core/plugin.js

@@ -18,13 +18,12 @@ export const createRuntime = () => createManager(runtimeHooks);
 const registerInit = (App, _init) => {
   const originalInit = App.init;
   App.init = async (context) => {
-    var _originalInit, _init1;
     if (!context.loaderManager) {
       context.loaderManager = createLoaderManager({});
     }
     await Promise.all([
-      (_originalInit = originalInit) === null || _originalInit === void 0 ? void 0 : _originalInit(context),
-      (_init1 = _init) === null || _init1 === void 0 ? void 0 : _init1(context)
+      originalInit === null || originalInit === void 0 ? void 0 : originalInit(context),
+      _init === null || _init === void 0 ? void 0 : _init(context)
     ]);
   };
 };

package/dist/esm-node/document/Html.js

@@ -6,8 +6,7 @@ function findTargetChild(tag, children) {
   return children.find((item) => getEleType(item) === tag);
 }
 function getEleType(ele) {
-  var _ele, _ele1;
-  return typeof ((_ele = ele) === null || _ele === void 0 ? void 0 : _ele.type) === "function" ? ele.type.name : (_ele1 = ele) === null || _ele1 === void 0 ? void 0 : _ele1.type;
+  return typeof (ele === null || ele === void 0 ? void 0 : ele.type) === "function" ? ele.type.name : ele === null || ele === void 0 ? void 0 : ele.type;
 }
 function findTargetElement(tag, children) {
   if (children.length === 0) {
@@ -15,11 +14,11 @@ function findTargetElement(tag, children) {
   }
   let nextChildren = [];
   for (const item of children) {
-    var _item_props, _item;
+    var _item_props;
     if (tag === getEleType(item)) {
       return item;
     }
-    if ((_item = item) === null || _item === void 0 ? void 0 : (_item_props = _item.props) === null || _item_props === void 0 ? void 0 : _item_props.children) {
+    if (item === null || item === void 0 ? void 0 : (_item_props = item.props) === null || _item_props === void 0 ? void 0 : _item_props.children) {
       nextChildren = nextChildren.concat(item.props.children);
     }
   }

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

@@ -45,7 +45,6 @@ export const documentPlugin = () => ({
         return null;
       }
       return async ({ htmlWebpackPlugin }) => {
-        var _tsConfig, _partialsByEntrypoint;
         const config = api.useResolvedConfigContext();
         const documentParams = getDocParams({
           config,
@@ -60,7 +59,7 @@ export const documentPlugin = () => ({
         } catch (err) {
           tsConfig = {};
         }
-        if ((_tsConfig = tsConfig) === null || _tsConfig === void 0 ? void 0 : _tsConfig.compilerOptions) {
+        if (tsConfig === null || tsConfig === void 0 ? void 0 : tsConfig.compilerOptions) {
           tsConfig.compilerOptions.jsx = "react-jsx";
         } else {
           tsConfig.compilerOptions = {
@@ -120,7 +119,7 @@ export const documentPlugin = () => ({
           partialsHead: "",
           partialsBody: ""
         };
-        if ((_partialsByEntrypoint = partialsByEntrypoint) === null || _partialsByEntrypoint === void 0 ? void 0 : _partialsByEntrypoint[entryName]) {
+        if (partialsByEntrypoint === null || partialsByEntrypoint === void 0 ? void 0 : partialsByEntrypoint[entryName]) {
           partialsContent.partialsTop = partialsByEntrypoint[entryName].top.join("\n");
           partialsContent.partialsHead = partialsByEntrypoint[entryName].head.join("\n");
           partialsContent.partialsBody = partialsByEntrypoint[entryName].body.join("\n");
@@ -153,9 +152,8 @@ export const documentPlugin = () => ({
         return {
           tools: {
             htmlPlugin: (options, entry) => {
-              var _options, _options1, _options2;
-              const hackParameters = typeof ((_options = options) === null || _options === void 0 ? void 0 : _options.templateParameters) === "function" ? (_options1 = options) === null || _options1 === void 0 ? void 0 : _options1.templateParameters({}, {}, {}, {}) : {
-                ...(_options2 = options) === null || _options2 === void 0 ? void 0 : _options2.templateParameters
+              const hackParameters = typeof (options === null || options === void 0 ? void 0 : options.templateParameters) === "function" ? options === null || options === void 0 ? void 0 : options.templateParameters({}, {}, {}, {}) : {
+                ...options === null || options === void 0 ? void 0 : options.templateParameters
               };
               const templateContent = documentEntry(
                 entry.entryName,

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

@@ -43,13 +43,12 @@ export const routerPlugin = () => ({
         ];
       },
       modifyEntryImports({ entrypoint, imports }) {
-        var _runtimeConfig;
         const { entryName, isMainEntry, fileSystemRoutes } = entrypoint;
         const userConfig = api.useResolvedConfigContext();
         const { packageName } = api.useAppContext();
         const runtimeConfig = getEntryOptions(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName);
         runtimeConfigMap.set(entryName, runtimeConfig);
-        if ((_runtimeConfig = runtimeConfig) === null || _runtimeConfig === void 0 ? void 0 : _runtimeConfig.router) {
+        if (runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.router) {
           if (!isV5(userConfig)) {
             imports.push({
               value: "@modern-js/runtime/plugins",

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

@@ -1,14 +1,13 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Suspense, useEffect, useRef, useMemo, useContext } from "react";
-import { Await, UNSAFE_DataRouterContext as DataRouterContext, useAsyncError } from "@modern-js/utils/runtime/router";
-import { serializeJson } from "@modern-js/utils/runtime-node";
+import { Await, UNSAFE_DataRouterContext as DataRouterContext, useAsyncError } from "@modern-js/runtime-utils/router";
+import { serializeJson } from "@modern-js/runtime-utils/node";
 import { JSX_SHELL_STREAM_END_MARK } from "../../common";
 import { serializeErrors } from "./utils";
 const setupFnStr = `function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DATA.r[r]=_ROUTER_DATA.r[r]||{};return new Promise((function(A,R){_ROUTER_DATA.r[r][e]={resolve:A,reject:R}}))};`;
 const resolveFnStr = `function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};`;
 const preResolvedFnStr = `function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resolve(e)};`;
 const DeferredDataScripts = (props) => {
-  var _props;
   const context = useContext(DataRouterContext);
   const { staticContext } = context || {};
   const hydratedRef = useRef(false);
@@ -36,9 +35,8 @@ const DeferredDataScripts = (props) => {
       const { deferredKeys } = deferredData;
       const deferredKeyPromiseStr = deferredKeys.map((key) => {
         if (pendingKeys.has(key)) {
-          var _props2;
           deferredDataScripts.push(/* @__PURE__ */ _jsx(DeferredDataScript, {
-            nonce: (_props2 = props) === null || _props2 === void 0 ? void 0 : _props2.nonce,
+            nonce: props === null || props === void 0 ? void 0 : props.nonce,
             data: deferredData.data[key],
             dataKey: key,
             routeId
@@ -74,7 +72,7 @@ const DeferredDataScripts = (props) => {
     children: [
       !hydratedRef.current && /* @__PURE__ */ _jsx("script", {
         async: true,
-        nonce: (_props = props) === null || _props === void 0 ? void 0 : _props.nonce,
+        nonce: props === null || props === void 0 ? void 0 : props.nonce,
         suppressHydrationWarning: true,
         dangerouslySetInnerHTML: {
           __html: deferredScripts[0]

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

@@ -1,11 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import React, { useContext, useMemo } from "react";
-import { Link as RouterLink, matchRoutes, useResolvedPath, useHref, useMatches, NavLink as RouterNavLink } from "@modern-js/utils/runtime/router";
+import { Link as RouterLink, matchRoutes, useResolvedPath, useHref, useMatches, NavLink as RouterNavLink } from "@modern-js/runtime-utils/router";
 import { RuntimeReactContext } from "../../core";
 export function composeEventHandlers(theirHandler, ourHandler) {
   return (event) => {
-    var _theirHandler;
-    (_theirHandler = theirHandler) === null || _theirHandler === void 0 ? void 0 : _theirHandler(event);
+    theirHandler === null || theirHandler === void 0 ? void 0 : theirHandler(event);
     if (!event.defaultPrevented) {
       ourHandler(event);
     }
@@ -71,8 +70,7 @@ async function loadRouteModule(route, routeAssets) {
   }
   try {
     await Promise.all(chunkIds.map((chunkId) => {
-      var __webpack_chunk_load__1;
-      return (__webpack_chunk_load__1 = __webpack_chunk_load__) === null || __webpack_chunk_load__1 === void 0 ? void 0 : __webpack_chunk_load__1(String(chunkId));
+      return __webpack_chunk_load__ === null || __webpack_chunk_load__ === void 0 ? void 0 : __webpack_chunk_load__(String(chunkId));
     }));
   } catch (error) {
     console.error(error);
@@ -106,8 +104,7 @@ const PrefetchPageLinks = ({ pathname }) => {
   const { routeAssets } = routeManifest || {};
   const matches = Array.isArray(routes) ? matchRoutes(routes, pathname) : [];
   if (Array.isArray(matches) && routeAssets) {
-    var _matches;
-    (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.forEach((match) => loadRouteModule(match.route, routeAssets));
+    matches === null || matches === void 0 ? void 0 : matches.forEach((match) => loadRouteModule(match.route, routeAssets));
   }
   if (!window._SSR_DATA) {
     return null;
@@ -122,8 +119,7 @@ const PrefetchDataLinks = ({ matches, pathname, routeManifest }) => {
   const currentMatches = useMatches();
   const basename = useHref("/");
   const dataHrefs = useMemo(() => {
-    var _matches;
-    return (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.filter((match, index) => {
+    return matches === null || matches === void 0 ? void 0 : matches.filter((match, index) => {
       if (!match.route.loader || typeof match.route.loader !== "function" || match.route.loader.length === 0) {
         return false;
       }

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

@@ -1,5 +1,6 @@
-import { useRouteLoaderData as useRouteData } from "@modern-js/utils/runtime/router";
+import { useRouteLoaderData as useRouteData } from "@modern-js/runtime-utils/router";
 import { routerPlugin } from "./plugin";
+export { renderRoutes } from "./utils";
 export default routerPlugin;
 export { modifyRoutes } from "./plugin";
 export * from "./withRouter";
@@ -65,4 +66,4 @@ export {
   defer,
   json,
   redirect
-} from "@modern-js/utils/runtime/router";
+} from "@modern-js/runtime-utils/router";

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

@@ -1,8 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext, useMemo } from "react";
-import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "@modern-js/utils/runtime/router";
+import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "@modern-js/runtime-utils/router";
 import hoistNonReactStatics from "hoist-non-react-statics";
-import { parsedJSONFromElement } from "@modern-js/utils/runtime-browser";
+import { parsedJSONFromElement } from "@modern-js/runtime-utils/browser";
 import { RuntimeReactContext } from "../../core";
 import { modifyRoutes as modifyRoutesHook } from "./hooks";
 import { deserializeErrors, renderRoutes, urlJoin } from "./utils";
@@ -46,7 +46,6 @@ export const routerPlugin = ({ serverBase = [], supportHtml5History = true, base
           });
         },
         hoc: ({ App }, next) => {
-          var _routesConfig;
           if (!finalRouteConfig && !createRoutes) {
             return next({
               App
@@ -61,8 +60,7 @@ export const routerPlugin = ({ serverBase = [], supportHtml5History = true, base
               const runtimeContext = useContext(RuntimeReactContext);
               const { unstable_getBlockNavState: getBlockNavState } = runtimeContext;
               return useMemo(() => {
-                var _hydrationData;
-                if ((_hydrationData = hydrationData) === null || _hydrationData === void 0 ? void 0 : _hydrationData.errors) {
+                if (hydrationData === null || hydrationData === void 0 ? void 0 : hydrationData.errors) {
                   hydrationData = {
                     ...hydrationData,
                     errors: deserializeErrors(hydrationData.errors)
@@ -122,7 +120,7 @@ export const routerPlugin = ({ serverBase = [], supportHtml5History = true, base
           if (App) {
             RouteApp = hoistNonReactStatics(RouteApp, App);
           }
-          if ((_routesConfig = routesConfig) === null || _routesConfig === void 0 ? void 0 : _routesConfig.globalApp) {
+          if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
             return next({
               App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
             });

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

@@ -1,11 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext } from "react";
-import { createStaticHandler } from "@modern-js/utils/runtime/remix-router";
-import { createStaticRouter, StaticRouterProvider } from "@modern-js/utils/runtime-node/router";
+import { createStaticHandler } from "@modern-js/runtime-utils/remix-router";
+import { createStaticRouter, StaticRouterProvider } from "@modern-js/runtime-utils/node/router";
 import hoistNonReactStatics from "hoist-non-react-statics";
-import { createRoutesFromElements } from "@modern-js/utils/runtime/router";
-import { createRequestContext, reporterCtx } from "@modern-js/utils/runtime-node";
-import { time } from "@modern-js/utils/universal/time";
+import { createRoutesFromElements } from "@modern-js/runtime-utils/router";
+import { createRequestContext, reporterCtx } from "@modern-js/runtime-utils/node";
+import { time } from "@modern-js/runtime-utils/time";
 import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
 import { RuntimeReactContext } from "../../core";
 import { renderRoutes, urlJoin } from "./utils";
@@ -92,7 +92,6 @@ export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
           });
         },
         hoc: ({ App }, next) => {
-          var _routesConfig;
           if (!routesConfig) {
             return next({
               App
@@ -112,7 +111,7 @@ export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
             };
           };
           const RouteApp = getRouteApp();
-          if ((_routesConfig = routesConfig) === null || _routesConfig === void 0 ? void 0 : _routesConfig.globalApp) {
+          if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
             return next({
               App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
             });

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

@@ -1 +1 @@
-export * from "@modern-js/utils/runtime-node/router";
+export * from "@modern-js/runtime-utils/node/router";

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

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Route, isRouteErrorResponse } from "@modern-js/utils/runtime/router";
-import { ErrorResponse } from "@modern-js/utils/runtime/remix-router";
-import { renderNestedRoute } from "@modern-js/utils/runtime/nested-routes";
+import { Route, isRouteErrorResponse } from "@modern-js/runtime-utils/router";
+import { ErrorResponse } from "@modern-js/runtime-utils/remix-router";
+import { renderNestedRoute } from "@modern-js/runtime-utils/browser";
 import { DefaultNotFound } from "./DefaultNotFound";
 import DeferredDataScripts from "./DeferredDataScripts";
 export function getRouteComponents(routes, { globalApp, ssrMode, props, reporter }) {
@@ -59,9 +59,9 @@ export function renderRoutes({ routesConfig, props, ssrMode, reporter }) {
   return routeElements;
 }
 export function getLocation(serverContext) {
-  var _serverContext, _url_replace, _url;
-  const { pathname, url } = ((_serverContext = serverContext) === null || _serverContext === void 0 ? void 0 : _serverContext.request) || {};
-  const cleanUrl = (_url = url) === null || _url === void 0 ? void 0 : (_url_replace = _url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
+  var _url_replace;
+  const { pathname, url } = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {};
+  const cleanUrl = url === null || url === void 0 ? void 0 : (_url_replace = url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
   const index = (cleanUrl || "").indexOf(pathname);
   if (index === -1) {
     return pathname;

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useLocation, useNavigate, useParams } from "@modern-js/utils/runtime/router";
+import { useLocation, useNavigate, useParams } from "@modern-js/runtime-utils/router";
 export const withRouter = (Component) => {
   return (props) => {
     const location = useLocation();

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

@@ -2,13 +2,12 @@ import path from "path";
 import { getEntryOptions, SERVER_RENDER_FUNCTION_NAME, LOADABLE_STATS_FILE, isUseSSRBundle, createRuntimeExportsUtils, isSSGEntry } from "@modern-js/utils";
 const PLUGIN_IDENTIFIER = "ssr";
 const hasStringSSREntry = (userConfig) => {
-  var _server, _server1;
   const isStreaming = (ssr) => ssr && typeof ssr === "object" && ssr.mode === "stream";
   const { server, output } = userConfig;
-  if ((((_server = server) === null || _server === void 0 ? void 0 : _server.ssr) || output.ssg) && !isStreaming(server.ssr)) {
+  if (((server === null || server === void 0 ? void 0 : server.ssr) || output.ssg) && !isStreaming(server.ssr)) {
     return true;
   }
-  if (((_server1 = server) === null || _server1 === void 0 ? void 0 : _server1.ssrByEntries) && typeof server.ssrByEntries === "object") {
+  if ((server === null || server === void 0 ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
     for (const name of Object.keys(server.ssrByEntries)) {
       if (!isStreaming(server.ssrByEntries[name])) {
         return true;
@@ -18,9 +17,8 @@ const hasStringSSREntry = (userConfig) => {
   return false;
 };
 const checkUseStringSSR = (config) => {
-  var _output;
   const { output } = config;
-  return Boolean((_output = output) === null || _output === void 0 ? void 0 : _output.ssg) || hasStringSSREntry(config);
+  return Boolean(output === null || output === void 0 ? void 0 : output.ssg) || hasStringSSREntry(config);
 };
 export const ssrPlugin = () => ({
   name: "@modern-js/plugin-ssr",
@@ -63,8 +61,8 @@ export const ssrPlugin = () => ({
         return {
           source: {
             alias: {
-              // ensure that all packages use the same storage in @modern-js/utils/runtime-node
-              "@modern-js/utils/runtime-node$": require.resolve("@modern-js/utils/runtime-node"),
+              // ensure that all packages use the same storage in @modern-js/runtime-utils/node
+              "@modern-js/runtime-utils/node$": require.resolve("@modern-js/runtime-utils/node"),
               "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
             },
             globalVars: (values, { target }) => {
@@ -94,9 +92,9 @@ export const ssrPlugin = () => ({
         pluginsExportsUtils.addExport(`export { default as ssr } from '@modern-js/runtime/ssr'`);
         const ssrConfig = getEntryOptions(entryName, isMainEntry, userConfig.server.ssr, userConfig.server.ssrByEntries, packageName);
         if (typeof ssrConfig === "object" && ssrConfig.mode === "stream") {
-          var _this, _runtimeConfig;
+          var _this;
           const runtimeConfig = getEntryOptions(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName);
-          if (((_this = (_runtimeConfig = runtimeConfig) === null || _runtimeConfig === void 0 ? void 0 : _runtimeConfig.router) === null || _this === void 0 ? void 0 : _this.mode) === "react-router-5") {
+          if (((_this = runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.router) === null || _this === void 0 ? void 0 : _this.mode) === "react-router-5") {
             throw new Error(`router v5 plugin doesn't support streaming SSR, check your config 'runtime.router'`);
           }
           if (fileSystemRoutes && !entrypoint.nestedRoutesEntry) {
@@ -122,8 +120,8 @@ export const ssrPlugin = () => ({
       },
       modifyEntryRuntimePlugins({ entrypoint, plugins, bundlerConfigs }) {
         if (ssrConfigMap.get(entrypoint.entryName)) {
-          var _bundlerConfigs_find_output, _bundlerConfigs_find, _bundlerConfigs, _config_server;
-          const chunkLoadingGlobal = (_bundlerConfigs = bundlerConfigs) === null || _bundlerConfigs === void 0 ? void 0 : (_bundlerConfigs_find = _bundlerConfigs.find((config2) => config2.name === "client")) === null || _bundlerConfigs_find === void 0 ? void 0 : (_bundlerConfigs_find_output = _bundlerConfigs_find.output) === null || _bundlerConfigs_find_output === void 0 ? void 0 : _bundlerConfigs_find_output.chunkLoadingGlobal;
+          var _bundlerConfigs_find_output, _bundlerConfigs_find, _config_server;
+          const chunkLoadingGlobal = bundlerConfigs === null || bundlerConfigs === void 0 ? void 0 : (_bundlerConfigs_find = bundlerConfigs.find((config2) => config2.name === "client")) === null || _bundlerConfigs_find === void 0 ? void 0 : (_bundlerConfigs_find_output = _bundlerConfigs_find.output) === null || _bundlerConfigs_find_output === void 0 ? void 0 : _bundlerConfigs_find_output.chunkLoadingGlobal;
           const config = api.useResolvedConfigContext();
           const { crossorigin, scriptLoading } = config.html;
           const disablePrerender = typeof ((_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.ssr) === "object" ? Boolean(config.server.ssr.disablePrerender) : false;

package/dist/esm-node/ssr/index.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { loadableReady } from "@loadable/component";
 import hoistNonReactStatics from "hoist-non-react-statics";
-import { parsedJSONFromElement } from "@modern-js/utils/runtime-browser";
+import { parsedJSONFromElement } from "@modern-js/runtime-utils/browser";
 import { RenderLevel } from "./serverRender/types";
 import { WithCallback } from "./react/withCallback";
 import { formatClient, mockResponse, isReact18 } from "./utils";

package/dist/esm-node/ssr/index.node.js

@@ -1,5 +1,6 @@
 import { formatServer } from "./utils";
 import render from "./serverRender";
+import { createSSRTracker } from "./serverRender/tracker";
 export const ssr = (config = {}) => ({
   name: "@modern-js/plugin-ssr",
   setup: () => {
@@ -16,6 +17,7 @@ export const ssr = (config = {}) => ({
         const { request } = context.ssrContext;
         context.ssrContext.request = formatServer(request);
         context.ssrContext.mode = config.mode;
+        context.ssrContext.tracker = createSSRTracker(context.ssrContext);
         if (!context.ssrContext.htmlModifiers) {
           context.ssrContext.htmlModifiers = [];
         }
@@ -24,8 +26,7 @@ export const ssr = (config = {}) => ({
         });
       },
       pickContext: ({ context, pickedContext }, next) => {
-        var _context;
-        const { request, response } = (_context = context) === null || _context === void 0 ? void 0 : _context.ssrContext;
+        const { request, response } = context === null || context === void 0 ? void 0 : context.ssrContext;
         const { initialData } = context;
         return next({
           context,