@modern-js/prod-server 2.54.2 → 2.54.3

package/dist/cjs/index.js

@@ -20,8 +20,8 @@ var src_exports = {};
 __export(src_exports, {
   applyPlugins: () => import_apply2.applyPlugins,
   createProdServer: () => createProdServer,
-  loadServerConfig: () => import_node2.loadServerConfig,
-  loadServerPlugins: () => import_node2.loadServerPlugins
+  loadServerPlugins: () => import_node2.loadServerPlugins,
+  loadServerRuntimeConfig: () => import_node2.loadServerRuntimeConfig
 });
 module.exports = __toCommonJS(src_exports);
 var import_node = require("@modern-js/server-core/node");
@@ -31,10 +31,14 @@ var import_apply2 = require("./apply");
 var import_node2 = require("@modern-js/server-core/node");
 const createProdServer = async (options) => {
   await (0, import_node.loadServerEnv)(options);
-  const serverConfig = (0, import_node.loadServerConfig)(options.pwd, options.serverConfigFile, options.serverConfigPath);
   const serverBaseOptions = options;
-  if (serverConfig) {
-    serverBaseOptions.serverConfig = serverConfig;
+  const serverCliConfig = process.env.NODE_ENV === "production" ? (0, import_node.loadServerCliConfig)(options.pwd, options.config) : options.config;
+  if (serverCliConfig) {
+    serverBaseOptions.config = serverCliConfig;
+  }
+  const serverRuntimeConfig = (0, import_node.loadServerRuntimeConfig)(options.pwd, options.serverConfigFile, options.serverConfigPath);
+  if (serverRuntimeConfig) {
+    serverBaseOptions.serverConfig = serverRuntimeConfig;
   }
   const server = (0, import_server_core.createServerBase)(serverBaseOptions);
   const nodeServer = await (0, import_node.createNodeServer)(server.handle.bind(server));
@@ -46,6 +50,6 @@ const createProdServer = async (options) => {
 0 && (module.exports = {
   applyPlugins,
   createProdServer,
-  loadServerConfig,
-  loadServerPlugins
+  loadServerPlugins,
+  loadServerRuntimeConfig
 });

package/dist/cjs/netlify.js

@@ -25,6 +25,10 @@ var import_node = require("@modern-js/server-core/node");
 var import_server_core = require("@modern-js/server-core");
 var import_apply = require("./apply");
 const createNetlifyFunction = async (options) => {
+  const serverCliConfig = (0, import_node.loadServerCliConfig)(options.pwd, options.config);
+  if (serverCliConfig) {
+    options.config = serverCliConfig;
+  }
   const server = (0, import_server_core.createServerBase)(options);
   await (0, import_node.loadServerEnv)(options);
   await (0, import_apply.applyPlugins)(server, options);

package/dist/esm/index.js

@@ -1,13 +1,13 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { createNodeServer, loadServerConfig, loadServerEnv } from "@modern-js/server-core/node";
+import { createNodeServer, loadServerRuntimeConfig, loadServerCliConfig, loadServerEnv } from "@modern-js/server-core/node";
 import { createServerBase } from "@modern-js/server-core";
 import { applyPlugins } from "./apply";
 import { applyPlugins as applyPlugins2 } from "./apply";
-import { loadServerPlugins, loadServerConfig as loadServerConfig2 } from "@modern-js/server-core/node";
+import { loadServerPlugins, loadServerRuntimeConfig as loadServerRuntimeConfig2 } from "@modern-js/server-core/node";
 var createProdServer = function() {
   var _ref = _async_to_generator(function(options) {
-    var serverConfig, serverBaseOptions, server, nodeServer;
+    var serverBaseOptions, serverCliConfig, serverRuntimeConfig, server, nodeServer;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -17,10 +17,14 @@ var createProdServer = function() {
           ];
         case 1:
           _state.sent();
-          serverConfig = loadServerConfig(options.pwd, options.serverConfigFile, options.serverConfigPath);
           serverBaseOptions = options;
-          if (serverConfig) {
-            serverBaseOptions.serverConfig = serverConfig;
+          serverCliConfig = process.env.NODE_ENV === "production" ? loadServerCliConfig(options.pwd, options.config) : options.config;
+          if (serverCliConfig) {
+            serverBaseOptions.config = serverCliConfig;
+          }
+          serverRuntimeConfig = loadServerRuntimeConfig(options.pwd, options.serverConfigFile, options.serverConfigPath);
+          if (serverRuntimeConfig) {
+            serverBaseOptions.serverConfig = serverRuntimeConfig;
           }
           server = createServerBase(serverBaseOptions);
           return [
@@ -55,6 +59,6 @@ var createProdServer = function() {
 export {
   applyPlugins2 as applyPlugins,
   createProdServer,
-  loadServerConfig2 as loadServerConfig,
-  loadServerPlugins
+  loadServerPlugins,
+  loadServerRuntimeConfig2 as loadServerRuntimeConfig
 };

package/dist/esm/netlify.js

@@ -1,14 +1,18 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { loadServerEnv } from "@modern-js/server-core/node";
+import { loadServerCliConfig, loadServerEnv } from "@modern-js/server-core/node";
 import { createServerBase } from "@modern-js/server-core";
 import { applyPlugins } from "./apply";
 var createNetlifyFunction = function() {
   var _ref = _async_to_generator(function(options) {
-    var server;
+    var serverCliConfig, server;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
+          serverCliConfig = loadServerCliConfig(options.pwd, options.config);
+          if (serverCliConfig) {
+            options.config = serverCliConfig;
+          }
           server = createServerBase(options);
           return [
             4,

package/dist/esm-node/index.js

@@ -1,14 +1,18 @@
-import { createNodeServer, loadServerConfig, loadServerEnv } from "@modern-js/server-core/node";
+import { createNodeServer, loadServerRuntimeConfig, loadServerCliConfig, loadServerEnv } from "@modern-js/server-core/node";
 import { createServerBase } from "@modern-js/server-core";
 import { applyPlugins } from "./apply";
 import { applyPlugins as applyPlugins2 } from "./apply";
-import { loadServerPlugins, loadServerConfig as loadServerConfig2 } from "@modern-js/server-core/node";
+import { loadServerPlugins, loadServerRuntimeConfig as loadServerRuntimeConfig2 } from "@modern-js/server-core/node";
 const createProdServer = async (options) => {
   await loadServerEnv(options);
-  const serverConfig = loadServerConfig(options.pwd, options.serverConfigFile, options.serverConfigPath);
   const serverBaseOptions = options;
-  if (serverConfig) {
-    serverBaseOptions.serverConfig = serverConfig;
+  const serverCliConfig = process.env.NODE_ENV === "production" ? loadServerCliConfig(options.pwd, options.config) : options.config;
+  if (serverCliConfig) {
+    serverBaseOptions.config = serverCliConfig;
+  }
+  const serverRuntimeConfig = loadServerRuntimeConfig(options.pwd, options.serverConfigFile, options.serverConfigPath);
+  if (serverRuntimeConfig) {
+    serverBaseOptions.serverConfig = serverRuntimeConfig;
   }
   const server = createServerBase(serverBaseOptions);
   const nodeServer = await createNodeServer(server.handle.bind(server));
@@ -19,6 +23,6 @@ const createProdServer = async (options) => {
 export {
   applyPlugins2 as applyPlugins,
   createProdServer,
-  loadServerConfig2 as loadServerConfig,
-  loadServerPlugins
+  loadServerPlugins,
+  loadServerRuntimeConfig2 as loadServerRuntimeConfig
 };

package/dist/esm-node/netlify.js

@@ -1,7 +1,11 @@
-import { loadServerEnv } from "@modern-js/server-core/node";
+import { loadServerCliConfig, loadServerEnv } from "@modern-js/server-core/node";
 import { createServerBase } from "@modern-js/server-core";
 import { applyPlugins } from "./apply";
 const createNetlifyFunction = async (options) => {
+  const serverCliConfig = loadServerCliConfig(options.pwd, options.config);
+  if (serverCliConfig) {
+    options.config = serverCliConfig;
+  }
   const server = createServerBase(options);
   await loadServerEnv(options);
   await applyPlugins(server, options);

package/dist/types/index.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 import { ProdServerOptions } from './types';
 export { applyPlugins, type ApplyPlugins } from './apply';
-export { loadServerPlugins, loadServerConfig, } from '@modern-js/server-core/node';
+export { loadServerPlugins, loadServerRuntimeConfig, } from '@modern-js/server-core/node';
 export type { ServerPlugin } from '@modern-js/server-core';
 export type { ProdServerOptions, BaseEnv } from './types';
 export declare const createProdServer: (options: ProdServerOptions) => Promise<(import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse> | import("https").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>) & {

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.54.2",
+  "version": "2.54.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -41,9 +41,9 @@
   },
   "dependencies": {
     "@swc/helpers": "0.5.3",
-    "@modern-js/server-core": "2.54.2",
-    "@modern-js/runtime-utils": "2.54.2",
-    "@modern-js/utils": "2.54.2"
+    "@modern-js/server-core": "2.54.3",
+    "@modern-js/utils": "2.54.3",
+    "@modern-js/runtime-utils": "2.54.3"
   },
   "devDependencies": {
     "@types/merge-deep": "^3.0.0",
@@ -56,10 +56,10 @@
     "tsx": "^3.12.7",
     "@types/jest": "^29",
     "typescript": "~5.0.4",
-    "@modern-js/eslint-config": "2.54.2",
-    "@scripts/build": "2.54.2",
-    "@modern-js/types": "2.54.2",
-    "@scripts/jest-config": "2.54.2"
+    "@scripts/build": "2.54.3",
+    "@modern-js/types": "2.54.3",
+    "@scripts/jest-config": "2.54.3",
+    "@modern-js/eslint-config": "2.54.3"
   },
   "sideEffects": [],
   "engines": {