From 0d2b1de70e3eeff6d9c8201a78e04a7970a0c6dc Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Wed, 1 Nov 2023 15:31:21 +0000 Subject: [PATCH 1/3] fix: upgrade fastify from 4.23.2 to 4.24.0 Snyk has created this PR to upgrade fastify from 4.23.2 to 4.24.0. See this package in npm: https://www.npmjs.com/package/fastify See this project in Snyk: https://app.snyk.io/org/denbon05/project/94aeba30-075f-43e4-8597-de7538411d1d?utm_source=github&utm_medium=referral&page=upgrade-pr --- package-lock.json | 41 ++++++++++++++++++++++------------------- package.json | 2 +- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index b9ef0fc..2f6fe7c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,13 +16,13 @@ "@types/node": "^20.5.1", "@typescript-eslint/eslint-plugin": "^5.27.1", "@typescript-eslint/parser": "^5.27.1", - "bun-types": "latest", + "bun-types": "^1.0.7", "eslint": "^8.17.0", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-prettier": "^9.0.0", "eslint-import-resolver-typescript": "^2.7.1", "eslint-plugin-import": "^2.26.0", - "fastify": "^4.23.2", + "fastify": "^4.24.0", "jest": "^28.1.1", "ts-jest": "^28.0.4", "ts-node": "^10.8.1", @@ -3248,9 +3248,9 @@ "dev": true }, "node_modules/fastify": { - "version": "4.23.2", - "resolved": "https://registry.npmjs.org/fastify/-/fastify-4.23.2.tgz", - "integrity": "sha512-WFSxsHES115svC7NrerNqZwwM0UOxbC/P6toT9LRHgAAFvG7o2AN5W+H4ihCtOGuYXjZf4z+2jXC89rVEoPWOA==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/fastify/-/fastify-4.24.0.tgz", + "integrity": "sha512-6Uu2cCAV1UgexPnWKchgRt77lng9ivNmyFhPMcgUbJ4VaVBE1l6aYluiYZiVsgOBFpHrmdj7FD6n1aHswln4yQ==", "dev": true, "dependencies": { "@fastify/ajv-compiler": "^3.5.0", @@ -3260,7 +3260,7 @@ "avvio": "^8.2.1", "fast-content-type-parse": "^1.0.0", "fast-json-stringify": "^5.7.0", - "find-my-way": "^7.6.0", + "find-my-way": "^7.7.0", "light-my-request": "^5.9.1", "pino": "^8.12.0", "process-warning": "^2.2.0", @@ -3319,9 +3319,9 @@ } }, "node_modules/find-my-way": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/find-my-way/-/find-my-way-7.6.2.tgz", - "integrity": "sha512-0OjHn1b1nCX3eVbm9ByeEHiscPYiHLfhei1wOUU9qffQkk98wE0Lo8VrVYfSGMgnSnDh86DxedduAnBf4nwUEw==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/find-my-way/-/find-my-way-7.7.0.tgz", + "integrity": "sha512-+SrHpvQ52Q6W9f3wJoJBbAQULJuNEEQwBvlvYwACDhBTLOTMiQ0HYWh4+vC3OivGP2ENcTI1oKlFA2OepJNjhQ==", "dev": true, "dependencies": { "fast-deep-equal": "^3.1.3", @@ -7966,7 +7966,8 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true + "dev": true, + "requires": {} }, "acorn-walk": { "version": "8.2.0", @@ -8743,7 +8744,8 @@ "version": "9.0.0", "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz", "integrity": "sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==", - "dev": true + "dev": true, + "requires": {} }, "eslint-import-resolver-node": { "version": "0.3.9", @@ -9088,9 +9090,9 @@ "dev": true }, "fastify": { - "version": "4.23.2", - "resolved": "https://registry.npmjs.org/fastify/-/fastify-4.23.2.tgz", - "integrity": "sha512-WFSxsHES115svC7NrerNqZwwM0UOxbC/P6toT9LRHgAAFvG7o2AN5W+H4ihCtOGuYXjZf4z+2jXC89rVEoPWOA==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/fastify/-/fastify-4.24.0.tgz", + "integrity": "sha512-6Uu2cCAV1UgexPnWKchgRt77lng9ivNmyFhPMcgUbJ4VaVBE1l6aYluiYZiVsgOBFpHrmdj7FD6n1aHswln4yQ==", "dev": true, "requires": { "@fastify/ajv-compiler": "^3.5.0", @@ -9100,7 +9102,7 @@ "avvio": "^8.2.1", "fast-content-type-parse": "^1.0.0", "fast-json-stringify": "^5.7.0", - "find-my-way": "^7.6.0", + "find-my-way": "^7.7.0", "light-my-request": "^5.9.1", "pino": "^8.12.0", "process-warning": "^2.2.0", @@ -9153,9 +9155,9 @@ } }, "find-my-way": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/find-my-way/-/find-my-way-7.6.2.tgz", - "integrity": "sha512-0OjHn1b1nCX3eVbm9ByeEHiscPYiHLfhei1wOUU9qffQkk98wE0Lo8VrVYfSGMgnSnDh86DxedduAnBf4nwUEw==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/find-my-way/-/find-my-way-7.7.0.tgz", + "integrity": "sha512-+SrHpvQ52Q6W9f3wJoJBbAQULJuNEEQwBvlvYwACDhBTLOTMiQ0HYWh4+vC3OivGP2ENcTI1oKlFA2OepJNjhQ==", "dev": true, "requires": { "fast-deep-equal": "^3.1.3", @@ -9969,7 +9971,8 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", - "dev": true + "dev": true, + "requires": {} }, "jest-regex-util": { "version": "28.0.2", diff --git a/package.json b/package.json index 85ee2a6..95b9fa1 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "eslint-config-prettier": "^9.0.0", "eslint-import-resolver-typescript": "^2.7.1", "eslint-plugin-import": "^2.26.0", - "fastify": "^4.23.2", + "fastify": "^4.24.0", "jest": "^28.1.1", "ts-jest": "^28.0.4", "ts-node": "^10.8.1", From d098a1fb2d43554b4dbc4d6c87cc35e25acc59a4 Mon Sep 17 00:00:00 2001 From: denbon05 Date: Sun, 5 Nov 2023 12:31:04 +0100 Subject: [PATCH 2/3] Add snyk to CI --- .github/workflows/ci.yml | 11 ++++++++++- .github/workflows/dependabot.yml | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2d461cd..a69d355 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,6 +9,15 @@ on: - main jobs: + security: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Run Snyk to check for vulnerabilities + uses: snyk/actions/node@master + env: + SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} + build: runs-on: ubuntu-latest @@ -17,7 +26,7 @@ jobs: node-version: [16.x, 17.x, 18.x, 20.x] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 with: diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml index e510d52..fbdad66 100644 --- a/.github/workflows/dependabot.yml +++ b/.github/workflows/dependabot.yml @@ -1,4 +1,4 @@ -name: Dependabot auto-merge +name: Dependabot auto-aprove on: pull_request: branches: From a0ef041d3f8ac6c9dedb41cad393edab3d31e9f2 Mon Sep 17 00:00:00 2001 From: denbon05 Date: Sun, 5 Nov 2023 12:38:46 +0100 Subject: [PATCH 3/3] Upgrade TS version --- .github/workflows/ci.yml | 9 --------- package-lock.json | 29 ++++++++--------------------- package.json | 5 ++--- 3 files changed, 10 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a69d355..e9b949f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,15 +9,6 @@ on: - main jobs: - security: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Run Snyk to check for vulnerabilities - uses: snyk/actions/node@master - env: - SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} - build: runs-on: ubuntu-latest diff --git a/package-lock.json b/package-lock.json index 2f6fe7c..e6cd474 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,6 @@ "@types/node": "^20.5.1", "@typescript-eslint/eslint-plugin": "^5.27.1", "@typescript-eslint/parser": "^5.27.1", - "bun-types": "^1.0.7", "eslint": "^8.17.0", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-prettier": "^9.0.0", @@ -26,7 +25,7 @@ "jest": "^28.1.1", "ts-jest": "^28.0.4", "ts-node": "^10.8.1", - "typescript": "^4.7.3" + "typescript": "^5.2.2" }, "engines": { "node": ">=16.x" @@ -2252,12 +2251,6 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, - "node_modules/bun-types": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/bun-types/-/bun-types-1.0.7.tgz", - "integrity": "sha512-zlIp+SCutbbugs6xDy+3WC3KO3zKySpF/bRfiTk/VJUdKt+WHAzlCtLplS7XglRYDFzhRhlzXMW/R5BHkw+u2Q==", - "dev": true - }, "node_modules/call-bind": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", @@ -6410,16 +6403,16 @@ } }, "node_modules/typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=4.2.0" + "node": ">=14.17" } }, "node_modules/unbox-primitive": { @@ -8326,12 +8319,6 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, - "bun-types": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/bun-types/-/bun-types-1.0.7.tgz", - "integrity": "sha512-zlIp+SCutbbugs6xDy+3WC3KO3zKySpF/bRfiTk/VJUdKt+WHAzlCtLplS7XglRYDFzhRhlzXMW/R5BHkw+u2Q==", - "dev": true - }, "call-bind": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", @@ -11388,9 +11375,9 @@ } }, "typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true }, "unbox-primitive": { diff --git a/package.json b/package.json index 95b9fa1..af17ad7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fastify-lcache", - "version": "1.1.6", + "version": "1.2.0", "description": "Light cache plugin for fastify", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -48,8 +48,7 @@ "jest": "^28.1.1", "ts-jest": "^28.0.4", "ts-node": "^10.8.1", - "typescript": "^4.7.3", - "bun-types": "latest" + "typescript": "^5.2.2" }, "dependencies": { "fastify-plugin": "^3.0.1"