@jayfong/x-server 2.74.1 → 2.74.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 (3) hide show
  1. package/lib/_cjs/cli/cli.js +48 -39
  2. package/lib/cli/cli.js +48 -39
  3. package/package.json +1 -1
package/lib/_cjs/cli/cli.js CHANGED
@@ -15,6 +15,45 @@ var _deploy_util = require("./deploy_util");
15
15
  var _dev_util = require("./dev_util");
16
16
  var _env_util = require("./env_util");
17
17
  var _template_util = require("./template_util");
18
+ async function deploy(argv) {
19
+ if (argv.channel === '_') {
20
+ argv.channel = await _env_util.EnvUtil.chooseChannel(process.cwd());
21
+ }
22
+ const deployEnvFiles = _env_util.EnvUtil.getFile('deploy', argv.channel, true);
23
+ const deployEnv = await _env_util.EnvUtil.parseFileAsMap({
24
+ cwd: process.cwd(),
25
+ file: deployEnvFiles
26
+ });
27
+ if (argv.type === 'env') {
28
+ const appEnvFiles = _env_util.EnvUtil.getFile('production', argv.channel);
29
+ const appEnv = await _env_util.EnvUtil.parseFileAsMap({
30
+ cwd: process.cwd(),
31
+ file: appEnvFiles
32
+ });
33
+ await _deploy_util.DeployUtil.deployEnv({
34
+ host: deployEnv.HOST,
35
+ user: deployEnv.USER,
36
+ key: deployEnv.KEY,
37
+ pass: deployEnv.PASSWORD,
38
+ token: appEnv.APP_TOKEN,
39
+ port: appEnv.APP_PORT,
40
+ env: appEnv
41
+ });
42
+ } else {
43
+ await _deploy_util.DeployUtil.deploy({
44
+ cwd: process.cwd(),
45
+ host: deployEnv.HOST,
46
+ user: deployEnv.USER,
47
+ key: deployEnv.KEY,
48
+ pass: deployEnv.PASSWORD,
49
+ dir: deployEnv.DIR,
50
+ cmd: deployEnv.CMD,
51
+ memory: deployEnv.MEMORY,
52
+ cron: deployEnv.CRON,
53
+ channel: argv.channel
54
+ });
55
+ }
56
+ }
18
57
  _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
19
58
  alias: 'i',
20
59
  describe: '额外需要生成的索引文件',
@@ -104,6 +143,11 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
104
143
  alias: 'h',
105
144
  describe: '渠道',
106
145
  type: 'string'
146
+ }).positional('deploy', {
147
+ alias: 'd',
148
+ describe: '构建完是否部署',
149
+ type: 'boolean',
150
+ default: false
107
151
  }), async argv => {
108
152
  if (argv.channel === '_') {
109
153
  argv.channel = await _env_util.EnvUtil.chooseChannel(process.cwd());
@@ -134,6 +178,9 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
134
178
  channel: argv.channel
135
179
  });
136
180
  console.log('构建成功');
181
+ if (argv.deploy) {
182
+ await deploy(argv);
183
+ }
137
184
  }).command('api', '生成 API', _ => _.positional('channel', {
138
185
  alias: 'h',
139
186
  describe: '渠道',
@@ -230,42 +277,4 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
230
277
  alias: 'h',
231
278
  describe: '渠道',
232
279
  type: 'string'
233
- }), async argv => {
234
- if (argv.channel === '_') {
235
- argv.channel = await _env_util.EnvUtil.chooseChannel(process.cwd());
236
- }
237
- const deployEnvFiles = _env_util.EnvUtil.getFile('deploy', argv.channel, true);
238
- const deployEnv = await _env_util.EnvUtil.parseFileAsMap({
239
- cwd: process.cwd(),
240
- file: deployEnvFiles
241
- });
242
- if (argv.type === 'env') {
243
- const appEnvFiles = _env_util.EnvUtil.getFile('production', argv.channel);
244
- const appEnv = await _env_util.EnvUtil.parseFileAsMap({
245
- cwd: process.cwd(),
246
- file: appEnvFiles
247
- });
248
- await _deploy_util.DeployUtil.deployEnv({
249
- host: deployEnv.HOST,
250
- user: deployEnv.USER,
251
- key: deployEnv.KEY,
252
- pass: deployEnv.PASSWORD,
253
- token: appEnv.APP_TOKEN,
254
- port: appEnv.APP_PORT,
255
- env: appEnv
256
- });
257
- } else {
258
- await _deploy_util.DeployUtil.deploy({
259
- cwd: process.cwd(),
260
- host: deployEnv.HOST,
261
- user: deployEnv.USER,
262
- key: deployEnv.KEY,
263
- pass: deployEnv.PASSWORD,
264
- dir: deployEnv.DIR,
265
- cmd: deployEnv.CMD,
266
- memory: deployEnv.MEMORY,
267
- cron: deployEnv.CRON,
268
- channel: argv.channel
269
- });
270
- }
271
- }).parse();
280
+ }), deploy).parse();
package/lib/cli/cli.js CHANGED
@@ -12,6 +12,45 @@ import { DeployUtil } from "./deploy_util";
12
12
  import { DevUtil } from "./dev_util";
13
13
  import { EnvUtil } from "./env_util";
14
14
  import { TemplateUtil } from "./template_util";
15
+ async function deploy(argv) {
16
+ if (argv.channel === '_') {
17
+ argv.channel = await EnvUtil.chooseChannel(process.cwd());
18
+ }
19
+ const deployEnvFiles = EnvUtil.getFile('deploy', argv.channel, true);
20
+ const deployEnv = await EnvUtil.parseFileAsMap({
21
+ cwd: process.cwd(),
22
+ file: deployEnvFiles
23
+ });
24
+ if (argv.type === 'env') {
25
+ const appEnvFiles = EnvUtil.getFile('production', argv.channel);
26
+ const appEnv = await EnvUtil.parseFileAsMap({
27
+ cwd: process.cwd(),
28
+ file: appEnvFiles
29
+ });
30
+ await DeployUtil.deployEnv({
31
+ host: deployEnv.HOST,
32
+ user: deployEnv.USER,
33
+ key: deployEnv.KEY,
34
+ pass: deployEnv.PASSWORD,
35
+ token: appEnv.APP_TOKEN,
36
+ port: appEnv.APP_PORT,
37
+ env: appEnv
38
+ });
39
+ } else {
40
+ await DeployUtil.deploy({
41
+ cwd: process.cwd(),
42
+ host: deployEnv.HOST,
43
+ user: deployEnv.USER,
44
+ key: deployEnv.KEY,
45
+ pass: deployEnv.PASSWORD,
46
+ dir: deployEnv.DIR,
47
+ cmd: deployEnv.CMD,
48
+ memory: deployEnv.MEMORY,
49
+ cron: deployEnv.CRON,
50
+ channel: argv.channel
51
+ });
52
+ }
53
+ }
15
54
  yargs.command('dev', '开始开发', _ => _.positional('index', {
16
55
  alias: 'i',
17
56
  describe: '额外需要生成的索引文件',
@@ -101,6 +140,11 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
101
140
  alias: 'h',
102
141
  describe: '渠道',
103
142
  type: 'string'
143
+ }).positional('deploy', {
144
+ alias: 'd',
145
+ describe: '构建完是否部署',
146
+ type: 'boolean',
147
+ default: false
104
148
  }), async argv => {
105
149
  if (argv.channel === '_') {
106
150
  argv.channel = await EnvUtil.chooseChannel(process.cwd());
@@ -131,6 +175,9 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
131
175
  channel: argv.channel
132
176
  });
133
177
  console.log('构建成功');
178
+ if (argv.deploy) {
179
+ await deploy(argv);
180
+ }
134
181
  }).command('api', '生成 API', _ => _.positional('channel', {
135
182
  alias: 'h',
136
183
  describe: '渠道',
@@ -227,42 +274,4 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
227
274
  alias: 'h',
228
275
  describe: '渠道',
229
276
  type: 'string'
230
- }), async argv => {
231
- if (argv.channel === '_') {
232
- argv.channel = await EnvUtil.chooseChannel(process.cwd());
233
- }
234
- const deployEnvFiles = EnvUtil.getFile('deploy', argv.channel, true);
235
- const deployEnv = await EnvUtil.parseFileAsMap({
236
- cwd: process.cwd(),
237
- file: deployEnvFiles
238
- });
239
- if (argv.type === 'env') {
240
- const appEnvFiles = EnvUtil.getFile('production', argv.channel);
241
- const appEnv = await EnvUtil.parseFileAsMap({
242
- cwd: process.cwd(),
243
- file: appEnvFiles
244
- });
245
- await DeployUtil.deployEnv({
246
- host: deployEnv.HOST,
247
- user: deployEnv.USER,
248
- key: deployEnv.KEY,
249
- pass: deployEnv.PASSWORD,
250
- token: appEnv.APP_TOKEN,
251
- port: appEnv.APP_PORT,
252
- env: appEnv
253
- });
254
- } else {
255
- await DeployUtil.deploy({
256
- cwd: process.cwd(),
257
- host: deployEnv.HOST,
258
- user: deployEnv.USER,
259
- key: deployEnv.KEY,
260
- pass: deployEnv.PASSWORD,
261
- dir: deployEnv.DIR,
262
- cmd: deployEnv.CMD,
263
- memory: deployEnv.MEMORY,
264
- cron: deployEnv.CRON,
265
- channel: argv.channel
266
- });
267
- }
268
- }).parse();
277
+ }), deploy).parse();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jayfong/x-server",
3
- "version": "2.74.1",
3
+ "version": "2.74.2",
4
4
  "license": "ISC",
5
5
  "sideEffects": false,
6
6
  "main": "lib/_cjs/index.js",