@modern-js/plugin-ssg 2.15.0 → 2.16.0

package/dist/esm-node/index.js

@@ -1,21 +1,17 @@
 import path from "path";
 import { logger, PLUGIN_SCHEMAS } from "@modern-js/utils";
 import { generatePath } from "react-router-dom";
-import {
-  flattenRoutes,
-  formatOutput,
-  isDynamicUrl,
-  readJSONSpec,
-  standardOptions,
-  writeJSONSpec
-} from "./libs/util";
+import { flattenRoutes, formatOutput, isDynamicUrl, readJSONSpec, standardOptions, writeJSONSpec } from "./libs/util";
 import { createServer } from "./server";
 import { writeHtmlFile } from "./libs/output";
 import { replaceRoute } from "./libs/replace";
 import { makeRoute } from "./libs/make";
-var src_default = () => ({
+export default () => ({
   name: "@modern-js/plugin-ssg",
-  pre: ["@modern-js/plugin-server", "@modern-js/plugin-bff"],
+  pre: [
+    "@modern-js/plugin-server",
+    "@modern-js/plugin-bff"
+  ],
   setup: (api) => {
     const agreedRouteMap = {};
     return {
@@ -26,7 +22,10 @@ var src_default = () => ({
         const { entryName } = entrypoint;
         const flattedRoutes = flattenRoutes(routes);
         agreedRouteMap[entryName] = flattedRoutes;
-        return { entrypoint, routes };
+        return {
+          entrypoint,
+          routes
+        };
       },
       async afterBuild() {
         const resolvedConfig = api.useResolvedConfigContext();
@@ -42,12 +41,7 @@ var src_default = () => ({
         if (pageRoutes.length === 0) {
           return;
         }
-        const intermediateOptions = standardOptions(
-          ssgOptions,
-          entrypoints,
-          pageRoutes,
-          server
-        );
+        const intermediateOptions = standardOptions(ssgOptions, entrypoints, pageRoutes, server);
         if (!intermediateOptions) {
           return;
         }
@@ -61,7 +55,10 @@ var src_default = () => ({
               return;
             }
             if (entryOptions === true) {
-              ssgRoutes.push({ ...pageRoute, output: entryPath });
+              ssgRoutes.push({
+                ...pageRoute,
+                output: entryPath
+              });
             } else if (entryOptions.routes && entryOptions.routes.length > 0) {
               const { routes: enrtyRoutes, headers } = entryOptions;
               enrtyRoutes.forEach((route) => {
@@ -73,26 +70,23 @@ var src_default = () => ({
               return;
             }
             if (entryOptions === true) {
-              entryOptions = { preventDefault: [], routes: [], headers: {} };
+              entryOptions = {
+                preventDefault: [],
+                routes: [],
+                headers: {}
+              };
             }
-            const {
-              preventDefault = [],
-              routes: userRoutes = [],
-              headers
-            } = entryOptions;
+            const { preventDefault = [], routes: userRoutes = [], headers } = entryOptions;
             if (userRoutes.length > 0) {
               userRoutes.forEach((route) => {
                 if (typeof route === "string") {
                   ssgRoutes.push(makeRoute(pageRoute, route, headers));
                 } else if (Array.isArray(route.params)) {
                   route.params.forEach((param) => {
-                    ssgRoutes.push(
-                      makeRoute(
-                        pageRoute,
-                        { ...route, url: generatePath(route.url, param) },
-                        headers
-                      )
-                    );
+                    ssgRoutes.push(makeRoute(pageRoute, {
+                      ...route,
+                      url: generatePath(route.url, param)
+                    }, headers));
                   });
                 } else {
                   ssgRoutes.push(makeRoute(pageRoute, route, headers));
@@ -112,29 +106,16 @@ var src_default = () => ({
         }
         ssgRoutes.forEach((ssgRoute) => {
           if (ssgRoute.isSSR) {
-            const isOriginRoute = pageRoutes.some(
-              (pageRoute) => pageRoute.urlPath === ssgRoute.urlPath && pageRoute.entryName === ssgRoute.entryName
-            );
+            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} `
-              );
+              throw new Error(`ssg can not using with ssr，url - ${ssgRoute.urlPath}, entry - ${ssgRoute.entryName} `);
             }
-            logger.warn(
-              `new ssg route ${ssgRoute.urlPath} is using ssr now，maybe from parent route ${ssgRoute.entryName}，close ssr`
-            );
+            logger.warn(`new ssg route ${ssgRoute.urlPath} is using ssr now，maybe from parent route ${ssgRoute.entryName}，close ssr`);
           }
           ssgRoute.isSSR = false;
           ssgRoute.output = formatOutput(ssgRoute.output);
         });
-        const htmlAry = await createServer(
-          api,
-          ssgRoutes,
-          pageRoutes,
-          apiRoutes,
-          resolvedConfig,
-          appDirectory
-        );
+        const htmlAry = await createServer(api, ssgRoutes, pageRoutes, apiRoutes, resolvedConfig, appDirectory);
         writeHtmlFile(htmlAry, ssgRoutes, buildDir);
         replaceRoute(ssgRoutes, pageRoutes);
         writeJSONSpec(buildDir, pageRoutes.concat(apiRoutes));
@@ -143,6 +124,3 @@ var src_default = () => ({
     };
   }
 });
-export {
-  src_default as default
-};

package/dist/esm-node/libs/make.js

@@ -1,15 +1,16 @@
 import path from "path";
 import normalize from "normalize-path";
-function makeRender(ssgRoutes, render, port) {
-  return ssgRoutes.map(
-    (ssgRoute) => render({
-      url: ssgRoute.urlPath,
-      headers: { host: `localhost:${port}`, ...ssgRoute.headers },
-      connection: {}
-    })
-  );
+export function makeRender(ssgRoutes, render, port) {
+  return ssgRoutes.map((ssgRoute) => render({
+    url: ssgRoute.urlPath,
+    headers: {
+      host: `localhost:${port}`,
+      ...ssgRoute.headers
+    },
+    connection: {}
+  }));
 }
-function makeRoute(baseRoute, route, headers = {}) {
+export function makeRoute(baseRoute, route, headers = {}) {
   const { urlPath, entryPath } = baseRoute;
   if (typeof route === "string") {
     return {
@@ -22,12 +23,11 @@ function makeRoute(baseRoute, route, headers = {}) {
     return {
       ...baseRoute,
       urlPath: normalize(`${urlPath}${route.url}`) || "/",
-      headers: { ...headers, ...route.headers },
+      headers: {
+        ...headers,
+        ...route.headers
+      },
       output: route.output ? path.normalize(route.output) : path.join(entryPath, `..${route.url === "/" ? "" : route.url}`)
     };
   }
 }
-export {
-  makeRender,
-  makeRoute
-};

package/dist/esm-node/libs/output.js

@@ -1,6 +1,6 @@
 import path from "path";
 import { fs } from "@modern-js/utils";
-function writeHtmlFile(htmlAry, ssgRoutes, baseDir) {
+export function writeHtmlFile(htmlAry, ssgRoutes, baseDir) {
   htmlAry.forEach((html, index) => {
     const ssgRoute = ssgRoutes[index];
     const filepath = path.join(baseDir, ssgRoute.output);
@@ -10,6 +10,3 @@ function writeHtmlFile(htmlAry, ssgRoutes, baseDir) {
     fs.writeFileSync(filepath, html);
   });
 }
-export {
-  writeHtmlFile
-};

package/dist/esm-node/libs/replace.js

@@ -1,5 +1,5 @@
 import normalize from "normalize-path";
-function exist(route, pageRoutes) {
+export function exist(route, pageRoutes) {
   return pageRoutes.slice().findIndex((pageRoute) => {
     const urlEqual = normalize(pageRoute.urlPath) === normalize(route.urlPath);
     const entryEqual = pageRoute.entryName === route.entryName;
@@ -9,19 +9,20 @@ function exist(route, pageRoutes) {
     return false;
   });
 }
-function replaceRoute(ssgRoutes, pageRoutes) {
+export function replaceRoute(ssgRoutes, pageRoutes) {
   const cleanSsgRoutes = ssgRoutes.map((ssgRoute) => {
     const { output, headers, ...cleanSsgRoute } = ssgRoute;
-    return Object.assign(
-      cleanSsgRoute,
-      output ? { entryPath: output } : {}
-    );
+    return Object.assign(cleanSsgRoute, output ? {
+      entryPath: output
+    } : {});
   });
   const freshRoutes = [];
   cleanSsgRoutes.forEach((ssgRoute) => {
     const index = exist(ssgRoute, pageRoutes);
     if (index < 0) {
-      freshRoutes.push({ ...ssgRoute });
+      freshRoutes.push({
+        ...ssgRoute
+      });
     } else {
       pageRoutes[index].entryPath = ssgRoute.entryPath;
     }
@@ -29,7 +30,3 @@ function replaceRoute(ssgRoutes, pageRoutes) {
   pageRoutes.push(...freshRoutes);
   return pageRoutes;
 }
-export {
-  exist,
-  replaceRoute
-};

package/dist/esm-node/libs/util.js

@@ -1,15 +1,10 @@
 import path from "path";
-import {
-  ROUTE_SPEC_FILE,
-  fs,
-  isSingleEntry,
-  SERVER_BUNDLE_DIRECTORY
-} from "@modern-js/utils";
-function formatOutput(filename) {
+import { ROUTE_SPEC_FILE, fs, isSingleEntry, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils";
+export function formatOutput(filename) {
   const outputPath = path.extname(filename) ? filename : `${filename}/index.html`;
   return outputPath;
 }
-function formatPath(str) {
+export function formatPath(str) {
   let addr = str;
   if (!addr || typeof addr !== "string") {
     return addr;
@@ -25,10 +20,10 @@ function formatPath(str) {
   }
   return addr;
 }
-function isDynamicUrl(url) {
+export function isDynamicUrl(url) {
   return url.includes(":");
 }
-function getUrlPrefix(route, baseUrl) {
+export function getUrlPrefix(route, baseUrl) {
   let base = "";
   if (Array.isArray(baseUrl)) {
     const filters = baseUrl.filter((url) => route.urlPath.includes(url));
@@ -47,7 +42,7 @@ function getUrlPrefix(route, baseUrl) {
   const prefix = `${base}/${entryName}`;
   return prefix.endsWith("/") ? prefix.slice(0, -1) : prefix;
 }
-function getOutput(route, base, agreed) {
+export function getOutput(route, base, agreed) {
   const { output } = route;
   if (output) {
     return output;
@@ -56,22 +51,24 @@ function getOutput(route, base, agreed) {
     const urlWithoutBase = route.urlPath.replace(base, "");
     return urlWithoutBase.startsWith("/") ? urlWithoutBase.slice(1) : urlWithoutBase;
   }
-  throw new Error(
-    `routing must provide output when calling createPage(), check ${route.urlPath}`
-  );
+  throw new Error(`routing must provide output when calling createPage(), check ${route.urlPath}`);
 }
-const readJSONSpec = (dir) => {
+export const readJSONSpec = (dir) => {
   const routeJSONPath = path.join(dir, ROUTE_SPEC_FILE);
   const routeJSON = require(routeJSONPath);
   const { routes } = routeJSON;
   return routes;
 };
-const writeJSONSpec = (dir, routes) => {
+export const writeJSONSpec = (dir, routes) => {
   const routeJSONPath = path.join(dir, ROUTE_SPEC_FILE);
-  fs.writeJSONSync(routeJSONPath, { routes }, { spaces: 2 });
+  fs.writeJSONSync(routeJSONPath, {
+    routes
+  }, {
+    spaces: 2
+  });
 };
-const replaceWithAlias = (base, filePath, alias) => path.posix.join(alias, path.posix.relative(base, filePath));
-const standardOptions = (ssgOptions, entrypoints, routes, server) => {
+export const replaceWithAlias = (base, filePath, alias) => path.posix.join(alias, path.posix.relative(base, filePath));
+export const standardOptions = (ssgOptions, entrypoints, routes, server) => {
   if (ssgOptions === false) {
     return false;
   }
@@ -83,7 +80,9 @@ const standardOptions = (ssgOptions, entrypoints, routes, server) => {
   } else if (typeof ssgOptions === "object") {
     const isSingle = isSingleEntry(entrypoints);
     if (isSingle && typeof ssgOptions.main === "undefined") {
-      return { main: ssgOptions };
+      return {
+        main: ssgOptions
+      };
     } else {
       return ssgOptions;
     }
@@ -91,18 +90,17 @@ const standardOptions = (ssgOptions, entrypoints, routes, server) => {
     const intermediateOptions = {};
     for (const entrypoint of entrypoints) {
       const { entryName } = entrypoint;
-      if (Array.isArray(server == null ? void 0 : server.baseUrl)) {
+      if (Array.isArray(server === null || server === void 0 ? void 0 : server.baseUrl)) {
         for (const url of server.baseUrl) {
           const matchUrl = entryName === "main" ? url : `${url}/${entryName}`;
           const route = routes.find((route2) => route2.urlPath === matchUrl);
-          intermediateOptions[route == null ? void 0 : route.urlPath] = ssgOptions(
-            entryName,
-            { baseUrl: url }
-          );
+          intermediateOptions[route === null || route === void 0 ? void 0 : route.urlPath] = ssgOptions(entryName, {
+            baseUrl: url
+          });
         }
       } else {
         intermediateOptions[entryName] = ssgOptions(entryName, {
-          baseUrl: server == null ? void 0 : server.baseUrl
+          baseUrl: server === null || server === void 0 ? void 0 : server.baseUrl
         });
       }
     }
@@ -110,12 +108,12 @@ const standardOptions = (ssgOptions, entrypoints, routes, server) => {
   }
   return false;
 };
-const openRouteSSR = (routes, entries = []) => routes.map((ssgRoute) => ({
+export const openRouteSSR = (routes, entries = []) => routes.map((ssgRoute) => ({
   ...ssgRoute,
   isSSR: entries.includes(ssgRoute.entryName),
   bundle: `${SERVER_BUNDLE_DIRECTORY}/${ssgRoute.entryName}.js`
 }));
-const flattenRoutes = (routes) => {
+export const flattenRoutes = (routes) => {
   const parents = [];
   const newRoutes = [];
   const traverseRoute = (route) => {
@@ -140,16 +138,3 @@ const flattenRoutes = (routes) => {
   routes.forEach(traverseRoute);
   return newRoutes;
 };
-export {
-  flattenRoutes,
-  formatOutput,
-  formatPath,
-  getOutput,
-  getUrlPrefix,
-  isDynamicUrl,
-  openRouteSSR,
-  readJSONSpec,
-  replaceWithAlias,
-  standardOptions,
-  writeJSONSpec
-};

package/dist/esm-node/server/consts.js

@@ -1,4 +1 @@
-const CLOSE_SIGN = "modern_close_server";
-export {
-  CLOSE_SIGN
-};
+export const CLOSE_SIGN = "modern_close_server";

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

@@ -3,62 +3,59 @@ import path from "path";
 import { logger } from "@modern-js/utils";
 import { openRouteSSR } from "../libs/util";
 import { CLOSE_SIGN } from "./consts";
-const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirectory) => new Promise((resolve, reject) => {
-  var _a, _b;
-  const entries = ssgRoutes.map((route) => route.entryName);
-  const backup = openRouteSSR(pageRoutes, entries);
-  const total = backup.concat(apiRoutes);
-  const cp = childProcess.fork(path.join(__dirname, "process"), {
-    cwd: appDirectory,
-    silent: true
-  });
-  const appContext = api.useAppContext();
-  const plugins = appContext.serverInternalPlugins;
-  cp.send(
-    JSON.stringify({
+export const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirectory) => {
+  return new Promise((resolve, reject) => {
+    var _cp_stderr, _cp_stdout;
+    const entries = ssgRoutes.map((route) => route.entryName);
+    const backup = openRouteSSR(pageRoutes, entries);
+    const total = backup.concat(apiRoutes);
+    const cp = childProcess.fork(path.join(__dirname, "process"), {
+      cwd: appDirectory,
+      silent: true
+    });
+    const appContext = api.useAppContext();
+    const plugins = appContext.serverInternalPlugins;
+    cp.send(JSON.stringify({
       options,
       renderRoutes: ssgRoutes,
       routes: total,
       appDirectory,
       plugins
-    })
-  );
-  const htmlChunks = [];
-  const htmlAry = [];
-  cp.on("message", (chunk) => {
-    if (chunk !== null) {
-      htmlChunks.push(chunk);
-    } else {
-      const html = htmlChunks.join("");
-      htmlAry.push(html);
-      htmlChunks.length = 0;
-    }
-    if (htmlAry.length === ssgRoutes.length) {
-      cp.send(CLOSE_SIGN);
-      resolve(htmlAry);
-    }
-  });
-  (_a = cp.stderr) == null ? void 0 : _a.on("data", (chunk) => {
-    const str = chunk.toString();
-    if (str.includes("Error")) {
-      logger.error(str);
-      reject(new Error("ssg render failed"));
-      cp.kill("SIGKILL");
-    } else {
-      logger.info(str.replace(/[^\S\n]+/g, " "));
-    }
-  });
-  (_b = cp.stdout) == null ? void 0 : _b.on("data", (chunk) => {
-    const str = chunk.toString();
-    if (str.includes("Error")) {
-      logger.error(str);
-      reject(new Error("ssg render failed"));
-      cp.kill("SIGKILL");
-    } else {
-      logger.info(str.replace(/[^\S\n]+/g, " "));
-    }
+    }));
+    const htmlChunks = [];
+    const htmlAry = [];
+    cp.on("message", (chunk) => {
+      if (chunk !== null) {
+        htmlChunks.push(chunk);
+      } else {
+        const html = htmlChunks.join("");
+        htmlAry.push(html);
+        htmlChunks.length = 0;
+      }
+      if (htmlAry.length === ssgRoutes.length) {
+        cp.send(CLOSE_SIGN);
+        resolve(htmlAry);
+      }
+    });
+    (_cp_stderr = cp.stderr) === null || _cp_stderr === void 0 ? void 0 : _cp_stderr.on("data", (chunk) => {
+      const str = chunk.toString();
+      if (str.includes("Error")) {
+        logger.error(str);
+        reject(new Error("ssg render failed"));
+        cp.kill("SIGKILL");
+      } else {
+        logger.info(str.replace(/[^\S\n]+/g, " "));
+      }
+    });
+    (_cp_stdout = cp.stdout) === null || _cp_stdout === void 0 ? void 0 : _cp_stdout.on("data", (chunk) => {
+      const str = chunk.toString();
+      if (str.includes("Error")) {
+        logger.error(str);
+        reject(new Error("ssg render failed"));
+        cp.kill("SIGKILL");
+      } else {
+        logger.info(str.replace(/[^\S\n]+/g, " "));
+      }
+    });
   });
-});
-export {
-  createServer
 };

package/dist/esm-node/server/prerender.js

@@ -1,12 +1,14 @@
 import EventEmitter from "events";
 import { Readable } from "stream";
 import httpMocks from "node-mocks-http";
-const compile = (requestHandler) => (options, extend = {}) => new Promise((resolve, reject) => {
+export const compile = (requestHandler) => (options, extend = {}) => new Promise((resolve, reject) => {
   const req = httpMocks.createRequest({
     ...options,
     eventEmitter: Readable
   });
-  const res = httpMocks.createResponse({ eventEmitter: EventEmitter });
+  const res = httpMocks.createResponse({
+    eventEmitter: EventEmitter
+  });
   Object.assign(req, extend);
   const proxyRes = new Proxy(res, {
     get(obj, prop) {
@@ -30,6 +32,3 @@ const compile = (requestHandler) => (options, extend = {}) => new Promise((resol
     reject(e);
   }
 });
-export {
-  compile
-};

package/dist/esm-node/server/process.js

@@ -8,13 +8,7 @@ process.on("message", async (chunk) => {
     process.exit();
   }
   const context = JSON.parse(chunk);
-  const {
-    routes,
-    renderRoutes,
-    options,
-    appDirectory,
-    plugins
-  } = context;
+  const { routes, renderRoutes, options, appDirectory, plugins } = context;
   let modernServer = null;
   try {
     const { server: serverOptions } = options;
@@ -36,11 +30,7 @@ process.on("message", async (chunk) => {
         return;
       }
       const render = createRender(modernServer.getRequestHandler());
-      const renderPromiseAry = makeRender(
-        renderRoutes,
-        render,
-        port
-      );
+      const renderPromiseAry = makeRender(renderRoutes, render, port);
       const htmlAry = await Promise.all(renderPromiseAry);
       htmlAry.forEach((html) => {
         process.send(html);
@@ -49,7 +39,7 @@ process.on("message", async (chunk) => {
       modernServer.close();
     });
   } catch (e) {
-    modernServer == null ? void 0 : modernServer.close();
+    modernServer === null || modernServer === void 0 ? void 0 : modernServer.close();
     process.stderr.write(e instanceof Error ? e.stack : e.toString());
   }
 });

package/dist/esm-node/types.js

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

package/package.json

@@ -3,7 +3,11 @@
   "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
   "bugs": "https://github.com/web-infra-dev/modern.js/issues",
-  "repository": "web-infra-dev/modern.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/web-infra-dev/modern.js",
+    "directory": "packages/cli/plugin-ssg"
+  },
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.15.0",
+  "version": "2.16.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -59,7 +63,7 @@
     "node-mocks-http": "^1.10.1",
     "normalize-path": "^3.0.0",
     "portfinder": "^1.0.28",
-    "@modern-js/utils": "2.15.0"
+    "@modern-js/utils": "2.16.0"
   },
   "peerDependencies": {
     "react-router-dom": ">=5.1.2"
@@ -76,11 +80,11 @@
     "react": "^18",
     "react-router-dom": "^6.8.1",
     "typescript": "^4",
-    "@modern-js/app-tools": "2.15.0",
-    "@modern-js/prod-server": "2.15.0",
-    "@modern-js/types": "2.15.0",
-    "@scripts/build": "2.15.0",
-    "@scripts/jest-config": "2.15.0"
+    "@modern-js/app-tools": "2.16.0",
+    "@modern-js/prod-server": "2.16.0",
+    "@modern-js/types": "2.16.0",
+    "@scripts/build": "2.16.0",
+    "@scripts/jest-config": "2.16.0"
   },
   "sideEffects": false,
   "publishConfig": {