From fc74d39eb4c3c1a359640d69935a0b94700f0353 Mon Sep 17 00:00:00 2001 From: Baldvin Mar Smarason Date: Wed, 25 Apr 2018 10:24:02 -0700 Subject: [PATCH 1/3] Suppress verbose build output --- app/angular/src/server/config/webpack.config.js | 5 +++-- app/polymer/src/server/config/webpack.config.js | 5 +++-- app/react/src/server/config/webpack.config.js | 6 +++--- app/vue/src/server/config/webpack.config.js | 6 +++--- lib/core/src/server/build-dev.js | 3 ++- lib/core/src/server/middleware.js | 4 ++-- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/app/angular/src/server/config/webpack.config.js b/app/angular/src/server/config/webpack.config.js index f9e4cecd1795..7b04bffefc7b 100644 --- a/app/angular/src/server/config/webpack.config.js +++ b/app/angular/src/server/config/webpack.config.js @@ -17,7 +17,7 @@ import { includePaths, excludePaths, nodeModulesPaths, loadEnv, nodePaths } from import babelLoaderConfig from './babel'; import { version } from '../../../package.json'; -export default function(configDir) { +export default function(configDir, quiet) { const config = { mode: 'development', devtool: 'cheap-module-source-map', @@ -60,12 +60,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 index 367ac7bfc4e7..1231e97a9e4f 100644 --- a/app/polymer/src/server/config/webpack.config.js +++ b/app/polymer/src/server/config/webpack.config.js @@ -17,7 +17,7 @@ import { includePaths, excludePaths, nodeModulesPaths, loadEnv, nodePaths } from import babelLoaderConfig from './babel'; import { version } from '../../../package.json'; -export default function(configDir) { +export default function(configDir, quiet) { const config = { mode: 'development', devtool: 'cheap-module-source-map', @@ -60,8 +60,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 index 5e23a7e2172b..f0e9918f4da4 100644 --- a/app/react/src/server/config/webpack.config.js +++ b/app/react/src/server/config/webpack.config.js @@ -17,7 +17,7 @@ import { includePaths, excludePaths, nodeModulesPaths, loadEnv, nodePaths } from import babelLoaderConfig from './babel'; import { version } from '../../../package.json'; -export default function(configDir) { +export default function(configDir, quiet) { const config = { mode: 'development', devtool: 'cheap-module-source-map', @@ -59,9 +59,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 index d08c16814f28..af905bdc60a5 100644 --- a/app/vue/src/server/config/webpack.config.js +++ b/app/vue/src/server/config/webpack.config.js @@ -17,7 +17,7 @@ import { includePaths, excludePaths, nodeModulesPaths, loadEnv, nodePaths } from import babelLoaderConfig from './babel'; import { version } from '../../../package.json'; -export default function(configDir) { +export default function(configDir, quiet) { const config = { mode: 'development', devtool: 'cheap-module-source-map', @@ -59,9 +59,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/lib/core/src/server/build-dev.js b/lib/core/src/server/build-dev.js index 0516dc431462..4d92802fcab1 100644 --- 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 ', 'Provide an SSL certificate. (Required with --https)') .option('--ssl-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 index ad9e1862d07a..23b2c2df490f 100644 --- 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 '/' From 41ca8bd4dc173e3e5aaca31bb1ae08ead649f535 Mon Sep 17 00:00:00 2001 From: Baldvin Mar Smarason Date: Wed, 25 Apr 2018 10:29:41 -0700 Subject: [PATCH 2/3] Add documentation --- docs/src/pages/configurations/cli-options/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/src/pages/configurations/cli-options/index.md b/docs/src/pages/configurations/cli-options/index.md index 4879709c5b8a..4318701e0ce8 100644 --- 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 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 From c1f3337bfed09035c8a28c7cc9fa1d419d59303a Mon Sep 17 00:00:00 2001 From: Baldvin Mar Smarason Date: Wed, 25 Apr 2018 15:59:02 -0700 Subject: [PATCH 3/3] Add update config to app/mithril --- app/mithril/src/server/config/webpack.config.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/mithril/src/server/config/webpack.config.js b/app/mithril/src/server/config/webpack.config.js index 5e23a7e2172b..f0e9918f4da4 100644 --- a/app/mithril/src/server/config/webpack.config.js +++ b/app/mithril/src/server/config/webpack.config.js @@ -17,7 +17,7 @@ import { includePaths, excludePaths, nodeModulesPaths, loadEnv, nodePaths } from import babelLoaderConfig from './babel'; import { version } from '../../../package.json'; -export default function(configDir) { +export default function(configDir, quiet) { const config = { mode: 'development', devtool: 'cheap-module-source-map', @@ -59,9 +59,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: [ {