Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Expand custom #1

Closed
wants to merge 48 commits into from
Closed

Expand custom #1

wants to merge 48 commits into from

Conversation

RebeccaStevens
Copy link

Based off TehShrike#215

Changes

  • Cloning is now off by default
  • A custom clone function can now be provided
    • This is primarily to handle the case of cloning non-plain objects
  • Updated the exposed internals
    • add deepClone(value)
      • deep clones a value in the same way that cloneUnlessOtherwiseSpecified did except an options object isn't supplied, the same original one is used.
    • add deepMerge(x, y)
      • deep merges two values in the same way that top level deepmerge does except an options object isn't supplied, the same original one is used.
    • remove cloneUnlessOtherwiseSpecified(value)
      • function no longer exists - replaced by getSubtree (not exposed) and deepClone (exposed)

TehShrike and others added 30 commits October 24, 2019 11:28
@TehShrike
Fix inconsistent indentation
da8e665 
One example was using spaces for indentation.  Noticed by @midnightcodr and reported in TehShrike#174
@TehShrike
Fix inconsistent indentation (TehShrike#175)
d1ae60f 
Fix inconsistent indentation
@TehShrike
Only call isMergeableObject if there are two values that could be m…
a34dd4d 
…erged

Also reverse the if check so you don't have to think your way through two negations and an OR

Inspired by TehShrike#176
@TehShrike
Changelog for 4.2.2
88d15b3
@TehShrike
4.2.2
c759b5d
@TehShrike
Merge branch 'master' of github.com:TehShrike/deepmerge
e9c9fec
@TehShrike
editorconfig
7640d50
@TehShrike
Merge remote-tracking branch 'upstream/master' into v5-2020
af876a3
chore(editorconfig): declare the charset
ca08a6c
chore(editorconfig): have package.json and its lockfile keep their de…
09c3e67 
…fault indenting style
chore(editorconfig): have markdown files keep there trailing whitespace
9e6c637 
It can have actual meaning.
chore(editorconfig): use space instead of tabs for markdown files
21e5999 
This is to help ensure that markdown files are rendered similarly by different renders.
chore(editorconfig): use space instead of tabs for yaml files
dc8df6b
chore: use files field in package.json instead of .npmignore
29b862b
chore: sort package.json fields
c32dfd4
refactor: move src file to src/
b62e6e1
refactor: move typedefs to types/
48a6eaf
chore(devdeps): update rollup to v2.33.1
e246c61 
update rollup plugins as well
chore(devdeps): update is-plain-obj to v3.0.0
6f2930b
chore(devdeps): update tape to v5.0.1
1a82cba
chore(devdeps): replace uglify-js with more modern terser
a27988f
@RebeccaStevens
build(typescript): add typescript and setup the build to build with t…
4e74235 
…ypescript
@RebeccaStevens
refactor: move implementation out of index file
2fb71c2
@RebeccaStevens
refactor: upgrade code
5646fd6
@RebeccaStevens
perf: only compute the full options on the top level call
7b894d1
@RebeccaStevens
refactor: move utility functions to a utils file
6e5dcd3
@RebeccaStevens
refactor: move options stuff to its own file
8373879
@RebeccaStevens
add typedefs from TehShrike#211
5676ca7
@RebeccaStevens
test: tests types
776fc22
@RebeccaStevens
chore: refactor npm script commands
a2af763
Rebecca Stevens and others added 18 commits November 27, 2020 18:46
@RebeccaStevens
build: update package exports
0a2be40
@RebeccaStevens
build: add type support for older TypeScript versions
2246372
@RebeccaStevens
build(lint): add eslint
8c562f5
@RebeccaStevens
style(lint): apply linting fixes
e0b302f
@RebeccaStevens
fix: remove circular dependency between utils and deepmerge files
9b55056
@RebeccaStevens
ci: update ci config
34fab73
@RebeccaStevens
ci: switch to using GitHub Actions
03bd8a9 
Travis has been running really slow lately
@RebeccaStevens
docs: update readme with new js interface
fbf00cc
@RebeccaStevens
test: ensure options aren't mutated
13d6db1 
re TehShrike#173
@RebeccaStevens
test: convert test to typescript and fixup errors this revealed
ded6c51
@RebeccaStevens
docs: update changelog
1e02b16
@RebeccaStevens
build: set required node version
6494a33
@RebeccaStevens
fix: small tweaks to types and formatting
0c343f2
@RebeccaStevens
refactor: extract out defaultClone
ced4b6d
@RebeccaStevens
feat: don't clone by deafult
f450b1f 
re TehShrike#212
@RebeccaStevens
feat: allow a custom clone function to be provided
992e0af
@RebeccaStevens
feat: custom merge is now a single function
d194991 
expose a deepMerge option in full options object
@RebeccaStevens
docs: update changelog
049dc4f
@RebeccaStevens
Copy link
Author

Oops wrong repo

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@RebeccaStevens @TehShrike