@modern-js/runtime 2.35.0 → 2.35.1

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

@@ -6,12 +6,12 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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";
@@ -157,7 +157,6 @@ export var routerPlugin = function(param) {
         },
         hoc: function(param2, next) {
           var App = param2.App;
-          var _routesConfig;
           if (!routesConfig) {
             return next({
               App: App
@@ -176,7 +175,7 @@ export var routerPlugin = function(param) {
             };
           };
           var 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/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/router/runtime/utils.js

@@ -4,9 +4,9 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 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, param) {
@@ -83,9 +83,9 @@ export function renderRoutes(param) {
   return routeElements;
 }
 export function getLocation(serverContext) {
-  var _serverContext, _url_replace, _url;
-  var _ref = ((_serverContext = serverContext) === null || _serverContext === void 0 ? void 0 : _serverContext.request) || {}, pathname = _ref.pathname, url = _ref.url;
-  var 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;
+  var _ref = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {}, pathname = _ref.pathname, url = _ref.url;
+  var cleanUrl = url === null || url === void 0 ? void 0 : (_url_replace = url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
   var index = (cleanUrl || "").indexOf(pathname);
   if (index === -1) {
     return pathname;

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

@@ -1,7 +1,7 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 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 var withRouter = function(Component) {
   return function(props) {
     var location = useLocation();

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

@@ -4,15 +4,14 @@ import path from "path";
 import { getEntryOptions, SERVER_RENDER_FUNCTION_NAME, LOADABLE_STATS_FILE, isUseSSRBundle, createRuntimeExportsUtils, isSSGEntry } from "@modern-js/utils";
 var PLUGIN_IDENTIFIER = "ssr";
 var hasStringSSREntry = function(userConfig) {
-  var _server, _server1;
   var isStreaming = function(ssr) {
     return ssr && typeof ssr === "object" && ssr.mode === "stream";
   };
   var server = userConfig.server, output = userConfig.output;
-  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") {
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
     try {
       for (var _iterator = Object.keys(server.ssrByEntries)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
@@ -39,9 +38,8 @@ var hasStringSSREntry = function(userConfig) {
   return false;
 };
 var checkUseStringSSR = function(config) {
-  var _output;
   var output = config.output;
-  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 var ssrPlugin = function() {
   return {
@@ -85,8 +83,8 @@ export var ssrPlugin = function() {
           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: function(values, param) {
@@ -119,9 +117,9 @@ export var ssrPlugin = function() {
           pluginsExportsUtils.addExport("export { default as ssr } from '@modern-js/runtime/ssr'");
           var ssrConfig = getEntryOptions(entryName, isMainEntry, userConfig.server.ssr, userConfig.server.ssrByEntries, packageName);
           if (typeof ssrConfig === "object" && ssrConfig.mode === "stream") {
-            var _this, _runtimeConfig;
+            var _this;
             var 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) {
@@ -148,8 +146,8 @@ export var ssrPlugin = function() {
         modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
           var entrypoint = param.entrypoint, plugins = param.plugins, bundlerConfigs = param.bundlerConfigs;
           if (ssrConfigMap.get(entrypoint.entryName)) {
-            var _bundlerConfigs_find_output, _bundlerConfigs_find, _bundlerConfigs, _config_server;
-            var chunkLoadingGlobal = (_bundlerConfigs = bundlerConfigs) === null || _bundlerConfigs === void 0 ? void 0 : (_bundlerConfigs_find = _bundlerConfigs.find(function(config2) {
+            var _bundlerConfigs_find_output, _bundlerConfigs_find, _config_server;
+            var chunkLoadingGlobal = bundlerConfigs === null || bundlerConfigs === void 0 ? void 0 : (_bundlerConfigs_find = bundlerConfigs.find(function(config2) {
               return 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 config = api.useResolvedConfigContext();

package/dist/esm/ssr/index.js

@@ -5,7 +5,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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/ssr/index.node.js

@@ -54,8 +54,7 @@ export var ssr = function() {
         },
         pickContext: function(param, next) {
           var context = param.context, pickedContext = param.pickedContext;
-          var _context;
-          var _ref = (_context = context) === null || _context === void 0 ? void 0 : _context.ssrContext, request = _ref.request, response = _ref.response;
+          var _ref = context === null || context === void 0 ? void 0 : context.ssrContext, request = _ref.request, response = _ref.response;
           var initialData = context.initialData;
           return next({
             context: context,

package/dist/esm/ssr/prefetch.js

@@ -2,7 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { renderToStaticMarkup } from "react-dom/server";
-import { run } from "@modern-js/utils/runtime-node";
+import { run } from "@modern-js/runtime-utils/node";
 import { ChunkExtractor } from "@loadable/server";
 var prefetch = function() {
   var _ref = _async_to_generator(function(App, context, config) {
@@ -10,7 +10,7 @@ var prefetch = function() {
       return [
         2,
         run(context.ssrContext.request.headers, /* @__PURE__ */ _async_to_generator(function() {
-          var _context_store, _context, ssrContext, loadableStats, extractor, loadersData;
+          var _context_store, ssrContext, loadableStats, extractor, loadersData;
           return _ts_generator(this, function(_state2) {
             switch (_state2.label) {
               case 0:
@@ -63,7 +63,7 @@ var prefetch = function() {
                     initialData: context.initialData,
                     i18nData: context.__i18nData__,
                     // todo: move to plugin state
-                    storeState: (_context = context) === null || _context === void 0 ? void 0 : (_context_store = _context.store) === null || _context_store === void 0 ? void 0 : _context_store.getState()
+                    storeState: context === null || context === void 0 ? void 0 : (_context_store = context.store) === null || _context_store === void 0 ? void 0 : _context_store.getState()
                   }
                 ];
             }

package/dist/esm/ssr/react/prerender/util.js

@@ -46,9 +46,8 @@ export var aggKeysFromPropsList = function aggKeysFromPropsList2(propsList, prop
     return usefulObject(props[propName]);
   }).reduce(function(result, next) {
     REQUEST_META.forEach(function(key) {
-      var _prop;
       var prop = next[propName];
-      if (((_prop = prop) === null || _prop === void 0 ? void 0 : _prop.hasOwnProperty(key)) && usefulArray(prop[key])) {
+      if ((prop === null || prop === void 0 ? void 0 : prop.hasOwnProperty(key)) && usefulArray(prop[key])) {
         result[key] = unique(result[key].concat(prop[key]));
       }
     });
@@ -73,9 +72,8 @@ export var aggMatchesFromPropsList = function aggMatchesFromPropsList2(propsList
     return usefulObject(props[propName]);
   }).reduce(function(result, next) {
     REQUEST_META.forEach(function(key) {
-      var _prop;
       var prop = next[propName];
-      if (((_prop = prop) === null || _prop === void 0 ? void 0 : _prop.hasOwnProperty(key)) && usefulObject(prop[key])) {
+      if ((prop === null || prop === void 0 ? void 0 : prop.hasOwnProperty(key)) && usefulObject(prop[key])) {
         result[key] = Object.assign(result[key], prop[key]);
       }
     });

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

@@ -1,5 +1,5 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import { serializeJson } from "@modern-js/utils/runtime-node";
+import { serializeJson } from "@modern-js/runtime-utils/node";
 import { attributesToString } from "../utils";
 import { buildTemplate } from "./buildTemplate.share";
 export function buildShellAfterTemplate(afterAppTemplate, options) {

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

@@ -1,7 +1,7 @@
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import ReactHelmet from "react-helmet";
-import { matchRoutes } from "@modern-js/utils/runtime/router";
+import { matchRoutes } from "@modern-js/runtime-utils/router";
 import helmetReplace from "../helmet";
 import { CSS_CHUNKS_PLACEHOLDER } from "../utils";
 import { HEAD_REG_EXP, buildTemplate } from "./buildTemplate.share";
@@ -9,7 +9,6 @@ function getHeadTemplate(beforeEntryTemplate, context) {
   var injectCss = function injectCss2(headTemplate2) {
     return headTemplate2.replace(CSS_CHUNKS_PLACEHOLDER, getCssChunks());
     function getCssChunks() {
-      var _matches;
       var routeManifest = context.routeManifest, routerContext = context.routerContext, routes = context.routes;
       if (!routeManifest || !routerContext || !routes) {
         return "";
@@ -17,7 +16,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
       var routeAssets = routeManifest.routeAssets;
       var cssChunks = [];
       var matches = matchRoutes(routes, routerContext.location, routerContext.basename);
-      (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.forEach(function(match, index) {
+      matches === null || matches === void 0 ? void 0 : matches.forEach(function(match, index) {
         if (!index) {
           return;
         }
@@ -28,8 +27,7 @@ function getHeadTemplate(beforeEntryTemplate, context) {
             var _cssChunks;
             var _routeManifest_referenceCssAssets = routeManifest2.referenceCssAssets, referenceCssAssets = _routeManifest_referenceCssAssets === void 0 ? [] : _routeManifest_referenceCssAssets;
             var _cssChunks1 = referenceCssAssets.filter(function(asset) {
-              var _asset;
-              return ((_asset = asset) === null || _asset === void 0 ? void 0 : _asset.endsWith(".css")) && !headTemplate2.includes(asset);
+              return (asset === null || asset === void 0 ? void 0 : asset.endsWith(".css")) && !headTemplate2.includes(asset);
             });
             (_cssChunks = cssChunks).push.apply(_cssChunks, _to_consumable_array(_cssChunks1));
           }

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

@@ -1,8 +1,8 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { createElement } from "react";
-import { run } from "@modern-js/utils/runtime-node";
-import { time } from "@modern-js/utils/universal/time";
+import { run } from "@modern-js/runtime-utils/node";
+import { time } from "@modern-js/runtime-utils/time";
 import { PreRender } from "../../react/prerender";
 import { SSRErrors, SSRTimings } from "../tracker";
 import renderToPipe from "./renderToPipe";

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

@@ -16,18 +16,17 @@ function renderToPipe(rootElement, context, options) {
   var chunkVec = [];
   var forUserPipe = function(stream) {
     return new Promise(function(resolve) {
-      var _ssrContext;
       var renderToPipeableStream;
       try {
         renderToPipeableStream = require("react-dom/server").renderToPipeableStream;
       } catch (e) {
       }
       var pipe = renderToPipeableStream(rootElement, _object_spread_props(_object_spread({}, options), {
-        nonce: (_ssrContext = ssrContext) === null || _ssrContext === void 0 ? void 0 : _ssrContext.nonce,
+        nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
         onShellReady: function onShellReady() {
-          var _options_onShellReady, _options;
+          var _options_onShellReady;
           var _getTemplates = getTemplates(context, RenderLevel.SERVER_RENDER), shellAfter = _getTemplates.shellAfter, shellBefore = _getTemplates.shellBefore;
-          (_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);
           var injectableTransform = new Transform({
             transform: function transform(chunk, _encoding, callback) {
               try {
@@ -55,11 +54,11 @@ function renderToPipe(rootElement, context, options) {
           resolve(pipe(injectableTransform).pipe(stream));
         },
         onShellError: function onShellError(error) {
-          var _options_onShellError, _options;
+          var _options_onShellError;
           var _getTemplates = getTemplates(context, RenderLevel.CLIENT_RENDER), shellAfter = _getTemplates.shellAfter, shellBefore = _getTemplates.shellBefore;
           var fallbackHtml = "".concat(shellBefore).concat(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);
         }
       })).pipe;
     });

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

@@ -17,7 +17,7 @@ function renderToPipe(rootElement, context, options) {
   var ssrContext = context.ssrContext;
   var forUserPipe = function() {
     var _ref = _async_to_generator(function() {
-      var renderToReadableStream, _getTemplates, shellAfter, shellBefore, _ssrContext, readableOriginal, reader, injectableStream, err, _ssrContext1, _getTemplates1, shellAfter1, shellBefore1, fallbackHtml;
+      var renderToReadableStream, _getTemplates, shellAfter, shellBefore, readableOriginal, reader, injectableStream, err, _getTemplates1, shellAfter1, shellBefore1, fallbackHtml;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
@@ -37,10 +37,10 @@ function renderToPipe(rootElement, context, options) {
             return [
               4,
               renderToReadableStream(rootElement, _object_spread_props(_object_spread({}, options), {
-                nonce: (_ssrContext = ssrContext) === null || _ssrContext === void 0 ? void 0 : _ssrContext.nonce,
+                nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
                 onError: function 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);
                 }
               }))
             ];
@@ -100,7 +100,7 @@ function renderToPipe(rootElement, context, options) {
             ];
           case 3:
             err = _state.sent();
-            (_ssrContext1 = ssrContext) === null || _ssrContext1 === void 0 ? void 0 : _ssrContext1.tracker.trackError(SSRErrors.RENDER_SHELL, err);
+            ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.tracker.trackError(SSRErrors.RENDER_SHELL, err);
             _getTemplates1 = getTemplates(context, RenderLevel.CLIENT_RENDER), shellAfter1 = _getTemplates1.shellAfter, shellBefore1 = _getTemplates1.shellBefore;
             fallbackHtml = "".concat(shellBefore1).concat(shellAfter1);
             return [

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

@@ -6,9 +6,9 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import React from "react";
-import { serializeJson } from "@modern-js/utils/runtime-node";
+import { serializeJson } from "@modern-js/runtime-utils/node";
 import ReactHelmet from "react-helmet";
-import { time } from "@modern-js/utils/universal/time";
+import { time } from "@modern-js/runtime-utils/time";
 import { serializeErrors } from "../../../router/runtime/utils";
 import helmetReplace from "../helmet";
 import { RenderLevel } from "../types";

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

@@ -1,7 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { run } from "@modern-js/utils/runtime-node";
-import { time } from "@modern-js/utils/universal/time";
+import { run } from "@modern-js/runtime-utils/node";
+import { time } from "@modern-js/runtime-utils/time";
 import { PreRender } from "../../react/prerender";
 import { SSRTimings } from "../tracker";
 import SSREntry from "./entry";

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-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);
     }
   }