@blocklet/did-space-react 0.5.82 → 0.5.83

package/dist/cjs/components/space-card/index.js

@@ -10,7 +10,7 @@ const Theme = require('@arcblock/ux/lib/Theme');
 const React = require('react');
 const axios = require('axios');
 const ahooks = require('ahooks');
-const compareVersions = require('compare-versions');
+const semver = require('semver');
 const _package = require('../../package.json.js');
 const constants = require('../../libs/constants.js');
 const useMobile = require('../../hooks/use-mobile.js');
@@ -24,13 +24,14 @@ const spaceConnected = require('../../icons/space-connected.svg.js');
 const spaceDisconnect = require('../../icons/space-disconnect.svg.js');
 const spaceConnectError = require('../../icons/space-connect-error.svg.js');
 
-const expectVersion = `^${_package.version}`;
+const expectVersion = `${_package.version}`;
 function Status({
   spaceUrl,
   status,
   errorCode,
   refresh,
   sx,
+  spaceInfo,
   ...rest
 }) {
   const { t, locale } = useLocale();
@@ -56,6 +57,7 @@ function Status({
     }),
     [locale]
   );
+  const spaceVersion = React.useMemo(() => spaceInfo?.version, [spaceInfo]);
   const errorStatusConfig = ahooks.useCreation(
     () => ({
       // 未知的网络错误（如超时）
@@ -94,13 +96,16 @@ function Status({
         text: /* @__PURE__ */ jsxRuntime.jsx(
           ErrorLink,
           {
-            title: t("storage.spaces.error.incompatible"),
+            title: t("storage.spaces.error.incompatible", {
+              spaceVersion,
+              expectVersion
+            }),
             url: ufo.joinURL(new URL(spaceUrl).origin, ".well-known/service/admin/components")
           }
         )
       }
     }),
-    [locale]
+    [locale, spaceVersion]
   );
   const { icon, text } = status === index.SpaceStatus.UNAVAILABLE ? errorStatusConfig[errorCode] : statusConfig[status];
   React.useEffect(() => {
@@ -177,7 +182,7 @@ function SpaceCard({ endpoint, selected = false, compat, action, className, deps
   } else if (spaceInfo) {
     spaceName = spaceInfo.name;
     const spaceVersion = spaceInfo.version;
-    const isIncompatible = !spaceVersion || !compareVersions.satisfies(spaceVersion, expectVersion);
+    const isIncompatible = !spaceVersion || semver.major(expectVersion) !== semver.major(spaceVersion);
     if (isIncompatible) {
       spaceStatus.current = index.SpaceStatus.UNAVAILABLE;
       errorCode = constants.SPACE_CONNECT_ERROR_CODE.INCOMPATIBLE;
@@ -241,6 +246,7 @@ function SpaceCard({ endpoint, selected = false, compat, action, className, deps
                   status: spaceStatus.current,
                   errorCode,
                   refresh,
+                  spaceInfo,
                   sx: { mr: 1 }
                 }
               )
@@ -271,6 +277,7 @@ function SpaceCard({ endpoint, selected = false, compat, action, className, deps
               status: spaceStatus.current,
               errorCode,
               refresh,
+              spaceInfo,
               flexShrink: 0
             }
           ),

package/dist/cjs/hooks/use-space-info.d.ts

@@ -1,4 +1,4 @@
-type SpaceInfo = {
+export type SpaceInfo = {
     version: string;
     name: string;
     subscriptionId: string;
@@ -10,4 +10,3 @@ export default function useSpaceInfo({ endpoint, deps }: {
     endpoint: string;
     deps?: any[];
 }): import("ahooks/lib/useRequest/src/types").Result<SpaceInfo | undefined, any[]>;
-export {};

package/dist/cjs/locales/en.js

@@ -42,7 +42,7 @@ const en = flat.flatten({
         unitLimit: "DID Spaces free quota has been used up, click this link to pay for the upgrade",
         corsBlocked: "The connection request may fail due to CORS restrictions:\n1. Please contact the DID Space administrator to verify the relevant configuration.\n2. If you are the administrator, click the link below to view the detailed setup guide and resolve the issue.",
         networkError: "Network error",
-        incompatible: "The current DID Spaces version is incompatible. Please contact your administrator to make adjustments. \nIf you are the administrator, click the link below to proceed."
+        incompatible: "The current connection of DID Spaces version ({spaceVersion}) is not compatible with the component version ({expectVersion}). Please contact the administrator for adjustments.\nIf you are the administrator, you can click the link below to take action."
       },
       gateway: {
         add: {

package/dist/cjs/locales/zh.js

@@ -42,7 +42,7 @@ const zh = flat.flatten({
         unitLimit: "DID Spaces \u514D\u8D39\u989D\u5EA6\u5DF2\u7528\u5B8C\uFF0C\u70B9\u51FB\u6B64\u94FE\u63A5\u4ED8\u8D39\u5347\u7EA7",
         corsBlocked: "\u8FDE\u63A5\u8BF7\u6C42\u53EF\u80FD\u56E0 CORS \u9650\u5236\u800C\u5931\u8D25\uFF1A\n1. \u8BF7\u8054\u7CFB DID Space \u7BA1\u7406\u5458\u786E\u8BA4\u76F8\u5173\u914D\u7F6E\u662F\u5426\u6B63\u786E\u3002\n2. \u5982\u679C\u60A8\u662F\u7BA1\u7406\u5458\uFF0C\u53EF\u4EE5\u70B9\u51FB\u4E0B\u65B9\u94FE\u63A5\uFF0C\u67E5\u770B\u8BE6\u7EC6\u7684\u914D\u7F6E\u6307\u5357\u5E76\u89E3\u51B3\u95EE\u9898\u3002",
         networkError: "\u7F51\u7EDC\u9519\u8BEF",
-        incompatible: "\u5F53\u524D DID Spaces \u7248\u672C\u4E0D\u517C\u5BB9\u3002\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u8FDB\u884C\u8C03\u6574\u3002\n\u5982\u679C\u60A8\u662F\u7BA1\u7406\u5458\uFF0C\u53EF\u4EE5\u5355\u51FB\u4E0B\u9762\u7684\u94FE\u63A5\u8FDB\u884C\u64CD\u4F5C\u3002"
+        incompatible: "\u5F53\u524D\u8FDE\u63A5\u7684 DID Spaces \u7248\u672C({spaceVersion}) \u4E0E\u7EC4\u4EF6\u7248\u672C({expectVersion})\u4E0D\u517C\u5BB9\u3002\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u8FDB\u884C\u8C03\u6574\u3002\n\u5982\u679C\u60A8\u662F\u7BA1\u7406\u5458\uFF0C\u53EF\u4EE5\u5355\u51FB\u4E0B\u9762\u7684\u94FE\u63A5\u8FDB\u884C\u64CD\u4F5C\u3002"
       },
       gateway: {
         add: {

package/dist/cjs/package.json.js

@@ -1,5 +1,5 @@
 'use strict';
 
-const version = "0.5.82";
+const version = "0.5.83";
 
 exports.version = version;

package/dist/es/components/space-card/index.js

@@ -5,10 +5,10 @@ import { Box, Stack, Tooltip, Link, Skeleton } from '@mui/material';
 import OpenInNewIcon from '@mui/icons-material/OpenInNew';
 import DidAddress from '@arcblock/ux/lib/DID';
 import { styled } from '@arcblock/ux/lib/Theme';
-import { useState, useRef, useEffect } from 'react';
+import { useState, useRef, useMemo, useEffect } from 'react';
 import { AxiosError } from 'axios';
 import { useCreation } from 'ahooks';
-import { satisfies } from 'compare-versions';
+import semver from 'semver';
 import { version } from '../../package.json.js';
 import { SPACE_CONNECT_ERROR_CODE, fixCorsErrorPageUrl } from '../../libs/constants.js';
 import useMobile from '../../hooks/use-mobile.js';
@@ -22,13 +22,14 @@ import SvgSpaceConnected from '../../icons/space-connected.svg.js';
 import SvgSpaceDisconnect from '../../icons/space-disconnect.svg.js';
 import SvgSpaceConnectError from '../../icons/space-connect-error.svg.js';
 
-const expectVersion = `^${version}`;
+const expectVersion = `${version}`;
 function Status({
   spaceUrl,
   status,
   errorCode,
   refresh,
   sx,
+  spaceInfo,
   ...rest
 }) {
   const { t, locale } = useLocale();
@@ -54,6 +55,7 @@ function Status({
     }),
     [locale]
   );
+  const spaceVersion = useMemo(() => spaceInfo?.version, [spaceInfo]);
   const errorStatusConfig = useCreation(
     () => ({
       // 未知的网络错误（如超时）
@@ -92,13 +94,16 @@ function Status({
         text: /* @__PURE__ */ jsx(
           ErrorLink,
           {
-            title: t("storage.spaces.error.incompatible"),
+            title: t("storage.spaces.error.incompatible", {
+              spaceVersion,
+              expectVersion
+            }),
             url: joinURL(new URL(spaceUrl).origin, ".well-known/service/admin/components")
           }
         )
       }
     }),
-    [locale]
+    [locale, spaceVersion]
   );
   const { icon, text } = status === SpaceStatus.UNAVAILABLE ? errorStatusConfig[errorCode] : statusConfig[status];
   useEffect(() => {
@@ -175,7 +180,7 @@ function SpaceCard({ endpoint, selected = false, compat, action, className, deps
   } else if (spaceInfo) {
     spaceName = spaceInfo.name;
     const spaceVersion = spaceInfo.version;
-    const isIncompatible = !spaceVersion || !satisfies(spaceVersion, expectVersion);
+    const isIncompatible = !spaceVersion || semver.major(expectVersion) !== semver.major(spaceVersion);
     if (isIncompatible) {
       spaceStatus.current = SpaceStatus.UNAVAILABLE;
       errorCode = SPACE_CONNECT_ERROR_CODE.INCOMPATIBLE;
@@ -239,6 +244,7 @@ function SpaceCard({ endpoint, selected = false, compat, action, className, deps
                   status: spaceStatus.current,
                   errorCode,
                   refresh,
+                  spaceInfo,
                   sx: { mr: 1 }
                 }
               )
@@ -269,6 +275,7 @@ function SpaceCard({ endpoint, selected = false, compat, action, className, deps
               status: spaceStatus.current,
               errorCode,
               refresh,
+              spaceInfo,
               flexShrink: 0
             }
           ),

package/dist/es/hooks/use-space-info.d.ts

@@ -1,4 +1,4 @@
-type SpaceInfo = {
+export type SpaceInfo = {
     version: string;
     name: string;
     subscriptionId: string;
@@ -10,4 +10,3 @@ export default function useSpaceInfo({ endpoint, deps }: {
     endpoint: string;
     deps?: any[];
 }): import("ahooks/lib/useRequest/src/types").Result<SpaceInfo | undefined, any[]>;
-export {};

package/dist/es/locales/en.js

@@ -40,7 +40,7 @@ const en = flatten({
         unitLimit: "DID Spaces free quota has been used up, click this link to pay for the upgrade",
         corsBlocked: "The connection request may fail due to CORS restrictions:\n1. Please contact the DID Space administrator to verify the relevant configuration.\n2. If you are the administrator, click the link below to view the detailed setup guide and resolve the issue.",
         networkError: "Network error",
-        incompatible: "The current DID Spaces version is incompatible. Please contact your administrator to make adjustments. \nIf you are the administrator, click the link below to proceed."
+        incompatible: "The current connection of DID Spaces version ({spaceVersion}) is not compatible with the component version ({expectVersion}). Please contact the administrator for adjustments.\nIf you are the administrator, you can click the link below to take action."
       },
       gateway: {
         add: {

package/dist/es/locales/zh.js

@@ -40,7 +40,7 @@ const zh = flatten({
         unitLimit: "DID Spaces \u514D\u8D39\u989D\u5EA6\u5DF2\u7528\u5B8C\uFF0C\u70B9\u51FB\u6B64\u94FE\u63A5\u4ED8\u8D39\u5347\u7EA7",
         corsBlocked: "\u8FDE\u63A5\u8BF7\u6C42\u53EF\u80FD\u56E0 CORS \u9650\u5236\u800C\u5931\u8D25\uFF1A\n1. \u8BF7\u8054\u7CFB DID Space \u7BA1\u7406\u5458\u786E\u8BA4\u76F8\u5173\u914D\u7F6E\u662F\u5426\u6B63\u786E\u3002\n2. \u5982\u679C\u60A8\u662F\u7BA1\u7406\u5458\uFF0C\u53EF\u4EE5\u70B9\u51FB\u4E0B\u65B9\u94FE\u63A5\uFF0C\u67E5\u770B\u8BE6\u7EC6\u7684\u914D\u7F6E\u6307\u5357\u5E76\u89E3\u51B3\u95EE\u9898\u3002",
         networkError: "\u7F51\u7EDC\u9519\u8BEF",
-        incompatible: "\u5F53\u524D DID Spaces \u7248\u672C\u4E0D\u517C\u5BB9\u3002\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u8FDB\u884C\u8C03\u6574\u3002\n\u5982\u679C\u60A8\u662F\u7BA1\u7406\u5458\uFF0C\u53EF\u4EE5\u5355\u51FB\u4E0B\u9762\u7684\u94FE\u63A5\u8FDB\u884C\u64CD\u4F5C\u3002"
+        incompatible: "\u5F53\u524D\u8FDE\u63A5\u7684 DID Spaces \u7248\u672C({spaceVersion}) \u4E0E\u7EC4\u4EF6\u7248\u672C({expectVersion})\u4E0D\u517C\u5BB9\u3002\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u8FDB\u884C\u8C03\u6574\u3002\n\u5982\u679C\u60A8\u662F\u7BA1\u7406\u5458\uFF0C\u53EF\u4EE5\u5355\u51FB\u4E0B\u9762\u7684\u94FE\u63A5\u8FDB\u884C\u64CD\u4F5C\u3002"
       },
       gateway: {
         add: {

package/dist/es/package.json.js

@@ -1,3 +1,3 @@
-const version = "0.5.82";
+const version = "0.5.83";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/did-space-react",
-  "version": "0.5.82",
+  "version": "0.5.83",
   "description": "Reusable react components for did space",
   "keywords": [
     "react",
@@ -84,19 +84,19 @@
     }
   },
   "dependencies": {
-    "@arcblock/did": "^1.18.161",
-    "@mui/icons-material": "^5.16.11",
-    "@mui/lab": "^5.0.0-alpha.174",
-    "@mui/material": "^5.16.11",
-    "@mui/system": "^5.16.8",
+    "@arcblock/did": "^1.18.162",
+    "@mui/icons-material": "^5.16.12",
+    "@mui/lab": "^5.0.0-alpha.175",
+    "@mui/material": "^5.16.12",
+    "@mui/system": "^5.16.12",
     "ahooks": "^3.8.4",
     "axios": "^1.7.9",
-    "compare-versions": "^6.1.1",
     "flat": "^5.0.2",
     "is-url": "^1.2.4",
     "lodash": "^4.17.21",
     "p-wait-for": "3",
     "react-error-boundary": "^4.1.2",
+    "semver": "^7.6.3",
     "ufo": "^1.5.4"
   },
   "peerDependencies": {
@@ -110,16 +110,16 @@
     "access": "public"
   },
   "devDependencies": {
-    "@arcblock/did-connect": "^2.10.89",
+    "@arcblock/did-connect": "^2.11.1",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@arcblock/ux": "^2.10.89",
+    "@arcblock/ux": "^2.11.1",
     "@babel/cli": "^7.26.4",
     "@babel/core": "^7.26.0",
     "@babel/preset-env": "^7.26.0",
     "@babel/preset-react": "^7.26.3",
     "@babel/preset-typescript": "^7.26.0",
-    "@blocklet/js-sdk": "^1.16.34-beta-20241216-230644-e9ec07d8",
-    "@blocklet/sdk": "^1.16.34-beta-20241216-230644-e9ec07d8",
+    "@blocklet/js-sdk": "^1.16.34-beta-20241218-045149-150af879",
+    "@blocklet/sdk": "^1.16.34-beta-20241218-045149-150af879",
     "@storybook/addon-essentials": "^7.6.20",
     "@storybook/addon-interactions": "^7.6.20",
     "@storybook/addon-links": "^7.6.20",
@@ -137,6 +137,7 @@
     "copyfiles": "^2.4.1",
     "eslint": "^8.57.1",
     "glob": "^10.4.5",
+    "nodemon": "^3.1.9",
     "prettier": "^2.8.8",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
@@ -150,5 +151,5 @@
     "vite-plugin-node-polyfills": "^0.22.0",
     "vitest": "^2.1.8"
   },
-  "gitHead": "766ed8f20bb6a83d26980c7a0666f18c45d8be42"
+  "gitHead": "b89be361bbc875a7c9051c9209f327ed6a6dd4b4"
 }