2.0.0

webpack-contrib · Feb 26, 2018 · 1ed9dac · 1ed9dac
1 parent 3c1c296
commit 1ed9dac
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 2.0.0 - 2018-02-26
+
+- 🚨 Drop [email protected] support (by @wonism in [#212](https://github.com/webpack-contrib/eslint-loader/pull/212))
+- 🚨 Drop Node 4 supported (by @wonism in [#212](https://github.com/webpack-contrib/eslint-loader/pull/212))
+- ✨ Add [email protected] support (by @wonism in [#212](https://github.com/webpack-contrib/eslint-loader/pull/212))
+- 🐛 Respect `eslintPath` for formatter (by @lmnsg in [#195](https://github.com/webpack-contrib/eslint-loader/pull/195))
+
 # 1.9.0 - 2017-07-06
 
 - Added: `eslintPath` option so you can provide your own eslint path.

diff --git a/index.js b/index.js
@@ -120,7 +120,7 @@ function printLinterOutput(res, config, webpack) {
           )
         }
 
-        emitter(webpack.version === 2 ? new ESLintError(messages) : messages)
+        emitter(new ESLintError(messages))
       }
       else {
         throw new Error(

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-loader",
-  "version": "1.9.0",
+  "version": "2.0.0",
   "description": "eslint loader (for webpack)",
   "keywords": [
     "lint",
@@ -16,7 +16,8 @@
     "index.js"
   ],
   "peerDependencies": {
-    "eslint": ">=1.6.0 <5.0.0"
+    "eslint": ">=1.6.0 <5.0.0",
+    "webpack": ">=2.0.0 <5.0.0"
   },
   "dependencies": {
     "loader-fs-cache": "^1.0.0",

diff --git a/test/utils/conf.js b/test/utils/conf.js
@@ -38,8 +38,6 @@ module.exports = function conf(webpackConf, loaderConf) {
     }, loaderConf),
   }
 
-  // webpack v1 allows loader option to be added directly to the root webpack
-  // config object
   // webpack v2 requires them to be added via the LoaderOptionsPlugin
   // webpack v4 needs mode option
   return assign(DEFAULT_CONFIG,
-Original file line number
+Diff line change
@@ Expand Up / @@ -120,7 +120,7 @@ function printLinterOutput(res, config, webpack) { @@
               )
             }
-            emitter(webpack.version === 2 ? new ESLintError(messages) : messages)
+            emitter(new ESLintError(messages))
           }
           else {
             throw new Error(
@@ Expand Down @@