@jayfong/x-server 2.73.0 → 2.73.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/lib/_cjs/cli/cli.js +6 -6
  2. package/lib/_cjs/cli/env_util.js +2 -2
  3. package/lib/cli/cli.js +6 -6
  4. package/lib/cli/env_util.js +3 -3
  5. package/package.json +1 -1
package/lib/_cjs/cli/cli.js CHANGED
@@ -31,7 +31,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
31
31
  describe: '渠道',
32
32
  type: 'string'
33
33
  }), async argv => {
34
- if (argv.channel === '') {
34
+ if (argv.channel === '_') {
35
35
  argv.channel = await _env_util.EnvUtil.chooseChannel(process.cwd());
36
36
  }
37
37
  process.env.NODE_ENV = 'development';
@@ -105,7 +105,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
105
105
  describe: '渠道',
106
106
  type: 'string'
107
107
  }), async argv => {
108
- if (argv.channel === '') {
108
+ if (argv.channel === '_') {
109
109
  argv.channel = await _env_util.EnvUtil.chooseChannel(process.cwd());
110
110
  }
111
111
  process.env.NODE_ENV = 'production';
@@ -139,7 +139,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
139
139
  describe: '渠道',
140
140
  type: 'string'
141
141
  }), async argv => {
142
- if (argv.channel === '') {
142
+ if (argv.channel === '_') {
143
143
  argv.channel = await _env_util.EnvUtil.chooseChannel(process.cwd());
144
144
  }
145
145
  process.env.NODE_ENV = 'production';
@@ -159,7 +159,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
159
159
  describe: '渠道',
160
160
  type: 'string'
161
161
  }), async argv => {
162
- if (argv.channel === '') {
162
+ if (argv.channel === '_') {
163
163
  argv.channel = await _env_util.EnvUtil.chooseChannel(process.cwd());
164
164
  }
165
165
  process.env.NODE_ENV = argv.production ? 'production' : 'development';
@@ -200,7 +200,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
200
200
  describe: '使用 tsx 运行',
201
201
  type: 'boolean'
202
202
  }), async argv => {
203
- if (argv.channel === '') {
203
+ if (argv.channel === '_') {
204
204
  argv.channel = await _env_util.EnvUtil.chooseChannel(process.cwd());
205
205
  }
206
206
  process.env.NODE_ENV = argv.production ? 'production' : 'development';
@@ -231,7 +231,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
231
231
  describe: '渠道',
232
232
  type: 'string'
233
233
  }), async argv => {
234
- if (argv.channel === '') {
234
+ if (argv.channel === '_') {
235
235
  argv.channel = await _env_util.EnvUtil.chooseChannel(process.cwd());
236
236
  }
237
237
  const deployEnvFiles = _env_util.EnvUtil.getFile('deploy', argv.channel, true);
package/lib/_cjs/cli/env_util.js CHANGED
@@ -11,7 +11,7 @@ var _vtils = require("vtils");
11
11
  var _yaml = require("yaml");
12
12
  class EnvUtil {
13
13
  static async chooseChannel(cwd) {
14
- const channelFiles = await (0, _globby.default)(['.env@*.{yml,yaml}'], {
14
+ const channelFiles = await (0, _globby.default)(['.env@*'], {
15
15
  cwd: cwd,
16
16
  onlyFiles: true,
17
17
  absolute: false
@@ -19,7 +19,7 @@ class EnvUtil {
19
19
  if (channelFiles.length === 0) {
20
20
  return undefined;
21
21
  }
22
- const channels = channelFiles.map(channel => channel.split('@').pop().split('.')[0]);
22
+ const channels = (0, _vtils.uniq)(channelFiles.map(channel => channel.split('@').pop().split('.')[0]));
23
23
  if (channels.length === 1) return channels[0];
24
24
  const res = await _inquirer.default.prompt([{
25
25
  name: 'channel',
package/lib/cli/cli.js CHANGED
@@ -28,7 +28,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
28
28
  describe: '渠道',
29
29
  type: 'string'
30
30
  }), async argv => {
31
- if (argv.channel === '') {
31
+ if (argv.channel === '_') {
32
32
  argv.channel = await EnvUtil.chooseChannel(process.cwd());
33
33
  }
34
34
  process.env.NODE_ENV = 'development';
@@ -102,7 +102,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
102
102
  describe: '渠道',
103
103
  type: 'string'
104
104
  }), async argv => {
105
- if (argv.channel === '') {
105
+ if (argv.channel === '_') {
106
106
  argv.channel = await EnvUtil.chooseChannel(process.cwd());
107
107
  }
108
108
  process.env.NODE_ENV = 'production';
@@ -136,7 +136,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
136
136
  describe: '渠道',
137
137
  type: 'string'
138
138
  }), async argv => {
139
- if (argv.channel === '') {
139
+ if (argv.channel === '_') {
140
140
  argv.channel = await EnvUtil.chooseChannel(process.cwd());
141
141
  }
142
142
  process.env.NODE_ENV = 'production';
@@ -156,7 +156,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
156
156
  describe: '渠道',
157
157
  type: 'string'
158
158
  }), async argv => {
159
- if (argv.channel === '') {
159
+ if (argv.channel === '_') {
160
160
  argv.channel = await EnvUtil.chooseChannel(process.cwd());
161
161
  }
162
162
  process.env.NODE_ENV = argv.production ? 'production' : 'development';
@@ -197,7 +197,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
197
197
  describe: '使用 tsx 运行',
198
198
  type: 'boolean'
199
199
  }), async argv => {
200
- if (argv.channel === '') {
200
+ if (argv.channel === '_') {
201
201
  argv.channel = await EnvUtil.chooseChannel(process.cwd());
202
202
  }
203
203
  process.env.NODE_ENV = argv.production ? 'production' : 'development';
@@ -228,7 +228,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
228
228
  describe: '渠道',
229
229
  type: 'string'
230
230
  }), async argv => {
231
- if (argv.channel === '') {
231
+ if (argv.channel === '_') {
232
232
  argv.channel = await EnvUtil.chooseChannel(process.cwd());
233
233
  }
234
234
  const deployEnvFiles = EnvUtil.getFile('deploy', argv.channel, true);
package/lib/cli/env_util.js CHANGED
@@ -2,11 +2,11 @@ import path from 'node:path';
2
2
  import fs from 'fs-extra';
3
3
  import globby from 'globby';
4
4
  import inquirer from 'inquirer';
5
- import { dedent, escapeRegExp, isPlainObject } from 'vtils';
5
+ import { dedent, escapeRegExp, isPlainObject, uniq } from 'vtils';
6
6
  import { parse as yamlParse } from 'yaml';
7
7
  export class EnvUtil {
8
8
  static async chooseChannel(cwd) {
9
- const channelFiles = await globby(['.env@*.{yml,yaml}'], {
9
+ const channelFiles = await globby(['.env@*'], {
10
10
  cwd: cwd,
11
11
  onlyFiles: true,
12
12
  absolute: false
@@ -14,7 +14,7 @@ export class EnvUtil {
14
14
  if (channelFiles.length === 0) {
15
15
  return undefined;
16
16
  }
17
- const channels = channelFiles.map(channel => channel.split('@').pop().split('.')[0]);
17
+ const channels = uniq(channelFiles.map(channel => channel.split('@').pop().split('.')[0]));
18
18
  if (channels.length === 1) return channels[0];
19
19
  const res = await inquirer.prompt([{
20
20
  name: 'channel',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jayfong/x-server",
3
- "version": "2.73.0",
3
+ "version": "2.73.2",
4
4
  "license": "ISC",
5
5
  "sideEffects": false,
6
6
  "main": "lib/_cjs/index.js",