Merge branch 'master' of github.com:expressjs/compression

Author: fernandolguevara

.eslintrc.yml

@@ -1,2 +1,9 @@
 root: true
-extends: standard
+extends:
+  - standard
+  - plugin:markdown/recommended
+plugins:
+  - markdown
+overrides:
+  - files: '**/*.md'
+    processor: 'markdown/markdown'

.github/workflows/ci.yml

@@ -29,73 +29,83 @@ jobs:
         - Node.js 14.x
         - Node.js 15.x
         - Node.js 16.x
+        - Node.js 17.x
 
         include:
         - name: Node.js 0.8
           node-version: "0.8"
           npm-i: [email protected] [email protected]
-          npm-rm: istanbul
+          npm-rm: nyc
 
         - name: Node.js 0.10
           node-version: "0.10"
-          npm-i: [email protected] [email protected]
+          npm-i: [email protected] [email protected] [email protected]
 
         - name: Node.js 0.12
           node-version: "0.12"
-          npm-i: [email protected] [email protected]
+          npm-i: [email protected] [email protected] [email protected]
 
         - name: io.js 1.x
           node-version: "1.8"
-          npm-i: [email protected] [email protected]
+          npm-i: [email protected] [email protected] [email protected]
 
         - name: io.js 2.x
           node-version: "2.5"
-          npm-i: [email protected] [email protected]
+          npm-i: [email protected] [email protected] [email protected]
 
         - name: io.js 3.x
           node-version: "3.3"
-          npm-i: [email protected] [email protected]
+          npm-i: [email protected] [email protected] [email protected]
 
         - name: Node.js 4.x
           node-version: "4.9"
-          npm-i: [email protected] [email protected]
+          npm-i: [email protected] [email protected] [email protected]
 
         - name: Node.js 5.x
           node-version: "5.12"
-          npm-i: [email protected] [email protected]
+          npm-i: [email protected] [email protected] [email protected]
 
         - name: Node.js 6.x
           node-version: "6.17"
+          npm-i: [email protected] [email protected] [email protected]
 
         - name: Node.js 7.x
           node-version: "7.10"
+          npm-i: [email protected] [email protected] [email protected]
 
         - name: Node.js 8.x
           node-version: "8.16"
+          npm-i: [email protected]
 
         - name: Node.js 9.x
           node-version: "9.11"
+          npm-i: [email protected]
 
         - name: Node.js 10.x
           node-version: "10.16"
+          npm-i: [email protected]
 
         - name: Node.js 11.x
           node-version: "11.15"
+          npm-i: [email protected]
 
         - name: Node.js 12.x
           node-version: "12.22"
 
         - name: Node.js 13.x
-          node-version: "13.13"
+          node-version: "13.14"
 
         - name: Node.js 14.x
-          node-version: "14.18"
+          node-version: "14.19"
 
         - name: Node.js 15.x
           node-version: "15.14"
 
         - name: Node.js 16.x
-          node-version: "16.13"
+          node-version: "16.15"
+
+        - name: Node.js 17.x
+          node-version: "17.9"
 
     steps:
     - uses: actions/checkout@v2
@@ -150,7 +160,7 @@ jobs:
     - name: Run tests
       shell: bash
       run: |
-        if npm -ps ls istanbul | grep -q istanbul; then
+        if npm -ps ls nyc | grep -q nyc; then
           npm run test-ci
         else
           npm test
@@ -162,7 +172,7 @@ jobs:
 
     - name: Collect code coverage
       uses: coverallsapp/github-action@master
-      if: steps.list_env.outputs.istanbul != ''
+      if: steps.list_env.outputs.nyc != ''
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         flag-name: run-${{ matrix.test_number }}

.gitignore

@@ -1,3 +1,5 @@
+.nyc_output/
 coverage
 node_modules
 npm-debug.log
+package-lock.json

HISTORY.md

@@ -1,12 +1,14 @@
 unreleased
 ==========
 
-  * deps: accepts@~1.3.7
+  * deps: accepts@~1.3.8
     - Fix sorting encoding with extra parameters
-    - deps: mime-types@~2.1.24
-    - deps: [email protected]
-  * deps: compressible@~2.0.17
-    - deps: mime-db@'>= 1.40.0 < 2'
+    - deps: mime-types@~2.1.34
+    - deps: [email protected]
+  * deps: compressible@~2.0.18
+    - Mark `font/ttf` as compressible
+    - Remove compressible from `multipart/mixed`
+    - deps: mime-db@'>= 1.43.0 < 2'
   * deps: [email protected]
 
 1.7.4 / 2019-03-18

README.md

@@ -24,8 +24,6 @@ $ npm install compression
 
 ## API
 
-<!-- eslint-disable no-unused-vars -->
-
 ```js
 var compression = require('compression')
 ```

package.json

@@ -10,9 +10,9 @@
   "repository": "expressjs/compression",
   "dependencies": {
     "@stdlib/assert-is-uint8array": "^0.0.8",
-    "accepts": "~1.3.7",
+    "accepts": "~1.3.8",
     "bytes": "3.0.0",
-    "compressible": "~2.0.17",
+    "compressible": "~2.0.18",
     "debug": "2.6.9",
     "on-headers": "~1.0.2",
     "safe-buffer": "5.2.1",
@@ -22,14 +22,14 @@
     "after": "0.8.2",
     "eslint": "7.32.0",
     "eslint-config-standard": "14.1.1",
-    "eslint-plugin-import": "2.25.3",
-    "eslint-plugin-markdown": "1.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.2.3",
-    "supertest": "4.0.2",
+    "eslint-plugin-import": "2.26.0",
+    "eslint-plugin-markdown": "2.2.1",
+    "eslint-plugin-node": "11.1.0",
+    "eslint-plugin-promise": "5.2.0",
+    "eslint-plugin-standard": "4.1.0",
+    "mocha": "9.2.2",
+    "nyc": "15.1.0",
+    "supertest": "6.2.3",
     "sinon": "4.5.0"
   },
   "files": [
@@ -41,9 +41,9 @@
     "node": ">= 0.8.0"
   },
   "scripts": {
-    "lint": "eslint --plugin markdown --ext js,md .",
+    "lint": "eslint .",
     "test": "mocha --check-leaks --reporter spec --bail",
-    "test-ci": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --check-leaks --reporter spec",
-    "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --check-leaks --reporter dot"
+    "test-ci": "nyc --reporter=lcovonly --reporter=text npm test",
+    "test-cov": "nyc --reporter=html --reporter=text npm test"
   }
 }