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

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/js/node/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/types/index.d.ts

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

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

@@ -1,5 +1,5 @@
 import { ServerRoute as ModernRoute } from '@modern-js/types';
-import { ServerConfig } from '@modern-js/core';
+import { ServerUserConfig } from '@modern-js/app-tools';
 import { SsgRoute, SSGConfig, EntryPoint, SSGMultiEntryOptions, AgreedRoute } from '../types';
 export declare function formatOutput(filename: string): string;
 export declare function formatPath(str: string): string;
@@ -9,7 +9,7 @@ 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: SSGConfig, entrypoints: EntryPoint[], routes: ModernRoute[], server: ServerConfig) => false | SSGMultiEntryOptions;
+export declare const standardOptions: (ssgOptions: SSGConfig, entrypoints: EntryPoint[], routes: ModernRoute[], server: ServerUserConfig) => false | SSGMultiEntryOptions;
 export declare const openRouteSSR: (routes: ModernRoute[], entries?: string[]) => {
   isSSR: boolean;
   bundle: string;

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

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

package/dist/types/types.d.ts

@@ -1,5 +1,5 @@
 import type { ServerRoute as ModernRoute } from '@modern-js/types';
-import type { SSGConfig, SSGRouteOptions, SSGMultiEntryOptions, SSGSingleEntryOptions } from '@modern-js/core';
+import { SSGConfig, SSGRouteOptions, SSGMultiEntryOptions, SSGSingleEntryOptions } from '@modern-js/app-tools';
 export type { SSGConfig, SSGRouteOptions, SSGMultiEntryOptions, SSGSingleEntryOptions };
 export declare type AgreedRoute = {
   path?: string;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.2",
   "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.2"
   },
   "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.2",
+    "@modern-js/prod-server": "2.0.0-beta.2",
+    "@scripts/build": "2.0.0-beta.2",
+    "@modern-js/app-tools": "2.0.0-beta.2",
+    "@scripts/jest-config": "2.0.0-beta.2"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -92,9 +92,9 @@
     "access": "public"
   },
   "scripts": {
-    "new": "modern new",
-    "build": "modern build",
-    "dev": "modern build --watch",
+    "new": "modern-lib new",
+    "build": "modern-lib build",
+    "dev": "modern-lib build --watch",
     "test": "jest --passWithNoTests"
   }
 }