diff --git a/.eslintrc.yml b/.eslintrc.yml index 587169c533..9e282530d5 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -1,5 +1,7 @@ root: true - +env: + es6: true + node: true rules: eol-last: error eqeqeq: [error, allow-null] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 80248fab69..2a143eed63 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,11 +11,7 @@ jobs: fail-fast: false matrix: name: - - Node.js 0.10 - - Node.js 0.12 - - io.js 1.x - - io.js 2.x - - io.js 3.x + - Node.js 4.0 - Node.js 4.x - Node.js 5.x - Node.js 6.x @@ -29,25 +25,9 @@ jobs: - Node.js 14.x include: - - name: Node.js 0.10 - node-version: "0.10" - npm-i: mocha@3.5.3 supertest@2.0.0 - - - name: Node.js 0.12 - node-version: "0.12" - npm-i: mocha@3.5.3 supertest@2.0.0 - - - name: io.js 1.x - node-version: "1.8" - npm-i: mocha@3.5.3 supertest@2.0.0 - - - name: io.js 2.x - node-version: "2.5" - npm-i: mocha@3.5.3 supertest@2.0.0 - - - name: io.js 3.x - node-version: "3.3" - npm-i: mocha@3.5.3 supertest@2.0.0 + - name: Node.js 4.0 + node-version: "4.0" + npm-i: mocha@5.2.0 supertest@3.4.2 - name: Node.js 4.x node-version: "4.9" diff --git a/History.md b/History.md index 66f59388eb..c12379180e 100644 --- a/History.md +++ b/History.md @@ -5,6 +5,7 @@ This incorporates all changes after 4.17.1 up to 4.17.2. * change: - query parser setting defaults to `'simple'` + - Requires Node.js 4+ - Use `mime-types` for file to content type mapping * deps: array-flatten@3.0.0 * deps: body-parser@2.0.0-beta.1 diff --git a/appveyor.yml b/appveyor.yml index 785c799e8f..433729652b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,10 +1,5 @@ environment: matrix: - - nodejs_version: "0.10" - - nodejs_version: "0.12" - - nodejs_version: "1.8" - - nodejs_version: "2.5" - - nodejs_version: "3.3" - nodejs_version: "4.9" - nodejs_version: "5.12" - nodejs_version: "6.17" @@ -38,14 +33,11 @@ install: # Setup Node.js version-specific dependencies - ps: | # mocha for testing - # - use 3.x for Node.js < 4 # - use 5.x for Node.js < 6 # - use 6.x for Node.js < 8 # - use 7.x for Node.js < 10 # - use 8.x for Node.js < 12 - if ([int]$env:nodejs_version.split(".")[0] -lt 4) { - npm install --silent --save-dev mocha@3.5.3 - } elseif ([int]$env:nodejs_version.split(".")[0] -lt 6) { + if ([int]$env:nodejs_version.split(".")[0] -lt 6) { npm install --silent --save-dev mocha@5.2.0 } elseif ([int]$env:nodejs_version.split(".")[0] -lt 8) { npm install --silent --save-dev mocha@6.2.2 @@ -56,11 +48,8 @@ install: } - ps: | # supertest for http calls - # - use 2.0.0 for Node.js < 4 # - use 3.4.2 for Node.js < 6 - if ([int]$env:nodejs_version.split(".")[0] -lt 4) { - npm install --silent --save-dev supertest@2.0.0 - } elseif ([int]$env:nodejs_version.split(".")[0] -lt 6) { + if ([int]$env:nodejs_version.split(".")[0] -lt 6) { npm install --silent --save-dev supertest@3.4.2 } # Update Node.js modules diff --git a/package.json b/package.json index 85ecc68011..214263c3f9 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "vhost": "~3.0.2" }, "engines": { - "node": ">= 0.10.0" + "node": ">= 4" }, "files": [ "LICENSE",