fix(webpack): don't output built logs when pdf and live

hiroppy · Jun 19, 2019 · 041a09a · 041a09a
1 parent f4a5e06
commit 041a09a
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 26 deletions.
diff --git a/packages/fusuma/src/tasks.js b/packages/fusuma/src/tasks.js
@@ -33,19 +33,23 @@ async function startProcess(basePath) {
   );
 }
 
-async function buildProcess(basePath, extendedConfig = {}) {
+async function buildProcess(basePath, extendedConfig = {}, isOutput = true) {
   const spinner = loader('Building with webpack...').start();
   const config = merge(await fusuma.read(basePath), extendedConfig);
   const remoteOrigin = await getRemoteOriginUrl(basePath);
 
   await deleteDir(join(basePath, 'dist'));
-  await build({
-    ...config,
-    internal: {
-      basePath,
-      remoteOrigin
-    }
-  });
+  await build(
+    {
+      ...config,
+      internal: {
+        basePath,
+        remoteOrigin
+      }
+    },
+    isOutput
+  );
+
   spinner.stop();
 }
 
@@ -62,12 +66,16 @@ async function pdfProcess(basePath, { input: i, output: o }) {
   const input = join(process.cwd(), i || 'dist');
   const output = join(process.cwd(), o || 'slide.pdf');
 
-  await buildProcess(basePath, {
-    slide: {
-      loop: false,
-      sidebar: false
-    }
-  });
+  await buildProcess(
+    basePath,
+    {
+      slide: {
+        loop: false,
+        sidebar: false
+      }
+    },
+    false
+  );
 
   const spinner = loader('Exporting as PDF...').start();
 
@@ -90,13 +98,17 @@ async function pdfProcess(basePath, { input: i, output: o }) {
 }
 
 async function live(basePath, { keyword, internal, port, dir }) {
-  await buildProcess(basePath, {
-    server: {
-      port,
-      isLive: true,
-      keyword
-    }
-  });
+  await buildProcess(
+    basePath,
+    {
+      server: {
+        port,
+        isLive: true,
+        keyword
+      }
+    },
+    false
+  );
 
   const spinner = loader('Setup live mode...').start();
 

diff --git a/packages/task-build/src/index.js b/packages/task-build/src/index.js
@@ -2,10 +2,10 @@
 
 const { build: webpackBuild } = require('@fusuma/webpack');
 
-async function build(config) {
+async function build(config, isOutput) {
   if (process.env.NODE_ENV === undefined) process.env.NODE_ENV = 'production';
 
-  await webpackBuild(config);
+  await webpackBuild(config, isOutput);
 }
 
 module.exports = build;
diff --git a/packages/webpack/src/index.js b/packages/webpack/src/index.js
@@ -8,15 +8,19 @@ function start(config, cb) {
   webpackDevServer(combineConfig(config), cb);
 }
 
-function build(config) {
+function build(config, isOutput = true) {
   const webpack = require('webpack');
   const outputBuildInfo = require('./outputBuildInfo');
 
   return new Promise((resolve, reject) => {
     webpack(combineConfig(config), (err, res) => {
-      if (err) reject(err);
+      if (err) {
+        return reject(err);
+      }
 
-      outputBuildInfo(res);
+      if (isOutput) {
+        outputBuildInfo(res);
+      }
 
       resolve();
     });