@nocobase/utils 0.5.0-alpha.30 → 0.5.0-alpha.34
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.js +1 -1
- package/lib/index.js.map +1 -1
- package/package.json +2 -2
package/lib/index.js
CHANGED
|
@@ -28,7 +28,7 @@ const deepmerge_1 = __importDefault(require("deepmerge"));
|
|
|
28
28
|
const overwriteMerge = (destinationArray, sourceArray, options) => sourceArray;
|
|
29
29
|
|
|
30
30
|
function merge(obj1, obj2) {
|
|
31
|
-
return deepmerge_1.default(obj1, obj2, {
|
|
31
|
+
return (0, deepmerge_1.default)(obj1, obj2, {
|
|
32
32
|
arrayMerge: overwriteMerge
|
|
33
33
|
});
|
|
34
34
|
}
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAkC;AAElC,MAAM,cAAc,GAAG,CAAC,gBAAgB,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,CAAC,WAAW,CAAA;AAE9E,SAAgB,KAAK,CAAC,IAAS,EAAE,IAAS;IACxC,OAAO,mBAAS,
|
|
1
|
+
{"version":3,"sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAkC;AAElC,MAAM,cAAc,GAAG,CAAC,gBAAgB,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,CAAC,WAAW,CAAA;AAE9E,SAAgB,KAAK,CAAC,IAAS,EAAE,IAAS;IACxC,OAAO,IAAA,mBAAS,EAAC,IAAI,EAAE,IAAI,EAAE;QAC3B,UAAU,EAAE,cAAc;KAC3B,CAAC,CAAC;AACL,CAAC;AAJD,sBAIC","file":"index.js","sourcesContent":["import deepmerge from 'deepmerge';\n\nconst overwriteMerge = (destinationArray, sourceArray, options) => sourceArray\n\nexport function merge(obj1: any, obj2: any) {\n return deepmerge(obj1, obj2, {\n arrayMerge: overwriteMerge,\n });\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nocobase/utils",
|
|
3
|
-
"version": "0.5.0-alpha.
|
|
3
|
+
"version": "0.5.0-alpha.34",
|
|
4
4
|
"main": "lib/index.js",
|
|
5
5
|
"types": "./lib/index.d.ts",
|
|
6
6
|
"license": "MIT",
|
|
@@ -9,5 +9,5 @@
|
|
|
9
9
|
"deepmerge": "^4.2.2",
|
|
10
10
|
"flat-to-nested": "^1.1.1"
|
|
11
11
|
},
|
|
12
|
-
"gitHead": "
|
|
12
|
+
"gitHead": "11cded6153bab633fb0b7415c33b4c3c369c2427"
|
|
13
13
|
}
|