Merge tag 'v1.3.4'

Author: dougwilson

.travis.yml

@@ -7,26 +7,90 @@ node_js:
   - "3.3"
   - "4.9"
   - "5.12"
-  - "6.14"
+  - "6.17"
   - "7.10"
-  - "8.11"
+  - "8.17"
   - "9.11"
-  - "10.6"
+  - "10.18"
+  - "11.15"
+  - "12.14"
+  - "13.7"
 sudo: false
 cache:
   directories:
     - node_modules
 before_install:
-  # Skip updating shrinkwrap / lock
-  - "npm config set shrinkwrap false"
+  - |
+    # Setup utility functions
+    function node_version_lt () {
+      [[ "$(v "$TRAVIS_NODE_VERSION")" -lt "$(v "${1}")" ]]
+    }
+    function npm_module_installed () {
+      npm -lsp ls | grep -Fq "$(pwd)/node_modules/${1}:${1}@"
+    }
+    function npm_remove_module_re () {
+      node -e '
+        fs = require("fs");
+        p = JSON.parse(fs.readFileSync("package.json", "utf8"));
+        r = RegExp(process.argv[1]);
+        for (k in p.devDependencies) {
+          if (r.test(k)) delete p.devDependencies[k];
+        }
+        fs.writeFileSync("package.json", JSON.stringify(p, null, 2) + "\n");
+      ' "$@"
+    }
+    function npm_use_module () {
+      node -e '
+        fs = require("fs");
+        p = JSON.parse(fs.readFileSync("package.json", "utf8"));
+        p.devDependencies[process.argv[1]] = process.argv[2];
+        fs.writeFileSync("package.json", JSON.stringify(p, null, 2) + "\n");
+      ' "$@"
+    }
+    function v () {
+      tr '.' '\n' <<< "${1}" \
+        | awk '{ printf "%03d", $0 }' \
+        | sed 's/^0*//'
+    }
+  # Configure npm
+  - |
+    # Skip updating shrinkwrap / lock
+    npm config set shrinkwrap false
   # Setup Node.js version-specific dependencies
-  - "test $(echo $TRAVIS_NODE_VERSION | cut -d. -f1) -ge 4 || npm rm --save-dev eslint eslint-plugin-markdown"
+  - |
+    # Configure eslint for linting
+    if node_version_lt '8.0'; then npm_remove_module_re '^eslint(-|$)'
+    fi
+  - |
+    # Configure mocha for testing
+    if   node_version_lt '4.0'; then npm_use_module 'mocha' '3.5.3'
+    elif node_version_lt '6.0'; then npm_use_module 'mocha' '5.2.0'
+    elif node_version_lt '8.0'; then npm_use_module 'mocha' '6.2.2'
+    fi
+  - |
+    # Configure supertest for http calls
+    if   node_version_lt '4.0'; then npm_use_module 'supertest' '2.0.0'
+    elif node_version_lt '6.0'; then npm_use_module 'supertest' '3.4.2'
+    fi
   # Update Node.js modules
-  - "test ! -d node_modules || npm prune"
-  - "test ! -d node_modules || npm rebuild"
+  - |
+    # Prune and rebuild node_modules
+    if [[ -d node_modules ]]; then
+      npm prune
+      npm rebuild
+    fi
 script:
-  # Run test script, then lint depending on eslint install
-  - "npm run-script test-travis"
-  - "test   -z $(npm -ps ls eslint) || npm run-script lint"
+  # Run test script
+  - |
+    npm test
+  # Run linting, depending on eslint install
+  - |
+    if npm_module_installed 'eslint'; then npm run-script lint
+    fi
 after_script:
-  - "test -d .nyc_output && npm install coveralls@2 && nyc report --reporter=text-lcov | coveralls"
+  # Upload coverage to coveralls if exists
+  - |
+    if [[ -d .nyc_output ]]; then
+      npm install --save-dev coveralls@2
+      nyc report --reporter=text-lcov | coveralls
+    fi

HISTORY.md

@@ -1,3 +1,10 @@
+2.x
+===
+
+  * deps: array-flatten@3.0.0
+  * deps: parseurl@~1.3.3
+  * deps: setprototypeof@1.2.0
+
 2.0.0-alpha.1 / 2018-07-27
 ==========================
 
@@ -11,6 +18,13 @@
     - Remove `DEBUG_FD` environment variable support
     - Support 256 namespace colors
 
+1.3.4 / 2020-01-24
+==================
+
+  * deps: array-flatten@3.0.0
+  * deps: parseurl@~1.3.3
+  * deps: setprototypeof@1.2.0
+
 1.3.3 / 2018-07-06
 ==================
 

README.md

@@ -175,14 +175,14 @@ rather than responding.
 
 ```js
 router.route('/')
-.all(function (req, res, next) {
-  next()
-})
-.all(check_something)
-.get(function (req, res) {
-  res.setHeader('Content-Type', 'text/plain; charset=utf-8')
-  res.end('Hello World!')
-})
+  .all(function (req, res, next) {
+    next()
+  })
+  .all(check_something)
+  .get(function (req, res) {
+    res.setHeader('Content-Type', 'text/plain; charset=utf-8')
+    res.end('Hello World!')
+  })
 ```
 
 ## Middleware

index.js

@@ -13,7 +13,7 @@
  */
 
 var debug = require('debug')('router')
-var flatten = require('array-flatten')
+var flatten = require('array-flatten').flatten
 var Layer = require('./lib/layer')
 var methods = require('methods')
 var mixin = require('utils-merge')

lib/route.js

@@ -13,7 +13,7 @@
  */
 
 var debug = require('debug')('router:route')
-var flatten = require('array-flatten')
+var flatten = require('array-flatten').flatten
 var Layer = require('./layer')
 var methods = require('methods')
 

package.json

@@ -9,22 +9,23 @@
   "license": "MIT",
   "repository": "pillarjs/router",
   "dependencies": {
-    "array-flatten": "2.1.1",
+    "array-flatten": "3.0.0",
     "debug": "3.1.0",
     "methods": "~1.1.2",
-    "parseurl": "~1.3.2",
+    "parseurl": "~1.3.3",
     "path-to-regexp": "0.1.7",
-    "setprototypeof": "1.1.0",
+    "setprototypeof": "1.2.0",
     "utils-merge": "1.0.1"
   },
   "devDependencies": {
     "after": "0.8.2",
-    "eslint": "3.19.0",
-    "eslint-plugin-markdown": "1.0.0-beta.6",
-    "finalhandler": "1.1.1",
-    "mocha": "3.5.3",
+    "eslint": "6.8.0",
+    "eslint-plugin-markdown": "1.0.1",
+    "finalhandler": "1.1.2",
+    "mocha": "7.0.0",
     "nyc": "10.3.2",
-    "supertest": "1.2.0"
+    "safe-buffer": "5.2.0",
+    "supertest": "4.0.2"
   },
   "files": [
     "lib/",
@@ -40,6 +41,7 @@
     "lint": "eslint --plugin markdown --ext js,md .",
     "test": "mocha --reporter spec --bail --check-leaks test/",
     "test-cov": "nyc --reporter=text npm test",
-    "test-travis": "nyc --reporter=html --reporter=text npm test"
+    "test-travis": "nyc --reporter=html --reporter=text npm test",
+    "version": "node scripts/version-history.js && git add HISTORY.md"
   }
 }

scripts/version-history.js

@@ -0,0 +1,63 @@
+'use strict'
+
+var fs = require('fs')
+var path = require('path')
+
+var HISTORY_FILE_PATH = path.join(__dirname, '..', 'HISTORY.md')
+var MD_HEADER_REGEXP = /^====*$/
+var VERSION = process.env.npm_package_version
+var VERSION_PLACEHOLDER_REGEXP = /^(?:unreleased|(\d+\.)+x)$/
+
+var historyFileLines = fs.readFileSync(HISTORY_FILE_PATH, 'utf-8').split('\n')
+
+if (!MD_HEADER_REGEXP.test(historyFileLines[1])) {
+  console.error('Missing header in HISTORY.md')
+  process.exit(1)
+}
+
+if (!VERSION_PLACEHOLDER_REGEXP.test(historyFileLines[0])) {
+  console.error('Missing placeholder version in HISTORY.md')
+  process.exit(1)
+}
+
+if (historyFileLines[0].indexOf('x') !== -1) {
+  var versionCheckRegExp = new RegExp('^' + historyFileLines[0].replace('x', '.+') + '$')
+
+  if (!versionCheckRegExp.test(VERSION)) {
+    console.error('Version %s does not match placeholder %s', VERSION, historyFileLines[0])
+    process.exit(1)
+  }
+}
+
+historyFileLines[0] = VERSION + ' / ' + getLocaleDate()
+historyFileLines[1] = repeat('=', historyFileLines[0].length)
+
+fs.writeFileSync(HISTORY_FILE_PATH, historyFileLines.join('\n'))
+
+function getLocaleDate () {
+  var now = new Date()
+
+  return zeroPad(now.getFullYear(), 4) + '-' +
+    zeroPad(now.getMonth() + 1, 2) + '-' +
+    zeroPad(now.getDate(), 2)
+}
+
+function repeat (str, length) {
+  var out = ''
+
+  for (var i = 0; i < length; i++) {
+    out += str
+  }
+
+  return out
+}
+
+function zeroPad (number, length) {
+  var num = number.toString()
+
+  while (num.length < length) {
+    num = '0' + num
+  }
+
+  return num
+}

test/auto-head.js

@@ -13,10 +13,10 @@ describe('HEAD', function () {
     router.get('/users', sethit(1), saw)
 
     request(server)
-    .head('/users')
-    .expect('Content-Type', 'text/plain')
-    .expect('x-fn-1', 'hit')
-    .expect(200, done)
+      .head('/users')
+      .expect('Content-Type', 'text/plain')
+      .expect('x-fn-1', 'hit')
+      .expect(200, done)
   })
 
   it('should invoke head if prior to get', function (done) {
@@ -27,10 +27,10 @@ describe('HEAD', function () {
     router.get('/users', sethit(2), saw)
 
     request(server)
-    .head('/users')
-    .expect('Content-Type', 'text/plain')
-    .expect('x-fn-1', 'hit')
-    .expect(200, done)
+      .head('/users')
+      .expect('Content-Type', 'text/plain')
+      .expect('x-fn-1', 'hit')
+      .expect(200, done)
   })
 })
 

test/auto-options.js

@@ -16,9 +16,9 @@ describe('OPTIONS', function () {
     router.put('/users', saw)
 
     request(server)
-    .options('/users')
-    .expect('Allow', 'GET, HEAD, POST, PUT')
-    .expect(200, 'GET, HEAD, POST, PUT', done)
+      .options('/users')
+      .expect('Allow', 'GET, HEAD, POST, PUT')
+      .expect(200, 'GET, HEAD, POST, PUT', done)
   })
 
   it('should not contain methods multiple times', function (done) {
@@ -31,9 +31,9 @@ describe('OPTIONS', function () {
     router.get('/users', saw)
 
     request(server)
-    .options('/users')
-    .expect('GET, HEAD, PUT')
-    .expect('Allow', 'GET, HEAD, PUT', done)
+      .options('/users')
+      .expect('GET, HEAD, PUT')
+      .expect('Allow', 'GET, HEAD, PUT', done)
   })
 
   it('should not include "all" routes', function (done) {
@@ -46,10 +46,10 @@ describe('OPTIONS', function () {
     router.all('/users', sethit(1))
 
     request(server)
-    .options('/users')
-    .expect('x-fn-1', 'hit')
-    .expect('Allow', 'GET, HEAD, PUT')
-    .expect(200, 'GET, HEAD, PUT', done)
+      .options('/users')
+      .expect('x-fn-1', 'hit')
+      .expect('Allow', 'GET, HEAD, PUT')
+      .expect(200, 'GET, HEAD, PUT', done)
   })
 
   it('should not respond if no matching path', function (done) {
@@ -59,8 +59,8 @@ describe('OPTIONS', function () {
     router.get('/users', saw)
 
     request(server)
-    .options('/')
-    .expect(404, done)
+      .options('/')
+      .expect(404, done)
   })
 
   it('should do nothing with explicit options route', function (done) {
@@ -71,8 +71,8 @@ describe('OPTIONS', function () {
     router.options('/users', saw)
 
     request(server)
-    .options('/users')
-    .expect(200, 'saw OPTIONS /users', done)
+      .options('/users')
+      .expect(200, 'saw OPTIONS /users', done)
   })
 
   describe('when error occurs in respone handler', function () {
@@ -88,8 +88,8 @@ describe('OPTIONS', function () {
       router.get('/users', saw)
 
       request(server)
-      .options('/users')
-      .expect(200, 'true', done)
+        .options('/users')
+        .expect(200, 'true', done)
     })
   })
 })