@modern-js/runtime 2.14.0 → 2.15.1-alpha.0

package/dist/cjs/ssr/index.js

@@ -1,147 +1,164 @@
-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) => {
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-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 ssr_exports = {};
-__export(ssr_exports, {
-  default: () => ssr_default,
-  ssr: () => ssr
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  ssr: () => ssr,
+  default: () => _default
 });
-module.exports = __toCommonJS(ssr_exports);
-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_runtime = require("@modern-js/utils/runtime");
-var import_types = require("./serverRender/types");
-var import_withCallback = require("./react/withCallback");
-var import_utils = require("./utils");
-var import_utils2 = require("./serverRender/utils");
-__reExport(ssr_exports, require("./react"), module.exports);
-const ssr = (config) => ({
-  name: "@modern-js/plugin-ssr",
-  setup: () => {
-    const mockResp = (0, import_utils.mockResponse)();
-    if (config.inlineScript === false) {
-      window._SSR_DATA = (0, import_runtime.parsedJSONFromElement)(import_utils2.SSR_DATA_JSON_ID);
-      window._ROUTER_DATA = (0, import_runtime.parsedJSONFromElement)(import_utils2.ROUTER_DATA_JSON_ID);
-    }
-    return {
-      client: async ({ App, context, ModernRender, ModernHydrate }) => {
-        var _a;
-        const hydrateContext = {
-          ...context,
-          get routes() {
-            return context.routes;
-          },
-          _hydration: true
-        };
-        const callback = () => {
-          delete hydrateContext._hydration;
-        };
-        const renderLevel = ((_a = window == null ? void 0 : window._SSR_DATA) == null ? void 0 : _a.renderLevel) || import_types.RenderLevel.CLIENT_RENDER;
-        if ((0, import_utils.isReact18)() && config.mode === "stream") {
-          return streamSSRHydrate();
+const _jsxruntime = require("react/jsx-runtime");
+const _component = require("@loadable/component");
+const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default(require("hoist-non-react-statics"));
+const _runtime = require("@modern-js/utils/runtime");
+const _types = require("./serverRender/types");
+const _withCallback = require("./react/withCallback");
+const _utils = require("./utils");
+const _utils1 = require("./serverRender/utils");
+_export_star(require("./react"), exports);
+function _export_star(from, to) {
+  Object.keys(from).forEach(function(k) {
+    if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
+      Object.defineProperty(to, k, {
+        enumerable: true,
+        get: function() {
+          return from[k];
         }
-        return stringSSRHydrate();
-        function stringSSRHydrate() {
-          if (renderLevel === import_types.RenderLevel.CLIENT_RENDER || renderLevel === import_types.RenderLevel.SERVER_PREFETCH) {
-            ModernRender(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { context }));
-          } else if (renderLevel === import_types.RenderLevel.SERVER_RENDER) {
-            if ((0, import_utils.isReact18)()) {
-              (0, import_component.loadableReady)(() => {
-                let SSRApp = () => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_withCallback.WithCallback, { callback, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { context: hydrateContext }) });
-                SSRApp = (0, import_hoist_non_react_statics.default)(SSRApp, App);
-                ModernHydrate(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(SSRApp, {}));
-              });
+      });
+    }
+  });
+  return from;
+}
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
+const ssr = (config) => {
+  return {
+    name: "@modern-js/plugin-ssr",
+    setup: () => {
+      const mockResp = (0, _utils.mockResponse)();
+      if (config.inlineScript === false) {
+        window._SSR_DATA = (0, _runtime.parsedJSONFromElement)(_utils1.SSR_DATA_JSON_ID);
+        window._ROUTER_DATA = (0, _runtime.parsedJSONFromElement)(_utils1.ROUTER_DATA_JSON_ID);
+      }
+      return {
+        client: async ({ App, context, ModernRender, ModernHydrate }) => {
+          var _window__SSR_DATA;
+          const hydrateContext = {
+            ...context,
+            get routes() {
+              return context.routes;
+            },
+            _hydration: true
+          };
+          const callback = () => {
+            delete hydrateContext._hydration;
+          };
+          const renderLevel = (window === null || window === void 0 ? void 0 : (_window__SSR_DATA = window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : _window__SSR_DATA.renderLevel) || _types.RenderLevel.CLIENT_RENDER;
+          if ((0, _utils.isReact18)() && config.mode === "stream") {
+            return streamSSRHydrate();
+          }
+          return stringSSRHydrate();
+          function stringSSRHydrate() {
+            if (renderLevel === _types.RenderLevel.CLIENT_RENDER || renderLevel === _types.RenderLevel.SERVER_PREFETCH) {
+              ModernRender(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+                context
+              }));
+            } else if (renderLevel === _types.RenderLevel.SERVER_RENDER) {
+              if ((0, _utils.isReact18)()) {
+                (0, _component.loadableReady)(() => {
+                  let SSRApp = () => /* @__PURE__ */ (0, _jsxruntime.jsx)(_withCallback.WithCallback, {
+                    callback,
+                    children: /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+                      context: hydrateContext
+                    })
+                  });
+                  SSRApp = (0, _hoistnonreactstatics.default)(SSRApp, App);
+                  ModernHydrate(/* @__PURE__ */ (0, _jsxruntime.jsx)(SSRApp, {}));
+                });
+              } else {
+                (0, _component.loadableReady)(() => {
+                  ModernHydrate(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+                    context: hydrateContext
+                  }), callback);
+                });
+              }
             } else {
-              (0, import_component.loadableReady)(() => {
-                ModernHydrate(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { context: hydrateContext }), callback);
+              console.warn(`unknow render level: ${renderLevel}, execute render()`);
+              ModernRender(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+                context
+              }));
+            }
+          }
+          function streamSSRHydrate() {
+            if (renderLevel === _types.RenderLevel.SERVER_RENDER) {
+              let SSRApp = () => /* @__PURE__ */ (0, _jsxruntime.jsx)(_withCallback.WithCallback, {
+                callback,
+                children: /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+                  context: hydrateContext
+                })
               });
+              SSRApp = (0, _hoistnonreactstatics.default)(SSRApp, App);
+              ModernHydrate(/* @__PURE__ */ (0, _jsxruntime.jsx)(SSRApp, {}));
+            } else {
+              ModernRender(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+                context
+              }));
             }
-          } else {
-            console.warn(
-              `unknow render level: ${renderLevel}, execute render()`
-            );
-            ModernRender(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { context }));
           }
-        }
-        function streamSSRHydrate() {
-          if (renderLevel === import_types.RenderLevel.SERVER_RENDER) {
-            let SSRApp = () => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_withCallback.WithCallback, { callback, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { context: hydrateContext }) });
-            SSRApp = (0, import_hoist_non_react_statics.default)(SSRApp, App);
-            ModernHydrate(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(SSRApp, {}));
-          } else {
-            ModernRender(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { context }));
+        },
+        init({ context }, next) {
+          var _window__SSR_DATA, _window__SSR_DATA_context;
+          const request = window === null || window === void 0 ? void 0 : (_window__SSR_DATA = window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_context = _window__SSR_DATA.context) === null || _window__SSR_DATA_context === void 0 ? void 0 : _window__SSR_DATA_context.request;
+          if (!request) {
+            context.ssrContext = {
+              ...context.ssrContext,
+              response: mockResp,
+              request: (0, _utils.formatClient)({})
+            };
+            return next({
+              context
+            });
+          }
+          context.ssrContext.response = mockResp;
+          context.ssrContext.request = (0, _utils.formatClient)(request);
+          return next({
+            context
+          });
+        },
+        pickContext: ({ context, pickedContext }, next) => {
+          var _window__SSR_DATA, _window__SSR_DATA_context;
+          const request = window === null || window === void 0 ? void 0 : (_window__SSR_DATA = window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_context = _window__SSR_DATA.context) === null || _window__SSR_DATA_context === void 0 ? void 0 : _window__SSR_DATA_context.request;
+          const { initialData } = context;
+          if (!request) {
+            return next({
+              context,
+              pickedContext: {
+                ...pickedContext,
+                initialData
+              }
+            });
           }
-        }
-      },
-      init({ context }, next) {
-        var _a, _b;
-        const request = (_b = (_a = window == null ? void 0 : window._SSR_DATA) == null ? void 0 : _a.context) == null ? void 0 : _b.request;
-        if (!request) {
-          context.ssrContext = {
-            ...context.ssrContext,
-            response: mockResp,
-            request: (0, import_utils.formatClient)({})
-          };
-          return next({ context });
-        }
-        context.ssrContext.response = mockResp;
-        context.ssrContext.request = (0, import_utils.formatClient)(request);
-        return next({ context });
-      },
-      pickContext: ({ context, pickedContext }, next) => {
-        var _a, _b;
-        const request = (_b = (_a = window == null ? void 0 : window._SSR_DATA) == null ? void 0 : _a.context) == null ? void 0 : _b.request;
-        const { initialData } = context;
-        if (!request) {
           return next({
             context,
             pickedContext: {
               ...pickedContext,
-              initialData
+              initialData,
+              request,
+              response: mockResp
             }
           });
         }
-        return next({
-          context,
-          pickedContext: {
-            ...pickedContext,
-            initialData,
-            request,
-            response: mockResp
-          }
-        });
-      }
-    };
-  }
-});
-var ssr_default = ssr;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ssr
-});
+      };
+    }
+  };
+};
+const _default = ssr;

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

@@ -1,76 +1,75 @@
-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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-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 index_node_exports = {};
-__export(index_node_exports, {
-  default: () => index_node_default,
-  ssr: () => ssr
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(index_node_exports);
-var import_utils = require("./utils");
-var import_serverRender = __toESM(require("./serverRender"));
-__reExport(index_node_exports, require("./react"), module.exports);
-const ssr = (config = {}) => ({
-  name: "@modern-js/plugin-ssr",
-  setup: () => {
-    return {
-      server: async ({ App, context }) => {
-        const html = await (0, import_serverRender.default)({
-          context,
-          App,
-          config
-        });
-        return html;
-      },
-      init({ context }, next) {
-        const { request } = context.ssrContext;
-        context.ssrContext.request = (0, import_utils.formatServer)(request);
-        context.ssrContext.mode = config.mode;
-        return next({ context });
-      },
-      pickContext: ({ context, pickedContext }, next) => {
-        const { request, response } = context == null ? void 0 : context.ssrContext;
-        const { initialData } = context;
-        return next({
-          context,
-          pickedContext: {
-            ...pickedContext,
-            initialData,
-            request,
-            response
-          }
-        });
-      }
-    };
-  }
-});
-var index_node_default = ssr;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ssr
+function _export(target, all) {
+  for (var name in all)
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  ssr: () => ssr,
+  default: () => _default
 });
+const _utils = require("./utils");
+const _serverRender = /* @__PURE__ */ _interop_require_default(require("./serverRender"));
+_export_star(require("./react"), exports);
+function _export_star(from, to) {
+  Object.keys(from).forEach(function(k) {
+    if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
+      Object.defineProperty(to, k, {
+        enumerable: true,
+        get: function() {
+          return from[k];
+        }
+      });
+    }
+  });
+  return from;
+}
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
+const ssr = (config = {}) => {
+  return {
+    name: "@modern-js/plugin-ssr",
+    setup: () => {
+      return {
+        server: async ({ App, context }) => {
+          const html = await (0, _serverRender.default)({
+            context,
+            App,
+            config
+          });
+          return html;
+        },
+        init({ context }, next) {
+          const { request } = context.ssrContext;
+          context.ssrContext.request = (0, _utils.formatServer)(request);
+          context.ssrContext.mode = config.mode;
+          return next({
+            context
+          });
+        },
+        pickContext: ({ context, pickedContext }, next) => {
+          const { request, response } = context === null || context === void 0 ? void 0 : context.ssrContext;
+          const { initialData } = context;
+          return next({
+            context,
+            pickedContext: {
+              ...pickedContext,
+              initialData,
+              request,
+              response
+            }
+          });
+        }
+      };
+    }
+  };
+};
+const _default = ssr;

package/dist/cjs/ssr/prefetch.js

@@ -1,65 +1,57 @@
-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 prefetch_exports = {};
-__export(prefetch_exports, {
-  default: () => prefetch_default
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(prefetch_exports);
-var import_jsx_runtime = require("react/jsx-runtime");
-var import_server = require("react-dom/server");
-var import_ssr = require("@modern-js/utils/ssr");
-var import_server2 = require("@loadable/server");
-const prefetch = async (App, context) => (0, import_ssr.run)(context.ssrContext.request.headers, async () => {
-  var _a;
-  const { ssrContext } = context;
-  const { loadableStats } = ssrContext;
-  if (loadableStats) {
-    const extractor = new import_server2.ChunkExtractor({
-      stats: loadableStats,
-      entrypoints: [ssrContext.entryName].filter(Boolean)
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: () => _default
+});
+const _jsxruntime = require("react/jsx-runtime");
+const _server = require("react-dom/server");
+const _ssr = require("@modern-js/utils/ssr");
+const _server1 = require("@loadable/server");
+const prefetch = async (App, context) => {
+  return (0, _ssr.run)(context.ssrContext.request.headers, async () => {
+    var _context_store;
+    const { ssrContext } = context;
+    const { loadableStats } = ssrContext;
+    if (loadableStats) {
+      const extractor = new _server1.ChunkExtractor({
+        stats: loadableStats,
+        entrypoints: [
+          ssrContext.entryName
+        ].filter(Boolean)
+      });
+      (0, _server.renderToStaticMarkup)(extractor.collectChunks(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+        context
+      })));
+    } else {
+      (0, _server.renderToStaticMarkup)(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+        context
+      }));
+    }
+    if (!context.loaderManager.hasPendingLoaders()) {
+      return {
+        initialData: context.initialData,
+        i18nData: context.__i18nData__
+      };
+    }
+    const loadersData = await context.loaderManager.awaitPendingLoaders();
+    Object.keys(loadersData).forEach((id) => {
+      const data = loadersData[id];
+      if (data._error) {
+        ssrContext.logger.error("App Prefetch Loader", data._error);
+        ssrContext.metrics.emitCounter("app.prefetch.loader.error", 1);
+        delete data._error;
+      }
     });
-    (0, import_server.renderToStaticMarkup)(extractor.collectChunks(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { context })));
-  } else {
-    (0, import_server.renderToStaticMarkup)(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { context }));
-  }
-  if (!context.loaderManager.hasPendingLoaders()) {
     return {
+      loadersData,
       initialData: context.initialData,
-      i18nData: context.__i18nData__
+      i18nData: context.__i18nData__,
+      // todo: move to plugin state
+      storeState: context === null || context === void 0 ? void 0 : (_context_store = context.store) === null || _context_store === void 0 ? void 0 : _context_store.getState()
     };
-  }
-  const loadersData = await context.loaderManager.awaitPendingLoaders();
-  Object.keys(loadersData).forEach((id) => {
-    const data = loadersData[id];
-    if (data._error) {
-      ssrContext.logger.error("App Prefetch Loader", data._error);
-      ssrContext.metrics.emitCounter("app.prefetch.loader.error", 1);
-      delete data._error;
-    }
   });
-  return {
-    loadersData,
-    initialData: context.initialData,
-    i18nData: context.__i18nData__,
-    // todo: move to plugin state
-    storeState: (_a = context == null ? void 0 : context.store) == null ? void 0 : _a.getState()
-  };
-});
-var prefetch_default = prefetch;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+};
+const _default = prefetch;

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

@@ -1,30 +1,17 @@
-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 react_exports = {};
-__export(react_exports, {
-  NoSSR: () => import_nossr.NoSSR,
-  PreRender: () => import_prerender.PreRender
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(react_exports);
-var import_prerender = require("./prerender");
-var import_nossr = require("./nossr");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  NoSSR,
-  PreRender
+function _export(target, all) {
+  for (var name in all)
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  PreRender: () => _prerender.PreRender,
+  NoSSR: () => _nossr.NoSSR
 });
+const _prerender = require("./prerender");
+const _nossr = require("./nossr");