diff --git a/package.json b/package.json index 674d616c92cd..23a232aa8f84 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "yarn": ">=999.0.0", "npm": ">=999.0.0" }, - "version": "2.35.0", + "version": "2.35.1", "private": true, "license": "AGPL-3.0-or-later", "scripts": { diff --git a/packages/mask/background/services/site-adaptors/connect.ts b/packages/mask/background/services/site-adaptors/connect.ts index f283040a2264..22df091b5f00 100644 --- a/packages/mask/background/services/site-adaptors/connect.ts +++ b/packages/mask/background/services/site-adaptors/connect.ts @@ -131,5 +131,5 @@ export async function connectSite( persona: identifier.toText(), username: profile?.userId, tabId: targetTab.id, - }) + }) as string } diff --git a/packages/mask/content-script/site-adaptor-infra/ui.ts b/packages/mask/content-script/site-adaptor-infra/ui.ts index 132785b7c1ac..7a18553b2761 100644 --- a/packages/mask/content-script/site-adaptor-infra/ui.ts +++ b/packages/mask/content-script/site-adaptor-infra/ui.ts @@ -136,7 +136,7 @@ export async function activateSiteAdaptorUIInner(ui_deferred: SiteAdaptorUI.Defe currentSetupGuideStatus[activatedSiteAdaptorUI!.networkIdentifier].value = stringify({ status: SetupGuideStep.FindUsername, persona: currentPersonaIdentifier?.toText(), - }) + }) as string } setupUIContext() diff --git a/packages/mask/package.json b/packages/mask/package.json index bc9edb2e0216..35589e3792b4 100644 --- a/packages/mask/package.json +++ b/packages/mask/package.json @@ -45,7 +45,6 @@ "@masknet/plugin-artblocks": "workspace:^", "@masknet/plugin-avatar": "workspace:^", "@masknet/plugin-calendar": "workspace:^", - "@masknet/plugin-claim": "workspace:^", "@masknet/plugin-collectible": "workspace:^", "@masknet/plugin-cross-chain-bridge": "workspace:^", "@masknet/plugin-debugger": "workspace:^", @@ -95,7 +94,6 @@ "@tanstack/react-query-devtools": "^5.48.0", "@tanstack/react-query-persist-client": "^5.48.0", "@types/elliptic": "^6.4.18", - "@types/json-stable-stringify": "^1.0.36", "@types/react-avatar-editor": "^13.0.2", "@types/react-highlight-words": "^0.20.0", "@types/use-subscription": "^1.0.2", @@ -116,7 +114,7 @@ "https-browserify": "^1.0.0", "idb": "^8.0.0", "immer": "^10.1.1", - "json-stable-stringify": "^1.1.1", + "json-stable-stringify": "1.3.0", "react-avatar-editor": "^13.0.2", "react-draggable": "^4.4.6", "react-highlight-words": "^0.20.0", diff --git a/packages/mask/shared/plugin-infra/register.js b/packages/mask/shared/plugin-infra/register.js index 6b816bd501fa..4124911dfd1c 100644 --- a/packages/mask/shared/plugin-infra/register.js +++ b/packages/mask/shared/plugin-infra/register.js @@ -13,7 +13,6 @@ import '@masknet/plugin-scam-warning/register' import '@masknet/plugin-collectible/register' import '@masknet/plugin-transak/register' import '@masknet/plugin-vcent/register' -import '@masknet/plugin-claim/register' import '@masknet/plugin-tips/register' import '@masknet/plugin-nextid/register' import '@masknet/plugin-trader/register' diff --git a/packages/plugins/FileService/src/SiteAdaptor/components/UploadFile.tsx b/packages/plugins/FileService/src/SiteAdaptor/components/UploadFile.tsx index b354c7ad0d38..bae411710cbd 100644 --- a/packages/plugins/FileService/src/SiteAdaptor/components/UploadFile.tsx +++ b/packages/plugins/FileService/src/SiteAdaptor/components/UploadFile.tsx @@ -1,5 +1,6 @@ // todo:the issue is potentially the file size limit +import { Trans } from '@lingui/react/macro' import { Icons } from '@masknet/icons' import { UploadDropArea } from '@masknet/shared' import { makeStyles } from '@masknet/theme' @@ -10,7 +11,6 @@ import { downloadFile } from '../../helpers.js' import { Provider } from '../../types.js' import { useFileManagement } from '../contexts/index.js' import { FileList } from './FileList.js' -import { Trans } from '@lingui/react/macro' interface ProviderConfig { name: ReactNode @@ -92,10 +92,6 @@ export function UploadFile() { provider: Provider.Arweave, name: Arweave, }, - { - provider: Provider.IPFS, - name: IPFS, - }, { provider: Provider.Load, name: Load Network, diff --git a/packages/plugins/FileService/src/Worker/index.ts b/packages/plugins/FileService/src/Worker/index.ts index 395c99155c69..3f79c719cd1d 100644 --- a/packages/plugins/FileService/src/Worker/index.ts +++ b/packages/plugins/FileService/src/Worker/index.ts @@ -7,8 +7,9 @@ import { getAllFiles, setFileInfo, setupDatabase } from './database.js' const worker: Plugin.Worker.Definition = { ...base, init(signal, context) { - context.startService(import('./service.js').then(({ upload, ...rest }) => rest)) - context.startGeneratorService(import('./service.js').then(({ upload }) => ({ upload }))) + const mod = import('./service.js') + context.startService(mod.then(({ upload, ...rest }) => rest)) + context.startGeneratorService(mod.then(({ upload }) => ({ upload }))) setupDatabase(context.getDatabaseStorage()) }, backup: { diff --git a/packages/plugins/Transak/package.json b/packages/plugins/Transak/package.json index 9f3edccaf8da..297f600624c5 100644 --- a/packages/plugins/Transak/package.json +++ b/packages/plugins/Transak/package.json @@ -23,8 +23,7 @@ "@masknet/shared-base-ui": "workspace:^", "@masknet/theme": "workspace:^", "@masknet/web3-shared-evm": "workspace:^", - "@types/json-stable-stringify": "^1.0.36", - "json-stable-stringify": "^1.1.1", + "json-stable-stringify": "1.3.0", "react-use": "^17.5.0" } -} \ No newline at end of file +} diff --git a/packages/shared-base-ui/src/locale/en-US.po b/packages/shared-base-ui/src/locale/en-US.po index 974f273b1129..ecbe223887d3 100644 --- a/packages/shared-base-ui/src/locale/en-US.po +++ b/packages/shared-base-ui/src/locale/en-US.po @@ -3655,7 +3655,6 @@ msgstr "" msgid "Invalid verification code." msgstr "" -#: packages/plugins/FileService/src/SiteAdaptor/components/UploadFile.tsx #: packages/plugins/Snapshot/src/SiteAdaptor/InformationCard.tsx msgid "IPFS" msgstr "" diff --git a/packages/shared-base-ui/src/locale/ja-JP.po b/packages/shared-base-ui/src/locale/ja-JP.po index e7fe8d5c943c..8520d76566b6 100644 --- a/packages/shared-base-ui/src/locale/ja-JP.po +++ b/packages/shared-base-ui/src/locale/ja-JP.po @@ -3660,7 +3660,6 @@ msgstr "無効なスリッページの許容範囲です。" msgid "Invalid verification code." msgstr "認証コードが無効です。" -#: packages/plugins/FileService/src/SiteAdaptor/components/UploadFile.tsx #: packages/plugins/Snapshot/src/SiteAdaptor/InformationCard.tsx msgid "IPFS" msgstr "" diff --git a/packages/shared-base-ui/src/locale/ko-KR.po b/packages/shared-base-ui/src/locale/ko-KR.po index f3faefa6e9db..411ca3e79329 100644 --- a/packages/shared-base-ui/src/locale/ko-KR.po +++ b/packages/shared-base-ui/src/locale/ko-KR.po @@ -3660,7 +3660,6 @@ msgstr "무효한 슬리피지 톨러런스" msgid "Invalid verification code." msgstr "유효하지 않은 인증 코드입니다." -#: packages/plugins/FileService/src/SiteAdaptor/components/UploadFile.tsx #: packages/plugins/Snapshot/src/SiteAdaptor/InformationCard.tsx msgid "IPFS" msgstr "" diff --git a/packages/shared-base-ui/src/locale/zh-CN.po b/packages/shared-base-ui/src/locale/zh-CN.po index 35b8d8ab0cfe..100b125c2bce 100644 --- a/packages/shared-base-ui/src/locale/zh-CN.po +++ b/packages/shared-base-ui/src/locale/zh-CN.po @@ -3660,7 +3660,6 @@ msgstr "无效的滑点容许值" msgid "Invalid verification code." msgstr "验证码错误。" -#: packages/plugins/FileService/src/SiteAdaptor/components/UploadFile.tsx #: packages/plugins/Snapshot/src/SiteAdaptor/InformationCard.tsx msgid "IPFS" msgstr "" diff --git a/packages/shared-base-ui/src/locale/zh-TW.po b/packages/shared-base-ui/src/locale/zh-TW.po index 294ec51a2887..670c85cb06a3 100644 --- a/packages/shared-base-ui/src/locale/zh-TW.po +++ b/packages/shared-base-ui/src/locale/zh-TW.po @@ -3660,7 +3660,6 @@ msgstr "" msgid "Invalid verification code." msgstr "" -#: packages/plugins/FileService/src/SiteAdaptor/components/UploadFile.tsx #: packages/plugins/Snapshot/src/SiteAdaptor/InformationCard.tsx msgid "IPFS" msgstr "" diff --git a/packages/shared-base/package.json b/packages/shared-base/package.json index ab096bea3906..37b55f9c1f27 100644 --- a/packages/shared-base/package.json +++ b/packages/shared-base/package.json @@ -23,12 +23,11 @@ "@masknet/typed-message": "workspace:^", "@servie/events": "^3.0.0", "@types/dompurify": "^3.0.5", - "@types/json-stable-stringify": "^1.0.36", "async-call-rpc": "^6.4.2", "bignumber.js": "9.1.2", "dompurify": "^3.1.5", "idb": "^8.0.0", - "json-stable-stringify": "^1.1.1", + "json-stable-stringify": "1.3.0", "pvtsutils": "^1.3.5", "typeson": "^9.0.3", "typeson-registry": "^11.1.1" diff --git a/packages/shared-base/src/helpers/ValueRef.ts b/packages/shared-base/src/helpers/ValueRef.ts index 5ff53932a73f..61930486b0e7 100644 --- a/packages/shared-base/src/helpers/ValueRef.ts +++ b/packages/shared-base/src/helpers/ValueRef.ts @@ -1,7 +1,7 @@ // All imports must be deferred. This file loads in the very early stage. import defer * as lodash from 'lodash-es' import defer * as constants from '../constants.js' -import defer * as stringify from 'json-stable-stringify' +import stringify from 'json-stable-stringify' export type ValueComparer = (a: T, b: T) => boolean const defaultComparer: ValueComparer = (a, b) => a === b @@ -64,7 +64,7 @@ export class ValueRefWithReady extends ValueRef { */ export class ValueRefJSON extends ValueRefWithReady { constructor(defaultValue: T) { - super(stringify.default(defaultValue), lodash.isEqual) + super(stringify(defaultValue), lodash.isEqual) } override get value(): string { return super.value @@ -76,7 +76,7 @@ export class ValueRefJSON extends ValueRefWithReady { } if (lodash.isEqual(this.asJSON, value)) return this.json = value - super.value = stringify.default(value) + super.value = stringify(value) as string } private json: Readonly | undefined get asJSON(): Readonly { diff --git a/packages/shared/package.json b/packages/shared/package.json index ae26b752411b..708e14750067 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -34,13 +34,12 @@ "@masknet/web3-telemetry": "workspace:^", "@react-hookz/web": "^24.0.4", "@types/d3": "5.16.4", - "@types/json-stable-stringify": "^1.0.36", "bignumber.js": "9.1.2", "d3": "^5.16.0", "date-fns": "^3.6.0", "fuse.js": "^7.0.0", "immer": "^10.1.1", - "json-stable-stringify": "^1.1.1", + "json-stable-stringify": "1.3.0", "lodash-es": "^4.17.21", "pure-react-carousel": "^1.30.1", "qrcode": "^1.5.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 452233f9258d..388c7322286d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -411,9 +411,6 @@ importers: '@masknet/plugin-calendar': specifier: workspace:^ version: link:../plugins/Calendar - '@masknet/plugin-claim': - specifier: workspace:^ - version: link:../plugins/Claim '@masknet/plugin-collectible': specifier: workspace:^ version: link:../plugins/Collectible @@ -561,9 +558,6 @@ importers: '@types/elliptic': specifier: ^6.4.18 version: 6.4.18 - '@types/json-stable-stringify': - specifier: ^1.0.36 - version: 1.0.36 '@types/react-avatar-editor': specifier: ^13.0.2 version: 13.0.2(patch_hash=964633ba75b95702d6968fe8758b1f14f1e84ae66b941d42ccf852710d60d9df) @@ -625,8 +619,8 @@ importers: specifier: ^10.1.1 version: 10.1.1 json-stable-stringify: - specifier: ^1.1.1 - version: 1.1.1 + specifier: 1.3.0 + version: 1.3.0 react-avatar-editor: specifier: ^13.0.2 version: 13.0.2(@babel/core@7.26.0)(react-dom@0.0.0-experimental-58af67a8f8-20240628(react@0.0.0-experimental-58af67a8f8-20240628))(react@0.0.0-experimental-58af67a8f8-20240628) @@ -1965,12 +1959,9 @@ importers: '@masknet/web3-shared-evm': specifier: workspace:^ version: link:../../web3-shared/evm - '@types/json-stable-stringify': - specifier: ^1.0.36 - version: 1.0.36 json-stable-stringify: - specifier: ^1.1.1 - version: 1.1.1 + specifier: 1.3.0 + version: 1.3.0 react-use: specifier: ^17.5.0 version: 17.5.0(patch_hash=d4ab26e7e9bf01f9c4ca5da3caefb5b44dee64b0382328e5a08df838b8d8a4f7)(react-dom@0.0.0-experimental-58af67a8f8-20240628(react@0.0.0-experimental-58af67a8f8-20240628))(react@0.0.0-experimental-58af67a8f8-20240628) @@ -2286,9 +2277,6 @@ importers: '@types/d3': specifier: 5.16.4 version: 5.16.4 - '@types/json-stable-stringify': - specifier: ^1.0.36 - version: 1.0.36 bignumber.js: specifier: 9.1.2 version: 9.1.2 @@ -2305,8 +2293,8 @@ importers: specifier: ^10.1.1 version: 10.1.1 json-stable-stringify: - specifier: ^1.1.1 - version: 1.1.1 + specifier: 1.3.0 + version: 1.3.0 lodash-es: specifier: ^4.17.21 version: 4.17.21 @@ -2392,9 +2380,6 @@ importers: '@types/dompurify': specifier: ^3.0.5 version: 3.0.5 - '@types/json-stable-stringify': - specifier: ^1.0.36 - version: 1.0.36 async-call-rpc: specifier: ^6.4.2 version: 6.4.2 @@ -2408,8 +2393,8 @@ importers: specifier: ^8.0.0 version: 8.0.0 json-stable-stringify: - specifier: ^1.1.1 - version: 1.1.1 + specifier: 1.3.0 + version: 1.3.0 pvtsutils: specifier: ^1.3.5 version: 1.3.6 @@ -7061,9 +7046,6 @@ packages: '@types/json-schema@7.0.15': resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} - '@types/json-stable-stringify@1.0.36': - resolution: {integrity: sha512-b7bq23s4fgBB76n34m2b3RBf6M369B0Z9uRR8aHTMd8kZISRkmDEpPD8hhpYvDFzr3bJCPES96cm3Q6qRNDbQw==} - '@types/json5@0.0.29': resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} @@ -10845,9 +10827,6 @@ packages: resolution: {integrity: sha512-eWv1ds/zAlz+M1ioHsyKJomfY7jbDDPpwSkv14KQj89bycx1nvK5/2Cj/T9g7kzJcX5Bc7Yv22FjfBZS/jl94A==} engines: {node: '>= 10.13.0'} - gopd@1.0.1: - resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} - gopd@1.2.0: resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==} engines: {node: '>= 0.4'} @@ -12120,6 +12099,10 @@ packages: resolution: {integrity: sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==} engines: {node: '>= 0.4'} + json-stable-stringify@1.3.0: + resolution: {integrity: sha512-qtYiSSFlwot9XHtF9bD9c7rwKjr+RecWT//ZnPvSmEjpV5mmPOCN4j8UjY5hbjNkOwZ/jQv3J6R1/pL7RwgMsg==} + engines: {node: '>= 0.4'} + json-stringify-safe@5.0.1: resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==} @@ -23071,8 +23054,6 @@ snapshots: '@types/json-schema@7.0.15': {} - '@types/json-stable-stringify@1.0.36': {} - '@types/json5@0.0.29': optional: true @@ -26029,7 +26010,6 @@ snapshots: dependencies: es-errors: 1.3.0 function-bind: 1.1.2 - optional: true call-bind@1.0.7: dependencies: @@ -26045,13 +26025,11 @@ snapshots: es-define-property: 1.0.1 get-intrinsic: 1.3.0 set-function-length: 1.2.2 - optional: true call-bound@1.0.4: dependencies: call-bind-apply-helpers: 1.0.2 get-intrinsic: 1.3.0 - optional: true callsites@3.1.0: {} @@ -27118,9 +27096,9 @@ snapshots: define-data-property@1.1.4: dependencies: - es-define-property: 1.0.0 + es-define-property: 1.0.1 es-errors: 1.3.0 - gopd: 1.0.1 + gopd: 1.2.0 define-lazy-prop@3.0.0: {} @@ -27332,7 +27310,6 @@ snapshots: call-bind-apply-helpers: 1.0.2 es-errors: 1.3.0 gopd: 1.2.0 - optional: true duplexer@0.1.2: {} @@ -27577,10 +27554,9 @@ snapshots: es-define-property@1.0.0: dependencies: - get-intrinsic: 1.2.4 + get-intrinsic: 1.3.0 - es-define-property@1.0.1: - optional: true + es-define-property@1.0.1: {} es-errors@1.3.0: {} @@ -27589,7 +27565,6 @@ snapshots: es-object-atoms@1.1.1: dependencies: es-errors: 1.3.0 - optional: true es-set-tostringtag@2.1.0: dependencies: @@ -28765,7 +28740,7 @@ snapshots: es-errors: 1.3.0 function-bind: 1.1.2 has-proto: 1.0.3 - has-symbols: 1.0.3 + has-symbols: 1.1.0 hasown: 2.0.2 get-intrinsic@1.3.0: @@ -28780,7 +28755,6 @@ snapshots: has-symbols: 1.1.0 hasown: 2.0.2 math-intrinsics: 1.1.0 - optional: true get-iterator@1.0.2: {} @@ -28792,7 +28766,6 @@ snapshots: dependencies: dunder-proto: 1.0.1 es-object-atoms: 1.1.1 - optional: true get-stdin@9.0.0: {} @@ -28945,12 +28918,7 @@ snapshots: dependencies: sparkles: 2.1.0 - gopd@1.0.1: - dependencies: - get-intrinsic: 1.2.4 - - gopd@1.2.0: - optional: true + gopd@1.2.0: {} got@11.8.6: dependencies: @@ -29096,7 +29064,7 @@ snapshots: has-property-descriptors@1.0.2: dependencies: - es-define-property: 1.0.0 + es-define-property: 1.0.1 has-proto@1.0.3: {} @@ -29107,12 +29075,11 @@ snapshots: has-symbols@1.0.3: {} - has-symbols@1.1.0: - optional: true + has-symbols@1.1.0: {} has-tostringtag@1.0.2: dependencies: - has-symbols: 1.0.3 + has-symbols: 1.1.0 has@1.0.4: optional: true @@ -29667,7 +29634,7 @@ snapshots: is-arguments@1.1.1: dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 has-tostringtag: 1.0.2 is-array-buffer@3.0.5: @@ -30551,6 +30518,14 @@ snapshots: jsonify: 0.0.1 object-keys: 1.1.1 + json-stable-stringify@1.3.0: + dependencies: + call-bind: 1.0.8 + call-bound: 1.0.4 + isarray: 2.0.5 + jsonify: 0.0.1 + object-keys: 1.1.1 + json-stringify-safe@5.0.1: {} json-text-sequence@0.1.1: @@ -30957,8 +30932,7 @@ snapshots: marky@1.2.5: {} - math-intrinsics@1.1.0: - optional: true + math-intrinsics@1.1.0: {} md5.js@1.3.5: dependencies: @@ -33416,8 +33390,8 @@ snapshots: define-data-property: 1.1.4 es-errors: 1.3.0 function-bind: 1.1.2 - get-intrinsic: 1.2.4 - gopd: 1.0.1 + get-intrinsic: 1.3.0 + gopd: 1.2.0 has-property-descriptors: 1.0.2 set-function-name@2.0.2: @@ -33506,9 +33480,9 @@ snapshots: side-channel@1.0.6: dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 es-errors: 1.3.0 - get-intrinsic: 1.2.4 + get-intrinsic: 1.3.0 object-inspect: 1.13.3 side-channel@1.1.0: @@ -35911,9 +35885,9 @@ snapshots: which-typed-array@1.1.15: dependencies: available-typed-arrays: 1.0.7 - call-bind: 1.0.7 + call-bind: 1.0.8 for-each: 0.3.3 - gopd: 1.0.1 + gopd: 1.2.0 has-tostringtag: 1.0.2 which-typed-array@1.1.19: diff --git a/tsconfig.json b/tsconfig.json index 68bc3c78b962..d17af1e3d068 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -131,7 +131,6 @@ "@masknet/plugin-transak": ["./packages/plugins/Transak/src/index.ts"], "@masknet/plugin-vcent": ["./packages/plugins/VCent/src/index.ts"], "@masknet/plugin-collectible": ["./packages/plugins/Collectible/src/index.ts"], - "@masknet/plugin-claim": ["./packages/plugins/Claim/src/index.ts"], "@masknet/plugin-artblocks": ["./packages/plugins/ArtBlocks/src/index.ts"], "@masknet/plugin-tips": ["./packages/plugins/Tips/src/index.ts"], "@masknet/plugin-nextid": ["./packages/plugins/NextID/src/index.ts"],