@modern-js/runtime 2.48.0 → 2.48.2

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

@@ -21,7 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 class LoadablePlugin {
@@ -99,8 +98,6 @@ class LoadablePlugin {
     outputAsset: true,
     chunkLoadingGlobal: "__LOADABLE_LOADED_CHUNKS__"
   }) {
-    (0, import_define_property._)(this, "opts", void 0);
-    (0, import_define_property._)(this, "compiler", void 0);
     this.opts = {
       filename,
       path: path2,

package/dist/cjs/ssr/index.js

@@ -37,6 +37,7 @@ var import_jsx_runtime = require("react/jsx-runtime");
 var import_component = require("@loadable/component");
 var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
 var import_parsed = require("@modern-js/runtime-utils/parsed");
+var import_url = require("@modern-js/runtime-utils/url");
 var import_types = require("./serverRender/types");
 var import_withCallback = require("./react/withCallback");
 var import_utils = require("./utils");
@@ -63,8 +64,8 @@ const ssr = (config) => ({
           _hydration: true
         };
         const { ssrContext } = hydrateContext;
-        const { pathname: initialPathname } = ssrContext.request;
-        const currentPathname = window.location.pathname;
+        const currentPathname = (0, import_url.normalizePathname)(window.location.pathname);
+        const initialPathname = (0, import_url.normalizePathname)(ssrContext.request.pathname);
         if (initialPathname !== currentPathname) {
           const errorMsg = `The initial URL ${initialPathname} and the URL ${currentPathname} to be hydrated do not match, reload.`;
           console.error(errorMsg);

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

@@ -31,7 +31,6 @@ __export(prerender_exports, {
   PreRender: () => PreRender
 });
 module.exports = __toCommonJS(prerender_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_react_side_effect = __toESM(require("react-side-effect"));
 var import_react = __toESM(require("react"));
 var import_util = require("./util");
@@ -82,8 +81,7 @@ const reducePropsToState = (propsList) => {
   return reduceProps;
 };
 function factory(Component) {
-  var _React_Component;
-  class Spr extends (_React_Component = import_react.default.Component) {
+  class Spr extends import_react.default.Component {
     static set canUseDOM(canUseDOM) {
       Component.canUseDOM = canUseDOM;
     }
@@ -107,12 +105,12 @@ function factory(Component) {
       });
     }
   }
-  (0, import_define_property._)(Spr, "peek", Component.peek);
-  (0, import_define_property._)(Spr, "rewind", Component.rewind);
-  (0, import_define_property._)(Spr, "config", () => {
+  Spr.peek = Component.peek;
+  Spr.rewind = Component.rewind;
+  Spr.config = () => {
     const mappedState = Component.rewind();
     return mappedState;
-  });
+  };
   return Spr;
 }
 const NullComponent = () => null;

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

@@ -55,9 +55,9 @@ const checkIsInline = (chunk, enableInline) => {
   }
 };
 function getHeadTemplate(beforeEntryTemplate, context, pluginConfig) {
+  const helmetData = import_react_helmet.default.renderStatic();
   const callbacks = [
     (headTemplate2) => {
-      const helmetData = import_react_helmet.default.renderStatic();
       return helmetData ? (0, import_helmet.default)(headTemplate2, helmetData) : headTemplate2;
     },
     // @TODO: prefetch scripts of lazy component

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

@@ -31,10 +31,8 @@ __export(entry_exports, {
   default: () => Entry
 });
 module.exports = __toCommonJS(entry_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_react = __toESM(require("react"));
 var import_node = require("@modern-js/runtime-utils/node");
-var import_react_helmet = __toESM(require("react-helmet"));
 var import_time = require("@modern-js/runtime-utils/time");
 var import_utils = require("../../../router/runtime/utils");
 var import_helmet = __toESM(require("../helmet"));
@@ -103,7 +101,7 @@ class Entry {
       (0, import_buildHtml.createReplaceHtml)(this.result.html || ""),
       ...this.htmlModifiers
     ]);
-    const helmetData = import_react_helmet.default.renderStatic();
+    const helmetData = this.result.helmet;
     return helmetData ? (0, import_helmet.default)(html, helmetData) : html;
   }
   async prefetch(context) {
@@ -126,7 +124,7 @@ class Entry {
           ssr: true
         })
       });
-      html = await (0, import_render.createRender)(App).addCollector((0, import_styledComponent.createStyledCollector)(this.result)).addCollector((0, import_loadable.createLoadableCollector)({
+      html = await (0, import_render.createRender)(App, this.result).addCollector((0, import_styledComponent.createStyledCollector)(this.result)).addCollector((0, import_loadable.createLoadableCollector)({
         stats: ssrContext.loadableStats,
         result: this.result,
         entryName: this.entryName,
@@ -159,15 +157,6 @@ class Entry {
     return ssrDataScripts;
   }
   constructor(options) {
-    (0, import_define_property._)(this, "entryName", void 0);
-    (0, import_define_property._)(this, "result", void 0);
-    (0, import_define_property._)(this, "tracker", void 0);
-    (0, import_define_property._)(this, "template", void 0);
-    (0, import_define_property._)(this, "App", void 0);
-    (0, import_define_property._)(this, "pluginConfig", void 0);
-    (0, import_define_property._)(this, "htmlModifiers", void 0);
-    (0, import_define_property._)(this, "nonce", void 0);
-    (0, import_define_property._)(this, "routeManifest", void 0);
     const { ctx, config } = options;
     const { entryName, template, nonce } = ctx;
     this.template = template;

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

@@ -31,7 +31,6 @@ __export(loadable_exports, {
   createLoadableCollector: () => createLoadableCollector
 });
 module.exports = __toCommonJS(loadable_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_server = require("@loadable/server");
 var import_utils = require("../utils");
 const extname = (uri) => {
@@ -160,8 +159,6 @@ class LoadableCollector {
     };
   }
   constructor(options) {
-    (0, import_define_property._)(this, "options", void 0);
-    (0, import_define_property._)(this, "extractor", void 0);
     this.options = options;
   }
 }

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

@@ -31,8 +31,8 @@ __export(render_exports, {
   createRender: () => createRender
 });
 module.exports = __toCommonJS(render_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_server = __toESM(require("react-dom/server"));
+var import_react_helmet = __toESM(require("react-helmet"));
 class Render {
   addCollector(collector) {
     this.collectors.push(collector);
@@ -41,17 +41,19 @@ class Render {
   async finish() {
     const App = this.collectors.reduce((pre, collector) => collector.collect(pre), this.App);
     const html = import_server.default.renderToString(App);
+    const helmetData = import_react_helmet.default.renderStatic();
+    this.renderResult.helmet = helmetData;
     await Promise.all(this.collectors.map((component) => component.effect()));
     return html;
   }
-  constructor(App) {
-    (0, import_define_property._)(this, "App", void 0);
-    (0, import_define_property._)(this, "collectors", []);
+  constructor(App, result) {
+    this.collectors = [];
     this.App = App;
+    this.renderResult = result;
   }
 }
-function createRender(App) {
-  return new Render(App);
+function createRender(App, result) {
+  return new Render(App, result);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -21,7 +21,6 @@ __export(styledComponent_exports, {
   createStyledCollector: () => createStyledCollector
 });
 module.exports = __toCommonJS(styledComponent_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_styled_components = require("styled-components");
 class StyledCollector {
   collect(comopnent) {
@@ -32,8 +31,7 @@ class StyledCollector {
     this.result.chunksMap.css += css;
   }
   constructor(result) {
-    (0, import_define_property._)(this, "sheet", new import_styled_components.ServerStyleSheet());
-    (0, import_define_property._)(this, "result", void 0);
+    this.sheet = new import_styled_components.ServerStyleSheet();
     this.result = result;
   }
 }

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

@@ -3,8 +3,6 @@ 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";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
@@ -21,8 +19,6 @@ var require_loadable_bundler_plugin = __commonJS({
           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,
@@ -32,82 +28,72 @@ var require_loadable_bundler_plugin = __commonJS({
         };
         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 _proto = LoadablePlugin2.prototype;
+      _proto.apply = 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 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;
-                }
-              };
+          });
+        }
+      };
+      _proto.handleEmit = 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;
+      };
+      _proto.writeAssetsFile = 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

@@ -6,6 +6,7 @@ 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/runtime-utils/parsed";
+import { normalizePathname } from "@modern-js/runtime-utils/url";
 import { RenderLevel } from "./serverRender/types";
 import { WithCallback } from "./react/withCallback";
 import { formatClient, mockResponse, isReact18 } from "./utils";
@@ -24,7 +25,7 @@ var ssr = function(config) {
       return {
         client: function() {
           var _ref = _async_to_generator(function(param) {
-            var App, context, ModernRender, ModernHydrate, _window__SSR_DATA, _window, hydrateContext, ssrContext, _ssrContext_request, initialPathname, currentPathname, errorMsg, callback, renderLevel;
+            var App, context, ModernRender, ModernHydrate, _window__SSR_DATA, _window, hydrateContext, ssrContext, currentPathname, initialPathname, errorMsg, callback, renderLevel;
             function stringSSRHydrate() {
               if (renderLevel === RenderLevel.CLIENT_RENDER || renderLevel === RenderLevel.SERVER_PREFETCH) {
                 ModernRender(/* @__PURE__ */ _jsx(App, {
@@ -88,8 +89,8 @@ var ssr = function(config) {
                 _hydration: true
               });
               ssrContext = hydrateContext.ssrContext;
-              _ssrContext_request = ssrContext.request, initialPathname = _ssrContext_request.pathname;
-              currentPathname = window.location.pathname;
+              currentPathname = normalizePathname(window.location.pathname);
+              initialPathname = normalizePathname(ssrContext.request.pathname);
               if (initialPathname !== currentPathname) {
                 errorMsg = "The initial URL ".concat(initialPathname, " and the URL ").concat(currentPathname, " to be hydrated do not match, reload.");
                 console.error(errorMsg);

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

@@ -52,35 +52,28 @@ var reducePropsToState = function(propsList) {
   return reduceProps;
 };
 function factory(Component) {
-  var _React_Component;
-  var Spr = /* @__PURE__ */ function(_superClass) {
+  var Spr = /* @__PURE__ */ function(_React_Component) {
     "use strict";
-    _inherits(Spr2, _superClass);
+    _inherits(Spr2, _React_Component);
     var _super = _create_super(Spr2);
     function Spr2() {
       _class_call_check(this, Spr2);
       return _super.apply(this, arguments);
     }
-    _create_class(Spr2, [
-      {
-        key: "verify",
-        value: function verify() {
-          return true;
-        }
-      },
-      {
-        key: "render",
-        value: function render() {
-          var newProps = _object_spread({}, this.props);
-          var validate = this.verify();
-          if (!validate) {
-            throw new Error("invalid props, check usage");
-          }
-          console.error("[Warn] PreRender has been deprecated, please use SSR Cache instead. reference to docs: https://modernjs.dev/guides/advanced-features/ssr.html");
-          return createElement(Component, _object_spread({}, newProps));
-        }
+    var _proto = Spr2.prototype;
+    _proto.verify = function verify() {
+      return true;
+    };
+    _proto.render = function render() {
+      var newProps = _object_spread({}, this.props);
+      var validate = this.verify();
+      if (!validate) {
+        throw new Error("invalid props, check usage");
       }
-    ], [
+      console.error("[Warn] PreRender has been deprecated, please use SSR Cache instead. reference to docs: https://modernjs.dev/guides/advanced-features/ssr.html");
+      return createElement(Component, _object_spread({}, newProps));
+    };
+    _create_class(Spr2, null, [
       {
         key: "canUseDOM",
         get: function get() {
@@ -92,13 +85,13 @@ function factory(Component) {
       }
     ]);
     return Spr2;
-  }(_React_Component = React.Component);
-  _define_property(Spr, "peek", Component.peek);
-  _define_property(Spr, "rewind", Component.rewind);
-  _define_property(Spr, "config", function() {
+  }(React.Component);
+  Spr.peek = Component.peek;
+  Spr.rewind = Component.rewind;
+  Spr.config = function() {
     var mappedState = Component.rewind();
     return mappedState;
-  });
+  };
   return Spr;
 }
 var NullComponent = function() {

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

@@ -51,9 +51,9 @@ var checkIsInline = function(chunk, enableInline) {
   }
 };
 function getHeadTemplate(beforeEntryTemplate, context, pluginConfig) {
+  var helmetData = ReactHelmet.renderStatic();
   var callbacks = [
     function(headTemplate2) {
-      var helmetData = ReactHelmet.renderStatic();
       return helmetData ? helmetReplace(headTemplate2, helmetData) : headTemplate2;
     },
     // @TODO: prefetch scripts of lazy component