@modern-js/runtime 2.15.1-alpha.2 → 2.16.0

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

@@ -1,49 +1,83 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var entry_exports = {};
-__export(entry_exports, {
-  default: () => Entry
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: () => Entry
 });
-module.exports = __toCommonJS(entry_exports);
-var import_react = __toESM(require("react"));
-var import_server = __toESM(require("react-dom/server"));
-var import_serialize = require("@modern-js/utils/universal/serialize");
-var import_react_helmet = __toESM(require("react-helmet"));
-var import_utils = require("../../../router/runtime/utils");
-var import_helmet = __toESM(require("../helmet"));
-var import_types = require("../types");
-var import_time = require("../time");
-var import_prefetch = __toESM(require("../../prefetch"));
-var import_utils2 = require("../utils");
-var import_template = require("./template");
-var import_reduce = require("./reduce");
-var loadableRenderer = __toESM(require("./loadable"));
-var styledComponentRenderer = __toESM(require("./styledComponent"));
+const _react = /* @__PURE__ */ _interop_require_default(require("react"));
+const _server = /* @__PURE__ */ _interop_require_default(require("react-dom/server"));
+const _serialize = require("@modern-js/utils/universal/serialize");
+const _reacthelmet = /* @__PURE__ */ _interop_require_default(require("react-helmet"));
+const _utils = require("../../../router/runtime/utils");
+const _helmet = /* @__PURE__ */ _interop_require_default(require("../helmet"));
+const _types = require("../types");
+const _time = require("../time");
+const _prefetch = /* @__PURE__ */ _interop_require_default(require("../../prefetch"));
+const _utils1 = require("../utils");
+const _template = require("./template");
+const _reduce = require("./reduce");
+const _loadable = /* @__PURE__ */ _interop_require_wildcard(require("./loadable"));
+const _styledComponent = /* @__PURE__ */ _interop_require_wildcard(require("./styledComponent"));
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
+function _getRequireWildcardCache(nodeInterop) {
+  if (typeof WeakMap !== "function")
+    return null;
+  var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
+  var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
+  return (_getRequireWildcardCache = function(nodeInterop2) {
+    return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
+  })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+  if (!nodeInterop && obj && obj.__esModule) {
+    return obj;
+  }
+  if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+    return {
+      default: obj
+    };
+  }
+  var cache = _getRequireWildcardCache(nodeInterop);
+  if (cache && cache.has(obj)) {
+    return cache.get(obj);
+  }
+  var newObj = {};
+  var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+  for (var key in obj) {
+    if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+      var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+      if (desc && (desc.get || desc.set)) {
+        Object.defineProperty(newObj, key, desc);
+      } else {
+        newObj[key] = obj[key];
+      }
+    }
+  }
+  newObj.default = obj;
+  if (cache) {
+    cache.set(obj, newObj);
+  }
+  return newObj;
+}
 const buildTemplateData = (context, data, renderLevel) => {
   const { request, enableUnsafeCtx } = context;
   const unsafeContext = {
@@ -65,56 +99,29 @@ const buildTemplateData = (context, data, renderLevel) => {
   };
 };
 class Entry {
-  constructor(options) {
-    const { ctx, config } = options;
-    const {
-      entryName,
-      template,
-      request: { host }
-    } = ctx;
-    this.fragments = (0, import_template.toFragments)(template, entryName);
-    this.entryName = entryName;
-    this.host = host;
-    this.App = options.App;
-    this.pluginConfig = config;
-    this.metrics = ctx.metrics;
-    this.logger = ctx.logger;
-    this.result = {
-      renderLevel: import_types.RenderLevel.CLIENT_RENDER,
-      html: "",
-      chunksMap: {
-        js: "",
-        css: ""
-      }
-    };
-  }
   async renderToHtml(context) {
-    var _a, _b, _c;
+    var _ssrContext_redirection, _ssrContext_redirection1, _ssrContext_redirection2;
     const ssrContext = context.ssrContext;
-    if ((_a = ssrContext.redirection) == null ? void 0 : _a.url) {
+    if ((_ssrContext_redirection = ssrContext.redirection) === null || _ssrContext_redirection === void 0 ? void 0 : _ssrContext_redirection.url) {
       return "";
     }
     const prefetchData = await this.prefetch(context);
-    if ((_b = ssrContext.redirection) == null ? void 0 : _b.url) {
+    if ((_ssrContext_redirection1 = ssrContext.redirection) === null || _ssrContext_redirection1 === void 0 ? void 0 : _ssrContext_redirection1.url) {
       return "";
     }
-    if (this.result.renderLevel >= import_types.RenderLevel.SERVER_PREFETCH) {
+    if (this.result.renderLevel >= _types.RenderLevel.SERVER_PREFETCH) {
       this.result.html = this.renderToString(context);
     }
-    if ((_c = ssrContext.redirection) == null ? void 0 : _c.url) {
+    if ((_ssrContext_redirection2 = ssrContext.redirection) === null || _ssrContext_redirection2 === void 0 ? void 0 : _ssrContext_redirection2.url) {
       return "";
     }
     const { routerContext } = context;
     const routerData = routerContext ? {
       loaderData: routerContext.loaderData,
-      errors: (0, import_utils.serializeErrors)(routerContext.errors)
+      errors: (0, _utils.serializeErrors)(routerContext.errors)
     } : void 0;
     let html = "";
-    const templateData = buildTemplateData(
-      ssrContext,
-      prefetchData,
-      this.result.renderLevel
-    );
+    const templateData = buildTemplateData(ssrContext, prefetchData, this.result.renderLevel);
     const SSRData = this.getSSRDataScript(templateData, routerData);
     for (const fragment of this.fragments) {
       if (fragment.isVariable && fragment.content === "SSRDataScript") {
@@ -123,20 +130,20 @@ class Entry {
         html += fragment.getValue(this.result);
       }
     }
-    const helmetData = import_react_helmet.default.renderStatic();
-    return helmetData ? (0, import_helmet.default)(html, helmetData) : html;
+    const helmetData = _reacthelmet.default.renderStatic();
+    return helmetData ? (0, _helmet.default)(html, helmetData) : html;
   }
   async prefetch(context) {
     let prefetchData;
-    const end = (0, import_time.time)();
+    const end = (0, _time.time)();
     try {
-      prefetchData = await (0, import_prefetch.default)(this.App, context);
-      this.result.renderLevel = import_types.RenderLevel.SERVER_PREFETCH;
+      prefetchData = await (0, _prefetch.default)(this.App, context);
+      this.result.renderLevel = _types.RenderLevel.SERVER_PREFETCH;
       const prefetchCost = end();
       this.logger.debug(`App Prefetch cost = %d ms`, prefetchCost);
       this.metrics.emitTimer("app.prefetch.cost", prefetchCost);
     } catch (e) {
-      this.result.renderLevel = import_types.RenderLevel.CLIENT_RENDER;
+      this.result.renderLevel = _types.RenderLevel.CLIENT_RENDER;
       this.logger.error("App Prefetch Render", e);
       this.metrics.emitCounter("app.prefetch.render.error", 1);
     }
@@ -144,11 +151,13 @@ class Entry {
   }
   renderToString(context) {
     let html = "";
-    const end = (0, import_time.time)();
+    const end = (0, _time.time)();
     const { ssrContext } = context;
     try {
-      const App = import_react.default.createElement(this.App, {
-        context: Object.assign(context, { ssr: true })
+      const App = _react.default.createElement(this.App, {
+        context: Object.assign(context, {
+          ssr: true
+        })
       });
       const renderContext = {
         stats: ssrContext.loadableStats,
@@ -157,15 +166,15 @@ class Entry {
         entryName: this.entryName,
         config: this.pluginConfig
       };
-      html = (0, import_reduce.reduce)(App, renderContext, [
-        styledComponentRenderer.toHtml,
-        loadableRenderer.toHtml,
-        (jsx) => import_server.default.renderToString(jsx)
+      html = (0, _reduce.reduce)(App, renderContext, [
+        _styledComponent.toHtml,
+        _loadable.toHtml,
+        (jsx) => _server.default.renderToString(jsx)
       ]);
       const cost = end();
       this.logger.debug("App Render To HTML cost = %d ms", cost);
       this.metrics.emitTimer("app.render.html.cost", cost);
-      this.result.renderLevel = import_types.RenderLevel.SERVER_RENDER;
+      this.result.renderLevel = _types.RenderLevel.SERVER_RENDER;
     } catch (e) {
       this.logger.error("App Render To HTML", e);
       this.metrics.emitCounter("app.render.html.error", 1);
@@ -174,18 +183,43 @@ class Entry {
   }
   getSSRDataScript(templateData, routerData) {
     const useInlineScript = this.pluginConfig.inlineScript !== false;
-    const ssrData = (0, import_serialize.serializeJson)(templateData);
-    let ssrDataScripts = useInlineScript ? `<script>window._SSR_DATA = ${ssrData}</script>` : `<script type="application/json" id="${import_utils2.SSR_DATA_JSON_ID}">${ssrData}</script>`;
+    const ssrData = (0, _serialize.serializeJson)(templateData);
+    let ssrDataScripts = useInlineScript ? `<script>window._SSR_DATA = ${ssrData}</script>` : `<script type="application/json" id="${_utils1.SSR_DATA_JSON_ID}">${ssrData}</script>`;
     if (routerData) {
-      const serializedRouterData = (0, import_serialize.serializeJson)(routerData);
+      const serializedRouterData = (0, _serialize.serializeJson)(routerData);
       ssrDataScripts += useInlineScript ? `
 <script>window._ROUTER_DATA = ${serializedRouterData}</script>` : `
-<script type="application/json" id="${import_utils2.ROUTER_DATA_JSON_ID}">${serializedRouterData}</script>`;
+<script type="application/json" id="${_utils1.ROUTER_DATA_JSON_ID}">${serializedRouterData}</script>`;
     }
     return {
       SSRDataScript: ssrDataScripts
     };
   }
+  constructor(options) {
+    _define_property(this, "entryName", void 0);
+    _define_property(this, "result", void 0);
+    _define_property(this, "metrics", void 0);
+    _define_property(this, "logger", void 0);
+    _define_property(this, "App", void 0);
+    _define_property(this, "fragments", void 0);
+    _define_property(this, "pluginConfig", void 0);
+    _define_property(this, "host", void 0);
+    const { ctx, config } = options;
+    const { entryName, template, request: { host } } = ctx;
+    this.fragments = (0, _template.toFragments)(template, entryName);
+    this.entryName = entryName;
+    this.host = host;
+    this.App = options.App;
+    this.pluginConfig = config;
+    this.metrics = ctx.metrics;
+    this.logger = ctx.logger;
+    this.result = {
+      renderLevel: _types.RenderLevel.CLIENT_RENDER,
+      html: "",
+      chunksMap: {
+        js: "",
+        css: ""
+      }
+    };
+  }
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

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

@@ -1,65 +1,38 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var renderToString_exports = {};
-__export(renderToString_exports, {
-  render: () => render
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(renderToString_exports);
-var import_ssr = require("@modern-js/utils/ssr");
-var import_prerender = require("../../react/prerender");
-var import_time = require("../time");
-var import_entry = __toESM(require("./entry"));
-const render = ({
-  App,
-  context,
-  config
-}) => {
+Object.defineProperty(exports, "render", {
+  enumerable: true,
+  get: () => render
+});
+const _ssr = require("@modern-js/utils/ssr");
+const _prerender = require("../../react/prerender");
+const _time = require("../time");
+const _entry = /* @__PURE__ */ _interop_require_default(require("./entry"));
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
+const render = ({ App, context, config }) => {
   const ssrContext = context.ssrContext;
-  return (0, import_ssr.run)(ssrContext.request.headers, async () => {
-    const entry = new import_entry.default({
+  return (0, _ssr.run)(ssrContext.request.headers, async () => {
+    const entry = new _entry.default({
       ctx: ssrContext,
       App,
       config
     });
     entry.metrics.emitCounter("app.visit.count", 1);
-    const end = (0, import_time.time)();
+    const end = (0, _time.time)();
     const html = await entry.renderToHtml(context);
     const cost = end();
     entry.logger.info("App Render Total cost = %d ms", cost);
     entry.metrics.emitTimer("app.render.cost", cost);
-    const cacheConfig = import_prerender.PreRender.config();
+    const cacheConfig = _prerender.PreRender.config();
     if (cacheConfig) {
       context.ssrContext.cacheConfig = cacheConfig;
     }
     return html;
   });
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  render
-});

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

@@ -1,71 +1,46 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var loadable_exports = {};
-__export(loadable_exports, {
-  toHtml: () => toHtml
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(loadable_exports);
-var import_server = require("@loadable/server");
-var import_utils = require("../../utils");
-var import_utils2 = require("../utils");
+Object.defineProperty(exports, "toHtml", {
+  enumerable: true,
+  get: () => toHtml
+});
+const _server = require("@loadable/server");
+const _utils = require("../../utils");
+const _utils1 = require("../utils");
 const extname = (uri) => {
   if (typeof uri !== "string" || !uri.includes(".")) {
     return "";
   }
-  return `.${uri == null ? void 0 : uri.split(".").pop()}` || "";
+  return `.${uri === null || uri === void 0 ? void 0 : uri.split(".").pop()}` || "";
 };
 const toHtml = (jsx, renderer, next) => {
-  const {
-    stats,
-    result: { chunksMap },
-    host,
-    config = {}
-  } = renderer;
+  const { stats, result: { chunksMap }, host, config = {} } = renderer;
   if (!stats || chunksMap.js) {
     return next(jsx);
   }
-  const extractor = new import_server.ChunkExtractor({
+  const extractor = new _server.ChunkExtractor({
     stats,
-    entrypoints: [renderer.entryName]
+    entrypoints: [
+      renderer.entryName
+    ]
   });
   const html = next(extractor.collectChunks(jsx));
   const chunks = extractor.getChunkAssets(extractor.chunks);
-  chunksMap.js = (chunksMap.js || "") + (0, import_utils2.getLoadableScripts)(extractor);
+  chunksMap.js = (chunksMap.js || "") + (0, _utils1.getLoadableScripts)(extractor);
   for (const v of chunks) {
     const fileType = extname(v.url).slice(1);
     if (fileType === "js") {
       const props = [];
       const { crossorigin } = config;
-      if (crossorigin && (0, import_utils.isCrossOrigin)(v.url, host)) {
-        props.push(
-          `crossorigin="${crossorigin === true ? "anonymous" : crossorigin}"`
-        );
+      if (crossorigin && (0, _utils.isCrossOrigin)(v.url, host)) {
+        props.push(`crossorigin="${crossorigin === true ? "anonymous" : crossorigin}"`);
       }
-      chunksMap[fileType] += `<script src="${v.url}" ${props.join(
-        " "
-      )}></script>`;
+      chunksMap[fileType] += `<script src="${v.url}" ${props.join(" ")}></script>`;
     } else if (fileType === "css") {
       chunksMap[fileType] += `<link href="${v.url}" rel="stylesheet" />`;
     }
   }
   return html;
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  toHtml
-});

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

@@ -1,31 +1,19 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var reduce_exports = {};
-__export(reduce_exports, {
-  reduce: () => reduce
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(reduce_exports);
+Object.defineProperty(exports, "reduce", {
+  enumerable: true,
+  get: () => reduce
+});
+const _react = /* @__PURE__ */ _interop_require_default(require("react"));
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
 function reduce(jsx, renderer, middleware) {
   let index = 0;
   const createNext = () => (App) => middleware[index++](App, renderer, createNext());
   return createNext()(jsx);
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  reduce
-});

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

@@ -1,34 +1,16 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var styledComponent_exports = {};
-__export(styledComponent_exports, {
-  toHtml: () => toHtml
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(styledComponent_exports);
-var import_styled_components = require("styled-components");
+Object.defineProperty(exports, "toHtml", {
+  enumerable: true,
+  get: () => toHtml
+});
+const _styledcomponents = require("styled-components");
 const toHtml = (jsx, renderer, next) => {
-  const sheet = new import_styled_components.ServerStyleSheet();
+  const sheet = new _styledcomponents.ServerStyleSheet();
   const html = next(sheet.collectStyles(jsx));
   const css = sheet.getStyleTags();
   renderer.result.chunksMap.css += css;
   return html;
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  toHtml
-});