From 70b4eb3df1a3ef95774e2d72bfda367c6795a7d4 Mon Sep 17 00:00:00 2001
From: James Sumners <321201+jsumners@users.noreply.github.com>
Date: Sun, 23 Jun 2024 12:07:21 -0400
Subject: [PATCH] Merge `next` into `master` (#37)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update for Fastify v5 (#34)

* update for fastify 5

* fixed typescript issue

* updated plugins-ci-package-manager

* remove package manager ci

---------

Co-authored-by: Gürgün Dayıoğlu <hey@gurgun.day>

* update workflow and pin node versions (#36)

---------

Co-authored-by: Cristian Barlutiu <cristian.barlutiu@gmail.com>
Co-authored-by: Gürgün Dayıoğlu <hey@gurgun.day>
---
 .github/workflows/ci.yml                 |  3 ++-
 .github/workflows/package-manager-ci.yml | 20 --------------------
 .taprc                                   |  7 +++----
 package.json                             |  8 ++++----
 types/index.test-d.ts                    |  4 ++--
 5 files changed, 11 insertions(+), 31 deletions(-)
 delete mode 100644 .github/workflows/package-manager-ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7b00276..bbfcb5e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,8 @@ on:
 
 jobs:
   test:
-    uses: fastify/workflows/.github/workflows/plugins-ci.yml@v3
+    uses: fastify/workflows/.github/workflows/plugins-ci.yml@v4.2.1
     with:
       license-check: true
       lint: true
+      node-versions: '["16", "18", "20", "22"]'
diff --git a/.github/workflows/package-manager-ci.yml b/.github/workflows/package-manager-ci.yml
deleted file mode 100644
index 89d450f..0000000
--- a/.github/workflows/package-manager-ci.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: package-manager-ci
-
-on:
-  push:
-    branches:
-     - main
-     - master
-     - next
-     - 'v*'
-    paths-ignore:
-      - 'docs/**'
-      - '*.md'
-  pull_request:
-    paths-ignore:
-      - 'docs/**'
-      - '*.md'
-
-jobs:
-  test:
-    uses: fastify/workflows/.github/workflows/plugins-ci-package-manager.yml@v3
diff --git a/.taprc b/.taprc
index fccba25..b30f091 100644
--- a/.taprc
+++ b/.taprc
@@ -1,6 +1,5 @@
-ts: false
-jsx: false
-coverage: true
-
+disable-coverage: true
 files:
   - test/**/*.test.js
+plugin:
+  - "!@tapjs/typescript"
diff --git a/package.json b/package.json
index 6e87fb5..e80bdae 100644
--- a/package.json
+++ b/package.json
@@ -23,10 +23,10 @@
   },
   "homepage": "https://github.com/fastify/deepmerge#readme",
   "devDependencies": {
-    "standard": "^17.0.0",
-    "tap": "^16.3.0",
-    "tape": "^5.6.1",
-    "tsd": "^0.27.0"
+    "standard": "^17.1.0",
+    "tap": "^18.7.1",
+    "tape": "^5.7.5",
+    "tsd": "^0.30.7"
   },
   "files": [
     "LICENSE",
diff --git a/types/index.test-d.ts b/types/index.test-d.ts
index 0fda4b7..78df804 100644
--- a/types/index.test-d.ts
+++ b/types/index.test-d.ts
@@ -16,8 +16,8 @@ expectAssignable<Function>(deepmerge({ symbols: true }))
 expectType<string>(deepmerge()('string', { a: 'string' }).a)
 expectType<string>(deepmerge()(1, { a: 'string' }).a)
 
-expectType<string>(deepmerge()({ a: 'string' }, 'string'))
-expectType<number>(deepmerge()({ a: 'string' }, 1))
+expectType<string>(deepmerge()<Object, string>({ a: 'string' }, 'string'))
+expectType<number>(deepmerge()<Object, number>({ a: 'string' }, 1))
 expectType<Date>(deepmerge()({ a: 'string' }, new Date()))
 expectType<RegExp>(deepmerge()({ a: 'string' }, /a/g))
 expectType<{}>(deepmerge()(/a/, {}))