From c2fc0aa23db444bb7292d2ac519d55f04d99ad1f Mon Sep 17 00:00:00 2001 From: James Sumners <321201+jsumners@users.noreply.github.com> Date: Tue, 9 Jul 2024 16:16:16 -0400 Subject: [PATCH] Merge `next` into `master` (#199) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update for Fastify v5 (#192) * Update for fastify 5 * removed coverage disable * replaced istambul with c8 * wrapped code in c8 * fix --------- Co-authored-by: Gürgün Dayıoğlu * Update for Fastify v5 (#192) * Update for fastify 5 * removed coverage disable * replaced istambul with c8 * wrapped code in c8 * fix --------- Co-authored-by: Gürgün Dayıoğlu * update fastify deps --------- Co-authored-by: Cristian Barlutiu Co-authored-by: Gürgün Dayıoğlu --- .github/workflows/ci.yml | 2 +- .taprc | 7 ------- index.js | 6 ++++-- package.json | 14 +++++++------- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87263eb..71d63df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ on: jobs: test: - uses: fastify/workflows/.github/workflows/plugins-ci-redis.yml@v3 + uses: fastify/workflows/.github/workflows/plugins-ci-redis.yml@v4.1.0 with: lint: true license-check: true diff --git a/.taprc b/.taprc index 63ccb87..eb6eb3e 100644 --- a/.taprc +++ b/.taprc @@ -1,9 +1,2 @@ -ts: false -jsx: false -flow: false -jobs: 1 -coverage: true -check-coverage: true - files: - test/**/*.test.js diff --git a/index.js b/index.js index 7f871b3..ec03b67 100644 --- a/index.js +++ b/index.js @@ -67,7 +67,7 @@ function fastifyRedis (fastify, options, next) { } // Testing this make the process crash on latest TAP :( - /* istanbul ignore next */ + /* c8 ignore start */ const onEnd = function (err) { client .off('ready', onReady) @@ -77,6 +77,7 @@ function fastifyRedis (fastify, options, next) { next(err) } + /* c8 ignore stop */ const onReady = function () { client @@ -88,7 +89,7 @@ function fastifyRedis (fastify, options, next) { } // Testing this make the process crash on latest TAP :( - /* istanbul ignore next */ + /* c8 ignore start */ const onError = function (err) { if (err.code === 'ENOTFOUND') { onEnd(err) @@ -105,6 +106,7 @@ function fastifyRedis (fastify, options, next) { onEnd(err) } } + /* c8 ignore stop */ // ioredis provides it in a .status property if (client.status === 'ready') { diff --git a/package.json b/package.json index f1afe3f..77cc3c0 100644 --- a/package.json +++ b/package.json @@ -35,18 +35,18 @@ }, "homepage": "https://github.com/fastify/fastify-redis#readme", "devDependencies": { - "@fastify/pre-commit": "^2.0.2", - "@types/node": "^20.1.0", - "fastify": "^4.0.0-rc.2", + "@fastify/pre-commit": "^2.1.0", + "@types/node": "^20.11.30", + "fastify": "^5.0.0-alpha.3", "proxyquire": "^2.1.3", - "standard": "^17.0.0", - "tap": "^16.0.0", + "standard": "^17.1.0", + "tap": "^18.7.1", "tsd": "^0.31.0", "why-is-node-running": "^2.2.2" }, "dependencies": { - "fastify-plugin": "^4.0.0", - "ioredis": "^5.0.0" + "fastify-plugin": "^5.0.0-pre.fv5.1", + "ioredis": "^5.3.2" }, "publishConfig": { "access": "public"