@modern-js/runtime 2.35.0 → 2.36.0

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,11 +38,10 @@ 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() {
+var ssrPlugin = function() {
   return {
     name: "@modern-js/plugin-ssr",
     required: [
@@ -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) {
@@ -141,15 +139,15 @@ export var ssrPlugin = function() {
             });
           }
           return {
-            entrypoint: entrypoint,
-            imports: imports
+            entrypoint,
+            imports
           };
         },
         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();
@@ -158,23 +156,23 @@ export var ssrPlugin = function() {
             plugins.push({
               name: PLUGIN_IDENTIFIER,
               options: JSON.stringify(_object_spread_props(_object_spread({}, ssrConfigMap.get(entrypoint.entryName) || {}), {
-                crossorigin: crossorigin,
-                scriptLoading: scriptLoading,
-                chunkLoadingGlobal: chunkLoadingGlobal,
-                disablePrerender: disablePrerender
+                crossorigin,
+                scriptLoading,
+                chunkLoadingGlobal,
+                disablePrerender
               }))
             });
           }
           return {
-            entrypoint: entrypoint,
-            plugins: plugins
+            entrypoint,
+            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
@@ -182,12 +180,16 @@ export var ssrPlugin = function() {
             };
           }
           return {
-            entrypoint: entrypoint,
-            exportStatement: exportStatement
+            entrypoint,
+            exportStatement
           };
         }
       };
     }
   };
 };
-export default ssrPlugin;
+var cli_default = ssrPlugin;
+export {
+  cli_default as default,
+  ssrPlugin
+};

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

@@ -1,3 +1,7 @@
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
 import { _ as _create_class } from "@swc/helpers/_/_create_class";
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
@@ -6,102 +10,107 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 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);
-              }
-            });
-          });
-        }
+var require_loadable_bundler_plugin = __commonJS({
+  "src/ssr/cli/loadable-bundler-plugin.ts"(exports, module) {
+    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,
+          path: path2,
+          writeToDisk,
+          outputAsset,
+          chunkLoadingGlobal
+        };
+        this.compiler = null;
       }
-    },
-    {
-      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;
+      _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 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;
+      ]);
+      return LoadablePlugin2;
+    }();
+    module.exports = LoadablePlugin;
+  }
+});
+export default require_loadable_bundler_plugin();

package/dist/esm/ssr/index.js

@@ -5,12 +5,12 @@ 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";
 import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID } from "./serverRender/utils";
-export var ssr = function(config) {
+var ssr = function(config) {
   return {
     name: "@modern-js/plugin-ssr",
     setup: function() {
@@ -26,7 +26,7 @@ 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) {
                 var loadableReadyOptions = {
@@ -36,7 +36,7 @@ export var ssr = function(config) {
                   loadableReady(function() {
                     var SSRApp = function() {
                       return /* @__PURE__ */ _jsx(WithCallback, {
-                        callback: callback,
+                        callback,
                         children: /* @__PURE__ */ _jsx(App, {
                           context: hydrateContext
                         })
@@ -55,7 +55,7 @@ export var ssr = function(config) {
               } else {
                 console.warn("unknow render level: ".concat(renderLevel, ", execute render()"));
                 ModernRender(/* @__PURE__ */ _jsx(App, {
-                  context: context
+                  context
                 }));
               }
             }
@@ -63,7 +63,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
                     })
@@ -73,7 +73,7 @@ export var ssr = function(config) {
                 ModernHydrate(/* @__PURE__ */ _jsx(SSRApp, {}));
               } else {
                 ModernRender(/* @__PURE__ */ _jsx(App, {
-                  context: context
+                  context
                 }));
               }
             }
@@ -115,13 +115,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) {
@@ -131,17 +131,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: initialData,
-              request: request,
+              initialData,
+              request,
               response: mockResp
             })
           });
@@ -150,5 +150,9 @@ export var ssr = function(config) {
     }
   };
 };
-export default ssr;
+var ssr_default = ssr;
 export * from "./react";
+export {
+  ssr_default as default,
+  ssr
+};

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

@@ -5,7 +5,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { formatServer } from "./utils";
 import render from "./serverRender";
 import { createSSRTracker } from "./serverRender/tracker";
-export var ssr = function() {
+var ssr = function() {
   var config = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
   return {
     name: "@modern-js/plugin-ssr",
@@ -21,9 +21,9 @@ export var ssr = function() {
                   return [
                     4,
                     render({
-                      context: context,
-                      App: App,
-                      config: config
+                      context,
+                      App,
+                      config
                     })
                   ];
                 case 1:
@@ -49,20 +49,19 @@ export var ssr = function() {
             context.ssrContext.htmlModifiers = [];
           }
           return next({
-            context: context
+            context
           });
         },
         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,
+            context,
             pickedContext: _object_spread_props(_object_spread({}, pickedContext), {
-              initialData: initialData,
-              request: request,
-              response: response
+              initialData,
+              request,
+              response
             })
           });
         }
@@ -70,5 +69,9 @@ export var ssr = function() {
     }
   };
 };
-export default ssr;
+var index_node_default = ssr;
 export * from "./react";
+export {
+  index_node_default as default,
+  ssr
+};

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:
@@ -25,11 +25,11 @@ var prefetch = function() {
                       ].filter(Boolean)
                     });
                     renderToStaticMarkup(extractor.collectChunks(/* @__PURE__ */ _jsx(App, {
-                      context: context
+                      context
                     })));
                   } else {
                     renderToStaticMarkup(/* @__PURE__ */ _jsx(App, {
-                      context: context
+                      context
                     }));
                   }
                 }
@@ -59,11 +59,11 @@ var prefetch = function() {
                 return [
                   2,
                   {
-                    loadersData: loadersData,
+                    loadersData,
                     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()
                   }
                 ];
             }
@@ -76,4 +76,7 @@ var prefetch = function() {
     return _ref.apply(this, arguments);
   };
 }();
-export default prefetch;
+var prefetch_default = prefetch;
+export {
+  prefetch_default as default
+};

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

@@ -1,2 +1,6 @@
-export { PreRender } from "./prerender";
-export { NoSSR } from "./nossr";
+import { PreRender } from "./prerender";
+import { NoSSR } from "./nossr";
+export {
+  NoSSR,
+  PreRender
+};

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

@@ -1,7 +1,7 @@
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import React, { useEffect, useState } from "react";
 var csr = false;
-export var NoSSR = function(props) {
+var NoSSR = function(props) {
   var _useState = _sliced_to_array(useState(csr), 2), isMounted = _useState[0], setMounted = _useState[1];
   useEffect(function() {
     csr = true;
@@ -10,3 +10,6 @@ export var NoSSR = function(props) {
   var children = props.children, _props_fallback = props.fallback, fallback = _props_fallback === void 0 ? null : _props_fallback;
   return React.createElement(React.Fragment, null, isMounted ? children : fallback);
 };
+export {
+  NoSSR
+};

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

@@ -104,4 +104,7 @@ var NullComponent = function() {
   return null;
 };
 var SprSideEffects = withSideEffect(reducePropsToState, handleClientStateChange, mapStateOnServer)(NullComponent);
-export var PreRender = factory(SprSideEffects);
+var PreRender = factory(SprSideEffects);
+export {
+  PreRender
+};

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

@@ -1 +0,0 @@
-export {};