@modern-js/prod-server 2.67.3 → 2.67.5

package/dist/cjs/apply.js

@@ -48,6 +48,7 @@ async function applyPlugins(serverBase, options, nodeServer) {
     return c.html((0, import_server_core.createErrorHtml)(500), 500);
   });
   const loggerOptions = config.server.logger;
+  const { middlewares, renderMiddlewares } = options.serverConfig || {};
   const plugins = [
     ...nodeServer ? [
       (0, import_node.injectNodeSeverPlugin)({
@@ -59,6 +60,7 @@ async function applyPlugins(serverBase, options, nodeServer) {
       staticGenerate: options.staticGenerate,
       logger: loggerOptions === false ? false : getLogger(loggerOptions)
     }),
+    (0, import_server_core.injectConfigMiddlewarePlugin)(middlewares, renderMiddlewares),
     ...options.plugins || [],
     (0, import_node.injectResourcePlugin)(),
     (0, import_node.injectRscManifestPlugin)(),

package/dist/cjs/index.js

@@ -48,9 +48,13 @@ const createProdServer = async (options) => {
   if (serverCliConfig) {
     serverBaseOptions.config = serverCliConfig;
   }
-  const serverRuntimeConfig = await (0, import_node.loadServerRuntimeConfig)(options.pwd, options.serverConfigFile, options.serverConfigPath);
+  const serverRuntimeConfig = await (0, import_node.loadServerRuntimeConfig)(options.pwd, options.serverConfigFile, options.serverConfigPath, options.metaName);
   if (serverRuntimeConfig) {
     serverBaseOptions.serverConfig = serverRuntimeConfig;
+    serverBaseOptions.plugins = [
+      ...serverRuntimeConfig.plugins || [],
+      ...options.plugins || []
+    ];
   }
   const server = (0, import_server_core.createServerBase)(serverBaseOptions);
   const nodeServer = await (0, import_node.createNodeServer)(server.handle.bind(server));

package/dist/cjs/netlify.js

@@ -25,11 +25,19 @@ var import_server_core = require("@modern-js/server-core");
 var import_node = require("@modern-js/server-core/node");
 var import_apply = require("./apply");
 const createNetlifyFunction = async (options) => {
+  const serverBaseOptions = options;
   const serverCliConfig = (0, import_node.loadServerCliConfig)(options.pwd, options.config);
   if (serverCliConfig) {
     options.config = serverCliConfig;
   }
-  const server = (0, import_server_core.createServerBase)(options);
+  const serverRuntimeConfig = await (0, import_node.loadServerRuntimeConfig)(options.pwd, options.serverConfigFile, options.serverConfigPath, options.metaName);
+  if (serverRuntimeConfig) {
+    serverBaseOptions.plugins = [
+      ...serverRuntimeConfig.plugins || [],
+      ...options.plugins || []
+    ];
+  }
+  const server = (0, import_server_core.createServerBase)(serverBaseOptions);
   await (0, import_node.loadServerEnv)(options);
   await (0, import_apply.applyPlugins)(server, options);
   await server.init();

package/dist/esm/apply.js

@@ -1,7 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { ErrorDigest, createDefaultPlugins, createErrorHtml, faviconPlugin, onError, renderPlugin } from "@modern-js/server-core";
+import { ErrorDigest, createDefaultPlugins, createErrorHtml, faviconPlugin, injectConfigMiddlewarePlugin, onError, renderPlugin } from "@modern-js/server-core";
 import { injectNodeSeverPlugin, injectResourcePlugin, injectRscManifestPlugin, loadCacheConfig, serverStaticPlugin } from "@modern-js/server-core/node";
 import { createLogger, isProd } from "@modern-js/utils";
 function getLogger(_) {
@@ -18,7 +18,7 @@ function applyPlugins(serverBase, options, nodeServer) {
 }
 function _applyPlugins() {
   _applyPlugins = _async_to_generator(function(serverBase, options, nodeServer) {
-    var pwd, appContext, config, loadCachePwd, cacheConfig, loggerOptions, plugins;
+    var pwd, appContext, config, loadCachePwd, cacheConfig, loggerOptions, _ref, middlewares, renderMiddlewares, plugins;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -41,6 +41,7 @@ function _applyPlugins() {
             return c.html(createErrorHtml(500), 500);
           });
           loggerOptions = config.server.logger;
+          _ref = options.serverConfig || {}, middlewares = _ref.middlewares, renderMiddlewares = _ref.renderMiddlewares;
           plugins = _to_consumable_array(nodeServer ? [
             injectNodeSeverPlugin({
               nodeServer
@@ -49,7 +50,9 @@ function _applyPlugins() {
             cacheConfig,
             staticGenerate: options.staticGenerate,
             logger: loggerOptions === false ? false : getLogger(loggerOptions)
-          })), _to_consumable_array(options.plugins || []), [
+          })), [
+            injectConfigMiddlewarePlugin(middlewares, renderMiddlewares)
+          ], _to_consumable_array(options.plugins || []), [
             injectResourcePlugin(),
             injectRscManifestPlugin(),
             serverStaticPlugin(),

package/dist/esm/index.js

@@ -1,4 +1,5 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { createServerBase } from "@modern-js/server-core";
 import { createNodeServer, loadServerCliConfig, loadServerEnv, loadServerRuntimeConfig } from "@modern-js/server-core/node";
@@ -26,12 +27,13 @@ var createProdServer = function() {
           }
           return [
             4,
-            loadServerRuntimeConfig(options.pwd, options.serverConfigFile, options.serverConfigPath)
+            loadServerRuntimeConfig(options.pwd, options.serverConfigFile, options.serverConfigPath, options.metaName)
           ];
         case 2:
           serverRuntimeConfig = _state.sent();
           if (serverRuntimeConfig) {
             serverBaseOptions.serverConfig = serverRuntimeConfig;
+            serverBaseOptions.plugins = _to_consumable_array(serverRuntimeConfig.plugins || []).concat(_to_consumable_array(options.plugins || []));
           }
           server = createServerBase(serverBaseOptions);
           return [

package/dist/esm/netlify.js

@@ -1,36 +1,47 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { createServerBase } from "@modern-js/server-core";
-import { loadServerCliConfig, loadServerEnv } from "@modern-js/server-core/node";
+import { loadServerCliConfig, loadServerEnv, loadServerRuntimeConfig } from "@modern-js/server-core/node";
 import { applyPlugins } from "./apply";
 var createNetlifyFunction = function() {
   var _ref = _async_to_generator(function(options) {
-    var serverCliConfig, server;
+    var serverBaseOptions, serverCliConfig, serverRuntimeConfig, server;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
+          serverBaseOptions = options;
           serverCliConfig = loadServerCliConfig(options.pwd, options.config);
           if (serverCliConfig) {
             options.config = serverCliConfig;
           }
-          server = createServerBase(options);
           return [
             4,
-            loadServerEnv(options)
+            loadServerRuntimeConfig(options.pwd, options.serverConfigFile, options.serverConfigPath, options.metaName)
           ];
         case 1:
+          serverRuntimeConfig = _state.sent();
+          if (serverRuntimeConfig) {
+            serverBaseOptions.plugins = _to_consumable_array(serverRuntimeConfig.plugins || []).concat(_to_consumable_array(options.plugins || []));
+          }
+          server = createServerBase(serverBaseOptions);
+          return [
+            4,
+            loadServerEnv(options)
+          ];
+        case 2:
           _state.sent();
           return [
             4,
             applyPlugins(server, options)
           ];
-        case 2:
+        case 3:
           _state.sent();
           return [
             4,
             server.init()
           ];
-        case 3:
+        case 4:
           _state.sent();
           return [
             2,

package/dist/esm-node/apply.js

@@ -1,4 +1,4 @@
-import { ErrorDigest, createDefaultPlugins, createErrorHtml, faviconPlugin, onError, renderPlugin } from "@modern-js/server-core";
+import { ErrorDigest, createDefaultPlugins, createErrorHtml, faviconPlugin, injectConfigMiddlewarePlugin, onError, renderPlugin } from "@modern-js/server-core";
 import { injectNodeSeverPlugin, injectResourcePlugin, injectRscManifestPlugin, loadCacheConfig, serverStaticPlugin } from "@modern-js/server-core/node";
 import { createLogger, isProd } from "@modern-js/utils";
 function getLogger(_) {
@@ -25,6 +25,7 @@ async function applyPlugins(serverBase, options, nodeServer) {
     return c.html(createErrorHtml(500), 500);
   });
   const loggerOptions = config.server.logger;
+  const { middlewares, renderMiddlewares } = options.serverConfig || {};
   const plugins = [
     ...nodeServer ? [
       injectNodeSeverPlugin({
@@ -36,6 +37,7 @@ async function applyPlugins(serverBase, options, nodeServer) {
       staticGenerate: options.staticGenerate,
       logger: loggerOptions === false ? false : getLogger(loggerOptions)
     }),
+    injectConfigMiddlewarePlugin(middlewares, renderMiddlewares),
     ...options.plugins || [],
     injectResourcePlugin(),
     injectRscManifestPlugin(),

package/dist/esm-node/index.js

@@ -12,9 +12,13 @@ const createProdServer = async (options) => {
   if (serverCliConfig) {
     serverBaseOptions.config = serverCliConfig;
   }
-  const serverRuntimeConfig = await loadServerRuntimeConfig(options.pwd, options.serverConfigFile, options.serverConfigPath);
+  const serverRuntimeConfig = await loadServerRuntimeConfig(options.pwd, options.serverConfigFile, options.serverConfigPath, options.metaName);
   if (serverRuntimeConfig) {
     serverBaseOptions.serverConfig = serverRuntimeConfig;
+    serverBaseOptions.plugins = [
+      ...serverRuntimeConfig.plugins || [],
+      ...options.plugins || []
+    ];
   }
   const server = createServerBase(serverBaseOptions);
   const nodeServer = await createNodeServer(server.handle.bind(server));

package/dist/esm-node/netlify.js

@@ -1,12 +1,20 @@
 import { createServerBase } from "@modern-js/server-core";
-import { loadServerCliConfig, loadServerEnv } from "@modern-js/server-core/node";
+import { loadServerCliConfig, loadServerEnv, loadServerRuntimeConfig } from "@modern-js/server-core/node";
 import { applyPlugins } from "./apply";
 const createNetlifyFunction = async (options) => {
+  const serverBaseOptions = options;
   const serverCliConfig = loadServerCliConfig(options.pwd, options.config);
   if (serverCliConfig) {
     options.config = serverCliConfig;
   }
-  const server = createServerBase(options);
+  const serverRuntimeConfig = await loadServerRuntimeConfig(options.pwd, options.serverConfigFile, options.serverConfigPath, options.metaName);
+  if (serverRuntimeConfig) {
+    serverBaseOptions.plugins = [
+      ...serverRuntimeConfig.plugins || [],
+      ...options.plugins || []
+    ];
+  }
+  const server = createServerBase(serverBaseOptions);
   await loadServerEnv(options);
   await applyPlugins(server, options);
   await server.init();

package/dist/types/index.d.ts

@@ -7,6 +7,6 @@ export { loadServerPlugins, loadServerRuntimeConfig, } from '@modern-js/server-c
 export type { ServerPluginLegacy, ServerPlugin } from '@modern-js/server-core';
 export type { ProdServerOptions, BaseEnv } from './types';
 export declare const createProdServer: (options: ProdServerOptions) => Promise<(import("http2").Http2SecureServer | import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse> | import("https").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>) & {
-    getRequestListener: () => (req: any, res: any) => Promise<void>;
+    getRequestListener: () => (req: import("@modern-js/types").NodeRequest, res: import("@modern-js/types").NodeResponse) => Promise<void>;
     getRequestHandler: () => import("@modern-js/server-core/dist/types/types").RequestHandler;
 }>;

package/dist/types/types.d.ts

@@ -4,10 +4,10 @@ import type { Logger } from '@modern-js/utils';
 interface ProdServerExtraOptions {
     /** compat modern.server-runtime.config.ts */
     serverConfigFile?: string;
-    serverConfigPath?: string;
+    serverConfigPath: string;
     plugins?: (ServerPlugin | ServerPluginLegacy)[];
 }
-export type ProdServerOptions = Exclude<ServerBaseOptions, 'serverConfig'> & ProdServerExtraOptions & CreateDefaultPluginsOptions;
+export type ProdServerOptions = ServerBaseOptions & ProdServerExtraOptions & CreateDefaultPluginsOptions;
 export type BaseEnv = {
     Variables: {
         logger: Logger;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.67.3",
+  "version": "2.67.5",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -40,11 +40,11 @@
     }
   },
   "dependencies": {
-    "@swc/helpers": "0.5.13",
+    "@swc/helpers": "^0.5.17",
     "source-map-support": "0.5.21",
-    "@modern-js/runtime-utils": "2.67.3",
-    "@modern-js/utils": "2.67.3",
-    "@modern-js/server-core": "2.67.3"
+    "@modern-js/runtime-utils": "2.67.5",
+    "@modern-js/server-core": "2.67.5",
+    "@modern-js/utils": "2.67.5"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -55,7 +55,7 @@
     "lint-staged": "~13.3.0",
     "tsx": "^3.12.7",
     "typescript": "~5.0.4",
-    "@modern-js/types": "2.67.3",
+    "@modern-js/types": "2.67.5",
     "@scripts/build": "2.66.0",
     "@scripts/jest-config": "2.66.0"
   },