Skip to content

Commit

Permalink
Merge branch '2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
wesleytodd committed Sep 9, 2024
2 parents 41b9278 + 30b42cb commit 168de1d
Show file tree
Hide file tree
Showing 19 changed files with 1,955 additions and 1,519 deletions.
2 changes: 0 additions & 2 deletions .eslintignore

This file was deleted.

18 changes: 0 additions & 18 deletions .eslintrc.yml

This file was deleted.

1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
29a69f3cf7cb5acbdde0a9151b885d46423b0c72
148 changes: 20 additions & 128 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
name: ci

on:
workflow_dispatch:
push:
branches:
- master
- master
- '2.0'
paths-ignore:
- '*.md'
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
paths-ignore:
- '*.md'

jobs:
test:
Expand All @@ -15,126 +18,35 @@ jobs:
fail-fast: false
matrix:
name:
- Node.js 0.8
- Node.js 0.10
- Node.js 0.12
- io.js 1.x
- io.js 2.x
- io.js 3.x
- Node.js 4.x
- Node.js 5.x
- Node.js 6.x
- Node.js 7.x
- Node.js 8.x
- Node.js 9.x
- Node.js 10.x
- Node.js 11.x
- Node.js 12.x
- Node.js 13.x
- Node.js 14.x
- Node.js 15.x
- Node.js 16.x
- Node.js 17.x
- Node.js 18.x
- Node.js 19.x
- Node.js 20.x
- Node.js 21.x
- Node.js 22.x

include:
- name: Node.js 0.8
node-version: "0.8"
npm-i: [email protected] [email protected]
npm-rm: nyc

- name: Node.js 0.10
node-version: "0.10"
npm-i: [email protected] [email protected] [email protected]

- name: Node.js 0.12
node-version: "0.12"
npm-i: [email protected] [email protected] [email protected]

- name: io.js 1.x
node-version: "1.8"
npm-i: [email protected] [email protected] [email protected]

- name: io.js 2.x
node-version: "2.5"
npm-i: [email protected] [email protected] [email protected]

- name: io.js 3.x
node-version: "3.3"
npm-i: [email protected] [email protected] [email protected]

- name: Node.js 4.x
node-version: "4.9"
npm-i: [email protected] [email protected] [email protected]

- name: Node.js 5.x
node-version: "5.12"
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.17"
npm-i: [email protected] [email protected]

- name: Node.js 9.x
node-version: "9.11"
npm-i: [email protected] [email protected]

- name: Node.js 10.x
node-version: "10.24"
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"
npm-i: [email protected]

- name: Node.js 13.x
node-version: "13.14"
npm-i: [email protected]

- name: Node.js 14.x
node-version: "14.21"
- name: Node.js 18.x
node-version: "18"

- name: Node.js 15.x
node-version: "15.14"
- name: Node.js 19.x
node-version: "19"

- name: Node.js 16.x
node-version: "16.19"
- name: Node.js 20.x
node-version: "20"

- name: Node.js 17.x
node-version: "17.9"
- name: Node.js 21.x
node-version: "21"

- name: Node.js 18.x
node-version: "18.14"

- name: Node.js 19.x
node-version: "19.7"
- name: Node.js 22.x
node-version: "22"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install Node.js ${{ matrix.node-version }}
shell: bash -eo pipefail -l {0}
run: |
nvm install --default ${{ matrix.node-version }}
if [[ "${{ matrix.node-version }}" == 0.* && "$(cut -d. -f2 <<< "${{ matrix.node-version }}")" -lt 10 ]]; then
nvm install --alias=npm 0.10
nvm use ${{ matrix.node-version }}
sed -i '1s;^.*$;'"$(printf '#!%q' "$(nvm which npm)")"';' "$(readlink -f "$(which npm)")"
npm config set strict-ssl false
fi
dirname "$(nvm which ${{ matrix.node-version }})" >> "$GITHUB_PATH"
- name: Configure npm
Expand All @@ -145,26 +57,6 @@ jobs:
npm config set shrinkwrap false
fi
- name: Remove npm module(s) ${{ matrix.npm-rm }}
run: npm rm --silent --save-dev ${{ matrix.npm-rm }}
if: matrix.npm-rm != ''

- name: Install npm module(s) ${{ matrix.npm-i }}
run: npm install --save-dev ${{ matrix.npm-i }}
if: matrix.npm-i != ''

- name: Setup Node.js version-specific dependencies
shell: bash
run: |
# eslint for linting
# - remove on Node.js < 12
if [[ "$(cut -d. -f1 <<< "${{ matrix.node-version }}")" -lt 12 ]]; then
node -pe 'Object.keys(require("./package").devDependencies).join("\n")' | \
grep -E '^eslint(-|$)' | \
sort -r | \
xargs -n1 npm rm --silent --save-dev
fi
- name: Install Node.js dependencies
run: npm install

Expand Down
49 changes: 49 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,52 @@
unreleased
=========================

* Drop support for node <18

2.0.0-beta.2 / 2024-03-20
=========================

This incorporates all changes after 1.3.5 up to 1.3.8.

* Add support for returned, rejected Promises to `router.param`

2.0.0-beta.1 / 2020-03-29
=========================

This incorporates all changes after 1.3.3 up to 1.3.5.

* Internalize private `router.process_params` method
* Remove `debug` dependency
* deps: [email protected]
* deps: parseurl@~1.3.3
* deps: [email protected]
- Add new `?`, `*`, and `+` parameter modifiers.
- Matching group expressions are only RegExp syntax.
`(*)` is no longer valid and must be written as `(.*)`, for example.
- Named matching groups no longer available by position in `req.params`.
`/:foo(.*)` only captures as `req.params.foo` and not available as
`req.params[0]`.
- Regular expressions can only be used in a matching group.
`/\\d+` is no longer valid and must be written as `/(\\d+)`.
- Matching groups are now literal regular expressions.
`:foo` named captures can no longer be included inside a capture group.
- Special `*` path segment behavior removed.
`/foo/*/bar` will match a literal `*` as the middle segment.
* deps: [email protected]

2.0.0-alpha.1 / 2018-07-27
==========================

* Add basic support for returned, rejected Promises
- Rejected Promises from middleware functions `next(error)`
* Drop support for Node.js below 0.10
* deps: [email protected]
- Add `DEBUG_HIDE_DATE` environment variable
- Change timer to per-namespace instead of global
- Change non-TTY date format
- Remove `DEBUG_FD` environment variable support
- Support 256 namespace colors

1.3.8 / 2023-02-24
==================

Expand Down
Loading

0 comments on commit 168de1d

Please sign in to comment.