@modern-js/runtime 2.35.1 → 2.36.0

package/dist/esm-node/router/runtime/utils.js

@@ -4,7 +4,7 @@ import { ErrorResponse } from "@modern-js/runtime-utils/remix-router";
 import { renderNestedRoute } from "@modern-js/runtime-utils/browser";
 import { DefaultNotFound } from "./DefaultNotFound";
 import DeferredDataScripts from "./DeferredDataScripts";
-export function getRouteComponents(routes, { globalApp, ssrMode, props, reporter }) {
+function getRouteComponents(routes, { globalApp, ssrMode, props, reporter }) {
   const Layout = ({ Component, ...props2 }) => {
     const GlobalLayout = globalApp;
     if (!GlobalLayout) {
@@ -42,7 +42,7 @@ export function getRouteComponents(routes, { globalApp, ssrMode, props, reporter
   }, "*"));
   return routeElements;
 }
-export function renderRoutes({ routesConfig, props, ssrMode, reporter }) {
+function renderRoutes({ routesConfig, props, ssrMode, reporter }) {
   if (!routesConfig) {
     return null;
   }
@@ -58,7 +58,7 @@ export function renderRoutes({ routesConfig, props, ssrMode, reporter }) {
   });
   return routeElements;
 }
-export function getLocation(serverContext) {
+function getLocation(serverContext) {
   var _url_replace;
   const { pathname, url } = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {};
   const cleanUrl = url === null || url === void 0 ? void 0 : (_url_replace = url.replace("http://", "")) === null || _url_replace === void 0 ? void 0 : _url_replace.replace("https://", "");
@@ -68,12 +68,12 @@ export function getLocation(serverContext) {
   }
   return cleanUrl.substring(index);
 }
-export const urlJoin = (...parts) => {
+const urlJoin = (...parts) => {
   const separator = "/";
   const replace = new RegExp(`${separator}{1,}`, "g");
   return standardSlash(parts.join(separator).replace(replace, separator));
 };
-export function standardSlash(str) {
+function standardSlash(str) {
   let addr = str;
   if (!addr || typeof addr !== "string") {
     return addr;
@@ -89,7 +89,7 @@ export function standardSlash(str) {
   }
   return addr;
 }
-export function serializeErrors(errors) {
+function serializeErrors(errors) {
   if (!errors) {
     return null;
   }
@@ -113,7 +113,7 @@ export function serializeErrors(errors) {
   }
   return serialized;
 }
-export function deserializeErrors(errors) {
+function deserializeErrors(errors) {
   if (!errors) {
     return null;
   }
@@ -132,3 +132,12 @@ export function deserializeErrors(errors) {
   }
   return serialized;
 }
+export {
+  deserializeErrors,
+  getLocation,
+  getRouteComponents,
+  renderRoutes,
+  serializeErrors,
+  standardSlash,
+  urlJoin
+};

package/dist/esm-node/router/runtime/withRouter.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useLocation, useNavigate, useParams } from "@modern-js/runtime-utils/router";
-export const withRouter = (Component) => {
+const withRouter = (Component) => {
   return (props) => {
     const location = useLocation();
     const params = useParams();
@@ -13,3 +13,6 @@ export const withRouter = (Component) => {
     });
   };
 };
+export {
+  withRouter
+};

package/dist/esm-node/runtimeContext.js

@@ -1,3 +1,7 @@
 import { createContext } from "react";
-export const RuntimeReactContext = createContext({});
-export const ServerRouterContext = createContext({});
+const RuntimeReactContext = createContext({});
+const ServerRouterContext = createContext({});
+export {
+  RuntimeReactContext,
+  ServerRouterContext
+};

package/dist/esm-node/ssr/cli/babel-plugin-ssr-loader-id.js

@@ -1,110 +1,119 @@
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
 import crypto from "crypto";
-import { Buffer } from "buffer";
+import { Buffer as Buffer2 } from "buffer";
 import * as t from "@babel/types";
 import { get } from "@modern-js/utils/lodash";
-const RUNTIME_PACKAGE_NAMES = [
-  "@modern-js/runtime"
-];
-const FUNCTION_USE_LOADER_NAME = "useLoader";
-function getHash(filepath) {
-  const cwd = process.cwd();
-  const point = filepath.indexOf(cwd);
-  let relativePath = filepath;
-  if (point !== -1) {
-    relativePath = filepath.substring(point + cwd.length);
-  }
-  const fileBuf = Buffer.from(relativePath);
-  const fsHash = crypto.createHash("md5");
-  const md5 = fsHash.update(fileBuf).digest("hex");
-  return md5;
-}
-function getUseLoaderPath(path, calleeName) {
-  const { node } = path;
-  if (!calleeName || node.callee.name !== calleeName) {
-    return false;
-  }
-  const arg1 = get(node, "arguments.0");
-  if (t.isFunction(arg1) || t.isFunctionExpression(arg1) || t.isArrowFunctionExpression(arg1) || t.isIdentifier(arg1) || t.isCallExpression(arg1) || t.isMemberExpression(arg1)) {
-    const loaderPath = path.get("arguments.0");
-    if (isDuplicateInnerLoader(loaderPath)) {
-      return false;
-    } else {
-      return loaderPath;
-    }
-  }
-  console.warn("useLoader 中 loaderId 生成失败，请检查 useLoader");
-  throw path.buildCodeFrameError(`
-    please check the usage of ${path.node.name}
-  `);
-}
-function isDuplicateInnerLoader(path) {
-  const { node } = path;
-  if (t.isFunctionExpression(node.callee)) {
-    if (t.isBlockStatement(node.callee.body)) {
-      if (get(node.callee.body, "body.0.declarations.0.id.name") === "innerLoader" && get(node.callee.body, "body.2.argument.name") === "innerLoader") {
-        return true;
+var require_babel_plugin_ssr_loader_id = __commonJS({
+  "src/ssr/cli/babel-plugin-ssr-loader-id.ts"(exports, module) {
+    const RUNTIME_PACKAGE_NAMES = [
+      "@modern-js/runtime"
+    ];
+    const FUNCTION_USE_LOADER_NAME = "useLoader";
+    function getHash(filepath) {
+      const cwd = process.cwd();
+      const point = filepath.indexOf(cwd);
+      let relativePath = filepath;
+      if (point !== -1) {
+        relativePath = filepath.substring(point + cwd.length);
       }
+      const fileBuf = Buffer2.from(relativePath);
+      const fsHash = crypto.createHash("md5");
+      const md5 = fsHash.update(fileBuf).digest("hex");
+      return md5;
     }
-  }
-  return false;
-}
-function getSelfRunLoaderExpression(loaderExpression, id) {
-  return t.callExpression(t.functionExpression(null, [], t.blockStatement([
-    t.variableDeclaration("var", [
-      t.variableDeclarator(t.identifier("innerLoader"), loaderExpression)
-    ]),
-    t.expressionStatement(t.assignmentExpression("=", t.memberExpression(t.identifier("innerLoader"), t.identifier("id")), t.stringLiteral(id))),
-    t.returnStatement(t.identifier("innerLoader"))
-  ])), []);
-}
-module.exports = function() {
-  let useLoader = null;
-  let hash = "";
-  let index = 0;
-  function genId() {
-    return `${hash}_${index++}`;
-  }
-  return {
-    name: "babel-plugin-ssr-loader-id",
-    pre() {
-      index = 0;
-      useLoader = null;
-      hash = "";
-    },
-    visitor: {
-      ImportDeclaration(path, state) {
-        if (useLoader) {
-          return false;
-        }
-        if (!RUNTIME_PACKAGE_NAMES.includes(get(path, "node.source.value"))) {
+    function getUseLoaderPath(path, calleeName) {
+      const { node } = path;
+      if (!calleeName || node.callee.name !== calleeName) {
+        return false;
+      }
+      const arg1 = get(node, "arguments.0");
+      if (t.isFunction(arg1) || t.isFunctionExpression(arg1) || t.isArrowFunctionExpression(arg1) || t.isIdentifier(arg1) || t.isCallExpression(arg1) || t.isMemberExpression(arg1)) {
+        const loaderPath = path.get("arguments.0");
+        if (isDuplicateInnerLoader(loaderPath)) {
           return false;
+        } else {
+          return loaderPath;
         }
-        hash = getHash(state.file.opts.filename);
-        get(path, "node.specifiers", []).forEach(({ imported, local }) => {
-          if (!imported) {
-            throw path.buildCodeFrameError(`please \`import { useLoader } from ${RUNTIME_PACKAGE_NAMES[0]}\``);
-          }
-          if (!useLoader && imported.name === FUNCTION_USE_LOADER_NAME) {
-            useLoader = local.name;
-          }
-        });
-        return false;
-      },
-      CallExpression(path) {
-        let loaderPath = getUseLoaderPath(path, useLoader);
-        if (loaderPath) {
-          if (!Array.isArray(loaderPath)) {
-            loaderPath = [
-              loaderPath
-            ];
+      }
+      console.warn("useLoader 中 loaderId 生成失败，请检查 useLoader");
+      throw path.buildCodeFrameError(`
+    please check the usage of ${path.node.name}
+  `);
+    }
+    function isDuplicateInnerLoader(path) {
+      const { node } = path;
+      if (t.isFunctionExpression(node.callee)) {
+        if (t.isBlockStatement(node.callee.body)) {
+          if (get(node.callee.body, "body.0.declarations.0.id.name") === "innerLoader" && get(node.callee.body, "body.2.argument.name") === "innerLoader") {
+            return true;
           }
-          loaderPath.forEach((p) => {
-            p.replaceWith(getSelfRunLoaderExpression(p.node, genId()));
-          });
-          return false;
         }
-        return false;
       }
+      return false;
     }
-  };
-};
+    function getSelfRunLoaderExpression(loaderExpression, id) {
+      return t.callExpression(t.functionExpression(null, [], t.blockStatement([
+        t.variableDeclaration("var", [
+          t.variableDeclarator(t.identifier("innerLoader"), loaderExpression)
+        ]),
+        t.expressionStatement(t.assignmentExpression("=", t.memberExpression(t.identifier("innerLoader"), t.identifier("id")), t.stringLiteral(id))),
+        t.returnStatement(t.identifier("innerLoader"))
+      ])), []);
+    }
+    module.exports = function() {
+      let useLoader = null;
+      let hash = "";
+      let index = 0;
+      function genId() {
+        return `${hash}_${index++}`;
+      }
+      return {
+        name: "babel-plugin-ssr-loader-id",
+        pre() {
+          index = 0;
+          useLoader = null;
+          hash = "";
+        },
+        visitor: {
+          ImportDeclaration(path, state) {
+            if (useLoader) {
+              return false;
+            }
+            if (!RUNTIME_PACKAGE_NAMES.includes(get(path, "node.source.value"))) {
+              return false;
+            }
+            hash = getHash(state.file.opts.filename);
+            get(path, "node.specifiers", []).forEach(({ imported, local }) => {
+              if (!imported) {
+                throw path.buildCodeFrameError(`please \`import { useLoader } from ${RUNTIME_PACKAGE_NAMES[0]}\``);
+              }
+              if (!useLoader && imported.name === FUNCTION_USE_LOADER_NAME) {
+                useLoader = local.name;
+              }
+            });
+            return false;
+          },
+          CallExpression(path) {
+            let loaderPath = getUseLoaderPath(path, useLoader);
+            if (loaderPath) {
+              if (!Array.isArray(loaderPath)) {
+                loaderPath = [
+                  loaderPath
+                ];
+              }
+              loaderPath.forEach((p) => {
+                p.replaceWith(getSelfRunLoaderExpression(p.node, genId()));
+              });
+              return false;
+            }
+            return false;
+          }
+        }
+      };
+    };
+  }
+});
+export default require_babel_plugin_ssr_loader_id();

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

@@ -20,7 +20,7 @@ const checkUseStringSSR = (config) => {
   const { output } = config;
   return Boolean(output === null || output === void 0 ? void 0 : output.ssg) || hasStringSSREntry(config);
 };
-export const ssrPlugin = () => ({
+const ssrPlugin = () => ({
   name: "@modern-js/plugin-ssr",
   required: [
     "@modern-js/runtime"
@@ -161,4 +161,8 @@ export const ssrPlugin = () => ({
     };
   }
 });
-export default ssrPlugin;
+var cli_default = ssrPlugin;
+export {
+  cli_default as default,
+  ssrPlugin
+};

package/dist/esm-node/ssr/cli/loadable-bundler-plugin.js

@@ -1,91 +1,100 @@
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import path from "path";
 import { fs } from "@modern-js/utils";
-class LoadablePlugin {
-  apply(compiler) {
-    this.compiler = compiler;
-    compiler.options.output.chunkLoadingGlobal = this.opts.chunkLoadingGlobal;
-    if (this.opts.outputAsset || this.opts.writeToDisk) {
-      compiler.hooks.make.tap(LoadablePlugin.name, (compilation) => {
-        compilation.hooks.processAssets.tap({
-          name: LoadablePlugin.name,
-          stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_REPORT
-        }, () => {
-          const asset = this.handleEmit(compilation);
-          if (asset) {
-            compilation.emitAsset(this.opts.filename, asset);
-          }
+var require_loadable_bundler_plugin = __commonJS({
+  "src/ssr/cli/loadable-bundler-plugin.ts"(exports, module) {
+    class LoadablePlugin {
+      apply(compiler) {
+        this.compiler = compiler;
+        compiler.options.output.chunkLoadingGlobal = this.opts.chunkLoadingGlobal;
+        if (this.opts.outputAsset || this.opts.writeToDisk) {
+          compiler.hooks.make.tap(LoadablePlugin.name, (compilation) => {
+            compilation.hooks.processAssets.tap({
+              name: LoadablePlugin.name,
+              stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_REPORT
+            }, () => {
+              const asset = this.handleEmit(compilation);
+              if (asset) {
+                compilation.emitAsset(this.opts.filename, asset);
+              }
+            });
+          });
+        }
+      }
+      handleEmit(compilation) {
+        const stats = compilation.getStats().toJson({
+          all: false,
+          assets: true,
+          // rspack not support cachedAssets,
+          cachedAssets: true,
+          chunks: true,
+          chunkGroups: true,
+          entrypoints: true,
+          // rspack not support chunkGroupChildren.
+          chunkGroupChildren: true,
+          hash: true,
+          ids: true,
+          outputPath: true,
+          publicPath: true
         });
-      });
-    }
-  }
-  handleEmit(compilation) {
-    const stats = compilation.getStats().toJson({
-      all: false,
-      assets: true,
-      // rspack not support cachedAssets,
-      cachedAssets: true,
-      chunks: true,
-      chunkGroups: true,
-      entrypoints: true,
-      // rspack not support chunkGroupChildren.
-      chunkGroupChildren: true,
-      hash: true,
-      ids: true,
-      outputPath: true,
-      publicPath: true
-    });
-    const output = {
-      ...stats,
-      generator: "loadable-components",
-      chunks: [
-        ...stats.chunks || []
-      ].map((chunk) => {
-        return {
-          id: chunk.id,
-          files: [
-            ...chunk.files || []
-          ]
+        const output = {
+          ...stats,
+          generator: "loadable-components",
+          chunks: [
+            ...stats.chunks || []
+          ].map((chunk) => {
+            return {
+              id: chunk.id,
+              files: [
+                ...chunk.files || []
+              ]
+            };
+          })
         };
-      })
-    };
-    const result = JSON.stringify(output, null, 2);
-    if (this.opts.writeToDisk) {
-      this.writeAssetsFile(result);
-    }
-    if (this.opts.outputAsset) {
-      return {
-        source() {
-          return result;
-        },
-        size() {
-          return result.length;
+        const result = JSON.stringify(output, null, 2);
+        if (this.opts.writeToDisk) {
+          this.writeAssetsFile(result);
         }
-      };
+        if (this.opts.outputAsset) {
+          return {
+            source() {
+              return result;
+            },
+            size() {
+              return result.length;
+            }
+          };
+        }
+        return null;
+      }
+      writeAssetsFile(manifest) {
+        var _this_compiler;
+        const outputFolder = (_this_compiler = this.compiler) === null || _this_compiler === void 0 ? void 0 : _this_compiler.options.output.path;
+        const outputFile = path.resolve(outputFolder || "", this.opts.filename);
+        fs.outputFileSync(outputFile, manifest);
+      }
+      constructor({ filename = "loadable-stats.json", path: path2, writeToDisk, outputAsset = true, chunkLoadingGlobal = "__LOADABLE_LOADED_CHUNKS__" } = {
+        filename: "loadable-stats.json",
+        outputAsset: true,
+        chunkLoadingGlobal: "__LOADABLE_LOADED_CHUNKS__"
+      }) {
+        _define_property(this, "opts", void 0);
+        _define_property(this, "compiler", void 0);
+        this.opts = {
+          filename,
+          path: path2,
+          writeToDisk,
+          outputAsset,
+          chunkLoadingGlobal
+        };
+        this.compiler = null;
+      }
     }
-    return null;
-  }
-  writeAssetsFile(manifest) {
-    var _this_compiler;
-    const outputFolder = (_this_compiler = this.compiler) === null || _this_compiler === void 0 ? void 0 : _this_compiler.options.output.path;
-    const outputFile = path.resolve(outputFolder || "", this.opts.filename);
-    fs.outputFileSync(outputFile, manifest);
-  }
-  constructor({ filename = "loadable-stats.json", path: path2, writeToDisk, outputAsset = true, chunkLoadingGlobal = "__LOADABLE_LOADED_CHUNKS__" } = {
-    filename: "loadable-stats.json",
-    outputAsset: true,
-    chunkLoadingGlobal: "__LOADABLE_LOADED_CHUNKS__"
-  }) {
-    _define_property(this, "opts", void 0);
-    _define_property(this, "compiler", void 0);
-    this.opts = {
-      filename,
-      path: path2,
-      writeToDisk,
-      outputAsset,
-      chunkLoadingGlobal
-    };
-    this.compiler = null;
+    module.exports = LoadablePlugin;
   }
-}
-module.exports = LoadablePlugin;
+});
+export default require_loadable_bundler_plugin();

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

@@ -6,7 +6,7 @@ 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";
-export const ssr = (config) => ({
+const ssr = (config) => ({
   name: "@modern-js/plugin-ssr",
   setup: () => {
     const mockResp = mockResponse();
@@ -128,5 +128,9 @@ export const ssr = (config) => ({
     };
   }
 });
-export default ssr;
+var ssr_default = ssr;
 export * from "./react";
+export {
+  ssr_default as default,
+  ssr
+};

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

@@ -1,7 +1,7 @@
 import { formatServer } from "./utils";
 import render from "./serverRender";
 import { createSSRTracker } from "./serverRender/tracker";
-export const ssr = (config = {}) => ({
+const ssr = (config = {}) => ({
   name: "@modern-js/plugin-ssr",
   setup: () => {
     return {
@@ -41,5 +41,9 @@ export const ssr = (config = {}) => ({
     };
   }
 });
-export default ssr;
+var index_node_default = ssr;
 export * from "./react";
+export {
+  index_node_default as default,
+  ssr
+};

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

@@ -46,4 +46,7 @@ const prefetch = async (App, context, config) => run(context.ssrContext.request.
     storeState: context === null || context === void 0 ? void 0 : (_context_store = context.store) === null || _context_store === void 0 ? void 0 : _context_store.getState()
   };
 });
-export default prefetch;
+var prefetch_default = prefetch;
+export {
+  prefetch_default as default
+};

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

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

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

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

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

@@ -83,4 +83,7 @@ function factory(Component) {
 }
 const NullComponent = () => null;
 const SprSideEffects = withSideEffect(reducePropsToState, handleClientStateChange, mapStateOnServer)(NullComponent);
-export const PreRender = factory(SprSideEffects);
+const PreRender = factory(SprSideEffects);
+export {
+  PreRender
+};

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

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

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

@@ -2,7 +2,7 @@ const REQUEST_META = [
   "header",
   "query"
 ];
-export const getInnermostProperty = function getInnermostProperty2(propsList, propName) {
+const getInnermostProperty = function getInnermostProperty2(propsList, propName) {
   for (let i = propsList.length - 1; i >= 0; i--) {
     const props = propsList[i];
     if (props.hasOwnProperty(propName)) {
@@ -11,7 +11,7 @@ export const getInnermostProperty = function getInnermostProperty2(propsList, pr
   }
   return null;
 };
-export const getOutermostProperty = function getOutermostProperty2(propsList, propName) {
+const getOutermostProperty = function getOutermostProperty2(propsList, propName) {
   for (const props of propsList) {
     if (props.hasOwnProperty(propName)) {
       return props[propName];
@@ -19,7 +19,7 @@ export const getOutermostProperty = function getOutermostProperty2(propsList, pr
   }
   return null;
 };
-export const aggKeysFromPropsList = function aggKeysFromPropsList2(propsList, propName) {
+const aggKeysFromPropsList = function aggKeysFromPropsList2(propsList, propName) {
   const initResult = REQUEST_META.reduce((result, next) => {
     const key = next;
     result[key] = [];
@@ -43,7 +43,7 @@ export const aggKeysFromPropsList = function aggKeysFromPropsList2(propsList, pr
     return result;
   }, res);
 };
-export const aggMatchesFromPropsList = function aggMatchesFromPropsList2(propsList, propName) {
+const aggMatchesFromPropsList = function aggMatchesFromPropsList2(propsList, propName) {
   const initResult = REQUEST_META.reduce((result, next) => {
     const key = next;
     result[key] = {};
@@ -81,6 +81,13 @@ function usefulArray(target) {
   }
   return Array.isArray(target) && target.length > 0;
 }
-export function exist(target) {
+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";
-export const WithCallback = ({ callback, children }) => {
+const WithCallback = ({ callback, children }) => {
   const once = useRef(false);
   useLayoutEffect(() => {
     if (once.current) {
@@ -12,3 +12,6 @@ export const WithCallback = ({ callback, children }) => {
   ]);
   return children;
 };
+export {
+  WithCallback
+};