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

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

@@ -1,115 +1,131 @@
-import { jsx } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { loadableReady } from "@loadable/component";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { parsedJSONFromElement } from "@modern-js/utils/runtime";
-import {
-  RenderLevel
-} from "./serverRender/types";
+import { RenderLevel } from "./serverRender/types";
 import { WithCallback } from "./react/withCallback";
 import { formatClient, mockResponse, isReact18 } from "./utils";
 import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID } from "./serverRender/utils";
-const ssr = (config) => ({
-  name: "@modern-js/plugin-ssr",
-  setup: () => {
-    const mockResp = mockResponse();
-    if (config.inlineScript === false) {
-      window._SSR_DATA = parsedJSONFromElement(SSR_DATA_JSON_ID);
-      window._ROUTER_DATA = parsedJSONFromElement(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) || RenderLevel.CLIENT_RENDER;
-        if (isReact18() && config.mode === "stream") {
-          return streamSSRHydrate();
-        }
-        return stringSSRHydrate();
-        function stringSSRHydrate() {
-          if (renderLevel === RenderLevel.CLIENT_RENDER || renderLevel === RenderLevel.SERVER_PREFETCH) {
-            ModernRender(/* @__PURE__ */ jsx(App, { context }));
-          } else if (renderLevel === RenderLevel.SERVER_RENDER) {
-            if (isReact18()) {
-              loadableReady(() => {
-                let SSRApp = () => /* @__PURE__ */ jsx(WithCallback, { callback, children: /* @__PURE__ */ jsx(App, { context: hydrateContext }) });
-                SSRApp = hoistNonReactStatics(SSRApp, App);
-                ModernHydrate(/* @__PURE__ */ jsx(SSRApp, {}));
-              });
+export const ssr = (config) => {
+  return {
+    name: "@modern-js/plugin-ssr",
+    setup: () => {
+      const mockResp = mockResponse();
+      if (config.inlineScript === false) {
+        window._SSR_DATA = parsedJSONFromElement(SSR_DATA_JSON_ID);
+        window._ROUTER_DATA = parsedJSONFromElement(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) || RenderLevel.CLIENT_RENDER;
+          if (isReact18() && config.mode === "stream") {
+            return streamSSRHydrate();
+          }
+          return stringSSRHydrate();
+          function stringSSRHydrate() {
+            if (renderLevel === RenderLevel.CLIENT_RENDER || renderLevel === RenderLevel.SERVER_PREFETCH) {
+              ModernRender(/* @__PURE__ */ _jsx(App, {
+                context
+              }));
+            } else if (renderLevel === RenderLevel.SERVER_RENDER) {
+              if (isReact18()) {
+                loadableReady(() => {
+                  let SSRApp = () => /* @__PURE__ */ _jsx(WithCallback, {
+                    callback,
+                    children: /* @__PURE__ */ _jsx(App, {
+                      context: hydrateContext
+                    })
+                  });
+                  SSRApp = hoistNonReactStatics(SSRApp, App);
+                  ModernHydrate(/* @__PURE__ */ _jsx(SSRApp, {}));
+                });
+              } else {
+                loadableReady(() => {
+                  ModernHydrate(/* @__PURE__ */ _jsx(App, {
+                    context: hydrateContext
+                  }), callback);
+                });
+              }
             } else {
-              loadableReady(() => {
-                ModernHydrate(/* @__PURE__ */ jsx(App, { context: hydrateContext }), callback);
+              console.warn(`unknow render level: ${renderLevel}, execute render()`);
+              ModernRender(/* @__PURE__ */ _jsx(App, {
+                context
+              }));
+            }
+          }
+          function streamSSRHydrate() {
+            if (renderLevel === RenderLevel.SERVER_RENDER) {
+              let SSRApp = () => /* @__PURE__ */ _jsx(WithCallback, {
+                callback,
+                children: /* @__PURE__ */ _jsx(App, {
+                  context: hydrateContext
+                })
               });
+              SSRApp = hoistNonReactStatics(SSRApp, App);
+              ModernHydrate(/* @__PURE__ */ _jsx(SSRApp, {}));
+            } else {
+              ModernRender(/* @__PURE__ */ _jsx(App, {
+                context
+              }));
             }
-          } else {
-            console.warn(
-              `unknow render level: ${renderLevel}, execute render()`
-            );
-            ModernRender(/* @__PURE__ */ jsx(App, { context }));
           }
-        }
-        function streamSSRHydrate() {
-          if (renderLevel === RenderLevel.SERVER_RENDER) {
-            let SSRApp = () => /* @__PURE__ */ jsx(WithCallback, { callback, children: /* @__PURE__ */ jsx(App, { context: hydrateContext }) });
-            SSRApp = hoistNonReactStatics(SSRApp, App);
-            ModernHydrate(/* @__PURE__ */ jsx(SSRApp, {}));
-          } else {
-            ModernRender(/* @__PURE__ */ 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: formatClient({})
+            };
+            return next({
+              context
+            });
+          }
+          context.ssrContext.response = mockResp;
+          context.ssrContext.request = 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: formatClient({})
-          };
-          return next({ context });
-        }
-        context.ssrContext.response = mockResp;
-        context.ssrContext.request = 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;
-export * from "./react";
-export {
-  ssr_default as default,
-  ssr
+      };
+    }
+  };
 };
+export default ssr;
+export * from "./react";

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

@@ -1,42 +1,42 @@
 import { formatServer } from "./utils";
 import render from "./serverRender";
-const ssr = (config = {}) => ({
-  name: "@modern-js/plugin-ssr",
-  setup: () => {
-    return {
-      server: async ({ App, context }) => {
-        const html = await render({
-          context,
-          App,
-          config
-        });
-        return html;
-      },
-      init({ context }, next) {
-        const { request } = context.ssrContext;
-        context.ssrContext.request = 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;
-export * from "./react";
-export {
-  index_node_default as default,
-  ssr
+export const ssr = (config = {}) => {
+  return {
+    name: "@modern-js/plugin-ssr",
+    setup: () => {
+      return {
+        server: async ({ App, context }) => {
+          const html = await render({
+            context,
+            App,
+            config
+          });
+          return html;
+        },
+        init({ context }, next) {
+          const { request } = context.ssrContext;
+          context.ssrContext.request = 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
+            }
+          });
+        }
+      };
+    }
+  };
 };
+export default ssr;
+export * from "./react";

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

@@ -1,44 +1,49 @@
-import { jsx } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { renderToStaticMarkup } from "react-dom/server";
 import { run } from "@modern-js/utils/ssr";
 import { ChunkExtractor } from "@loadable/server";
-const prefetch = async (App, context) => run(context.ssrContext.request.headers, async () => {
-  var _a;
-  const { ssrContext } = context;
-  const { loadableStats } = ssrContext;
-  if (loadableStats) {
-    const extractor = new ChunkExtractor({
-      stats: loadableStats,
-      entrypoints: [ssrContext.entryName].filter(Boolean)
+const prefetch = async (App, context) => {
+  return run(context.ssrContext.request.headers, async () => {
+    var _context_store;
+    const { ssrContext } = context;
+    const { loadableStats } = ssrContext;
+    if (loadableStats) {
+      const extractor = new ChunkExtractor({
+        stats: loadableStats,
+        entrypoints: [
+          ssrContext.entryName
+        ].filter(Boolean)
+      });
+      renderToStaticMarkup(extractor.collectChunks(/* @__PURE__ */ _jsx(App, {
+        context
+      })));
+    } else {
+      renderToStaticMarkup(/* @__PURE__ */ _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;
+      }
     });
-    renderToStaticMarkup(extractor.collectChunks(/* @__PURE__ */ jsx(App, { context })));
-  } else {
-    renderToStaticMarkup(/* @__PURE__ */ 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;
-export {
-  prefetch_default as default
 };
+export default prefetch;

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

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

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

@@ -1,18 +1,11 @@
 import React, { useEffect, useState } from "react";
 let csr = false;
-const NoSSR = (props) => {
+export const NoSSR = (props) => {
   const [isMounted, setMounted] = useState(csr);
   useEffect(() => {
     csr = true;
     setMounted(true);
   });
   const { children, fallback = null } = props;
-  return React.createElement(
-    React.Fragment,
-    null,
-    isMounted ? children : fallback
-  );
-};
-export {
-  NoSSR
+  return React.createElement(React.Fragment, null, isMounted ? children : fallback);
 };

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

@@ -1,11 +1,19 @@
+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;
+}
 import withSideEffect from "react-side-effect";
 import React, { createElement } from "react";
-import {
-  getOutermostProperty,
-  aggKeysFromPropsList,
-  exist,
-  aggMatchesFromPropsList
-} from "./util";
+import { getOutermostProperty, aggKeysFromPropsList, exist, aggMatchesFromPropsList } from "./util";
 const PROP_NAMES = {
   INTERVAL: "interval",
   STALE_LIMIT: "staleLimit",
@@ -32,7 +40,10 @@ const mapStateOnServer = (reduceProps) => {
     const reduceProp = reduceProps[propKey];
     let nextProps = props;
     if (exist(reduceProp)) {
-      nextProps = { ...props, [propKey]: reduceProp };
+      nextProps = {
+        ...props,
+        [propKey]: reduceProp
+      };
     }
     return nextProps;
   }, defaultProps);
@@ -50,7 +61,8 @@ const reducePropsToState = (propsList) => {
   return reduceProps;
 };
 function factory(Component) {
-  class Spr extends React.Component {
+  var _React_Component;
+  class Spr extends (_React_Component = React.Component) {
     static set canUseDOM(canUseDOM) {
       Component.canUseDOM = canUseDOM;
     }
@@ -61,29 +73,26 @@ function factory(Component) {
       return true;
     }
     render() {
-      const newProps = { ...this.props };
+      const newProps = {
+        ...this.props
+      };
       const validate = this.verify();
       if (!validate) {
         throw new Error("invalid props, check usage");
       }
-      return createElement(Component, { ...newProps });
+      return createElement(Component, {
+        ...newProps
+      });
     }
   }
-  Spr.peek = Component.peek;
-  Spr.rewind = Component.rewind;
-  Spr.config = () => {
+  _define_property(Spr, "peek", Component.peek);
+  _define_property(Spr, "rewind", Component.rewind);
+  _define_property(Spr, "config", () => {
     const mappedState = Component.rewind();
     return mappedState;
-  };
+  });
   return Spr;
 }
 const NullComponent = () => null;
-const SprSideEffects = withSideEffect(
-  reducePropsToState,
-  handleClientStateChange,
-  mapStateOnServer
-)(NullComponent);
-const PreRender = factory(SprSideEffects);
-export {
-  PreRender
-};
+const SprSideEffects = withSideEffect(reducePropsToState, handleClientStateChange, mapStateOnServer)(NullComponent);
+export const PreRender = factory(SprSideEffects);

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

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

package/dist/esm-node/ssr/react/prerender/util.js

@@ -1,5 +1,8 @@
-const REQUEST_META = ["header", "query"];
-const getInnermostProperty = function getInnermostProperty2(propsList, propName) {
+const REQUEST_META = [
+  "header",
+  "query"
+];
+export const getInnermostProperty = function getInnermostProperty2(propsList, propName) {
   for (let i = propsList.length - 1; i >= 0; i--) {
     const props = propsList[i];
     if (props.hasOwnProperty(propName)) {
@@ -8,7 +11,7 @@ const getInnermostProperty = function getInnermostProperty2(propsList, propName)
   }
   return null;
 };
-const getOutermostProperty = function getOutermostProperty2(propsList, propName) {
+export const getOutermostProperty = function getOutermostProperty2(propsList, propName) {
   for (const props of propsList) {
     if (props.hasOwnProperty(propName)) {
       return props[propName];
@@ -16,46 +19,40 @@ const getOutermostProperty = function getOutermostProperty2(propsList, propName)
   }
   return null;
 };
-const aggKeysFromPropsList = function aggKeysFromPropsList2(propsList, propName) {
-  const initResult = REQUEST_META.reduce(
-    (result, next) => {
-      const key = next;
-      result[key] = [];
-      return result;
-    },
-    {}
-  );
+export const aggKeysFromPropsList = function aggKeysFromPropsList2(propsList, propName) {
+  const initResult = REQUEST_META.reduce((result, next) => {
+    const key = next;
+    result[key] = [];
+    return result;
+  }, {});
   const res = propsList.filter((props) => usefulObject(props[propName])).reduce((result, next) => {
     REQUEST_META.forEach((key) => {
       const prop = next[propName];
-      if ((prop == null ? void 0 : prop.hasOwnProperty(key)) && usefulArray(prop[key])) {
+      if ((prop === null || prop === void 0 ? void 0 : prop.hasOwnProperty(key)) && usefulArray(prop[key])) {
         result[key] = unique(result[key].concat(prop[key]));
       }
     });
     return result;
   }, initResult);
   return REQUEST_META.reduce((result, next) => {
-    var _a;
+    var _result_key;
     const key = next;
-    if (result[key] && ((_a = result[key]) == null ? void 0 : _a.length) === 0) {
+    if (result[key] && ((_result_key = result[key]) === null || _result_key === void 0 ? void 0 : _result_key.length) === 0) {
       delete result[key];
     }
     return result;
   }, res);
 };
-const aggMatchesFromPropsList = function aggMatchesFromPropsList2(propsList, propName) {
-  const initResult = REQUEST_META.reduce(
-    (result, next) => {
-      const key = next;
-      result[key] = {};
-      return result;
-    },
-    {}
-  );
+export const aggMatchesFromPropsList = function aggMatchesFromPropsList2(propsList, propName) {
+  const initResult = REQUEST_META.reduce((result, next) => {
+    const key = next;
+    result[key] = {};
+    return result;
+  }, {});
   const res = propsList.filter((props) => usefulObject(props[propName])).reduce((result, next) => {
     REQUEST_META.forEach((key) => {
       const prop = next[propName];
-      if ((prop == null ? void 0 : prop.hasOwnProperty(key)) && usefulObject(prop[key])) {
+      if ((prop === null || prop === void 0 ? void 0 : prop.hasOwnProperty(key)) && usefulObject(prop[key])) {
         result[key] = Object.assign(result[key], prop[key]);
       }
     });
@@ -84,13 +81,6 @@ function usefulArray(target) {
   }
   return Array.isArray(target) && target.length > 0;
 }
-function exist(target) {
+export function exist(target) {
   return target != null;
 }
-export {
-  aggKeysFromPropsList,
-  aggMatchesFromPropsList,
-  exist,
-  getInnermostProperty,
-  getOutermostProperty
-};

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

@@ -1,5 +1,5 @@
 import { useRef, useLayoutEffect } from "react";
-const WithCallback = ({ callback, children }) => {
+export const WithCallback = ({ callback, children }) => {
   const once = useRef(false);
   useLayoutEffect(() => {
     if (once.current) {
@@ -7,9 +7,8 @@ const WithCallback = ({ callback, children }) => {
     }
     once.current = true;
     callback();
-  }, [callback]);
+  }, [
+    callback
+  ]);
   return children;
 };
-export {
-  WithCallback
-};

package/dist/esm-node/ssr/serverRender/helmet.js

@@ -3,8 +3,8 @@ const RE_HTML_ATTR = /<html[^>]*>/;
 const RE_BODY_ATTR = /<body[^>]*>/;
 const RE_LAST_IN_HEAD = /<\/head>/;
 const RE_TITLE = /<title[^>]*>([\s\S\n\r]*?)<\/title>/;
-const TEST_TITLE_CONTENT = /(?<=<title[^>]*>)([\s\S\n\r]*?)([.|\S])([\s\S\n\r]*?)(?=<\/title>)/;
-function helmet(content, helmetData) {
+const TEST_TITLE_CONTENT = RegExp("(?<=<title[^>]*>)([\\s\\S\\n\\r]*?)([.|\\S])([\\s\\S\\n\\r]*?)(?=<\\/title>)");
+export default function helmet(content, helmetData) {
   let result = content;
   const bodyAttributes = helmetData.bodyAttributes.toString();
   if (bodyAttributes) {
@@ -39,6 +39,3 @@ function helmet(content, helmetData) {
   }, "");
   return result.replace(RE_LAST_IN_HEAD, `${helmetStr}</head>`);
 }
-export {
-  helmet as default
-};