@modern-js/runtime 2.21.0 → 2.22.0

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "buildShellAfterTemplate", {
   enumerable: true,
-  get: () => buildShellAfterTemplate
+  get: function() {
+    return buildShellAfterTemplate;
+  }
 });
 const _runtimenode = require("@modern-js/utils/runtime-node");
 const _utils = require("../utils");

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

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  HEAD_REG_EXP: () => HEAD_REG_EXP,
-  buildTemplate: () => buildTemplate
+  HEAD_REG_EXP: function() {
+    return HEAD_REG_EXP;
+  },
+  buildTemplate: function() {
+    return buildTemplate;
+  }
 });
 const HEAD_REG_EXP = /<head(.|\n)*>(.|\n)*<\/head>/;
 function buildTemplate(template, callbacks) {

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "buildShellBeforeTemplate", {
   enumerable: true,
-  get: () => buildShellBeforeTemplate
+  get: function() {
+    return buildShellBeforeTemplate;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _reacthelmet = /* @__PURE__ */ _interop_require_default._(require("react-helmet"));

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "render", {
   enumerable: true,
-  get: () => render
+  get: function() {
+    return render;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _react = require("react");

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "getLoadableChunks", {
   enumerable: true,
-  get: () => getLoadableChunks
+  get: function() {
+    return getLoadableChunks;
+  }
 });
 const _server = require("@loadable/server");
 function getLoadableChunks({ context, jsx }) {

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
   enumerable: true,
-  get: () => _default
+  get: function() {
+    return _default;
+  }
 });
 const _stream = require("stream");
 const _types = require("../types");

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
   enumerable: true,
-  get: () => _default
+  get: function() {
+    return _default;
+  }
 });
 const _types = require("../types");
 const _common = require("../../../common");

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "getStyledComponentCss", {
   enumerable: true,
-  get: () => getStyledComponentCss
+  get: function() {
+    return getStyledComponentCss;
+  }
 });
 const _styledcomponents = require("styled-components");
 function getStyledComponentCss({ jsx }) {

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "getTemplates", {
   enumerable: true,
-  get: () => getTemplates
+  get: function() {
+    return getTemplates;
+  }
 });
 const _buildTemplateafter = require("./buildTemplate.after");
 const _bulidTemplatebefore = require("./bulidTemplate.before");

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
   enumerable: true,
-  get: () => Entry
+  get: function() {
+    return Entry;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "render", {
   enumerable: true,
-  get: () => render
+  get: function() {
+    return render;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _runtimenode = require("@modern-js/utils/runtime-node");

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "toHtml", {
   enumerable: true,
-  get: () => toHtml
+  get: function() {
+    return toHtml;
+  }
 });
 const _server = require("@loadable/server");
 const _utils = require("../../utils");

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "reduce", {
   enumerable: true,
-  get: () => reduce
+  get: function() {
+    return reduce;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _react = /* @__PURE__ */ _interop_require_default._(require("react"));

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "toHtml", {
   enumerable: true,
-  get: () => toHtml
+  get: function() {
+    return toHtml;
+  }
 });
 const _styledcomponents = require("styled-components");
 const toHtml = (jsx, renderer, next) => {

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

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  Fragment: () => Fragment,
-  toFragments: () => toFragments
+  Fragment: function() {
+    return Fragment;
+  },
+  toFragments: function() {
+    return toFragments;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 const VARIABLE_REG_EXP = /<!--<\?([-=+])\s*(.*?)\s*\?>-->/;

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "RenderLevel", {
   enumerable: true,
-  get: () => RenderLevel
+  get: function() {
+    return RenderLevel;
+  }
 });
 var RenderLevel;
 (function(RenderLevel2) {

package/dist/cjs/ssr/serverRender/time.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "time", {
   enumerable: true,
-  get: () => time
+  get: function() {
+    return time;
+  }
 });
 const getLatency = (hrtime) => {
   const [s, ns] = process.hrtime(hrtime);

package/dist/cjs/ssr/serverRender/time.worker.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "time", {
   enumerable: true,
-  get: () => time
+  get: function() {
+    return time;
+  }
 });
 function processHrtime(previousTimestamp) {
   const now = (/* @__PURE__ */ new Date()).getTime();

package/dist/cjs/ssr/serverRender/types.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "RenderLevel", {
   enumerable: true,
-  get: () => _type.RenderLevel
+  get: function() {
+    return _type.RenderLevel;
+  }
 });
 const _type = require("./renderToString/type");

package/dist/cjs/ssr/serverRender/utils.js

@@ -10,11 +10,21 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  CSS_CHUNKS_PLACEHOLDER: () => CSS_CHUNKS_PLACEHOLDER,
-  SSR_DATA_JSON_ID: () => SSR_DATA_JSON_ID,
-  ROUTER_DATA_JSON_ID: () => ROUTER_DATA_JSON_ID,
-  getLoadableScripts: () => getLoadableScripts,
-  attributesToString: () => attributesToString
+  CSS_CHUNKS_PLACEHOLDER: function() {
+    return CSS_CHUNKS_PLACEHOLDER;
+  },
+  SSR_DATA_JSON_ID: function() {
+    return SSR_DATA_JSON_ID;
+  },
+  ROUTER_DATA_JSON_ID: function() {
+    return ROUTER_DATA_JSON_ID;
+  },
+  getLoadableScripts: function() {
+    return getLoadableScripts;
+  },
+  attributesToString: function() {
+    return attributesToString;
+  }
 });
 const CSS_CHUNKS_PLACEHOLDER = "<!--<?- chunksMap.css ?>-->";
 const SSR_DATA_JSON_ID = "__MODERN_SSR_DATA__";

package/dist/cjs/ssr/utils.js

@@ -10,11 +10,21 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  isReact18: () => isReact18,
-  formatServer: () => formatServer,
-  formatClient: () => formatClient,
-  mockResponse: () => mockResponse,
-  isCrossOrigin: () => isCrossOrigin
+  isReact18: function() {
+    return isReact18;
+  },
+  formatServer: function() {
+    return formatServer;
+  },
+  formatClient: function() {
+    return formatClient;
+  },
+  mockResponse: function() {
+    return mockResponse;
+  },
+  isCrossOrigin: function() {
+    return isCrossOrigin;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _cookie = /* @__PURE__ */ _interop_require_default._(require("cookie"));

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
   enumerable: true,
-  get: () => _default
+  get: function() {
+    return _default;
+  }
 });
 const _utils = require("@modern-js/utils");
 const PLUGIN_IDENTIFIER = "state";

package/dist/cjs/state/index.js

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  state: () => _runtime.default,
-  default: () => _runtime.default
+  state: function() {
+    return _runtime.default;
+  },
+  default: function() {
+    return _runtime.default;
+  }
 });
 const _export_star = require("@swc/helpers/_/_export_star");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");

package/dist/cjs/state/plugins.js

@@ -10,10 +10,18 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  devtools: () => _plugindevtools.default,
-  effects: () => effects,
-  immer: () => immer,
-  autoActions: () => autoActions
+  devtools: function() {
+    return _plugindevtools.default;
+  },
+  effects: function() {
+    return effects;
+  },
+  immer: function() {
+    return immer;
+  },
+  autoActions: function() {
+    return autoActions;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _plugineffects = require("@modern-js-reduck/plugin-effects");

package/dist/cjs/state/runtime/index.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
   enumerable: true,
-  get: () => _plugin.default
+  get: function() {
+    return _plugin.default;
+  }
 });
 const _export_star = require("@swc/helpers/_/_export_star");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
   enumerable: true,
-  get: () => _default
+  get: function() {
+    return _default;
+  }
 });
 const _export_star = require("@swc/helpers/_/_export_star");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");

package/dist/esm/cli/index.js

@@ -43,6 +43,14 @@ export default function() {
               globalVars: {
                 "process.env.IS_REACT18": process.env.IS_REACT18
               }
+            },
+            tools: {
+              styledComponents: {
+                // https://github.com/styled-components/babel-plugin-styled-components/issues/287
+                topLevelImportPaths: [
+                  "@modern-js/runtime/styled"
+                ]
+              }
             }
           };
         },

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

@@ -1,9 +1,11 @@
 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 { useContext } from "react";
 import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "@modern-js/utils/runtime/router";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { parsedJSONFromElement } from "@modern-js/utils/runtime-browser";
+import { RuntimeReactContext } from "../../core";
 import { modifyRoutes as modifyRoutesHook } from "./hooks";
 import { deserializeErrors, renderRoutes, urlJoin } from "./utils";
 export var finalRouteConfig = {
@@ -83,6 +85,8 @@ export var routerPlugin = function(param) {
                 basename: _basename,
                 hydrationData: hydrationData
               });
+              var runtimeContext = useContext(RuntimeReactContext);
+              runtimeContext.remixRouter = router;
               return /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {
                 children: /* @__PURE__ */ _jsx(RouterProvider, {
                   router: router
@@ -102,6 +106,22 @@ export var routerPlugin = function(param) {
           return next({
             App: RouteApp
           });
+        },
+        pickContext: function(param2, next) {
+          var context = param2.context, pickedContext = param2.pickedContext;
+          var remixRouter = context.remixRouter;
+          var router = {
+            navigate: remixRouter.navigate,
+            get location() {
+              return remixRouter.state.location;
+            }
+          };
+          return next({
+            context: context,
+            pickedContext: _object_spread_props(_object_spread({}, pickedContext), {
+              router: router
+            })
+          });
         }
       };
     }

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

@@ -123,7 +123,7 @@ export var routerPlugin = function(param) {
                     ];
                   }
                   router = createStaticRouter(routes, routerContext);
-                  context.router = router;
+                  context.remixRouter = router;
                   context.routerContext = routerContext;
                   context.routes = routes;
                   context.routeManifest = context.ssrContext.routeManifest;
@@ -148,10 +148,10 @@ export var routerPlugin = function(param) {
           }
           var getRouteApp = function() {
             return function(props) {
-              var _useContext = useContext(RuntimeReactContext), router = _useContext.router, routerContext = _useContext.routerContext;
+              var _useContext = useContext(RuntimeReactContext), remixRouter = _useContext.remixRouter, routerContext = _useContext.routerContext;
               return /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {
                 children: /* @__PURE__ */ _jsx(StaticRouterProvider, {
-                  router: router,
+                  router: remixRouter,
                   context: routerContext,
                   hydrate: false
                 })
@@ -167,6 +167,22 @@ export var routerPlugin = function(param) {
           return next({
             App: RouteApp
           });
+        },
+        pickContext: function(param2, next) {
+          var context = param2.context, pickedContext = param2.pickedContext;
+          var remixRouter = context.remixRouter;
+          var router = {
+            navigate: remixRouter.navigate,
+            get location() {
+              return remixRouter.state.location;
+            }
+          };
+          return next({
+            context: context,
+            pickedContext: _object_spread_props(_object_spread({}, pickedContext), {
+              router: router
+            })
+          });
         }
       };
     }

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

@@ -1,3 +1,5 @@
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import path from "path";
 import { getEntryOptions, SERVER_RENDER_FUNCTION_NAME, LOADABLE_STATS_FILE, isUseSSRBundle, createRuntimeExportsUtils, isSSGEntry } from "@modern-js/utils";
 var PLUGIN_IDENTIFIER = "ssr";
@@ -137,11 +139,17 @@ export default function() {
           };
         },
         modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
-          var entrypoint = param.entrypoint, plugins = param.plugins;
+          var entrypoint = param.entrypoint, plugins = param.plugins, bundlerConfigs = param.bundlerConfigs;
           if (ssrConfigMap.get(entrypoint.entryName)) {
+            var _bundlerConfigs_find, _bundlerConfigs_find_output;
+            var chunkLoadingGlobal = (_bundlerConfigs_find = bundlerConfigs === null || bundlerConfigs === void 0 ? void 0 : bundlerConfigs.find(function(config) {
+              return config.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;
             plugins.push({
               name: PLUGIN_IDENTIFIER,
-              options: JSON.stringify(ssrConfigMap.get(entrypoint.entryName))
+              options: JSON.stringify(_object_spread_props(_object_spread({}, ssrConfigMap.get(entrypoint.entryName) || {}), {
+                chunkLoadingGlobal: chunkLoadingGlobal
+              }))
             });
           }
           return {

package/dist/esm/ssr/index.js

@@ -29,6 +29,9 @@ export var ssr = function(config) {
                   context: context
                 }));
               } else if (renderLevel === RenderLevel.SERVER_RENDER) {
+                var loadableReadyOptions = {
+                  chunkLoadingGlobal: config.chunkLoadingGlobal
+                };
                 if (isReact18()) {
                   loadableReady(function() {
                     var SSRApp = function() {
@@ -41,13 +44,13 @@ export var ssr = function(config) {
                     };
                     SSRApp = hoistNonReactStatics(SSRApp, App);
                     ModernHydrate(/* @__PURE__ */ _jsx(SSRApp, {}));
-                  });
+                  }, loadableReadyOptions);
                 } else {
                   loadableReady(function() {
                     ModernHydrate(/* @__PURE__ */ _jsx(App, {
                       context: hydrateContext
                     }), callback);
-                  });
+                  }, loadableReadyOptions);
                 }
               } else {
                 console.warn("unknow render level: ".concat(renderLevel, ", execute render()"));

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

@@ -40,6 +40,14 @@ export default () => ({
             globalVars: {
               "process.env.IS_REACT18": process.env.IS_REACT18
             }
+          },
+          tools: {
+            styledComponents: {
+              // https://github.com/styled-components/babel-plugin-styled-components/issues/287
+              topLevelImportPaths: [
+                "@modern-js/runtime/styled"
+              ]
+            }
           }
         };
       },

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

@@ -1,7 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { useContext } from "react";
 import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "@modern-js/utils/runtime/router";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { parsedJSONFromElement } from "@modern-js/utils/runtime-browser";
+import { RuntimeReactContext } from "../../core";
 import { modifyRoutes as modifyRoutesHook } from "./hooks";
 import { deserializeErrors, renderRoutes, urlJoin } from "./utils";
 export let finalRouteConfig = {
@@ -75,6 +77,8 @@ export const routerPlugin = ({ serverBase = [], supportHtml5History = true, base
                 basename: _basename,
                 hydrationData
               });
+              const runtimeContext = useContext(RuntimeReactContext);
+              runtimeContext.remixRouter = router;
               return /* @__PURE__ */ _jsx(App, {
                 ...props,
                 children: /* @__PURE__ */ _jsx(RouterProvider, {
@@ -95,6 +99,22 @@ export const routerPlugin = ({ serverBase = [], supportHtml5History = true, base
           return next({
             App: RouteApp
           });
+        },
+        pickContext: ({ context, pickedContext }, next) => {
+          const { remixRouter } = context;
+          const router = {
+            navigate: remixRouter.navigate,
+            get location() {
+              return remixRouter.state.location;
+            }
+          };
+          return next({
+            context,
+            pickedContext: {
+              ...pickedContext,
+              router
+            }
+          });
         }
       };
     }

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

@@ -65,7 +65,7 @@ export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
             return routerContext;
           }
           const router = createStaticRouter(routes, routerContext);
-          context.router = router;
+          context.remixRouter = router;
           context.routerContext = routerContext;
           context.routes = routes;
           context.routeManifest = context.ssrContext.routeManifest;
@@ -83,11 +83,11 @@ export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
           }
           const getRouteApp = () => {
             return (props) => {
-              const { router, routerContext } = useContext(RuntimeReactContext);
+              const { remixRouter, routerContext } = useContext(RuntimeReactContext);
               return /* @__PURE__ */ _jsx(App, {
                 ...props,
                 children: /* @__PURE__ */ _jsx(StaticRouterProvider, {
-                  router,
+                  router: remixRouter,
                   context: routerContext,
                   hydrate: false
                 })
@@ -103,6 +103,22 @@ export const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
           return next({
             App: RouteApp
           });
+        },
+        pickContext: ({ context, pickedContext }, next) => {
+          const { remixRouter } = context;
+          const router = {
+            navigate: remixRouter.navigate,
+            get location() {
+              return remixRouter.state.location;
+            }
+          };
+          return next({
+            context,
+            pickedContext: {
+              ...pickedContext,
+              router
+            }
+          });
         }
       };
     }

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

@@ -114,11 +114,16 @@ export default () => {
             imports
           };
         },
-        modifyEntryRuntimePlugins({ entrypoint, plugins }) {
+        modifyEntryRuntimePlugins({ entrypoint, plugins, bundlerConfigs }) {
           if (ssrConfigMap.get(entrypoint.entryName)) {
+            var _bundlerConfigs_find, _bundlerConfigs_find_output;
+            const chunkLoadingGlobal = (_bundlerConfigs_find = bundlerConfigs === null || bundlerConfigs === void 0 ? void 0 : bundlerConfigs.find((config) => config.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;
             plugins.push({
               name: PLUGIN_IDENTIFIER,
-              options: JSON.stringify(ssrConfigMap.get(entrypoint.entryName))
+              options: JSON.stringify({
+                ...ssrConfigMap.get(entrypoint.entryName) || {},
+                chunkLoadingGlobal
+              })
             });
           }
           return {