From 1f9fbacfb83a0b39f1687ae4d4993a330c242070 Mon Sep 17 00:00:00 2001 From: Clark Du Date: Mon, 27 Mar 2017 11:47:57 +0800 Subject: [PATCH] add eslint config and format build folder --- build/.eslintrc.json | 8 ++++++++ build/webpack.base.config.js | 7 +++---- build/webpack.dev.config.js | 4 ++-- build/webpack.dist.dev.config.js | 4 ++-- build/webpack.dist.prod.config.js | 4 ++-- build/webpack.test.config.js | 26 +++++++++++++------------- 6 files changed, 30 insertions(+), 23 deletions(-) create mode 100644 build/.eslintrc.json diff --git a/build/.eslintrc.json b/build/.eslintrc.json new file mode 100644 index 00000000..39235be0 --- /dev/null +++ b/build/.eslintrc.json @@ -0,0 +1,8 @@ +{ + "extends": [ + "../.eslintrc.json" + ], + "env": { + "node": true + } +} diff --git a/build/webpack.base.config.js b/build/webpack.base.config.js index fb5adc59..d7558800 100644 --- a/build/webpack.base.config.js +++ b/build/webpack.base.config.js @@ -1,10 +1,9 @@ /** * 公共配置 */ -var webpack = require('webpack'); var path = require('path'); function resolve (dir) { - return path.join(__dirname, '..', dir) + return path.join(__dirname, '..', dir) } module.exports = { @@ -61,8 +60,8 @@ module.exports = { resolve: { extensions: ['.js', '.vue'], alias: { - 'vue': 'vue/dist/vue.esm.js', - '@': resolve('src') + 'vue': 'vue/dist/vue.esm.js', + '@': resolve('src') } } }; diff --git a/build/webpack.dev.config.js b/build/webpack.dev.config.js index 699d29eb..5803c51e 100644 --- a/build/webpack.dev.config.js +++ b/build/webpack.dev.config.js @@ -6,9 +6,9 @@ var path = require('path'); var webpack = require('webpack'); // var ExtractTextPlugin = require('extract-text-webpack-plugin'); var HtmlWebpackPlugin = require('html-webpack-plugin'); -var merge = require('webpack-merge') +var merge = require('webpack-merge'); var webpackBaseConfig = require('./webpack.base.config.js'); -var FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin') +var FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin'); module.exports = merge(webpackBaseConfig, { diff --git a/build/webpack.dist.dev.config.js b/build/webpack.dist.dev.config.js index 6e040622..de27463d 100644 --- a/build/webpack.dist.dev.config.js +++ b/build/webpack.dist.dev.config.js @@ -1,9 +1,9 @@ var path = require('path'); var webpack = require('webpack'); -var merge = require('webpack-merge') +var merge = require('webpack-merge'); var webpackBaseConfig = require('./webpack.base.config.js'); -process.env.NODE_ENV = 'production' +process.env.NODE_ENV = 'production'; module.exports = merge(webpackBaseConfig, { entry: { diff --git a/build/webpack.dist.prod.config.js b/build/webpack.dist.prod.config.js index 9e2373a0..6dd09752 100644 --- a/build/webpack.dist.prod.config.js +++ b/build/webpack.dist.prod.config.js @@ -1,6 +1,6 @@ var path = require('path'); var webpack = require('webpack'); -var merge = require('webpack-merge') +var merge = require('webpack-merge'); var webpackBaseConfig = require('./webpack.base.config.js'); process.env.NODE_ENV = 'production'; @@ -28,7 +28,7 @@ module.exports = merge(webpackBaseConfig, { plugins: [ // @todo new webpack.DefinePlugin({ - 'process.env.NODE_ENV': '"production"' + 'process.env.NODE_ENV': '"production"' }), new webpack.optimize.UglifyJsPlugin({ compress: { diff --git a/build/webpack.test.config.js b/build/webpack.test.config.js index 6c3212b7..5c246011 100644 --- a/build/webpack.test.config.js +++ b/build/webpack.test.config.js @@ -2,24 +2,24 @@ * 用于单元测试 */ -var webpack = require('webpack') -var merge = require('webpack-merge') +var webpack = require('webpack'); +var merge = require('webpack-merge'); var webpackBaseConfig = require('./webpack.base.config.js'); var webpackConfig = merge(webpackBaseConfig, { // use inline sourcemap for karma-sourcemap-loader - devtool: '#inline-source-map', - plugins: [ - new webpack.DefinePlugin({ - 'process.env': { - NODE_ENV: '"testing"' - } - }) - ] -}) + devtool: '#inline-source-map', + plugins: [ + new webpack.DefinePlugin({ + 'process.env': { + NODE_ENV: '"testing"' + } + }) + ] +}); // no need for app entry during tests -delete webpackConfig.entry +delete webpackConfig.entry; -module.exports = webpackConfig +module.exports = webpackConfig;