Authored by dongjunjie

1

This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
@@ -12,7 +12,7 @@ module.exports = { @@ -12,7 +12,7 @@ module.exports = {
12 alias: { 12 alias: {
13 jquery: path.resolve(baseName, './jquery.js'), 13 jquery: path.resolve(baseName, './jquery.js'),
14 vue: path.resolve(baseName, './vue.min.js'), 14 vue: path.resolve(baseName, './vue.min.js'),
15 - echarts:path.resolve(baseName, './echarts.simple.min.js'), 15 + echarts:path.resolve(baseName, './echarts2.js'),
16 util:path.resolve(baseName, './util.js') 16 util:path.resolve(baseName, './util.js')
17 }, 17 },
18 extensions: ['', '.js', '.vue', '.scss'] 18 extensions: ['', '.js', '.vue', '.scss']
@@ -21,8 +21,8 @@ module.exports = { @@ -21,8 +21,8 @@ module.exports = {
21 loaders: [ 21 loaders: [
22 { test: /\.vue$/, loader: "vue" }, 22 { test: /\.vue$/, loader: "vue" },
23 { test: /\.scss$/, loader: ExtractTextPlugin.extract("style-loader", 'css-loader!autoprefixer!sass-loader') }, 23 { test: /\.scss$/, loader: ExtractTextPlugin.extract("style-loader", 'css-loader!autoprefixer!sass-loader') },
24 - { test: /\.js$/, loader: 'babel', exclude: /node_modules/ },  
25 - { test: /\.(png|jpg|gif)$/, loader: 'url?limit=10000&name=./images/[name].[ext]?[hash:10]', }, 24 + { test: /\.js$/, loader: 'babel', exclude: [/node_modules/] },
  25 + { test: /\.(png|jpg|gif)$/, loader: 'url?limit=10000&name=./images/[name].[ext]?[hash:10]'},
26 ] 26 ]
27 }, 27 },
28 babel: { 28 babel: {