@nocobase/utils 0.5.0-alpha.34 → 0.5.0-alpha.35

package/lib/index.d.ts

@@ -1 +1,2 @@
-export declare function merge(obj1: any, obj2: any): unknown;
+export * from './merge';
+export * from './umiConfig';

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"sources":["index.ts"],"names":[],"mappings":"AAIA,wBAAgB,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,WAIzC","file":"index.d.ts","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"]}
+{"version":3,"sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC","file":"index.d.ts","sourcesContent":["export * from './merge';\nexport * from './umiConfig';\n"]}

package/lib/index.js

@@ -12,26 +12,28 @@ function _react() {
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var __importDefault = void 0 && (void 0).__importDefault || function (mod) {
-  return mod && mod.__esModule ? mod : {
-    "default": mod
-  };
+var __createBinding = void 0 && (void 0).__createBinding || (Object.create ? function (o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  Object.defineProperty(o, k2, {
+    enumerable: true,
+    get: function get() {
+      return m[k];
+    }
+  });
+} : function (o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  o[k2] = m[k];
+});
+
+var __exportStar = void 0 && (void 0).__exportStar || function (m, exports) {
+  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.merge = void 0;
 
-const deepmerge_1 = __importDefault(require("deepmerge"));
-
-const overwriteMerge = (destinationArray, sourceArray, options) => sourceArray;
-
-function merge(obj1, obj2) {
-  return (0, deepmerge_1.default)(obj1, obj2, {
-    arrayMerge: overwriteMerge
-  });
-}
+__exportStar(require("./merge"), exports);
 
-exports.merge = merge;
+__exportStar(require("./umiConfig"), exports);
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -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,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"]}
+{"version":3,"sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAwB;AACxB,8CAA4B","file":"index.js","sourcesContent":["export * from './merge';\nexport * from './umiConfig';\n"]}

package/lib/merge.d.ts

@@ -0,0 +1 @@
+export declare function merge(obj1: any, obj2: any): unknown;

package/lib/merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"sources":["merge.ts"],"names":[],"mappings":"AAIA,wBAAgB,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,WAIzC","file":"merge.d.ts","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/lib/merge.js

@@ -0,0 +1,37 @@
+"use strict";
+
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+
+  _react = function _react() {
+    return data;
+  };
+
+  return data;
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var __importDefault = void 0 && (void 0).__importDefault || function (mod) {
+  return mod && mod.__esModule ? mod : {
+    "default": mod
+  };
+};
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.merge = void 0;
+
+const deepmerge_1 = __importDefault(require("deepmerge"));
+
+const overwriteMerge = (destinationArray, sourceArray, options) => sourceArray;
+
+function merge(obj1, obj2) {
+  return (0, deepmerge_1.default)(obj1, obj2, {
+    arrayMerge: overwriteMerge
+  });
+}
+
+exports.merge = merge;
+//# sourceMappingURL=merge.js.map

package/lib/merge.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["merge.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":"merge.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/lib/umiConfig.d.ts

@@ -0,0 +1,17 @@
+export declare function getUmiConfig(): {
+    define: {
+        'process.env.API_BASE_URL': string;
+    };
+    proxy: {
+        [x: string]: {
+            target: string;
+            changeOrigin: boolean;
+        } | {
+            target: string;
+            changeOrigin: boolean;
+            pathRewrite: {
+                [x: string]: string;
+            };
+        };
+    };
+};

package/lib/umiConfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"sources":["umiConfig.ts"],"names":[],"mappings":"AAAA,wBAAgB,YAAY;;;;;;;;;;;;;;;;EAmC3B","file":"umiConfig.d.ts","sourcesContent":["export function getUmiConfig() {\n  const { API_PORT, API_BASE_URL } = process.env;\n  const API_BASE_PATH = process.env.API_BASE_PATH || '/api/';\n  const PROXY_TARGET_URL = process.env.PROXY_TARGET_URL || `http://127.0.0.1:${API_PORT}`;\n  const LOCAL_STORAGE_BASE_URL = process.env.LOCAL_STORAGE_BASE_URL || '/uploads';\n\n  function getLocalStorageProxy() {\n    if (LOCAL_STORAGE_BASE_URL.startsWith('http')) {\n      return {};\n    }\n\n    return {\n      [LOCAL_STORAGE_BASE_URL]: {\n        target: PROXY_TARGET_URL,\n        changeOrigin: true,\n      },\n    };\n  }\n\n  return {\n    define: {\n      'process.env.API_BASE_URL': API_BASE_URL || API_BASE_PATH,\n    },\n    // only proxy when using `umi dev`\n    // if the assets are built, will not proxy\n    proxy: {\n      [API_BASE_PATH]: {\n        target: PROXY_TARGET_URL,\n        changeOrigin: true,\n        pathRewrite: { [`^${API_BASE_PATH}`]: API_BASE_PATH },\n      },\n      // for local storage\n      ...getLocalStorageProxy(),\n    },\n  };\n}\n"]}

package/lib/umiConfig.js

@@ -0,0 +1,58 @@
+"use strict";
+
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+
+  _react = function _react() {
+    return data;
+  };
+
+  return data;
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getUmiConfig = void 0;
+
+function getUmiConfig() {
+  const _process$env = process.env,
+        API_PORT = _process$env.API_PORT,
+        API_BASE_URL = _process$env.API_BASE_URL;
+  const API_BASE_PATH = process.env.API_BASE_PATH || '/api/';
+  const PROXY_TARGET_URL = process.env.PROXY_TARGET_URL || `http://127.0.0.1:${API_PORT}`;
+  const LOCAL_STORAGE_BASE_URL = process.env.LOCAL_STORAGE_BASE_URL || '/uploads';
+
+  function getLocalStorageProxy() {
+    if (LOCAL_STORAGE_BASE_URL.startsWith('http')) {
+      return {};
+    }
+
+    return {
+      [LOCAL_STORAGE_BASE_URL]: {
+        target: PROXY_TARGET_URL,
+        changeOrigin: true
+      }
+    };
+  }
+
+  return {
+    define: {
+      'process.env.API_BASE_URL': API_BASE_URL || API_BASE_PATH
+    },
+    proxy: Object.assign({
+      [API_BASE_PATH]: {
+        target: PROXY_TARGET_URL,
+        changeOrigin: true,
+        pathRewrite: {
+          [`^${API_BASE_PATH}`]: API_BASE_PATH
+        }
+      }
+    }, getLocalStorageProxy())
+  };
+}
+
+exports.getUmiConfig = getUmiConfig;
+//# sourceMappingURL=umiConfig.js.map

package/lib/umiConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["umiConfig.ts"],"names":[],"mappings":";;;AAAA,SAAgB,YAAY;IAC1B,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAC/C,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,OAAO,CAAC;IAC3D,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,oBAAoB,QAAQ,EAAE,CAAC;IACxF,MAAM,sBAAsB,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,UAAU,CAAC;IAEhF,SAAS,oBAAoB;QAC3B,IAAI,sBAAsB,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC7C,OAAO,EAAE,CAAC;SACX;QAED,OAAO;YACL,CAAC,sBAAsB,CAAC,EAAE;gBACxB,MAAM,EAAE,gBAAgB;gBACxB,YAAY,EAAE,IAAI;aACnB;SACF,CAAC;IACJ,CAAC;IAED,OAAO;QACL,MAAM,EAAE;YACN,0BAA0B,EAAE,YAAY,IAAI,aAAa;SAC1D;QAGD,KAAK,kBACH,CAAC,aAAa,CAAC,EAAE;gBACf,MAAM,EAAE,gBAAgB;gBACxB,YAAY,EAAE,IAAI;gBAClB,WAAW,EAAE,EAAE,CAAC,IAAI,aAAa,EAAE,CAAC,EAAE,aAAa,EAAE;aACtD,IAEE,oBAAoB,EAAE,CAC1B;KACF,CAAC;AACJ,CAAC;AAnCD,oCAmCC","file":"umiConfig.js","sourcesContent":["export function getUmiConfig() {\n  const { API_PORT, API_BASE_URL } = process.env;\n  const API_BASE_PATH = process.env.API_BASE_PATH || '/api/';\n  const PROXY_TARGET_URL = process.env.PROXY_TARGET_URL || `http://127.0.0.1:${API_PORT}`;\n  const LOCAL_STORAGE_BASE_URL = process.env.LOCAL_STORAGE_BASE_URL || '/uploads';\n\n  function getLocalStorageProxy() {\n    if (LOCAL_STORAGE_BASE_URL.startsWith('http')) {\n      return {};\n    }\n\n    return {\n      [LOCAL_STORAGE_BASE_URL]: {\n        target: PROXY_TARGET_URL,\n        changeOrigin: true,\n      },\n    };\n  }\n\n  return {\n    define: {\n      'process.env.API_BASE_URL': API_BASE_URL || API_BASE_PATH,\n    },\n    // only proxy when using `umi dev`\n    // if the assets are built, will not proxy\n    proxy: {\n      [API_BASE_PATH]: {\n        target: PROXY_TARGET_URL,\n        changeOrigin: true,\n        pathRewrite: { [`^${API_BASE_PATH}`]: API_BASE_PATH },\n      },\n      // for local storage\n      ...getLocalStorageProxy(),\n    },\n  };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "0.5.0-alpha.34",
+  "version": "0.5.0-alpha.35",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "MIT",
@@ -9,5 +9,5 @@
     "deepmerge": "^4.2.2",
     "flat-to-nested": "^1.1.1"
   },
-  "gitHead": "11cded6153bab633fb0b7415c33b4c3c369c2427"
+  "gitHead": "2b81a6af327ee784a6943aff6e028fde3298dec9"
 }