20dc04b9 by 任超

Merge branch 'master' into dev

2 parents 8a786c6a 981e0cd7
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
38 "babel-plugin-dynamic-import-node": "2.3.3", 38 "babel-plugin-dynamic-import-node": "2.3.3",
39 "chalk": "2.4.2", 39 "chalk": "2.4.2",
40 "connect": "3.6.6", 40 "connect": "3.6.6",
41 "copy-webpack-plugin": "^6.0.0",
42 "element-ui": "^2.15.13", 41 "element-ui": "^2.15.13",
43 "html-webpack-plugin": "3.2.0", 42 "html-webpack-plugin": "3.2.0",
44 "runjs": "4.3.2", 43 "runjs": "4.3.2",
......
...@@ -8,8 +8,6 @@ function resolve (dir) { ...@@ -8,8 +8,6 @@ function resolve (dir) {
8 const name = defaultSettings.title 8 const name = defaultSettings.title
9 const port = process.env.port || process.env.npm_config_port || 8888 // dev port 9 const port = process.env.port || process.env.npm_config_port || 8888 // dev port
10 10
11 const CopyWebpackPlugin = require('copy-webpack-plugin')
12
13 // All configuration item explanations can be find in https://cli.vuejs.org/config/ 11 // All configuration item explanations can be find in https://cli.vuejs.org/config/
14 module.exports = { 12 module.exports = {
15 /** 13 /**
...@@ -70,7 +68,6 @@ module.exports = { ...@@ -70,7 +68,6 @@ module.exports = {
70 '@': resolve('src') 68 '@': resolve('src')
71 } 69 }
72 }, 70 },
73 plugins: [new CopyWebpackPlugin({ patterns: [{ from: 'src/api/config.js', to: 'config.js'}] })],
74 devtool: '#eval-source-map' //测试 71 devtool: '#eval-source-map' //测试
75 }, 72 },
76 // chainWebpack通过链式编程的形式,来修改默认的webpack配置 73 // chainWebpack通过链式编程的形式,来修改默认的webpack配置
......