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

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

@@ -1,130 +1,110 @@
-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 as Buffer2 } from "buffer";
+import { Buffer } from "buffer";
 import * as t from "@babel/types";
 import { get } from "@modern-js/utils/lodash";
-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;
+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;
     }
-    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(`
+  }
+  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;
+      }
     }
-    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;
+  }
+  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;
       }
-      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

@@ -1,20 +1,13 @@
 import path from "path";
-import {
-  getEntryOptions,
-  SERVER_RENDER_FUNCTION_NAME,
-  LOADABLE_STATS_FILE,
-  isUseSSRBundle,
-  createRuntimeExportsUtils,
-  isSSGEntry
-} from "@modern-js/utils";
+import { getEntryOptions, SERVER_RENDER_FUNCTION_NAME, LOADABLE_STATS_FILE, isUseSSRBundle, createRuntimeExportsUtils, isSSGEntry } from "@modern-js/utils";
 const PLUGIN_IDENTIFIER = "ssr";
 const hasStringSSREntry = (userConfig) => {
   const isStreaming = (ssr) => ssr && typeof ssr === "object" && ssr.mode === "stream";
   const { server } = userConfig;
-  if ((server == null ? void 0 : server.ssr) && !isStreaming(server.ssr)) {
+  if ((server === null || server === void 0 ? void 0 : server.ssr) && !isStreaming(server.ssr)) {
     return true;
   }
-  if ((server == null ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
+  if ((server === null || server === void 0 ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
     for (const name of Object.keys(server.ssrByEntries)) {
       if (!isStreaming(server.ssrByEntries[name])) {
         return true;
@@ -23,131 +16,119 @@ const hasStringSSREntry = (userConfig) => {
   }
   return false;
 };
-var cli_default = () => ({
-  name: "@modern-js/plugin-ssr",
-  required: ["@modern-js/runtime"],
-  setup: (api) => {
-    const ssrConfigMap = /* @__PURE__ */ new Map();
-    let pluginsExportsUtils;
-    return {
-      config() {
-        const appContext = api.useAppContext();
-        pluginsExportsUtils = createRuntimeExportsUtils(
-          appContext.internalDirectory,
-          "plugins"
-        );
-        const { bundlerType = "webpack" } = api.useAppContext();
-        const babelConfig = bundlerType === "webpack" ? (config) => {
-          var _a, _b;
-          (_a = config.plugins) == null ? void 0 : _a.push(
-            path.join(__dirname, "./babel-plugin-ssr-loader-id")
-          );
-          const userConfig = api.useResolvedConfigContext();
-          if (isUseSSRBundle(userConfig) && hasStringSSREntry(userConfig)) {
-            (_b = config.plugins) == null ? void 0 : _b.push(
-              require.resolve("@loadable/babel-plugin")
-            );
-          }
-        } : void 0;
-        return {
-          source: {
-            alias: {
-              // ensure that all packages use the same storage in @modern-js/utils/ssr
-              "@modern-js/utils/ssr": require.resolve("@modern-js/utils/ssr"),
-              "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
-            },
-            globalVars: (values, { target }) => {
-              values["process.env.MODERN_TARGET"] = target === "node" || target === "service-worker" ? "node" : "browser";
+export default () => {
+  return {
+    name: "@modern-js/plugin-ssr",
+    required: [
+      "@modern-js/runtime"
+    ],
+    setup: (api) => {
+      const ssrConfigMap = /* @__PURE__ */ new Map();
+      let pluginsExportsUtils;
+      return {
+        config() {
+          const appContext = api.useAppContext();
+          pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
+          const { bundlerType = "webpack" } = api.useAppContext();
+          const babelConfig = bundlerType === "webpack" ? (config) => {
+            var _config_plugins;
+            (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
+            const userConfig = api.useResolvedConfigContext();
+            if (isUseSSRBundle(userConfig) && hasStringSSREntry(userConfig)) {
+              var _config_plugins1;
+              (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
             }
-          },
-          tools: {
-            webpackChain: (chain, { isServer, isServiceWorker, CHAIN_ID }) => {
-              const userConfig = api.useResolvedConfigContext();
-              if (isUseSSRBundle(userConfig) && !isServer && !isServiceWorker && hasStringSSREntry(userConfig)) {
-                const LoadableWebpackPlugin = require("@loadable/webpack-plugin");
-                chain.plugin(CHAIN_ID.PLUGIN.LOADABLE).use(LoadableWebpackPlugin, [
-                  { filename: LOADABLE_STATS_FILE }
-                ]);
+          } : void 0;
+          return {
+            source: {
+              alias: {
+                // ensure that all packages use the same storage in @modern-js/utils/ssr
+                "@modern-js/utils/ssr": require.resolve("@modern-js/utils/ssr"),
+                "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
+              },
+              globalVars: (values, { target }) => {
+                values["process.env.MODERN_TARGET"] = target === "node" || target === "service-worker" ? "node" : "browser";
               }
             },
-            babel: babelConfig
+            tools: {
+              webpackChain: (chain, { isServer, isServiceWorker, CHAIN_ID }) => {
+                const userConfig = api.useResolvedConfigContext();
+                if (isUseSSRBundle(userConfig) && !isServer && !isServiceWorker && hasStringSSREntry(userConfig)) {
+                  const LoadableWebpackPlugin = require("@loadable/webpack-plugin");
+                  chain.plugin(CHAIN_ID.PLUGIN.LOADABLE).use(LoadableWebpackPlugin, [
+                    {
+                      filename: LOADABLE_STATS_FILE
+                    }
+                  ]);
+                }
+              },
+              babel: babelConfig
+            }
+          };
+        },
+        modifyEntryImports({ entrypoint, imports }) {
+          const { entryName, fileSystemRoutes } = entrypoint;
+          const userConfig = api.useResolvedConfigContext();
+          const { packageName, entrypoints } = api.useAppContext();
+          pluginsExportsUtils.addExport(`export { default as ssr } from '@modern-js/runtime/ssr'`);
+          const ssrConfig = getEntryOptions(entryName, userConfig.server.ssr, userConfig.server.ssrByEntries, packageName);
+          if (typeof ssrConfig === "object" && ssrConfig.mode === "stream") {
+            var _ref;
+            const runtimeConfig = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
+            if (((_ref = runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.router) === null || _ref === void 0 ? void 0 : _ref.mode) === "react-router-5") {
+              throw new Error(`router v5 plugin doesn't support streaming SSR, check your config 'runtime.router'`);
+            }
+            if (fileSystemRoutes && !entrypoint.nestedRoutesEntry) {
+              throw new Error(`You should switch to file-system based router to support streaming SSR.`);
+            }
           }
-        };
-      },
-      modifyEntryImports({ entrypoint, imports }) {
-        var _a;
-        const { entryName, fileSystemRoutes } = entrypoint;
-        const userConfig = api.useResolvedConfigContext();
-        const { packageName, entrypoints } = api.useAppContext();
-        pluginsExportsUtils.addExport(
-          `export { default as ssr } from '@modern-js/runtime/ssr'`
-        );
-        const ssrConfig = getEntryOptions(
-          entryName,
-          userConfig.server.ssr,
-          userConfig.server.ssrByEntries,
-          packageName
-        );
-        if (typeof ssrConfig === "object" && ssrConfig.mode === "stream") {
-          const runtimeConfig = getEntryOptions(
-            entryName,
-            userConfig.runtime,
-            userConfig.runtimeByEntries,
-            packageName
-          );
-          if (((_a = runtimeConfig == null ? void 0 : runtimeConfig.router) == null ? void 0 : _a.mode) === "react-router-5") {
-            throw new Error(
-              `router v5 plugin doesn't support streaming SSR, check your config 'runtime.router'`
-            );
+          const useSSG = isSSGEntry(userConfig, entryName, entrypoints);
+          ssrConfigMap.set(entryName, ssrConfig || useSSG);
+          if (ssrConfig || useSSG) {
+            imports.push({
+              value: "@modern-js/runtime/plugins",
+              specifiers: [
+                {
+                  imported: PLUGIN_IDENTIFIER
+                }
+              ]
+            });
           }
-          if (fileSystemRoutes && !entrypoint.nestedRoutesEntry) {
-            throw new Error(
-              `You should switch to file-system based router to support streaming SSR.`
-            );
+          return {
+            entrypoint,
+            imports
+          };
+        },
+        modifyEntryRuntimePlugins({ entrypoint, plugins }) {
+          if (ssrConfigMap.get(entrypoint.entryName)) {
+            plugins.push({
+              name: PLUGIN_IDENTIFIER,
+              options: JSON.stringify(ssrConfigMap.get(entrypoint.entryName))
+            });
           }
-        }
-        const useSSG = isSSGEntry(userConfig, entryName, entrypoints);
-        ssrConfigMap.set(entryName, ssrConfig || useSSG);
-        if (ssrConfig || useSSG) {
-          imports.push({
-            value: "@modern-js/runtime/plugins",
-            specifiers: [{ imported: PLUGIN_IDENTIFIER }]
-          });
-        }
-        return {
-          entrypoint,
-          imports
-        };
-      },
-      modifyEntryRuntimePlugins({ entrypoint, plugins }) {
-        if (ssrConfigMap.get(entrypoint.entryName)) {
-          plugins.push({
-            name: PLUGIN_IDENTIFIER,
-            options: JSON.stringify(ssrConfigMap.get(entrypoint.entryName))
-          });
-        }
-        return {
-          entrypoint,
-          plugins
-        };
-      },
-      modifyEntryExport({ entrypoint, exportStatement }) {
-        if (ssrConfigMap.get(entrypoint.entryName)) {
           return {
             entrypoint,
-            exportStatement: [
-              `export function ${SERVER_RENDER_FUNCTION_NAME}(context) {
+            plugins
+          };
+        },
+        modifyEntryExport({ entrypoint, exportStatement }) {
+          if (ssrConfigMap.get(entrypoint.entryName)) {
+            return {
+              entrypoint,
+              exportStatement: [
+                `export function ${SERVER_RENDER_FUNCTION_NAME}(context) {
               return bootstrap(AppWrapper, context)
             }`,
-              exportStatement
-            ].join("\n")
+                exportStatement
+              ].join("\n")
+            };
+          }
+          return {
+            entrypoint,
+            exportStatement
           };
         }
-        return { entrypoint, exportStatement };
-      }
-    };
-  }
-});
-export {
-  cli_default as default
+      };
+    }
+  };
 };