Merge pull request #3487 from bmson/baldvin/verbose

Suppress verbose build output # Conflicts: # app/mithril/src/server/config/webpack.config.js
storybookjs · Apr 27, 2018 · 555600f · 555600f
1 parent 5320fb3
commit 555600f
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 13 deletions.
diff --git a/app/angular/src/server/config/webpack.config.js b/app/angular/src/server/config/webpack.config.js
@@ -12,7 +12,7 @@ import babelLoaderConfig from './babel';
 import { getPreviewHeadHtml, getManagerHeadHtml } from '../utils';
 import { version } from '../../../package.json';
 
-export default function(configDir) {
+export default function(configDir, quiet) {
   const config = {
     devtool: 'cheap-module-source-map',
     entry: {
@@ -52,12 +52,13 @@ export default function(configDir) {
       new CaseSensitivePathsPlugin(),
       new WatchMissingNodeModulesPlugin(nodeModulesPaths),
       new webpack.ProgressPlugin(),
+      quiet ? null : new webpack.ProgressPlugin(),
       new webpack.ContextReplacementPlugin(
         /angular(\\|\/)core(\\|\/)(@angular|esm5)/,
         path.resolve(__dirname, '../src')
       ),
       new Dotenv({ silent: true }),
-    ],
+    ].filter(Boolean),
     module: {
       rules: [
         {

diff --git a/app/polymer/src/server/config/webpack.config.js b/app/polymer/src/server/config/webpack.config.js
@@ -13,7 +13,7 @@ import { getPreviewHeadHtml, getManagerHeadHtml } from '../utils';
 import babelLoaderConfig from './babel';
 import { version } from '../../../package.json';
 
-export default function(configDir) {
+export default function(configDir, quiet) {
   const config = {
     devtool: 'cheap-module-source-map',
     entry: {
@@ -57,8 +57,9 @@ export default function(configDir) {
       new CaseSensitivePathsPlugin(),
       new WatchMissingNodeModulesPlugin(nodeModulesPaths),
       new webpack.ProgressPlugin(),
+      quiet ? null : new webpack.ProgressPlugin(),
       new Dotenv({ silent: true }),
-    ],
+    ].filter(Boolean),
     module: {
       rules: [
         {

diff --git a/app/react/src/server/config/webpack.config.js b/app/react/src/server/config/webpack.config.js
@@ -12,7 +12,7 @@ import babelLoaderConfig from './babel';
 import { getPreviewHeadHtml, getManagerHeadHtml } from '../utils';
 import { version } from '../../../package.json';
 
-export default function(configDir) {
+export default function(configDir, quiet) {
   const config = {
     devtool: 'cheap-module-source-map',
     entry: {
@@ -51,9 +51,9 @@ export default function(configDir) {
       new webpack.HotModuleReplacementPlugin(),
       new CaseSensitivePathsPlugin(),
       new WatchMissingNodeModulesPlugin(nodeModulesPaths),
-      new webpack.ProgressPlugin(),
+      quiet ? null : new webpack.ProgressPlugin(),
       new Dotenv({ silent: true }),
-    ],
+    ].filter(Boolean),
     module: {
       rules: [
         {

diff --git a/app/vue/src/server/config/webpack.config.js b/app/vue/src/server/config/webpack.config.js
@@ -12,7 +12,7 @@ import { getPreviewHeadHtml, getManagerHeadHtml } from '../utils';
 import babelLoaderConfig from './babel';
 import { version } from '../../../package.json';
 
-export default function(configDir) {
+export default function(configDir, quiet) {
   const config = {
     devtool: 'cheap-module-source-map',
     entry: {
@@ -51,9 +51,9 @@ export default function(configDir) {
       new webpack.HotModuleReplacementPlugin(),
       new CaseSensitivePathsPlugin(),
       new WatchMissingNodeModulesPlugin(nodeModulesPaths),
-      new webpack.ProgressPlugin(),
+      quiet ? null : new webpack.ProgressPlugin(),
       new Dotenv({ silent: true }),
-    ],
+    ].filter(Boolean),
     module: {
       rules: [
         {

diff --git a/docs/src/pages/configurations/cli-options/index.md b/docs/src/pages/configurations/cli-options/index.md
@@ -21,6 +21,7 @@ Here are all those options:
       -h, --host [string]           Host to run Storybook
       -s, --static-dir <dir-names>  Directory where to load static files from, comma-separated list
       -c, --config-dir [dir-name]   Directory where to load Storybook configurations from
+      --quiet                       Suppress verbose build output
 
 ## For build-storybook
 

diff --git a/lib/core/src/server/build-dev.js b/lib/core/src/server/build-dev.js
@@ -32,6 +32,7 @@ export function buildDev({ packageJson, getBaseConfig, loadConfig, defaultFavIco
     .option('--ssl-cert <cert>', 'Provide an SSL certificate. (Required with --https)')
     .option('--ssl-key <key>', 'Provide an SSL key. (Required with --https)')
     .option('--smoke-test', 'Exit after successful start')
+    .option('--quiet', 'Suppress verbose build output')
     .option('-d, --db-path [db-file]', 'DEPRECATED!')
     .option('--enable-db', 'DEPRECATED!')
     .parse(process.argv);
@@ -132,7 +133,7 @@ export function buildDev({ packageJson, getBaseConfig, loadConfig, defaultFavIco
 
   // NOTE changes to env should be done before calling `getBaseConfig`
   // `getBaseConfig` function which is called inside the middleware
-  app.use(storybook(configDir, loadConfig, getBaseConfig));
+  app.use(storybook(configDir, loadConfig, getBaseConfig, program.quiet));
 
   let serverResolve = () => {};
   let serverReject = () => {};

diff --git a/lib/core/src/server/middleware.js b/lib/core/src/server/middleware.js
@@ -13,10 +13,10 @@ export const webpackValid = new Promise((resolve, reject) => {
   webpackReject = reject;
 });
 
-export default function(configDir, loadConfig, getBaseConfig) {
+export default function(configDir, loadConfig, getBaseConfig, quiet) {
   // Build the webpack configuration using the `getBaseConfig`
   // custom `.babelrc` file and `webpack.config.js` files
-  const config = loadConfig('DEVELOPMENT', getBaseConfig(configDir), configDir);
+  const config = loadConfig('DEVELOPMENT', getBaseConfig(configDir, quiet), configDir);
   const middlewareFn = getMiddleware(configDir);
 
   // remove the leading '/'