ee-bin 1.5.0-beta.1 → 1.6.0

package/tools/replaceDist.js

@@ -1,83 +1,83 @@
-'use strict';
-
-const path = require('path');
-const fs = require('fs');
-const fsPro = require('fs-extra');
-const chalk = require('chalk');
-const Utils = require('../lib/utils');
-
-/**
- * 资源替换
- */
-
- module.exports = {
-  
-  /**
-   * 执行
-   */  
-  run(options = {}) {
-    const warnTips = chalk.bgYellow('Warning') + ': This command is deprecated. Use move instead !';
-    console.log(warnTips);
-
-    console.log('[ee-bin] [rd] Start moving resources');
-    const homeDir = process.cwd();
-    let { dist, target, config } = options;
-
-    let distDir = './frontend/dist';
-    let targetDir = './public/dist';
-
-    // 命令行优先
-    if (dist) {
-      distDir = dist;
-    }
-    if (target) {
-      targetDir = target;
-    }
-
-    // 如果命令行没参数，从bin config 获取
-    if (!dist && !target) {
-      const hasConfig = Utils.checkConfig(config);
-      if (hasConfig) {
-        const cfg = Utils.loadConfig(config);
-        if (cfg.rd && cfg.rd.dist) {
-          distDir = cfg.rd.dist;
-        }
-        if (cfg.rd && cfg.rd.target) {
-          targetDir = cfg.rd.target;
-        }
-      }   
-    }
-
-    const sourceDir = path.join(homeDir, distDir);
-    if (!fs.existsSync(sourceDir)) {
-      const errorTips = chalk.bgRed('Error') + ' Frontend resource does not exist, please build !';
-      console.error(errorTips);
-      return
-    }
-    
-    // 清空历史资源 并 复制到ee资源目录
-    const eeResourceDir = path.join(homeDir, targetDir);
-    if (!fs.existsSync(eeResourceDir)) {
-      fs.mkdirSync(eeResourceDir, {recursive: true, mode: 0o777});
-    } else {
-      this._rmFolder(eeResourceDir);
-      console.log('[ee-bin] [rd] Clear history resources:', eeResourceDir);
-    }
-
-    fsPro.copySync(sourceDir, eeResourceDir);
-    console.log('[ee-bin] [rd] Copy a resource to:', eeResourceDir);
-    console.log('[ee-bin] [rd] End');
-  },
-
-  /**
-   * 删除文件夹
-   */
-  _rmFolder(folder) {
-    const nodeVersion = (process.versions && process.versions.node) || null;
-    if (nodeVersion && Utils.compareVersion(nodeVersion, '14.14.0') == 1) {
-      fs.rmSync(folder, {recursive: true});
-    } else {
-      fs.rmdirSync(folder, {recursive: true});
-    }
-  },
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const fsPro = require('fs-extra');
+const chalk = require('chalk');
+const Utils = require('../lib/utils');
+
+/**
+ * 资源替换
+ */
+
+ module.exports = {
+  
+  /**
+   * 执行
+   */  
+  run(options = {}) {
+    const warnTips = chalk.bgYellow('Warning') + ': This command is deprecated. Use move instead !';
+    console.log(warnTips);
+
+    console.log('[ee-bin] [rd] Start moving resources');
+    const homeDir = process.cwd();
+    let { dist, target, config } = options;
+
+    let distDir = './frontend/dist';
+    let targetDir = './public/dist';
+
+    // 命令行优先
+    if (dist) {
+      distDir = dist;
+    }
+    if (target) {
+      targetDir = target;
+    }
+
+    // 如果命令行没参数，从bin config 获取
+    if (!dist && !target) {
+      const hasConfig = Utils.checkConfig(config);
+      if (hasConfig) {
+        const cfg = Utils.loadConfig(config);
+        if (cfg.rd && cfg.rd.dist) {
+          distDir = cfg.rd.dist;
+        }
+        if (cfg.rd && cfg.rd.target) {
+          targetDir = cfg.rd.target;
+        }
+      }   
+    }
+
+    const sourceDir = path.join(homeDir, distDir);
+    if (!fs.existsSync(sourceDir)) {
+      const errorTips = chalk.bgRed('Error') + ' Frontend resource does not exist, please build !';
+      console.error(errorTips);
+      return
+    }
+    
+    // 清空历史资源 并 复制到ee资源目录
+    const eeResourceDir = path.join(homeDir, targetDir);
+    if (!fs.existsSync(eeResourceDir)) {
+      fs.mkdirSync(eeResourceDir, {recursive: true, mode: 0o777});
+    } else {
+      this._rmFolder(eeResourceDir);
+      console.log('[ee-bin] [rd] Clear history resources:', eeResourceDir);
+    }
+
+    fsPro.copySync(sourceDir, eeResourceDir);
+    console.log('[ee-bin] [rd] Copy a resource to:', eeResourceDir);
+    console.log('[ee-bin] [rd] End');
+  },
+
+  /**
+   * 删除文件夹
+   */
+  _rmFolder(folder) {
+    const nodeVersion = (process.versions && process.versions.node) || null;
+    if (nodeVersion && Utils.compareVersion(nodeVersion, '14.14.0') == 1) {
+      fs.rmSync(folder, {recursive: true});
+    } else {
+      fs.rmdirSync(folder, {recursive: true});
+    }
+  },
 }

package/tools/serve.js

@@ -1,163 +1,167 @@
-'use strict';
-
-const path = require('path');
-const Utils = require('../lib/utils');
-const is = require('is-type-of');
-const chalk = require('chalk');
-const crossSpawn = require('cross-spawn');
-
-module.exports = {
-
-  execProcess: {},
-
-  /**
-   * 启动前端、主进程服务
-   */  
-  dev(options = {}) {
-    const { config, serve } = options;
-    const binCmd = 'dev';
-    const binCfg = Utils.loadConfig(config);
-    const binCmdConfig = binCfg[binCmd];
-
-    let command = serve;
-    if (!command) {
-      command = Object.keys(binCmdConfig).join();
-    }
-
-    const opt = {
-      binCmd,
-      binCmdConfig,
-      command,
-    }
-    this.multiExec(opt);
-  },
-
-  /**
-   * 启动主进程服务
-   */  
-  start(options = {}) {
-    const { config } = options;
-    const binCmd = 'start';
-    const binCfg = Utils.loadConfig(config);
-    const binCmdConfig = {
-      start: binCfg[binCmd]
-    };
-
-    const opt = {
-      binCmd,
-      binCmdConfig,
-      command: binCmd,
-    }
-    this.multiExec(opt);
-  },
-
-  sleep(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-  }, 
-
-  /**
-   * 构建
-   */  
-  build(options = {}) {
-    const { config, cmds } = options;
-    const binCmd = 'build';
-    const binCfg = Utils.loadConfig(config);
-    const binCmdConfig = binCfg[binCmd];
-
-    if (!cmds || cmds == "") {
-      // [todo]
-      let tip = chalk.bgYellow('Warning') + ' Please modify the ' + chalk.blue('build') + ' config, See: ';
-      tip += chalk.underline('https://www.kaka996.com/pages/c492f8/');
-      console.log(tip);
-      return
-    }
-
-    const opt = {
-      binCmd,
-      binCmdConfig,
-      command: cmds,
-    }
-    this.multiExec(opt);
-  },
-
-  /**
-   * 执行自定义命令
-   */  
-  exec(options = {}) {
-    let { config, command, cmds } = options;
-    const binCmd = 'exec';
-    const binCfg = Utils.loadConfig(config);
-    const binCmdConfig = binCfg[binCmd];
-
-    // if (typeof command !== "string" || !cmds) {
-    //   console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + chalk.red(`Error: Please specify parameters for --cmds` ));
-    //   return
-    // }
-
-    // 兼容
-    if (typeof command === "string") {
-      cmds = command;
-    }
-
-    const opt = {
-      binCmd,
-      binCmdConfig,
-      command: cmds,
-    }
-    this.multiExec(opt);
-  },
-
-  /**
-   * 支持多个命令
-   */  
-  multiExec(opt = {}) {
-    //console.log('multiExec opt:', opt)
-    const { binCmd, binCmdConfig, command } = opt;
-    
-    let cmds;
-    const cmdString = command.trim();
-    if (cmdString.indexOf(',') !== -1) {
-      cmds = cmdString.split(',');
-    } else {
-      cmds = [cmdString];
-    }
-
-    for (let i = 0; i < cmds.length; i++) {
-      let cmd = cmds[i];
-      let cfg = binCmdConfig[cmd];
-
-      if (!cfg) {
-        console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + chalk.red(`Error: [${binCmd} ${cmd}] config does not exist` ));
-        continue;
-      }
-
-      // frontend 如果是 file:// 协议，则不启动
-      if (cmd == 'frontend' && cfg.protocol == 'file://') {
-        continue;
-      }
-  
-      console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + "Run " + chalk.green(`[${binCmd} ${cmd}]` + " command"));
-      console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + chalk.green('config:'), JSON.stringify(cfg));
-      
-      let execDir = path.join(process.cwd(), cfg.directory);
-      let execArgs = is.string(cfg.args) ? [cfg.args] : cfg.args;
-      let stdio = cfg.stdio ? cfg.stdio: 'inherit';
-  
-      this.execProcess[cmd] = crossSpawn(
-        cfg.cmd, 
-        execArgs,
-        { stdio: stdio, cwd: execDir, maxBuffer: 1024 * 1024 * 1024 },
-      );
-      console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + 'The ' + chalk.green(`[${binCmd} ${cmd}]`) + ' command is running');
-
-      this.execProcess[cmd].on('exit', () => {
-        if (cmd == 'electron') {
-          console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + chalk.green('Press "CTRL+C" to exit'));
-          return
-        }
-        console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + 'The ' + chalk.green(`[${binCmd} ${cmd}]`) + ' command is executed and exits');
-      });
-    }
-  },  
-
-}
+'use strict';
+
+const path = require('path');
+const Utils = require('../lib/utils');
+const is = require('is-type-of');
+const chalk = require('chalk');
+const crossSpawn = require('cross-spawn');
+
+module.exports = {
+
+  execProcess: {},
+
+  /**
+   * 启动前端、主进程服务
+   */
+  dev(options = {}) {
+    const { config, serve } = options;
+    const binCmd = 'dev';
+    const binCfg = Utils.loadConfig(config);
+    const binCmdConfig = binCfg[binCmd];
+
+    let command = serve;
+    if (!command) {
+      command = Object.keys(binCmdConfig).join();
+    }
+
+    const opt = {
+      binCmd,
+      binCmdConfig,
+      command,
+    }
+    this.multiExec(opt);
+  },
+
+  /**
+   * 启动主进程服务
+   */
+  start(options = {}) {
+    const { config } = options;
+    const binCmd = 'start';
+    const binCfg = Utils.loadConfig(config);
+    const binCmdConfig = {
+      start: binCfg[binCmd]
+    };
+
+    const opt = {
+      binCmd,
+      binCmdConfig,
+      command: binCmd,
+    }
+    this.multiExec(opt);
+  },
+
+  sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  },
+
+  /**
+   * 构建
+   */
+  build(options = {}) {
+    const { config, cmds } = options;
+    const binCmd = 'build';
+    const binCfg = Utils.loadConfig(config);
+    const binCmdConfig = binCfg[binCmd];
+
+    if (!cmds || cmds == "") {
+      // [todo]
+      let tip = chalk.bgYellow('Warning') + ' Please modify the ' + chalk.blue('build') + ' config, See: ';
+      tip += chalk.underline('https://www.kaka996.com/pages/c492f8/');
+      console.log(tip);
+      return
+    }
+
+    const opt = {
+      binCmd,
+      binCmdConfig,
+      command: cmds,
+    }
+    this.multiExec(opt);
+  },
+
+  /**
+   * 执行自定义命令
+   */
+  exec(options = {}) {
+    let { config, command, cmds } = options;
+    const binCmd = 'exec';
+    const binCfg = Utils.loadConfig(config);
+    const binCmdConfig = binCfg[binCmd];
+
+    // if (typeof command !== "string" || !cmds) {
+    //   console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + chalk.red(`Error: Please specify parameters for --cmds` ));
+    //   return
+    // }
+
+    // 兼容
+    if (typeof command === "string") {
+      cmds = command;
+    }
+
+    const opt = {
+      binCmd,
+      binCmdConfig,
+      command: cmds,
+    }
+    this.multiExec(opt);
+  },
+
+  /**
+   * 支持多个命令
+   */
+  multiExec(opt = {}) {
+    //console.log('multiExec opt:', opt)
+    const { binCmd, binCmdConfig, command } = opt;
+
+    let cmds;
+    const cmdString = command.trim();
+    if (cmdString.indexOf(',') !== -1) {
+      cmds = cmdString.split(',');
+    } else {
+      cmds = [cmdString];
+    }
+
+    for (let i = 0; i < cmds.length; i++) {
+      let cmd = cmds[i];
+      let cfg = binCmdConfig[cmd];
+
+      if (!cfg) {
+        console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + chalk.red(`Error: [${binCmd} ${cmd}] config does not exist` ));
+        continue;
+      }
+
+      // frontend 如果是 file:// 协议，则不启动
+      if (cmd == 'frontend' && cfg.protocol == 'file://') {
+        continue;
+      }
+
+      console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + "Run " + chalk.green(`[${binCmd} ${cmd}]` + " command"));
+      console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + chalk.green('config:'), JSON.stringify(cfg));
+
+      let execDir = path.join(process.cwd(), cfg.directory);
+      let execArgs = is.string(cfg.args) ? [cfg.args] : cfg.args;
+      let stdio = cfg.stdio ? cfg.stdio: 'inherit';
+
+      const handler = cfg.sync ? crossSpawn.sync : crossSpawn;
+
+      this.execProcess[cmd] = handler(
+        cfg.cmd,
+        execArgs,
+        { stdio: stdio, cwd: execDir, maxBuffer: 1024 * 1024 * 1024 },
+      );
+      console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + 'The ' + chalk.green(`[${binCmd} ${cmd}]`) + ` command is ${cfg.sync ? 'run completed' : 'running'}`);
+
+      if(!cfg.sync) {
+        this.execProcess[cmd].on('exit', () => {
+          if (cmd == 'electron') {
+            console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + chalk.green('Press "CTRL+C" to exit'));
+            return
+          }
+          console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + 'The ' + chalk.green(`[${binCmd} ${cmd}]`) + ' command is executed and exits');
+        });
+      }
+    }
+  },
+
+}