@modern-js/plugin-ssg 2.6.0 → 2.8.0

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @modern-js/plugin-ssg
 
+## 2.8.0
+
+### Patch Changes
+
+- 1f6ca2c7fb: fix: nested routes in ssg
+  fix: 修复嵌套路由在 SSG 中的问题
+- Updated dependencies [1104a9f18b]
+- Updated dependencies [1f6ca2c7fb]
+  - @modern-js/utils@2.8.0
+
+## 2.7.0
+
+### Minor Changes
+
+- dcad887024: feat: support deferred data for streaming ssr
+  feat: 流式渲染支持 deferred data
+
+### Patch Changes
+
+- 0de9e61292: fix: ssg error reporting inaccuracy problem
+
+  fix: 修复 ssg 报错不准确的问题
+
+- Updated dependencies [0f15fc597c]
+- Updated dependencies [dcad887024]
+- Updated dependencies [a4672f7c16]
+- Updated dependencies [7fff9020e1]
+- Updated dependencies [84bfb439b8]
+  - @modern-js/utils@2.7.0
+
 ## 2.6.0
 
 ### Patch Changes

package/README.md

@@ -19,8 +19,8 @@ Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-sta
 
 ## Contributing
 
-Please read the [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md).
+Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/blob/main/CONTRIBUTING.md).
 
 ## License
 
-Modern.js is [MIT licensed](https://github.com/modern-js-dev/modern.js/blob/main/LICENSE).
+Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE).

package/dist/cjs/server/index.js

@@ -36,6 +36,7 @@ var import_utils = require("@modern-js/utils");
 var import_util = require("../libs/util");
 var import_consts = require("./consts");
 const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirectory) => new Promise((resolve, reject) => {
+  var _a, _b;
   const entries = ssgRoutes.map((route) => route.entryName);
   const backup = (0, import_util.openRouteSSR)(pageRoutes, entries);
   const total = backup.concat(apiRoutes);
@@ -69,7 +70,7 @@ const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirecto
       resolve(htmlAry);
     }
   });
-  cp.stderr.on("data", (chunk) => {
+  (_a = cp.stderr) == null ? void 0 : _a.on("data", (chunk) => {
     const str = chunk.toString();
     if (str.includes("Error")) {
       import_utils.logger.error(str);
@@ -79,7 +80,7 @@ const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirecto
       import_utils.logger.info(str.replace(/[^\S\n]+/g, " "));
     }
   });
-  cp.stdout.on("data", (chunk) => {
+  (_b = cp.stdout) == null ? void 0 : _b.on("data", (chunk) => {
     const str = chunk.toString();
     if (str.includes("Error")) {
       import_utils.logger.error(str);

package/dist/cjs/server/process.js

@@ -72,6 +72,6 @@ process.on("message", async (chunk) => {
     });
   } catch (e) {
     modernServer == null ? void 0 : modernServer.close();
-    throw e;
+    process.stderr.write(e instanceof Error ? e.stack : e.toString());
   }
 });

package/dist/esm/server/index.js

@@ -5,6 +5,7 @@ import { openRouteSSR } from "../libs/util";
 import { CLOSE_SIGN } from "./consts";
 var createServer = function(api, ssgRoutes, pageRoutes, apiRoutes, options, appDirectory) {
     return new Promise(function(resolve, reject) {
+        var _cp_stderr, _cp_stdout;
         var entries = ssgRoutes.map(function(route) {
             return route.entryName;
         });
@@ -38,7 +39,7 @@ var createServer = function(api, ssgRoutes, pageRoutes, apiRoutes, options, appD
                 resolve(htmlAry);
             }
         });
-        cp.stderr.on("data", function(chunk) {
+        (_cp_stderr = cp.stderr) === null || _cp_stderr === void 0 ? void 0 : _cp_stderr.on("data", function(chunk) {
             var str = chunk.toString();
             if (str.includes("Error")) {
                 logger.error(str);
@@ -48,7 +49,7 @@ var createServer = function(api, ssgRoutes, pageRoutes, apiRoutes, options, appD
                 logger.info(str.replace(/[^\S\n]+/g, " "));
             }
         });
-        cp.stdout.on("data", function(chunk) {
+        (_cp_stdout = cp.stdout) === null || _cp_stdout === void 0 ? void 0 : _cp_stdout.on("data", function(chunk) {
             var str = chunk.toString();
             if (str.includes("Error")) {
                 logger.error(str);

package/dist/esm/server/process.js

@@ -27,6 +27,13 @@ function _asyncToGenerator(fn) {
         });
     };
 }
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
 var __generator = this && this.__generator || function(thisArg, body) {
     var f, y, t, g, _ = {
         label: 0,
@@ -212,7 +219,11 @@ process.on("message", function() {
                 case 4:
                     e = _state.sent();
                     modernServer === null || modernServer === void 0 ? void 0 : modernServer.close();
-                    throw e;
+                    process.stderr.write(_instanceof(e, Error) ? e.stack : e.toString());
+                    return [
+                        3,
+                        5
+                    ];
                 case 5:
                     return [
                         2

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

@@ -4,6 +4,7 @@ import { logger } from "@modern-js/utils";
 import { openRouteSSR } from "../libs/util";
 import { CLOSE_SIGN } from "./consts";
 const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirectory) => new Promise((resolve, reject) => {
+  var _a, _b;
   const entries = ssgRoutes.map((route) => route.entryName);
   const backup = openRouteSSR(pageRoutes, entries);
   const total = backup.concat(apiRoutes);
@@ -37,7 +38,7 @@ const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirecto
       resolve(htmlAry);
     }
   });
-  cp.stderr.on("data", (chunk) => {
+  (_a = cp.stderr) == null ? void 0 : _a.on("data", (chunk) => {
     const str = chunk.toString();
     if (str.includes("Error")) {
       logger.error(str);
@@ -47,7 +48,7 @@ const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirecto
       logger.info(str.replace(/[^\S\n]+/g, " "));
     }
   });
-  cp.stdout.on("data", (chunk) => {
+  (_b = cp.stdout) == null ? void 0 : _b.on("data", (chunk) => {
     const str = chunk.toString();
     if (str.includes("Error")) {
       logger.error(str);

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

@@ -50,6 +50,6 @@ process.on("message", async (chunk) => {
     });
   } catch (e) {
     modernServer == null ? void 0 : modernServer.close();
-    throw e;
+    process.stderr.write(e instanceof Error ? e.stack : e.toString());
   }
 });

package/dist/types/types.d.ts

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

package/package.json

@@ -2,8 +2,8 @@
   "name": "@modern-js/plugin-ssg",
   "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
-  "bugs": "https://github.com/modern-js-dev/modern.js/issues",
-  "repository": "modern-js-dev/modern.js",
+  "bugs": "https://github.com/web-infra-dev/modern.js/issues",
+  "repository": "web-infra-dev/modern.js",
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.6.0",
+  "version": "2.8.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -57,7 +57,7 @@
     "node-mocks-http": "^1.10.1",
     "normalize-path": "^3.0.0",
     "portfinder": "^1.0.28",
-    "@modern-js/utils": "2.6.0"
+    "@modern-js/utils": "2.8.0"
   },
   "peerDependencies": {
     "react-router-dom": ">=5.1.2"
@@ -72,13 +72,13 @@
     "@types/node": "^14",
     "jest": "^27",
     "react": "^18",
-    "react-router-dom": "^6.6.0",
+    "react-router-dom": "^6.8.1",
     "typescript": "^4",
-    "@modern-js/app-tools": "2.6.0",
-    "@modern-js/prod-server": "2.6.0",
-    "@modern-js/types": "2.6.0",
-    "@scripts/build": "2.6.0",
-    "@scripts/jest-config": "2.6.0"
+    "@modern-js/app-tools": "2.8.0",
+    "@modern-js/prod-server": "2.8.0",
+    "@modern-js/types": "2.8.0",
+    "@scripts/build": "2.8.0",
+    "@scripts/jest-config": "2.8.0"
   },
   "sideEffects": false,
   "publishConfig": {