Merge branch 'depfu/update/npm/eslint-config-onelint-3.0.0'

* depfu/update/npm/eslint-config-onelint-3.0.0: eslint-disable-next-line handle-callback-err eslint --fix . Upgrade eslint to version 4.19.1 Upgrade eslint-config-onelint to version 3.0.0
papandreou · May 27, 2018 · b4484d6 · b4484d6
2 parents 707c150 + e715ad3
commit b4484d6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/lib/processImage.js b/lib/processImage.js
@@ -57,6 +57,8 @@ module.exports = function (options) {
                 }
             }
             delete req.headers['if-modified-since']; // Prevent false positive conditional GETs after enabling processimage
+            // hijackResponse will never pass an error here
+            // eslint-disable-next-line handle-callback-err
             hijackResponse(res, function (err, res) {
                 // Polyfill res.status for browser-sync compatibility
                 if (typeof res.status !== 'function') {

diff --git a/package.json b/package.json
@@ -32,8 +32,8 @@
     "browser-sync": "^2.18.6",
     "compression": "^1.6.1",
     "coveralls": "^2.11.4",
-    "eslint": "^3.13.1",
-    "eslint-config-onelint": "^1.1.0",
+    "eslint": "^4.19.1",
+    "eslint-config-onelint": "^3.0.0",
     "express": "^4.13.4",
     "gifsicle-stream": "^0.3.1",
     "istanbul": "^0.4.5",

diff --git a/test/processImage.js b/test/processImage.js
@@ -196,7 +196,7 @@ describe('express-processimage', function () {
                         Filesize: expect.it('to match', /Ki?$/).and('when passed as parameter to', parseFloat, 'to be less than', 10)
                     })
                 })
-                .then(() => expect(console.error, 'to have no calls satisfying', () => console.error(/DeprecationWarning/)));
+                    .then(() => expect(console.error, 'to have no calls satisfying', () => console.error(/DeprecationWarning/)));
             });
 
             it('should work and not log deprecation warnings when there is an explicit conversion', function () {
@@ -211,7 +211,7 @@ describe('express-processimage', function () {
                         Filesize: expect.it('to match', /Ki?$/).and('when passed as parameter to', parseFloat, 'to be less than', 10)
                     })
                 })
-                .then(() => expect(console.error, 'to have no calls satisfying', () => console.error(/DeprecationWarning/)));
+                    .then(() => expect(console.error, 'to have no calls satisfying', () => console.error(/DeprecationWarning/)));
             });
         });
     });
@@ -1006,7 +1006,7 @@ describe('express-processimage', function () {
                                 height: 48
                             }
                         })
-                        .and('when converted to PNG to resemble', pathModule.resolve(__dirname, '..', 'testdata', 'rotatedBulb.png'))
+                            .and('when converted to PNG to resemble', pathModule.resolve(__dirname, '..', 'testdata', 'rotatedBulb.png'))
                     });
                 });
 
@@ -1023,7 +1023,7 @@ describe('express-processimage', function () {
                             },
                             Interlace: 'Line'
                         })
-                        .and('when converted to PNG to resemble', pathModule.resolve(__dirname, '..', 'testdata', 'rotatedBulb.png'))
+                            .and('when converted to PNG to resemble', pathModule.resolve(__dirname, '..', 'testdata', 'rotatedBulb.png'))
                     });
                 });