Skip to content

Commit ca17b3e

Browse files
guanbinruiswkatmaskJack-Works
authored
[Release] Hotfix 2.35.0 => 2.35.1 (patch) (#12322)
* fix: remove claim plugin references (#12321) * chore: bump version to 2.35.1 * fix: mf-6765 update json-stable-stringify and use default export (#12325) bump dependency across packages, remove @types/json-stable-stringify, replace import * as stringify with default import and call stringify(...). also enable dotenv dev loading in build script. * fix(scripts): skip dotenv loading in production (#12326) * fix: makeAttachment not defined close MF-6766 * fix(file-service): temporarily remove IPFS provider from upload options (#12327) * fix(file-service): temporarily remove IPFS provider from upload options * fix: linter --------- Co-authored-by: swkatmask <[email protected]> --------- Co-authored-by: Wukong Sun <[email protected]> Co-authored-by: Jack Works <[email protected]> Co-authored-by: swkatmask <[email protected]>
1 parent 3706309 commit ca17b3e

File tree

18 files changed

+52
-93
lines changed

18 files changed

+52
-93
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"yarn": ">=999.0.0",
88
"npm": ">=999.0.0"
99
},
10-
"version": "2.35.0",
10+
"version": "2.35.1",
1111
"private": true,
1212
"license": "AGPL-3.0-or-later",
1313
"scripts": {

packages/mask/background/services/site-adaptors/connect.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,5 +131,5 @@ export async function connectSite(
131131
persona: identifier.toText(),
132132
username: profile?.userId,
133133
tabId: targetTab.id,
134-
})
134+
}) as string
135135
}

packages/mask/content-script/site-adaptor-infra/ui.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ export async function activateSiteAdaptorUIInner(ui_deferred: SiteAdaptorUI.Defe
136136
currentSetupGuideStatus[activatedSiteAdaptorUI!.networkIdentifier].value = stringify({
137137
status: SetupGuideStep.FindUsername,
138138
persona: currentPersonaIdentifier?.toText(),
139-
})
139+
}) as string
140140
}
141141

142142
setupUIContext()

packages/mask/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
"@masknet/plugin-artblocks": "workspace:^",
4646
"@masknet/plugin-avatar": "workspace:^",
4747
"@masknet/plugin-calendar": "workspace:^",
48-
"@masknet/plugin-claim": "workspace:^",
4948
"@masknet/plugin-collectible": "workspace:^",
5049
"@masknet/plugin-cross-chain-bridge": "workspace:^",
5150
"@masknet/plugin-debugger": "workspace:^",
@@ -95,7 +94,6 @@
9594
"@tanstack/react-query-devtools": "^5.48.0",
9695
"@tanstack/react-query-persist-client": "^5.48.0",
9796
"@types/elliptic": "^6.4.18",
98-
"@types/json-stable-stringify": "^1.0.36",
9997
"@types/react-avatar-editor": "^13.0.2",
10098
"@types/react-highlight-words": "^0.20.0",
10199
"@types/use-subscription": "^1.0.2",
@@ -116,7 +114,7 @@
116114
"https-browserify": "^1.0.0",
117115
"idb": "^8.0.0",
118116
"immer": "^10.1.1",
119-
"json-stable-stringify": "^1.1.1",
117+
"json-stable-stringify": "1.3.0",
120118
"react-avatar-editor": "^13.0.2",
121119
"react-draggable": "^4.4.6",
122120
"react-highlight-words": "^0.20.0",

packages/mask/shared/plugin-infra/register.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import '@masknet/plugin-scam-warning/register'
1313
import '@masknet/plugin-collectible/register'
1414
import '@masknet/plugin-transak/register'
1515
import '@masknet/plugin-vcent/register'
16-
import '@masknet/plugin-claim/register'
1716
import '@masknet/plugin-tips/register'
1817
import '@masknet/plugin-nextid/register'
1918
import '@masknet/plugin-trader/register'

packages/plugins/FileService/src/SiteAdaptor/components/UploadFile.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// todo:the issue is potentially the file size limit
22

3+
import { Trans } from '@lingui/react/macro'
34
import { Icons } from '@masknet/icons'
45
import { UploadDropArea } from '@masknet/shared'
56
import { makeStyles } from '@masknet/theme'
@@ -10,7 +11,6 @@ import { downloadFile } from '../../helpers.js'
1011
import { Provider } from '../../types.js'
1112
import { useFileManagement } from '../contexts/index.js'
1213
import { FileList } from './FileList.js'
13-
import { Trans } from '@lingui/react/macro'
1414

1515
interface ProviderConfig {
1616
name: ReactNode
@@ -92,10 +92,6 @@ export function UploadFile() {
9292
provider: Provider.Arweave,
9393
name: <Trans>Arweave</Trans>,
9494
},
95-
{
96-
provider: Provider.IPFS,
97-
name: <Trans>IPFS</Trans>,
98-
},
9995
{
10096
provider: Provider.Load,
10197
name: <Trans>Load Network</Trans>,

packages/plugins/FileService/src/Worker/index.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ import { getAllFiles, setFileInfo, setupDatabase } from './database.js'
77
const worker: Plugin.Worker.Definition = {
88
...base,
99
init(signal, context) {
10-
context.startService(import('./service.js').then(({ upload, ...rest }) => rest))
11-
context.startGeneratorService(import('./service.js').then(({ upload }) => ({ upload })))
10+
const mod = import('./service.js')
11+
context.startService(mod.then(({ upload, ...rest }) => rest))
12+
context.startGeneratorService(mod.then(({ upload }) => ({ upload })))
1213
setupDatabase(context.getDatabaseStorage())
1314
},
1415
backup: {

packages/plugins/Transak/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
"@masknet/shared-base-ui": "workspace:^",
2424
"@masknet/theme": "workspace:^",
2525
"@masknet/web3-shared-evm": "workspace:^",
26-
"@types/json-stable-stringify": "^1.0.36",
27-
"json-stable-stringify": "^1.1.1",
26+
"json-stable-stringify": "1.3.0",
2827
"react-use": "^17.5.0"
2928
}
30-
}
29+
}

packages/shared-base-ui/src/locale/en-US.po

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/shared-base-ui/src/locale/ja-JP.po

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)