@modern-js/plugin-ssg 2.48.5 → 2.49.0

package/dist/cjs/server/index.js

@@ -51,8 +51,13 @@ const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirecto
     options,
     renderRoutes: ssgRoutes,
     routes: total,
-    appDirectory,
-    plugins
+    appContext: {
+      apiDirectory: appContext.apiDirectory,
+      lambdaDirectory: appContext.lambdaDirectory,
+      appDirectory: appContext.appDirectory
+    },
+    plugins,
+    distDirectory: appContext.distDirectory
   }));
   const htmlChunks = [];
   const htmlAry = [];

package/dist/cjs/server/process.js

@@ -21,48 +21,68 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
-var import_prod_server = __toESM(require("@modern-js/prod-server"));
+var import_http = require("http");
 var import_portfinder = __toESM(require("portfinder"));
-var import_make = require("../libs/make");
-var import_prerender = require("./prerender");
+var import_prod_server = require("@modern-js/prod-server");
 var import_consts = require("./consts");
 process.on("message", async (chunk) => {
   if (chunk === import_consts.CLOSE_SIGN) {
     process.exit();
   }
   const context = JSON.parse(chunk);
-  const { routes, renderRoutes, options, appDirectory, plugins } = context;
-  let modernServer = null;
+  const { routes, renderRoutes, options, appContext, plugins, distDirectory } = context;
+  let nodeServer = null;
   try {
-    const { server: serverOptions } = options;
-    const defaultPort = Number(process.env.PORT) || serverOptions.port;
+    const { server: serverConfig } = options;
+    const defaultPort = Number(process.env.PORT) || serverConfig.port;
     import_portfinder.default.basePort = defaultPort;
     const port = await import_portfinder.default.getPortPromise();
-    modernServer = await (0, import_prod_server.default)({
-      pwd: appDirectory,
+    const serverOptions = {
+      pwd: distDirectory,
       config: options,
+      appContext,
       routes,
       staticGenerate: true,
       internalPlugins: plugins
-    });
-    modernServer.listen(port, async (err) => {
-      if (err) {
-        throw err;
-      }
-      if (!modernServer) {
+    };
+    nodeServer = await (0, import_prod_server.createProdServer)(serverOptions);
+    nodeServer.listen(port, async () => {
+      if (!nodeServer) {
         return;
       }
-      const render = (0, import_prerender.compile)(modernServer.getRequestHandler());
-      const renderPromiseAry = (0, import_make.makeRender)(renderRoutes, render, port);
-      const htmlAry = await Promise.all(renderPromiseAry);
+      const htmlAry = await Promise.all(renderRoutes.map((route) => {
+        const url = `http://localhost:${port}${route.urlPath}`;
+        return getHtml(url, port);
+      }));
       htmlAry.forEach((html) => {
         process.send(html);
         process.send(null);
       });
-      modernServer.close();
+      nodeServer.close();
     });
   } catch (e) {
-    modernServer === null || modernServer === void 0 ? void 0 : modernServer.close();
+    nodeServer === null || nodeServer === void 0 ? void 0 : nodeServer.close();
     process.stderr.write(e instanceof Error ? e.stack : e.toString());
   }
 });
+function getHtml(url, port) {
+  const headers = {
+    host: `localhost:${port}`
+  };
+  return new Promise((resolve, reject) => {
+    (0, import_http.request)(url, {
+      headers
+    }, (res) => {
+      let html = "";
+      res.on("error", (error) => {
+        reject(error);
+      });
+      res.on("data", (chunk) => {
+        html += chunk.toString();
+      });
+      res.on("end", () => {
+        resolve(html);
+      });
+    }).end();
+  });
+}

package/dist/esm/server/index.js

@@ -21,8 +21,13 @@ var createServer = function(api, ssgRoutes, pageRoutes, apiRoutes, options, appD
       options,
       renderRoutes: ssgRoutes,
       routes: total,
-      appDirectory,
-      plugins
+      appContext: {
+        apiDirectory: appContext.apiDirectory,
+        lambdaDirectory: appContext.lambdaDirectory,
+        appDirectory: appContext.appDirectory
+      },
+      plugins,
+      distDirectory: appContext.distDirectory
     }));
     var htmlChunks = [];
     var htmlAry = [];

package/dist/esm/server/process.js

@@ -1,14 +1,13 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import server from "@modern-js/prod-server";
+import { request } from "http";
 import portfinder from "portfinder";
-import { makeRender } from "../libs/make";
-import { compile as createRender } from "./prerender";
+import { createProdServer } from "@modern-js/prod-server";
 import { CLOSE_SIGN } from "./consts";
 process.on("message", function() {
   var _ref = _async_to_generator(function(chunk) {
-    var context, routes, renderRoutes, options, appDirectory, plugins, modernServer, serverOptions, defaultPort, port, e;
+    var context, routes, renderRoutes, options, appContext, plugins, distDirectory, nodeServer, serverConfig, defaultPort, port, serverOptions, e;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -16,8 +15,8 @@ process.on("message", function() {
             process.exit();
           }
           context = JSON.parse(chunk);
-          routes = context.routes, renderRoutes = context.renderRoutes, options = context.options, appDirectory = context.appDirectory, plugins = context.plugins;
-          modernServer = null;
+          routes = context.routes, renderRoutes = context.renderRoutes, options = context.options, appContext = context.appContext, plugins = context.plugins, distDirectory = context.distDirectory;
+          nodeServer = null;
           _state.label = 1;
         case 1:
           _state.trys.push([
@@ -26,8 +25,8 @@ process.on("message", function() {
             ,
             5
           ]);
-          serverOptions = options.server;
-          defaultPort = Number(process.env.PORT) || serverOptions.port;
+          serverConfig = options.server;
+          defaultPort = Number(process.env.PORT) || serverConfig.port;
           portfinder.basePort = defaultPort;
           return [
             4,
@@ -35,62 +34,57 @@ process.on("message", function() {
           ];
         case 2:
           port = _state.sent();
+          serverOptions = {
+            pwd: distDirectory,
+            config: options,
+            appContext,
+            routes,
+            staticGenerate: true,
+            internalPlugins: plugins
+          };
           return [
             4,
-            server({
-              pwd: appDirectory,
-              config: options,
-              routes,
-              staticGenerate: true,
-              internalPlugins: plugins
-            })
+            createProdServer(serverOptions)
           ];
         case 3:
-          modernServer = _state.sent();
-          modernServer.listen(port, function() {
-            var _ref2 = _async_to_generator(function(err) {
-              var render, renderPromiseAry, htmlAry;
-              return _ts_generator(this, function(_state2) {
-                switch (_state2.label) {
-                  case 0:
-                    if (err) {
-                      throw err;
-                    }
-                    if (!modernServer) {
-                      return [
-                        2
-                      ];
-                    }
-                    render = createRender(modernServer.getRequestHandler());
-                    renderPromiseAry = makeRender(renderRoutes, render, port);
-                    return [
-                      4,
-                      Promise.all(renderPromiseAry)
-                    ];
-                  case 1:
-                    htmlAry = _state2.sent();
-                    htmlAry.forEach(function(html) {
-                      process.send(html);
-                      process.send(null);
-                    });
-                    modernServer.close();
+          nodeServer = _state.sent();
+          nodeServer.listen(port, /* @__PURE__ */ _async_to_generator(function() {
+            var htmlAry;
+            return _ts_generator(this, function(_state2) {
+              switch (_state2.label) {
+                case 0:
+                  if (!nodeServer) {
                     return [
                       2
                     ];
-                }
-              });
+                  }
+                  return [
+                    4,
+                    Promise.all(renderRoutes.map(function(route) {
+                      var url = "http://localhost:".concat(port).concat(route.urlPath);
+                      return getHtml(url, port);
+                    }))
+                  ];
+                case 1:
+                  htmlAry = _state2.sent();
+                  htmlAry.forEach(function(html) {
+                    process.send(html);
+                    process.send(null);
+                  });
+                  nodeServer.close();
+                  return [
+                    2
+                  ];
+              }
             });
-            return function(err) {
-              return _ref2.apply(this, arguments);
-            };
-          }());
+          }));
           return [
             3,
             5
           ];
         case 4:
           e = _state.sent();
-          modernServer === null || modernServer === void 0 ? void 0 : modernServer.close();
+          nodeServer === null || nodeServer === void 0 ? void 0 : nodeServer.close();
           process.stderr.write(_instanceof(e, Error) ? e.stack : e.toString());
           return [
             3,
@@ -107,3 +101,24 @@ process.on("message", function() {
     return _ref.apply(this, arguments);
   };
 }());
+function getHtml(url, port) {
+  var headers = {
+    host: "localhost:".concat(port)
+  };
+  return new Promise(function(resolve, reject) {
+    request(url, {
+      headers
+    }, function(res) {
+      var html = "";
+      res.on("error", function(error) {
+        reject(error);
+      });
+      res.on("data", function(chunk) {
+        html += chunk.toString();
+      });
+      res.on("end", function() {
+        resolve(html);
+      });
+    }).end();
+  });
+}

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

@@ -18,8 +18,13 @@ const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirecto
     options,
     renderRoutes: ssgRoutes,
     routes: total,
-    appDirectory,
-    plugins
+    appContext: {
+      apiDirectory: appContext.apiDirectory,
+      lambdaDirectory: appContext.lambdaDirectory,
+      appDirectory: appContext.appDirectory
+    },
+    plugins,
+    distDirectory: appContext.distDirectory
   }));
   const htmlChunks = [];
   const htmlAry = [];

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

@@ -1,45 +1,65 @@
-import server from "@modern-js/prod-server";
+import { request } from "http";
 import portfinder from "portfinder";
-import { makeRender } from "../libs/make";
-import { compile as createRender } from "./prerender";
+import { createProdServer } from "@modern-js/prod-server";
 import { CLOSE_SIGN } from "./consts";
 process.on("message", async (chunk) => {
   if (chunk === CLOSE_SIGN) {
     process.exit();
   }
   const context = JSON.parse(chunk);
-  const { routes, renderRoutes, options, appDirectory, plugins } = context;
-  let modernServer = null;
+  const { routes, renderRoutes, options, appContext, plugins, distDirectory } = context;
+  let nodeServer = null;
   try {
-    const { server: serverOptions } = options;
-    const defaultPort = Number(process.env.PORT) || serverOptions.port;
+    const { server: serverConfig } = options;
+    const defaultPort = Number(process.env.PORT) || serverConfig.port;
     portfinder.basePort = defaultPort;
     const port = await portfinder.getPortPromise();
-    modernServer = await server({
-      pwd: appDirectory,
+    const serverOptions = {
+      pwd: distDirectory,
       config: options,
+      appContext,
       routes,
       staticGenerate: true,
       internalPlugins: plugins
-    });
-    modernServer.listen(port, async (err) => {
-      if (err) {
-        throw err;
-      }
-      if (!modernServer) {
+    };
+    nodeServer = await createProdServer(serverOptions);
+    nodeServer.listen(port, async () => {
+      if (!nodeServer) {
         return;
       }
-      const render = createRender(modernServer.getRequestHandler());
-      const renderPromiseAry = makeRender(renderRoutes, render, port);
-      const htmlAry = await Promise.all(renderPromiseAry);
+      const htmlAry = await Promise.all(renderRoutes.map((route) => {
+        const url = `http://localhost:${port}${route.urlPath}`;
+        return getHtml(url, port);
+      }));
       htmlAry.forEach((html) => {
         process.send(html);
         process.send(null);
       });
-      modernServer.close();
+      nodeServer.close();
     });
   } catch (e) {
-    modernServer === null || modernServer === void 0 ? void 0 : modernServer.close();
+    nodeServer === null || nodeServer === void 0 ? void 0 : nodeServer.close();
     process.stderr.write(e instanceof Error ? e.stack : e.toString());
   }
 });
+function getHtml(url, port) {
+  const headers = {
+    host: `localhost:${port}`
+  };
+  return new Promise((resolve, reject) => {
+    request(url, {
+      headers
+    }, (res) => {
+      let html = "";
+      res.on("error", (error) => {
+        reject(error);
+      });
+      res.on("data", (chunk) => {
+        html += chunk.toString();
+      });
+      res.on("end", () => {
+        resolve(html);
+      });
+    }).end();
+  });
+}

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

@@ -1,5 +1,4 @@
-/// <reference types="node/http" />
-/// <reference types="@modern-js/prod-server/src/type" />
+/// <reference types="node" />
 import { IncomingMessage, ServerResponse } from 'http';
 export type Options = {
     url: string;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.48.5",
+  "version": "2.49.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -63,7 +63,7 @@
     "normalize-path": "3.0.0",
     "portfinder": "^1.0.28",
     "@swc/helpers": "0.5.3",
-    "@modern-js/utils": "2.48.5"
+    "@modern-js/utils": "2.49.0"
   },
   "peerDependencies": {
     "react-router-dom": ">=5.1.2"
@@ -81,11 +81,11 @@
     "react-dom": "^18",
     "react-router-dom": "6.22.0",
     "typescript": "^5",
-    "@modern-js/app-tools": "2.48.5",
-    "@modern-js/prod-server": "2.48.5",
-    "@modern-js/types": "2.48.5",
-    "@scripts/build": "2.48.5",
-    "@scripts/jest-config": "2.48.5"
+    "@modern-js/app-tools": "2.49.0",
+    "@modern-js/prod-server": "2.49.0",
+    "@modern-js/types": "2.49.0",
+    "@scripts/jest-config": "2.49.0",
+    "@scripts/build": "2.49.0"
   },
   "sideEffects": false,
   "publishConfig": {