@modern-js/runtime 2.4.1-alpha.1 → 2.5.0-alpha.0

package/dist/{js/treeshaking → esm}/ssr/serverRender/renderToStream/template.js

@@ -48,11 +48,12 @@ import { buildShellAfterTemplate } from "./buildTemplate.after";
 import { buildShellBeforeTemplate } from "./bulidTemplate.before";
 var HTML_SEPARATOR = "<!--<?- html ?>-->";
 var getTemplates = function(context, renderLevel) {
-    var ssrContext = context.ssrContext;
+    var ssrContext = context.ssrContext, routerContext = context.routerContext;
     var _ref = _slicedToArray(ssrContext.template.split(HTML_SEPARATOR) || [], 2), tmp = _ref[0], beforeAppTemplate = tmp === void 0 ? "" : tmp, tmp1 = _ref[1], afterAppHtmlTemplate = tmp1 === void 0 ? "" : tmp1;
     var builtBeforeTemplate = buildShellBeforeTemplate(beforeAppTemplate, context);
     var builtAfterTemplate = buildShellAfterTemplate(afterAppHtmlTemplate, {
         ssrContext: ssrContext,
+        routerContext: routerContext,
         renderLevel: renderLevel
     });
     return {

package/dist/{js/treeshaking → esm}/ssr/serverRender/renderToString/entry.js

@@ -156,7 +156,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
 };
 import React from "react";
 import ReactDomServer from "react-dom/server";
-import serialize from "serialize-javascript";
+import { serializeJson } from "@modern-js/utils/serialize";
 import ReactHelmet from "react-helmet";
 import helmetReplace from "../helmet";
 import { RenderLevel } from "../types";
@@ -166,10 +166,11 @@ import { toFragments } from "./template";
 import { reduce } from "./reduce";
 import * as loadableRenderer from "./loadable";
 import * as styledComponentRenderer from "./styledComponent";
-var buildTemplateData = function(context, data, renderLevel) {
+var buildTemplateData = function(context, data, routerData, renderLevel) {
     var request = context.request;
     return {
         data: data,
+        routerData: routerData,
         context: {
             request: {
                 params: request.params,
@@ -220,7 +221,7 @@ var Entry = /*#__PURE__*/ function() {
             value: function renderToHtml(context) {
                 var _this = this;
                 return _asyncToGenerator(function() {
-                    var _ssrContext_redirection, _ssrContext_redirection1, _ssrContext_redirection2, ssrContext, prefetchData, html, templateData, SSRData, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, fragment, helmetData;
+                    var _ssrContext_redirection, _ssrContext_redirection1, _ssrContext_redirection2, ssrContext, prefetchData, routerContext, routerData, html, templateData, SSRData, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, fragment, helmetData;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -252,8 +253,12 @@ var Entry = /*#__PURE__*/ function() {
                                         ""
                                     ];
                                 }
+                                routerContext = context.routerContext;
+                                routerData = routerContext !== null && routerContext !== void 0 ? routerContext : {
+                                    loaderData: routerContext.loaderData
+                                };
                                 html = "";
-                                templateData = buildTemplateData(ssrContext, prefetchData, _this.result.renderLevel);
+                                templateData = buildTemplateData(ssrContext, prefetchData, routerData, _this.result.renderLevel);
                                 SSRData = _this.getSSRDataScript(templateData);
                                 _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                                 try {
@@ -381,9 +386,7 @@ var Entry = /*#__PURE__*/ function() {
             key: "getSSRDataScript",
             value: function getSSRDataScript(templateData) {
                 return {
-                    SSRDataScript: "\n        <script>window._SSR_DATA = ".concat(serialize(templateData, {
-                        isJSON: true
-                    }), "</script>\n      ")
+                    SSRDataScript: "\n        <script>window._SSR_DATA = ".concat(serializeJson(templateData), "</script>\n      ")
                 };
             }
         }

package/dist/esm/state/types.js

@@ -0,0 +1 @@
+"use strict";

package/dist/{js/modern → esm-node}/cli/index.js

@@ -1,23 +1,3 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 import path from "path";
 import { PLUGIN_SCHEMAS, cleanRequireCache, isReact18 } from "@modern-js/utils";
 import PluginState from "../state/cli";
@@ -55,14 +35,12 @@ var cli_default = () => ({
       validateSchema() {
         return PLUGIN_SCHEMAS["@modern-js/runtime"];
       },
-      beforeRestart() {
-        return __async(this, null, function* () {
-          cleanRequireCache([
-            require.resolve("../state/cli"),
-            require.resolve("../router/cli"),
-            require.resolve("../ssr/cli")
-          ]);
-        });
+      async beforeRestart() {
+        cleanRequireCache([
+          require.resolve("../state/cli"),
+          require.resolve("../router/cli"),
+          require.resolve("../ssr/cli")
+        ]);
       }
     };
   }

package/dist/esm-node/common.js

@@ -0,0 +1,8 @@
+const isBrowser = () => typeof window !== "undefined" && window.name !== "nodejs";
+const JSX_SHELL_STREAM_END_MARK = "<!--<?- SHELL_STREAM_END ?>-->";
+const ESCAPED_SHELL_STREAM_END_MARK = "&lt;!--&lt;?- SHELL_STREAM_END ?&gt;--&gt;";
+export {
+  ESCAPED_SHELL_STREAM_END_MARK,
+  JSX_SHELL_STREAM_END_MARK,
+  isBrowser
+};

package/dist/{js/modern → esm-node}/core/compatible.js

@@ -1,51 +1,3 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 import { jsx } from "react/jsx-runtime";
 import React, { useContext, useMemo } from "react";
 import hoistNonReactStatics from "hoist-non-react-statics";
@@ -74,12 +26,12 @@ const createApp = ({ plugins }) => {
     const WrapperComponent = (props) => {
       const element = React.createElement(
         App || React.Fragment,
-        __spreadValues({}, props),
+        { ...props },
         props.children
       );
       const context = useContext(RuntimeReactContext);
       return runner.provide(
-        { element, props: __spreadValues({}, props), context },
+        { element, props: { ...props }, context },
         {
           onLast: ({ element: element2 }) => element2
         }
@@ -92,8 +44,7 @@ const createApp = ({ plugins }) => {
       { App: WrapperComponent },
       {
         onLast: ({ App: App2 }) => {
-          const WrapComponent = (_a) => {
-            var _b = _a, { context } = _b, props = __objRest(_b, ["context"]);
+          const WrapComponent = ({ context, ...props }) => {
             let contextValue = context;
             if (!(contextValue == null ? void 0 : contextValue.runner)) {
               contextValue = getInitialContext(runner);
@@ -101,15 +52,17 @@ const createApp = ({ plugins }) => {
                 { context: contextValue },
                 {
                   onLast: ({ context: context1 }) => {
-                    var _a2;
-                    return (_a2 = App2 == null ? void 0 : App2.init) == null ? void 0 : _a2.call(App2, context1);
+                    var _a;
+                    return (_a = App2 == null ? void 0 : App2.init) == null ? void 0 : _a.call(App2, context1);
                   }
                 }
               );
             }
             return /* @__PURE__ */ jsx(RuntimeReactContext.Provider, {
               value: contextValue,
-              children: /* @__PURE__ */ jsx(App2, __spreadValues({}, props))
+              children: /* @__PURE__ */ jsx(App2, {
+                ...props
+              })
             });
           };
           return hoistNonReactStatics(WrapComponent, App2);
@@ -120,7 +73,7 @@ const createApp = ({ plugins }) => {
     return HOCApp;
   };
 };
-const bootstrap = (BootApp, id, root, ReactDOM) => __async(void 0, null, function* () {
+const bootstrap = async (BootApp, id, root, ReactDOM) => {
   var _a, _b;
   let App = BootApp;
   let runner = runnerMap.get(App);
@@ -159,13 +112,14 @@ const bootstrap = (BootApp, id, root, ReactDOM) => __async(void 0, null, functio
         },
         {}
       );
-      Object.assign(context, __spreadValues({
+      Object.assign(context, {
         loaderManager: createLoaderManager(initialLoadersState, {
           skipStatic: true
-        })
-      }, ssrData ? { ssrContext: ssrData == null ? void 0 : ssrData.context } : {}));
+        }),
+        ...ssrData ? { ssrContext: ssrData == null ? void 0 : ssrData.context } : {}
+      });
       context.initialData = (_b = ssrData == null ? void 0 : ssrData.data) == null ? void 0 : _b.initialData;
-      const initialData = yield runInit(context);
+      const initialData = await runInit(context);
       if (initialData) {
         context.initialData = initialData;
       }
@@ -256,7 +210,7 @@ const bootstrap = (BootApp, id, root, ReactDOM) => __async(void 0, null, functio
       }
       return false;
     };
-    const initialData = yield runInit(context);
+    const initialData = await runInit(context);
     if (!isRedirectResponse(initialData)) {
       context.initialData = initialData;
       return runner.server({
@@ -265,7 +219,7 @@ const bootstrap = (BootApp, id, root, ReactDOM) => __async(void 0, null, functio
       });
     }
   }
-});
+};
 const useRuntimeContext = () => {
   const context = useContext(RuntimeReactContext);
   const memoizedContext = useMemo(

package/dist/{js/modern → esm-node}/core/loader/loaderManager.js

@@ -1,23 +1,3 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 import invariant from "invariant";
 const createGetId = () => {
   const idCache = /* @__PURE__ */ new Map();
@@ -50,7 +30,7 @@ const createLoader = (id, initialData = {
   let { data, error } = initialData;
   let hasLoaded = false;
   const handlers = /* @__PURE__ */ new Set();
-  const load = () => __async(void 0, null, function* () {
+  const load = async () => {
     if (skip) {
       return promise;
     }
@@ -73,7 +53,7 @@ const createLoader = (id, initialData = {
       notify();
     });
     return promise;
-  });
+  };
   const getResult = () => ({
     loading: !hasLoaded && status === 1 /* loading */,
     reloading: hasLoaded && status === 1 /* loading */,
@@ -135,7 +115,7 @@ const createLoaderManager = (initialDataMap, managerOptions = {}) => {
     }
     return false;
   };
-  const awaitPendingLoaders = () => __async(void 0, null, function* () {
+  const awaitPendingLoaders = async () => {
     const pendingLoaders = [];
     for (const [id, loader] of loadersMap) {
       const { promise } = loader;
@@ -143,7 +123,7 @@ const createLoaderManager = (initialDataMap, managerOptions = {}) => {
         pendingLoaders.push([id, loader]);
       }
     }
-    yield Promise.all(pendingLoaders.map((item) => item[1].promise));
+    await Promise.all(pendingLoaders.map((item) => item[1].promise));
     return pendingLoaders.reduce(
       (res, [id, loader]) => {
         res[id] = loader.result;
@@ -151,7 +131,7 @@ const createLoaderManager = (initialDataMap, managerOptions = {}) => {
       },
       {}
     );
-  });
+  };
   return {
     hasPendingLoaders,
     awaitPendingLoaders,

package/dist/{js/modern → esm-node}/core/loader/useLoader.js

@@ -1,22 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import {
   useContext,
   useRef,
@@ -55,9 +36,10 @@ const useLoader = (loaderFn, options = { params: void 0 }) => {
             return Promise.reject(e);
           }
         },
-        __spreadProps(__spreadValues({}, options), {
+        {
+          ...options,
           params
-        })
+        }
       );
       loaderRef.current = loaderManager.get(id);
       (_b = unlistenLoaderChangeRef.current) == null ? void 0 : _b.call(unlistenLoaderChangeRef);
@@ -104,9 +86,10 @@ const useLoader = (loaderFn, options = { params: void 0 }) => {
     load(p);
   }, [options.params]);
   const [result, setResult] = useState(loaderRef.current.result);
-  return __spreadProps(__spreadValues({}, result), {
+  return {
+    ...result,
     reload: load
-  });
+  };
 };
 var useLoader_default = useLoader;
 export {

package/dist/{js/modern → esm-node}/core/plugin.js

@@ -1,23 +1,3 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 import {
   createManager,
   createPipeline,
@@ -41,12 +21,12 @@ const runtimeHooks = {
 const createRuntime = () => createManager(runtimeHooks);
 const registerInit = (App, _init) => {
   const originalInit = App.init;
-  App.init = (context) => __async(void 0, null, function* () {
+  App.init = async (context) => {
     if (!context.loaderManager) {
       context.loaderManager = createLoaderManager({});
     }
-    yield Promise.all([originalInit == null ? void 0 : originalInit(context), _init == null ? void 0 : _init(context)]);
-  });
+    await Promise.all([originalInit == null ? void 0 : originalInit(context), _init == null ? void 0 : _init(context)]);
+  };
 };
 const runtime = createRuntime();
 const { createPlugin } = runtime;

package/dist/{js/modern → esm-node}/document/cli/index.js

@@ -1,39 +1,3 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 import path from "path";
 import React from "react";
 import ReactDomServer from "react-dom/server";
@@ -72,7 +36,7 @@ const getDocumenByEntryName = function(entrypoints, entryName, fallbackDir) {
 var cli_default = () => ({
   name: "@modern-js/plugin-document",
   pre: ["@modern-js/plugin-analyze"],
-  setup: (api) => __async(void 0, null, function* () {
+  setup: async (api) => {
     function getDocParams(params) {
       const { config, templateParameters, entryName } = params;
       return {
@@ -94,9 +58,9 @@ var cli_default = () => ({
       if (!documentFilePath) {
         return null;
       }
-      return (_0) => __async(void 0, [_0], function* ({ htmlWebpackPlugin }) {
+      return async ({ htmlWebpackPlugin }) => {
         const documentParams = getDocParams({
-          config: api.useConfigContext(),
+          config: api.useResolvedConfigContext(),
           entryName,
           templateParameters
         });
@@ -107,7 +71,7 @@ var cli_default = () => ({
         const userTsConfigFilePath = path.join(appDirectory, "tsconfig.json");
         let tsConfig;
         try {
-          tsConfig = yield require(userTsConfigFilePath);
+          tsConfig = await require(userTsConfigFilePath);
         } catch (err) {
           tsConfig = {};
         }
@@ -123,7 +87,7 @@ var cli_default = () => ({
           internalDirectory,
           `./document/_${entryName}.html.js`
         );
-        yield build({
+        await build({
           entryPoints: [documentFilePath],
           outfile: htmlOutputFile,
           platform: "node",
@@ -156,7 +120,7 @@ var cli_default = () => ({
           ]
         });
         delete require.cache[require.resolve(htmlOutputFile)];
-        const Document = (yield require(htmlOutputFile)).default;
+        const Document = (await require(htmlOutputFile)).default;
         const HTMLElement = React.createElement(
           DocumentContext.Provider,
           { value: documentParams },
@@ -194,7 +158,7 @@ var cli_default = () => ({
           PLACEHOLDER_REPLACER_MAP[DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]
         );
         return finalHtml;
-      });
+      };
     };
     return {
       config: () => {
@@ -206,7 +170,7 @@ var cli_default = () => ({
                 {},
                 {},
                 {}
-              ) : __spreadValues({}, options == null ? void 0 : options.templateParameters);
+              ) : { ...options == null ? void 0 : options.templateParameters };
               const templateContent = documentEntry(
                 entry.entryName,
                 hackParameters
@@ -215,14 +179,18 @@ var cli_default = () => ({
                 templateContent,
                 inject: false
               } : {};
-              return __spreadValues(__spreadValues({}, options), documentHtmlOptions);
+              return {
+                ...options,
+                ...documentHtmlOptions
+              };
             }
           }
         };
       }
     };
-  })
+  }
 });
 export {
-  cli_default as default
+  cli_default as default,
+  getDocumenByEntryName
 };