Skip to content

Commit 33166f2

Browse files
authored
Merge pull request webpack#6928 from alberto/eslint-config-overrides
Consolidate eslint config
2 parents 0e404b8 + 69d3548 commit 33166f2

File tree

4 files changed

+8
-21
lines changed

4 files changed

+8
-21
lines changed

.eslintrc.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,21 @@ module.exports = {
4343
{
4444
files: ["lib/**/*.runtime.js", "buildin/*.js", "hot/*.js"],
4545
env: {
46-
es6: false
46+
es6: false,
47+
browser: true
4748
},
4849
globals: {
4950
Promise: false,
5051
},
5152
parserOptions: {
5253
ecmaVersion: 5
5354
}
55+
},
56+
{
57+
files: ["test/**/*.js"],
58+
env: {
59+
mocha: true,
60+
}
5461
}
5562
]
5663
};

buildin/.eslintrc

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

hot/.eslintrc

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

test/.eslintrc.js

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

0 commit comments

Comments
 (0)