@modern-js/prod-server 1.1.10-beta.0 → 1.2.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @modern-js/prod-server
 
+## 1.2.0
+
+### Minor Changes
+
+- 3d64b2f: feat: prod-server supports that load server env from .env.\*
+
+  feat: prod-server 支持从 .env.\* 文件加载服务器环境变量
+
+### Patch Changes
+
+- 7b902b3: feat: support ListenOptions for prod-server
+
+  feat: server 支持传入 listernOptions 参数
+
+- Updated dependencies [a27ab8d]
+  - @modern-js/server-core@1.4.1
+  - @modern-js/utils@1.7.12
+
 ## 1.1.9
 
 ### Patch Changes

package/dist/js/modern/server/index.js

@@ -5,8 +5,9 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import path from 'path';
+import fs from 'fs';
+import { Logger, SHARED_DIR, OUTPUT_CONFIG_FILE, dotenv, dotenvExpand } from '@modern-js/utils';
 import { serverManager, AppContext, ConfigContext, loadPlugins } from '@modern-js/server-core';
-import { Logger, SHARED_DIR, OUTPUT_CONFIG_FILE } from '@modern-js/utils';
 import { metrics as defaultMetrics } from "../libs/metrics";
 import { loadConfig, getServerConfigPath, requireConfig } from "../libs/loadConfig";
 import { debug } from "../utils";
@@ -34,6 +35,7 @@ export class Server {
   }
   /**
    * 初始化顺序
+   * - 读取 .env.{process.env.MODERN_ENV} 文件，加载环境变量
    * - 获取 server runtime config
    * - 设置 context
    * - 创建 hooksRunner
@@ -51,6 +53,7 @@ export class Server {
     const {
       options
     } = this;
+    this.loadServerEnv(options);
     this.initServerConfig(options);
     await this.injectContext(this.runner, options); // initialize server runner
 
@@ -128,22 +131,18 @@ export class Server {
   }
 
   listen(options, listener) {
-    if (typeof options === 'object') {
-      this.app.listen(options, () => {
-        if (listener) {
-          listener();
-        }
+    const callback = () => {
+      if (listener) {
+        listener();
+      }
 
-        this.server.onListening(this.app);
-      });
-    } else {
-      this.app.listen(process.env.PORT || options || 8080, () => {
-        if (listener) {
-          listener();
-        }
+      this.server.onListening(this.app);
+    };
 
-        this.server.onListening(this.app);
-      });
+    if (typeof options === 'object') {
+      this.app.listen(options, callback);
+    } else {
+      this.app.listen(process.env.PORT || options || 8080, callback);
     }
   }
 
@@ -214,4 +213,19 @@ export class Server {
     };
   }
 
+  loadServerEnv(options) {
+    const {
+      pwd: appDirectory
+    } = options;
+    const serverEnv = process.env.MODERN_ENV;
+    const serverEnvPath = path.resolve(appDirectory, `.env.${serverEnv}`);
+
+    if (serverEnv && fs.existsSync(serverEnvPath) && !fs.statSync(serverEnvPath).isDirectory()) {
+      const envConfig = dotenv.config({
+        path: serverEnvPath
+      });
+      dotenvExpand(envConfig);
+    }
+  }
+
 }

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

@@ -7,10 +7,12 @@ exports.Server = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
-var _serverCore = require("@modern-js/server-core");
+var _fs = _interopRequireDefault(require("fs"));
 
 var _utils = require("@modern-js/utils");
 
+var _serverCore = require("@modern-js/server-core");
+
 var _metrics = require("../libs/metrics");
 
 var _loadConfig = require("../libs/loadConfig");
@@ -50,6 +52,7 @@ class Server {
   }
   /**
    * 初始化顺序
+   * - 读取 .env.{process.env.MODERN_ENV} 文件，加载环境变量
    * - 获取 server runtime config
    * - 设置 context
    * - 创建 hooksRunner
@@ -67,6 +70,7 @@ class Server {
     const {
       options
     } = this;
+    this.loadServerEnv(options);
     this.initServerConfig(options);
     await this.injectContext(this.runner, options); // initialize server runner
 
@@ -148,22 +152,18 @@ class Server {
   }
 
   listen(options, listener) {
-    if (typeof options === 'object') {
-      this.app.listen(options, () => {
-        if (listener) {
-          listener();
-        }
+    const callback = () => {
+      if (listener) {
+        listener();
+      }
 
-        this.server.onListening(this.app);
-      });
-    } else {
-      this.app.listen(process.env.PORT || options || 8080, () => {
-        if (listener) {
-          listener();
-        }
+      this.server.onListening(this.app);
+    };
 
-        this.server.onListening(this.app);
-      });
+    if (typeof options === 'object') {
+      this.app.listen(options, callback);
+    } else {
+      this.app.listen(process.env.PORT || options || 8080, callback);
     }
   }
 
@@ -237,6 +237,23 @@ class Server {
     };
   }
 
+  loadServerEnv(options) {
+    const {
+      pwd: appDirectory
+    } = options;
+    const serverEnv = process.env.MODERN_ENV;
+
+    const serverEnvPath = _path.default.resolve(appDirectory, `.env.${serverEnv}`);
+
+    if (serverEnv && _fs.default.existsSync(serverEnvPath) && !_fs.default.statSync(serverEnvPath).isDirectory()) {
+      const envConfig = _utils.dotenv.config({
+        path: serverEnvPath
+      });
+
+      (0, _utils.dotenvExpand)(envConfig);
+    }
+  }
+
 }
 
 exports.Server = Server;

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

@@ -12,6 +12,7 @@ export declare class Server {
   constructor(options: ModernServerOptions);
   /**
    * 初始化顺序
+   * - 读取 .env.{process.env.MODERN_ENV} 文件，加载环境变量
    * - 获取 server runtime config
    * - 设置 context
    * - 创建 hooksRunner
@@ -46,4 +47,5 @@ export declare class Server {
   private createHookRunner;
   private injectContext;
   private initAppContext;
+  private loadServerEnv;
 }

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.10-beta.0",
+  "version": "1.2.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,9 +28,9 @@
     }
   },
   "dependencies": {
-    "@modern-js/utils": "^1.7.11",
+    "@modern-js/utils": "^1.7.12",
     "@babel/compat-data": "^7.17.10",
-    "@modern-js/server-core": "^1.4.0",
+    "@modern-js/server-core": "^1.4.1",
     "axios": "^0.24.0",
     "compare-versions": "^3.6.0",
     "cookie": "^0.4.2",
@@ -43,8 +43,8 @@
     "ua-parser-js": "^0.7.28"
   },
   "devDependencies": {
-    "@modern-js/types": "1.5.5",
-    "@modern-js/core": "1.12.4",
+    "@modern-js/types": "1.6.0",
+    "@modern-js/core": "1.13.0",
     "@scripts/jest-config": "0.0.0",
     "@scripts/build": "0.0.0",
     "@types/cookie": "^0.4.1",
@@ -67,8 +67,7 @@
   },
   "publishConfig": {
     "access": "public",
-    "registry": "https://registry.npmjs.org/",
-    "types": "./dist/types/index.d.ts"
+    "registry": "https://registry.npmjs.org/"
   },
   "wireit": {
     "build": {