@nocobase/resourcer 0.7.1-alpha.6 → 0.7.1-alpha.7

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.
Files changed (2) hide show
  1. package/lib/assign.js +7 -7
  2. package/package.json +2 -2
package/lib/assign.js CHANGED
@@ -7,20 +7,20 @@ exports.assign = assign;
7
7
  exports.default = isPlainObject;
8
8
  exports.mergeStrategies = void 0;
9
9
 
10
- function _lodash() {
11
- const data = _interopRequireDefault(require("lodash"));
10
+ function _deepmerge() {
11
+ const data = _interopRequireDefault(require("deepmerge"));
12
12
 
13
- _lodash = function _lodash() {
13
+ _deepmerge = function _deepmerge() {
14
14
  return data;
15
15
  };
16
16
 
17
17
  return data;
18
18
  }
19
19
 
20
- function _deepmerge() {
21
- const data = _interopRequireDefault(require("deepmerge"));
20
+ function _lodash() {
21
+ const data = _interopRequireDefault(require("lodash"));
22
22
 
23
- _deepmerge = function _deepmerge() {
23
+ _lodash = function _lodash() {
24
24
  return data;
25
25
  };
26
26
 
@@ -102,7 +102,7 @@ mergeStrategies.set('union', (x, y) => {
102
102
  y = y.split(',');
103
103
  }
104
104
 
105
- return _lodash().default.uniq((x || []).concat(y || []));
105
+ return _lodash().default.uniq((x || []).concat(y || [])).filter(Boolean);
106
106
  });
107
107
  mergeStrategies.set('intersect', (x, y) => {
108
108
  if (typeof x === 'string') {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nocobase/resourcer",
3
- "version": "0.7.1-alpha.6",
3
+ "version": "0.7.1-alpha.7",
4
4
  "description": "",
5
5
  "main": "./lib/index.js",
6
6
  "types": "./lib/index.d.ts",
@@ -23,5 +23,5 @@
23
23
  "url": "git+https://github.com/nocobase/nocobase.git",
24
24
  "directory": "packages/resourcer"
25
25
  },
26
- "gitHead": "b6f96c97020d278ae597bf05553442d7516b2216"
26
+ "gitHead": "87601930b09f7df3eec5d493b62a7ec27871caa1"
27
27
  }