Skip to content

Commit 00e489e

Browse files
committed
bump dev-dependencies
1 parent cf9f123 commit 00e489e

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

index.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ const getEnumerableOwnPropertyKeys = value => {
2929
if (Object.getOwnPropertySymbols) {
3030
const symbols = Object.getOwnPropertySymbols(value);
3131

32-
for (let i = 0; i < symbols.length; i++) {
33-
if (propertyIsEnumerable.call(value, symbols[i])) {
34-
keys.push(symbols[i]);
32+
for (const symbol of symbols) {
33+
if (propertyIsEnumerable.call(value, symbol)) {
34+
keys.push(symbol);
3535
}
3636
}
3737
}
@@ -127,9 +127,7 @@ const concatArrays = (merged, source, config) => {
127127
}
128128

129129
// Merge non-index keys
130-
result = mergeKeys(result, array, getEnumerableOwnPropertyKeys(array).filter(key => {
131-
return indices.indexOf(key) === -1;
132-
}), config);
130+
result = mergeKeys(result, array, getEnumerableOwnPropertyKeys(array).filter(key => !indices.includes(key)), config);
133131
});
134132

135133
return result;

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
"clone"
3131
],
3232
"devDependencies": {
33-
"ava": "^1.3.1",
33+
"ava": "^2.4.0",
3434
"coveralls": "^3.0.3",
35-
"nyc": "^11.9.0",
36-
"rimraf": "^2.6.3",
37-
"xo": "^0.24.0"
35+
"nyc": "^14.1.1",
36+
"rimraf": "^3.0.0",
37+
"xo": "^0.25.3"
3838
},
3939
"dependencies": {
4040
"is-plain-obj": "^1.1"

test/option-values.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import mergeOptions from '..';
44
function toString(value) {
55
try {
66
return String(value);
7-
} catch (error) {
7+
} catch (_) {
88
return typeof value;
99
}
1010
}
@@ -81,7 +81,7 @@ test('support Promise as target, Promise as source', async t => {
8181
const promise2 = Promise.resolve(42);
8282
const result = mergeOptions({promise: promise1}, {promise: promise2});
8383
t.is(result.promise.constructor, Promise);
84-
t.deepEqual(await result.promise, 42);
84+
t.is(await result.promise, 42);
8585
});
8686

8787
test('support user-defined object as target, user-defined object as source', t => {

0 commit comments

Comments
 (0)