nuxt-gin-tools 0.2.2 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-gin-tools",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "This project is used as a dependency for [nuxt-gin-starter](https://github.com/RapboyGao/nuxt-gin-starter.git)",
   "bin": {
     "nuxt-gin": "index.js"

package/src/dev-go.js

@@ -19,11 +19,13 @@ const chokidar_1 = __importDefault(require("chokidar"));
 const chalk_1 = __importDefault(require("chalk"));
 const fs_extra_1 = require("fs-extra");
 const os_1 = __importDefault(require("os"));
+const readline_1 = require("readline");
 const path_1 = require("path");
 const cwd = process.cwd();
 const RESTART_DEBOUNCE_MS = 150;
 const SHUTDOWN_TIMEOUT_MS = 2000;
 const LOG_TAG = "go-watch";
+const GO_OUTPUT_TAG = chalk_1.default.blue("[go]");
 const serverConfigPath = (0, path_1.join)(cwd, "server.config.json");
 const ginPort = getGinPort();
 function getGinPort() {
@@ -260,15 +262,29 @@ function quote(arg) {
     }
     return arg;
 }
+function forwardWithGoTag(input, output) {
+    if (!input) {
+        return;
+    }
+    const rl = (0, readline_1.createInterface)({ input });
+    rl.on("line", (line) => {
+        output.write(`${GO_OUTPUT_TAG} ${line}\n`);
+    });
+}
 function runGoProcess() {
+    var _a, _b, _c;
     const command = `go run ${quote("main.go")}`;
     killGinPortIfNeeded();
     console.log(chalk_1.default.green(`[${LOG_TAG}] start: ${command}`));
-    return (0, child_process_1.spawn)(command, {
+    const proc = (0, child_process_1.spawn)(command, {
         cwd,
         shell: true,
-        stdio: "inherit",
+        env: Object.assign(Object.assign({}, process.env), { FORCE_COLOR: (_a = process.env.FORCE_COLOR) !== null && _a !== void 0 ? _a : "1", CLICOLOR: (_b = process.env.CLICOLOR) !== null && _b !== void 0 ? _b : "1", CLICOLOR_FORCE: (_c = process.env.CLICOLOR_FORCE) !== null && _c !== void 0 ? _c : "1" }),
+        stdio: ["inherit", "pipe", "pipe"],
     });
+    forwardWithGoTag(proc.stdout, process.stdout);
+    forwardWithGoTag(proc.stderr, process.stderr);
+    return proc;
 }
 function stopGoProcess(proc) {
     return __awaiter(this, void 0, void 0, function* () {