diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b00276..5395d92 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.yml@v3 + uses: fastify/workflows/.github/workflows/plugins-ci.yml@v4.1.0 with: license-check: true lint: true 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(deepmerge({ symbols: true })) expectType(deepmerge()('string', { a: 'string' }).a) expectType(deepmerge()(1, { a: 'string' }).a) -expectType(deepmerge()({ a: 'string' }, 'string')) -expectType(deepmerge()({ a: 'string' }, 1)) +expectType(deepmerge()({ a: 'string' }, 'string')) +expectType(deepmerge()({ a: 'string' }, 1)) expectType(deepmerge()({ a: 'string' }, new Date())) expectType(deepmerge()({ a: 'string' }, /a/g)) expectType<{}>(deepmerge()(/a/, {}))