@varlet/shared 3.3.3 → 3.3.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/index.cjs +2 -2
- package/lib/index.js +2 -2
- package/package.json +1 -1
package/lib/index.cjs
CHANGED
|
@@ -101,7 +101,7 @@ var isURL = (val) => {
|
|
|
101
101
|
}
|
|
102
102
|
return /^(http)|(\.*\/)/.test(val);
|
|
103
103
|
};
|
|
104
|
-
var isEmpty = (val) => val === void 0 || val === null || val === "" ||
|
|
104
|
+
var isEmpty = (val) => val === void 0 || val === null || val === "" || isArray(val) && !val.length;
|
|
105
105
|
var isWindow = (val) => val === window;
|
|
106
106
|
var supportTouch = () => inBrowser() && "ontouchstart" in window;
|
|
107
107
|
var inBrowser = () => typeof window !== "undefined";
|
|
@@ -328,7 +328,7 @@ function mergeWith(object, source, customizer) {
|
|
|
328
328
|
if (isObject2(targetValue)) {
|
|
329
329
|
target[key] = baseMerge(targetValue, srcValue);
|
|
330
330
|
} else {
|
|
331
|
-
target[key] = baseMerge(
|
|
331
|
+
target[key] = baseMerge(isArray(srcValue) ? [] : {}, srcValue);
|
|
332
332
|
}
|
|
333
333
|
} else {
|
|
334
334
|
target[key] = srcValue;
|
package/lib/index.js
CHANGED
|
@@ -33,7 +33,7 @@ var isURL = (val) => {
|
|
|
33
33
|
}
|
|
34
34
|
return /^(http)|(\.*\/)/.test(val);
|
|
35
35
|
};
|
|
36
|
-
var isEmpty = (val) => val === void 0 || val === null || val === "" ||
|
|
36
|
+
var isEmpty = (val) => val === void 0 || val === null || val === "" || isArray(val) && !val.length;
|
|
37
37
|
var isWindow = (val) => val === window;
|
|
38
38
|
var supportTouch = () => inBrowser() && "ontouchstart" in window;
|
|
39
39
|
var inBrowser = () => typeof window !== "undefined";
|
|
@@ -260,7 +260,7 @@ function mergeWith(object, source, customizer) {
|
|
|
260
260
|
if (isObject2(targetValue)) {
|
|
261
261
|
target[key] = baseMerge(targetValue, srcValue);
|
|
262
262
|
} else {
|
|
263
|
-
target[key] = baseMerge(
|
|
263
|
+
target[key] = baseMerge(isArray(srcValue) ? [] : {}, srcValue);
|
|
264
264
|
}
|
|
265
265
|
} else {
|
|
266
266
|
target[key] = srcValue;
|