@modern-js/runtime 2.17.0 → 2.18.0

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

@@ -12,7 +12,7 @@ function _array_with_holes(arr) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -164,7 +164,7 @@ export function getRouteComponents(routes, param) {
       return /* @__PURE__ */ _jsx(Component, _object_spread({}, props2));
     }
     return /* @__PURE__ */ _jsx(GlobalLayout, _object_spread({
-      Component
+      Component: Component
     }, props2));
   };
   var routeElements = [];
@@ -175,7 +175,7 @@ export function getRouteComponents(routes, param) {
       if (route.type === "nested") {
         var routeElement = renderNestedRoute(route, {
           DeferredDataComponent: ssrMode === "stream" ? DeferredDataScripts : void 0,
-          props
+          props: props
         });
         routeElements.push(routeElement);
       } else {
@@ -218,9 +218,9 @@ export function renderRoutes(param) {
     return null;
   }
   var routeElements = getRouteComponents(routes, {
-    globalApp,
-    ssrMode,
-    props
+    globalApp: globalApp,
+    ssrMode: ssrMode,
+    props: props
   });
   return routeElements;
 }

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

@@ -1,7 +1,7 @@
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -58,9 +58,9 @@ export var withRouter = function(Component) {
     var params = useParams();
     var navigate = useNavigate();
     return /* @__PURE__ */ _jsx(Component, _object_spread_props(_object_spread({}, props), {
-      location,
-      params,
-      navigate
+      location: location,
+      params: params,
+      navigate: navigate
     }));
   };
 };

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

@@ -48,16 +48,31 @@ export default function() {
         config: function config() {
           var appContext = api.useAppContext();
           pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
+          var userConfig = api.useResolvedConfigContext();
           var _api_useAppContext = api.useAppContext(), _api_useAppContext_bundlerType = _api_useAppContext.bundlerType, bundlerType = _api_useAppContext_bundlerType === void 0 ? "webpack" : _api_useAppContext_bundlerType;
-          var babelConfig = bundlerType === "webpack" ? function(config2) {
-            var _config_plugins;
-            (_config_plugins = config2.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
-            var userConfig = api.useResolvedConfigContext();
-            if (isUseSSRBundle(userConfig) && hasStringSSREntry(userConfig)) {
-              var _config_plugins1;
-              (_config_plugins1 = config2.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
+          var babelConfig = function() {
+            if (bundlerType === "webpack") {
+              return function(config2) {
+                var _config_plugins;
+                (_config_plugins = config2.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
+                if (isUseSSRBundle(userConfig) && hasStringSSREntry(userConfig)) {
+                  var _config_plugins1;
+                  (_config_plugins1 = config2.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
+                }
+              };
+            } else if (bundlerType === "rspack") {
+              if (isUseSSRBundle(userConfig)) {
+                return function(config2) {
+                  var _config_plugins;
+                  (_config_plugins = config2.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
+                  if (hasStringSSREntry(userConfig)) {
+                    var _config_plugins1;
+                    (_config_plugins1 = config2.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
+                  }
+                };
+              }
             }
-          } : void 0;
+          }();
           return {
             source: {
               alias: {
@@ -71,12 +86,12 @@ export default function() {
               }
             },
             tools: {
-              webpackChain: function(chain, param) {
+              bundlerChain: function bundlerChain(chain, param) {
                 var isServer = param.isServer, isServiceWorker = param.isServiceWorker, CHAIN_ID = param.CHAIN_ID;
-                var userConfig = api.useResolvedConfigContext();
-                if (isUseSSRBundle(userConfig) && !isServer && !isServiceWorker && hasStringSSREntry(userConfig)) {
-                  var LoadableWebpackPlugin = require("@loadable/webpack-plugin");
-                  chain.plugin(CHAIN_ID.PLUGIN.LOADABLE).use(LoadableWebpackPlugin, [
+                var userConfig2 = api.useResolvedConfigContext();
+                if (isUseSSRBundle(userConfig2) && !isServer && !isServiceWorker && hasStringSSREntry(userConfig2)) {
+                  var LoadableBundlerPlugin = require("./loadable-bundler-plugin.js");
+                  chain.plugin(CHAIN_ID.PLUGIN.LOADABLE).use(LoadableBundlerPlugin, [
                     {
                       filename: LOADABLE_STATS_FILE
                     }
@@ -117,8 +132,8 @@ export default function() {
             });
           }
           return {
-            entrypoint,
-            imports
+            entrypoint: entrypoint,
+            imports: imports
           };
         },
         modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
@@ -130,15 +145,15 @@ export default function() {
             });
           }
           return {
-            entrypoint,
-            plugins
+            entrypoint: entrypoint,
+            plugins: plugins
           };
         },
         modifyEntryExport: function modifyEntryExport(param) {
           var entrypoint = param.entrypoint, exportStatement = param.exportStatement;
           if (ssrConfigMap.get(entrypoint.entryName)) {
             return {
-              entrypoint,
+              entrypoint: entrypoint,
               exportStatement: [
                 "export function ".concat(SERVER_RENDER_FUNCTION_NAME, "(context) {\n              return bootstrap(AppWrapper, context)\n            }"),
                 exportStatement
@@ -146,8 +161,8 @@ export default function() {
             };
           }
           return {
-            entrypoint,
-            exportStatement
+            entrypoint: entrypoint,
+            exportStatement: exportStatement
           };
         }
       };

package/dist/esm/ssr/cli/loadable-bundler-plugin.js

@@ -0,0 +1,209 @@
+function _array_like_to_array(arr, len) {
+  if (len == null || len > arr.length)
+    len = arr.length;
+  for (var i = 0, arr2 = new Array(len); i < len; i++)
+    arr2[i] = arr[i];
+  return arr2;
+}
+function _array_without_holes(arr) {
+  if (Array.isArray(arr))
+    return _array_like_to_array(arr);
+}
+function _class_call_check(instance, Constructor) {
+  if (!(instance instanceof Constructor)) {
+    throw new TypeError("Cannot call a class as a function");
+  }
+}
+function _defineProperties(target, props) {
+  for (var i = 0; i < props.length; i++) {
+    var descriptor = props[i];
+    descriptor.enumerable = descriptor.enumerable || false;
+    descriptor.configurable = true;
+    if ("value" in descriptor)
+      descriptor.writable = true;
+    Object.defineProperty(target, descriptor.key, descriptor);
+  }
+}
+function _create_class(Constructor, protoProps, staticProps) {
+  if (protoProps)
+    _defineProperties(Constructor.prototype, protoProps);
+  if (staticProps)
+    _defineProperties(Constructor, staticProps);
+  return Constructor;
+}
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+function _iterable_to_array(iter) {
+  if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null)
+    return Array.from(iter);
+}
+function _non_iterable_spread() {
+  throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _object_spread(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i] != null ? arguments[i] : {};
+    var ownKeys2 = Object.keys(source);
+    if (typeof Object.getOwnPropertySymbols === "function") {
+      ownKeys2 = ownKeys2.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+        return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+      }));
+    }
+    ownKeys2.forEach(function(key) {
+      _define_property(target, key, source[key]);
+    });
+  }
+  return target;
+}
+function ownKeys(object, enumerableOnly) {
+  var keys = Object.keys(object);
+  if (Object.getOwnPropertySymbols) {
+    var symbols = Object.getOwnPropertySymbols(object);
+    if (enumerableOnly) {
+      symbols = symbols.filter(function(sym) {
+        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+      });
+    }
+    keys.push.apply(keys, symbols);
+  }
+  return keys;
+}
+function _object_spread_props(target, source) {
+  source = source != null ? source : {};
+  if (Object.getOwnPropertyDescriptors) {
+    Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+  } else {
+    ownKeys(Object(source)).forEach(function(key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
+  }
+  return target;
+}
+function _to_consumable_array(arr) {
+  return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
+}
+function _unsupported_iterable_to_array(o, minLen) {
+  if (!o)
+    return;
+  if (typeof o === "string")
+    return _array_like_to_array(o, minLen);
+  var n = Object.prototype.toString.call(o).slice(8, -1);
+  if (n === "Object" && o.constructor)
+    n = o.constructor.name;
+  if (n === "Map" || n === "Set")
+    return Array.from(n);
+  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))
+    return _array_like_to_array(o, minLen);
+}
+import path from "path";
+import { fs } from "@modern-js/utils";
+var LoadablePlugin = /* @__PURE__ */ function() {
+  "use strict";
+  function LoadablePlugin2() {
+    var _ref = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {
+      filename: "loadable-stats.json",
+      outputAsset: true,
+      chunkLoadingGlobal: "__LOADABLE_LOADED_CHUNKS__"
+    }, _ref_filename = _ref.filename, filename = _ref_filename === void 0 ? "loadable-stats.json" : _ref_filename, path2 = _ref.path, writeToDisk = _ref.writeToDisk, _ref_outputAsset = _ref.outputAsset, outputAsset = _ref_outputAsset === void 0 ? true : _ref_outputAsset, _ref_chunkLoadingGlobal = _ref.chunkLoadingGlobal, chunkLoadingGlobal = _ref_chunkLoadingGlobal === void 0 ? "__LOADABLE_LOADED_CHUNKS__" : _ref_chunkLoadingGlobal;
+    _class_call_check(this, LoadablePlugin2);
+    _define_property(this, "opts", void 0);
+    _define_property(this, "compiler", void 0);
+    this.opts = {
+      filename: filename,
+      path: path2,
+      writeToDisk: writeToDisk,
+      outputAsset: outputAsset,
+      chunkLoadingGlobal: chunkLoadingGlobal
+    };
+    this.compiler = null;
+  }
+  _create_class(LoadablePlugin2, [
+    {
+      key: "apply",
+      value: function apply(compiler) {
+        var _this = this;
+        this.compiler = compiler;
+        compiler.options.output.chunkLoadingGlobal = this.opts.chunkLoadingGlobal;
+        if (this.opts.outputAsset || this.opts.writeToDisk) {
+          compiler.hooks.make.tap(LoadablePlugin2.name, function(compilation) {
+            compilation.hooks.processAssets.tap({
+              name: LoadablePlugin2.name,
+              stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_REPORT
+            }, function() {
+              var asset = _this.handleEmit(compilation);
+              if (asset) {
+                compilation.emitAsset(_this.opts.filename, asset);
+              }
+            });
+          });
+        }
+      }
+    },
+    {
+      key: "handleEmit",
+      value: function handleEmit(compilation) {
+        var stats = compilation.getStats().toJson({
+          all: false,
+          assets: true,
+          // rspack not support cachedAssets,
+          cachedAssets: true,
+          chunks: true,
+          chunkGroups: true,
+          entrypoints: true,
+          // rspack not support chunkGroupChildren.
+          chunkGroupChildren: true,
+          hash: true,
+          ids: true,
+          outputPath: true,
+          publicPath: true
+        });
+        var output = _object_spread_props(_object_spread({}, stats), {
+          generator: "loadable-components",
+          chunks: _to_consumable_array(stats.chunks || []).map(function(chunk) {
+            return {
+              id: chunk.id,
+              files: _to_consumable_array(chunk.files || [])
+            };
+          })
+        });
+        var result = JSON.stringify(output, null, 2);
+        if (this.opts.writeToDisk) {
+          this.writeAssetsFile(result);
+        }
+        if (this.opts.outputAsset) {
+          return {
+            source: function source() {
+              return result;
+            },
+            size: function size() {
+              return result.length;
+            }
+          };
+        }
+        return null;
+      }
+    },
+    {
+      key: "writeAssetsFile",
+      value: function writeAssetsFile(manifest) {
+        var _this_compiler;
+        var outputFolder = (_this_compiler = this.compiler) === null || _this_compiler === void 0 ? void 0 : _this_compiler.options.output.path;
+        var outputFile = path.resolve(outputFolder || "", this.opts.filename);
+        fs.outputFileSync(outputFile, manifest);
+      }
+    }
+  ]);
+  return LoadablePlugin2;
+}();
+module.exports = LoadablePlugin;

package/dist/esm/ssr/index.js

@@ -30,7 +30,7 @@ function _async_to_generator(fn) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -205,14 +205,14 @@ export var ssr = function(config) {
             function stringSSRHydrate() {
               if (renderLevel === RenderLevel.CLIENT_RENDER || renderLevel === RenderLevel.SERVER_PREFETCH) {
                 ModernRender(/* @__PURE__ */ _jsx(App, {
-                  context
+                  context: context
                 }));
               } else if (renderLevel === RenderLevel.SERVER_RENDER) {
                 if (isReact18()) {
                   loadableReady(function() {
                     var SSRApp = function() {
                       return /* @__PURE__ */ _jsx(WithCallback, {
-                        callback,
+                        callback: callback,
                         children: /* @__PURE__ */ _jsx(App, {
                           context: hydrateContext
                         })
@@ -231,7 +231,7 @@ export var ssr = function(config) {
               } else {
                 console.warn("unknow render level: ".concat(renderLevel, ", execute render()"));
                 ModernRender(/* @__PURE__ */ _jsx(App, {
-                  context
+                  context: context
                 }));
               }
             }
@@ -239,7 +239,7 @@ export var ssr = function(config) {
               if (renderLevel === RenderLevel.SERVER_RENDER) {
                 var SSRApp = function() {
                   return /* @__PURE__ */ _jsx(WithCallback, {
-                    callback,
+                    callback: callback,
                     children: /* @__PURE__ */ _jsx(App, {
                       context: hydrateContext
                     })
@@ -249,7 +249,7 @@ export var ssr = function(config) {
                 ModernHydrate(/* @__PURE__ */ _jsx(SSRApp, {}));
               } else {
                 ModernRender(/* @__PURE__ */ _jsx(App, {
-                  context
+                  context: context
                 }));
               }
             }
@@ -291,13 +291,13 @@ export var ssr = function(config) {
               request: formatClient({})
             });
             return next({
-              context
+              context: context
             });
           }
           context.ssrContext.response = mockResp;
           context.ssrContext.request = formatClient(request);
           return next({
-            context
+            context: context
           });
         },
         pickContext: function(param, next) {
@@ -307,17 +307,17 @@ export var ssr = function(config) {
           var initialData = context.initialData;
           if (!request) {
             return next({
-              context,
+              context: context,
               pickedContext: _object_spread_props(_object_spread({}, pickedContext), {
-                initialData
+                initialData: initialData
               })
             });
           }
           return next({
-            context,
+            context: context,
             pickedContext: _object_spread_props(_object_spread({}, pickedContext), {
-              initialData,
-              request,
+              initialData: initialData,
+              request: request,
               response: mockResp
             })
           });

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

@@ -30,7 +30,7 @@ function _async_to_generator(fn) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -199,9 +199,9 @@ export var ssr = function() {
                   return [
                     4,
                     render({
-                      context,
-                      App,
-                      config
+                      context: context,
+                      App: App,
+                      config: config
                     })
                   ];
                 case 1:
@@ -223,7 +223,7 @@ export var ssr = function() {
           context.ssrContext.request = formatServer(request);
           context.ssrContext.mode = config.mode;
           return next({
-            context
+            context: context
           });
         },
         pickContext: function(param, next) {
@@ -231,11 +231,11 @@ export var ssr = function() {
           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: context,
             pickedContext: _object_spread_props(_object_spread({}, pickedContext), {
-              initialData,
-              request,
-              response
+              initialData: initialData,
+              request: request,
+              response: response
             })
           });
         }

package/dist/esm/ssr/prefetch.js

@@ -153,11 +153,11 @@ var prefetch = function() {
                     ].filter(Boolean)
                   });
                   renderToStaticMarkup(extractor.collectChunks(/* @__PURE__ */ _jsx(App, {
-                    context
+                    context: context
                   })));
                 } else {
                   renderToStaticMarkup(/* @__PURE__ */ _jsx(App, {
-                    context
+                    context: context
                   }));
                 }
                 if (!context.loaderManager.hasPendingLoaders()) {
@@ -186,7 +186,7 @@ var prefetch = function() {
                 return [
                   2,
                   {
-                    loadersData,
+                    loadersData: loadersData,
                     initialData: context.initialData,
                     i18nData: context.__i18nData__,
                     // todo: move to plugin state

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

@@ -29,7 +29,7 @@ function _create_class(Constructor, protoProps, staticProps) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true

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

@@ -1,7 +1,7 @@
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -40,7 +40,7 @@ export function buildShellAfterTemplate(afterAppTemplate, options) {
       };
       var SSRData = {
         data: {
-          initialData,
+          initialData: initialData,
           i18nData: __i18nData__
         },
         context: {
@@ -52,7 +52,7 @@ export function buildShellAfterTemplate(afterAppTemplate, options) {
             url: request.url
           }, enableUnsafeCtx ? unsafeContext : {})
         },
-        renderLevel
+        renderLevel: renderLevel
       };
       return "\n      <script>window._SSR_DATA = ".concat(serializeJson(SSRData), "</script>\n      ");
     }

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

@@ -4,7 +4,7 @@ export function getLoadableChunks(param) {
   var _context_ssrContext = context.ssrContext, loadableStats = _context_ssrContext.loadableStats, entryName = _context_ssrContext.entryName;
   if (!loadableStats) {
     return {
-      jsx
+      jsx: jsx
     };
   }
   var extractor = new ChunkExtractor({

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

@@ -1,7 +1,7 @@
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true

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

@@ -30,7 +30,7 @@ function _async_to_generator(fn) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true

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

@@ -64,8 +64,8 @@ export var getTemplates = function(context, renderLevel) {
   var _ref = _sliced_to_array(ssrContext.template.split(HTML_SEPARATOR) || [], 2), tmp = _ref[0], beforeAppTemplate = tmp === void 0 ? "" : tmp, tmp1 = _ref[1], afterAppHtmlTemplate = tmp1 === void 0 ? "" : tmp1;
   var builtBeforeTemplate = buildShellBeforeTemplate(beforeAppTemplate, context);
   var builtAfterTemplate = buildShellAfterTemplate(afterAppHtmlTemplate, {
-    context,
-    renderLevel
+    context: context,
+    renderLevel: renderLevel
   });
   return {
     shellBefore: builtBeforeTemplate,

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

@@ -52,7 +52,7 @@ function _create_class(Constructor, protoProps, staticProps) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -199,7 +199,7 @@ var buildTemplateData = function(context, data, renderLevel) {
     headers: request.headers
   };
   return {
-    data,
+    data: data,
     context: {
       request: _object_spread({
         params: request.params,
@@ -209,7 +209,7 @@ var buildTemplateData = function(context, data, renderLevel) {
         url: request.url
       }, enableUnsafeCtx ? unsafeContext : {})
     },
-    renderLevel
+    renderLevel: renderLevel
   };
 };
 var Entry = /* @__PURE__ */ function() {

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

@@ -143,8 +143,8 @@ export var render = function(param) {
         case 0:
           entry = new SSREntry({
             ctx: ssrContext,
-            App,
-            config
+            App: App,
+            config: config
           });
           entry.metrics.emitCounter("app.visit.count", 1);
           end = time();

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

@@ -13,7 +13,7 @@ export var toHtml = function(jsx, renderer, next) {
     return next(jsx);
   }
   var extractor = new ChunkExtractor({
-    stats,
+    stats: stats,
     entrypoints: [
       renderer.entryName
     ]

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

@@ -34,7 +34,7 @@ function _create_class(Constructor, protoProps, staticProps) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true