@dotcom-tool-kit/node 1.3.0 → 1.4.0

package/lib/tasks/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/tasks/node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAA;AAQhF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,IAAI,CAAC,OAAO,UAAU,CAAC;IACvD,MAAM,CAAC,WAAW,SAAK;IAEvB,MAAM,CAAC,cAAc,EAAE,WAAW,CAEjC;IAEK,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAmC3B"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/tasks/node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAA;AAShF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,IAAI,CAAC,OAAO,UAAU,CAAC;IACvD,MAAM,CAAC,WAAW,SAAK;IAEvB,MAAM,CAAC,cAAc,EAAE,WAAW,CAEjC;IAEK,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA4C3B"}

package/lib/tasks/node.js

@@ -6,12 +6,13 @@ const error_1 = require("@dotcom-tool-kit/error");
 const child_process_1 = require("child_process");
 const vault_1 = require("@dotcom-tool-kit/vault");
 const state_1 = require("@dotcom-tool-kit/state");
+const logger_1 = require("@dotcom-tool-kit/logger");
 const get_port_1 = (0, tslib_1.__importDefault)(require("get-port"));
 const wait_port_1 = (0, tslib_1.__importDefault)(require("wait-port"));
 class Node extends types_1.Task {
     async run() {
         const { entry } = this.options;
-        const vault = new vault_1.VaultEnvVars({
+        const vault = new vault_1.VaultEnvVars(this.logger, {
             environment: 'development'
         });
         const vaultEnv = await vault.get();
@@ -20,22 +21,30 @@ class Node extends types_1.Task {
                 port: [3001, 3002, 3003]
             }));
         if (!entry) {
-            const error = new error_1.ToolKitError('the Node tasks requires an `entry` option');
-            error.details = 'this is the entrypoint for your app, e.g. `server/app.js`';
+            const error = new error_1.ToolKitError(`the ${logger_1.styles.task('Node')} task requires an ${logger_1.styles.option('entry')} option`);
+            error.details = `this is the entrypoint for your app, e.g. ${logger_1.styles.filepath('server/app.js')}`;
             throw error;
         }
+        this.logger.verbose('starting the child node process...');
         const child = (0, child_process_1.fork)(entry, {
             env: {
                 ...vaultEnv,
                 PORT: port.toString(),
                 ...process.env
             },
-            stdio: 'inherit'
-        });
-        await (0, wait_port_1.default)({
-            host: 'localhost',
-            port: port
+            silent: true
         });
+        (0, logger_1.hookFork)(this.logger, entry, child);
+        const unhook = (0, logger_1.hookConsole)(this.logger, 'wait-port');
+        try {
+            await (0, wait_port_1.default)({
+                host: 'localhost',
+                port: port
+            });
+        }
+        finally {
+            unhook();
+        }
         (0, state_1.writeState)('local', { port });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dotcom-tool-kit/node",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "",
   "main": "lib",
   "scripts": {
@@ -10,10 +10,10 @@
   "author": "FT.com Platforms Team <platforms-team.customer-products@ft.com>",
   "license": "ISC",
   "dependencies": {
-    "@dotcom-tool-kit/error": "^1.3.0",
-    "@dotcom-tool-kit/state": "^1.3.0",
-    "@dotcom-tool-kit/types": "^1.3.0",
-    "@dotcom-tool-kit/vault": "^1.3.0",
+    "@dotcom-tool-kit/error": "^1.4.0",
+    "@dotcom-tool-kit/state": "^1.4.0",
+    "@dotcom-tool-kit/types": "^1.4.0",
+    "@dotcom-tool-kit/vault": "^1.4.0",
     "get-port": "^5.1.1",
     "wait-port": "^0.2.9"
   },