Merge next into master (#37)

* 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 <[email protected]>

* update workflow and pin node versions (#36)

---------

Co-authored-by: Cristian Barlutiu <[email protected]>
Co-authored-by: Gürgün Dayıoğlu <[email protected]>

.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"]'

.taprc

@@ -1,6 +1,5 @@
-ts: false
-jsx: false
-coverage: true
-
+disable-coverage: true
 files:
   - test/**/*.test.js
+plugin:
+  - "!@tapjs/typescript"

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",

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/, {}))