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

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

@@ -1,37 +1,16 @@
 "use strict";
 
 var _prodServer = _interopRequireDefault(require("@modern-js/prod-server"));
-
 var _portfinder = _interopRequireDefault(require("portfinder"));
-
-var _utils = require("@modern-js/utils");
-
 var _make = require("../libs/make");
-
 var _prerender = require("./prerender");
-
 var _consts = require("./consts");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const safetyRequire = (filename, base) => {
-  try {
-    return (0, _utils.compatRequire)(require.resolve(`${filename}/server`, {
-      paths: [base]
-    }));
-  } catch (e) {
-    return (0, _utils.compatRequire)(require.resolve(filename, {
-      paths: [base]
-    }));
-  }
-};
-
 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,
@@ -40,17 +19,13 @@ process.on('message', async chunk => {
     appDirectory,
     plugins
   } = context;
-  const instances = plugins.map(plugin => {
-    const mod = safetyRequire(plugin, appDirectory);
-    return mod();
-  });
   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();
@@ -59,22 +34,23 @@ process.on('message', async chunk => {
       config: options,
       routes,
       staticGenerate: true,
-      plugins: instances
-    }); // listen just for bff request in ssr page
+      internalPlugins: plugins
+    });
 
+    // 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);
@@ -84,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/dist/types/libs/util.d.ts

@@ -1,6 +1,6 @@
 import { ServerRoute as ModernRoute } from '@modern-js/types';
 import { ServerConfig } from '@modern-js/core';
-import { SsgRoute, SSGConfig, EntryPoint, SSGMultiEntryOptions } from '../types';
+import { SsgRoute, SSGConfig, EntryPoint, SSGMultiEntryOptions, AgreedRoute } from '../types';
 export declare function formatOutput(filename: string): string;
 export declare function formatPath(str: string): string;
 export declare function isDynamicUrl(url: string): boolean;
@@ -20,4 +20,5 @@ export declare const openRouteSSR: (routes: ModernRoute[], entries?: string[]) =
   isApi?: boolean | undefined;
   enableModernMode?: boolean | undefined;
   responseHeaders?: Record<string, unknown> | undefined;
-}[];
+}[];
+export declare const flattenRoutes: (routes: AgreedRoute[]) => AgreedRoute[];

package/dist/types/types.d.ts

@@ -2,10 +2,11 @@ import type { ServerRoute as ModernRoute } from '@modern-js/types';
 import type { SSGConfig, SSGRouteOptions, SSGMultiEntryOptions, SSGSingleEntryOptions } from '@modern-js/core';
 export type { SSGConfig, SSGRouteOptions, SSGMultiEntryOptions, SSGSingleEntryOptions };
 export declare type AgreedRoute = {
-  path: string;
-  component: string;
-  _component: string;
-  exact: boolean;
+  path?: string;
+  component?: string;
+  _component?: string;
+  children?: AgreedRoute[];
+  exact?: boolean;
 };
 export declare type EntryPoint = {
   entryName: string;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.5",
+  "version": "2.0.0-beta.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -58,22 +58,28 @@
     "node-mocks-http": "^1.10.1",
     "normalize-path": "^3.0.0",
     "portfinder": "^1.0.28",
-    "react-router-dom": "^5.2.1",
-    "@modern-js/utils": "1.21.5"
+    "@modern-js/utils": "2.0.0-beta.1"
+  },
+  "peerDependencies": {
+    "react-router-dom": ">=5.1.2"
+  },
+  "peerDependenciesMeta": {
+    "react-router-dom": {
+      "optional": true
+    }
   },
   "devDependencies": {
     "@types/jest": "^27",
     "@types/node": "^14",
-    "@types/react-router": "^5.1.16",
-    "@types/react-router-dom": "^5.1.8",
-    "react": "^17",
+    "react-router-dom": "^6.4.2",
+    "react": "^18",
     "typescript": "^4",
     "jest": "^27",
-    "@modern-js/types": "1.21.5",
-    "@modern-js/prod-server": "1.21.5",
-    "@modern-js/core": "1.21.5",
-    "@scripts/build": "1.21.5",
-    "@scripts/jest-config": "1.21.5"
+    "@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": {
@@ -85,33 +91,10 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "wireit": {
-    "build": {
-      "command": "modern build",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json"
-      ],
-      "output": [
-        "dist/**/*"
-      ]
-    },
-    "test": {
-      "command": "jest --passWithNoTests",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json",
-        "tests/**/*"
-      ],
-      "output": []
-    }
-  },
   "scripts": {
     "new": "modern new",
-    "build": "wireit",
+    "build": "modern build",
     "dev": "modern build --watch",
-    "test": "wireit"
+    "test": "jest --passWithNoTests"
   }
 }