update: vuejs-templates/webpack to 1.3.1

This commit is contained in:
xidedix
2018-03-29 17:16:08 +02:00
parent bc16f142d6
commit 18d7f18af3
192 changed files with 21580 additions and 2056 deletions
+7 -6
View File
@@ -1,11 +1,12 @@
'use strict'
// This is the webpack config used for unit tests.
var utils = require('./utils')
var webpack = require('webpack')
var merge = require('webpack-merge')
var baseConfig = require('./webpack.base.conf')
const utils = require('./utils')
const webpack = require('webpack')
const merge = require('webpack-merge')
const baseWebpackConfig = require('./webpack.base.conf')
var webpackConfig = merge(baseConfig, {
const webpackConfig = merge(baseWebpackConfig, {
// use inline sourcemap for karma-sourcemap-loader
module: {
rules: utils.styleLoaders()
@@ -13,7 +14,7 @@ var webpackConfig = merge(baseConfig, {
devtool: '#inline-source-map',
resolveLoader: {
alias: {
// necessary to to make lang="scss" work in test when using vue-loader's ?inject option
// necessary to to make lang="scss" work in test when using vue-loader's ?inject option
// see discussion at https://github.com/vuejs/vue-loader/issues/724
'scss-loader': 'sass-loader'
}