@abtnode/ux 1.16.28-beta-8acda0e6 → 1.16.28-next-5a717317

package/lib/analytics/traffic.js

@@ -3,10 +3,16 @@
 import { useEffect, useState } from 'react';
 import dayjs from '@abtnode/util/lib/dayjs';
 import nthArg from 'lodash/nthArg';
-import { joinURL } from 'ufo';
+import joinUrl from 'url-join';
 import useAsyncRetry from 'react-use/lib/useAsyncRetry';
 import Iframe from 'react-iframe';
-import { Alert, CircularProgress, Grid, Typography, Button, IconButton, Popover } from '@mui/material';
+import Alert from '@mui/material/Alert';
+import Spinner from '@mui/material/CircularProgress';
+import Grid from '@mui/material/Grid';
+import Typography from '@mui/material/Typography';
+import Button from '@mui/material/Button';
+import IconButton from '@mui/material/IconButton';
+import Popover from '@mui/material/Popover';
 import ViewIcon from '@mui/icons-material/LaunchOutlined';
 import { DateRangePicker } from 'mui-daterange-picker';
 import { DatePicker } from '@mui/x-date-pickers';
@@ -108,7 +114,7 @@ export default function TrafficInsights({
     error
   } = data;
   if (!list.length && loading) {
-    return /*#__PURE__*/_jsx(CircularProgress, {});
+    return /*#__PURE__*/_jsx(Spinner, {});
   }
   if (error) {
     return /*#__PURE__*/_jsx(Alert, {
@@ -144,7 +150,7 @@ export default function TrafficInsights({
 
   // eslint-disable-next-line no-nested-ternary
   const pathPrefix = inService ? WELLKNOWN_SERVICE_PATH_PREFIX : process.env.NODE_ENV === 'production' ? info.routing.adminPath : '';
-  const breakdownUrl = joinURL(window.location.origin, pathPrefix, `/api/analytics/traffic?date=${dayjs(date).format('YYYY-MM-DD')}&did=${did}`);
+  const breakdownUrl = joinUrl(window.location.origin, pathPrefix, `/api/analytics/traffic?date=${dayjs(date).format('YYYY-MM-DD')}&did=${did}`);
   const onRangeChange = range => {
     setDateRange(range);
     setAnchorEl(null);

package/lib/blocklet/authentication/federated/federated-detail-dialog.js

@@ -11,7 +11,7 @@ import { Address } from '@arcblock/did-connect';
 import Dialog from '@arcblock/ux/lib/Dialog';
 import StarsIcon from '@mui/icons-material/Stars';
 import isUrl from 'is-url';
-import { joinURL } from 'ufo';
+import joinUrl from 'url-join';
 import { useBlockletContext } from '../../../contexts/blocklet';
 import { useNodeContext } from '../../../contexts/node';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -95,7 +95,7 @@ const FederatedDetailDialog = /*#__PURE__*/forwardRef((props, ref) => {
         });
       }
       if (['appLogo'].includes(key)) {
-        const logoUrl = isUrl(value) ? value : joinURL(state.data.appUrl || '', value || '');
+        const logoUrl = isUrl(value) ? value : joinUrl(state.data.appUrl || '', value || '');
         try {
           const logoUrlInstance = new URL(logoUrl);
           logoUrlInstance.searchParams.set('imageFilter', 'resize');

package/lib/blocklet/blocklet-source.js

@@ -1,6 +1,6 @@
 import { useContext } from 'react';
 import PropTypes from 'prop-types';
-import { joinURL } from 'ufo';
+import joinUrl from 'url-join';
 import toUpper from 'lodash/toUpper';
 import Tag from '@arcblock/ux/lib/Tag';
 import { LocaleContext } from '@arcblock/ux/lib/Locale/context';
@@ -21,7 +21,7 @@ export default function BlockletSource({
       type: "success",
       children: toUpper(sourceInfo.source)
     }, "source"), sourceInfo.source === 'registry' && /*#__PURE__*/_jsx(ExternalLink, {
-      href: joinURL(sourceInfo.deployedFrom, 'blocklets', blocklet?.meta?.bundleDid || ''),
+      href: joinUrl(sourceInfo.deployedFrom, 'blocklets', blocklet?.meta?.bundleDid || ''),
       target: "_blank",
       className: "page-link",
       underline: "hover",

package/lib/blocklet/component/did-space/connect-to.js

@@ -3,7 +3,7 @@ import React, { useState } from 'react';
 import Button from '@arcblock/ux/lib/Button';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import DidConnect from '@arcblock/did-connect/lib/Connect';
-import { joinURL } from 'ufo';
+import joinUrl from 'url-join';
 import toast from '@arcblock/ux/lib/Toast';
 import SplitButton from '@arcblock/ux/lib/SplitButton';
 import Dialog from '@arcblock/ux/lib/Dialog';
@@ -62,7 +62,7 @@ function ConnectTo({
     checkTimeout: 1000 * 300,
     prefix: '/api/did',
     checkFn: axios.create({
-      baseURL: joinURL(window.location.origin, getPathPrefix())
+      baseURL: joinUrl(window.location.origin, getPathPrefix())
     }).get,
     messages: {
       title: t('storage.spaces.provideNFT.title', {
@@ -191,10 +191,10 @@ function ConnectTo({
       setAuthorizeConnect(preValue => ({
         ...preValue,
         open: true,
-        prefix: joinURL(didSpacesCoreUrl, 'space/api/did'),
+        prefix: joinUrl(didSpacesCoreUrl, 'space/api/did'),
         baseUrl: new URL(didSpacesCoreUrl).origin,
         checkFn: axios.create({
-          baseURL: joinURL(didSpacesCoreUrl, 'space')
+          baseURL: joinUrl(didSpacesCoreUrl, 'space')
         }).get,
         extraParams: {
           appDid: blockletInfo.appDid,

package/lib/blocklet/component/navigation/navigation-dialog.js

@@ -23,7 +23,8 @@ import { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRe
 import { Controller, useForm } from 'react-hook-form';
 import { Icon, loadIcon } from '@iconify/react';
 import { isMatchSection, checkLink, flattenNavigation } from '@blocklet/meta/lib/parse-navigation-from-blocklet';
-import { joinURL, withoutTrailingSlash } from 'ufo';
+import urljoin from 'url-join';
+import { withoutTrailingSlash } from 'ufo/dist/index.mjs';
 import isAbsoluteUrl from 'is-absolute-url';
 import { SUPPORTED_LANGUAGES } from '@blocklet/constant';
 import LocaleTabs from './locale-tabs';
@@ -168,7 +169,7 @@ const NavigationDialog = /*#__PURE__*/forwardRef(function NavigationDialog({
         return withoutTrailingSlash(stringLink);
       }
       const selectedLink = isObject(selectedOption.link) ? selectedOption.link[state.locale] : selectedOption.link;
-      return withoutTrailingSlash(joinURL(stringLink, selectedLink || '/'));
+      return withoutTrailingSlash(urljoin(stringLink, selectedLink || '/'));
     }
     return null;
   }, [components, state.locale, selectedOption, watchComponent]);

package/lib/blocklet/component/space-connector.js

@@ -4,7 +4,7 @@ import { LocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { BLOCKLET_CONFIGURABLE_KEY, DID_SPACES } from '@blocklet/constant';
 import axios from 'axios';
 import PropTypes from 'prop-types';
-import { joinURL } from 'ufo';
+import joinUrl from 'url-join';
 import { isEmpty } from 'lodash';
 import Typography from '@mui/material/Typography';
 import Toast from '@arcblock/ux/lib/Toast';
@@ -118,10 +118,10 @@ const SpaceConnector = /*#__PURE__*/forwardRef(({
       ...preValue,
       action: 'one-click-authorization',
       checkTimeout: 1000 * 300,
-      prefix: joinURL(gatewayUrl, 'space/api/did'),
+      prefix: joinUrl(gatewayUrl, 'space/api/did'),
       baseUrl: new URL(gatewayUrl).origin,
       checkFn: axios.create({
-        baseURL: joinURL(gatewayUrl, 'space')
+        baseURL: joinUrl(gatewayUrl, 'space')
       }).get,
       extraParams: {
         appDid: blocklet.appDid,

package/lib/blocklet/component/space-selector.js

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import styled from '@emotion/styled';
-import { joinURL } from 'ufo';
+import joinUrl from 'url-join';
 import isUrl from 'is-url';
 import useLocalStorage from 'react-use/lib/useLocalStorage';
 import Button from '@arcblock/ux/lib/Button';
@@ -40,7 +40,7 @@ function SpaceSelector({
   } = useSessionContext();
   useEffect(() => {
     if (gatewayUrl && !gatewayList.find(x => x.value === gatewayUrl)) {
-      api.get(joinURL(gatewayUrl, '/__blocklet__.js?type=json')).then(res => {
+      api.get(joinUrl(gatewayUrl, '/__blocklet__.js?type=json')).then(res => {
         // FIXME: @wangshijun handle mountPoint
         setGatewayList([...gatewayList, {
           value: gatewayUrl,

package/lib/blocklet/component/store-blocklet-list.js

@@ -3,7 +3,7 @@
 import { useEffect, useState } from 'react';
 import styled from '@emotion/styled';
 import PropTypes from 'prop-types';
-import { joinURL } from 'ufo';
+import joinUrl from 'url-join';
 import Link from '@mui/material/Link';
 import { ErrorFallback } from '@arcblock/ux/lib/ErrorBoundary';
 import { ErrorBoundary } from 'react-error-boundary';
@@ -20,7 +20,7 @@ import { formatRegistryLogoPath } from '../../util';
 import { useBlockletContext } from '../../contexts/blocklet';
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 const getStoreDetail = (meta, endpoint) => {
-  return joinURL(endpoint, `/blocklets/${meta.did}`);
+  return joinUrl(endpoint, `/blocklets/${meta.did}`);
 };
 const displayAttributes = ({
   blocklet,
@@ -42,7 +42,7 @@ function BlockletItem({
   const {
     t
   } = useLocaleContext();
-  let logoUrl = joinURL(endpoint, formatRegistryLogoPath(blocklet.did, blocklet.logo || ''));
+  let logoUrl = joinUrl(endpoint, formatRegistryLogoPath(blocklet.did, blocklet.logo || ''));
   try {
     const tempURL = new URL(logoUrl);
     tempURL.searchParams.set('v', blocklet.version || +new Date());

package/lib/blocklet/logo-uploader.js

@@ -1,6 +1,6 @@
 import React, { lazy, useRef } from 'react';
 import PropTypes from 'prop-types';
-import { joinURL } from 'ufo';
+import joinUrl from 'url-join';
 import styled from '@emotion/styled';
 import noop from 'lodash/noop';
 import Box from '@mui/material/Box';
@@ -52,7 +52,7 @@ export default function LogoUploader({
         disabled: true
       },
       apiPathProps: {
-        uploader: joinURL(prefix, uploadPrefix, type, did),
+        uploader: joinUrl(prefix, uploadPrefix, type, did),
         disableMediaKitPrefix: true
       },
       coreProps: {

package/lib/blocklet/notification/push-kit.js

@@ -85,7 +85,7 @@ function NotificationPushKit() {
       await api.sendPush({
         input: {
           did,
-          receiver: pageState.testReceiver,
+          receiver: 'z1b9wxs47TXpA5s6VMoGFBk933tF7ujzFDt',
           notification: JSON.stringify({
             title: 'Test push-kit notification',
             body: 'This is message from push-kit config test',

package/lib/blocklet/preferences/index.js

@@ -2,7 +2,7 @@ import React, { useState, useContext } from 'react';
 import styled from '@emotion/styled';
 import PropTypes from 'prop-types';
 import Iframe from 'react-iframe';
-import { joinURL } from 'ufo';
+import joinUrl from 'url-join';
 import { WELLKNOWN_SERVICE_PATH_PREFIX } from '@abtnode/constant';
 import { Grid, Box } from '@mui/material';
 import GeneralIcon from '@mui/icons-material/TuneRounded';
@@ -236,9 +236,9 @@ export default function BlockletPreferences({
     if (!inService) {
       urlSearchParams.set('authKey', '__sst');
     }
-    urlSearchParams.set('schemaKey', joinURL(window.location.origin, pathPrefix, `/api/preferences?id=${encodeURIComponent(current)}`));
+    urlSearchParams.set('schemaKey', joinUrl(window.location.origin, pathPrefix, `/api/preferences?id=${encodeURIComponent(current)}`));
     content = /*#__PURE__*/_jsx(Iframe, {
-      url: `${joinURL(window.location.origin, pathPrefix, '/hosted/form-collector/')}?${urlSearchParams.toString()}`,
+      url: `${joinUrl(window.location.origin, pathPrefix, '/hosted/form-collector/')}?${urlSearchParams.toString()}`,
       width: "100%",
       height: "100%",
       frameBorder: 0,

package/lib/blocklet/publish/create-release/resources.js

@@ -3,7 +3,7 @@ import classnames from 'classnames';
 import PropTypes from 'prop-types';
 import { useEffect, useRef } from 'react';
 import useSetState from 'react-use/lib/useSetState';
-import { joinURL } from 'ufo';
+import joinUrl from 'url-join';
 import { Box } from '@mui/material';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { hasStartEngine } from '@blocklet/meta/lib/engine';
@@ -14,7 +14,6 @@ import { useNodeContext } from '../../../contexts/node';
 import { axios } from '../../../util/api';
 import StopBox from './stop-box';
 import Tree from './tree';
-import keepNowResources from './keep-now-resources';
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 const fillParent = (nodes, parentId) => {
   nodes.forEach(node => {
@@ -32,7 +31,7 @@ const parseUrl = (component, projectId, releaseId, locale, initUrl) => {
   const {
     exportApi = '/'
   } = component?.meta.resource || {};
-  const urlObj = new URL(joinURL('http://127.0.0.1', component.mountPoint, exportApi || '/').replace(/\/+/g, '/'));
+  const urlObj = new URL(joinUrl('http://127.0.0.1', component.mountPoint, exportApi || '/').replace(/\/+/g, '/'));
   urlObj.searchParams.set('projectId', projectId);
   urlObj.searchParams.set('releaseId', releaseId);
   urlObj.searchParams.set('local', locale);
@@ -179,7 +178,7 @@ export default function Resources({
             const list = res?.resources || [];
             if (list?.length) {
               setSelectedResourceIds({
-                [child.meta.did]: keepNowResources(tree, list)
+                [child.meta.did]: list
               });
               setSelectedComponentsMapByIds(child.meta.did, tree, list);
               if (!readOnly) {

package/lib/blocklet/publish/release-list.js

@@ -2,7 +2,7 @@
 import React, { useState, useEffect } from 'react';
 import { Link, useParams } from 'react-router-dom';
 import styled from '@emotion/styled';
-import { joinURL } from 'ufo';
+import joinUrl from 'url-join';
 import upperFirst from 'lodash/upperFirst';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { Box, useMediaQuery, IconButton, Typography, Tooltip, Breadcrumbs } from '@mui/material';
@@ -234,12 +234,12 @@ export default function ReleaseList() {
         let downloadUrl = '';
         const published = release.status === 'published';
         if (published) {
-          const blockletMetaUrl = joinURL(serverEndpoint, `/api/project/${blocklet.meta.did}/${project.id}/${project.lastReleaseId}/release/blocklet.json`);
+          const blockletMetaUrl = joinUrl(serverEndpoint, `/api/project/${blocklet.meta.did}/${project.id}/${project.lastReleaseId}/release/blocklet.json`);
           const url = new URL(serverEndpoint);
-          url.pathname = joinURL(url.pathname, '/launch-blocklet/agreement');
+          url.pathname = joinUrl(url.pathname, '/launch-blocklet/agreement');
           url.searchParams.set('blocklet_meta_url', blockletMetaUrl);
           installUrl = url.href;
-          downloadUrl = joinURL(`${WELLKNOWN_SERVICE_PATH_PREFIX}/api/project/${blocklet.meta.did}/${project.id}/${project.lastReleaseId}/download/${(project.lastReleaseFiles || [])[0]}`);
+          downloadUrl = joinUrl(`${WELLKNOWN_SERVICE_PATH_PREFIX}/api/project/${blocklet.meta.did}/${project.id}/${project.lastReleaseId}/download/${(project.lastReleaseFiles || [])[0]}`);
         }
         return /*#__PURE__*/_jsxs(Box, {
           display: "flex",

package/lib/blocklet/purchase/component-purchase.js

@@ -1,6 +1,6 @@
 /* eslint-disable react/jsx-one-expression-per-line */
 import { useState, useEffect, useImperativeHandle, forwardRef } from 'react';
-import { joinURL } from 'ufo';
+import joinUrl from 'url-join';
 import { getDisplayName } from '@blocklet/meta/lib/util';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import DidConnect from '@arcblock/did-connect/lib/Connect';
@@ -132,7 +132,7 @@ export function ComponentPurchase({
     purchase: {
       action: 'acquire-asset',
       checkFn: axios.create({
-        baseURL: joinURL(baseUrl, '/store')
+        baseURL: joinUrl(baseUrl, '/store')
       }).get,
       extraParams: {
         factory: meta.nftFactory,

package/lib/blocklet/storage/connect-to.js

@@ -3,7 +3,7 @@ import React, { useState } from 'react';
 import Button from '@arcblock/ux/lib/Button';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import DidConnect from '@arcblock/did-connect/lib/Connect';
-import { joinURL } from 'ufo';
+import joinUrl from 'url-join';
 import toast from '@arcblock/ux/lib/Toast';
 import SplitButton from '@arcblock/ux/lib/SplitButton';
 import Dialog from '@arcblock/ux/lib/Dialog';
@@ -53,7 +53,7 @@ function ConnectTo({
     action: 'connect-to-did-spaces',
     checkTimeout: 1000 * 300,
     checkFn: axios.create({
-      baseURL: joinURL(window.location.origin, getPathPrefix())
+      baseURL: joinUrl(window.location.origin, getPathPrefix())
     }).get,
     messages: {
       title: t('storage.spaces.provideNFT.title', {
@@ -198,10 +198,10 @@ function ConnectTo({
       setAuthorizeConnect(preValue => ({
         ...preValue,
         open: true,
-        prefix: joinURL(didSpacesCoreUrl, 'space/api/did'),
+        prefix: joinUrl(didSpacesCoreUrl, 'space/api/did'),
         baseUrl: new URL(didSpacesCoreUrl).origin,
         checkFn: axios.create({
-          baseURL: joinURL(didSpacesCoreUrl, 'space')
+          baseURL: joinUrl(didSpacesCoreUrl, 'space')
         }).get,
         extraParams: {
           appDid: blockletInfo.appDid,

package/lib/blocklet/storage/item.js

@@ -4,7 +4,7 @@ import Button from '@arcblock/ux/lib/Button';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import PropTypes from 'prop-types';
 import Toast from '@arcblock/ux/lib/Toast';
-import { joinURL } from 'ufo';
+import joinUrl from 'url-join';
 import { BLOCKLET_CONFIGURABLE_KEY } from '@blocklet/constant';
 import DidConnect from '@arcblock/did-connect/lib/Connect';
 import { useRequest } from 'ahooks';
@@ -176,10 +176,10 @@ function SpaceItem({
     setAuthorizeConnect(preValue => ({
       ...preValue,
       open: true,
-      prefix: joinURL(spaceGateway.url, 'space/api/did'),
+      prefix: joinUrl(spaceGateway.url, 'space/api/did'),
       baseUrl: new URL(spaceGateway.url).origin,
       checkFn: axios.create({
-        baseURL: joinURL(spaceGateway.url, 'space')
+        baseURL: joinUrl(spaceGateway.url, 'space')
       }).get,
       extraParams: {
         appDid,

package/lib/blocklet/util.js

@@ -1,5 +1,5 @@
 import sortBy from 'lodash/sortBy';
-import { joinURL } from 'ufo';
+import joinUrl from 'url-join';
 import isEmpty from 'lodash/isEmpty';
 import normalizePathPrefix from '@abtnode/util/lib/normalize-path-prefix';
 import { forEachBlockletSync, replaceSlotToIp } from '@blocklet/meta/lib/util';
@@ -7,12 +7,12 @@ import { BLOCKLET_APP_SPACE_REQUIREMENT } from '@blocklet/constant';
 import { SLOT_FOR_IP_DNS_SITE } from '@abtnode/constant';
 export const getServerUrl = (info, encodeURI = false) => {
   const adminPath = process.env.NODE_ENV === 'production' ? info.routing.adminPath : '';
-  return encodeURI ? encodeURIComponent(joinURL(window.location.origin, adminPath)) : joinURL(window.location.origin, adminPath);
+  return encodeURI ? encodeURIComponent(joinUrl(window.location.origin, adminPath)) : joinUrl(window.location.origin, adminPath);
 };
 export const getLaunchAgreementUrl = (meta, info, storeUrl) => {
   const serverUrl = getServerUrl(info);
-  const metaUrl = joinURL(storeUrl, `/api/blocklets/${meta.did}/blocklet.json`);
-  const url = new URL(joinURL(serverUrl, '/launch-blocklet/agreement'));
+  const metaUrl = joinUrl(storeUrl, `/api/blocklets/${meta.did}/blocklet.json`);
+  const url = new URL(joinUrl(serverUrl, '/launch-blocklet/agreement'));
   url.searchParams.set('blocklet_meta_url', metaUrl);
   url.searchParams.set('from', window.location.href);
   return url.href;

package/lib/hooks/url-evaluation.js

@@ -1,5 +1,5 @@
 import { useState, useEffect, useMemo, useRef, useContext } from 'react';
-import { joinURL } from 'ufo';
+import joinUrl from 'url-join';
 import memoize from 'lodash/memoize';
 import { WELLKNOWN_PING_PREFIX } from '@abtnode/constant';
 import { evaluateURLs } from '@abtnode/util/lib/url-evaluation';
@@ -16,7 +16,7 @@ const ping = memoize(url => {
   if (hostname === window.location.hostname) {
     return true;
   }
-  return defaultCheckAccessible(joinURL(origin, WELLKNOWN_PING_PREFIX));
+  return defaultCheckAccessible(joinUrl(origin, WELLKNOWN_PING_PREFIX));
 });
 
 // url <-> evaluation cache

package/lib/hooks/use-app-logo.js

@@ -1,4 +1,4 @@
-import { joinURL } from 'ufo';
+import joinUrl from 'url-join';
 import { BLOCKLET_CONFIGURABLE_KEY } from '@blocklet/constant';
 import { useNodeContext } from '../contexts/node';
 import { isInstalling, getLogoHash } from '../util';
@@ -21,9 +21,9 @@ export default function useAppLogo({
   const customRectLogo = (blocklet?.environments || []).find(x => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_RECT)?.value;
   const customFavicon = (blocklet?.environments || []).find(x => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_FAVICON)?.value;
   const prefix = window.env?.apiPrefix || '/';
-  const logoUrl = `${joinURL(prefix, `/blocklet/logo/${inService ? '' : blocklet.meta.did}`)}${getSearch(blocklet, customLogo)}`;
-  const rectLogoUrl = `${joinURL(prefix, `/blocklet/logo-rect/${inService ? '' : blocklet.meta.did}`)}${getSearch(blocklet, customRectLogo)}`;
-  const faviconUrl = `${joinURL(prefix, `/blocklet/logo-favicon/${inService ? '' : blocklet.meta.did}`)}${getSearch(blocklet, customFavicon)}`;
+  const logoUrl = joinUrl(prefix, `/blocklet/logo/${inService ? '' : blocklet.meta.did}`, getSearch(blocklet, customLogo));
+  const rectLogoUrl = joinUrl(prefix, `/blocklet/logo-rect/${inService ? '' : blocklet.meta.did}`, getSearch(blocklet, customRectLogo));
+  const faviconUrl = joinUrl(prefix, `/blocklet/logo-favicon/${inService ? '' : blocklet.meta.did}`, getSearch(blocklet, customFavicon));
   return {
     logoUrl,
     rectLogoUrl,

package/lib/hooks/use-bundle-logo.js

@@ -1,4 +1,4 @@
-import { joinURL } from 'ufo';
+import joinUrl from 'url-join';
 import { WELLKNOWN_SERVICE_PATH_PREFIX } from '@abtnode/constant';
 import { useNodeContext } from '../contexts/node';
 import { formatRegistryLogoPath, APP_PREFIX, isDownloading, isExtracting } from '../util';
@@ -12,14 +12,14 @@ export default function useAvatar({
   } = node;
   const pending = isDownloading(blocklet?.status) || isExtracting(blocklet?.status);
   const search = `?v=${blocklet?.meta?.version}${pending ? '~' : ''}`;
-  let logoUrl = inService ? `${joinURL(APP_PREFIX, WELLKNOWN_SERVICE_PATH_PREFIX, '/blocklet/logo-bundle')}${search}` : joinURL(node.imgPrefix, 'blocklet.png');
+  let logoUrl = inService ? joinUrl(APP_PREFIX, WELLKNOWN_SERVICE_PATH_PREFIX, '/blocklet/logo-bundle', search) : joinUrl(node.imgPrefix, 'blocklet.png');
   if (blocklet.source === 'registry' && blocklet.deployedFrom && blocklet.meta.logo) {
-    logoUrl = `${joinURL(blocklet.deployedFrom, formatRegistryLogoPath(blocklet.meta.bundleDid, blocklet.meta.logo))}${search}`;
+    logoUrl = joinUrl(blocklet.deployedFrom, formatRegistryLogoPath(blocklet.meta.bundleDid, blocklet.meta.logo), search);
   } else {
     const prefix = window.env.apiPrefix || '/';
     const components = ancestors.concat(blocklet);
     const list = inService ? components.slice(1) : components;
-    logoUrl = `${joinURL(prefix, `/blocklet/logo-bundle${list.map(x => `/${x.meta.did}`).join('')}`)}${search}`;
+    logoUrl = joinUrl(prefix, `/blocklet/logo-bundle${list.map(x => `/${x.meta.did}`).join('')}`, search);
   }
   return {
     logoUrl,

package/lib/invitation/invitation-receive.js

@@ -4,7 +4,7 @@ import styled from '@emotion/styled';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import DidButton from '@arcblock/did-connect/lib/Button';
 import { AUTH_SERVICE_PREFIX, API_DID_PREFIX } from '@arcblock/did-connect/lib/constant';
-import { joinURL } from 'ufo';
+import joinURL from 'url-join';
 import { formatDateTime } from '../util';
 import usePassportId from '../hooks/use-passport-id';
 import { useSessionContext } from '../contexts/session';

package/lib/locales/en.js

@@ -833,10 +833,6 @@ export default {
       welcome: {
         switchLabel: 'Welcome Page'
       },
-      security: {
-        switchLabel: 'File System Isolation',
-        switchTips: 'After disabling this option, the file system of the Blocklet will no longer be in isolation, which may pose a risk of malicious software damaging the file system.'
-      },
       upgrade: {
         title: 'Upgrade Blocklet Server to {version}',
         description: 'During the upgrade, your Blocklet Server will enter maintenance mode for a few minutes while the update is completed.',

package/lib/locales/zh-tw.js

@@ -980,7 +980,7 @@ export default {
       testSend: '測試推播套件發送',
       inputTestReceiver: '請輸入測試接收者 DID',
       receiverRequired: '需要 PushKit 接收者 DID',
-      pushPath: 'PushKit 的 API 路徑（預設 /api/push）',
+      pushPath: '推送套件的 API 路徑（預設 /api/push）',
       did: 'PushKit Blocklet DID',
       customOptions: '自訂選項'
     }

package/lib/locales/zh.js

@@ -874,10 +874,6 @@ export default {
       welcome: {
         switchLabel: 'Welcome 页面'
       },
-      security: {
-        switchLabel: '文件系统隔离',
-        switchTips: '关闭此选项后，Blocklet 的文件系统将不再处于隔离状态，可能会存在恶意软件破坏文件系统的风险。'
-      },
       register: {
         titleAdded: '当前节点已经添加到应用启动器',
         title: '添加节点到应用启动器',
@@ -987,7 +983,7 @@ export default {
       testSend: '测试推送',
       inputTestReceiver: '请输入测试接收者 DID',
       receiverRequired: '需要 PushKit 接收者 DID',
-      pushPath: 'PushKit 的 API 路径（默认 /api/push）',
+      pushPath: '推送套件的 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 'ufo';
+import joinUrl from 'url-join';
 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 'ufo';
+import joinUrl from 'url-join';
 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 'ufo';
+import joinUrl from 'url-join';
 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 'ufo';
+import joinUrl from 'url-join';
 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 'ufo';
+import joinUrl from 'url-join';
 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, withQuery } from 'ufo';
+import { joinURL } from 'ufo';
 import { api } from './api';
 
 /* eslint-disable import/prefer-default-export */
@@ -230,8 +230,6 @@ 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') ? withQuery(didSpacesCoreUrl, {
-    spaceDid: u.searchParams.get('spaceDid')
-  }) : didSpacesCoreUrl;
+  const spaceGatewayUrl = options.withSearchParams && u.searchParams.get('spaceDid') ? joinURL(didSpacesCoreUrl, `?spaceDid=${u.searchParams.get('spaceDid')}`) : didSpacesCoreUrl;
   return spaceGatewayUrl;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.28-beta-8acda0e6",
+  "version": "1.16.28-next-5a717317",
   "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-beta-8acda0e6",
-    "@abtnode/constant": "1.16.28-beta-8acda0e6",
-    "@abtnode/util": "1.16.28-beta-8acda0e6",
+    "@abtnode/auth": "1.16.28-next-5a717317",
+    "@abtnode/constant": "1.16.28-next-5a717317",
+    "@abtnode/util": "1.16.28-next-5a717317",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.123",
-    "@arcblock/did-connect": "^2.10.0",
+    "@arcblock/did-connect": "^2.9.90",
     "@arcblock/did-motif": "^1.1.13",
-    "@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-beta-8acda0e6",
-    "@blocklet/launcher-layout": "2.3.22",
-    "@blocklet/list": "^0.12.114",
-    "@blocklet/meta": "1.16.28-beta-8acda0e6",
-    "@blocklet/ui-react": "^2.10.0",
-    "@blocklet/uploader": "^0.1.10",
+    "@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",
     "@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": "^1.7.2",
+    "axios": "^0.27.2",
     "classnames": "^2.3.2",
     "copy-to-clipboard": "^3.3.3",
     "date-fns": "^2.30.0",
@@ -93,7 +93,8 @@
     "rehype-external-links": "^3.0.0",
     "semver": "^7.3.8",
     "timeago.js": "^4.0.2",
-    "ufo": "^1.5.3",
+    "ufo": "^1.0.1",
+    "url-join": "^4.0.1",
     "validator": "^13.9.0"
   },
   "devDependencies": {
@@ -107,5 +108,5 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0"
   },
-  "gitHead": "a1a896a7d34abc6a1f24b855524c228c0b0a3ade"
+  "gitHead": "3624967f9549de3a25a87ed6b20f82519ddb4757"
 }

package/lib/blocklet/publish/create-release/keep-now-resources.js

@@ -1,15 +0,0 @@
-function keepNowResources(trees, list) {
-  const listSet = new Set(list || []);
-  const result = [];
-  function traverse(tree) {
-    if (listSet.has(tree?.id)) {
-      result.push(tree?.id);
-    }
-    if (tree?.children) {
-      tree.children.forEach(traverse);
-    }
-  }
-  (trees || []).forEach(traverse);
-  return result;
-}
-export default keepNowResources;