Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Raice Hannay committed Jan 23, 2024
1 parent 0d4f2f1 commit 5571561
Show file tree
Hide file tree
Showing 4 changed files with 1,120 additions and 1,018 deletions.
8 changes: 4 additions & 4 deletions index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ type TPrimitives =
type TMerged<T> = [T] extends [Array<any>]
? { [K in keyof T]: TMerged<T[K]> }
: [T] extends [TPrimitives]
? T
: [T] extends [object]
? TPartialKeys<{ [K in TAllKeys<T>]: TMerged<TIndexValue<T, K>> }, never>
: T;
? T
: [T] extends [object]
? TPartialKeys<{ [K in TAllKeys<T>]: TMerged<TIndexValue<T, K>> }, never>
: T;

// istanbul ignore next
const isObject = (obj: any) => {
Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "ts-deepmerge",
"type": "module",
"license": "ISC",
"version": "6.2.0",
"version": "6.2.1",
"scripts": {
"clean": "rimraf ./{cjs,esm}/!(package.json)",
"compile": "yarn clean && yarn compile:esm && yarn compile:cjs",
Expand Down Expand Up @@ -55,19 +55,19 @@
"main": "./cjs/index.js",
"module": "./esm/index.js",
"devDependencies": {
"@types/jest": "^29.5.3",
"@typescript-eslint/eslint-plugin": "^6.1.0",
"concurrently": "^8.2.0",
"@types/jest": "^29.5.11",
"@typescript-eslint/eslint-plugin": "^6.19.1",
"concurrently": "^8.2.2",
"cross-env": "^7.0.3",
"eslint": "^8.45.0",
"eslint": "^8.56.0",
"eslint-config-voodoocreation": "^4.0.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jest": "^27.2.3",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^27.6.3",
"eslint-plugin-prefer-arrow": "^1.2.3",
"jest": "^29.6.1",
"jest-environment-jsdom": "^29.6.1",
"prettier": "^3.0.0",
"ts-jest": "^29.1.1",
"typescript": "^5.1.6"
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"prettier": "^3.2.4",
"ts-jest": "^29.1.2",
"typescript": "^5.3.3"
}
}
6 changes: 3 additions & 3 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"noImplicitAny": true,
"downlevelIteration": true,
"noUnusedLocals": true,
"noUnusedParameters": true
"noUnusedParameters": true,
},
"exclude": [
"**/coverage/*",
Expand All @@ -23,6 +23,6 @@
"**/esm/*",
"**/*.d.ts",
"**/*.test.ts",
"**/*.test.tsx"
]
"**/*.test.tsx",
],
}
Loading

0 comments on commit 5571561

Please sign in to comment.