diff --git a/packages/cli/src/config/webpack.config.prod.js b/packages/cli/src/config/webpack.config.prod.js index 62764d0d7..54c3b9196 100644 --- a/packages/cli/src/config/webpack.config.prod.js +++ b/packages/cli/src/config/webpack.config.prod.js @@ -1,3 +1,4 @@ +// const webpack = require('webpack'); const webpackMerge = require('webpack-merge'); const commonConfig = require('./webpack.config.common.js'); @@ -12,6 +13,10 @@ module.exports = ({ config, context, graph }) => { hints: 'warning' } + // plugins: [ + // new webpack.ProgressPlugin() + // ] + }); }; \ No newline at end of file diff --git a/packages/cli/src/lifecycles/config.js b/packages/cli/src/lifecycles/config.js index 892d5a829..b7e9bea8e 100644 --- a/packages/cli/src/lifecycles/config.js +++ b/packages/cli/src/lifecycles/config.js @@ -90,10 +90,11 @@ module.exports = readAndMergeConfig = async() => { } if (themeFile) { - if (typeof themeFile !== 'string' && themeFile.indexOf('.') < 1) { + if (typeof themeFile === 'string' && themeFile.indexOf('.') > 0) { + customConfig.themeFile = themeFile; + } else { reject(`Error: greenwood.config.js themeFile must be a valid filename. got ${themeFile} instead.`); } - customConfig.themeFile = themeFile; } if (devServer && Object.keys(devServer).length > 0) { @@ -119,6 +120,7 @@ module.exports = readAndMergeConfig = async() => { } } } + resolve({ ...defaultConfig, ...customConfig }); } catch (err) { reject(err); diff --git a/packages/cli/src/tasks/build.js b/packages/cli/src/tasks/build.js index df89ff357..39b9d72e1 100644 --- a/packages/cli/src/tasks/build.js +++ b/packages/cli/src/tasks/build.js @@ -1,3 +1,4 @@ +const chalk = require('chalk'); const path = require('path'); const webpack = require('webpack'); const serializeBuild = require('../lifecycles/serialize'); @@ -32,6 +33,11 @@ const runWebpack = async (compilation) => { reject(err); } else { console.log('webpack build complete'); + + if (stats && stats.hasWarnings()) { + console.log(`${chalk.rgb(255, 255, 71)(stats.toJson('minimal').warnings[0])}`); + } + resolve(); } });