@modern-js/server-core 2.54.2 → 2.54.3

package/dist/cjs/adapters/node/helper/index.js

@@ -19,9 +19,10 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var helper_exports = {};
 __export(helper_exports, {
   loadCacheConfig: () => import_loadCache.loadCacheConfig,
-  loadServerConfig: () => import_loadConfig.loadServerConfig,
+  loadServerCliConfig: () => import_loadConfig.loadServerCliConfig,
   loadServerEnv: () => import_loadEnv.loadServerEnv,
-  loadServerPlugins: () => import_loadPlugin.loadServerPlugins
+  loadServerPlugins: () => import_loadPlugin.loadServerPlugins,
+  loadServerRuntimeConfig: () => import_loadConfig.loadServerRuntimeConfig
 });
 module.exports = __toCommonJS(helper_exports);
 var import_loadEnv = require("./loadEnv");
@@ -31,7 +32,8 @@ var import_loadCache = require("./loadCache");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   loadCacheConfig,
-  loadServerConfig,
+  loadServerCliConfig,
   loadServerEnv,
-  loadServerPlugins
+  loadServerPlugins,
+  loadServerRuntimeConfig
 });

package/dist/cjs/adapters/node/helper/loadConfig.js

@@ -28,7 +28,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var loadConfig_exports = {};
 __export(loadConfig_exports, {
-  loadServerConfig: () => loadServerConfig
+  loadServerCliConfig: () => loadServerCliConfig,
+  loadServerRuntimeConfig: () => loadServerRuntimeConfig
 });
 module.exports = __toCommonJS(loadConfig_exports);
 var import_path = __toESM(require("path"));
@@ -51,7 +52,7 @@ function loadServerConfigOld(pwd, configFile) {
   const serverConfig = requireConfig(serverConfigPath);
   return serverConfig;
 }
-function loadServerConfig(pwd, oldServerFile = import_utils.DEFAULT_SERVER_CONFIG, newServerConfigPath) {
+function loadServerRuntimeConfig(pwd, oldServerFile = import_utils.DEFAULT_SERVER_CONFIG, newServerConfigPath) {
   const newServerConfig = newServerConfigPath && loadServerConfigNew(newServerConfigPath);
   if (newServerConfig) {
     return newServerConfig;
@@ -59,7 +60,29 @@ function loadServerConfig(pwd, oldServerFile = import_utils.DEFAULT_SERVER_CONFI
   const oldServerConfig = loadServerConfigOld(pwd, oldServerFile);
   return oldServerConfig;
 }
+function loadServerCliConfig(pwd, defaultConfig = {}) {
+  var _defaultConfig_output;
+  const cliConfigPath = (0, import_utils.ensureAbsolutePath)(pwd, import_path.default.join(((_defaultConfig_output = defaultConfig.output) === null || _defaultConfig_output === void 0 ? void 0 : _defaultConfig_output.path) || "dist", import_utils.OUTPUT_CONFIG_FILE));
+  let cliConfig = {
+    output: {},
+    source: {},
+    tools: {},
+    server: {},
+    security: {},
+    runtime: {},
+    bff: {},
+    html: {},
+    dev: {}
+  };
+  try {
+    cliConfig = require(cliConfigPath);
+  } catch (_2) {
+  }
+  const mergedCliConfig = import_utils.lodash.merge(defaultConfig, cliConfig);
+  return mergedCliConfig;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  loadServerConfig
+  loadServerCliConfig,
+  loadServerRuntimeConfig
 });

package/dist/cjs/adapters/node/index.js

@@ -27,9 +27,10 @@ __export(node_exports, {
   injectNodeSeverPlugin: () => import_plugins.injectNodeSeverPlugin,
   injectResourcePlugin: () => import_plugins.injectResourcePlugin,
   loadCacheConfig: () => import_helper.loadCacheConfig,
-  loadServerConfig: () => import_helper.loadServerConfig,
+  loadServerCliConfig: () => import_helper.loadServerCliConfig,
   loadServerEnv: () => import_helper.loadServerEnv,
   loadServerPlugins: () => import_helper.loadServerPlugins,
+  loadServerRuntimeConfig: () => import_helper.loadServerRuntimeConfig,
   sendResponse: () => import_node.sendResponse,
   serverStaticPlugin: () => import_plugins.serverStaticPlugin,
   writeReadableStreamToWritable: () => import_node.writeReadableStreamToWritable
@@ -50,9 +51,10 @@ var import_helper = require("./helper");
   injectNodeSeverPlugin,
   injectResourcePlugin,
   loadCacheConfig,
-  loadServerConfig,
+  loadServerCliConfig,
   loadServerEnv,
   loadServerPlugins,
+  loadServerRuntimeConfig,
   sendResponse,
   serverStaticPlugin,
   writeReadableStreamToWritable

package/dist/esm/adapters/node/helper/index.js

@@ -1,10 +1,11 @@
 import { loadServerEnv } from "./loadEnv";
 import { loadServerPlugins } from "./loadPlugin";
-import { loadServerConfig } from "./loadConfig";
+import { loadServerRuntimeConfig, loadServerCliConfig } from "./loadConfig";
 import { loadCacheConfig } from "./loadCache";
 export {
   loadCacheConfig,
-  loadServerConfig,
+  loadServerCliConfig,
   loadServerEnv,
-  loadServerPlugins
+  loadServerPlugins,
+  loadServerRuntimeConfig
 };

package/dist/esm/adapters/node/helper/loadConfig.js

@@ -1,5 +1,5 @@
 import path from "path";
-import { compatRequire, fs, DEFAULT_SERVER_CONFIG, requireExistModule } from "@modern-js/utils";
+import { compatRequire, fs, DEFAULT_SERVER_CONFIG, requireExistModule, ensureAbsolutePath, OUTPUT_CONFIG_FILE, lodash as _ } from "@modern-js/utils";
 var requireConfig = function(serverConfigPath) {
   if (fs.pathExistsSync(serverConfigPath)) {
     return compatRequire(serverConfigPath);
@@ -18,7 +18,7 @@ function loadServerConfigOld(pwd, configFile) {
   var serverConfig = requireConfig(serverConfigPath);
   return serverConfig;
 }
-function loadServerConfig(pwd) {
+function loadServerRuntimeConfig(pwd) {
   var oldServerFile = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : DEFAULT_SERVER_CONFIG, newServerConfigPath = arguments.length > 2 ? arguments[2] : void 0;
   var newServerConfig = newServerConfigPath && loadServerConfigNew(newServerConfigPath);
   if (newServerConfig) {
@@ -27,6 +27,29 @@ function loadServerConfig(pwd) {
   var oldServerConfig = loadServerConfigOld(pwd, oldServerFile);
   return oldServerConfig;
 }
+function loadServerCliConfig(pwd) {
+  var defaultConfig = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+  var _defaultConfig_output;
+  var cliConfigPath = ensureAbsolutePath(pwd, path.join(((_defaultConfig_output = defaultConfig.output) === null || _defaultConfig_output === void 0 ? void 0 : _defaultConfig_output.path) || "dist", OUTPUT_CONFIG_FILE));
+  var cliConfig = {
+    output: {},
+    source: {},
+    tools: {},
+    server: {},
+    security: {},
+    runtime: {},
+    bff: {},
+    html: {},
+    dev: {}
+  };
+  try {
+    cliConfig = require(cliConfigPath);
+  } catch (_2) {
+  }
+  var mergedCliConfig = _.merge(defaultConfig, cliConfig);
+  return mergedCliConfig;
+}
 export {
-  loadServerConfig
+  loadServerCliConfig,
+  loadServerRuntimeConfig
 };

package/dist/esm/adapters/node/index.js

@@ -1,7 +1,7 @@
 import { httpCallBack2HonoMid, connectMid2HonoMid } from "./hono";
 import { createNodeServer, sendResponse, createWebRequest, writeReadableStreamToWritable } from "./node";
 import { serverStaticPlugin, injectResourcePlugin, getHtmlTemplates, getServerManifest, injectNodeSeverPlugin } from "./plugins";
-import { loadServerPlugins, loadServerEnv, loadServerConfig, loadCacheConfig } from "./helper";
+import { loadServerPlugins, loadServerEnv, loadServerRuntimeConfig, loadServerCliConfig, loadCacheConfig } from "./helper";
 export {
   connectMid2HonoMid,
   createNodeServer,
@@ -12,9 +12,10 @@ export {
   injectNodeSeverPlugin,
   injectResourcePlugin,
   loadCacheConfig,
-  loadServerConfig,
+  loadServerCliConfig,
   loadServerEnv,
   loadServerPlugins,
+  loadServerRuntimeConfig,
   sendResponse,
   serverStaticPlugin,
   writeReadableStreamToWritable

package/dist/esm-node/adapters/node/helper/index.js

@@ -1,10 +1,11 @@
 import { loadServerEnv } from "./loadEnv";
 import { loadServerPlugins } from "./loadPlugin";
-import { loadServerConfig } from "./loadConfig";
+import { loadServerRuntimeConfig, loadServerCliConfig } from "./loadConfig";
 import { loadCacheConfig } from "./loadCache";
 export {
   loadCacheConfig,
-  loadServerConfig,
+  loadServerCliConfig,
   loadServerEnv,
-  loadServerPlugins
+  loadServerPlugins,
+  loadServerRuntimeConfig
 };

package/dist/esm-node/adapters/node/helper/loadConfig.js

@@ -1,5 +1,5 @@
 import path from "path";
-import { compatRequire, fs, DEFAULT_SERVER_CONFIG, requireExistModule } from "@modern-js/utils";
+import { compatRequire, fs, DEFAULT_SERVER_CONFIG, requireExistModule, ensureAbsolutePath, OUTPUT_CONFIG_FILE, lodash as _ } from "@modern-js/utils";
 const requireConfig = (serverConfigPath) => {
   if (fs.pathExistsSync(serverConfigPath)) {
     return compatRequire(serverConfigPath);
@@ -18,7 +18,7 @@ function loadServerConfigOld(pwd, configFile) {
   const serverConfig = requireConfig(serverConfigPath);
   return serverConfig;
 }
-function loadServerConfig(pwd, oldServerFile = DEFAULT_SERVER_CONFIG, newServerConfigPath) {
+function loadServerRuntimeConfig(pwd, oldServerFile = DEFAULT_SERVER_CONFIG, newServerConfigPath) {
   const newServerConfig = newServerConfigPath && loadServerConfigNew(newServerConfigPath);
   if (newServerConfig) {
     return newServerConfig;
@@ -26,6 +26,28 @@ function loadServerConfig(pwd, oldServerFile = DEFAULT_SERVER_CONFIG, newServerC
   const oldServerConfig = loadServerConfigOld(pwd, oldServerFile);
   return oldServerConfig;
 }
+function loadServerCliConfig(pwd, defaultConfig = {}) {
+  var _defaultConfig_output;
+  const cliConfigPath = ensureAbsolutePath(pwd, path.join(((_defaultConfig_output = defaultConfig.output) === null || _defaultConfig_output === void 0 ? void 0 : _defaultConfig_output.path) || "dist", OUTPUT_CONFIG_FILE));
+  let cliConfig = {
+    output: {},
+    source: {},
+    tools: {},
+    server: {},
+    security: {},
+    runtime: {},
+    bff: {},
+    html: {},
+    dev: {}
+  };
+  try {
+    cliConfig = require(cliConfigPath);
+  } catch (_2) {
+  }
+  const mergedCliConfig = _.merge(defaultConfig, cliConfig);
+  return mergedCliConfig;
+}
 export {
-  loadServerConfig
+  loadServerCliConfig,
+  loadServerRuntimeConfig
 };

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

@@ -1,7 +1,7 @@
 import { httpCallBack2HonoMid, connectMid2HonoMid } from "./hono";
 import { createNodeServer, sendResponse, createWebRequest, writeReadableStreamToWritable } from "./node";
 import { serverStaticPlugin, injectResourcePlugin, getHtmlTemplates, getServerManifest, injectNodeSeverPlugin } from "./plugins";
-import { loadServerPlugins, loadServerEnv, loadServerConfig, loadCacheConfig } from "./helper";
+import { loadServerPlugins, loadServerEnv, loadServerRuntimeConfig, loadServerCliConfig, loadCacheConfig } from "./helper";
 export {
   connectMid2HonoMid,
   createNodeServer,
@@ -12,9 +12,10 @@ export {
   injectNodeSeverPlugin,
   injectResourcePlugin,
   loadCacheConfig,
-  loadServerConfig,
+  loadServerCliConfig,
   loadServerEnv,
   loadServerPlugins,
+  loadServerRuntimeConfig,
   sendResponse,
   serverStaticPlugin,
   writeReadableStreamToWritable

package/dist/types/adapters/node/helper/index.d.ts

@@ -1,4 +1,4 @@
 export { loadServerEnv } from './loadEnv';
 export { loadServerPlugins } from './loadPlugin';
-export { loadServerConfig } from './loadConfig';
+export { loadServerRuntimeConfig, loadServerCliConfig } from './loadConfig';
 export { loadCacheConfig } from './loadCache';

package/dist/types/adapters/node/helper/loadConfig.d.ts

@@ -1,2 +1,3 @@
-import { ServerConfig } from '../../../types';
-export declare function loadServerConfig(pwd: string, oldServerFile?: string, newServerConfigPath?: string): ServerConfig | undefined;
+import { CliConfig, ServerConfig, UserConfig } from '../../../types';
+export declare function loadServerRuntimeConfig(pwd: string, oldServerFile?: string, newServerConfigPath?: string): ServerConfig | undefined;
+export declare function loadServerCliConfig(pwd: string, defaultConfig?: UserConfig): CliConfig;

package/dist/types/adapters/node/index.d.ts

@@ -2,4 +2,4 @@ export { httpCallBack2HonoMid, connectMid2HonoMid } from './hono';
 export type { ServerNodeContext, ServerNodeMiddleware } from './hono';
 export { createNodeServer, sendResponse, createWebRequest, writeReadableStreamToWritable, } from './node';
 export { serverStaticPlugin, injectResourcePlugin, getHtmlTemplates, getServerManifest, injectNodeSeverPlugin, } from './plugins';
-export { loadServerPlugins, loadServerEnv, loadServerConfig, loadCacheConfig, } from './helper';
+export { loadServerPlugins, loadServerEnv, loadServerRuntimeConfig, loadServerCliConfig, loadCacheConfig, } from './helper';

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",
@@ -53,9 +53,9 @@
     "hono": "^3.12.2",
     "ts-deepmerge": "7.0.0",
     "isbot": "3.8.0",
-    "@modern-js/plugin": "2.54.2",
-    "@modern-js/utils": "2.54.2",
-    "@modern-js/runtime-utils": "2.54.2"
+    "@modern-js/plugin": "2.54.3",
+    "@modern-js/runtime-utils": "2.54.3",
+    "@modern-js/utils": "2.54.3"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -65,9 +65,9 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@scripts/build": "2.54.2",
-    "@modern-js/types": "2.54.2",
-    "@scripts/jest-config": "2.54.2"
+    "@scripts/jest-config": "2.54.3",
+    "@scripts/build": "2.54.3",
+    "@modern-js/types": "2.54.3"
   },
   "sideEffects": false,
   "publishConfig": {