style(textlint-bundler): fix coding style

mobilusoss · Feb 17, 2020 · 26eba92 · 26eba92
1 parent c532d09
commit 26eba92
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 21 deletions.
diff --git a/packages/textlint-bundler/lib/bundle.js b/packages/textlint-bundler/lib/bundle.js
@@ -1,6 +1,5 @@
 const fs = require('fs');
 const path = require('path');
-const chalk = require('chalk');
 const webpack = require('webpack');
 
 const readPkg = () => {
@@ -35,27 +34,15 @@ module.exports = (flags, spinner) => {
   }
   const webpackConfig = createWebpackConfig(textlint.preset, flags.debug);
   return new Promise((resolve, reject) => {
-    const webpackCallback = (err, stats) => {
+    webpack(webpackConfig, (err, stats) => {
       spinner.clear();
       if (err) {
-        console.error(chalk.bold.red('Error'), err.stack || err);
-        console.log(err.details || '');
-        return reject('Bundle Error')
+        return reject(err);
       }
-
-      const info = stats.toJson();
       if (stats.hasErrors()) {
-        console.error(chalk.bold.red('Error'), 'webpack errors');
-        console.log(info.errors.join(""))
-        return reject('Bundle stats has errors')
-      }
-
-      if (stats.hasWarnings()) {
-        console.warn(chalk.keyword('orange')('Warning'), 'webpack warnings');
-        console.log(chalk.keyword('gray')(info.warnings.join("")))
+        return reject(stats);
       }
-      resolve()
-    };
-    webpack(webpackConfig, webpackCallback);
+      return resolve(stats);
+    });
   });
 }
diff --git a/packages/textlint-bundler/lib/textlint-bundler.js b/packages/textlint-bundler/lib/textlint-bundler.js
@@ -37,12 +37,24 @@ const run = () => {
   console.log(chalk.bold.white('Start Bundling...'))
   const spinner = ora().start();
   bundle(cli.flags, spinner)
-  .then(() => {
+  .then((stats) => {
+    if (stats.hasWarnings()) {
+      const info = stats.toJson();
+      console.warn(chalk.keyword('orange')('Warning'), 'webpack warnings');
+      console.log(chalk.keyword('gray')(info.warnings.join("")));
+    }
     console.log(chalk.bold.green('Success'));
     console.log("Run `npx http-server ./dist -o /example.html` to see example");
   })
-  .catch((e) => {
-    console.log(chalk.bold.red('Error'), e);
+  .catch((reason) => {
+    if (typeof reason.hasErrors === 'function' ) {
+      console.error(chalk.bold.red('Error'), 'webpack errors');
+      const info = reason.toJson();
+      console.log(info.errors.join(""));
+    } else {
+      console.error(chalk.bold.red('Error'), reason.stack || reason);
+      console.log(reason.details || '');
+    }
   })
   .finally(() => {
     spinner.stop();