Commit 5e7ad5e05a6a55bab0973fd4783161c58a77bccc
Committed by
GitHub
Merge pull request #500 from clarkdo/2.0
add eslint config and format build folder
Showing
6 changed files
with
30 additions
and
23 deletions
Show diff stats
build/webpack.base.config.js
1 | 1 | /** |
2 | 2 | * 公共配置 |
3 | 3 | */ |
4 | -var webpack = require('webpack'); | |
5 | 4 | var path = require('path'); |
6 | 5 | function resolve (dir) { |
7 | - return path.join(__dirname, '..', dir) | |
6 | + return path.join(__dirname, '..', dir) | |
8 | 7 | } |
9 | 8 | |
10 | 9 | module.exports = { |
... | ... | @@ -61,8 +60,8 @@ module.exports = { |
61 | 60 | resolve: { |
62 | 61 | extensions: ['.js', '.vue'], |
63 | 62 | alias: { |
64 | - 'vue': 'vue/dist/vue.esm.js', | |
65 | - '@': resolve('src') | |
63 | + 'vue': 'vue/dist/vue.esm.js', | |
64 | + '@': resolve('src') | |
66 | 65 | } |
67 | 66 | } |
68 | 67 | }; | ... | ... |
build/webpack.dev.config.js
... | ... | @@ -6,9 +6,9 @@ var path = require('path'); |
6 | 6 | var webpack = require('webpack'); |
7 | 7 | // var ExtractTextPlugin = require('extract-text-webpack-plugin'); |
8 | 8 | var HtmlWebpackPlugin = require('html-webpack-plugin'); |
9 | -var merge = require('webpack-merge') | |
9 | +var merge = require('webpack-merge'); | |
10 | 10 | var webpackBaseConfig = require('./webpack.base.config.js'); |
11 | -var FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin') | |
11 | +var FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin'); | |
12 | 12 | |
13 | 13 | |
14 | 14 | module.exports = merge(webpackBaseConfig, { | ... | ... |
build/webpack.dist.dev.config.js
1 | 1 | var path = require('path'); |
2 | 2 | var webpack = require('webpack'); |
3 | -var merge = require('webpack-merge') | |
3 | +var merge = require('webpack-merge'); | |
4 | 4 | var webpackBaseConfig = require('./webpack.base.config.js'); |
5 | 5 | |
6 | -process.env.NODE_ENV = 'production' | |
6 | +process.env.NODE_ENV = 'production'; | |
7 | 7 | |
8 | 8 | module.exports = merge(webpackBaseConfig, { |
9 | 9 | entry: { | ... | ... |
build/webpack.dist.prod.config.js
1 | 1 | var path = require('path'); |
2 | 2 | var webpack = require('webpack'); |
3 | -var merge = require('webpack-merge') | |
3 | +var merge = require('webpack-merge'); | |
4 | 4 | var webpackBaseConfig = require('./webpack.base.config.js'); |
5 | 5 | |
6 | 6 | process.env.NODE_ENV = 'production'; |
... | ... | @@ -28,7 +28,7 @@ module.exports = merge(webpackBaseConfig, { |
28 | 28 | plugins: [ |
29 | 29 | // @todo |
30 | 30 | new webpack.DefinePlugin({ |
31 | - 'process.env.NODE_ENV': '"production"' | |
31 | + 'process.env.NODE_ENV': '"production"' | |
32 | 32 | }), |
33 | 33 | new webpack.optimize.UglifyJsPlugin({ |
34 | 34 | compress: { | ... | ... |
build/webpack.test.config.js
... | ... | @@ -2,24 +2,24 @@ |
2 | 2 | * 用于单元测试 |
3 | 3 | */ |
4 | 4 | |
5 | -var webpack = require('webpack') | |
6 | -var merge = require('webpack-merge') | |
5 | +var webpack = require('webpack'); | |
6 | +var merge = require('webpack-merge'); | |
7 | 7 | var webpackBaseConfig = require('./webpack.base.config.js'); |
8 | 8 | |
9 | 9 | |
10 | 10 | var webpackConfig = merge(webpackBaseConfig, { |
11 | 11 | // use inline sourcemap for karma-sourcemap-loader |
12 | - devtool: '#inline-source-map', | |
13 | - plugins: [ | |
14 | - new webpack.DefinePlugin({ | |
15 | - 'process.env': { | |
16 | - NODE_ENV: '"testing"' | |
17 | - } | |
18 | - }) | |
19 | - ] | |
20 | -}) | |
12 | + devtool: '#inline-source-map', | |
13 | + plugins: [ | |
14 | + new webpack.DefinePlugin({ | |
15 | + 'process.env': { | |
16 | + NODE_ENV: '"testing"' | |
17 | + } | |
18 | + }) | |
19 | + ] | |
20 | +}); | |
21 | 21 | |
22 | 22 | // no need for app entry during tests |
23 | -delete webpackConfig.entry | |
23 | +delete webpackConfig.entry; | |
24 | 24 | |
25 | -module.exports = webpackConfig | |
25 | +module.exports = webpackConfig; | ... | ... |