@modern-js/plugin-ssg 1.2.4 → 1.2.5

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @modern-js/plugin-ssg
 
+## 1.2.5
+
+### Patch Changes
+
+- 73306c0d: fix ssg type
+- 59010b7a: rewrite server lifecycle, add unit test
+- aed9912e: fix: output.ssg type error
+- Updated dependencies [cc5e8001]
+- Updated dependencies [2520ea86]
+- Updated dependencies [db43dce6]
+- Updated dependencies [e81fd9b7]
+- Updated dependencies [1c411e71]
+  - @modern-js/core@1.4.6
+  - @modern-js/utils@1.3.4
+
 ## 1.2.4
 
 ### Patch Changes

package/dist/js/modern/index.js

@@ -84,8 +84,6 @@ export default createPlugin(() => {
         let entryOptions = intermediateOptions[entryName];
 
         if (!agreedRoutes) {
-          var _entryOptions$routes;
-
           // default behavior for non-agreed route
           if (!entryOptions) {
             return;
@@ -96,7 +94,7 @@ export default createPlugin(() => {
             ssgRoutes.push(_objectSpread(_objectSpread({}, pageRoute), {}, {
               output: entryPath
             }));
-          } else if (((_entryOptions$routes = entryOptions.routes) === null || _entryOptions$routes === void 0 ? void 0 : _entryOptions$routes.length) > 0) {
+          } else if (entryOptions.routes && entryOptions.routes.length > 0) {
             // if entryOptions is object and has routes options
             // add every route in options
             const {

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

@@ -1,4 +1,4 @@
-import server from '@modern-js/server';
+import server from '@modern-js/prod-server';
 import portfinder from 'portfinder';
 import { compatRequire } from '@modern-js/utils';
 import { makeRender } from "../libs/make";

package/dist/js/modern/types.js

@@ -1 +1 @@
-export {};
+import '@modern-js/core';

package/dist/js/node/index.js

@@ -103,8 +103,6 @@ var _default = (0, _core.createPlugin)(() => {
         let entryOptions = intermediateOptions[entryName];
 
         if (!agreedRoutes) {
-          var _entryOptions$routes;
-
           // default behavior for non-agreed route
           if (!entryOptions) {
             return;
@@ -115,7 +113,7 @@ var _default = (0, _core.createPlugin)(() => {
             ssgRoutes.push(_objectSpread(_objectSpread({}, pageRoute), {}, {
               output: entryPath
             }));
-          } else if (((_entryOptions$routes = entryOptions.routes) === null || _entryOptions$routes === void 0 ? void 0 : _entryOptions$routes.length) > 0) {
+          } else if (entryOptions.routes && entryOptions.routes.length > 0) {
             // if entryOptions is object and has routes options
             // add every route in options
             const {

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

@@ -1,6 +1,6 @@
 "use strict";
 
-var _server = _interopRequireDefault(require("@modern-js/server"));
+var _prodServer = _interopRequireDefault(require("@modern-js/prod-server"));
 
 var _portfinder = _interopRequireDefault(require("portfinder"));
 
@@ -51,7 +51,7 @@ process.on('message', async chunk => {
     const defaultPort = Number(process.env.PORT) || serverOptions.port;
     _portfinder.default.basePort = defaultPort;
     const port = await _portfinder.default.getPortPromise();
-    modernServer = await (0, _server.default)({
+    modernServer = await (0, _prodServer.default)({
       pwd: appDirectory,
       config: options,
       routes,

package/dist/js/node/types.js

@@ -1,5 +1,3 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+require("@modern-js/core");

package/dist/types/types.d.ts

@@ -1,4 +1,5 @@
 import { ServerRoute as ModernRoute } from '@modern-js/types';
+import '@modern-js/core';
 export declare type AgreedRoute = {
   path: string;
   component: string;
@@ -25,10 +26,15 @@ export declare type RouteOptions = string | {
 export declare type SingleEntryOptions = boolean | {
   preventDefault?: string[];
   headers?: Record<string, any>;
-  routes: RouteOptions[];
+  routes?: RouteOptions[];
 };
 export declare type MultiEntryOptions = Record<string, SingleEntryOptions>;
 export declare type SSG = boolean | SingleEntryOptions | MultiEntryOptions | ((entryName: string) => SingleEntryOptions);
 export declare type ExtendOutputConfig = {
   ssg: SSG;
-};
+};
+declare module '@modern-js/core' {
+  interface OutputConfig {
+    ssg?: SSG;
+  }
+}

package/package.json

@@ -11,12 +11,22 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.4",
+  "version": "1.2.5",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
   "module": "./dist/js/treeshaking/index.js",
   "jsnext:modern": "./dist/js/modern/index.js",
+  "typesVersions": {
+    "*": {
+      ".": [
+        "./dist/types/index.d.ts"
+      ],
+      "types": [
+        "./dist/types/types.d.ts"
+      ]
+    }
+  },
   "exports": {
     ".": {
       "node": {
@@ -33,19 +43,27 @@
         "require": "./dist/js/node/index.js"
       },
       "default": "./dist/js/treeshaking/index.js"
+    },
+    "./types": {
+      "node": {
+        "import": "./dist/js/modern/types.js",
+        "require": "./dist/js/node/types.js",
+        "types": "./dist/types/types.d.ts"
+      },
+      "default": "./dist/js/treeshaking/types.js"
     }
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/utils": "^1.3.3",
+    "@modern-js/utils": "^1.3.4",
     "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.4.4",
     "@modern-js/types": "^1.3.4",
+    "@modern-js/prod-server": "^1.0.2",
     "@types/jest": "^26",
     "@types/node": "^14",
     "@types/react": "^17",
@@ -53,13 +71,13 @@
     "@types/react-router": "^5.1.16",
     "@types/react-router-dom": "^5.1.8",
     "typescript": "^4",
-    "@modern-js/core": "^1.4.4",
+    "@modern-js/core": "^1.4.6",
     "@scripts/build": "0.0.0",
     "jest": "^27",
     "@scripts/jest-config": "0.0.0"
   },
   "peerDependencies": {
-    "@modern-js/core": "^1.4.4"
+    "@modern-js/core": "^1.4.6"
   },
   "sideEffects": false,
   "modernConfig": {