Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/mask/background/services/site-adaptors/connect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,5 +131,5 @@ export async function connectSite(
persona: identifier.toText(),
username: profile?.userId,
tabId: targetTab.id,
})
}) as string
}
2 changes: 1 addition & 1 deletion packages/mask/content-script/site-adaptor-infra/ui.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 1 addition & 3 deletions packages/mask/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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:^",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down
1 change: 0 additions & 1 deletion packages/mask/shared/plugin-infra/register.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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
Expand Down Expand Up @@ -92,10 +92,6 @@ export function UploadFile() {
provider: Provider.Arweave,
name: <Trans>Arweave</Trans>,
},
{
provider: Provider.IPFS,
name: <Trans>IPFS</Trans>,
},
{
provider: Provider.Load,
name: <Trans>Load Network</Trans>,
Expand Down
5 changes: 3 additions & 2 deletions packages/plugins/FileService/src/Worker/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
5 changes: 2 additions & 3 deletions packages/plugins/Transak/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
1 change: 0 additions & 1 deletion packages/shared-base-ui/src/locale/en-US.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion packages/shared-base-ui/src/locale/ja-JP.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion packages/shared-base-ui/src/locale/ko-KR.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion packages/shared-base-ui/src/locale/zh-CN.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion packages/shared-base-ui/src/locale/zh-TW.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions packages/shared-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions packages/shared-base/src/helpers/ValueRef.ts
Original file line number Diff line number Diff line change
@@ -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<T> = (a: T, b: T) => boolean
const defaultComparer: ValueComparer<any> = (a, b) => a === b
Expand Down Expand Up @@ -64,7 +64,7 @@ export class ValueRefWithReady<T> extends ValueRef<T> {
*/
export class ValueRefJSON<T extends object> extends ValueRefWithReady<string> {
constructor(defaultValue: T) {
super(stringify.default(defaultValue), lodash.isEqual)
super(stringify(defaultValue), lodash.isEqual)
}
override get value(): string {
return super.value
Expand All @@ -76,7 +76,7 @@ export class ValueRefJSON<T extends object> extends ValueRefWithReady<string> {
}
if (lodash.isEqual(this.asJSON, value)) return
this.json = value
super.value = stringify.default(value)
super.value = stringify(value) as string
}
private json: Readonly<T> | undefined
get asJSON(): Readonly<T> {
Expand Down
3 changes: 1 addition & 2 deletions packages/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading