From 857ef3c807d9a32ec4faabf65467dcd76e81c00b Mon Sep 17 00:00:00 2001 From: Evan You Date: Wed, 16 Mar 2016 02:54:06 -0400 Subject: [PATCH] move default css loaders into base config --- template/build/webpack.base.conf.js | 7 +++++++ template/build/webpack.dev.conf.js | 7 ------- template/test/unit/karma.conf.js | 7 ------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js index 010c60a1fb..21c0c75247 100644 --- a/template/build/webpack.base.conf.js +++ b/template/build/webpack.base.conf.js @@ -1,4 +1,5 @@ var path = require('path') +var cssLoaders = require('./css-loaders') var projectRoot = path.resolve(__dirname, '../') module.exports = { @@ -64,6 +65,12 @@ module.exports = { } ] }, + vue: { + loaders: cssLoaders({ + sourceMap: false, + extract: false + }) + }, eslint: { formatter: require('eslint-friendly-formatter') } diff --git a/template/build/webpack.dev.conf.js b/template/build/webpack.dev.conf.js index 48ee8dc91b..861da8894c 100644 --- a/template/build/webpack.dev.conf.js +++ b/template/build/webpack.dev.conf.js @@ -1,7 +1,6 @@ var webpack = require('webpack') var merge = require('webpack-merge') var baseConfig = require('./webpack.base.conf') -var cssLoaders = require('./css-loaders') var HtmlWebpackPlugin = require('html-webpack-plugin') // add hot-reload related code to entry chunks @@ -17,12 +16,6 @@ module.exports = merge(baseConfig, { // when serving the html from in-memory publicPath: '/' }, - vue: { - loaders: cssLoaders({ - sourceMap: false, - extract: false - }) - }, plugins: [ // https://github.com/glenjamin/webpack-hot-middleware#installation--usage new webpack.optimize.OccurenceOrderPlugin(), diff --git a/template/test/unit/karma.conf.js b/template/test/unit/karma.conf.js index 7960123e7d..85cf7255eb 100644 --- a/template/test/unit/karma.conf.js +++ b/template/test/unit/karma.conf.js @@ -7,10 +7,6 @@ var path = require('path') var merge = require('webpack-merge') var baseConfig = require('../../build/webpack.base.conf') var projectRoot = path.resolve(__dirname, '../../') -var cssLoaders = require('../../build/css-loaders')({ - sourceMap: false, - extract: false -}) var webpackConfig = merge(baseConfig, { // use inline sourcemap for karma-sourcemap-loader @@ -22,9 +18,6 @@ var webpackConfig = merge(baseConfig, { } }) -// merge css loaders with vue loaders -webpackConfig.vue.loaders = merge(webpackConfig.vue.loaders, cssLoaders) - // no need for app entry during tests delete webpackConfig.entry