@modern-js/plugin-ssg 2.0.0-beta.0 → 2.0.0-beta.1

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @modern-js/plugin-ssg
 
+## 2.0.0-beta.1
+
+### Major Changes
+
+- dda38c9: chore: v2
+
+### Patch Changes
+
+- cc971eabfc: refactor: move server plugin load logic in `@modern-js/core`
+  refactor：移除在 `@modern-js/core` 中的 server 插件加载逻辑
+- 8b8e1bb571: feat: support nested routes
+  feat: 支持嵌套路由
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712d]
+  - @modern-js/utils@2.0.0-beta.1
+
 ## 2.0.0-beta.0
 
 ### Major Changes

package/dist/js/modern/index.js

@@ -1,9 +1,6 @@
 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 { logger, PLUGIN_SCHEMAS } from '@modern-js/utils';
 import { generatePath } from 'react-router-dom';
@@ -21,7 +18,6 @@ export default (() => ({
       validateSchema() {
         return PLUGIN_SCHEMAS['@modern-js/plugin-ssg'];
       },
-
       modifyFileSystemRoutes({
         entrypoint,
         routes
@@ -36,7 +32,6 @@ export default (() => ({
           routes
         };
       },
-
       async afterBuild() {
         const resolvedConfig = api.useResolvedConfigContext();
         const appContext = api.useAppContext();
@@ -52,30 +47,28 @@ export default (() => ({
           ssg,
           path: outputPath
         } = output;
-        const ssgOptions = Array.isArray(ssg) ? ssg.pop() : ssg; // no ssg configuration, skip ssg render.
-
+        const ssgOptions = Array.isArray(ssg) ? ssg.pop() : ssg;
+        // no ssg configuration, skip ssg render.
         if (!ssgOptions) {
           return;
         }
-
         const buildDir = path.join(appDirectory, outputPath);
-        const routes = readJSONSpec(buildDir); // filter all routes not web
+        const routes = readJSONSpec(buildDir);
 
+        // filter all routes not web
         const pageRoutes = routes.filter(route => !route.isApi);
-        const apiRoutes = routes.filter(route => route.isApi); // if no web page route, skip ssg render
+        const apiRoutes = routes.filter(route => route.isApi);
 
+        // if no web page route, skip ssg render
         if (pageRoutes.length === 0) {
           return;
         }
-
         const intermediateOptions = standardOptions(ssgOptions, entrypoints, pageRoutes, server);
-
         if (!intermediateOptions) {
           return;
         }
-
-        const ssgRoutes = []; // each route will try to match the configuration
-
+        const ssgRoutes = [];
+        // each route will try to match the configuration
         pageRoutes.forEach(pageRoute => {
           const {
             entryName,
@@ -83,14 +76,13 @@ export default (() => ({
           } = pageRoute;
           const agreedRoutes = agreedRouteMap[entryName];
           let entryOptions = intermediateOptions[entryName] || intermediateOptions[pageRoute.urlPath];
-
           if (!agreedRoutes) {
             // default behavior for non-agreed route
             if (!entryOptions) {
               return;
-            } // only add entry route if entryOptions is true
-
+            }
 
+            // only add entry route if entryOptions is true
             if (entryOptions === true) {
               ssgRoutes.push(_objectSpread(_objectSpread({}, pageRoute), {}, {
                 output: entryPath
@@ -112,7 +104,6 @@ export default (() => ({
             if (!entryOptions) {
               return;
             }
-
             if (entryOptions === true) {
               entryOptions = {
                 preventDefault: [],
@@ -120,13 +111,12 @@ export default (() => ({
                 headers: {}
               };
             }
-
             const {
               preventDefault = [],
               routes: userRoutes = [],
               headers
-            } = entryOptions; // if the user sets the routes, then only add them
-
+            } = entryOptions;
+            // if the user sets the routes, then only add them
             if (userRoutes.length > 0) {
               userRoutes.forEach(route => {
                 if (typeof route === 'string') {
@@ -151,36 +141,34 @@ export default (() => ({
             }
           }
         });
-
         if (ssgRoutes.length === 0) {
           return;
-        } // currently SSG and SSR cannot be turned on at the same time、same route
-
+        }
 
+        // currently SSG and SSR cannot be turned on at the same time、same route
         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} `);
             }
-
             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); // write to dist file
+        const htmlAry = await createServer(api, ssgRoutes, pageRoutes, apiRoutes, resolvedConfig, appDirectory);
 
-        writeHtmlFile(htmlAry, ssgRoutes, buildDir); // format route info, side effect
+        // write to dist file
+        writeHtmlFile(htmlAry, ssgRoutes, buildDir);
 
-        replaceRoute(ssgRoutes, pageRoutes); // write routes to spec file
+        // format route info, side effect
+        replaceRoute(ssgRoutes, pageRoutes);
 
+        // write routes to spec file
         writeJSONSpec(buildDir, pageRoutes.concat(apiRoutes));
         logger.info('ssg Compiled successfully');
       }
-
     };
   }
 }));

package/dist/js/modern/libs/make.js

@@ -1,9 +1,6 @@
 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 normalize from 'normalize-path';
 export function makeRender(ssgRoutes, render, port) {
@@ -20,7 +17,6 @@ export function makeRoute(baseRoute, route, headers = {}) {
     urlPath,
     entryPath
   } = baseRoute;
-
   if (typeof route === 'string') {
     return _objectSpread(_objectSpread({}, baseRoute), {}, {
       urlPath: normalize(`${urlPath}${route}`) || '/',

package/dist/js/modern/libs/output.js

@@ -4,11 +4,9 @@ export function writeHtmlFile(htmlAry, ssgRoutes, baseDir) {
   htmlAry.forEach((html, index) => {
     const ssgRoute = ssgRoutes[index];
     const filepath = path.join(baseDir, ssgRoute.output);
-
     if (!fs.existsSync(path.dirname(filepath))) {
       fs.ensureDirSync(path.dirname(filepath));
     }
-
     fs.writeFileSync(filepath, html);
   });
 }

package/dist/js/modern/libs/replace.js

@@ -1,25 +1,17 @@
 const _excluded = ["output", "headers"];
-
 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; }
-
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 import normalize from 'normalize-path';
 export function exist(route, pageRoutes) {
   return pageRoutes.slice().findIndex(pageRoute => {
     const urlEqual = normalize(pageRoute.urlPath) === normalize(route.urlPath);
     const entryEqual = pageRoute.entryName === route.entryName;
-
     if (urlEqual && entryEqual) {
       return true;
     }
-
     return false;
   });
 }
@@ -27,20 +19,19 @@ export function replaceRoute(ssgRoutes, pageRoutes) {
   // remove redundant fields and replace rendered entryPath
   const cleanSsgRoutes = ssgRoutes.map(ssgRoute => {
     const {
-      output,
-      headers
-    } = ssgRoute,
-          cleanSsgRoute = _objectWithoutProperties(ssgRoute, _excluded);
-
+        output,
+        headers
+      } = ssgRoute,
+      cleanSsgRoute = _objectWithoutProperties(ssgRoute, _excluded);
     return Object.assign(cleanSsgRoute, output ? {
       entryPath: output
     } : {});
-  }); // all routes that need to be added and replaced
+  });
 
+  // all routes that need to be added and replaced
   const freshRoutes = [];
   cleanSsgRoutes.forEach(ssgRoute => {
     const index = exist(ssgRoute, pageRoutes);
-
     if (index < 0) {
       // new route
       freshRoutes.push(_objectSpread({}, ssgRoute));

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

@@ -1,9 +1,6 @@
 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) {
@@ -12,23 +9,18 @@ export function formatOutput(filename) {
 }
 export function formatPath(str) {
   let addr = str;
-
   if (!addr || typeof addr !== 'string') {
     return addr;
   }
-
   if (addr.startsWith('.')) {
     addr = addr.slice(1);
   }
-
   if (!addr.startsWith('/')) {
     addr = `/${addr}`;
   }
-
   if (addr.endsWith('/') && addr !== '/') {
     addr = addr.slice(0, addr.length - 1);
   }
-
   return addr;
 }
 export function isDynamicUrl(url) {
@@ -36,51 +28,44 @@ export function isDynamicUrl(url) {
 }
 export function getUrlPrefix(route, baseUrl) {
   let base = '';
-
   if (Array.isArray(baseUrl)) {
     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
+      const matched = filters.sort((a, b) => a.length - b.length)[0];
 
+      // this should never happened
       if (!matched) {
         throw new Error('');
       }
-
       base = matched;
     }
   } else {
     base = baseUrl;
   }
-
   base = base === '/' ? '' : base;
   const entryName = route.entryName === 'main' ? '' : route.entryName;
   const prefix = `${base}/${entryName}`;
   return prefix.endsWith('/') ? prefix.slice(0, -1) : prefix;
-} // if no output, return default path for aggred-route(relative),
-// or throw error for control-route
+}
 
+// 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;
-
   if (output) {
     return output;
   }
-
   if (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}`);
 }
 export const readJSONSpec = dir => {
   const routeJSONPath = path.join(dir, ROUTE_SPEC_FILE);
-
   const routeJSON = require(routeJSONPath);
-
   const {
     routes
   } = routeJSON;
@@ -99,7 +84,6 @@ export const standardOptions = (ssgOptions, entrypoints, routes, server) => {
   if (ssgOptions === false) {
     return false;
   }
-
   if (ssgOptions === true) {
     return entrypoints.reduce((opt, entry) => {
       opt[entry.entryName] = ssgOptions;
@@ -107,7 +91,6 @@ export const standardOptions = (ssgOptions, entrypoints, routes, server) => {
     }, {});
   } else if (typeof ssgOptions === 'object') {
     const isSingle = isSingleEntry(entrypoints);
-
     if (isSingle && typeof ssgOptions.main === 'undefined') {
       return {
         main: ssgOptions
@@ -117,12 +100,11 @@ export const standardOptions = (ssgOptions, entrypoints, routes, server) => {
     }
   } else if (typeof ssgOptions === 'function') {
     const intermediateOptions = {};
-
     for (const entrypoint of entrypoints) {
       const {
         entryName
-      } = entrypoint; // TODO: may be async function
-
+      } = entrypoint;
+      // TODO: may be async function
       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}`;
@@ -137,33 +119,30 @@ export const standardOptions = (ssgOptions, entrypoints, routes, server) => {
         });
       }
     }
-
     return intermediateOptions;
   }
-
   return false;
 };
 export const openRouteSSR = (routes, entries = []) => routes.map(ssgRoute => _objectSpread(_objectSpread({}, ssgRoute), {}, {
   isSSR: entries.includes(ssgRoute.entryName),
   bundle: `${SERVER_BUNDLE_DIRECTORY}/${ssgRoute.entryName}.js`
-})); // TODO: 过滤带有 server loader 的路由
+}));
 
+// TODO: 过滤带有 server loader 的路由
 export const flattenRoutes = routes => {
   const parents = [];
   const newRoutes = [];
-
   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(/\/$/, '');
 
-    path = path.replace(/\/$/, ''); // If the route path is / and is not the root route, it should not be used as an ssg route
-
+    // 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
       }));
     }
-
     if (route.children) {
       parents.push(_objectSpread(_objectSpread({}, route), {}, {
         path
@@ -172,7 +151,6 @@ export const flattenRoutes = routes => {
       parents.pop();
     }
   };
-
   routes.forEach(traverseRoute);
   return newRoutes;
 };

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

@@ -32,7 +32,6 @@ export const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, app
       htmlAry.push(html);
       htmlChunks.length = 0;
     }
-
     if (htmlAry.length === ssgRoutes.length) {
       cp.send(CLOSE_SIGN);
       resolve(htmlAry);
@@ -40,7 +39,6 @@ export const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, app
   });
   cp.stderr.on('data', chunk => {
     const str = chunk.toString();
-
     if (str.includes('Error')) {
       logger.error(str);
       reject(new Error('ssg render failed'));
@@ -51,7 +49,6 @@ export const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, app
   });
   cp.stdout.on('data', chunk => {
     const str = chunk.toString();
-
     if (str.includes('Error')) {
       logger.error(str);
       reject(new Error('ssg render failed'));

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

@@ -1,9 +1,6 @@
 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';
@@ -20,10 +17,8 @@ export const compile = requestHandler => (options, extend = {}) => new Promise((
       if (typeof prop === 'symbol' && !obj[prop]) {
         return null;
       }
-
       return obj[prop];
     }
-
   });
   res.on('finish', () => {
     if (res.statusCode !== 200) {
@@ -33,7 +28,6 @@ export const compile = requestHandler => (options, extend = {}) => new Promise((
     }
   });
   res.on('error', e => reject(e));
-
   try {
     requestHandler(req, proxyRes);
   } catch (e) {

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

@@ -8,7 +8,6 @@ process.on('message', async chunk => {
     // eslint-disable-next-line no-process-exit
     process.exit();
   }
-
   const context = JSON.parse(chunk);
   const {
     routes,
@@ -18,12 +17,12 @@ process.on('message', async chunk => {
     plugins
   } = context;
   let modernServer = null;
-
   try {
     const {
       server: serverOptions
-    } = options; // start server in default port
+    } = options;
 
+    // start server in default port
     const defaultPort = Number(process.env.PORT) || serverOptions.port;
     portfinder.basePort = defaultPort;
     const port = await portfinder.getPortPromise();
@@ -33,21 +32,22 @@ process.on('message', async chunk => {
       routes,
       staticGenerate: true,
       internalPlugins: plugins
-    }); // listen just for bff request in ssr page
+    });
 
+    // listen just for bff request in ssr page
     modernServer.listen(port, async err => {
       if (err) {
         throw err;
       }
-
       if (!modernServer) {
         return;
-      } // get server handler, render to ssr
-
+      }
 
+      // 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 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);
@@ -57,7 +57,6 @@ process.on('message', async chunk => {
     });
   } catch (e) {
     var _modernServer;
-
     (_modernServer = modernServer) === null || _modernServer === void 0 ? void 0 : _modernServer.close();
     throw e;
   }

package/dist/js/node/index.js

@@ -4,31 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 var _reactRouterDom = require("react-router-dom");
-
 var _util = require("./libs/util");
-
 var _server = require("./server");
-
 var _output = require("./libs/output");
-
 var _replace = require("./libs/replace");
-
 var _make = require("./libs/make");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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; }
-
 var _default = () => ({
   name: '@modern-js/plugin-ssg',
   pre: ['@modern-js/plugin-server', '@modern-js/plugin-bff'],
@@ -38,7 +25,6 @@ var _default = () => ({
       validateSchema() {
         return _utils.PLUGIN_SCHEMAS['@modern-js/plugin-ssg'];
       },
-
       modifyFileSystemRoutes({
         entrypoint,
         routes
@@ -53,7 +39,6 @@ var _default = () => ({
           routes
         };
       },
-
       async afterBuild() {
         const resolvedConfig = api.useResolvedConfigContext();
         const appContext = api.useAppContext();
@@ -69,31 +54,28 @@ var _default = () => ({
           ssg,
           path: outputPath
         } = output;
-        const ssgOptions = Array.isArray(ssg) ? ssg.pop() : ssg; // no ssg configuration, skip ssg render.
-
+        const ssgOptions = Array.isArray(ssg) ? ssg.pop() : ssg;
+        // no ssg configuration, skip ssg render.
         if (!ssgOptions) {
           return;
         }
-
         const buildDir = _path.default.join(appDirectory, outputPath);
+        const routes = (0, _util.readJSONSpec)(buildDir);
 
-        const routes = (0, _util.readJSONSpec)(buildDir); // filter all routes not web
-
+        // filter all routes not web
         const pageRoutes = routes.filter(route => !route.isApi);
-        const apiRoutes = routes.filter(route => route.isApi); // if no web page route, skip ssg render
+        const apiRoutes = routes.filter(route => route.isApi);
 
+        // if no web page route, skip ssg render
         if (pageRoutes.length === 0) {
           return;
         }
-
         const intermediateOptions = (0, _util.standardOptions)(ssgOptions, entrypoints, pageRoutes, server);
-
         if (!intermediateOptions) {
           return;
         }
-
-        const ssgRoutes = []; // each route will try to match the configuration
-
+        const ssgRoutes = [];
+        // each route will try to match the configuration
         pageRoutes.forEach(pageRoute => {
           const {
             entryName,
@@ -101,14 +83,13 @@ var _default = () => ({
           } = pageRoute;
           const agreedRoutes = agreedRouteMap[entryName];
           let entryOptions = intermediateOptions[entryName] || intermediateOptions[pageRoute.urlPath];
-
           if (!agreedRoutes) {
             // default behavior for non-agreed route
             if (!entryOptions) {
               return;
-            } // only add entry route if entryOptions is true
-
+            }
 
+            // only add entry route if entryOptions is true
             if (entryOptions === true) {
               ssgRoutes.push(_objectSpread(_objectSpread({}, pageRoute), {}, {
                 output: entryPath
@@ -130,7 +111,6 @@ var _default = () => ({
             if (!entryOptions) {
               return;
             }
-
             if (entryOptions === true) {
               entryOptions = {
                 preventDefault: [],
@@ -138,13 +118,12 @@ var _default = () => ({
                 headers: {}
               };
             }
-
             const {
               preventDefault = [],
               routes: userRoutes = [],
               headers
-            } = entryOptions; // if the user sets the routes, then only add them
-
+            } = entryOptions;
+            // if the user sets the routes, then only add them
             if (userRoutes.length > 0) {
               userRoutes.forEach(route => {
                 if (typeof route === 'string') {
@@ -169,39 +148,35 @@ var _default = () => ({
             }
           }
         });
-
         if (ssgRoutes.length === 0) {
           return;
-        } // currently SSG and SSR cannot be turned on at the same time、same route
-
+        }
 
+        // currently SSG and SSR cannot be turned on at the same time、same route
         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} `);
             }
-
             _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, _util.formatOutput)(ssgRoute.output);
         });
-        const htmlAry = await (0, _server.createServer)(api, ssgRoutes, pageRoutes, apiRoutes, resolvedConfig, appDirectory); // write to dist file
+        const htmlAry = await (0, _server.createServer)(api, ssgRoutes, pageRoutes, apiRoutes, resolvedConfig, appDirectory);
 
-        (0, _output.writeHtmlFile)(htmlAry, ssgRoutes, buildDir); // format route info, side effect
+        // write to dist file
+        (0, _output.writeHtmlFile)(htmlAry, ssgRoutes, buildDir);
 
-        (0, _replace.replaceRoute)(ssgRoutes, pageRoutes); // write routes to spec file
+        // format route info, side effect
+        (0, _replace.replaceRoute)(ssgRoutes, pageRoutes);
 
+        // write routes to spec file
         (0, _util.writeJSONSpec)(buildDir, pageRoutes.concat(apiRoutes));
-
         _utils.logger.info('ssg Compiled successfully');
       }
-
     };
   }
 });
-
 exports.default = _default;

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

@@ -5,19 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.makeRender = makeRender;
 exports.makeRoute = makeRoute;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _normalizePath = _interopRequireDefault(require("normalize-path"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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; }
-
 function makeRender(ssgRoutes, render, port) {
   return ssgRoutes.map(ssgRoute => render({
     url: ssgRoute.urlPath,
@@ -27,13 +20,11 @@ function makeRender(ssgRoutes, render, port) {
     connection: {}
   }));
 }
-
 function makeRoute(baseRoute, route, headers = {}) {
   const {
     urlPath,
     entryPath
   } = baseRoute;
-
   if (typeof route === 'string') {
     return _objectSpread(_objectSpread({}, baseRoute), {}, {
       urlPath: (0, _normalizePath.default)(`${urlPath}${route}`) || '/',

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

@@ -4,23 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.writeHtmlFile = writeHtmlFile;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function writeHtmlFile(htmlAry, ssgRoutes, baseDir) {
   htmlAry.forEach((html, index) => {
     const ssgRoute = ssgRoutes[index];
-
     const filepath = _path.default.join(baseDir, ssgRoute.output);
-
     if (!_utils.fs.existsSync(_path.default.dirname(filepath))) {
       _utils.fs.ensureDirSync(_path.default.dirname(filepath));
     }
-
     _utils.fs.writeFileSync(filepath, html);
   });
 }

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

@@ -5,54 +5,41 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.exist = exist;
 exports.replaceRoute = replaceRoute;
-
 var _normalizePath = _interopRequireDefault(require("normalize-path"));
-
 const _excluded = ["output", "headers"];
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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; }
-
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 function exist(route, pageRoutes) {
   return pageRoutes.slice().findIndex(pageRoute => {
     const urlEqual = (0, _normalizePath.default)(pageRoute.urlPath) === (0, _normalizePath.default)(route.urlPath);
     const entryEqual = pageRoute.entryName === route.entryName;
-
     if (urlEqual && entryEqual) {
       return true;
     }
-
     return false;
   });
 }
-
 function replaceRoute(ssgRoutes, pageRoutes) {
   // remove redundant fields and replace rendered entryPath
   const cleanSsgRoutes = ssgRoutes.map(ssgRoute => {
     const {
-      output,
-      headers
-    } = ssgRoute,
-          cleanSsgRoute = _objectWithoutProperties(ssgRoute, _excluded);
-
+        output,
+        headers
+      } = ssgRoute,
+      cleanSsgRoute = _objectWithoutProperties(ssgRoute, _excluded);
     return Object.assign(cleanSsgRoute, output ? {
       entryPath: output
     } : {});
-  }); // all routes that need to be added and replaced
+  });
 
+  // all routes that need to be added and replaced
   const freshRoutes = [];
   cleanSsgRoutes.forEach(ssgRoute => {
     const index = exist(ssgRoute, pageRoutes);
-
     if (index < 0) {
       // new route
       freshRoutes.push(_objectSpread({}, ssgRoute));

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

@@ -10,128 +10,96 @@ exports.getOutput = getOutput;
 exports.getUrlPrefix = getUrlPrefix;
 exports.isDynamicUrl = isDynamicUrl;
 exports.writeJSONSpec = exports.standardOptions = exports.replaceWithAlias = exports.readJSONSpec = exports.openRouteSSR = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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; }
-
 function formatOutput(filename) {
   const outputPath = _path.default.extname(filename) ? filename : `${filename}/index.html`;
   return outputPath;
 }
-
 function formatPath(str) {
   let addr = str;
-
   if (!addr || typeof addr !== 'string') {
     return addr;
   }
-
   if (addr.startsWith('.')) {
     addr = addr.slice(1);
   }
-
   if (!addr.startsWith('/')) {
     addr = `/${addr}`;
   }
-
   if (addr.endsWith('/') && addr !== '/') {
     addr = addr.slice(0, addr.length - 1);
   }
-
   return addr;
 }
-
 function isDynamicUrl(url) {
   return url.includes(':');
 }
-
 function getUrlPrefix(route, baseUrl) {
   let base = '';
-
   if (Array.isArray(baseUrl)) {
     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
+      const matched = filters.sort((a, b) => a.length - b.length)[0];
 
+      // this should never happened
       if (!matched) {
         throw new Error('');
       }
-
       base = matched;
     }
   } else {
     base = baseUrl;
   }
-
   base = base === '/' ? '' : base;
   const entryName = route.entryName === 'main' ? '' : route.entryName;
   const prefix = `${base}/${entryName}`;
   return prefix.endsWith('/') ? prefix.slice(0, -1) : prefix;
-} // if no output, return default path for aggred-route(relative),
-// or throw error for control-route
-
+}
 
+// if no output, return default path for aggred-route(relative),
+// or throw error for control-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;
   }
-
   throw new Error(`routing must provide output when calling createPage(), check ${route.urlPath}`);
 }
-
 const readJSONSpec = dir => {
   const routeJSONPath = _path.default.join(dir, _utils.ROUTE_SPEC_FILE);
-
   const routeJSON = require(routeJSONPath);
-
   const {
     routes
   } = routeJSON;
   return routes;
 };
-
 exports.readJSONSpec = readJSONSpec;
-
 const writeJSONSpec = (dir, routes) => {
   const routeJSONPath = _path.default.join(dir, _utils.ROUTE_SPEC_FILE);
-
   _utils.fs.writeJSONSync(routeJSONPath, {
     routes
   }, {
     spaces: 2
   });
 };
-
 exports.writeJSONSpec = writeJSONSpec;
-
 const replaceWithAlias = (base, filePath, alias) => _path.default.posix.join(alias, _path.default.posix.relative(base, filePath));
-
 exports.replaceWithAlias = replaceWithAlias;
-
 const standardOptions = (ssgOptions, entrypoints, routes, server) => {
   if (ssgOptions === false) {
     return false;
   }
-
   if (ssgOptions === true) {
     return entrypoints.reduce((opt, entry) => {
       opt[entry.entryName] = ssgOptions;
@@ -139,7 +107,6 @@ const standardOptions = (ssgOptions, entrypoints, routes, server) => {
     }, {});
   } else if (typeof ssgOptions === 'object') {
     const isSingle = (0, _utils.isSingleEntry)(entrypoints);
-
     if (isSingle && typeof ssgOptions.main === 'undefined') {
       return {
         main: ssgOptions
@@ -149,12 +116,11 @@ const standardOptions = (ssgOptions, entrypoints, routes, server) => {
     }
   } else if (typeof ssgOptions === 'function') {
     const intermediateOptions = {};
-
     for (const entrypoint of entrypoints) {
       const {
         entryName
-      } = entrypoint; // TODO: may be async function
-
+      } = entrypoint;
+      // TODO: may be async function
       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}`;
@@ -169,39 +135,32 @@ const standardOptions = (ssgOptions, entrypoints, routes, server) => {
         });
       }
     }
-
     return intermediateOptions;
   }
-
   return false;
 };
-
 exports.standardOptions = standardOptions;
-
 const openRouteSSR = (routes, entries = []) => routes.map(ssgRoute => _objectSpread(_objectSpread({}, ssgRoute), {}, {
   isSSR: entries.includes(ssgRoute.entryName),
   bundle: `${_utils.SERVER_BUNDLE_DIRECTORY}/${ssgRoute.entryName}.js`
-})); // TODO: 过滤带有 server loader 的路由
-
+}));
 
+// TODO: 过滤带有 server loader 的路由
 exports.openRouteSSR = openRouteSSR;
-
 const flattenRoutes = routes => {
   const parents = [];
   const newRoutes = [];
-
   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(/\/$/, '');
 
-    path = path.replace(/\/$/, ''); // If the route path is / and is not the root route, it should not be used as an ssg route
-
+    // 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
       }));
     }
-
     if (route.children) {
       parents.push(_objectSpread(_objectSpread({}, route), {}, {
         path
@@ -210,9 +169,7 @@ const flattenRoutes = routes => {
       parents.pop();
     }
   };
-
   routes.forEach(traverseRoute);
   return newRoutes;
 };
-
 exports.flattenRoutes = flattenRoutes;

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

@@ -4,31 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createServer = void 0;
-
 var _child_process = _interopRequireDefault(require("child_process"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 var _util = require("../libs/util");
-
 var _consts = require("./consts");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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 backup = (0, _util.openRouteSSR)(pageRoutes, entries);
   const total = backup.concat(apiRoutes);
-
   const cp = _child_process.default.fork(_path.default.join(__dirname, 'process'), {
     cwd: appDirectory,
     silent: true
   });
-
   const appContext = api.useAppContext();
   const plugins = appContext.serverInternalPlugins;
   cp.send(JSON.stringify({
@@ -48,7 +39,6 @@ const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirecto
       htmlAry.push(html);
       htmlChunks.length = 0;
     }
-
     if (htmlAry.length === ssgRoutes.length) {
       cp.send(_consts.CLOSE_SIGN);
       resolve(htmlAry);
@@ -56,10 +46,8 @@ const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirecto
   });
   cp.stderr.on('data', chunk => {
     const str = chunk.toString();
-
     if (str.includes('Error')) {
       _utils.logger.error(str);
-
       reject(new Error('ssg render failed'));
       cp.kill('SIGKILL');
     } else {
@@ -68,10 +56,8 @@ const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirecto
   });
   cp.stdout.on('data', chunk => {
     const str = chunk.toString();
-
     if (str.includes('Error')) {
       _utils.logger.error(str);
-
       reject(new Error('ssg render failed'));
       cp.kill('SIGKILL');
     } else {
@@ -79,5 +65,4 @@ const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirecto
     }
   });
 });
-
 exports.createServer = createServer;

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

@@ -4,40 +4,28 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.compile = void 0;
-
 var _events = _interopRequireDefault(require("events"));
-
 var _stream = require("stream");
-
 var _nodeMocksHttp = _interopRequireDefault(require("node-mocks-http"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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; }
-
 const compile = requestHandler => (options, extend = {}) => new Promise((resolve, reject) => {
   const req = _nodeMocksHttp.default.createRequest(_objectSpread(_objectSpread({}, options), {}, {
     eventEmitter: _stream.Readable
   }));
-
   const res = _nodeMocksHttp.default.createResponse({
     eventEmitter: _events.default
   });
-
   Object.assign(req, extend);
   const proxyRes = new Proxy(res, {
     get(obj, prop) {
       if (typeof prop === 'symbol' && !obj[prop]) {
         return null;
       }
-
       return obj[prop];
     }
-
   });
   res.on('finish', () => {
     if (res.statusCode !== 200) {
@@ -47,12 +35,10 @@ const compile = requestHandler => (options, extend = {}) => new Promise((resolve
     }
   });
   res.on('error', e => reject(e));
-
   try {
     requestHandler(req, proxyRes);
   } catch (e) {
     reject(e);
   }
 });
-
 exports.compile = compile;

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

@@ -1,23 +1,16 @@
 "use strict";
 
 var _prodServer = _interopRequireDefault(require("@modern-js/prod-server"));
-
 var _portfinder = _interopRequireDefault(require("portfinder"));
-
 var _make = require("../libs/make");
-
 var _prerender = require("./prerender");
-
 var _consts = require("./consts");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 process.on('message', async chunk => {
   if (chunk === _consts.CLOSE_SIGN) {
     // eslint-disable-next-line no-process-exit
     process.exit();
   }
-
   const context = JSON.parse(chunk);
   const {
     routes,
@@ -27,12 +20,12 @@ process.on('message', async chunk => {
     plugins
   } = context;
   let modernServer = null;
-
   try {
     const {
       server: serverOptions
-    } = options; // start server in default port
+    } = options;
 
+    // start server in default port
     const defaultPort = Number(process.env.PORT) || serverOptions.port;
     _portfinder.default.basePort = defaultPort;
     const port = await _portfinder.default.getPortPromise();
@@ -42,21 +35,22 @@ process.on('message', async chunk => {
       routes,
       staticGenerate: true,
       internalPlugins: plugins
-    }); // listen just for bff request in ssr page
+    });
 
+    // listen just for bff request in ssr page
     modernServer.listen(port, async err => {
       if (err) {
         throw err;
       }
-
       if (!modernServer) {
         return;
-      } // get server handler, render to ssr
-
+      }
 
+      // get server handler, render to ssr
       const render = (0, _prerender.compile)(modernServer.getRequestHandler());
-      const renderPromiseAry = (0, _make.makeRender)(renderRoutes, render, port); // eslint-disable-next-line promise/no-promise-in-callback
+      const renderPromiseAry = (0, _make.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);
@@ -66,7 +60,6 @@ process.on('message', async chunk => {
     });
   } catch (e) {
     var _modernServer;
-
     (_modernServer = modernServer) === null || _modernServer === void 0 ? void 0 : _modernServer.close();
     throw e;
   }

package/dist/types/index.d.ts

@@ -1,5 +1,3 @@
 import type { CliPlugin } from '@modern-js/core';
-
 declare const _default: () => CliPlugin;
-
 export default _default;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -55,10 +55,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/utils": "2.0.0-beta.0",
     "node-mocks-http": "^1.10.1",
     "normalize-path": "^3.0.0",
-    "portfinder": "^1.0.28"
+    "portfinder": "^1.0.28",
+    "@modern-js/utils": "2.0.0-beta.1"
   },
   "peerDependencies": {
     "react-router-dom": ">=5.1.2"
@@ -69,17 +69,17 @@
     }
   },
   "devDependencies": {
-    "@modern-js/types": "2.0.0-beta.0",
-    "@modern-js/prod-server": "2.0.0-beta.0",
     "@types/jest": "^27",
     "@types/node": "^14",
-    "@modern-js/core": "2.0.0-beta.0",
-    "@scripts/build": "2.0.0-beta.0",
-    "@scripts/jest-config": "2.0.0-beta.0",
     "react-router-dom": "^6.4.2",
     "react": "^18",
     "typescript": "^4",
-    "jest": "^27"
+    "jest": "^27",
+    "@modern-js/types": "2.0.0-beta.1",
+    "@modern-js/prod-server": "2.0.0-beta.1",
+    "@modern-js/core": "2.0.0-beta.1",
+    "@scripts/build": "2.0.0-beta.1",
+    "@scripts/jest-config": "2.0.0-beta.1"
   },
   "sideEffects": false,
   "modernConfig": {