Skip to content
This repository was archived by the owner on Sep 28, 2020. It is now read-only.

Commit 2ddc184

Browse files
committed
use eslint-config-i-am-meticulous + --fix
1 parent c8e6ad5 commit 2ddc184

24 files changed

+227
-115
lines changed

.eslintrc

Lines changed: 0 additions & 16 deletions
This file was deleted.

index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
var assign = require("object-assign");
44
var loaderUtils = require("loader-utils");
55
var objectHash = require("object-hash");
6-
var pkg = require("./package.json");
76
var createCache = require("loader-fs-cache");
7+
8+
var pkg = require("./package.json");
9+
810
var cache = createCache("eslint-loader");
911

1012
var engines = {};

package.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@
2929
"devDependencies": {
3030
"ava": "^0.17.0",
3131
"eslint": "^5.1.0",
32+
"eslint-config-i-am-meticulous": "^11.0.0",
3233
"eslint-friendly-formatter": "^2.0.4",
3334
"husky": "^0.14.3",
35+
"mkdirp": "^0.5.1",
3436
"npmpub": "^4.0.1",
3537
"prettier": "^1.13.7",
3638
"pretty-quick": "^1.6.0",
@@ -43,6 +45,13 @@
4345
"test": "npm run lint && npm run ava",
4446
"release": "npmpub"
4547
},
48+
"eslintConfig": {
49+
"extends": "eslint-config-i-am-meticulous",
50+
"rules": {
51+
"no-var": 0,
52+
"prefer-const": 0
53+
}
54+
},
4655
"ava": {
4756
"files": [
4857
"test/*.js"

test/autofix.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
var fs = require("fs");
2+
13
var test = require("ava");
24
var webpack = require("webpack");
5+
36
var conf = require("./utils/conf");
4-
var fs = require("fs");
57

68
// clone the "fixable" file, so that we do not lose the original contents
79
// when the fixes are applied to disk

test/cache.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
var test = require("ava");
21
var fs = require("fs");
32
var path = require("path");
3+
4+
var test = require("ava");
45
var assign = require("object-assign");
56
var rimraf = require("rimraf");
7+
var mkdirp = require("mkdirp");
68
var webpack = require("webpack");
79

810
var defaultCacheDir = path.join(
@@ -252,7 +254,6 @@ test.cb.serial("should generate a new file if the identifier changes", t => {
252254
});
253255
});
254256

255-
var mkdirp = require("mkdirp");
256257
function createTestDirectory(baseDirectory, testTitle, cb) {
257258
const directory = path.join(baseDirectory, escapeDirectory(testTitle));
258259

test/error.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
var test = require("ava");
22
var webpack = require("webpack");
3+
34
var conf = require("./utils/conf");
45

56
test.cb("eslint-loader can return error if file is bad", function(t) {

test/eslint-path.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
var path = require("path");
2+
23
var test = require("ava");
34
var webpack = require("webpack");
5+
46
var conf = require("./utils/conf");
57

68
test.cb(

test/eslintignore.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
var test = require("ava");
22
var webpack = require("webpack");
3+
34
var conf = require("./utils/conf");
45

56
test.cb("eslint-loader ignores files present in .eslintignore", function(t) {

test/fail-on-error-async-and-emit.js

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
var test = require("ava");
2+
var webpack = require("webpack");
3+
4+
var conf = require("./utils/conf");
5+
6+
test.cb("emits errors in async mode", function(t) {
7+
t.plan(1);
8+
webpack(
9+
conf(
10+
{
11+
cache: true,
12+
entry: "./test/fixtures/error.js"
13+
},
14+
{
15+
failOnError: true,
16+
emitError: true,
17+
cache: true
18+
}
19+
),
20+
function(err, stats) {
21+
if (err) {
22+
throw err;
23+
}
24+
25+
// console.log(stats.compilation.errors)
26+
t.true(
27+
stats.hasErrors(),
28+
"a file that contains eslint errors should return error"
29+
);
30+
t.end();
31+
}
32+
);
33+
});
34+
35+
test.cb("correctly indentifies a success", function(t) {
36+
t.plan(1);
37+
webpack(
38+
conf(
39+
{
40+
cache: true,
41+
entry: "./test/fixtures/good.js"
42+
},
43+
{
44+
failOnError: true,
45+
emitError: true,
46+
cache: true
47+
}
48+
),
49+
function(err, stats) {
50+
if (err) {
51+
throw err;
52+
}
53+
54+
// console.log(stats.compilation.errors)
55+
t.false(
56+
stats.hasErrors(),
57+
"a file that doesn't contains eslint errors should not return errors"
58+
);
59+
t.end();
60+
}
61+
);
62+
});

test/fail-on-error/async-and-emit.js

Lines changed: 0 additions & 56 deletions
This file was deleted.

test/force-emit-error.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
var test = require("ava");
22
var webpack = require("webpack");
3+
34
var conf = require("./utils/conf");
45

56
test.cb("eslint-loader can force to emit error", function(t) {

test/force-emit-warning.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
var test = require("ava");
22
var webpack = require("webpack");
3+
34
var conf = require("./utils/conf");
45

56
test.cb("eslint-loader can force to emit warning", function(t) {

test/formatter-custom.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-disable no-console */
22
var test = require("ava");
33
var webpack = require("webpack");
4+
45
var conf = require("./utils/conf");
56

67
test.cb("eslint-loader can use custom formatter", function(t) {

test/formatter-eslint.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-disable no-console */
22
var test = require("ava");
33
var webpack = require("webpack");
4+
45
var conf = require("./utils/conf");
56

67
test.cb("eslint-loader can use eslint formatter", function(t) {

test/formatter-multiple-entries.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
var fs = require("fs");
2+
var path = require("path");
3+
14
var test = require("ava");
25
var webpack = require("webpack");
6+
37
var conf = require("./utils/conf");
4-
var fs = require("fs");
5-
var path = require("path");
68

79
test.cb(
810
"eslint-loader can be configured to write multiple eslint result files",

test/formatter-write.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
/* eslint-disable no-console */
2+
var fs = require("fs");
3+
24
var test = require("ava");
35
var webpack = require("webpack");
6+
47
var conf = require("./utils/conf");
5-
var fs = require("fs");
68

79
test.cb(
810
"eslint-loader can be configured to write eslint results to a file",

test/multiple-engines.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
var test = require("ava");
22
var webpack = require("webpack");
3+
34
var conf = require("./utils/conf");
45

56
test.cb("eslint-loader will create an engine for each unique config", function(

test/ok.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
var test = require("ava");
22
var webpack = require("webpack");
3+
34
var conf = require("./utils/conf");
45

56
test.cb("eslint-loader don't throw error if file is ok", function(t) {

test/parameters.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
var test = require("ava");
22
var webpack = require("webpack");
3+
34
var conf = require("./utils/conf");
45

56
test.cb("eslint-loader supports query strings parameters", function(t) {

test/quiet.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
var test = require("ava");
22
var webpack = require("webpack");
3+
34
var conf = require("./utils/conf");
45

56
test.cb(

test/utils/conf.js

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
1-
var path = require("path")
2-
var assign = require("object-assign")
1+
var path = require("path");
32

4-
var webpack = require("webpack")
5-
var webpackVersion = require("./version.js")
3+
var assign = require("object-assign");
4+
var webpack = require("webpack");
5+
6+
var webpackVersion = require("./version.js");
67

78
var DEFAULT_CONFIG = {
89
output: {
910
path: path.join(__dirname, "..", "output") + path.sep,
10-
filename: "bundle.js",
11+
filename: "bundle.js"
1112
},
1213
module: {
1314
rules: [
1415
{
1516
test: /\.js$/,
1617
use: "./index",
17-
exclude: /node_modules/,
18-
},
19-
],
20-
},
21-
}
18+
exclude: /node_modules/
19+
}
20+
]
21+
}
22+
};
2223

2324
/**
2425
* Returns a valid config for both webpack versions 1 and 2.
@@ -27,29 +28,28 @@ var DEFAULT_CONFIG = {
2728
* @returns {Object}
2829
*/
2930
module.exports = function conf(webpackConf, loaderConf) {
30-
var mode = webpackVersion < 4 ? {} : {mode: "development"}
31+
var mode = webpackVersion < 4 ? {} : { mode: "development" };
3132

3233
loaderConf = {
33-
eslint: assign({
34-
// this disables the use of .eslintignore, since it contains the fixtures
35-
// folder to skip it on the global linting, but here we want the opposite
36-
// (we only use .eslintignore on the test that checks this)
37-
ignore: false,
38-
}, loaderConf),
39-
}
34+
eslint: assign(
35+
{
36+
// this disables the use of .eslintignore, since it contains the fixtures
37+
// folder to skip it on the global linting, but here we want the opposite
38+
// (we only use .eslintignore on the test that checks this)
39+
ignore: false
40+
},
41+
loaderConf
42+
)
43+
};
4044

4145
// webpack v2 requires them to be added via the LoaderOptionsPlugin
4246
// webpack v4 needs mode option
43-
return assign(DEFAULT_CONFIG,
44-
mode,
45-
webpackConf,
46-
{
47-
plugins: [
48-
new webpack.LoaderOptionsPlugin({
49-
exclude: /node_modules/,
50-
options: loaderConf,
51-
}),
52-
],
53-
}
54-
)
55-
}
47+
return assign(DEFAULT_CONFIG, mode, webpackConf, {
48+
plugins: [
49+
new webpack.LoaderOptionsPlugin({
50+
exclude: /node_modules/,
51+
options: loaderConf
52+
})
53+
]
54+
});
55+
};

0 commit comments

Comments
 (0)