@modern-js/plugin-ssg 2.4.0 → 2.5.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @modern-js/plugin-ssg
 
+## 2.5.0
+
+### Patch Changes
+
+- 89ca6cc: refactor: merge build-config into scripts/build
+
+  refactor: 把 build-config 合并进 scripts/build
+
+- 30614fa: chore: modify package.json entry fields and build config
+  chore: 更改 package.json entry 字段以及构建配置
+- Updated dependencies [30614fa]
+- Updated dependencies [1b0ce87]
+- Updated dependencies [11c053b]
+  - @modern-js/utils@2.5.0
+
 ## 2.4.0
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -0,0 +1,168 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var src_exports = {};
+__export(src_exports, {
+  default: () => src_default
+});
+module.exports = __toCommonJS(src_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_react_router_dom = require("react-router-dom");
+var import_util = require("./libs/util");
+var import_server = require("./server");
+var import_output = require("./libs/output");
+var import_replace = require("./libs/replace");
+var import_make = require("./libs/make");
+var src_default = () => ({
+  name: "@modern-js/plugin-ssg",
+  pre: ["@modern-js/plugin-server", "@modern-js/plugin-bff"],
+  setup: (api) => {
+    const agreedRouteMap = {};
+    return {
+      validateSchema() {
+        return import_utils.PLUGIN_SCHEMAS["@modern-js/plugin-ssg"];
+      },
+      modifyFileSystemRoutes({ entrypoint, routes }) {
+        const { entryName } = entrypoint;
+        const flattedRoutes = (0, import_util.flattenRoutes)(routes);
+        agreedRouteMap[entryName] = flattedRoutes;
+        return { entrypoint, routes };
+      },
+      async afterBuild() {
+        const resolvedConfig = api.useResolvedConfigContext();
+        const appContext = api.useAppContext();
+        const { appDirectory, entrypoints } = appContext;
+        const { output, server } = resolvedConfig;
+        const { ssg, distPath: { root: outputPath } = {} } = output;
+        const ssgOptions = (Array.isArray(ssg) ? ssg.pop() : ssg) || true;
+        const buildDir = import_path.default.join(appDirectory, outputPath);
+        const routes = (0, import_util.readJSONSpec)(buildDir);
+        const pageRoutes = routes.filter((route) => !route.isApi);
+        const apiRoutes = routes.filter((route) => route.isApi);
+        if (pageRoutes.length === 0) {
+          return;
+        }
+        const intermediateOptions = (0, import_util.standardOptions)(
+          ssgOptions,
+          entrypoints,
+          pageRoutes,
+          server
+        );
+        if (!intermediateOptions) {
+          return;
+        }
+        const ssgRoutes = [];
+        pageRoutes.forEach((pageRoute) => {
+          const { entryName, entryPath } = pageRoute;
+          const agreedRoutes = agreedRouteMap[entryName];
+          let entryOptions = intermediateOptions[entryName] || intermediateOptions[pageRoute.urlPath];
+          if (!agreedRoutes) {
+            if (!entryOptions) {
+              return;
+            }
+            if (entryOptions === true) {
+              ssgRoutes.push({ ...pageRoute, output: entryPath });
+            } else if (entryOptions.routes && entryOptions.routes.length > 0) {
+              const { routes: enrtyRoutes, headers } = entryOptions;
+              enrtyRoutes.forEach((route) => {
+                ssgRoutes.push((0, import_make.makeRoute)(pageRoute, route, headers));
+              });
+            }
+          } else {
+            if (!entryOptions) {
+              return;
+            }
+            if (entryOptions === true) {
+              entryOptions = { preventDefault: [], routes: [], headers: {} };
+            }
+            const {
+              preventDefault = [],
+              routes: userRoutes = [],
+              headers
+            } = entryOptions;
+            if (userRoutes.length > 0) {
+              userRoutes.forEach((route) => {
+                if (typeof route === "string") {
+                  ssgRoutes.push((0, import_make.makeRoute)(pageRoute, route, headers));
+                } else if (Array.isArray(route.params)) {
+                  route.params.forEach((param) => {
+                    ssgRoutes.push(
+                      (0, import_make.makeRoute)(
+                        pageRoute,
+                        { ...route, url: (0, import_react_router_dom.generatePath)(route.url, param) },
+                        headers
+                      )
+                    );
+                  });
+                } else {
+                  ssgRoutes.push((0, import_make.makeRoute)(pageRoute, route, headers));
+                }
+              });
+            } else {
+              agreedRoutes.filter((route) => !preventDefault.includes(route.path)).forEach((route) => {
+                if (!(0, import_util.isDynamicUrl)(route.path)) {
+                  ssgRoutes.push((0, import_make.makeRoute)(pageRoute, route.path, headers));
+                }
+              });
+            }
+          }
+        });
+        if (ssgRoutes.length === 0) {
+          return;
+        }
+        ssgRoutes.forEach((ssgRoute) => {
+          if (ssgRoute.isSSR) {
+            const isOriginRoute = pageRoutes.some(
+              (pageRoute) => pageRoute.urlPath === ssgRoute.urlPath && pageRoute.entryName === ssgRoute.entryName
+            );
+            if (isOriginRoute) {
+              throw new Error(
+                `ssg can not using with ssr，url - ${ssgRoute.urlPath}, entry - ${ssgRoute.entryName} `
+              );
+            }
+            import_utils.logger.warn(
+              `new ssg route ${ssgRoute.urlPath} is using ssr now，maybe from parent route ${ssgRoute.entryName}，close ssr`
+            );
+          }
+          ssgRoute.isSSR = false;
+          ssgRoute.output = (0, import_util.formatOutput)(ssgRoute.output);
+        });
+        const htmlAry = await (0, import_server.createServer)(
+          api,
+          ssgRoutes,
+          pageRoutes,
+          apiRoutes,
+          resolvedConfig,
+          appDirectory
+        );
+        (0, import_output.writeHtmlFile)(htmlAry, ssgRoutes, buildDir);
+        (0, import_replace.replaceRoute)(ssgRoutes, pageRoutes);
+        (0, import_util.writeJSONSpec)(buildDir, pageRoutes.concat(apiRoutes));
+        import_utils.logger.info("ssg Compiled successfully");
+      }
+    };
+  }
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/{js/node → cjs}/libs/make.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 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 __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -50,7 +33,7 @@ function makeRender(ssgRoutes, render, port) {
   return ssgRoutes.map(
     (ssgRoute) => render({
       url: ssgRoute.urlPath,
-      headers: __spreadValues({ host: `localhost:${port}` }, ssgRoute.headers),
+      headers: { host: `localhost:${port}`, ...ssgRoute.headers },
       connection: {}
     })
   );
@@ -58,17 +41,19 @@ function makeRender(ssgRoutes, render, port) {
 function makeRoute(baseRoute, route, headers = {}) {
   const { urlPath, entryPath } = baseRoute;
   if (typeof route === "string") {
-    return __spreadProps(__spreadValues({}, baseRoute), {
+    return {
+      ...baseRoute,
       urlPath: (0, import_normalize_path.default)(`${urlPath}${route}`) || "/",
       headers,
       output: import_path.default.join(entryPath, `..${route === "/" ? "" : route}`)
-    });
+    };
   } else {
-    return __spreadProps(__spreadValues({}, baseRoute), {
+    return {
+      ...baseRoute,
       urlPath: (0, import_normalize_path.default)(`${urlPath}${route.url}`) || "/",
-      headers: __spreadValues(__spreadValues({}, headers), route.headers),
+      headers: { ...headers, ...route.headers },
       output: route.output ? import_path.default.normalize(route.output) : import_path.default.join(entryPath, `..${route.url === "/" ? "" : route.url}`)
-    });
+    };
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/{js/node → cjs}/libs/replace.js

@@ -2,34 +2,8 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 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 __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -66,7 +40,7 @@ function exist(route, pageRoutes) {
 }
 function replaceRoute(ssgRoutes, pageRoutes) {
   const cleanSsgRoutes = ssgRoutes.map((ssgRoute) => {
-    const _a = ssgRoute, { output, headers } = _a, cleanSsgRoute = __objRest(_a, ["output", "headers"]);
+    const { output, headers, ...cleanSsgRoute } = ssgRoute;
     return Object.assign(
       cleanSsgRoute,
       output ? { entryPath: output } : {}
@@ -76,7 +50,7 @@ function replaceRoute(ssgRoutes, pageRoutes) {
   cleanSsgRoutes.forEach((ssgRoute) => {
     const index = exist(ssgRoute, pageRoutes);
     if (index < 0) {
-      freshRoutes.push(__spreadValues({}, ssgRoute));
+      freshRoutes.push({ ...ssgRoute });
     } else {
       pageRoutes[index].entryPath = ssgRoute.entryPath;
     }

package/dist/{js/node → cjs}/libs/util.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 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 __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -160,7 +143,8 @@ const standardOptions = (ssgOptions, entrypoints, routes, server) => {
   }
   return false;
 };
-const openRouteSSR = (routes, entries = []) => routes.map((ssgRoute) => __spreadProps(__spreadValues({}, ssgRoute), {
+const openRouteSSR = (routes, entries = []) => routes.map((ssgRoute) => ({
+  ...ssgRoute,
   isSSR: entries.includes(ssgRoute.entryName),
   bundle: `${import_utils.SERVER_BUNDLE_DIRECTORY}/${ssgRoute.entryName}.js`
 }));
@@ -172,14 +156,16 @@ const flattenRoutes = (routes) => {
     let path2 = parent ? `${parent.path}/${route.path || ""}`.replace(/\/+/g, "/") : route.path || "";
     path2 = path2.replace(/\/$/, "");
     if (route._component && (path2 !== "/" || path2 === "/" && !parent)) {
-      newRoutes.push(__spreadProps(__spreadValues({}, route), {
+      newRoutes.push({
+        ...route,
         path: path2
-      }));
+      });
     }
     if (route.children) {
-      parents.push(__spreadProps(__spreadValues({}, route), {
+      parents.push({
+        ...route,
         path: path2
-      }));
+      });
       route.children.forEach(traverseRoute);
       parents.pop();
     }

package/dist/{js/node → cjs}/server/prerender.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 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 __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -47,9 +30,10 @@ var import_events = __toESM(require("events"));
 var import_stream = require("stream");
 var import_node_mocks_http = __toESM(require("node-mocks-http"));
 const compile = (requestHandler) => (options, extend = {}) => new Promise((resolve, reject) => {
-  const req = import_node_mocks_http.default.createRequest(__spreadProps(__spreadValues({}, options), {
+  const req = import_node_mocks_http.default.createRequest({
+    ...options,
     eventEmitter: import_stream.Readable
-  }));
+  });
   const res = import_node_mocks_http.default.createResponse({ eventEmitter: import_events.default });
   Object.assign(req, extend);
   const proxyRes = new Proxy(res, {

package/dist/{js/node → cjs}/server/process.js

@@ -16,32 +16,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
-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());
-  });
-};
 var import_prod_server = __toESM(require("@modern-js/prod-server"));
 var import_portfinder = __toESM(require("portfinder"));
 var import_make = require("../libs/make");
 var import_prerender = require("./prerender");
 var import_consts = require("./consts");
-process.on("message", (chunk) => __async(exports, null, function* () {
+process.on("message", async (chunk) => {
   if (chunk === import_consts.CLOSE_SIGN) {
     process.exit();
   }
@@ -58,15 +38,15 @@ process.on("message", (chunk) => __async(exports, null, function* () {
     const { server: serverOptions } = options;
     const defaultPort = Number(process.env.PORT) || serverOptions.port;
     import_portfinder.default.basePort = defaultPort;
-    const port = yield import_portfinder.default.getPortPromise();
-    modernServer = yield (0, import_prod_server.default)({
+    const port = await import_portfinder.default.getPortPromise();
+    modernServer = await (0, import_prod_server.default)({
       pwd: appDirectory,
       config: options,
       routes,
       staticGenerate: true,
       internalPlugins: plugins
     });
-    modernServer.listen(port, (err) => __async(exports, null, function* () {
+    modernServer.listen(port, async (err) => {
       if (err) {
         throw err;
       }
@@ -79,15 +59,15 @@ process.on("message", (chunk) => __async(exports, null, function* () {
         render,
         port
       );
-      const htmlAry = yield Promise.all(renderPromiseAry);
+      const htmlAry = await Promise.all(renderPromiseAry);
       htmlAry.forEach((html) => {
         process.send(html);
         process.send(null);
       });
       modernServer.close();
-    }));
+    });
   } catch (e) {
     modernServer == null ? void 0 : modernServer.close();
     throw e;
   }
-}));
+});

package/dist/{js/treeshaking → esm}/index.js

@@ -207,7 +207,7 @@ var src_default = function() {
                 },
                 afterBuild: function afterBuild() {
                     return _asyncToGenerator(function() {
-                        var resolvedConfig, appContext, appDirectory, entrypoints, output, server, ssg, tmp, ref, outputPath, ssgOptions, buildDir, routes, pageRoutes, apiRoutes, intermediateOptions, ssgRoutes, htmlAry;
+                        var resolvedConfig, appContext, appDirectory, entrypoints, output, server, ssg, tmp, _ref, outputPath, ssgOptions, buildDir, routes, pageRoutes, apiRoutes, intermediateOptions, ssgRoutes, htmlAry;
                         return __generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
@@ -215,7 +215,7 @@ var src_default = function() {
                                     appContext = api.useAppContext();
                                     appDirectory = appContext.appDirectory, entrypoints = appContext.entrypoints;
                                     output = resolvedConfig.output, server = resolvedConfig.server;
-                                    ssg = output.ssg, tmp = output.distPath, ref = tmp === void 0 ? {} : tmp, outputPath = ref.root;
+                                    ssg = output.ssg, tmp = output.distPath, _ref = tmp === void 0 ? {} : tmp, outputPath = _ref.root;
                                     ssgOptions = (Array.isArray(ssg) ? ssg.pop() : ssg) || true;
                                     buildDir = path.join(appDirectory, outputPath);
                                     routes = readJSONSpec(buildDir);
@@ -266,7 +266,7 @@ var src_default = function() {
                                                     headers: {}
                                                 };
                                             }
-                                            var _preventDefault = entryOptions.preventDefault, preventDefault = _preventDefault === void 0 ? [] : _preventDefault, tmp = entryOptions.routes, userRoutes = tmp === void 0 ? [] : tmp, headers1 = entryOptions.headers;
+                                            var _entryOptions_preventDefault = entryOptions.preventDefault, preventDefault = _entryOptions_preventDefault === void 0 ? [] : _entryOptions_preventDefault, tmp = entryOptions.routes, userRoutes = tmp === void 0 ? [] : tmp, headers1 = entryOptions.headers;
                                             if (userRoutes.length > 0) {
                                                 userRoutes.forEach(function(route) {
                                                     if (typeof route === "string") {