Merge branch 'master' into feature/brotli

.travis.yml

@@ -8,12 +8,13 @@ node_js:
   - "3.3"
   - "4.9"
   - "5.12"
-  - "6.16"
+  - "6.17"
   - "7.10"
-  - "8.15"
+  - "8.16"
   - "9.11"
-  - "10.15"
-  - "11.10"
+  - "10.16"
+  - "11.15"
+  - "12.9"
 sudo: false
 cache:
   directories:
@@ -62,7 +63,7 @@ before_install:
     fi
   - |
     # Configure eslint for linting
-    if node_version_lt '6.0'; then npm_remove_module_re '^eslint(-|$)'
+    if node_version_lt '8.0'; then npm_remove_module_re '^eslint(-|$)'
     fi
   - |
     # Configure mocha for testing

HISTORY.md

@@ -1,3 +1,14 @@
+unreleased
+==========
+
+  * deps: accepts@~1.3.7
+    - Fix sorting encoding with extra parameters
+    - deps: mime-types@~2.1.24
+    - deps: negotiator@0.6.2
+  * deps: compressible@~2.0.17
+    - deps: mime-db@'>= 1.40.0 < 2'
+  * deps: safe-buffer@5.2.0
+
 1.7.4 / 2019-03-18
 ==================
 

package.json

@@ -10,25 +10,25 @@
   "repository": "expressjs/compression",
   "dependencies": {
     "bytes": "3.0.0",
-    "compressible": "~2.0.16",
+    "compressible": "~2.0.17",
     "debug": "2.6.9",
     "object-assign": "4.1.1",
     "on-headers": "~1.0.2",
-    "safe-buffer": "5.1.2",
+    "safe-buffer": "5.2.0",
     "vary": "~1.1.2"
   },
   "devDependencies": {
     "after": "0.8.2",
-    "eslint": "5.15.1",
-    "eslint-config-standard": "12.0.0",
-    "eslint-plugin-import": "2.16.0",
+    "eslint": "6.3.0",
+    "eslint-config-standard": "14.0.1",
+    "eslint-plugin-import": "2.18.2",
     "eslint-plugin-markdown": "1.0.0",
-    "eslint-plugin-node": "7.0.1",
-    "eslint-plugin-promise": "4.0.1",
-    "eslint-plugin-standard": "4.0.0",
+    "eslint-plugin-node": "9.2.0",
+    "eslint-plugin-promise": "4.2.1",
+    "eslint-plugin-standard": "4.0.1",
     "istanbul": "0.4.5",
-    "mocha": "6.0.2",
-    "supertest": "4.0.0"
+    "mocha": "6.2.0",
+    "supertest": "4.0.2"
   },
   "files": [
     "LICENSE",

test/compression.js

@@ -180,7 +180,7 @@ describe('compression()', function () {
       pressure()
     })
 
-    crypto.pseudoRandomBytes(1024 * 128, function (err, chunk) {
+    crypto.randomBytes(1024 * 128, function (err, chunk) {
       if (err) return done(err)
       buf = chunk
       pressure()
@@ -237,7 +237,7 @@ describe('compression()', function () {
       pressure()
     })
 
-    crypto.pseudoRandomBytes(1024 * 128, function (err, chunk) {
+    crypto.randomBytes(1024 * 128, function (err, chunk) {
       if (err) return done(err)
       buf = chunk
       pressure()