@modern-js/runtime 2.35.0 → 2.35.1

package/dist/cjs/ssr/serverRender/renderToStream/buildTemplate.after.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "buildShellAfterTemplate", {
     return buildShellAfterTemplate;
   }
 });
-const _runtimenode = require("@modern-js/utils/runtime-node");
+const _node = require("@modern-js/runtime-utils/node");
 const _utils = require("../utils");
 const _buildTemplateshare = require("./buildTemplate.share");
 function buildShellAfterTemplate(afterAppTemplate, options) {
@@ -49,7 +49,7 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
         nonce
       });
       return `
-      <script${attrsStr}>window._SSR_DATA = ${(0, _runtimenode.serializeJson)(SSRData)}</script>
+      <script${attrsStr}>window._SSR_DATA = ${(0, _node.serializeJson)(SSRData)}</script>
       `;
     }
   }

package/dist/cjs/ssr/serverRender/renderToStream/bulidTemplate.before.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "buildShellBeforeTemplate", {
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _reacthelmet = /* @__PURE__ */ _interop_require_default._(require("react-helmet"));
-const _router = require("@modern-js/utils/runtime/router");
+const _router = require("@modern-js/runtime-utils/router");
 const _helmet = /* @__PURE__ */ _interop_require_default._(require("../helmet"));
 const _utils = require("../utils");
 const _buildTemplateshare = require("./buildTemplate.share");
@@ -31,7 +31,6 @@ function getHeadTemplate(beforeEntryTemplate, context) {
   function injectCss(headTemplate2) {
     return headTemplate2.replace(_utils.CSS_CHUNKS_PLACEHOLDER, getCssChunks());
     function getCssChunks() {
-      var _matches;
       const { routeManifest, routerContext, routes } = context;
       if (!routeManifest || !routerContext || !routes) {
         return "";
@@ -39,7 +38,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
       const { routeAssets } = routeManifest;
       const cssChunks = [];
       const matches = (0, _router.matchRoutes)(routes, routerContext.location, routerContext.basename);
-      (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.forEach((match, index) => {
+      matches === null || matches === void 0 ? void 0 : matches.forEach((match, index) => {
         if (!index) {
           return;
         }
@@ -48,10 +47,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
           const routeManifest2 = routeAssets[routeId];
           if (routeManifest2) {
             const { referenceCssAssets = [] } = routeManifest2;
-            const _cssChunks = referenceCssAssets.filter((asset) => {
-              var _asset;
-              return ((_asset = asset) === null || _asset === void 0 ? void 0 : _asset.endsWith(".css")) && !headTemplate2.includes(asset);
-            });
+            const _cssChunks = referenceCssAssets.filter((asset) => (asset === null || asset === void 0 ? void 0 : asset.endsWith(".css")) && !headTemplate2.includes(asset));
             cssChunks.push(..._cssChunks);
           }
         }

package/dist/cjs/ssr/serverRender/renderToStream/index.js

@@ -10,8 +10,8 @@ Object.defineProperty(exports, "render", {
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _react = require("react");
-const _runtimenode = require("@modern-js/utils/runtime-node");
-const _time = require("@modern-js/utils/universal/time");
+const _node = require("@modern-js/runtime-utils/node");
+const _time = require("@modern-js/runtime-utils/time");
 const _prerender = require("../../react/prerender");
 const _tracker = require("../tracker");
 const _renderToPipe = /* @__PURE__ */ _interop_require_default._(require("./renderToPipe"));
@@ -20,7 +20,7 @@ const render = ({ App, context }) => {
   if (!ssrContext) {
     throw new Error('The "ssrContext" must not be undefined, but received undefined');
   }
-  return (0, _runtimenode.run)(ssrContext.request.headers, async () => {
+  return (0, _node.run)(ssrContext.request.headers, async () => {
     const end = (0, _time.time)();
     const rootElement = (0, _react.createElement)(App, {
       context: Object.assign(context || {}, {

package/dist/cjs/ssr/serverRender/renderToStream/renderToPipe.js

@@ -23,7 +23,6 @@ function renderToPipe(rootElement, context, options) {
   const chunkVec = [];
   const forUserPipe = (stream) => {
     return new Promise((resolve) => {
-      var _ssrContext;
       let renderToPipeableStream;
       try {
         ({ renderToPipeableStream } = require("react-dom/server"));
@@ -31,11 +30,11 @@ function renderToPipe(rootElement, context, options) {
       }
       const { pipe } = renderToPipeableStream(rootElement, {
         ...options,
-        nonce: (_ssrContext = ssrContext) === null || _ssrContext === void 0 ? void 0 : _ssrContext.nonce,
+        nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
         onShellReady() {
-          var _options_onShellReady, _options;
+          var _options_onShellReady;
           const { shellAfter, shellBefore } = (0, _template.getTemplates)(context, _types.RenderLevel.SERVER_RENDER);
-          (_options = options) === null || _options === void 0 ? void 0 : (_options_onShellReady = _options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(_options);
+          options === null || options === void 0 ? void 0 : (_options_onShellReady = options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(options);
           const injectableTransform = new _stream.Transform({
             transform(chunk, _encoding, callback) {
               try {
@@ -63,11 +62,11 @@ function renderToPipe(rootElement, context, options) {
           resolve(pipe(injectableTransform).pipe(stream));
         },
         onShellError(error) {
-          var _options_onShellError, _options;
+          var _options_onShellError;
           const { shellAfter, shellBefore } = (0, _template.getTemplates)(context, _types.RenderLevel.CLIENT_RENDER);
           const fallbackHtml = `${shellBefore}${shellAfter}`;
           resolve(fallbackHtml);
-          (_options = options) === null || _options === void 0 ? void 0 : (_options_onShellError = _options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(_options, error);
+          options === null || options === void 0 ? void 0 : (_options_onShellError = options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(options, error);
         }
       });
     });

package/dist/cjs/ssr/serverRender/renderToStream/renderToPipe.worker.js

@@ -29,13 +29,12 @@ function renderToPipe(rootElement, context, options) {
     }
     const { shellAfter, shellBefore } = (0, _template.getTemplates)(context, _types.RenderLevel.SERVER_RENDER);
     try {
-      var _ssrContext;
       const readableOriginal = await renderToReadableStream(rootElement, {
         ...options,
-        nonce: (_ssrContext = ssrContext) === null || _ssrContext === void 0 ? void 0 : _ssrContext.nonce,
+        nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
         onError(error) {
-          var _options_onError, _options;
-          (_options = options) === null || _options === void 0 ? void 0 : (_options_onError = _options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(_options, 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, error);
         }
       });
       const reader = readableOriginal.getReader();
@@ -66,8 +65,7 @@ function renderToPipe(rootElement, context, options) {
       });
       return injectableStream;
     } catch (err) {
-      var _ssrContext1;
-      (_ssrContext1 = ssrContext) === null || _ssrContext1 === void 0 ? void 0 : _ssrContext1.tracker.trackError(_tracker.SSRErrors.RENDER_SHELL, err);
+      ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.tracker.trackError(_tracker.SSRErrors.RENDER_SHELL, err);
       const { shellAfter: shellAfter2, shellBefore: shellBefore2 } = (0, _template.getTemplates)(context, _types.RenderLevel.CLIENT_RENDER);
       const fallbackHtml = `${shellBefore2}${shellAfter2}`;
       return fallbackHtml;

package/dist/cjs/ssr/serverRender/renderToString/entry.js

@@ -11,9 +11,9 @@ Object.defineProperty(exports, "default", {
 const _define_property = require("@swc/helpers/_/_define_property");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
-const _runtimenode = require("@modern-js/utils/runtime-node");
+const _node = require("@modern-js/runtime-utils/node");
 const _reacthelmet = /* @__PURE__ */ _interop_require_default._(require("react-helmet"));
-const _time = require("@modern-js/utils/universal/time");
+const _time = require("@modern-js/runtime-utils/time");
 const _utils = require("../../../router/runtime/utils");
 const _helmet = /* @__PURE__ */ _interop_require_default._(require("../helmet"));
 const _types = require("../types");
@@ -123,13 +123,13 @@ class Entry {
   }
   getSSRDataScript(templateData, routerData) {
     const useInlineScript = this.pluginConfig.inlineScript !== false;
-    const ssrData = (0, _runtimenode.serializeJson)(templateData);
+    const ssrData = (0, _node.serializeJson)(templateData);
     const attrsStr = (0, _utils1.attributesToString)({
       nonce: this.nonce
     });
     let ssrDataScripts = useInlineScript ? `<script${attrsStr}>window._SSR_DATA = ${ssrData}</script>` : `<script type="application/json" id="${_utils1.SSR_DATA_JSON_ID}">${ssrData}</script>`;
     if (routerData) {
-      const serializedRouterData = (0, _runtimenode.serializeJson)(routerData);
+      const serializedRouterData = (0, _node.serializeJson)(routerData);
       ssrDataScripts += useInlineScript ? `
 <script${attrsStr}>window._ROUTER_DATA = ${serializedRouterData}</script>` : `
 <script type="application/json" id="${_utils1.ROUTER_DATA_JSON_ID}">${serializedRouterData}</script>`;

package/dist/cjs/ssr/serverRender/renderToString/index.js

@@ -9,14 +9,14 @@ Object.defineProperty(exports, "render", {
   }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _runtimenode = require("@modern-js/utils/runtime-node");
-const _time = require("@modern-js/utils/universal/time");
+const _node = require("@modern-js/runtime-utils/node");
+const _time = require("@modern-js/runtime-utils/time");
 const _prerender = require("../../react/prerender");
 const _tracker = require("../tracker");
 const _entry = /* @__PURE__ */ _interop_require_default._(require("./entry"));
 const render = ({ App, context, config }) => {
   const ssrContext = context.ssrContext;
-  return (0, _runtimenode.run)(ssrContext.request.headers, async () => {
+  return (0, _node.run)(ssrContext.request.headers, async () => {
     const entry = new _entry.default({
       ctx: ssrContext,
       App,

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

@@ -12,11 +12,10 @@ const _define_property = require("@swc/helpers/_/_define_property");
 const _server = require("@loadable/server");
 const _utils = require("../utils");
 const extname = (uri) => {
-  var _uri;
   if (typeof uri !== "string" || !uri.includes(".")) {
     return "";
   }
-  return `.${(_uri = uri) === null || _uri === void 0 ? void 0 : _uri.split(".").pop()}` || "";
+  return `.${uri === null || uri === void 0 ? void 0 : uri.split(".").pop()}` || "";
 };
 class LoadableCollector {
   collect(comopnent) {
@@ -40,35 +39,47 @@ class LoadableCollector {
     const { extractor } = this;
     const chunks = extractor.getChunkAssets(extractor.chunks);
     chunksMap.js = (chunksMap.js || "") + (0, _utils.getLoadableScripts)(extractor);
+    const attributes = this.generateAttributes();
     for (const v of chunks) {
-      const fileType = extname(v.url).slice(1);
-      const attributes = {};
-      const { crossorigin, scriptLoading = "defer" } = config;
-      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;
       }
+      const fileType = extname(v.url).slice(1);
       if (fileType === "js") {
         const jsChunkReg = new RegExp(`<script .*src="${v.url}".*>`);
         if (!jsChunkReg.test(template)) {
+          const { scriptLoading = "defer" } = config;
+          switch (scriptLoading) {
+            case "defer":
+              attributes.defer = true;
+              break;
+            case "module":
+              attributes.type = "module";
+              break;
+            default:
+          }
           attributes.nonce = nonce;
           const attrsStr = (0, _utils.attributesToString)(attributes);
           chunksMap[fileType] += `<script${attrsStr} src="${v.url}"></script>`;
         }
       } else if (fileType === "css") {
-        const attrsStr = (0, _utils.attributesToString)(attributes);
-        chunksMap[fileType] += `<link${attrsStr} href="${v.url}" rel="stylesheet" />`;
+        const cssChunkReg = new RegExp(`<link .*href="${v.url}".*>`);
+        if (!cssChunkReg.test(template)) {
+          const attrsStr = (0, _utils.attributesToString)(attributes);
+          chunksMap[fileType] += `<link${attrsStr} href="${v.url}" rel="stylesheet" />`;
+        }
       }
     }
   }
+  generateAttributes() {
+    const { config } = this.options;
+    const { crossorigin } = config;
+    const attributes = {};
+    if (crossorigin) {
+      attributes.crossorigin = crossorigin === true ? "anonymous" : crossorigin;
+    }
+    return attributes;
+  }
   constructor(options) {
     _define_property._(this, "options", void 0);
     _define_property._(this, "extractor", void 0);

package/dist/esm/core/compatible.js

@@ -58,17 +58,16 @@ export var createApp = function(param) {
           var context = _param.context, props = _object_without_properties(_param, [
             "context"
           ]);
-          var _contextValue;
           var 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: function(param3) {
                 var context1 = param3.context;
-                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);
               }
             });
           }
@@ -87,7 +86,7 @@ export var createApp = function(param) {
 };
 export var bootstrap = function() {
   var _ref = _async_to_generator(function(BootApp, id, root, ReactDOM) {
-    var App, runner, context, runInit, isBrowser, _ssrData_data, _ssrData, _ssrData1, _ssrData_data1, _ssrData2, ssrData, loadersData, initialLoadersState, initialData, rootElement, ModernRender, ModernHydrate, isRedirectResponse, initialData1;
+    var App, runner, context, runInit, isBrowser, _ssrData_data, _ssrData_data1, ssrData, loadersData, initialLoadersState, initialData, rootElement, ModernRender, ModernHydrate, isRedirectResponse, initialData1;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -106,8 +105,8 @@ export var bootstrap = function() {
             }, {
               onLast: function(param) {
                 var context1 = param.context;
-                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);
               }
             });
           };
@@ -131,7 +130,7 @@ export var bootstrap = function() {
               2
             ];
           ssrData = window._SSR_DATA;
-          loadersData = ((_ssrData = ssrData) === null || _ssrData === void 0 ? void 0 : (_ssrData_data = _ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
+          loadersData = (ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data = ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
           initialLoadersState = Object.keys(loadersData).reduce(function(res, key) {
             var loaderData = loadersData[key];
             if (loaderData.loading !== false) {
@@ -145,9 +144,9 @@ export var bootstrap = function() {
               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;
           return [
             4,
             runInit(context)

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

@@ -19,7 +19,7 @@ var useLoader = function(loaderFn) {
     delete options._cache;
   }
   var load = useCallback(function(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();
@@ -38,7 +38,7 @@ var useLoader = function(loaderFn) {
       params: 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;
     }
@@ -52,12 +52,12 @@ var useLoader = function(loaderFn) {
     unlistenLoaderChangeRef.current = (_loaderRef_current = loaderRef.current) === null || _loaderRef_current === void 0 ? void 0 : _loaderRef_current.onChange(function(_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;
@@ -66,8 +66,8 @@ var useLoader = function(loaderFn) {
   ]);
   useEffect(function() {
     return function() {
-      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(function() {

package/dist/esm/core/plugin.js

@@ -23,7 +23,6 @@ var registerInit = function(App, _init) {
   var originalInit = App.init;
   App.init = function() {
     var _ref = _async_to_generator(function(context) {
-      var _originalInit, _$_init;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
@@ -33,8 +32,8 @@ var registerInit = function(App, _init) {
             return [
               4,
               Promise.all([
-                (_originalInit = originalInit) === null || _originalInit === void 0 ? void 0 : _originalInit(context),
-                (_$_init = _init) === null || _$_init === void 0 ? void 0 : _$_init(context)
+                originalInit === null || originalInit === void 0 ? void 0 : originalInit(context),
+                _init === null || _init === void 0 ? void 0 : _init(context)
               ])
             ];
           case 1:

package/dist/esm/document/Html.js

@@ -11,8 +11,7 @@ function findTargetChild(tag, children) {
   });
 }
 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) {
@@ -23,11 +22,11 @@ function findTargetElement(tag, children) {
   try {
     for (var _iterator = children[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
       var item = _step.value;
-      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/document/cli/index.js

@@ -57,7 +57,7 @@ export var documentPlugin = function() {
             }
             return function() {
               var _ref2 = _async_to_generator(function(param) {
-                var htmlWebpackPlugin, _tsConfig, _partialsByEntrypoint, config, documentParams, tempTsConfigFile, userTsConfigFilePath, tsConfig, err, htmlOutputFile, Document, HTMLElement, html, partialsByEntrypoint, scripts, partialsContent, links, metas, nonce, nonceAttr, finalHtml;
+                var htmlWebpackPlugin, config, documentParams, tempTsConfigFile, userTsConfigFilePath, tsConfig, err, htmlOutputFile, Document, HTMLElement, html, partialsByEntrypoint, scripts, partialsContent, links, metas, nonce, nonceAttr, finalHtml;
                 return _ts_generator(this, function(_state2) {
                   switch (_state2.label) {
                     case 0:
@@ -96,7 +96,7 @@ export var documentPlugin = function() {
                         4
                       ];
                     case 4:
-                      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 = {
@@ -168,7 +168,7 @@ export var documentPlugin = function() {
                         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");
@@ -222,8 +222,7 @@ export var documentPlugin = function() {
                 return {
                   tools: {
                     htmlPlugin: function(options, entry) {
-                      var _options, _options1, _options2;
-                      var hackParameters = typeof ((_options = options) === null || _options === void 0 ? void 0 : _options.templateParameters) === "function" ? (_options1 = options) === null || _options1 === void 0 ? void 0 : _options1.templateParameters({}, {}, {}, {}) : _object_spread({}, (_options2 = options) === null || _options2 === void 0 ? void 0 : _options2.templateParameters);
+                      var hackParameters = typeof (options === null || options === void 0 ? void 0 : options.templateParameters) === "function" ? options === null || options === void 0 ? void 0 : options.templateParameters({}, {}, {}, {}) : _object_spread({}, options === null || options === void 0 ? void 0 : options.templateParameters);
                       var templateContent = documentEntry(
                         entry.entryName,
                         // options,

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

@@ -47,13 +47,12 @@ export var routerPlugin = function() {
         },
         modifyEntryImports: function modifyEntryImports(param) {
           var entrypoint = param.entrypoint, imports = param.imports;
-          var _runtimeConfig;
           var entryName = entrypoint.entryName, isMainEntry = entrypoint.isMainEntry, fileSystemRoutes = entrypoint.fileSystemRoutes;
           var userConfig = api.useResolvedConfigContext();
           var packageName = api.useAppContext().packageName;
           var 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/router/runtime/DeferredDataScripts.node.js

@@ -1,15 +1,14 @@
 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 { 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";
 var 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}}))};";
 var resolveFnStr = "function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};";
 var preResolvedFnStr = "function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resolve(e)};";
 var DeferredDataScripts = function(props) {
-  var _props;
   var context = useContext(DataRouterContext);
   var staticContext = (context || {}).staticContext;
   var hydratedRef = useRef(false);
@@ -38,9 +37,8 @@ var DeferredDataScripts = function(props) {
       var deferredKeys = deferredData.deferredKeys;
       var deferredKeyPromiseStr = deferredKeys.map(function(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: routeId
@@ -76,7 +74,7 @@ var DeferredDataScripts = function(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/router/runtime/PrefetchLink.js

@@ -5,12 +5,11 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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 function(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);
     }
@@ -99,8 +98,7 @@ function _loadRouteModule() {
           return [
             4,
             Promise.all(chunkIds.map(function(chunkId) {
-              var _$__webpack_chunk_load__;
-              return (_$__webpack_chunk_load__ = __webpack_chunk_load__) === null || _$__webpack_chunk_load__ === void 0 ? void 0 : _$__webpack_chunk_load__(String(chunkId));
+              return __webpack_chunk_load__ === null || __webpack_chunk_load__ === void 0 ? void 0 : __webpack_chunk_load__(String(chunkId));
             }))
           ];
         case 2:
@@ -154,8 +152,7 @@ var PrefetchPageLinks = function(param) {
   var routeAssets = (routeManifest || {}).routeAssets;
   var matches = Array.isArray(routes) ? matchRoutes(routes, pathname) : [];
   if (Array.isArray(matches) && routeAssets) {
-    var _matches;
-    (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.forEach(function(match) {
+    matches === null || matches === void 0 ? void 0 : matches.forEach(function(match) {
       return loadRouteModule(match.route, routeAssets);
     });
   }
@@ -173,8 +170,7 @@ var PrefetchDataLinks = function(param) {
   var currentMatches = useMatches();
   var basename = useHref("/");
   var dataHrefs = useMemo(function() {
-    var _matches;
-    return (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.filter(function(match, index) {
+    return matches === null || matches === void 0 ? void 0 : matches.filter(function(match, index) {
       if (!match.route.loader || typeof match.route.loader !== "function" || match.route.loader.length === 0) {
         return false;
       }

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

@@ -1,4 +1,4 @@
-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;
@@ -66,4 +66,4 @@ export {
   defer,
   json,
   redirect
-} from "@modern-js/utils/runtime/router";
+} from "@modern-js/runtime-utils/router";

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

@@ -3,9 +3,9 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 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";
@@ -56,7 +56,6 @@ export var routerPlugin = function(param) {
         },
         hoc: function(param2, next) {
           var App = param2.App;
-          var _routesConfig;
           if (!finalRouteConfig && !createRoutes) {
             return next({
               App: App
@@ -71,8 +70,7 @@ export var routerPlugin = function(param) {
               var runtimeContext = useContext(RuntimeReactContext);
               var getBlockNavState = runtimeContext.unstable_getBlockNavState;
               return useMemo(function() {
-                var _hydrationData;
-                if ((_hydrationData = hydrationData) === null || _hydrationData === void 0 ? void 0 : _hydrationData.errors) {
+                if (hydrationData === null || hydrationData === void 0 ? void 0 : hydrationData.errors) {
                   hydrationData = _object_spread_props(_object_spread({}, hydrationData), {
                     errors: deserializeErrors(hydrationData.errors)
                   });
@@ -133,7 +131,7 @@ export var routerPlugin = function(param) {
           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)
             });