@abtnode/ux 1.16.28-next-5a717317 → 1.16.28

package/lib/locales/zh.js

@@ -355,7 +355,8 @@ export default {
     upload: '上传',
     blockletStudio: 'Studio',
     visitStore: '访问 Store',
-    reconnect: '重新连接'
+    reconnect: '重新连接',
+    change: '更改'
   },
   blocklet: {
     external: '外部',
@@ -680,7 +681,7 @@ export default {
       resourceEmptyTip: '没有可用的资源',
       releaseEmptyTip: '这里没有任何发布',
       createReleaseTip: '您可以创建 Blocklet 新版本，在发布中包含说明和资源，以供其他人使用',
-      createRelease: '创建新的版本',
+      createRelease: '创建版本',
       deleteReleaseTip: '此发布删除后不可恢复，是否继续？',
       createBlockletDid: '通过 DID 钱包创建',
       createReleaseSuccess: '发布成功',
@@ -705,7 +706,7 @@ export default {
         noFirstDid: '请先填写 Blocklet DID',
         noTitle: '请填写 Blocklet 名称',
         noVersion: '请填写 Blocklet 版本号',
-        noResource: '请选择需要关联的资源',
+        noResource: '请选择上传的资源以包含在区块中',
         noDescription: '请填写 Blocklet 描述',
         noNote: '请填写 发布说明',
         inValidVersion: '无效的 Blocklet 版本'
@@ -744,7 +745,9 @@ export default {
         branding: '描述您的区块链应用的基本信息。此信息将在商店向用户展示。'
       },
       branding: '品牌',
-      brandingHelp: '将在商店中显示有关区块链的更多信息'
+      brandingHelp: '将在商店中显示有关区块链的更多信息',
+      resourceSelect: '从 blocklets 选择资源',
+      resourceUpload: '从您的磁盘上传资源'
     },
     titleValidationError: '标题长度必须至少为3到40个字符',
     descriptionValidationError: '描述长度必须在3到160个字符之间'
@@ -874,6 +877,10 @@ export default {
       welcome: {
         switchLabel: 'Welcome 页面'
       },
+      security: {
+        switchLabel: '文件系统隔离',
+        switchTips: '关闭此选项后，Blocklet 的文件系统将不再处于隔离状态，可能会存在恶意软件破坏文件系统的风险。'
+      },
       register: {
         titleAdded: '当前节点已经添加到应用启动器',
         title: '添加节点到应用启动器',
@@ -983,7 +990,7 @@ export default {
       testSend: '测试推送',
       inputTestReceiver: '请输入测试接收者 DID',
       receiverRequired: '需要 PushKit 接收者 DID',
-      pushPath: '推送套件的 API 路径（默认 /api/push）',
+      pushPath: 'PushKit 的 API 路径（默认 /api/push）',
       did: 'PushKit Blocklet DID',
       customOptions: '自定义选项'
     }

package/lib/store/connect-actions.js

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import { useState } from 'react';
 import { Box, Button, Menu, MenuItem } from '@mui/material';
 import MoreVertIcon from '@mui/icons-material/MoreVert';
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import LaunchIcon from '@mui/icons-material/Launch';
 import LinkOutlinedIcon from '@mui/icons-material/LinkOutlined';
 import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline';
@@ -26,7 +26,7 @@ function ConnectActions({
   const [showReconnectConfirm, setShowReconnectConfirm] = useState(false);
   const handleOpenUrl = e => {
     e.stopPropagation();
-    window.open(joinUrl(store.url, 'developer/blocklets'));
+    window.open(joinURL(store.url, 'developer/blocklets'));
     window.open(store.url);
   };
   const handleOpen = event => {

package/lib/store/item.js

@@ -7,7 +7,7 @@ import AdminPanelSettingsIcon from '@mui/icons-material/AdminPanelSettings';
 import DoneIcon from '@mui/icons-material/Done';
 import PropTypes from 'prop-types';
 import { useEffect, useState } from 'react';
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Toast from '@arcblock/ux/lib/Toast';
 import DeleteStore from './delete';
@@ -117,7 +117,7 @@ export default function StoreItem({
   const handleOpenUrl = e => {
     e.stopPropagation();
     if (isPublish) {
-      window.open(joinUrl(store.url, 'developer/blocklets'));
+      window.open(joinURL(store.url, 'developer/blocklets'));
       return;
     }
     window.open(store.url);

package/lib/team/members/util.js

@@ -1,4 +1,4 @@
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import { USER_AVATAR_URL_PREFIX, USER_AVATAR_PATH_PREFIX } from '@abtnode/constant';
 
 // eslint-disable-next-line import/prefer-default-export
@@ -6,9 +6,9 @@ export function parseAvatar(avatar, teamDid, inService) {
   if (avatar && avatar.startsWith(USER_AVATAR_URL_PREFIX)) {
     const prefix = window.env.apiPrefix || '/';
     if (inService) {
-      return joinUrl(prefix, USER_AVATAR_PATH_PREFIX, avatar.replace(USER_AVATAR_URL_PREFIX, ''));
+      return joinURL(prefix, USER_AVATAR_PATH_PREFIX, avatar.replace(USER_AVATAR_URL_PREFIX, ''));
     }
-    return joinUrl(prefix, USER_AVATAR_PATH_PREFIX, teamDid, avatar.replace(USER_AVATAR_URL_PREFIX, ''));
+    return joinURL(prefix, USER_AVATAR_PATH_PREFIX, teamDid, avatar.replace(USER_AVATAR_URL_PREFIX, ''));
   }
   return avatar;
 }

package/lib/util/index.js

@@ -8,7 +8,7 @@ import isUrl from 'is-url';
 import get from 'lodash/get';
 import trimEnd from 'lodash/trimEnd';
 import qs from 'querystring';
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 import axios from '@abtnode/util/lib/axios';
 import dayjs from '@abtnode/util/lib/dayjs';
 import tryWithTimeout from '@abtnode/util/lib/try-with-timeout';
@@ -272,7 +272,7 @@ export const getInviteLink = ({
     return '';
   }
   const u = new URL(endpoint);
-  u.pathname = joinUrl(u.pathname, WELLKNOWN_SERVICE_PATH_PREFIX, 'invite');
+  u.pathname = joinURL(u.pathname, WELLKNOWN_SERVICE_PATH_PREFIX, 'invite');
   u.searchParams.set('inviteId', inviteId);
   return u.href;
 };
@@ -284,7 +284,7 @@ export const getTransferAppLink = ({
     return '';
   }
   const u = new URL(endpoint);
-  u.pathname = joinUrl(u.pathname, WELLKNOWN_SERVICE_PATH_PREFIX, 'transfer');
+  u.pathname = joinURL(u.pathname, WELLKNOWN_SERVICE_PATH_PREFIX, 'transfer');
   u.searchParams.set('transferId', transferId);
   return u.href;
 };
@@ -296,7 +296,7 @@ export const getIssuePassportLink = ({
     return '';
   }
   const u = new URL(endpoint);
-  u.pathname = joinUrl(u.pathname, WELLKNOWN_SERVICE_PATH_PREFIX, 'issue-passport');
+  u.pathname = joinURL(u.pathname, WELLKNOWN_SERVICE_PATH_PREFIX, 'issue-passport');
   u.searchParams.set('id', id);
   return u.href;
 };
@@ -366,22 +366,22 @@ export const getBlockletLogoUrl = ({
     return logoPath;
   }
   if (baseUrl.startsWith('http') && logoPath) {
-    return joinUrl(baseUrl, formatRegistryLogoPath(did, logoPath, version));
+    return joinURL(baseUrl, formatRegistryLogoPath(did, logoPath, version));
   }
   const prefix = window.env.apiPrefix || '/';
   let apiPrefix = prefix.replace(/^\/+/, '').replace(/\/+$/, '');
   if (apiPrefix) {
     apiPrefix = `/${apiPrefix}`;
   }
-  return joinUrl(apiPrefix, version ? `/blocklet/logo/${did}?v=${version}` : `/blocklet/logo/${did}`);
+  return joinURL(apiPrefix, version ? `/blocklet/logo/${did}?v=${version}` : `/blocklet/logo/${did}`);
 };
 export const getPathPrefix = () => window.env && window.env.apiPrefix ? window.env.apiPrefix : '/';
-export const isUrlAccessible = url => checkAccessible(joinUrl(new URL(url).origin, WELLKNOWN_PING_PREFIX));
+export const isUrlAccessible = url => checkAccessible(joinURL(new URL(url).origin, WELLKNOWN_PING_PREFIX));
 const checkBlockletAccessible = async (url, timeout = 5000) => {
   try {
     const urlObj = new URL(url);
     urlObj.protocol = 'https';
-    urlObj.pathname = joinUrl(WELLKNOWN_BLOCKLET_HEALTH_PATH);
+    urlObj.pathname = joinURL(WELLKNOWN_BLOCKLET_HEALTH_PATH);
     const response = await axios.get(urlObj.toString(), {
       timeout,
       validateStatus: status => {
@@ -501,10 +501,10 @@ export function getBlockletMetaUrl(storeUrl, did, dist) {
   if (!origin && dist?.tarball) {
     origin = new URL(dist.tarball).origin;
   }
-  return joinUrl(origin, BLOCKLET_STORE_API_PREFIX, `/blocklets/${did}/blocklet.json`);
+  return joinURL(origin, BLOCKLET_STORE_API_PREFIX, `/blocklets/${did}/blocklet.json`);
 }
 export async function getAsset(chainHost, address) {
-  const result = await axios.post(joinUrl(chainHost, '/api/gql/'), JSON.stringify({
+  const result = await axios.post(joinURL(chainHost, '/api/gql/'), JSON.stringify({
     query: `{
         getAssetState(address: "${address}") {
           state {
@@ -627,12 +627,12 @@ const getLauncherBaseURL = async launcherUrl => {
   try {
     const {
       data: appMeta
-    } = await axios.get(joinUrl(launcherUrl, '__blocklet__.js?type=json'), {
+    } = await axios.get(joinURL(launcherUrl, '__blocklet__.js?type=json'), {
       timeout: 5000
     });
     const mountPoint = appMeta.componentMountPoints?.find(item => item.did === 'z8iZkFBbrVQxZHvcWWB3Sa2TrfGmSeFz9MSU7');
     const launcherUrlObj = new URL(launcherUrl);
-    baseUrl = joinUrl(launcherUrlObj.origin, mountPoint?.mountPoint);
+    baseUrl = joinURL(launcherUrlObj.origin, mountPoint?.mountPoint);
   } catch (error) {
     console.error(error);
   }
@@ -646,20 +646,20 @@ export const getSubscriptionURL = async ({
   if (!launcherUrl) {
     return '';
   }
-  let baseUrl = joinUrl(launcherUrl, '/instances');
+  let baseUrl = joinURL(launcherUrl, '/instances');
   try {
     const {
       data: appMeta
-    } = await axios.get(joinUrl(launcherUrl, '__blocklet__.js?type=json'), {
+    } = await axios.get(joinURL(launcherUrl, '__blocklet__.js?type=json'), {
       timeout: 5000
     });
     const mountPoint = appMeta.componentMountPoints?.find(item => item.did === 'z8iZy4P83i6AgnNdNUexsh2kBcsDHoqcwPavn');
     const launcherUrlObj = new URL(launcherUrl);
-    baseUrl = joinUrl(launcherUrlObj.origin, mountPoint?.mountPoint, '/nfts');
+    baseUrl = joinURL(launcherUrlObj.origin, mountPoint?.mountPoint, '/nfts');
   } catch (error) {
     console.error(error);
   }
-  return joinUrl(baseUrl, `/${nftId}/subscription?locale=${locale}&return-url=${encodeURIComponent(window.location.href)}`);
+  return joinURL(baseUrl, `/${nftId}/subscription?locale=${locale}&return-url=${encodeURIComponent(window.location.href)}`);
 };
 export const getSubscriptionUrlV2 = async ({
   launcherUrl = '',
@@ -671,7 +671,7 @@ export const getSubscriptionUrlV2 = async ({
     return '';
   }
   const baseUrl = await getLauncherBaseURL(launcherUrl);
-  return joinUrl(baseUrl, `/embed/subscription?launcherSessionId=${launcherSessionId}&nftDid=${nftDid}&locale=${locale}`); // nftDid 是兼容字段
+  return joinURL(baseUrl, `/embed/subscription?launcherSessionId=${launcherSessionId}&nftDid=${nftDid}&locale=${locale}`); // nftDid 是兼容字段
 };
 export const getManageSubscriptionURL = async ({
   launcherUrl = '',
@@ -682,7 +682,7 @@ export const getManageSubscriptionURL = async ({
     return '';
   }
   const baseUrl = await getLauncherBaseURL(launcherUrl);
-  return joinUrl(baseUrl, `/embed/manage-subscription?launcherSessionId=${launcherSessionId}&locale=${locale}`);
+  return joinURL(baseUrl, `/embed/manage-subscription?launcherSessionId=${launcherSessionId}&locale=${locale}`);
 };
 export const nanoid = (length = 16) => [...Array(length)].map(() => Math.random().toString(36)[2]).join('');
 export const getSystemDomains = domains => domains.filter(x => x.isProtected);

package/lib/util/join-url-keep-search.js

@@ -1,4 +1,4 @@
-import joinUrl from 'url-join';
+import { joinURL } from 'ufo';
 const joinUrlKeepSearch = (originalUrl, path) => {
   if (!originalUrl) {
     return '';
@@ -8,7 +8,7 @@ const joinUrlKeepSearch = (originalUrl, path) => {
   }
   const url = new URL(originalUrl);
   const searchParams = new URLSearchParams(url.searchParams);
-  const newPath = new URL(joinUrl(url.origin, path));
+  const newPath = new URL(joinURL(url.origin, path));
   newPath.search = searchParams.toString();
   return newPath.toString();
 };

package/lib/util/spaces.js

@@ -1,7 +1,7 @@
 import isUrl from 'is-url';
 import { BLOCKLET_CONFIGURABLE_KEY } from '@blocklet/constant';
 import { isObject, isString } from 'lodash';
-import { joinURL } from 'ufo';
+import { joinURL, withQuery } from 'ufo';
 import { api } from './api';
 
 /* eslint-disable import/prefer-default-export */
@@ -230,6 +230,8 @@ export async function getSpaceGatewayUrl(anyUrl, options = {
     throw new Error(`MountPoint(${mountPoint}) not found`);
   }
   const didSpacesCoreUrl = joinURL(u.origin, mountPoint);
-  const spaceGatewayUrl = options.withSearchParams && u.searchParams.get('spaceDid') ? joinURL(didSpacesCoreUrl, `?spaceDid=${u.searchParams.get('spaceDid')}`) : didSpacesCoreUrl;
+  const spaceGatewayUrl = options.withSearchParams && u.searchParams.get('spaceDid') ? withQuery(didSpacesCoreUrl, {
+    spaceDid: u.searchParams.get('spaceDid')
+  }) : didSpacesCoreUrl;
   return spaceGatewayUrl;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.28-next-5a717317",
+  "version": "1.16.28",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -25,24 +25,24 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.28-next-5a717317",
-    "@abtnode/constant": "1.16.28-next-5a717317",
-    "@abtnode/util": "1.16.28-next-5a717317",
+    "@abtnode/auth": "1.16.28",
+    "@abtnode/constant": "1.16.28",
+    "@abtnode/util": "1.16.28",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.123",
-    "@arcblock/did-connect": "^2.9.90",
+    "@arcblock/did-connect": "^2.10.0",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.9.90",
-    "@arcblock/nft-display": "2.9.90",
-    "@arcblock/react-hooks": "^2.9.90",
-    "@arcblock/terminal": "^2.9.90",
-    "@arcblock/ux": "^2.9.90",
-    "@blocklet/constant": "1.16.28-next-5a717317",
-    "@blocklet/launcher-layout": "2.3.21",
-    "@blocklet/list": "^0.12.111",
-    "@blocklet/meta": "1.16.28-next-5a717317",
-    "@blocklet/ui-react": "^2.9.90",
-    "@blocklet/uploader": "^0.1.6",
+    "@arcblock/icons": "^2.10.0",
+    "@arcblock/nft-display": "2.10.0",
+    "@arcblock/react-hooks": "^2.10.0",
+    "@arcblock/terminal": "^2.10.0",
+    "@arcblock/ux": "^2.10.0",
+    "@blocklet/constant": "1.16.28",
+    "@blocklet/launcher-layout": "2.3.22",
+    "@blocklet/list": "^0.12.114",
+    "@blocklet/meta": "1.16.28",
+    "@blocklet/ui-react": "^2.10.0",
+    "@blocklet/uploader": "^0.1.10",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify-icons/logos": "^1.2.36",
@@ -58,7 +58,7 @@
     "@ocap/client": "1.18.123",
     "@uiw/react-markdown-preview": "^5.1.1",
     "ahooks": "^3.7.8",
-    "axios": "^0.27.2",
+    "axios": "^1.7.2",
     "classnames": "^2.3.2",
     "copy-to-clipboard": "^3.3.3",
     "date-fns": "^2.30.0",
@@ -93,8 +93,7 @@
     "rehype-external-links": "^3.0.0",
     "semver": "^7.3.8",
     "timeago.js": "^4.0.2",
-    "ufo": "^1.0.1",
-    "url-join": "^4.0.1",
+    "ufo": "^1.5.3",
     "validator": "^13.9.0"
   },
   "devDependencies": {
@@ -108,5 +107,5 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0"
   },
-  "gitHead": "3624967f9549de3a25a87ed6b20f82519ddb4757"
+  "gitHead": "54db076a7e520bbc260f8cbf0af31dd50b86aef1"
 }