@jayfong/x-server 2.22.4 → 2.23.0

package/lib/_cjs/cli/cli.js

@@ -4,14 +4,14 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 var _chokidar = _interopRequireDefault(require("chokidar"));
 var _execa = _interopRequireDefault(require("execa"));
+var _vscodeGenerateIndexStandalone = require("vscode-generate-index-standalone");
+var _vtils = require("vtils");
 var _yargs = _interopRequireDefault(require("yargs"));
 var _api_generator = require("./api_generator");
 var _build_util = require("./build_util");
-var _vtils = require("vtils");
 var _deploy_util = require("./deploy_util");
 var _dev_util = require("./dev_util");
 var _env_util = require("./env_util");
-var _vscodeGenerateIndexStandalone = require("vscode-generate-index-standalone");
 var _template_util = require("./template_util");
 _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   alias: 'i',
@@ -24,6 +24,11 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
 }).positional('tsx', {
   describe: '使用 tsx 运行',
   type: 'boolean'
+}).positional('env', {
+  alias: 'e',
+  describe: '环境变量文件',
+  type: 'string',
+  default: 'development'
 }), async argv => {
   process.env.NODE_ENV = 'development';
   let lastRun;
@@ -49,7 +54,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   watcher.on('all', (0, _vtils.debounce)(async () => {
     await _env_util.EnvUtil.importFile({
       cwd: process.cwd(),
-      file: '.env'
+      file: ['.env', `.env.${argv.env}`]
     });
     _env_util.EnvUtil.outputTypes({
       cwd: process.cwd(),

package/lib/_cjs/cli/env_util.js

@@ -122,11 +122,16 @@ class EnvUtil {
     return envsObj;
   }
   static async importFile(options) {
-    const envs = await EnvUtil.parseFile(options);
     const envsObj = {};
-    for (const env of envs) {
-      envsObj[env.key] = env.value;
-      process.env[env.key] = env.value;
+    for (const file of (0, _vtils.castArray)(options.file)) {
+      const envs = await EnvUtil.parseFile({
+        ...options,
+        file: file
+      });
+      for (const env of envs) {
+        envsObj[env.key] = env.value;
+        process.env[env.key] = env.value;
+      }
     }
     process.env.X_SERVER_ENVS = JSON.stringify({
       // @ts-ignore

package/lib/cli/cli.js

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 import chokidar from 'chokidar';
 import execa from 'execa';
+import { generateManyIndex } from 'vscode-generate-index-standalone';
+import { castArray, debounce } from 'vtils';
 import yargs from 'yargs';
 import { ApiGenerator } from "./api_generator";
 import { BuildUtil } from "./build_util";
-import { castArray, debounce } from 'vtils';
 import { DeployUtil } from "./deploy_util";
 import { DevUtil } from "./dev_util";
 import { EnvUtil } from "./env_util";
-import { generateManyIndex } from 'vscode-generate-index-standalone';
 import { TemplateUtil } from "./template_util";
 yargs.command('dev', '开始开发', _ => _.positional('index', {
   alias: 'i',
@@ -21,6 +21,11 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
 }).positional('tsx', {
   describe: '使用 tsx 运行',
   type: 'boolean'
+}).positional('env', {
+  alias: 'e',
+  describe: '环境变量文件',
+  type: 'string',
+  default: 'development'
 }), async argv => {
   process.env.NODE_ENV = 'development';
   let lastRun;
@@ -46,7 +51,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   watcher.on('all', debounce(async () => {
     await EnvUtil.importFile({
       cwd: process.cwd(),
-      file: '.env'
+      file: ['.env', `.env.${argv.env}`]
     });
     EnvUtil.outputTypes({
       cwd: process.cwd(),

package/lib/cli/env_util.d.ts

@@ -21,7 +21,7 @@ export declare class EnvUtil {
     }): Promise<Record<string, any>>;
     static importFile(options: {
         cwd: string;
-        file: string;
+        file: string | string[];
     }): Promise<void>;
     static makeTypes(envs: ParsedEnv[]): string;
     static outputTypes(options: {

package/lib/cli/env_util.js

@@ -1,6 +1,6 @@
 import fs from 'fs-extra';
 import path from 'node:path';
-import { dedent, devOrProd, escapeRegExp, isNumeric, isPlainObject } from 'vtils';
+import { castArray, dedent, devOrProd, escapeRegExp, isNumeric, isPlainObject } from 'vtils';
 import { parse as yamlParse } from 'yaml';
 export class EnvUtil {
   static normalizeValue(value) {
@@ -117,11 +117,16 @@ export class EnvUtil {
     return envsObj;
   }
   static async importFile(options) {
-    const envs = await EnvUtil.parseFile(options);
     const envsObj = {};
-    for (const env of envs) {
-      envsObj[env.key] = env.value;
-      process.env[env.key] = env.value;
+    for (const file of castArray(options.file)) {
+      const envs = await EnvUtil.parseFile({
+        ...options,
+        file: file
+      });
+      for (const env of envs) {
+        envsObj[env.key] = env.value;
+        process.env[env.key] = env.value;
+      }
     }
     process.env.X_SERVER_ENVS = JSON.stringify({
       // @ts-ignore

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.22.4",
+  "version": "2.23.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",