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

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,80 +11,79 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.1-alpha.1",
+  "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",
       "types": "./dist/types/index.d.ts",
-      "default": "./dist/js/treeshaking/index.js"
+      "default": "./dist/esm/index.js"
     },
     "./loadable": {
       "jsnext:source": "./src/exports/loadable.ts",
       "types": "./dist/types/exports/loadable.d.ts",
-      "default": "./dist/js/treeshaking/exports/loadable.js"
+      "default": "./dist/esm/exports/loadable.js"
     },
     "./head": {
       "jsnext:source": "./src/exports/head.ts",
       "types": "./dist/types/exports/head.d.ts",
-      "default": "./dist/js/treeshaking/exports/head.js"
+      "default": "./dist/esm/exports/head.js"
     },
     "./styled": {
       "jsnext:source": "./src/exports/styled.ts",
       "types": "./dist/types/exports/styled.d.ts",
-      "default": "./dist/js/treeshaking/exports/styled.js"
+      "default": "./dist/esm/exports/styled.js"
     },
     "./server": {
       "jsnext:source": "./src/exports/server.ts",
-      "node": "./dist/js/node/exports/server.js",
+      "node": "./dist/cjs/exports/server.js",
       "types": "./dist/types/exports/server.d.ts",
-      "default": "./dist/js/treeshaking/exports/server.js"
+      "default": "./dist/esm/exports/server.js"
     },
     "./document": {
       "jsnext:source": "./src/document/index.ts",
-      "node": "./dist/js/node/document/index.js",
+      "node": "./dist/cjs/document/index.js",
       "types": "./dist/types/document/index.d.ts",
-      "default": "./dist/js/treeshaking/document/index.js"
+      "default": "./dist/esm/document/index.js"
     },
     "./document/cli": {
       "jsnext:source": "./src/document/cli/index.ts",
-      "node": "./dist/js/node/document/cli/index.js",
+      "node": "./dist/cjs/document/cli/index.js",
       "types": "./dist/types/document/index.d.ts",
-      "default": "./dist/js/treeshaking/document/cli/index.js"
+      "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",
+      "node": "./dist/esm/ssr/index.node.js",
+      "worker": "./dist/esm/ssr/index.node.js",
       "types": "./dist/types/ssr/index.d.ts",
-      "default": "./dist/js/treeshaking/ssr/index.js"
+      "default": "./dist/esm/ssr/index.js"
     },
     "./model": {
       "jsnext:source": "./src/state/index.ts",
       "types": "./dist/types/model.d.ts",
-      "default": "./dist/js/treeshaking/state/index.js"
+      "default": "./dist/esm/state/index.js"
     },
     "./cli": {
       "jsnext:source": "./src/cli/index.ts",
       "types": "./dist/types/cli/index.d.ts",
-      "default": "./dist/js/node/cli/index.js"
+      "default": "./dist/cjs/cli/index.js"
     },
     "./router": {
       "jsnext:source": "./src/router/index.ts",
       "types": "./dist/types/router/index.d.ts",
-      "default": "./dist/js/treeshaking/router/index.js"
+      "default": "./dist/esm/router/index.js"
     },
     "./router/server": {
       "jsnext:source": "./src/router/runtime/server.ts",
       "types": "./dist/types/router/runtime/server.d.ts",
-      "default": "./dist/js/treeshaking/router/runtime/server.js"
+      "default": "./dist/esm/router/runtime/server.js"
     }
   },
   "typesVersions": {
@@ -144,9 +143,6 @@
     "@modern-js-reduck/plugin-immutable": "^1.1.4",
     "@modern-js-reduck/react": "^1.1.4",
     "@modern-js-reduck/store": "^1.1.4",
-    "@modern-js/plugin": "2.4.0",
-    "@modern-js/types": "2.4.0",
-    "@modern-js/utils": "2.4.0",
     "@remix-run/node": "^1.9.0",
     "@remix-run/router": "^1.2.0",
     "@types/loadable__component": "^5.13.4",
@@ -162,19 +158,17 @@
     "redux-logger": "^3.0.6",
     "serialize-javascript": "^6.0.0",
     "styled-components": "^5.3.1",
-    "esbuild": "0.15.7"
+    "esbuild": "0.15.7",
+    "@modern-js/plugin": "2.5.0",
+    "@modern-js/types": "2.5.0",
+    "@modern-js/utils": "2.5.0"
   },
   "peerDependencies": {
     "react": ">=17",
     "react-dom": ">=17"
   },
   "devDependencies": {
-    "@modern-js/app-tools": "2.4.0",
-    "@modern-js/core": "2.4.0",
-    "@modern-js/server-core": "2.4.0",
     "@remix-run/web-fetch": "^4.1.3",
-    "@scripts/build": "2.4.0",
-    "@scripts/jest-config": "2.4.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/react-hooks": "^8.0.1",
     "@types/invariant": "^2.2.30",
@@ -187,7 +181,12 @@
     "react": "^18",
     "react-dom": "^18",
     "ts-jest": "^27.0.4",
-    "typescript": "^4"
+    "typescript": "^4",
+    "@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": {},

package/dist/js/modern/router/runtime/withRouter.js

@@ -1,36 +0,0 @@
-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 { useLocation, useNavigate, useParams } from "react-router-dom";
-const withRouter = (Component) => {
-  return (props) => {
-    const location = useLocation();
-    const params = useParams();
-    const navigate = useNavigate();
-    return /* @__PURE__ */ jsx(Component, __spreadProps(__spreadValues({}, props), {
-      location,
-      params,
-      navigate
-    }));
-  };
-};
-export {
-  withRouter
-};

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

@@ -1,79 +0,0 @@
-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 { formatServer } from "./utils";
-import render from "./serverRender";
-const ssr = (config = {}) => ({
-  name: "@modern-js/plugin-ssr",
-  setup: () => {
-    return {
-      server: (_0) => __async(void 0, [_0], function* ({ App, context }) {
-        const html = yield render({
-          context,
-          App,
-          config
-        });
-        return html;
-      }),
-      init({ context }, next) {
-        const { request } = context.ssrContext;
-        context.ssrContext.request = formatServer(request);
-        return next({ context });
-      },
-      pickContext: ({ context, pickedContext }, next) => {
-        const { request, response } = context == null ? void 0 : context.ssrContext;
-        const { initialData } = context;
-        return next({
-          context,
-          pickedContext: __spreadProps(__spreadValues({}, pickedContext), {
-            initialData,
-            request,
-            response
-          })
-        });
-      }
-    };
-  }
-});
-var index_node_default = ssr;
-export * from "./react";
-export {
-  index_node_default as default,
-  ssr
-};

package/dist/js/modern/ssr/prefetch.js

@@ -1,69 +0,0 @@
-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 { renderToStaticMarkup } from "react-dom/server";
-import { run } from "@modern-js/utils/ssr";
-import { ChunkExtractor } from "@loadable/server";
-const prefetch = (App, context) => __async(void 0, null, function* () {
-  return run(context.ssrContext.request.headers, () => __async(void 0, null, function* () {
-    var _a;
-    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 = yield 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__,
-      storeState: (_a = context == null ? void 0 : context.store) == null ? void 0 : _a.getState()
-    };
-  }));
-});
-var prefetch_default = prefetch;
-export {
-  prefetch_default as default
-};

package/dist/js/modern/ssr/serverRender/index.js

@@ -1,35 +0,0 @@
-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 { isReact18 } from "../utils";
-function serverRender(options) {
-  return __async(this, null, function* () {
-    if (isReact18() && options.config.mode === "stream") {
-      const pipe = yield require("./renderToStream").render(options);
-      return pipe;
-    } else {
-      const html = yield require("./renderToString").render(options);
-      return html;
-    }
-  });
-}
-export {
-  serverRender as default
-};

package/dist/js/modern/ssr/serverRender/renderToString/index.worker.js

@@ -1,49 +0,0 @@
-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 { PreRender } from "../../react/prerender";
-import { time } from "../time";
-import SSREntry from "./entry";
-const render = (_0) => __async(void 0, [_0], function* ({
-  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 = yield 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
-};