Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update for fastify v5 #61

Merged
merged 3 commits into from
Apr 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 110 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,119 @@ name: CI
on:
push:
branches:
- main
- master
- next
- 'v*'
- main
- master
- next
- "v*"
paths-ignore:
- 'docs/**'
- '*.md'
- "docs/**"
- "*.md"
pull_request:
paths-ignore:
- 'docs/**'
- '*.md'
- "docs/**"
- "*.md"

jobs:
dependency-review:
name: Dependency Review
if: github.event_name == 'pull_request'
runs-on: ubuntu-latest
permissions:
contents: read
steps:
- name: Check out repo
uses: actions/checkout@v4
with:
persist-credentials: false

- name: Dependency review
uses: actions/dependency-review-action@v4

lint:
name: Lint Code
runs-on: ubuntu-latest
permissions:
contents: read
steps:
- name: Check out repo
uses: actions/checkout@v4
with:
persist-credentials: false

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: lts/*

- name: Install dependencies
run: npm i --ignore-scripts

- name: Lint code
run: npm run lint

test:
uses: fastify/workflows/.github/workflows/plugins-ci.yml@v3
with:
license-check: true
lint: true
name: Test
runs-on: ubuntu-latest
permissions:
contents: read
strategy:
matrix:
node-version: [10, 12, 14, 16, 18, 20]
steps:
- name: Check out repo
uses: actions/checkout@v4
with:
persist-credentials: false

- name: Setup Node ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

- name: Upgrade npm
if: ${{ success() && matrix.node-version == '6' }}
run: npm i npm@6.13.4 -g

- name: Install dependencies
run: npm i --ignore-scripts

- name: Run tests
run: npm run test:unit

typescript:
name: Test TypeScript
runs-on: ubuntu-latest
permissions:
contents: read
steps:
- name: Check out repo
uses: actions/checkout@v4
with:
persist-credentials: false

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: lts/*

- name: Install dependencies
run: npm i --ignore-scripts

- name: tsd
run: npm run test:typescript

automerge:
name: Automerge Dependabot PRs
if: >
github.event_name == 'pull_request' &&
github.event.pull_request.user.login == 'dependabot[bot]'
needs: [lint, test, typescript]
permissions:
pull-requests: write
contents: write
runs-on: ubuntu-latest
steps:
- uses: fastify/github-action-merge-dependabot@v3
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
target: major
4 changes: 0 additions & 4 deletions .taprc

This file was deleted.

15 changes: 9 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,25 @@
},
"homepage": "https://github.com/fastify/proxy-addr#readme",
"dependencies": {
"@fastify/forwarded": "^2.0.0",
"ipaddr.js": "^2.0.0"
"@fastify/forwarded": "^2.2.0",
"ipaddr.js": "^2.1.0"
},
"devDependencies": {
"@types/node": "^20.1.0",
"@fastify/pre-commit": "^2.1.0",
"@types/node": "^20.12.7",
"beautify-benchmark": "0.2.4",
"benchmark": "2.1.4",
"standard": "^17.0.0",
"tap": "^16.0.0",
"c8": "^7.14.0",
"standard": "^17.1.0",
"tape": "^5.7.5",
"tsd": "^0.31.0"
},
"scripts": {
"bench": "node benchmark/index.js",
"lint": "standard",
"lint:fix": "standard --fix",
"test": "npm run test:unit && npm run test:typescript",
"test:typescript": "tsd",
"test:unit": "tap"
"test:unit": "c8 tape test/**/*.js"
}
}
2 changes: 1 addition & 1 deletion test/all.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'

const { test } = require('tap')
const test = require('tape')
const proxyaddr = require('..')

test('argument req should be required', function (t) {
Expand Down
2 changes: 1 addition & 1 deletion test/base.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'

const { test } = require('tap')
const test = require('tape')
const proxyaddr = require('..')

test('req should be required', function (t) {
Expand Down
2 changes: 1 addition & 1 deletion test/compile.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'

const { test } = require('tap')
const test = require('tape')
const proxyaddr = require('..')

test('trust arg should be required', function (t) {
Expand Down