@modern-js/plugin-ssg 1.1.3-rc.0 → 1.2.3

package/CHANGELOG.md

@@ -1,12 +1,57 @@
 # @modern-js/plugin-ssg
 
-## 1.1.3-rc.0
+## 1.2.3
 
 ### Patch Changes
 
-- Updated dependencies [b7fb82ec]
-  - @modern-js/utils@1.1.6-rc.0
-  - @modern-js/core@1.2.1-rc.0
+- 1e17ef11: fix: fix ssg with new plugin route logic
+- Updated dependencies [53aca274]
+- Updated dependencies [78279953]
+- Updated dependencies [e116ace5]
+- Updated dependencies [4d72edea]
+  - @modern-js/core@1.4.1
+  - @modern-js/utils@1.3.1
+
+## 1.2.2
+
+### Patch Changes
+
+- 5a7901d7: fix ssg url
+- Updated dependencies [d9cc5ea9]
+- Updated dependencies [bd819a8d]
+- Updated dependencies [ec4dbffb]
+- Updated dependencies [d099e5c5]
+- Updated dependencies [bada2879]
+- Updated dependencies [24f616ca]
+- Updated dependencies [bd819a8d]
+  - @modern-js/core@1.4.0
+  - @modern-js/utils@1.3.0
+
+## 1.2.1
+
+### Patch Changes
+
+- 83166714: change .npmignore
+- Updated dependencies [83166714]
+- Updated dependencies [c3de9882]
+- Updated dependencies [33ff48af]
+  - @modern-js/core@1.3.2
+  - @modern-js/utils@1.2.2
+
+## 1.2.0
+
+### Minor Changes
+
+- cfe11628: Make Modern.js self bootstraping
+
+### Patch Changes
+
+- Updated dependencies [2da09c69]
+- Updated dependencies [fc71e36f]
+- Updated dependencies [c3d46ee4]
+- Updated dependencies [cfe11628]
+  - @modern-js/utils@1.2.0
+  - @modern-js/core@1.3.0
 
 ## 1.1.2
 

package/dist/js/modern/index.js

@@ -172,7 +172,7 @@ export default createPlugin(() => {
         ssgRoute.isSSR = false;
         ssgRoute.output = formatOutput(ssgRoute.output);
       });
-      const htmlAry = await createServer(ssgRoutes, apiRoutes, resolvedConfig, appDirectory); // write to dist file
+      const htmlAry = await createServer(ssgRoutes, pageRoutes, apiRoutes, resolvedConfig, appDirectory); // write to dist file
 
       writeHtmlFile(htmlAry, ssgRoutes, buildDir); // format route info, side effect
 

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

@@ -25,13 +25,13 @@ export function makeRoute(baseRoute, route, headers = {}) {
     return _objectSpread(_objectSpread({}, baseRoute), {}, {
       urlPath: normalize(`${urlPath}${route}`) || '/',
       headers,
-      output: path.join(entryPath, `..${route}`)
+      output: path.join(entryPath, `..${route === '/' ? '' : route}`)
     });
   } else {
     return _objectSpread(_objectSpread({}, baseRoute), {}, {
       urlPath: normalize(`${urlPath}${route.url}`) || '/',
       headers: _objectSpread(_objectSpread({}, headers), route.headers),
-      output: route.output ? path.normalize(route.output) : path.join(entryPath, `..${route.url}`)
+      output: route.output ? path.normalize(route.output) : path.join(entryPath, `..${route.url === '/' ? '' : route.url}`)
     });
   }
 }

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

@@ -1,5 +1,11 @@
+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 } from '@modern-js/utils';
+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;
@@ -124,4 +130,8 @@ export const standardOptions = (ssgOptions, entrypoints) => {
   }
 
   return false;
-};
+};
+export const openRouteSSR = routes => routes.map(ssgRoute => _objectSpread(_objectSpread({}, ssgRoute), {}, {
+  isSSR: true,
+  bundle: `${SERVER_BUNDLE_DIRECTORY}/${ssgRoute.entryName}.js`
+}));

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

@@ -1,21 +1,13 @@
-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 childProcess from 'child_process';
 import path from 'path';
-import { logger, SERVER_BUNDLE_DIRECTORY } from '@modern-js/utils';
+import { logger } from '@modern-js/utils';
 import { useAppContext } from '@modern-js/core';
+import { openRouteSSR } from "../libs/util";
 import { CLOSE_SIGN } from "./consts";
-export const createServer = (ssgRoutes, apiRoutes, options, appDirectory) => new Promise((resolve, reject) => {
+export const createServer = (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 backup = ssgRoutes.map(ssgRoute => _objectSpread(_objectSpread({}, ssgRoute), {}, {
-    isSSR: true,
-    bundle: `${SERVER_BUNDLE_DIRECTORY}/${ssgRoute.entryName}.js`
-  }));
+  const backup = openRouteSSR(pageRoutes);
   const total = backup.concat(apiRoutes);
   const cp = childProcess.fork(path.join(__dirname, 'process'), {
     cwd: appDirectory,
@@ -26,6 +18,7 @@ export const createServer = (ssgRoutes, apiRoutes, options, appDirectory) => new
   const plugins = serverPlugins.map(p => p.name);
   cp.send(JSON.stringify({
     options,
+    renderRoutes: ssgRoutes,
     routes: total,
     appDirectory,
     plugins
@@ -41,7 +34,7 @@ export const createServer = (ssgRoutes, apiRoutes, options, appDirectory) => new
       htmlChunks.length = 0;
     }
 
-    if (htmlAry.length === backup.length) {
+    if (htmlAry.length === ssgRoutes.length) {
       cp.send(CLOSE_SIGN);
       resolve(htmlAry);
     }

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

@@ -26,6 +26,7 @@ process.on('message', async chunk => {
   const context = JSON.parse(chunk);
   const {
     routes,
+    renderRoutes,
     options,
     appDirectory,
     plugins
@@ -52,11 +53,15 @@ process.on('message', async chunk => {
     modernServer.listen(port, async err => {
       if (err) {
         throw err;
+      }
+
+      if (!modernServer) {
+        return;
       } // get server handler, render to ssr
 
 
       const render = createRender(modernServer.getRequestHandler());
-      const renderPromiseAry = makeRender(routes.filter(route => !route.isApi), 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 => {

package/dist/js/node/index.js

@@ -191,7 +191,7 @@ var _default = (0, _core.createPlugin)(() => {
         ssgRoute.isSSR = false;
         ssgRoute.output = (0, _util.formatOutput)(ssgRoute.output);
       });
-      const htmlAry = await (0, _server.createServer)(ssgRoutes, apiRoutes, resolvedConfig, appDirectory); // write to dist file
+      const htmlAry = await (0, _server.createServer)(ssgRoutes, pageRoutes, apiRoutes, resolvedConfig, appDirectory); // write to dist file
 
       (0, _output.writeHtmlFile)(htmlAry, ssgRoutes, buildDir); // format route info, side effect
 

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

@@ -38,13 +38,13 @@ function makeRoute(baseRoute, route, headers = {}) {
     return _objectSpread(_objectSpread({}, baseRoute), {}, {
       urlPath: (0, _normalizePath.default)(`${urlPath}${route}`) || '/',
       headers,
-      output: _path.default.join(entryPath, `..${route}`)
+      output: _path.default.join(entryPath, `..${route === '/' ? '' : route}`)
     });
   } else {
     return _objectSpread(_objectSpread({}, baseRoute), {}, {
       urlPath: (0, _normalizePath.default)(`${urlPath}${route.url}`) || '/',
       headers: _objectSpread(_objectSpread({}, headers), route.headers),
-      output: route.output ? _path.default.normalize(route.output) : _path.default.join(entryPath, `..${route.url}`)
+      output: route.output ? _path.default.normalize(route.output) : _path.default.join(entryPath, `..${route.url === '/' ? '' : route.url}`)
     });
   }
 }

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

@@ -8,7 +8,7 @@ exports.formatPath = formatPath;
 exports.getOutput = getOutput;
 exports.getUrlPrefix = getUrlPrefix;
 exports.isDynamicUrl = isDynamicUrl;
-exports.writeJSONSpec = exports.standardOptions = exports.replaceWithAlias = exports.readJSONSpec = void 0;
+exports.writeJSONSpec = exports.standardOptions = exports.replaceWithAlias = exports.readJSONSpec = exports.openRouteSSR = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
@@ -16,6 +16,12 @@ 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;
@@ -157,4 +163,11 @@ const standardOptions = (ssgOptions, entrypoints) => {
   return false;
 };
 
-exports.standardOptions = standardOptions;
+exports.standardOptions = standardOptions;
+
+const openRouteSSR = routes => routes.map(ssgRoute => _objectSpread(_objectSpread({}, ssgRoute), {}, {
+  isSSR: true,
+  bundle: `${_utils.SERVER_BUNDLE_DIRECTORY}/${ssgRoute.entryName}.js`
+}));
+
+exports.openRouteSSR = openRouteSSR;

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

@@ -13,23 +13,16 @@ var _utils = require("@modern-js/utils");
 
 var _core = require("@modern-js/core");
 
+var _util = require("../libs/util");
+
 var _consts = require("./consts");
 
 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 createServer = (ssgRoutes, apiRoutes, options, appDirectory) => new Promise((resolve, reject) => {
+const createServer = (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 backup = ssgRoutes.map(ssgRoute => _objectSpread(_objectSpread({}, ssgRoute), {}, {
-    isSSR: true,
-    bundle: `${_utils.SERVER_BUNDLE_DIRECTORY}/${ssgRoute.entryName}.js`
-  }));
+  const backup = (0, _util.openRouteSSR)(pageRoutes);
   const total = backup.concat(apiRoutes);
 
   const cp = _child_process.default.fork(_path.default.join(__dirname, 'process'), {
@@ -42,6 +35,7 @@ const createServer = (ssgRoutes, apiRoutes, options, appDirectory) => new Promis
   const plugins = serverPlugins.map(p => p.name);
   cp.send(JSON.stringify({
     options,
+    renderRoutes: ssgRoutes,
     routes: total,
     appDirectory,
     plugins
@@ -57,7 +51,7 @@ const createServer = (ssgRoutes, apiRoutes, options, appDirectory) => new Promis
       htmlChunks.length = 0;
     }
 
-    if (htmlAry.length === backup.length) {
+    if (htmlAry.length === ssgRoutes.length) {
       cp.send(_consts.CLOSE_SIGN);
       resolve(htmlAry);
     }

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

@@ -35,6 +35,7 @@ process.on('message', async chunk => {
   const context = JSON.parse(chunk);
   const {
     routes,
+    renderRoutes,
     options,
     appDirectory,
     plugins
@@ -61,11 +62,15 @@ process.on('message', async chunk => {
     modernServer.listen(port, async err => {
       if (err) {
         throw err;
+      }
+
+      if (!modernServer) {
+        return;
       } // get server handler, render to ssr
 
 
       const render = (0, _prerender.compile)(modernServer.getRequestHandler());
-      const renderPromiseAry = (0, _make.makeRender)(routes.filter(route => !route.isApi), 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 => {

package/dist/types/libs/util.d.ts

@@ -8,4 +8,14 @@ export declare function getOutput(route: SsgRoute, base: string, agreed?: boolea
 export declare const readJSONSpec: (dir: string) => ModernRoute[];
 export declare const writeJSONSpec: (dir: string, routes: ModernRoute[]) => void;
 export declare const replaceWithAlias: (base: string, filePath: string, alias: string) => string;
-export declare const standardOptions: (ssgOptions: SSG, entrypoints: EntryPoint[]) => false | MultiEntryOptions;
+export declare const standardOptions: (ssgOptions: SSG, entrypoints: EntryPoint[]) => false | MultiEntryOptions;
+export declare const openRouteSSR: (routes: ModernRoute[]) => {
+  isSSR: boolean;
+  bundle: string;
+  entryName?: string | undefined;
+  urlPath: string;
+  entryPath: string;
+  isSPA?: boolean | undefined;
+  isApi?: boolean | undefined;
+  enableModernMode?: boolean | undefined;
+}[];

package/dist/types/server/index.d.ts

@@ -1,4 +1,4 @@
 import { NormalizedConfig } from '@modern-js/core';
 import { ServerRoute as ModernRoute } from '@modern-js/types';
 import { SsgRoute } from '../types';
-export declare const createServer: (ssgRoutes: SsgRoute[], apiRoutes: ModernRoute[], options: NormalizedConfig, appDirectory: string) => Promise<string[]>;
+export declare const createServer: (ssgRoutes: SsgRoute[], pageRoutes: ModernRoute[], apiRoutes: ModernRoute[], options: NormalizedConfig, appDirectory: string) => Promise<string[]>;

package/jest.config.js

@@ -0,0 +1,8 @@
+const sharedConfig = require('@scripts/jest-config');
+
+/** @type {import('@jest/types').Config.InitialOptions} */
+module.exports = {
+  // eslint-disable-next-line node/no-unsupported-features/es-syntax
+  ...sharedConfig,
+  rootDir: __dirname,
+};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.3-rc.0",
+  "version": "1.2.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -20,12 +20,14 @@
   "exports": {
     ".": {
       "node": {
+        "jsnext:source": "./src/index.ts",
         "import": "./dist/js/modern/index.js",
         "require": "./dist/js/node/index.js"
       },
       "default": "./dist/js/treeshaking/index.js"
     },
     "./cli": {
+      "jsnext:source": "./src/index.ts",
       "node": {
         "import": "./dist/js/modern/index.js",
         "require": "./dist/js/node/index.js"
@@ -35,15 +37,15 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/utils": "^1.1.6-rc.0",
+    "@modern-js/utils": "^1.3.1",
     "node-mocks-http": "^1.10.1",
     "normalize-path": "^3.0.0",
     "portfinder": "^1.0.28",
     "react-router-dom": "^5.2.1"
   },
   "devDependencies": {
-    "@modern-js/server": "^1.2.1-rc.0",
-    "@modern-js/types": "^1.1.5-rc.0",
+    "@modern-js/server": "^1.4.1",
+    "@modern-js/types": "^1.3.1",
     "@types/jest": "^26",
     "@types/node": "^14",
     "@types/react": "^17",
@@ -51,12 +53,13 @@
     "@types/react-router": "^5.1.16",
     "@types/react-router-dom": "^5.1.8",
     "typescript": "^4",
-    "@modern-js/core": "^1.2.1-rc.0",
-    "@modern-js/plugin-testing": "^1.2.2",
-    "@modern-js/module-tools": "^1.1.4"
+    "@modern-js/core": "^1.4.1",
+    "@scripts/build": "0.0.0",
+    "jest": "^27",
+    "@scripts/jest-config": "0.0.0"
   },
   "peerDependencies": {
-    "@modern-js/core": "^1.2.1-rc.0"
+    "@modern-js/core": "^1.4.1"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -72,7 +75,7 @@
     "new": "modern new",
     "build": "modern build",
     "dev": "modern build --watch",
-    "test": "modern test --passWithNoTests"
+    "test": "jest --passWithNoTests"
   },
   "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
 }

package/tests/index.test.ts

@@ -0,0 +1,7 @@
+import plugin from '../src';
+
+describe('plugin-ssg', () => {
+  it('default', () => {
+    expect(plugin).toBeDefined();
+  });
+});

package/tests/lib.test.ts

@@ -1,8 +1,8 @@
 import fs from 'fs';
 import path from 'path';
 import { ServerRoute as ModernRoute } from '@modern-js/types';
-import { exist, replaceRoute } from '@/libs/replace';
-import { makeRoute } from '@/libs/make';
+import { exist, replaceRoute } from '../src/libs/replace';
+import { makeRoute } from '../src/libs/make';
 
 describe('test functional function', () => {
   it('should check route exist correctly', () => {

package/tests/tsconfig.json

@@ -4,9 +4,7 @@
     "declaration": false,
     "jsx": "preserve",
     "baseUrl": "./",
-    "paths": {
-      "@/*": ["../src/*"]
-    },
+    "paths": {},
     "esModuleInterop": true
   }
 }

package/tests/util.test.ts

@@ -6,7 +6,8 @@ import {
   getOutput,
   replaceWithAlias,
   standardOptions,
-} from '@/libs/util';
+  openRouteSSR,
+} from '../src/libs/util';
 
 describe('test ssg util function', () => {
   it('should return format path correctly', () => {
@@ -73,6 +74,7 @@ describe('test ssg util function', () => {
     expect(replaceWithAlias('/src', '/src/app.js', '@src')).toBe('@src/app.js');
   });
 
+  // eslint-disable-next-line max-statements
   it('should starndar user config correctly', () => {
     const opt0 = standardOptions(false, []);
     expect(opt0).toBeFalsy();
@@ -98,47 +100,58 @@ describe('test ssg util function', () => {
     };
     const opt4 = standardOptions(ssg1, [{ entryName: 'main', entry: '' }]);
     expect(opt4).toEqual({ main: ssg1 });
+
+    // error usage, just test
+    const ssg2 = {
+      routes: ['/foo', { url: '/baz' }],
+    };
+    const opt5 = standardOptions(ssg2, [
+      { entryName: 'main', entry: '' },
+      { entryName: 'home', entry: '' },
+    ]);
+    expect(opt5).toEqual(ssg2);
+
+    const ssg3 = {
+      main: { routes: ['/foo', { url: '/baz' }] },
+      home: false,
+    };
+    const opt6 = standardOptions(ssg3, [
+      { entryName: 'main', entry: '' },
+      { entryName: 'home', entry: '' },
+    ]);
+    expect(opt6).toEqual(ssg3);
+
+    const ssg4 = () => true;
+    const opt7 = standardOptions(ssg4, [
+      { entryName: 'main', entry: '' },
+      { entryName: 'home', entry: '' },
+    ]);
+    expect(opt7).toEqual({ main: true, home: true });
+
+    const ssg5 = (entryName: string) => {
+      if (entryName === 'main') {
+        return true;
+      } else {
+        return {
+          routes: ['/foo'],
+        };
+      }
+    };
+    const opt8 = standardOptions(ssg5, [
+      { entryName: 'main', entry: '' },
+      { entryName: 'home', entry: '' },
+    ]);
+    expect(opt8).toEqual({ main: true, home: { routes: ['/foo'] } });
   });
 
-  // error usage, just test
-  const ssg2 = {
-    routes: ['/foo', { url: '/baz' }],
-  };
-  const opt5 = standardOptions(ssg2, [
-    { entryName: 'main', entry: '' },
-    { entryName: 'home', entry: '' },
-  ]);
-  expect(opt5).toEqual(ssg2);
-
-  const ssg3 = {
-    main: { routes: ['/foo', { url: '/baz' }] },
-    home: false,
-  };
-  const opt6 = standardOptions(ssg3, [
-    { entryName: 'main', entry: '' },
-    { entryName: 'home', entry: '' },
-  ]);
-  expect(opt6).toEqual(ssg3);
-
-  const ssg4 = () => true;
-  const opt7 = standardOptions(ssg4, [
-    { entryName: 'main', entry: '' },
-    { entryName: 'home', entry: '' },
-  ]);
-  expect(opt7).toEqual({ main: true, home: true });
-
-  const ssg5 = (entryName: string) => {
-    if (entryName === 'main') {
-      return true;
-    } else {
-      return {
-        routes: ['/foo'],
-      };
-    }
-  };
-  const opt8 = standardOptions(ssg5, [
-    { entryName: 'main', entry: '' },
-    { entryName: 'home', entry: '' },
-  ]);
-  expect(opt8).toEqual({ main: true, home: { routes: ['/foo'] } });
+  it('should get ssr route correctly', () => {
+    const ssrRoutes = openRouteSSR([
+      {
+        isSSR: false,
+      },
+    ] as any);
+
+    expect(ssrRoutes[0].isSSR).toBeTruthy();
+    expect(ssrRoutes[0].bundle).toBeDefined();
+  });
 });

package/tsconfig.json

@@ -4,9 +4,7 @@
     "declaration": false,
     "jsx": "preserve",
     "baseUrl": "./",
-    "paths": {
-      "@/*": ["./src/*"]
-    },
+    "paths": {},
     "esModuleInterop": true
   },
   "include": ["src"]

package/src/global.d.ts

@@ -1 +0,0 @@
-declare module 'normalize-path';

package/src/index.ts

@@ -1,209 +0,0 @@
-import path from 'path';
-import { logger, PLUGIN_SCHEMAS } from '@modern-js/utils';
-import {
-  createPlugin,
-  useAppContext,
-  useResolvedConfigContext,
-} from '@modern-js/core';
-import { generatePath } from 'react-router-dom';
-import {
-  AgreedRoute,
-  AgreedRouteMap,
-  EntryPoint,
-  ExtendOutputConfig,
-  SSG,
-  SsgRoute,
-} from './types';
-import {
-  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';
-
-export default createPlugin(
-  (() => {
-    const agreedRouteMap: AgreedRouteMap = {};
-
-    return {
-      validateSchema() {
-        return PLUGIN_SCHEMAS['@modern-js/plugin-ssg'];
-      },
-      modifyFileSystemRoutes({
-        entrypoint,
-        routes,
-      }: {
-        entrypoint: EntryPoint;
-        routes: AgreedRoute[];
-      }) {
-        const { entryName } = entrypoint;
-        agreedRouteMap[entryName] = routes;
-
-        return { entrypoint, routes };
-      },
-      // eslint-disable-next-line max-statements
-      async afterBuild() {
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        const resolvedConfig = useResolvedConfigContext();
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        const appContext = useAppContext();
-
-        const { appDirectory, entrypoints } = appContext;
-        const { output } = resolvedConfig;
-        const { ssg, path: outputPath } = output as typeof output &
-          ExtendOutputConfig;
-
-        const ssgOptions: SSG = Array.isArray(ssg) ? ssg.pop() : ssg;
-        // no ssg configuration, skip ssg render.
-        if (!ssgOptions) {
-          return;
-        }
-
-        const buildDir = path.join(appDirectory, outputPath as string);
-        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
-        if (pageRoutes.length === 0) {
-          return;
-        }
-
-        const intermediateOptions = standardOptions(ssgOptions, entrypoints);
-
-        if (!intermediateOptions) {
-          return;
-        }
-
-        const ssgRoutes: SsgRoute[] = [];
-        // each route will try to match the configuration
-        pageRoutes.forEach(pageRoute => {
-          const { entryName, entryPath } = pageRoute;
-          const agreedRoutes = agreedRouteMap[entryName as string];
-          let entryOptions = intermediateOptions[entryName as string];
-
-          if (!agreedRoutes) {
-            // default behavior for non-agreed route
-            if (!entryOptions) {
-              return;
-            }
-
-            // only add entry route if entryOptions is true
-            if (entryOptions === true) {
-              ssgRoutes.push({ ...pageRoute, output: entryPath });
-            } else if (entryOptions.routes?.length > 0) {
-              // if entryOptions is object and has routes options
-              // add every route in options
-              const { routes: enrtyRoutes, headers } = entryOptions;
-              enrtyRoutes.forEach(route => {
-                ssgRoutes.push(makeRoute(pageRoute, route, headers));
-              });
-            }
-          } else {
-            // Unless entryOptions is set to false
-            // the default behavior is to add all file-based routes
-            if (entryOptions === false) {
-              return;
-            }
-
-            if (!entryOptions || entryOptions === true) {
-              entryOptions = { preventDefault: [], routes: [], headers: {} };
-            }
-
-            const {
-              preventDefault = [],
-              routes: userRoutes = [],
-              headers,
-            } = entryOptions;
-            // if the user sets the routes, then only add them
-            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,
-                      ),
-                    );
-                  });
-                } else {
-                  ssgRoutes.push(makeRoute(pageRoute, route, headers));
-                }
-              });
-            } else {
-              // otherwith add all except dynamic routes
-              agreedRoutes
-                .filter(route => !preventDefault.includes(route.path))
-                .forEach(route => {
-                  if (!isDynamicUrl(route.path)) {
-                    ssgRoutes.push(makeRoute(pageRoute, route.path, headers));
-                  }
-                });
-            }
-          }
-        });
-
-        if (ssgRoutes.length === 0) {
-          return;
-        }
-
-        // currently SSG and SSR cannot be turned on at the same time、same route
-        ssgRoutes.forEach((ssgRoute: 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(
-          ssgRoutes,
-          apiRoutes,
-          resolvedConfig,
-          appDirectory,
-        );
-
-        // write to dist file
-        writeHtmlFile(htmlAry, ssgRoutes, buildDir);
-
-        // format route info, side effect
-        replaceRoute(ssgRoutes, pageRoutes);
-
-        // write routes to spec file
-        writeJSONSpec(buildDir, pageRoutes.concat(apiRoutes));
-
-        logger.info('ssg Compiled successfully');
-      },
-    };
-  }) as any,
-  { name: '@modern-js/plugin-ssg' },
-) as any;

package/src/libs/make.ts

@@ -1,45 +0,0 @@
-import path from 'path';
-import { ServerRoute as ModernRoute } from '@modern-js/types';
-import normalize from 'normalize-path';
-import { compile } from '../server/prerender';
-import { RouteOptions, SsgRoute } from '../types';
-
-export function makeRender(
-  ssgRoutes: SsgRoute[],
-  render: ReturnType<typeof compile>,
-  port: number,
-): Promise<string>[] {
-  return ssgRoutes.map((ssgRoute: SsgRoute) =>
-    render({
-      url: ssgRoute.urlPath,
-      headers: { host: `localhost:${port}`, ...ssgRoute.headers },
-      connection: {},
-    }),
-  );
-}
-
-export function makeRoute(
-  baseRoute: ModernRoute,
-  route: string | RouteOptions,
-  headers: Record<string, any> = {},
-): SsgRoute {
-  const { urlPath, entryPath } = baseRoute;
-
-  if (typeof route === 'string') {
-    return {
-      ...baseRoute,
-      urlPath: normalize(`${urlPath}${route}`) || '/',
-      headers,
-      output: path.join(entryPath, `..${route}`),
-    };
-  } else {
-    return {
-      ...baseRoute,
-      urlPath: normalize(`${urlPath}${route.url}`) || '/',
-      headers: { ...headers, ...route.headers },
-      output: route.output
-        ? path.normalize(route.output)
-        : path.join(entryPath, `..${route.url}`),
-    };
-  }
-}

package/src/libs/output.ts

@@ -1,19 +0,0 @@
-import path from 'path';
-import { fs } from '@modern-js/utils';
-import { SsgRoute } from '../types';
-
-export function writeHtmlFile(
-  htmlAry: string[],
-  ssgRoutes: SsgRoute[],
-  baseDir: string,
-) {
-  htmlAry.forEach((html: any, index: number) => {
-    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/src/libs/replace.ts

@@ -1,42 +0,0 @@
-import normalize from 'normalize-path';
-import { ServerRoute as ModernRoute } from '@modern-js/types';
-import { SsgRoute } from '../types';
-
-export function exist(route: ModernRoute, pageRoutes: ModernRoute[]): number {
-  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;
-  });
-}
-
-export function replaceRoute(ssgRoutes: SsgRoute[], pageRoutes: ModernRoute[]) {
-  // remove redundant fields and replace rendered entryPath
-  const cleanSsgRoutes = ssgRoutes.map(ssgRoute => {
-    const { output, headers, ...cleanSsgRoute } = ssgRoute;
-    return Object.assign(
-      cleanSsgRoute,
-      output ? { entryPath: output } : {},
-    ) as ModernRoute;
-  });
-
-  // all routes that need to be added and replaced
-  const freshRoutes: ModernRoute[] = [];
-  cleanSsgRoutes.forEach(ssgRoute => {
-    const index = exist(ssgRoute, pageRoutes);
-
-    if (index < 0) {
-      // new route
-      freshRoutes.push({ ...ssgRoute });
-    } else {
-      // overwrite original entry
-      pageRoutes[index].entryPath = ssgRoute.entryPath;
-    }
-  });
-
-  pageRoutes.push(...freshRoutes);
-  return pageRoutes;
-}

package/src/libs/util.ts

@@ -1,127 +0,0 @@
-import path from 'path';
-import { ROUTE_SPEC_FILE, fs, isSingleEntry } from '@modern-js/utils';
-import { ServerRoute as ModernRoute } from '@modern-js/types';
-import { EntryPoint, MultiEntryOptions, SSG, SsgRoute } from '../types';
-
-export function formatOutput(filename: string) {
-  const outputPath = path.extname(filename)
-    ? filename
-    : `${filename}/index.html`;
-  return outputPath;
-}
-
-export function formatPath(str: string) {
-  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: string): boolean {
-  return url.includes(':');
-}
-
-export function getUrlPrefix(route: SsgRoute, baseUrl: string | string[]) {
-  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 happend
-      if (!matched) {
-        throw new Error('');
-      }
-      base = matched;
-    }
-  } else {
-    base = baseUrl;
-  }
-
-  base = base === '/' ? '' : base;
-  const entryName = route.entryName === 'main' ? '' : route.entryName;
-  const prefix = `${base}/${entryName as string}`;
-  return prefix.endsWith('/') ? prefix.slice(0, -1) : prefix;
-}
-
-// if no output, return default path for aggred-route(relative),
-// or thorw error for control-route
-export function getOutput(route: SsgRoute, base: string, agreed?: boolean) {
-  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: string) => {
-  const routeJSONPath = path.join(dir, ROUTE_SPEC_FILE);
-  const routeJSON: {
-    routes: ModernRoute[];
-  } = require(routeJSONPath);
-  const { routes } = routeJSON;
-  return routes;
-};
-
-export const writeJSONSpec = (dir: string, routes: ModernRoute[]) => {
-  const routeJSONPath = path.join(dir, ROUTE_SPEC_FILE);
-  fs.writeJSONSync(routeJSONPath, { routes }, { spaces: 2 });
-};
-
-export const replaceWithAlias = (
-  base: string,
-  filePath: string,
-  alias: string,
-) => path.posix.join(alias, path.posix.relative(base, filePath));
-
-export const standardOptions = (ssgOptions: SSG, entrypoints: EntryPoint[]) => {
-  if (ssgOptions === false) {
-    return false;
-  }
-
-  if (ssgOptions === true) {
-    return entrypoints.reduce((opt, entry) => {
-      opt[entry.entryName] = ssgOptions;
-      return opt;
-    }, {} as MultiEntryOptions);
-  } else if (typeof ssgOptions === 'object') {
-    const isSingle = isSingleEntry(entrypoints);
-
-    if (isSingle && typeof (ssgOptions as any).main === 'undefined') {
-      return { main: ssgOptions } as MultiEntryOptions;
-    } else {
-      return ssgOptions as MultiEntryOptions;
-    }
-  } else if (typeof ssgOptions === 'function') {
-    const intermediateOptions: MultiEntryOptions = {};
-    for (const entrypoint of entrypoints) {
-      const { entryName } = entrypoint;
-      // Todo may be async function
-      intermediateOptions[entryName] = ssgOptions(entryName);
-    }
-    return intermediateOptions;
-  }
-
-  return false;
-};

package/src/server/consts.ts

@@ -1 +0,0 @@
-export const CLOSE_SIGN = 'modern_close_server';

package/src/server/index.ts

@@ -1,85 +0,0 @@
-import childProcess from 'child_process';
-import path from 'path';
-import { logger, SERVER_BUNDLE_DIRECTORY } from '@modern-js/utils';
-import { NormalizedConfig, useAppContext } from '@modern-js/core';
-import { ServerRoute as ModernRoute } from '@modern-js/types';
-import { SsgRoute } from '../types';
-import { CLOSE_SIGN } from './consts';
-
-export const createServer = (
-  ssgRoutes: SsgRoute[],
-  apiRoutes: ModernRoute[],
-  options: NormalizedConfig,
-  appDirectory: string,
-): Promise<string[]> =>
-  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 backup: ModernRoute[] = ssgRoutes.map(ssgRoute => ({
-      ...ssgRoute,
-      isSSR: true,
-      bundle: `${SERVER_BUNDLE_DIRECTORY}/${ssgRoute.entryName as string}.js`,
-    }));
-
-    const total = backup.concat(apiRoutes);
-
-    const cp = childProcess.fork(path.join(__dirname, 'process'), {
-      cwd: appDirectory,
-      silent: true,
-    });
-
-    const appContext = useAppContext();
-    const serverPlugins = appContext.plugins
-      .filter((p: any) => p.server)
-      .map((p: any) => p.server);
-    const plugins = serverPlugins.map((p: any) => p.name);
-
-    cp.send(
-      JSON.stringify({
-        options,
-        routes: total,
-        appDirectory,
-        plugins,
-      }),
-    );
-
-    const htmlChunks: string[] = [];
-    const htmlAry: string[] = [];
-
-    cp.on('message', (chunk: string) => {
-      if (chunk !== null) {
-        htmlChunks.push(chunk);
-      } else {
-        const html = htmlChunks.join('');
-        htmlAry.push(html);
-        htmlChunks.length = 0;
-      }
-
-      if (htmlAry.length === backup.length) {
-        cp.send(CLOSE_SIGN);
-        resolve(htmlAry);
-      }
-    });
-
-    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!.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, ' '));
-      }
-    });
-  });

package/src/server/prerender.ts

@@ -1,49 +0,0 @@
-import EventEmitter from 'events';
-import { IncomingMessage, ServerResponse } from 'http';
-import { Readable } from 'stream';
-import httpMocks from 'node-mocks-http';
-
-export type Options = {
-  url: string;
-  headers: {
-    host: string;
-    [key: string]: string;
-  };
-  [propName: string]: any;
-};
-
-export const compile =
-  (requestHandler: (req: IncomingMessage, res: ServerResponse) => void) =>
-  (options: Options, extend = {}): Promise<string> =>
-    new Promise((resolve, reject) => {
-      const req = httpMocks.createRequest({
-        ...options,
-        eventEmitter: Readable,
-      });
-      const res = httpMocks.createResponse({ eventEmitter: EventEmitter });
-
-      Object.assign(req, extend);
-      const proxyRes = new Proxy(res, {
-        get(obj: any, prop: any) {
-          if (typeof prop === 'symbol' && !obj[prop]) {
-            return null;
-          }
-          return obj[prop];
-        },
-      });
-
-      res.on('finish', () => {
-        if (res.statusCode !== 200) {
-          reject(new Error(res.statusMessage));
-        } else {
-          resolve(res._getData());
-        }
-      });
-
-      res.on('error', (e: Error) => reject(e));
-      try {
-        requestHandler(req, proxyRes);
-      } catch (e) {
-        reject(e);
-      }
-    });

package/src/server/process.ts

@@ -1,90 +0,0 @@
-import Server from '@modern-js/server';
-import { ServerRoute as ModernRoute } from '@modern-js/types';
-import portfinder from 'portfinder';
-import { NormalizedConfig } from '@modern-js/core';
-import { compatRequire } from '@modern-js/utils';
-import { makeRender } from '../libs/make';
-import { compile as createRender } from './prerender';
-import { CLOSE_SIGN } from './consts';
-import { SsgRoute } from '@/types';
-
-type Then<T> = T extends PromiseLike<infer U> ? U : T;
-
-type ModernServer = Then<ReturnType<typeof Server>>;
-
-const safetyRequire = (filename: string, base: string) => {
-  try {
-    return compatRequire(
-      require.resolve(`${filename}/server`, { paths: [base] }),
-    );
-  } catch (e) {
-    return compatRequire(require.resolve(filename, { paths: [base] }));
-  }
-};
-
-process.on('message', async (chunk: string) => {
-  if (chunk === CLOSE_SIGN) {
-    // eslint-disable-next-line no-process-exit
-    process.exit();
-  }
-
-  const context = JSON.parse(chunk as any);
-  const {
-    routes,
-    options,
-    appDirectory,
-    plugins,
-  }: {
-    routes: ModernRoute[];
-    options: NormalizedConfig;
-    appDirectory: string;
-    plugins: string[];
-  } = context;
-
-  const instances = plugins.map(plugin => safetyRequire(plugin, appDirectory));
-
-  let modernServer: ModernServer | null = null;
-  try {
-    const { server } = options;
-
-    // start server in default port
-    const defaultPort = Number(process.env.PORT) || server.port;
-    portfinder.basePort = defaultPort!;
-    const port = await portfinder.getPortPromise();
-
-    modernServer = await Server({
-      pwd: appDirectory,
-      config: options,
-      routes,
-      staticGenerate: true,
-      plugins: instances,
-    });
-
-    // listen just for bff request in ssr page
-    modernServer.listen(port, async (err: Error) => {
-      if (err) {
-        throw err;
-      }
-
-      // get server handler, render to ssr
-      const render = createRender(modernServer!.getRequestHandler());
-      const renderPromiseAry = makeRender(
-        routes.filter(route => !route.isApi) as SsgRoute[],
-        render,
-        port,
-      );
-
-      // eslint-disable-next-line promise/no-promise-in-callback
-      const htmlAry = await Promise.all(renderPromiseAry);
-      htmlAry.forEach((html: string) => {
-        process.send!(html);
-        process.send!(null);
-      });
-
-      modernServer!.close();
-    });
-  } catch (e) {
-    modernServer?.close();
-    throw e;
-  }
-});

package/src/types.ts

@@ -1,51 +0,0 @@
-import { ServerRoute as ModernRoute } from '@modern-js/types';
-
-export type AgreedRoute = {
-  path: string;
-  component: string;
-  _component: string;
-  exact: boolean;
-};
-
-export type EntryPoint = {
-  entryName: string;
-  entry: string;
-};
-
-export type AgreedRouteMap = {
-  [propNames: string]: AgreedRoute[];
-};
-
-export type SsgRoute = ModernRoute & {
-  output: string;
-  headers?: Record<string, string>;
-};
-
-export type RouteOptions =
-  | string
-  | {
-      url: string;
-      output?: string;
-      params?: Record<string, any>[];
-      headers?: Record<string, any>;
-    };
-
-export type SingleEntryOptions =
-  | boolean
-  | {
-      preventDefault?: string[];
-      headers?: Record<string, any>;
-      routes: RouteOptions[];
-    };
-
-export type MultiEntryOptions = Record<string, SingleEntryOptions>;
-
-export type SSG =
-  | boolean
-  | SingleEntryOptions
-  | MultiEntryOptions
-  | ((entryName: string) => SingleEntryOptions);
-
-export type ExtendOutputConfig = {
-  ssg: SSG;
-};