@modern-js/plugin-ssg 2.58.1 → 2.58.3

package/dist/cjs/index.js

@@ -35,11 +35,11 @@ module.exports = __toCommonJS(src_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_react_router_dom = require("react-router-dom");
-var import_util = require("./libs/util");
-var import_server = require("./server");
+var import_make = require("./libs/make");
 var import_output = require("./libs/output");
 var import_replace = require("./libs/replace");
-var import_make = require("./libs/make");
+var import_util = require("./libs/util");
+var import_server = require("./server");
 const ssgPlugin = () => ({
   name: "@modern-js/plugin-ssg",
   pre: [

package/dist/cjs/server/process.js

@@ -22,8 +22,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var import_http = require("http");
-var import_portfinder = __toESM(require("portfinder"));
 var import_prod_server = require("@modern-js/prod-server");
+var import_portfinder = __toESM(require("portfinder"));
 var import_consts = require("./consts");
 process.on("message", async (chunk) => {
   if (chunk === import_consts.CLOSE_SIGN) {
@@ -42,7 +42,7 @@ process.on("message", async (chunk) => {
       config: options,
       appContext,
       routes,
-      plugins: (0, import_prod_server.loadServerPlugins)(plugins, appContext.appDirectory || distDirectory),
+      plugins: await (0, import_prod_server.loadServerPlugins)(plugins, appContext.appDirectory || distDirectory),
       staticGenerate: true
     };
     nodeServer = await (0, import_prod_server.createProdServer)(serverOptions);

package/dist/esm/index.js

@@ -5,11 +5,11 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { filterRoutesForServer, logger } from "@modern-js/utils";
 import { generatePath } from "react-router-dom";
-import { flattenRoutes, formatOutput, isDynamicUrl, readJSONSpec, standardOptions, writeJSONSpec } from "./libs/util";
-import { createServer } from "./server";
+import { makeRoute } from "./libs/make";
 import { writeHtmlFile } from "./libs/output";
 import { replaceRoute } from "./libs/replace";
-import { makeRoute } from "./libs/make";
+import { flattenRoutes, formatOutput, isDynamicUrl, readJSONSpec, standardOptions, writeJSONSpec } from "./libs/util";
+import { createServer } from "./server";
 var ssgPlugin = function() {
   return {
     name: "@modern-js/plugin-ssg",

package/dist/esm/libs/util.js

@@ -1,7 +1,7 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import path from "path";
-import { ROUTE_SPEC_FILE, fs, isSingleEntry, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils";
+import { fs, ROUTE_SPEC_FILE, SERVER_BUNDLE_DIRECTORY, isSingleEntry } from "@modern-js/utils";
 function formatOutput(filename) {
   var outputPath = path.extname(filename) ? filename : "".concat(filename, "/index.html");
   return outputPath;

package/dist/esm/server/process.js

@@ -2,12 +2,12 @@ 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 { request } from "http";
-import portfinder from "portfinder";
 import { createProdServer, loadServerPlugins } from "@modern-js/prod-server";
+import portfinder from "portfinder";
 import { CLOSE_SIGN } from "./consts";
 process.on("message", function() {
   var _ref = _async_to_generator(function(chunk) {
-    var context, routes, renderRoutes, options, appContext, plugins, distDirectory, nodeServer, serverConfig, defaultPort, port, serverOptions, e;
+    var context, routes, renderRoutes, options, appContext, plugins, distDirectory, nodeServer, serverConfig, defaultPort, port, serverOptions, _tmp, e;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -21,9 +21,9 @@ process.on("message", function() {
         case 1:
           _state.trys.push([
             1,
-            4,
+            5,
             ,
-            5
+            6
           ]);
           serverConfig = options.server;
           defaultPort = Number(process.env.PORT) || serverConfig.port;
@@ -34,19 +34,23 @@ process.on("message", function() {
           ];
         case 2:
           port = _state.sent();
-          serverOptions = {
+          _tmp = {
             pwd: distDirectory,
             config: options,
             appContext,
-            routes,
-            plugins: loadServerPlugins(plugins, appContext.appDirectory || distDirectory),
-            staticGenerate: true
+            routes
           };
           return [
             4,
-            createProdServer(serverOptions)
+            loadServerPlugins(plugins, appContext.appDirectory || distDirectory)
           ];
         case 3:
+          serverOptions = (_tmp.plugins = _state.sent(), _tmp.staticGenerate = true, _tmp);
+          return [
+            4,
+            createProdServer(serverOptions)
+          ];
+        case 4:
           nodeServer = _state.sent();
           nodeServer.listen(port, /* @__PURE__ */ _async_to_generator(function() {
             var htmlAry;
@@ -80,17 +84,17 @@ process.on("message", function() {
           }));
           return [
             3,
-            5
+            6
           ];
-        case 4:
+        case 5:
           e = _state.sent();
           nodeServer === null || nodeServer === void 0 ? void 0 : nodeServer.close();
           process.stderr.write(_instanceof(e, Error) ? e.stack : e.toString());
           return [
             3,
-            5
+            6
           ];
-        case 5:
+        case 6:
           return [
             2
           ];

package/dist/esm-node/index.js

@@ -1,11 +1,11 @@
 import path from "path";
 import { filterRoutesForServer, logger } from "@modern-js/utils";
 import { generatePath } from "react-router-dom";
-import { flattenRoutes, formatOutput, isDynamicUrl, readJSONSpec, standardOptions, writeJSONSpec } from "./libs/util";
-import { createServer } from "./server";
+import { makeRoute } from "./libs/make";
 import { writeHtmlFile } from "./libs/output";
 import { replaceRoute } from "./libs/replace";
-import { makeRoute } from "./libs/make";
+import { flattenRoutes, formatOutput, isDynamicUrl, readJSONSpec, standardOptions, writeJSONSpec } from "./libs/util";
+import { createServer } from "./server";
 const ssgPlugin = () => ({
   name: "@modern-js/plugin-ssg",
   pre: [

package/dist/esm-node/libs/util.js

@@ -1,5 +1,5 @@
 import path from "path";
-import { ROUTE_SPEC_FILE, fs, isSingleEntry, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils";
+import { fs, ROUTE_SPEC_FILE, SERVER_BUNDLE_DIRECTORY, isSingleEntry } from "@modern-js/utils";
 function formatOutput(filename) {
   const outputPath = path.extname(filename) ? filename : `${filename}/index.html`;
   return outputPath;

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

@@ -1,6 +1,6 @@
 import { request } from "http";
-import portfinder from "portfinder";
 import { createProdServer, loadServerPlugins } from "@modern-js/prod-server";
+import portfinder from "portfinder";
 import { CLOSE_SIGN } from "./consts";
 process.on("message", async (chunk) => {
   if (chunk === CLOSE_SIGN) {
@@ -19,7 +19,7 @@ process.on("message", async (chunk) => {
       config: options,
       appContext,
       routes,
-      plugins: loadServerPlugins(plugins, appContext.appDirectory || distDirectory),
+      plugins: await loadServerPlugins(plugins, appContext.appDirectory || distDirectory),
       staticGenerate: true
     };
     nodeServer = await createProdServer(serverOptions);

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

@@ -1,5 +1,5 @@
-import { ServerRoute as ModernRoute } from '@modern-js/types';
-import { compile } from '../server/prerender';
-import { SSGRouteOptions, SsgRoute } from '../types';
+import type { ServerRoute as ModernRoute } from '@modern-js/types';
+import type { compile } from '../server/prerender';
+import type { SSGRouteOptions, SsgRoute } from '../types';
 export declare function makeRender(ssgRoutes: SsgRoute[], render: ReturnType<typeof compile>, port: number): Promise<string>[];
 export declare function makeRoute(baseRoute: ModernRoute, route: string | SSGRouteOptions, headers?: Record<string, any>): SsgRoute;

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

@@ -1,2 +1,2 @@
-import { SsgRoute } from '../types';
+import type { SsgRoute } from '../types';
 export declare function writeHtmlFile(htmlAry: string[], ssgRoutes: SsgRoute[], baseDir: string): void;

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

@@ -1,4 +1,4 @@
-import { ServerRoute as ModernRoute } from '@modern-js/types';
-import { SsgRoute } from '../types';
+import type { ServerRoute as ModernRoute } from '@modern-js/types';
+import type { SsgRoute } from '../types';
 export declare function exist(route: ModernRoute, pageRoutes: ModernRoute[]): number;
 export declare function replaceRoute(ssgRoutes: SsgRoute[], pageRoutes: ModernRoute[]): ModernRoute[];

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

@@ -1,6 +1,6 @@
-import { ServerRoute as ModernRoute } from '@modern-js/types';
-import { ServerUserConfig } from '@modern-js/app-tools';
-import { SsgRoute, SSGConfig, EntryPoint, SSGMultiEntryOptions, AgreedRoute } from '../types';
+import type { ServerUserConfig } from '@modern-js/app-tools';
+import type { ServerRoute as ModernRoute } from '@modern-js/types';
+import type { AgreedRoute, EntryPoint, SSGConfig, SSGMultiEntryOptions, SsgRoute } from '../types';
 export declare function formatOutput(filename: string): string;
 export declare function formatPath(str: string): string;
 export declare function isDynamicUrl(url: string): boolean;

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

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

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

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

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/types';
+import type { SSGConfig, SSGMultiEntryOptions, SSGRouteOptions, SSGSingleEntryOptions } from '@modern-js/types';
 export type { SSGConfig, SSGRouteOptions, SSGMultiEntryOptions, SSGSingleEntryOptions, };
 export type AgreedRoute = {
     path?: string;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.1",
+  "version": "2.58.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -63,8 +63,8 @@
     "node-mocks-http": "^1.11.0",
     "normalize-path": "3.0.0",
     "portfinder": "^1.0.28",
-    "@modern-js/prod-server": "2.58.1",
-    "@modern-js/utils": "2.58.1"
+    "@modern-js/prod-server": "2.58.3",
+    "@modern-js/utils": "2.58.3"
   },
   "peerDependencies": {
     "react-router-dom": ">=5.1.2"
@@ -82,10 +82,10 @@
     "react-dom": "^18",
     "react-router-dom": "6.22.0",
     "typescript": "^5",
-    "@modern-js/types": "2.58.1",
-    "@modern-js/app-tools": "2.58.1",
-    "@scripts/jest-config": "2.58.1",
-    "@scripts/build": "2.58.1"
+    "@modern-js/app-tools": "2.58.3",
+    "@scripts/build": "2.58.3",
+    "@scripts/jest-config": "2.58.3",
+    "@modern-js/types": "2.58.3"
   },
   "sideEffects": false,
   "publishConfig": {