@arcblock/ux 2.12.51 → 2.12.53

package/lib/Locale/context.js

@@ -5,7 +5,7 @@ import get from 'lodash/get';
 import Cookie from 'js-cookie';
 import browserLang from './browser-lang';
 import { translate } from './util';
-import { getCookieOptions } from '../Util';
+import { getCookieOptions, resolveRootDomain } from '../Util';
 const cookieName = 'nf_lang';
 
 // 跨应用传递多语言选择的方式是在 query string 中添加 locale 参数，LocaleSelector 要高优先级遵守这个参数
@@ -33,7 +33,19 @@ const getLocale = (languages = []) => {
   return getLocaleFromSearchParams(languages) || Cookie.get(cookieName) || browserLang(langParams);
 };
 const setLocale = locale => {
-  Cookie.set(cookieName, locale, getCookieOptions());
+  const opts = getCookieOptions();
+
+  // @compatibility 移除历史上使用根域名的旧 cookie
+  if (!opts.domain) {
+    const rootDomain = resolveRootDomain();
+    if (rootDomain) {
+      Cookie.remove(cookieName, {
+        path: opts.path || '/',
+        domain: rootDomain
+      });
+    }
+  }
+  Cookie.set(cookieName, locale, opts);
   setLocaleParam(locale);
 };
 const getLanguages = arg => {

package/lib/Util/index.d.ts

@@ -1,5 +1,9 @@
 import type { $TSFixMe, Locale } from '../type';
 declare let dateTool: $TSFixMe | null;
+/** 是否常见二段式顶级域名 */
+export declare function isTwoSegmentTLD(domain: string): boolean;
+/** 获取根域名 */
+export declare function resolveRootDomain(): string;
 export declare function parseQuery(str: string): Record<string, string | boolean>;
 export declare function stringifyQuery(params?: {}): string;
 export declare function getCookieOptions(expireInDays?: number | {

package/lib/Util/index.js

@@ -7,6 +7,52 @@ import omitBy from 'lodash/omitBy';
 import pRetry from 'p-retry';
 import { DID_PREFIX, BLOCKLET_SERVICE_PATH_PREFIX } from './constant';
 let dateTool = null;
+const IP_V4_REGEX = /^(\d{1,3}\.){3}\d{1,3}(:\d+)?$/;
+// 常见顶级域名
+const commonSLDs = new Set(['co', 'com', 'net', 'org', 'gov', 'edu', 'ac']);
+// 常见国家域名
+const commonCcTLDs = new Set(['uk', 'au', 'cn', 'nz', 'za', 'in', 'br', 'mx', 'fr', 'it', 'ca']);
+
+/** 是否常见二段式顶级域名 */
+export function isTwoSegmentTLD(domain) {
+  if (!domain) {
+    return false;
+  }
+  const parts = domain.split('.');
+  if (parts.length < 2) return false;
+  const sld = parts[parts.length - 2];
+  const tld = parts[parts.length - 1];
+  return commonSLDs.has(sld) && commonCcTLDs.has(tld);
+}
+
+/** 获取根域名 */
+export function resolveRootDomain() {
+  const {
+    host
+  } = window.location;
+  if (!host) {
+    return '';
+  }
+  if (IP_V4_REGEX.test(host)) {
+    return '';
+  }
+
+  // 移除可能存在的端口号
+  const hostWithoutPort = host.split(':')[0];
+  const parts = hostWithoutPort.split('.');
+  if (parts.length === 1) {
+    return '';
+  }
+
+  // 二段式顶级域名
+  if (parts.length > 2) {
+    const tld = parts.slice(-2).join('.');
+    if (isTwoSegmentTLD(tld)) {
+      return `.${parts.slice(-3).join('.')}`;
+    }
+  }
+  return `.${parts.slice(-2).join('.')}`;
+}
 export function parseQuery(str) {
   return str.replace(/^\?/, '').split('&').map(x => x.split('=')).filter(([key]) => !!key).reduce((memo, x) => {
     const key = x[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.12.51",
+  "version": "2.12.53",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -69,12 +69,12 @@
     "react": ">=18.2.0",
     "react-router-dom": ">=6.22.3"
   },
-  "gitHead": "b122909f88066cb3d5b1cd96f6658d6870ed85e1",
+  "gitHead": "454c63f6d9b58724fa0176ac74de2f306b53207c",
   "dependencies": {
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.12.51",
-    "@arcblock/nft-display": "^2.12.51",
-    "@arcblock/react-hooks": "^2.12.51",
+    "@arcblock/icons": "^2.12.53",
+    "@arcblock/nft-display": "^2.12.53",
+    "@arcblock/react-hooks": "^2.12.53",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@fontsource/inter": "^5.0.16",
     "@fontsource/ubuntu-mono": "^5.0.18",

package/src/Locale/context.tsx

@@ -6,7 +6,7 @@ import Cookie from 'js-cookie';
 import browserLang from './browser-lang';
 import { translate } from './util';
 
-import { getCookieOptions } from '../Util';
+import { getCookieOptions, resolveRootDomain } from '../Util';
 import type { Locale } from '../type';
 
 const cookieName = 'nf_lang';
@@ -42,7 +42,17 @@ const getLocale = (languages: { code: string }[] = []): string => {
 };
 
 const setLocale = (locale: Locale) => {
-  Cookie.set(cookieName, locale, getCookieOptions());
+  const opts = getCookieOptions();
+
+  // @compatibility 移除历史上使用根域名的旧 cookie
+  if (!opts.domain) {
+    const rootDomain = resolveRootDomain();
+    if (rootDomain) {
+      Cookie.remove(cookieName, { path: opts.path || '/', domain: rootDomain });
+    }
+  }
+
+  Cookie.set(cookieName, locale, opts);
   setLocaleParam(locale);
 };
 

package/src/Util/index.ts

@@ -9,6 +9,59 @@ import { DID_PREFIX, BLOCKLET_SERVICE_PATH_PREFIX } from './constant';
 import type { $TSFixMe, Locale } from '../type';
 
 let dateTool: $TSFixMe | null = null;
+const IP_V4_REGEX = /^(\d{1,3}\.){3}\d{1,3}(:\d+)?$/;
+// 常见顶级域名
+const commonSLDs = new Set(['co', 'com', 'net', 'org', 'gov', 'edu', 'ac']);
+// 常见国家域名
+const commonCcTLDs = new Set(['uk', 'au', 'cn', 'nz', 'za', 'in', 'br', 'mx', 'fr', 'it', 'ca']);
+
+/** 是否常见二段式顶级域名 */
+export function isTwoSegmentTLD(domain: string) {
+  if (!domain) {
+    return false;
+  }
+
+  const parts = domain.split('.');
+
+  if (parts.length < 2) return false;
+
+  const sld = parts[parts.length - 2];
+  const tld = parts[parts.length - 1];
+
+  return commonSLDs.has(sld) && commonCcTLDs.has(tld);
+}
+
+/** 获取根域名 */
+export function resolveRootDomain() {
+  const { host } = window.location;
+
+  if (!host) {
+    return '';
+  }
+
+  if (IP_V4_REGEX.test(host)) {
+    return '';
+  }
+
+  // 移除可能存在的端口号
+  const hostWithoutPort = host.split(':')[0];
+  const parts = hostWithoutPort.split('.');
+
+  if (parts.length === 1) {
+    return '';
+  }
+
+  // 二段式顶级域名
+  if (parts.length > 2) {
+    const tld = parts.slice(-2).join('.');
+
+    if (isTwoSegmentTLD(tld)) {
+      return `.${parts.slice(-3).join('.')}`;
+    }
+  }
+
+  return `.${parts.slice(-2).join('.')}`;
+}
 
 export function parseQuery(str: string) {
   return str