@modern-js/runtime 2.47.1 → 2.48.1

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

@@ -1,7 +1,6 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 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 _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
@@ -65,10 +64,205 @@ var LoadableCollector = /* @__PURE__ */ function() {
   "use strict";
   function LoadableCollector2(options) {
     _class_call_check(this, LoadableCollector2);
-    _define_property(this, "options", void 0);
-    _define_property(this, "extractor", void 0);
     this.options = options;
   }
+  var _proto = LoadableCollector2.prototype;
+  _proto.collect = function collect(comopnent) {
+    var _this_options = this.options, stats = _this_options.stats, entryName = _this_options.entryName;
+    if (!stats) {
+      return comopnent;
+    }
+    this.extractor = new ChunkExtractor({
+      stats,
+      entrypoints: [
+        entryName
+      ]
+    });
+    return this.extractor.collectChunks(comopnent);
+  };
+  _proto.effect = function effect() {
+    var _this = this;
+    return _async_to_generator(function() {
+      var extractor, chunks, scriptChunks, styleChunks;
+      return _ts_generator(this, function(_state) {
+        switch (_state.label) {
+          case 0:
+            if (!_this.extractor) {
+              return [
+                2
+              ];
+            }
+            extractor = _this.extractor;
+            chunks = extractor.getChunkAssets(extractor.chunks);
+            scriptChunks = generateChunks(chunks, "js");
+            styleChunks = generateChunks(chunks, "css");
+            _this.emitLoadableScripts(extractor);
+            return [
+              4,
+              _this.emitScriptAssets(scriptChunks)
+            ];
+          case 1:
+            _state.sent();
+            return [
+              4,
+              _this.emitStyleAssets(styleChunks)
+            ];
+          case 2:
+            _state.sent();
+            return [
+              2
+            ];
+        }
+      });
+    })();
+  };
+  _proto.emitLoadableScripts = function emitLoadableScripts(extractor) {
+    var check = function(scripts2) {
+      return (scripts2 || "").includes("__LOADABLE_REQUIRED_CHUNKS___ext");
+    };
+    var scripts = extractor.getScriptTags();
+    if (!check(scripts)) {
+      return;
+    }
+    var _this_options = this.options, chunksMap = _this_options.result.chunksMap;
+    var s = scripts.split("</script>").slice(0, 2).map(function(i) {
+      return "".concat(i, "</script>");
+    }).join("");
+    chunksMap.js += s;
+  };
+  _proto.emitScriptAssets = function emitScriptAssets(chunks) {
+    var _this = this;
+    return _async_to_generator(function() {
+      var _this_options, template, config, nonce, result, chunksMap, _config_scriptLoading, scriptLoading, enableInlineScripts, scriptLoadingAtr, attributes, scripts;
+      return _ts_generator(this, function(_state) {
+        switch (_state.label) {
+          case 0:
+            _this_options = _this.options, template = _this_options.template, config = _this_options.config, nonce = _this_options.nonce, result = _this_options.result;
+            chunksMap = result.chunksMap;
+            _config_scriptLoading = config.scriptLoading, scriptLoading = _config_scriptLoading === void 0 ? "defer" : _config_scriptLoading, enableInlineScripts = config.enableInlineScripts;
+            scriptLoadingAtr = {
+              defer: scriptLoading === "defer" ? true : void 0,
+              type: scriptLoading === "module" ? "module" : void 0,
+              async: scriptLoading === "async" ? true : void 0
+            };
+            attributes = attributesToString(_this.generateAttributes(_object_spread({
+              nonce
+            }, scriptLoadingAtr)));
+            return [
+              4,
+              Promise.all(chunks.filter(function(chunk) {
+                var _this_existsAssets;
+                var jsChunkReg = new RegExp('<script .*src="'.concat(chunk.url, '".*>'));
+                return !jsChunkReg.test(template) && !((_this_existsAssets = _this.existsAssets) === null || _this_existsAssets === void 0 ? void 0 : _this_existsAssets.includes(chunk.path));
+              }).map(function() {
+                var _ref = _async_to_generator(function(chunk) {
+                  var script;
+                  return _ts_generator(this, function(_state2) {
+                    script = "<script".concat(attributes, ' src="').concat(chunk.url, '"></script>');
+                    if (checkIsNode() && checkIsInline(chunk, enableInlineScripts)) {
+                      return [
+                        2,
+                        readAsset(chunk).then(function(content) {
+                          return "<script>".concat(content, "</script>");
+                        }).catch(function(_) {
+                          return script;
+                        })
+                      ];
+                    } else {
+                      return [
+                        2,
+                        script
+                      ];
+                    }
+                    return [
+                      2
+                    ];
+                  });
+                });
+                return function(chunk) {
+                  return _ref.apply(this, arguments);
+                };
+              }()))
+            ];
+          case 1:
+            scripts = _state.sent();
+            chunksMap.js += scripts.filter(function(script) {
+              return Boolean(script);
+            }).join("");
+            return [
+              2
+            ];
+        }
+      });
+    })();
+  };
+  _proto.emitStyleAssets = function emitStyleAssets(chunks) {
+    var _this = this;
+    return _async_to_generator(function() {
+      var _this_options, template, chunksMap, enableInlineStyles, atrributes, css;
+      return _ts_generator(this, function(_state) {
+        switch (_state.label) {
+          case 0:
+            _this_options = _this.options, template = _this_options.template, chunksMap = _this_options.result.chunksMap, enableInlineStyles = _this_options.config.enableInlineStyles;
+            atrributes = attributesToString(_this.generateAttributes());
+            return [
+              4,
+              Promise.all(chunks.filter(function(chunk) {
+                var _this_existsAssets;
+                var cssChunkReg = new RegExp('<link .*href="'.concat(chunk.url, '".*>'));
+                return !cssChunkReg.test(template) && !((_this_existsAssets = _this.existsAssets) === null || _this_existsAssets === void 0 ? void 0 : _this_existsAssets.includes(chunk.path));
+              }).map(function() {
+                var _ref = _async_to_generator(function(chunk) {
+                  var link;
+                  return _ts_generator(this, function(_state2) {
+                    link = "<link".concat(atrributes, ' href="').concat(chunk.url, '" rel="stylesheet" />');
+                    if (checkIsNode() && checkIsInline(chunk, enableInlineStyles)) {
+                      return [
+                        2,
+                        readAsset(chunk).then(function(content) {
+                          return "<style>".concat(content, "</style>");
+                        }).catch(function(_) {
+                          return link;
+                        })
+                      ];
+                    } else {
+                      return [
+                        2,
+                        link
+                      ];
+                    }
+                    return [
+                      2
+                    ];
+                  });
+                });
+                return function(chunk) {
+                  return _ref.apply(this, arguments);
+                };
+              }()))
+            ];
+          case 1:
+            css = _state.sent();
+            chunksMap.css += css.filter(function(css2) {
+              return Boolean(css2);
+            }).join("");
+            return [
+              2
+            ];
+        }
+      });
+    })();
+  };
+  _proto.generateAttributes = function generateAttributes() {
+    var extraAtr = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
+    var config = this.options.config;
+    var crossorigin = config.crossorigin;
+    var attributes = {};
+    if (crossorigin) {
+      attributes.crossorigin = crossorigin === true ? "anonymous" : crossorigin;
+    }
+    return _object_spread({}, attributes, extraAtr);
+  };
   _create_class(LoadableCollector2, [
     {
       key: "existsAssets",
@@ -77,220 +271,6 @@ var LoadableCollector = /* @__PURE__ */ function() {
         var _this_options = this.options, routeManifest = _this_options.routeManifest, entryName = _this_options.entryName;
         return routeManifest === null || routeManifest === void 0 ? void 0 : (_routeManifest_routeAssets = routeManifest.routeAssets) === null || _routeManifest_routeAssets === void 0 ? void 0 : (_routeManifest_routeAssets_entryName = _routeManifest_routeAssets[entryName]) === null || _routeManifest_routeAssets_entryName === void 0 ? void 0 : _routeManifest_routeAssets_entryName.assets;
       }
-    },
-    {
-      key: "collect",
-      value: function collect(comopnent) {
-        var _this_options = this.options, stats = _this_options.stats, entryName = _this_options.entryName;
-        if (!stats) {
-          return comopnent;
-        }
-        this.extractor = new ChunkExtractor({
-          stats,
-          entrypoints: [
-            entryName
-          ]
-        });
-        return this.extractor.collectChunks(comopnent);
-      }
-    },
-    {
-      key: "effect",
-      value: function effect() {
-        var _this = this;
-        return _async_to_generator(function() {
-          var extractor, chunks, scriptChunks, styleChunks;
-          return _ts_generator(this, function(_state) {
-            switch (_state.label) {
-              case 0:
-                if (!_this.extractor) {
-                  return [
-                    2
-                  ];
-                }
-                extractor = _this.extractor;
-                chunks = extractor.getChunkAssets(extractor.chunks);
-                scriptChunks = generateChunks(chunks, "js");
-                styleChunks = generateChunks(chunks, "css");
-                _this.emitLoadableScripts(extractor);
-                return [
-                  4,
-                  _this.emitScriptAssets(scriptChunks)
-                ];
-              case 1:
-                _state.sent();
-                return [
-                  4,
-                  _this.emitStyleAssets(styleChunks)
-                ];
-              case 2:
-                _state.sent();
-                return [
-                  2
-                ];
-            }
-          });
-        })();
-      }
-    },
-    {
-      key: "emitLoadableScripts",
-      value: function emitLoadableScripts(extractor) {
-        var check = function(scripts2) {
-          return (scripts2 || "").includes("__LOADABLE_REQUIRED_CHUNKS___ext");
-        };
-        var scripts = extractor.getScriptTags();
-        if (!check(scripts)) {
-          return;
-        }
-        var _this_options = this.options, chunksMap = _this_options.result.chunksMap;
-        var s = scripts.split("</script>").slice(0, 2).map(function(i) {
-          return "".concat(i, "</script>");
-        }).join("");
-        chunksMap.js += s;
-      }
-    },
-    {
-      key: "emitScriptAssets",
-      value: function emitScriptAssets(chunks) {
-        var _this = this;
-        return _async_to_generator(function() {
-          var _this_options, template, config, nonce, result, chunksMap, _config_scriptLoading, scriptLoading, enableInlineScripts, scriptLoadingAtr, attributes, scripts;
-          return _ts_generator(this, function(_state) {
-            switch (_state.label) {
-              case 0:
-                _this_options = _this.options, template = _this_options.template, config = _this_options.config, nonce = _this_options.nonce, result = _this_options.result;
-                chunksMap = result.chunksMap;
-                _config_scriptLoading = config.scriptLoading, scriptLoading = _config_scriptLoading === void 0 ? "defer" : _config_scriptLoading, enableInlineScripts = config.enableInlineScripts;
-                scriptLoadingAtr = {
-                  defer: scriptLoading === "defer" ? true : void 0,
-                  type: scriptLoading === "module" ? "module" : void 0,
-                  async: scriptLoading === "async" ? true : void 0
-                };
-                attributes = attributesToString(_this.generateAttributes(_object_spread({
-                  nonce
-                }, scriptLoadingAtr)));
-                return [
-                  4,
-                  Promise.all(chunks.filter(function(chunk) {
-                    var _this_existsAssets;
-                    var jsChunkReg = new RegExp('<script .*src="'.concat(chunk.url, '".*>'));
-                    return !jsChunkReg.test(template) && !((_this_existsAssets = _this.existsAssets) === null || _this_existsAssets === void 0 ? void 0 : _this_existsAssets.includes(chunk.path));
-                  }).map(function() {
-                    var _ref = _async_to_generator(function(chunk) {
-                      var script;
-                      return _ts_generator(this, function(_state2) {
-                        script = "<script".concat(attributes, ' src="').concat(chunk.url, '"></script>');
-                        if (checkIsNode() && checkIsInline(chunk, enableInlineScripts)) {
-                          return [
-                            2,
-                            readAsset(chunk).then(function(content) {
-                              return "<script>".concat(content, "</script>");
-                            }).catch(function(_) {
-                              return script;
-                            })
-                          ];
-                        } else {
-                          return [
-                            2,
-                            script
-                          ];
-                        }
-                        return [
-                          2
-                        ];
-                      });
-                    });
-                    return function(chunk) {
-                      return _ref.apply(this, arguments);
-                    };
-                  }()))
-                ];
-              case 1:
-                scripts = _state.sent();
-                chunksMap.js += scripts.filter(function(script) {
-                  return Boolean(script);
-                }).join("");
-                return [
-                  2
-                ];
-            }
-          });
-        })();
-      }
-    },
-    {
-      key: "emitStyleAssets",
-      value: function emitStyleAssets(chunks) {
-        var _this = this;
-        return _async_to_generator(function() {
-          var _this_options, template, chunksMap, enableInlineStyles, atrributes, css;
-          return _ts_generator(this, function(_state) {
-            switch (_state.label) {
-              case 0:
-                _this_options = _this.options, template = _this_options.template, chunksMap = _this_options.result.chunksMap, enableInlineStyles = _this_options.config.enableInlineStyles;
-                atrributes = attributesToString(_this.generateAttributes());
-                return [
-                  4,
-                  Promise.all(chunks.filter(function(chunk) {
-                    var _this_existsAssets;
-                    var cssChunkReg = new RegExp('<link .*href="'.concat(chunk.url, '".*>'));
-                    return !cssChunkReg.test(template) && !((_this_existsAssets = _this.existsAssets) === null || _this_existsAssets === void 0 ? void 0 : _this_existsAssets.includes(chunk.path));
-                  }).map(function() {
-                    var _ref = _async_to_generator(function(chunk) {
-                      var link;
-                      return _ts_generator(this, function(_state2) {
-                        link = "<link".concat(atrributes, ' href="').concat(chunk.url, '" rel="stylesheet" />');
-                        if (checkIsNode() && checkIsInline(chunk, enableInlineStyles)) {
-                          return [
-                            2,
-                            readAsset(chunk).then(function(content) {
-                              return "<style>".concat(content, "</style>");
-                            }).catch(function(_) {
-                              return link;
-                            })
-                          ];
-                        } else {
-                          return [
-                            2,
-                            link
-                          ];
-                        }
-                        return [
-                          2
-                        ];
-                      });
-                    });
-                    return function(chunk) {
-                      return _ref.apply(this, arguments);
-                    };
-                  }()))
-                ];
-              case 1:
-                css = _state.sent();
-                chunksMap.css += css.filter(function(css2) {
-                  return Boolean(css2);
-                }).join("");
-                return [
-                  2
-                ];
-            }
-          });
-        })();
-      }
-    },
-    {
-      key: "generateAttributes",
-      value: function generateAttributes() {
-        var extraAtr = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
-        var config = this.options.config;
-        var crossorigin = config.crossorigin;
-        var attributes = {};
-        if (crossorigin) {
-          attributes.crossorigin = crossorigin === true ? "anonymous" : crossorigin;
-        }
-        return _object_spread({}, attributes, extraAtr);
-      }
     }
   ]);
   return LoadableCollector2;

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

@@ -1,56 +1,46 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 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 _ts_generator } from "@swc/helpers/_/_ts_generator";
 import ReactDomServer from "react-dom/server";
 var Render = /* @__PURE__ */ function() {
   "use strict";
   function Render2(App) {
     _class_call_check(this, Render2);
-    _define_property(this, "App", void 0);
-    _define_property(this, "collectors", []);
+    this.collectors = [];
     this.App = App;
   }
-  _create_class(Render2, [
-    {
-      key: "addCollector",
-      value: function addCollector(collector) {
-        this.collectors.push(collector);
-        return this;
-      }
-    },
-    {
-      key: "finish",
-      value: function finish() {
-        var _this = this;
-        return _async_to_generator(function() {
-          var App, html;
-          return _ts_generator(this, function(_state) {
-            switch (_state.label) {
-              case 0:
-                App = _this.collectors.reduce(function(pre, collector) {
-                  return collector.collect(pre);
-                }, _this.App);
-                html = ReactDomServer.renderToString(App);
-                return [
-                  4,
-                  Promise.all(_this.collectors.map(function(component) {
-                    return component.effect();
-                  }))
-                ];
-              case 1:
-                _state.sent();
-                return [
-                  2,
-                  html
-                ];
-            }
-          });
-        })();
-      }
-    }
-  ]);
+  var _proto = Render2.prototype;
+  _proto.addCollector = function addCollector(collector) {
+    this.collectors.push(collector);
+    return this;
+  };
+  _proto.finish = function finish() {
+    var _this = this;
+    return _async_to_generator(function() {
+      var App, html;
+      return _ts_generator(this, function(_state) {
+        switch (_state.label) {
+          case 0:
+            App = _this.collectors.reduce(function(pre, collector) {
+              return collector.collect(pre);
+            }, _this.App);
+            html = ReactDomServer.renderToString(App);
+            return [
+              4,
+              Promise.all(_this.collectors.map(function(component) {
+                return component.effect();
+              }))
+            ];
+          case 1:
+            _state.sent();
+            return [
+              2,
+              html
+            ];
+        }
+      });
+    })();
+  };
   return Render2;
 }();
 function createRender(App) {

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

@@ -1,30 +1,20 @@
 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 { ServerStyleSheet } from "styled-components";
 var StyledCollector = /* @__PURE__ */ function() {
   "use strict";
   function StyledCollector2(result) {
     _class_call_check(this, StyledCollector2);
-    _define_property(this, "sheet", new ServerStyleSheet());
-    _define_property(this, "result", void 0);
+    this.sheet = new ServerStyleSheet();
     this.result = result;
   }
-  _create_class(StyledCollector2, [
-    {
-      key: "collect",
-      value: function collect(comopnent) {
-        return this.sheet.collectStyles(comopnent);
-      }
-    },
-    {
-      key: "effect",
-      value: function effect() {
-        var css = this.sheet.getStyleTags();
-        this.result.chunksMap.css += css;
-      }
-    }
-  ]);
+  var _proto = StyledCollector2.prototype;
+  _proto.collect = function collect(comopnent) {
+    return this.sheet.collectStyles(comopnent);
+  };
+  _proto.effect = function effect() {
+    var css = this.sheet.getStyleTags();
+    this.result.chunksMap.css += css;
+  };
   return StyledCollector2;
 }();
 function createStyledCollector(result) {

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

@@ -2,7 +2,6 @@ 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 _define_property } from "@swc/helpers/_/_define_property";
 import path from "path";
 import { fs } from "@modern-js/utils";
 var require_loadable_bundler_plugin = __commonJS({
@@ -82,8 +81,6 @@ var require_loadable_bundler_plugin = __commonJS({
         outputAsset: true,
         chunkLoadingGlobal: "__LOADABLE_LOADED_CHUNKS__"
       }) {
-        _define_property(this, "opts", void 0);
-        _define_property(this, "compiler", void 0);
         this.opts = {
           filename,
           path: path2,

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

@@ -2,6 +2,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";
@@ -28,7 +29,7 @@ const ssr = (config) => ({
         };
         const { ssrContext } = hydrateContext;
         const { pathname: initialPathname } = ssrContext.request;
-        const currentPathname = window.location.pathname;
+        const currentPathname = normalizePathname(window.location.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/esm-node/ssr/react/prerender/index.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import withSideEffect from "react-side-effect";
 import React, { createElement } from "react";
 import { getOutermostProperty, aggKeysFromPropsList, exist, aggMatchesFromPropsList } from "./util";
@@ -49,8 +48,7 @@ const reducePropsToState = (propsList) => {
   return reduceProps;
 };
 function factory(Component) {
-  var _React_Component;
-  class Spr extends (_React_Component = React.Component) {
+  class Spr extends React.Component {
     static set canUseDOM(canUseDOM) {
       Component.canUseDOM = canUseDOM;
     }
@@ -74,12 +72,12 @@ function factory(Component) {
       });
     }
   }
-  _define_property(Spr, "peek", Component.peek);
-  _define_property(Spr, "rewind", Component.rewind);
-  _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/esm-node/ssr/serverRender/renderToString/entry.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import React from "react";
 import { serializeJson } from "@modern-js/runtime-utils/node";
 import ReactHelmet from "react-helmet";
@@ -126,15 +125,6 @@ class Entry {
     return ssrDataScripts;
   }
   constructor(options) {
-    _define_property(this, "entryName", void 0);
-    _define_property(this, "result", void 0);
-    _define_property(this, "tracker", void 0);
-    _define_property(this, "template", void 0);
-    _define_property(this, "App", void 0);
-    _define_property(this, "pluginConfig", void 0);
-    _define_property(this, "htmlModifiers", void 0);
-    _define_property(this, "nonce", void 0);
-    _define_property(this, "routeManifest", void 0);
     const { ctx, config } = options;
     const { entryName, template, nonce } = ctx;
     this.template = template;

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

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { ChunkExtractor } from "@loadable/server";
 import { attributesToString, checkIsNode } from "../utils";
 const extname = (uri) => {
@@ -127,8 +126,6 @@ class LoadableCollector {
     };
   }
   constructor(options) {
-    _define_property(this, "options", void 0);
-    _define_property(this, "extractor", void 0);
     this.options = options;
   }
 }