@hylid/env 0.0.2-dev.3 → 0.0.2-dev.9

package/lib/checker/mp.js

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

package/lib/getClientName/getName4Mp.js

@@ -1,9 +1,5 @@
 import { mpChecker } from "../checker";
-import { CLIENT } from "../constants";
 import { getMatchName } from "../utils";
 export function getName4MP() {
-  // 微信小程序
-  // @ts-ignore
-  if (typeof wx !== 'undefined') return CLIENT.WECHAT;
   return getMatchName(mpChecker, my.getSystemInfoSync().app);
 }

package/lib/utils.js

@@ -1,6 +1,14 @@
+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;
   // 小程序一定有 my
   if (typeof my === 'undefined') return false;
   // SDKVersion 只在小程序有
@@ -34,29 +42,28 @@ export function notice(text) {
 }
 export function getSettingName() {
   var _a;
+  var ENV_KEY = '__hy_env__';
   var clientMatch = ((_a = window.location.search) === null || _a === void 0 ? void 0 : _a.match(/__app__=([^&]*)/)) || [];
   var client = clientMatch[1];
   var platformMatch = window.location.search.match(/__platform__=([^&]*)/) || [];
   var platform = platformMatch[1];
-  if (client || platform) {
-    localStorage.setItem('__hy_env__', JSON.stringify({
-      client: client,
-      platform: platform
-    }));
+  var env = JSON.parse(localStorage.getItem(ENV_KEY) || '{}') || {};
+  if (client) {
+    env.client = client;
   }
+  if (platform) {
+    env.platform = platform;
+  }
+  localStorage.setItem(ENV_KEY, JSON.stringify(env));
   if (clientMatch[1]) {
     var search = window.location.search.replace(new RegExp("".concat(clientMatch[0], "(&)*")), '');
     var hash = window.location.hash || '';
     var newUrl = "".concat(window.location.pathname).concat(search).concat(hash);
     history.replaceState(null, '', newUrl);
   }
-  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) : {};
+  var cached = JSON.parse(localStorage.getItem(ENV_KEY) || '{}');
+  var crossBridgeStorage = localStorage.getItem('_CB__app__');
+  return crossBridgeStorage ? __assign(__assign({}, cached), {
+    client: crossBridgeStorage
+  }) : cached;
 }

package/lib/version.js

@@ -1 +1 @@
-export default '4.0.27-alpha.1';
+export default '0.0.2-dev.9';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hylid/env",
-  "version": "0.0.2-dev.3",
+  "version": "0.0.2-dev.9",
   "main": "lib/index.js",
   "files": [
     "lib"