@modern-js/runtime 2.4.1-beta.0 → 2.5.0

package/dist/{js/modern → esm-node}/ssr/serverRender/renderToStream/renderToPipe.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 { Transform } from "stream";
 import { RenderLevel } from "../types";
 import { getTemplates } from "./template";
@@ -30,7 +11,8 @@ function renderToPipe(rootElement, context, options) {
         ({ renderToPipeableStream } = require("react-dom/server"));
       } catch (e) {
       }
-      const { pipe } = renderToPipeableStream(rootElement, __spreadProps(__spreadValues({}, options), {
+      const { pipe } = renderToPipeableStream(rootElement, {
+        ...options,
         onShellReady() {
           var _a;
           const { shellAfter, shellBefore } = getTemplates(
@@ -82,7 +64,7 @@ function renderToPipe(rootElement, context, options) {
           ssrContext.metrics.emitCounter("app.render.streaming.error", 1);
           (_a = options == null ? void 0 : options.onError) == null ? void 0 : _a.call(options, error);
         }
-      }));
+      });
     });
   };
   return forUserPipe;

package/dist/{js/modern → esm-node}/ssr/serverRender/renderToStream/renderToPipe.worker.js

@@ -1,48 +1,9 @@
-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));
-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 { RenderLevel } from "../types";
 import { getTemplates } from "./template";
 function renderToPipe(rootElement, context, options) {
   let isShellStream = true;
   const { ssrContext } = context;
-  const forUserPipe = (stream) => __async(this, null, function* () {
+  const forUserPipe = async (stream) => {
     let renderToReadableStream;
     try {
       ({ renderToReadableStream } = require("react-dom/server"));
@@ -53,23 +14,27 @@ function renderToPipe(rootElement, context, options) {
       RenderLevel.SERVER_RENDER
     );
     try {
-      let _a;
-      const readableOriginal = yield renderToReadableStream(rootElement, __spreadProps(__spreadValues({}, options), {
+      const readableOriginal = await renderToReadableStream(rootElement, {
+        ...options,
         onError(error) {
-          var _a2;
+          var _a;
           ssrContext.logger.error(
             "An error occurs during streaming SSR",
             error
           );
           ssrContext.metrics.emitCounter("app.render.streaming.error", 1);
-          (_a2 = options == null ? void 0 : options.onError) == null ? void 0 : _a2.call(options, error);
+          (_a = options == null ? void 0 : options.onError) == null ? void 0 : _a.call(options, error);
         }
-      }));
+      });
       const reader = readableOriginal.getReader();
       const injectableStream = new ReadableStream({
         start(controller) {
-          return __async(this, null, function* () {
-            const { value } = yield reader.read();
+          async function push() {
+            const { done, value } = await reader.read();
+            if (done) {
+              controller.close();
+              return;
+            }
             if (isShellStream) {
               controller.enqueue(encodeForWebStream(shellBefore));
               controller.enqueue(value);
@@ -78,7 +43,9 @@ function renderToPipe(rootElement, context, options) {
             } else {
               controller.enqueue(value);
             }
-          });
+            push();
+          }
+          push();
         }
       });
       return readableOriginal(injectableStream).readableOriginal(stream);
@@ -91,7 +58,7 @@ function renderToPipe(rootElement, context, options) {
       const fallbackHtml = `${shellBefore2}${shellAfter2}`;
       return fallbackHtml;
     }
-  });
+  };
   return forUserPipe;
 }
 let encoder;

package/dist/{js/modern → esm-node}/ssr/serverRender/renderToString/entry.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 React from "react";
 import ReactDomServer from "react-dom/server";
 import serialize from "serialize-javascript";
@@ -74,58 +54,54 @@ class Entry {
       }
     };
   }
-  renderToHtml(context) {
-    return __async(this, null, function* () {
-      var _a, _b, _c;
-      const ssrContext = context.ssrContext;
-      if ((_a = ssrContext.redirection) == null ? void 0 : _a.url) {
-        return "";
-      }
-      const prefetchData = yield this.prefetch(context);
-      if ((_b = ssrContext.redirection) == null ? void 0 : _b.url) {
-        return "";
-      }
-      if (this.result.renderLevel >= RenderLevel.SERVER_PREFETCH) {
-        this.result.html = this.renderToString(context);
-      }
-      if ((_c = ssrContext.redirection) == null ? void 0 : _c.url) {
-        return "";
-      }
-      let html = "";
-      const templateData = buildTemplateData(
-        ssrContext,
-        prefetchData,
-        this.result.renderLevel
-      );
-      const SSRData = this.getSSRDataScript(templateData);
-      for (const fragment of this.fragments) {
-        if (fragment.isVariable && fragment.content === "SSRDataScript") {
-          html += fragment.getValue(SSRData);
-        } else {
-          html += fragment.getValue(this.result);
-        }
+  async renderToHtml(context) {
+    var _a, _b, _c;
+    const ssrContext = context.ssrContext;
+    if ((_a = ssrContext.redirection) == null ? void 0 : _a.url) {
+      return "";
+    }
+    const prefetchData = await this.prefetch(context);
+    if ((_b = ssrContext.redirection) == null ? void 0 : _b.url) {
+      return "";
+    }
+    if (this.result.renderLevel >= RenderLevel.SERVER_PREFETCH) {
+      this.result.html = this.renderToString(context);
+    }
+    if ((_c = ssrContext.redirection) == null ? void 0 : _c.url) {
+      return "";
+    }
+    let html = "";
+    const templateData = buildTemplateData(
+      ssrContext,
+      prefetchData,
+      this.result.renderLevel
+    );
+    const SSRData = this.getSSRDataScript(templateData);
+    for (const fragment of this.fragments) {
+      if (fragment.isVariable && fragment.content === "SSRDataScript") {
+        html += fragment.getValue(SSRData);
+      } else {
+        html += fragment.getValue(this.result);
       }
-      const helmetData = ReactHelmet.renderStatic();
-      return helmetData ? helmetReplace(html, helmetData) : html;
-    });
+    }
+    const helmetData = ReactHelmet.renderStatic();
+    return helmetData ? helmetReplace(html, helmetData) : html;
   }
-  prefetch(context) {
-    return __async(this, null, function* () {
-      let prefetchData;
-      const end = time();
-      try {
-        prefetchData = yield prefetch(this.App, context);
-        this.result.renderLevel = 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 = RenderLevel.CLIENT_RENDER;
-        this.logger.error("App Prefetch Render", e);
-        this.metrics.emitCounter("app.prefetch.render.error", 1);
-      }
-      return prefetchData || {};
-    });
+  async prefetch(context) {
+    let prefetchData;
+    const end = time();
+    try {
+      prefetchData = await prefetch(this.App, context);
+      this.result.renderLevel = 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 = RenderLevel.CLIENT_RENDER;
+      this.logger.error("App Prefetch Render", e);
+      this.metrics.emitCounter("app.prefetch.render.error", 1);
+    }
+    return prefetchData || {};
   }
   renderToString(context) {
     let html = "";

package/dist/{js/modern → esm-node}/ssr/serverRender/renderToString/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 { run } from "@modern-js/utils/ssr";
 import { PreRender } from "../../react/prerender";
 import { time } from "../time";
@@ -28,7 +8,7 @@ const render = ({
   config
 }) => {
   const ssrContext = context.ssrContext;
-  return run(ssrContext.request.headers, () => __async(void 0, null, function* () {
+  return run(ssrContext.request.headers, async () => {
     const entry = new SSREntry({
       ctx: ssrContext,
       App,
@@ -36,7 +16,7 @@ const render = ({
     });
     entry.metrics.emitCounter("app.visit.count", 1);
     const end = time();
-    const html = yield entry.renderToHtml(context);
+    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);
@@ -45,7 +25,7 @@ const render = ({
       context.ssrContext.cacheConfig = cacheConfig;
     }
     return html;
-  }));
+  });
 };
 export {
   render

package/dist/esm-node/ssr/serverRender/renderToString/index.worker.js

@@ -0,0 +1,29 @@
+import { PreRender } from "../../react/prerender";
+import { time } from "../time";
+import SSREntry from "./entry";
+const render = async ({
+  App,
+  context,
+  config
+}) => {
+  const ssrContext = context.ssrContext;
+  const entry = new SSREntry({
+    ctx: ssrContext,
+    App,
+    config
+  });
+  entry.metrics.emitCounter("app.visit.count", 1);
+  const end = 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 = PreRender.config();
+  if (cacheConfig) {
+    context.ssrContext.cacheConfig = cacheConfig;
+  }
+  return html;
+};
+export {
+  render
+};

package/dist/{js/modern → esm-node}/ssr/utils.js

@@ -1,19 +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;
-};
 const isReact18 = () => process.env.IS_REACT18 === "true";
 const formatServer = (request) => {
   const {
@@ -21,11 +5,12 @@ const formatServer = (request) => {
     "user-agent": userAgent = "",
     referer
   } = request.headers || {};
-  return __spreadValues({
+  return {
     cookie,
     userAgent,
-    referer
-  }, request);
+    referer,
+    ...request
+  };
 };
 const getQuery = () => window.location.search.substring(1).split("&").reduce((res, item) => {
   const [key, value] = item.split("=");

package/dist/{js/modern → esm-node}/state/runtime/plugin.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 { jsx } from "react/jsx-runtime";
 import { useContext } from "react";
 import {
@@ -64,7 +45,9 @@ const state = (config) => ({
           return /* @__PURE__ */ jsx(Provider, {
             store: context.store,
             config: storeConfig,
-            children: /* @__PURE__ */ jsx(App, __spreadValues({}, props))
+            children: /* @__PURE__ */ jsx(App, {
+              ...props
+            })
           });
         };
         return next({
@@ -82,9 +65,10 @@ const state = (config) => ({
       pickContext({ context, pickedContext }, next) {
         return next({
           context,
-          pickedContext: __spreadProps(__spreadValues({}, pickedContext), {
+          pickedContext: {
+            ...pickedContext,
             store: context.store
-          })
+          }
         });
       }
     };

package/dist/types/document/cli/index.d.ts

@@ -1,4 +1,6 @@
 import type { CliPlugin, AppTools } from '@modern-js/app-tools';
+import { Entrypoint } from '@modern-js/types/cli';
+export declare const getDocumenByEntryName: (entrypoints: Entrypoint[], entryName: string, fallbackDir?: string) => string | undefined;
 
 declare const _default: () => CliPlugin<AppTools>;
 

package/package.json

@@ -11,68 +11,79 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.1-beta.0",
+  "version": "2.5.0",
   "engines": {
     "node": ">=14.17.6"
   },
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index",
-  "main": "./dist/js/node/index.js",
-  "module": "./dist/js/treeshaking/index.js",
-  "jsnext:modern": "./dist/js/modern/index.js",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
   "exports": {
     ".": {
       "jsnext:source": "./src/index.ts",
-      "default": "./dist/js/treeshaking/index.js"
+      "types": "./dist/types/index.d.ts",
+      "default": "./dist/esm/index.js"
     },
     "./loadable": {
       "jsnext:source": "./src/exports/loadable.ts",
-      "default": "./dist/js/treeshaking/exports/loadable.js"
+      "types": "./dist/types/exports/loadable.d.ts",
+      "default": "./dist/esm/exports/loadable.js"
     },
     "./head": {
       "jsnext:source": "./src/exports/head.ts",
-      "default": "./dist/js/treeshaking/exports/head.js"
+      "types": "./dist/types/exports/head.d.ts",
+      "default": "./dist/esm/exports/head.js"
     },
     "./styled": {
       "jsnext:source": "./src/exports/styled.ts",
-      "default": "./dist/js/treeshaking/exports/styled.js"
+      "types": "./dist/types/exports/styled.d.ts",
+      "default": "./dist/esm/exports/styled.js"
     },
     "./server": {
       "jsnext:source": "./src/exports/server.ts",
-      "node": "./dist/js/node/exports/server.js",
-      "default": "./dist/js/treeshaking/exports/server.js"
+      "node": "./dist/cjs/exports/server.js",
+      "types": "./dist/types/exports/server.d.ts",
+      "default": "./dist/esm/exports/server.js"
     },
     "./document": {
       "jsnext:source": "./src/document/index.ts",
-      "node": "./dist/js/node/document/index.js",
-      "default": "./dist/js/treeshaking/document/index.js"
+      "node": "./dist/cjs/document/index.js",
+      "types": "./dist/types/document/index.d.ts",
+      "default": "./dist/esm/document/index.js"
     },
     "./document/cli": {
       "jsnext:source": "./src/document/cli/index.ts",
-      "node": "./dist/js/node/document/cli/index.js",
-      "default": "./dist/js/treeshaking/document/cli/index.js"
+      "node": "./dist/cjs/document/cli/index.js",
+      "types": "./dist/types/document/index.d.ts",
+      "default": "./dist/esm/document/cli/index.js"
     },
     "./ssr": {
       "jsnext:source": "./src/ssr/index.ts",
-      "node": "./dist/js/treeshaking/ssr/index.node.js",
-      "worker": "./dist/js/treeshaking/ssr/index.node.js",
-      "default": "./dist/js/treeshaking/ssr/index.js"
+      "node": "./dist/esm/ssr/index.node.js",
+      "worker": "./dist/esm/ssr/index.node.js",
+      "types": "./dist/types/ssr/index.d.ts",
+      "default": "./dist/esm/ssr/index.js"
     },
     "./model": {
       "jsnext:source": "./src/state/index.ts",
-      "default": "./dist/js/treeshaking/state/index.js"
+      "types": "./dist/types/model.d.ts",
+      "default": "./dist/esm/state/index.js"
     },
     "./cli": {
       "jsnext:source": "./src/cli/index.ts",
-      "default": "./dist/js/node/cli/index.js"
+      "types": "./dist/types/cli/index.d.ts",
+      "default": "./dist/cjs/cli/index.js"
     },
     "./router": {
       "jsnext:source": "./src/router/index.ts",
-      "default": "./dist/js/treeshaking/router/index.js"
+      "types": "./dist/types/router/index.d.ts",
+      "default": "./dist/esm/router/index.js"
     },
     "./router/server": {
       "jsnext:source": "./src/router/runtime/server.ts",
-      "default": "./dist/js/treeshaking/router/runtime/server.js"
+      "types": "./dist/types/router/runtime/server.d.ts",
+      "default": "./dist/esm/router/runtime/server.js"
     }
   },
   "typesVersions": {
@@ -148,9 +159,9 @@
     "serialize-javascript": "^6.0.0",
     "styled-components": "^5.3.1",
     "esbuild": "0.15.7",
-    "@modern-js/plugin": "2.4.0",
-    "@modern-js/types": "2.4.0",
-    "@modern-js/utils": "2.4.1-beta.0"
+    "@modern-js/plugin": "2.5.0",
+    "@modern-js/types": "2.5.0",
+    "@modern-js/utils": "2.5.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -171,11 +182,11 @@
     "react-dom": "^18",
     "ts-jest": "^27.0.4",
     "typescript": "^4",
-    "@modern-js/app-tools": "3.0.0-beta.0",
-    "@modern-js/core": "2.4.1-beta.0",
-    "@modern-js/server-core": "2.4.1-beta.0",
-    "@scripts/jest-config": "2.4.0",
-    "@scripts/build": "2.4.0"
+    "@modern-js/app-tools": "2.5.0",
+    "@modern-js/core": "2.5.0",
+    "@modern-js/server-core": "2.5.0",
+    "@scripts/jest-config": "2.5.0",
+    "@scripts/build": "2.5.0"
   },
   "sideEffects": false,
   "modernConfig": {},