stop ignoring CONSOLE_LOG events

FredKSchott · Oct 16, 2020 · 652bd98 · 652bd98 · vercel · Oct 16, 2020
1 parent 05fa08b
commit 652bd98
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/plugins/plugin-run-script/plugin.js b/plugins/plugin-run-script/plugin.js
@@ -20,7 +20,7 @@ function runScriptPlugin(_, {cmd, watch, output}) {
       function dataListener(chunk) {
         let stdOutput = chunk.toString();
         if (output === 'stream') {
-          log('CONSOLE_INFO', {id: cmdProgram, msg: stdOutput});
+          log('CONSOLE_INFO', {msg: stdOutput});
           return;
         }
         if (stdOutput.includes('\u001bc') || stdOutput.includes('\x1Bc')) {

diff --git a/plugins/plugin-run-script/test/plugin.test.js b/plugins/plugin-run-script/test/plugin.test.js
@@ -42,8 +42,8 @@ describe.skip('plugin-run-script', () => {
     execaResult.stdout.emit('data', Buffer.from('STDOUT_TEST_MESSAGE'));
     execaResult.stderr.emit('data', Buffer.from('STDERR_TEST_MESSAGE'));
     expect(logFn.mock.calls).toEqual([
-      ['CONSOLE_INFO', {id: 'CMD', msg: 'STDOUT_TEST_MESSAGE'}],
-      ['CONSOLE_INFO', {id: 'CMD', msg: 'STDERR_TEST_MESSAGE'}],
+      ['CONSOLE_INFO', {msg: 'STDOUT_TEST_MESSAGE'}],
+      ['CONSOLE_INFO', {msg: 'STDERR_TEST_MESSAGE'}],
     ]);
   });
   test('handles command output in "dashboard" mode', async () => {

diff --git a/snowpack/src/commands/build.ts b/snowpack/src/commands/build.ts
@@ -311,8 +311,8 @@ export async function command(commandOptions: CommandOptions) {
           isHmrEnabled: getIsHmrEnabled(config),
           // @ts-ignore: internal API only
           log: (msg, data: {msg: string} = {}) => {
-            if (msg === 'WORKER_MSG') {
-              logger.info(`[${runPlugin.name}] ${data.msg.trim()}`);
+            if (msg === 'CONSOLE_INFO' || msg === 'WORKER_MSG') {
+              logger.info(data.msg.trim(), {name: runPlugin.name});
             }
           },
         })

diff --git a/snowpack/src/commands/dev.ts b/snowpack/src/commands/dev.ts
@@ -366,7 +366,11 @@ export async function startServer(commandOptions: CommandOptions) {
           isHmrEnabled: isHmr,
           // @ts-ignore: internal API only
           log: (msg, data) => {
-            messageBus.emit(msg, {...data, id: runPlugin.name});
+            if (msg === 'CONSOLE_INFO') {
+              logger.info(data.msg, {name: runPlugin.name});
+            } else {
+              messageBus.emit(msg, {...data, id: runPlugin.name});
+            }
           },
         })
         .then(() => {