@hylid/env 4.0.26 → 4.0.27-alpha.1

package/lib/checker/mp.js

@@ -27,7 +27,4 @@ export var mpChecker = [{
 }, {
   name: CLIENT.MPAY,
   match: [/MPay/]
-}, {
-  name: CLIENT.HIPAY,
-  match: [/hipay/]
 }];

package/lib/utils.js

@@ -1,13 +1,3 @@
-var __assign = this && this.__assign || function () {
-  __assign = Object.assign || function (t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-    }
-    return t;
-  };
-  return __assign.apply(this, arguments);
-};
 export function isMP() {
   // @ts-ignore
   if (typeof wx !== 'undefined') return true;
@@ -60,9 +50,13 @@ export function getSettingName() {
     var newUrl = "".concat(window.location.pathname).concat(search).concat(hash);
     history.replaceState(null, '', newUrl);
   }
-  var cached = JSON.parse(localStorage.getItem('__hy_env__') || '{}');
-  var crossBridgeStorage = localStorage.getItem('_CB__app__');
-  return crossBridgeStorage ? __assign(__assign({}, cached), {
-    client: crossBridgeStorage
-  }) : cached;
+  var cached = localStorage.getItem('__hy_env__');
+  // 兼容 cross-bridge 和 hylid-bridge 共存的情况
+  if (!cached) {
+    var crossBridgeStorage = localStorage.getItem('_CB__app__');
+    return crossBridgeStorage ? {
+      client: crossBridgeStorage
+    } : {};
+  }
+  return cached ? JSON.parse(cached) : {};
 }

package/lib/version.js

@@ -1 +1 @@
-export default '4.0.26';
+export default '4.0.27-alpha.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hylid/env",
-  "version": "4.0.26",
+  "version": "4.0.27-alpha.1",
   "main": "lib/index.js",
   "files": [
     "lib"