Commit00e489e

committed

bump dev-dependencies

1 parentcf9f123 commit00e489eCopy full SHA for 00e489e

File tree

+10

-12

lines changed

+10

-12

lines changed

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ const getEnumerableOwnPropertyKeys = value => {`
`29`	`29`	`if(Object.getOwnPropertySymbols){`
`30`	`30`	`constsymbols=Object.getOwnPropertySymbols(value);`
`31`	`31`
`32`		`-for(leti=0;i<symbols.length;i++){`
`33`		`-if(propertyIsEnumerable.call(value,symbols[i])){`
`34`		`-keys.push(symbols[i]);`
	`32`	`+for(constsymbolofsymbols){`
	`33`	`+if(propertyIsEnumerable.call(value,symbol)){`
	`34`	`+keys.push(symbol);`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`}`
`@@ -127,9 +127,7 @@ const concatArrays = (merged, source, config) => {`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`// Merge non-index keys`
`130`		`-result=mergeKeys(result,array,getEnumerableOwnPropertyKeys(array).filter(key=>{`
`131`		`-returnindices.indexOf(key)===-1;`
`132`		`-}),config);`
	`130`	`+result=mergeKeys(result,array,getEnumerableOwnPropertyKeys(array).filter(key=>!indices.includes(key)),config);`
`133`	`131`	`});`
`134`	`132`
`135`	`133`	`returnresult;`

Lines changed: 4 additions & 4 deletions

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import mergeOptions from '..';`
`4`	`4`	`functiontoString(value){`
`5`	`5`	`try{`
`6`	`6`	`returnString(value);`
`7`		`-}catch(error){`
	`7`	`+}catch(_){`
`8`	`8`	`returntypeofvalue;`
`9`	`9`	`}`
`10`	`10`	`}`
`@@ -81,7 +81,7 @@ test('support Promise as target, Promise as source', async t => {`
`81`	`81`	`constpromise2=Promise.resolve(42);`
`82`	`82`	`constresult=mergeOptions({promise:promise1},{promise:promise2});`
`83`	`83`	`t.is(result.promise.constructor,Promise);`
`84`		`-t.deepEqual(awaitresult.promise,42);`
	`84`	`+t.is(awaitresult.promise,42);`
`85`	`85`	`});`
`86`	`86`
`87`	`87`	`test('support user-defined object as target, user-defined object as source',t=>{`

Comments

(0)