@modern-js/plugin-ssg 2.0.0-beta.3 → 2.0.0-beta.4

package/dist/js/modern/libs/util.js

@@ -1,86 +1,96 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-import path from 'path';
-import { ROUTE_SPEC_FILE, fs, isSingleEntry, SERVER_BUNDLE_DIRECTORY } from '@modern-js/utils';
-export function formatOutput(filename) {
+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 path from "path";
+import {
+  ROUTE_SPEC_FILE,
+  fs,
+  isSingleEntry,
+  SERVER_BUNDLE_DIRECTORY
+} from "@modern-js/utils";
+function formatOutput(filename) {
   const outputPath = path.extname(filename) ? filename : `${filename}/index.html`;
   return outputPath;
 }
-export function formatPath(str) {
+function formatPath(str) {
   let addr = str;
-  if (!addr || typeof addr !== 'string') {
+  if (!addr || typeof addr !== "string") {
     return addr;
   }
-  if (addr.startsWith('.')) {
+  if (addr.startsWith(".")) {
     addr = addr.slice(1);
   }
-  if (!addr.startsWith('/')) {
+  if (!addr.startsWith("/")) {
     addr = `/${addr}`;
   }
-  if (addr.endsWith('/') && addr !== '/') {
+  if (addr.endsWith("/") && addr !== "/") {
     addr = addr.slice(0, addr.length - 1);
   }
   return addr;
 }
-export function isDynamicUrl(url) {
-  return url.includes(':');
+function isDynamicUrl(url) {
+  return url.includes(":");
 }
-export function getUrlPrefix(route, baseUrl) {
-  let base = '';
+function getUrlPrefix(route, baseUrl) {
+  let base = "";
   if (Array.isArray(baseUrl)) {
-    const filters = baseUrl.filter(url => route.urlPath.includes(url));
+    const filters = baseUrl.filter((url) => route.urlPath.includes(url));
     if (filters.length > 1) {
       const matched = filters.sort((a, b) => a.length - b.length)[0];
-
-      // this should never happened
       if (!matched) {
-        throw new Error('');
+        throw new Error("");
       }
       base = matched;
     }
   } else {
     base = baseUrl;
   }
-  base = base === '/' ? '' : base;
-  const entryName = route.entryName === 'main' ? '' : route.entryName;
+  base = base === "/" ? "" : base;
+  const entryName = route.entryName === "main" ? "" : route.entryName;
   const prefix = `${base}/${entryName}`;
-  return prefix.endsWith('/') ? prefix.slice(0, -1) : prefix;
+  return prefix.endsWith("/") ? prefix.slice(0, -1) : prefix;
 }
-
-// if no output, return default path for aggred-route(relative),
-// or throw error for control-route
-export function getOutput(route, base, agreed) {
-  const {
-    output
-  } = route;
+function getOutput(route, base, agreed) {
+  const { output } = route;
   if (output) {
     return output;
   }
   if (agreed) {
-    const urlWithoutBase = route.urlPath.replace(base, '');
-    return urlWithoutBase.startsWith('/') ? urlWithoutBase.slice(1) : urlWithoutBase;
+    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}`
+  );
 }
-export const readJSONSpec = dir => {
+const readJSONSpec = (dir) => {
   const routeJSONPath = path.join(dir, ROUTE_SPEC_FILE);
   const routeJSON = require(routeJSONPath);
-  const {
-    routes
-  } = routeJSON;
+  const { routes } = routeJSON;
   return routes;
 };
-export const writeJSONSpec = (dir, routes) => {
+const writeJSONSpec = (dir, routes) => {
   const routeJSONPath = path.join(dir, ROUTE_SPEC_FILE);
-  fs.writeJSONSync(routeJSONPath, {
-    routes
-  }, {
-    spaces: 2
-  });
+  fs.writeJSONSync(routeJSONPath, { routes }, { spaces: 2 });
 };
-export const replaceWithAlias = (base, filePath, alias) => path.posix.join(alias, path.posix.relative(base, filePath));
-export const standardOptions = (ssgOptions, entrypoints, routes, server) => {
+const replaceWithAlias = (base, filePath, alias) => path.posix.join(alias, path.posix.relative(base, filePath));
+const standardOptions = (ssgOptions, entrypoints, routes, server) => {
   if (ssgOptions === false) {
     return false;
   }
@@ -89,33 +99,29 @@ export const standardOptions = (ssgOptions, entrypoints, routes, server) => {
       opt[entry.entryName] = ssgOptions;
       return opt;
     }, {});
-  } else if (typeof ssgOptions === 'object') {
+  } else if (typeof ssgOptions === "object") {
     const isSingle = isSingleEntry(entrypoints);
-    if (isSingle && typeof ssgOptions.main === 'undefined') {
-      return {
-        main: ssgOptions
-      };
+    if (isSingle && typeof ssgOptions.main === "undefined") {
+      return { main: ssgOptions };
     } else {
       return ssgOptions;
     }
-  } else if (typeof ssgOptions === 'function') {
+  } else if (typeof ssgOptions === "function") {
     const intermediateOptions = {};
     for (const entrypoint of entrypoints) {
-      const {
-        entryName
-      } = entrypoint;
-      // TODO: may be async function
-      if (Array.isArray(server === null || server === void 0 ? void 0 : server.baseUrl)) {
+      const { entryName } = entrypoint;
+      if (Array.isArray(server == null ? void 0 : server.baseUrl)) {
         for (const url of server.baseUrl) {
-          const matchUrl = entryName === 'main' ? url : `${url}/${entryName}`;
-          const route = routes.find(route => route.urlPath === matchUrl);
-          intermediateOptions[route === null || route === void 0 ? void 0 : route.urlPath] = ssgOptions(entryName, {
-            baseUrl: url
-          });
+          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 }
+          );
         }
       } else {
         intermediateOptions[entryName] = ssgOptions(entryName, {
-          baseUrl: server === null || server === void 0 ? void 0 : server.baseUrl
+          baseUrl: server == null ? void 0 : server.baseUrl
         });
       }
     }
@@ -123,29 +129,25 @@ export const standardOptions = (ssgOptions, entrypoints, routes, server) => {
   }
   return false;
 };
-export const openRouteSSR = (routes, entries = []) => routes.map(ssgRoute => _objectSpread(_objectSpread({}, ssgRoute), {}, {
+const openRouteSSR = (routes, entries = []) => routes.map((ssgRoute) => __spreadProps(__spreadValues({}, ssgRoute), {
   isSSR: entries.includes(ssgRoute.entryName),
   bundle: `${SERVER_BUNDLE_DIRECTORY}/${ssgRoute.entryName}.js`
 }));
-
-// TODO: 过滤带有 server loader 的路由
-export const flattenRoutes = routes => {
+const flattenRoutes = (routes) => {
   const parents = [];
   const newRoutes = [];
-  const traverseRoute = route => {
+  const traverseRoute = (route) => {
     const parent = parents[parents.length - 1];
-    let path = parent ? `${parent.path}/${route.path || ''}`.replace(/\/+/g, '/') : route.path || ''; // If the route is an index route, the route has no path property
-    path = path.replace(/\/$/, '');
-
-    // If the route path is / and is not the root route, it should not be used as an ssg route
-    if (route._component && (path !== '/' || path === '/' && !parent)) {
-      newRoutes.push(_objectSpread(_objectSpread({}, route), {}, {
-        path
+    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), {
+        path: path2
       }));
     }
     if (route.children) {
-      parents.push(_objectSpread(_objectSpread({}, route), {}, {
-        path
+      parents.push(__spreadProps(__spreadValues({}, route), {
+        path: path2
       }));
       route.children.forEach(traverseRoute);
       parents.pop();
@@ -153,4 +155,17 @@ export const flattenRoutes = routes => {
   };
   routes.forEach(traverseRoute);
   return newRoutes;
-};
+};
+export {
+  flattenRoutes,
+  formatOutput,
+  formatPath,
+  getOutput,
+  getUrlPrefix,
+  isDynamicUrl,
+  openRouteSSR,
+  readJSONSpec,
+  replaceWithAlias,
+  standardOptions,
+  writeJSONSpec
+};

package/dist/js/modern/server/consts.js

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

package/dist/js/modern/server/index.js

@@ -1,34 +1,34 @@
-import childProcess from 'child_process';
-import path from 'path';
-import { logger } from '@modern-js/utils';
+import childProcess from "child_process";
+import path from "path";
+import { logger } from "@modern-js/utils";
 import { openRouteSSR } from "../libs/util";
 import { CLOSE_SIGN } from "./consts";
-export const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirectory) => new Promise((resolve, reject) => {
-  // this side of the shallow copy of a route for subsequent render processing, to prevent the modification of the current field
-  // manually enable the server-side rendering configuration for all routes that require SSG
-  const entries = ssgRoutes.map(route => route.entryName);
+const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirectory) => new Promise((resolve, reject) => {
+  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'), {
+  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
-  }));
+  cp.send(
+    JSON.stringify({
+      options,
+      renderRoutes: ssgRoutes,
+      routes: total,
+      appDirectory,
+      plugins
+    })
+  );
   const htmlChunks = [];
   const htmlAry = [];
-  cp.on('message', chunk => {
+  cp.on("message", (chunk) => {
     if (chunk !== null) {
       htmlChunks.push(chunk);
     } else {
-      const html = htmlChunks.join('');
+      const html = htmlChunks.join("");
       htmlAry.push(html);
       htmlChunks.length = 0;
     }
@@ -37,24 +37,27 @@ export const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, app
       resolve(htmlAry);
     }
   });
-  cp.stderr.on('data', chunk => {
+  cp.stderr.on("data", (chunk) => {
     const str = chunk.toString();
-    if (str.includes('Error')) {
+    if (str.includes("Error")) {
       logger.error(str);
-      reject(new Error('ssg render failed'));
-      cp.kill('SIGKILL');
+      reject(new Error("ssg render failed"));
+      cp.kill("SIGKILL");
     } else {
-      logger.info(str.replace(/[^\S\n]+/g, ' '));
+      logger.info(str.replace(/[^\S\n]+/g, " "));
     }
   });
-  cp.stdout.on('data', chunk => {
+  cp.stdout.on("data", (chunk) => {
     const str = chunk.toString();
-    if (str.includes('Error')) {
+    if (str.includes("Error")) {
       logger.error(str);
-      reject(new Error('ssg render failed'));
-      cp.kill('SIGKILL');
+      reject(new Error("ssg render failed"));
+      cp.kill("SIGKILL");
     } else {
-      logger.info(str.replace(/[^\S\n]+/g, ' '));
+      logger.info(str.replace(/[^\S\n]+/g, " "));
     }
   });
-});
+});
+export {
+  createServer
+};

package/dist/js/modern/server/prerender.js

@@ -1,36 +1,53 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-import EventEmitter from 'events';
-import { Readable } from 'stream';
-import httpMocks from 'node-mocks-http';
-export const compile = requestHandler => (options, extend = {}) => new Promise((resolve, reject) => {
-  const req = httpMocks.createRequest(_objectSpread(_objectSpread({}, options), {}, {
+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 EventEmitter from "events";
+import { Readable } from "stream";
+import httpMocks from "node-mocks-http";
+const compile = (requestHandler) => (options, extend = {}) => new Promise((resolve, reject) => {
+  const req = httpMocks.createRequest(__spreadProps(__spreadValues({}, 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) {
-      if (typeof prop === 'symbol' && !obj[prop]) {
+      if (typeof prop === "symbol" && !obj[prop]) {
         return null;
       }
       return obj[prop];
     }
   });
-  res.on('finish', () => {
+  res.on("finish", () => {
     if (res.statusCode !== 200) {
       reject(new Error(res.statusMessage));
     } else {
       resolve(res._getData());
     }
   });
-  res.on('error', e => reject(e));
+  res.on("error", (e) => reject(e));
   try {
     requestHandler(req, proxyRes);
   } catch (e) {
     reject(e);
   }
-});
+});
+export {
+  compile
+};

package/dist/js/modern/server/process.js

@@ -1,63 +1,84 @@
-import server from '@modern-js/prod-server';
-import portfinder from 'portfinder';
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+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 server from "@modern-js/prod-server";
+import portfinder from "portfinder";
 import { makeRender } from "../libs/make";
 import { compile as createRender } from "./prerender";
 import { CLOSE_SIGN } from "./consts";
-process.on('message', async chunk => {
-  if (chunk === CLOSE_SIGN) {
-    // eslint-disable-next-line no-process-exit
-    process.exit();
-  }
-  const context = JSON.parse(chunk);
-  const {
-    routes,
-    renderRoutes,
-    options,
-    appDirectory,
-    plugins
-  } = context;
-  let modernServer = null;
-  try {
-    const {
-      server: serverOptions
-    } = options;
-
-    // start server in default port
-    const defaultPort = Number(process.env.PORT) || serverOptions.port;
-    portfinder.basePort = defaultPort;
-    const port = await portfinder.getPortPromise();
-    modernServer = await server({
-      pwd: appDirectory,
-      config: options,
-      routes,
-      staticGenerate: true,
-      internalPlugins: plugins
-    });
-
-    // listen just for bff request in ssr page
-    modernServer.listen(port, async err => {
-      if (err) {
-        throw err;
+var require_process = __commonJS({
+  "src/server/process.ts"(exports) {
+    process.on("message", (chunk) => __async(exports, null, function* () {
+      if (chunk === CLOSE_SIGN) {
+        process.exit();
       }
-      if (!modernServer) {
-        return;
+      const context = JSON.parse(chunk);
+      const {
+        routes,
+        renderRoutes,
+        options,
+        appDirectory,
+        plugins
+      } = context;
+      let modernServer = null;
+      try {
+        const { server: serverOptions } = options;
+        const defaultPort = Number(process.env.PORT) || serverOptions.port;
+        portfinder.basePort = defaultPort;
+        const port = yield portfinder.getPortPromise();
+        modernServer = yield server({
+          pwd: appDirectory,
+          config: options,
+          routes,
+          staticGenerate: true,
+          internalPlugins: plugins
+        });
+        modernServer.listen(port, (err) => __async(exports, null, function* () {
+          if (err) {
+            throw err;
+          }
+          if (!modernServer) {
+            return;
+          }
+          const render = createRender(modernServer.getRequestHandler());
+          const renderPromiseAry = makeRender(
+            renderRoutes,
+            render,
+            port
+          );
+          const htmlAry = yield Promise.all(renderPromiseAry);
+          htmlAry.forEach((html) => {
+            process.send(html);
+            process.send(null);
+          });
+          modernServer.close();
+        }));
+      } catch (e) {
+        modernServer == null ? void 0 : modernServer.close();
+        throw e;
       }
-
-      // get server handler, render to ssr
-      const render = createRender(modernServer.getRequestHandler());
-      const renderPromiseAry = makeRender(renderRoutes, render, port);
-
-      // eslint-disable-next-line promise/no-promise-in-callback
-      const htmlAry = await Promise.all(renderPromiseAry);
-      htmlAry.forEach(html => {
-        process.send(html);
-        process.send(null);
-      });
-      modernServer.close();
-    });
-  } catch (e) {
-    var _modernServer;
-    (_modernServer = modernServer) === null || _modernServer === void 0 ? void 0 : _modernServer.close();
-    throw e;
+    }));
   }
-});
+});
+export default require_process();

package/dist/js/modern/types.js

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