diff --git a/meta.js b/meta.js index 6f7b0f80d8..07d1b18303 100644 --- a/meta.js +++ b/meta.js @@ -105,6 +105,7 @@ module.exports = { ".eslintrc.js": "lint", ".eslintignore": "lint", "config/test.env.js": "unit || e2e", + "build/webpack.test.conf.js": "e2e || (unit && runner === 'karma')", "test/unit/**/*": "unit", "test/unit/index.js": "unit && runner === 'karma'", "test/unit/karma.conf.js": "unit && runner === 'karma'", diff --git a/template/.babelrc b/template/.babelrc index 050e00e28c..953e101125 100644 --- a/template/.babelrc +++ b/template/.babelrc @@ -5,12 +5,11 @@ }], "stage-2" ], - "plugins": ["transform-runtime"], + "plugins": ["transform-runtime"]{{#if_or unit e2e}}, "env": { "test": { "presets": ["env", "stage-2"]{{#if_eq runner "karma"}}, - "plugins": ["istanbul"] - {{/if_eq}} + "plugins": ["istanbul"]{{/if_eq}} } - } + }{{/if_or}} } diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js index d344b962b4..813a7b0ccd 100644 --- a/template/build/webpack.dev.conf.js +++ b/template/build/webpack.dev.conf.js @@ -14,12 +14,13 @@ const devWebpackConfig = merge(baseWebpackConfig, { }, // cheap-module-eval-source-map is faster for development devtool: config.dev.devtool, - + // these devServer options should be customized in /config/index.js devServer: { clientLogLevel: 'warning', historyApiFallback: true, hot: true, + compress: true, host: process.env.HOST || config.dev.host, port: process.env.PORT || config.dev.port, open: config.dev.autoOpenBrowser, @@ -37,7 +38,7 @@ const devWebpackConfig = merge(baseWebpackConfig, { plugins: [ new webpack.DefinePlugin({ 'process.env': require('../config/dev.env') - }), + }), new webpack.HotModuleReplacementPlugin(), new webpack.NamedModulesPlugin(), // HMR shows correct file names in console on update. new webpack.NoEmitOnErrorsPlugin(), diff --git a/template/config/index.js b/template/config/index.js index cb24cb81bb..964b4112c2 100644 --- a/template/config/index.js +++ b/template/config/index.js @@ -14,7 +14,7 @@ module.exports = { // Various Dev Server settings host: 'localhost', // can be overwritten by process.env.HOST - port: 8080, // can be overwritten by process.env.HOST, if port is in use, a free one will be determined + port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, notifyOnErrors: true, @@ -47,7 +47,7 @@ module.exports = { // just be aware of this issue when enabling this option. cssSourceMap: false, }, - + build: { // Template for index.html index: path.resolve(__dirname, '../dist/index.html'), @@ -64,14 +64,14 @@ module.exports = { productionSourceMap: true, // https://webpack.js.org/configuration/devtool/#production devtool: '#source-map', - + // Gzip off by default as many popular static hosts such as // Surge or Netlify already gzip all static assets for you. // Before setting to `true`, make sure to: // npm install --save-dev compression-webpack-plugin productionGzip: false, productionGzipExtensions: ['js', 'css'], - + // Run the build command with an extra argument to // View the bundle analyzer report after build finishes: // `npm run build --report`