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

Update deep merge interface (api) #217

Draft
wants to merge 40 commits into
base: v5
Choose a base branch
from
Draft

Update deep merge interface (api) #217

wants to merge 40 commits into from

Commits on Nov 17, 2020

  1. chore(editorconfig): declare the charset

    Rebecca Stevens committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    ca08a6c View commit details
    Browse the repository at this point in the history

  2. chore(editorconfig): have package.json and its lockfile keep their de… 

    …fault indenting style
    Rebecca Stevens committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    09c3e67 View commit details
    Browse the repository at this point in the history

  3. chore(editorconfig): have markdown files keep there trailing whitespace 

    It can have actual meaning.
    Rebecca Stevens committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    9e6c637 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2020

  1. chore(editorconfig): use space instead of tabs for markdown files 

    This is to help ensure that markdown files are rendered similarly by different renders.
    Rebecca Stevens committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    21e5999 View commit details
    Browse the repository at this point in the history

  2. chore(editorconfig): use space instead of tabs for yaml files

    Rebecca Stevens committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    dc8df6b View commit details
    Browse the repository at this point in the history

  3. chore: use files field in package.json instead of .npmignore

    Rebecca Stevens committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    29b862b View commit details
    Browse the repository at this point in the history

  4. chore: sort package.json fields

    Rebecca Stevens committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    c32dfd4 View commit details
    Browse the repository at this point in the history

  5. refactor: move src file to src/

    Rebecca Stevens committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    b62e6e1 View commit details
    Browse the repository at this point in the history

  6. refactor: move typedefs to types/

    Rebecca Stevens committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    48a6eaf View commit details
    Browse the repository at this point in the history

  7. chore(devdeps): update rollup to v2.33.1 

    update rollup plugins as well
    Rebecca Stevens committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    e246c61 View commit details
    Browse the repository at this point in the history

  8. chore(devdeps): update is-plain-obj to v3.0.0

    Rebecca Stevens committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    6f2930b View commit details
    Browse the repository at this point in the history

  9. chore(devdeps): update tape to v5.0.1

    Rebecca Stevens committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    1a82cba View commit details
    Browse the repository at this point in the history

  10. chore(devdeps): replace uglify-js with more modern terser

    Rebecca Stevens committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    a27988f View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2020

  1. build(typescript): add typescript and setup the build to build with t… 

    …ypescript
    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    4e74235 View commit details
    Browse the repository at this point in the history

  2. refactor: move implementation out of index file

    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    2fb71c2 View commit details
    Browse the repository at this point in the history

  3. refactor: upgrade code

    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    5646fd6 View commit details
    Browse the repository at this point in the history

  4. perf: only compute the full options on the top level call

    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    7b894d1 View commit details
    Browse the repository at this point in the history

  5. refactor: move utility functions to a utils file

    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    6e5dcd3 View commit details
    Browse the repository at this point in the history

  6. refactor: move options stuff to its own file

    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    8373879 View commit details
    Browse the repository at this point in the history

  7. add typedefs from TehShrike#211

    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    5676ca7 View commit details
    Browse the repository at this point in the history

  8. test: tests types

    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    776fc22 View commit details
    Browse the repository at this point in the history

  9. chore: refactor npm script commands

    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    a2af763 View commit details
    Browse the repository at this point in the history

  10. build: update package exports

    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    0a2be40 View commit details
    Browse the repository at this point in the history

  11. build: add type support for older TypeScript versions

    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    2246372 View commit details
    Browse the repository at this point in the history

  12. build(lint): add eslint

    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    8c562f5 View commit details
    Browse the repository at this point in the history

  13. style(lint): apply linting fixes

    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    e0b302f View commit details
    Browse the repository at this point in the history

  14. fix: remove circular dependency between utils and deepmerge files

    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    9b55056 View commit details
    Browse the repository at this point in the history

  15. ci: update ci config

    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    34fab73 View commit details
    Browse the repository at this point in the history

  16. ci: switch to using GitHub Actions 

    Travis has been running really slow lately
    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    03bd8a9 View commit details
    Browse the repository at this point in the history

  17. docs: update readme with new js interface

    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    fbf00cc View commit details
    Browse the repository at this point in the history

  18. test: ensure options aren't mutated 

    re TehShrike#173
    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    13d6db1 View commit details
    Browse the repository at this point in the history

  19. test: convert test to typescript and fixup errors this revealed

    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    ded6c51 View commit details
    Browse the repository at this point in the history

  20. docs: update changelog

    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    1e02b16 View commit details
    Browse the repository at this point in the history

  21. build: set required node version

    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    6494a33 View commit details
    Browse the repository at this point in the history

  22. fix: small tweaks to types and formatting

    @RebeccaStevens
    Rebecca Stevens authored and RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    0c343f2 View commit details
    Browse the repository at this point in the history

  23. refactor: extract out defaultClone

    @RebeccaStevens
    RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    ced4b6d View commit details
    Browse the repository at this point in the history

  24. feat: don't clone by deafult 

    re TehShrike#212
    @RebeccaStevens
    RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    f450b1f View commit details
    Browse the repository at this point in the history

  25. feat: allow a custom clone function to be provided

    @RebeccaStevens
    RebeccaStevens committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    992e0af View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2020

  1. feat: custom merge is now a single function 

    expose a deepMerge option in full options object
    @RebeccaStevens
    RebeccaStevens committed Nov 28, 2020
    Configuration menu
    Copy the full SHA
    d194991 View commit details
    Browse the repository at this point in the history

  2. docs: update changelog

    @RebeccaStevens
    RebeccaStevens committed Nov 28, 2020
    Configuration menu
    Copy the full SHA
    049dc4f View commit details
    Browse the repository at this point in the history