Code

Expand custom#1

Code

Closed

RebeccaStevens wants to merge 48 commits intobryan-hunter:v5bryan-hunter/deepmerge:v5from RebeccaStevens:expand-customRebeccaStevens/fork-deepmerge:expand-customCopy head branch name to clipboard

+5,625-1,774

Commits

Commits on Oct 24, 2019

• Fix inconsistent indentation

  Show description for da8e665
  TehShrike

  authored
  da8e665

• Fix inconsistent indentation (TehShrike#175)

  Show description for d1ae60f
  TehShrike

  authored
  d1ae60f

Commits on Oct 28, 2019

• Only call isMergeableObject if there are two values that could be merged

  Show description for a34dd4d
  TehShrike

  committed
  a34dd4d

• Changelog for 4.2.2

  TehShrike

  committed
  88d15b3

• 4.2.2

  TehShrike

  committed
  c759b5d

• Merge branch 'master' of github.com:TehShrike/deepmerge

  TehShrike

  committed
  e9c9fec

Commits on Oct 30, 2019

• editorconfig

  TehShrike

  committed
  7640d50

Commits on Nov 10, 2020

• Merge remote-tracking branch 'upstream/master' into v5-2020

  TehShrike

  committed
  af876a3

Commits on Nov 17, 2020

• chore(editorconfig): declare the charset

  

  Rebecca Stevens

  committed
  ca08a6c

• chore(editorconfig): have package.json and its lockfile keep their default indenting style

  

  Rebecca Stevens

  committed
  09c3e67

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

  Show description for 9e6c637
  

  Rebecca Stevens

  committed
  9e6c637

Commits on Nov 18, 2020

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

  Show description for 21e5999
  

  Rebecca Stevens

  committed
  21e5999

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

  

  Rebecca Stevens

  committed
  dc8df6b

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

  

  Rebecca Stevens

  committed
  29b862b

• chore: sort package.json fields

  

  Rebecca Stevens

  committed
  c32dfd4

• refactor: move src file to src/

  

  Rebecca Stevens

  committed
  b62e6e1

• refactor: move typedefs to types/

  

  Rebecca Stevens

  committed
  48a6eaf

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

  Show description for e246c61
  

  Rebecca Stevens

  committed
  e246c61

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

  

  Rebecca Stevens

  committed
  6f2930b

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

  

  Rebecca Stevens

  committed
  1a82cba

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

  

  Rebecca Stevens

  committed
  a27988f

Commits on Nov 27, 2020

• build(typescript): add typescript and setup the build to build with typescript

  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  4e74235

• refactor: move implementation out of index file

  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  2fb71c2

• refactor: upgrade code

  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  5646fd6

• perf: only compute the full options on the top level call

  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  7b894d1

• refactor: move utility functions to a utils file

  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  6e5dcd3

• refactor: move options stuff to its own file

  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  8373879

• add typedefs from TehShrike#211

  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  5676ca7

• test: tests types

  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  776fc22

• chore: refactor npm script commands

  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  a2af763

• build: update package exports

  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  0a2be40

• build: add type support for older TypeScript versions

  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  2246372

• build(lint): add eslint

  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  8c562f5

• style(lint): apply linting fixes

  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  e0b302f

• fix: remove circular dependency between utils and deepmerge files

  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  9b55056

• ci: update ci config

  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  34fab73

• ci: switch to using GitHub Actions

  Show description for 03bd8a9
  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  03bd8a9

• docs: update readme with new js interface

  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  fbf00cc

• test: ensure options aren't mutated

  Show description for 13d6db1
  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  13d6db1

• test: convert test to typescript and fixup errors this revealed

  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  ded6c51

• docs: update changelog

  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  1e02b16

• build: set required node version

  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  6494a33

• fix: small tweaks to types and formatting

  

  Rebecca Stevens

  authored and

  RebeccaStevens

  committed
  0c343f2

• refactor: extract out defaultClone

  RebeccaStevens

  committed
  ced4b6d

• feat: don't clone by deafult

  Show description for f450b1f
  RebeccaStevens

  committed
  f450b1f

• feat: allow a custom clone function to be provided

  RebeccaStevens

  committed
  992e0af

Commits on Nov 28, 2020

• feat: custom merge is now a single function

  Show description for d194991
  RebeccaStevens

  committed
  d194991

• docs: update changelog

  RebeccaStevens

  committed
  049dc4f