Skip to content

Commit

Permalink
fix: use custom deepmerge() (#27)
Browse files Browse the repository at this point in the history
* fix: use custom deepmerge()

`deepmerge` does not work with class instances.

Create an internal implementation that fixes this issue.
  • Loading branch information
unional committed May 13, 2019
1 parent 11d3a41 commit 093621b
Show file tree
Hide file tree
Showing 6 changed files with 228 additions and 120 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Expand Up @@ -107,7 +107,7 @@ jobs:
path: .reports/junit
size-limit:
docker:
- image: 'circleci/node:9'
- image: 'circleci/node:latest-browsers'
steps:
- checkout
- attach_workspace:
Expand Down
1 change: 1 addition & 0 deletions jest.config.js
Expand Up @@ -2,6 +2,7 @@ const common = require('@unional/devpkg-node/simple/config/jest.common')
module.exports = Object.assign(common, {
'globals': {
'ts-jest': {
'diagnostics': false,
'tsConfig': 'tsconfig.jest.json'
}
}
Expand Down
80 changes: 66 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions package.json
Expand Up @@ -36,11 +36,9 @@
"watch": "jest --watch",
"watch:type": "tsc --watch"
},
"dependencies": {
"deepmerge": "^3.2.0"
},
"dependencies": {},
"devDependencies": {
"@unional/devpkg-node": "^1.2.5",
"@unional/devpkg-node": "^1.3.0",
"assertron": "^7.0.1",
"size-limit": "^1.3.1"
},
Expand Down

0 comments on commit 093621b

Please sign in to comment.