Skip to content

Commit 07b0b36

Browse files
committed
【update】eslint
1 parent d064751 commit 07b0b36

File tree

6 files changed

+24
-37
lines changed

6 files changed

+24
-37
lines changed

build/webpack.config.base.js

Lines changed: 21 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
var webpack = require('webpack');
2-
var ExtractTextPlugin = require('extract-text-webpack-plugin');
1+
const webpack = require('webpack');
2+
const ExtractTextPlugin = require('extract-text-webpack-plugin');
3+
const ESLintPlugin = require('eslint-webpack-plugin');
34
const pkg = require('../package.json');
45

56
//包版本(ES6或者ES5)
6-
let moduleVersion = process.env.moduleVersion || "es5";
7+
let moduleVersion = process.env.moduleVersion || 'es5';
78

89
//打包公共配置
910
module.exports = {
10-
1111
moduleVersion: moduleVersion,
1212

13-
mode: "production",
13+
mode: 'production',
1414
//页面入口文件配置
1515
entry: {},
1616

@@ -19,7 +19,7 @@ module.exports = {
1919
return {
2020
path: `${__dirname}/../dist/${libName}/`,
2121
filename: `${fileName}.js`
22-
}
22+
};
2323
},
2424

2525
//是否启用压缩
@@ -37,34 +37,25 @@ module.exports = {
3737
},
3838

3939
externals: {
40-
'echarts': 'function(){try{return echarts}catch(e){return {}}}()',
41-
'mapv': "function(){try{return mapv}catch(e){return {}}}()",
42-
'elasticsearch': 'function(){try{return elasticsearch}catch(e){return {}}}()'
40+
echarts: 'function(){try{return echarts}catch(e){return {}}}()',
41+
mapv: 'function(){try{return mapv}catch(e){return {}}}()',
42+
elasticsearch: 'function(){try{return elasticsearch}catch(e){return {}}}()'
4343
},
4444

4545
module: {
4646
rules: {
4747
img: {
4848
//图片小于80k采用base64编码
4949
test: /\.(png|jpg|jpeg|gif|woff|woff2|svg|eot|ttf)$/,
50-
use: [{
51-
loader: 'url-loader',
52-
options: {
53-
limit: 150000
50+
use: [
51+
{
52+
loader: 'url-loader',
53+
options: {
54+
limit: 150000
55+
}
5456
}
55-
}]
56-
},
57-
58-
eslint: {
59-
test: [/\.js$/],
60-
exclude: /node_modules/,
61-
enforce: 'pre',
62-
loader: 'eslint-loader',
63-
options: {
64-
failOnError: true
65-
}
57+
]
6658
},
67-
6859
css: {
6960
test: /\.css$/,
7061
use: ExtractTextPlugin.extract({
@@ -76,7 +67,6 @@ module.exports = {
7667
}
7768
},
7869

79-
8070
bannerInfo: function (libName) {
8171
return `
8272
${libName}.(${pkg.homepage})
@@ -89,8 +79,9 @@ module.exports = {
8979
plugins: function (libName, productName) {
9080
return [
9181
new webpack.BannerPlugin(this.bannerInfo(productName)),
92-
new ExtractTextPlugin(`./${productName}.css`),
93-
new webpack.NoEmitOnErrorsPlugin()
94-
]
82+
new ExtractTextPlugin(`./${productName}.css`),
83+
new webpack.NoEmitOnErrorsPlugin(),
84+
new ESLintPlugin({ failOnError: true, files: 'src' })
85+
];
9586
}
96-
};
87+
};

build/webpack.config.classic.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ module.exports = {
2626
module: {
2727
rules: (function () {
2828
let moduleRules = [];
29-
moduleRules.push(configBase.module.rules.eslint);
3029
if (configBase.moduleVersion === "es5") {
3130
//打包为es5相关配置
3231
moduleRules.push({

build/webpack.config.leaflet.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ module.exports = {
3131
rules: (function () {
3232
let moduleRules = [];
3333
moduleRules.push(configBase.module.rules.img);
34-
moduleRules.push(configBase.module.rules.eslint);
3534
if (configBase.moduleVersion === "es5") {
3635
//打包为es5相关配置
3736
moduleRules.push({

build/webpack.config.mapboxgl.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ module.exports = {
3535
rules: (function() {
3636
let moduleRules = [];
3737
moduleRules.push(configBase.module.rules.img);
38-
moduleRules.push(configBase.module.rules.eslint);
3938
if (configBase.moduleVersion === 'es5') {
4039
//打包为es5相关配置
4140
moduleRules.push({

build/webpack.config.openlayers.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ module.exports = {
4848
rules: (function() {
4949
let moduleRules = [];
5050
moduleRules.push(configBase.module.rules.img);
51-
moduleRules.push(configBase.module.rules.eslint);
5251
if (configBase.moduleVersion === 'es5') {
5352
//打包为es5相关配置
5453
moduleRules.push({

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@
7575
"cross-env": "^7.0.2",
7676
"css-loader": "^3.2.0",
7777
"es3ify-loader": "^0.2.0",
78-
"eslint": "^6.8.0",
79-
"eslint-loader": "^3.0.2",
80-
"eslint-plugin-import": "^2.18.2",
78+
"eslint": "^7.11.0",
79+
"eslint-plugin-import": "^2.22.1",
80+
"eslint-webpack-plugin": "^2.1.0",
8181
"express": "^4.16.3",
8282
"extract-text-webpack-plugin": "^4.0.0-beta.0",
8383
"get-pixels": "^3.3.0",

0 commit comments

Comments
 (0)