Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0936836
chore: bump version to 2.32.3
guanbinrui Apr 17, 2025
7fcd74d
feat: mf-6641 integrate google drive (#12176)
swkatmask Apr 2, 2025
7dde693
feat: mf-6640 recover from google drive (#12178)
swkatmask Apr 2, 2025
01214e3
refactor: rewrite onboarding writer to avoid break words in i18n (#12…
Jack-Works Apr 3, 2025
838ff38
docs(i18n): sync i18n files from Crowdin (#12182)
Jack-Works Apr 5, 2025
4fa32bb
fix: mf-6672 request identity permission (#12183)
swkatmask Apr 7, 2025
e9278da
chore: mf-6670 remove x2y2 (#12184)
swkatmask Apr 7, 2025
4351982
fix: backup/recover related issues. (#12187)
swkatmask Apr 8, 2025
ddabc6f
fix: mf-6688 do not encrypt/decrypt with account for google drive (#1…
swkatmask Apr 9, 2025
e0b3ae7
chore: remove unused legacy backup pages (#12192)
swkatmask Apr 9, 2025
ac818b1
fix: show toast after recovery success (#12194)
swkatmask Apr 10, 2025
cb487e9
docs(i18n): sync i18n files from Crowdin (#12197)
Jack-Works Apr 11, 2025
2d7c021
fix: mf-6690 modal naviate (#12199)
swkatmask Apr 11, 2025
cf09c71
chore: pick useful changes from turbo pr (#12190)
Jack-Works Apr 11, 2025
49df46c
refactor: remove TransactionWatcher hack (#12188)
Jack-Works Apr 11, 2025
968f06f
fix: mf-6691 record cloud backup timestamp (#12202)
swkatmask Apr 14, 2025
2071471
feat: mf-6673 lens v3 follow/unfollow (#12198)
swkatmask Apr 15, 2025
df7c88d
fix: mf-6693 mf-6694 follow/unfollow lens (#12209)
swkatmask Apr 17, 2025
1c81901
chore: only allow to select managed account (#12211)
swkatmask Apr 17, 2025
cea4764
chore: revert 2.32.3 unrelated changes (#12212)
swkatmask Apr 17, 2025
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,4 @@ common/autoinstallers/*/.npmrc
/package-lock.json
/yarn.lock
quick-lint-js.config
.aider*
2 changes: 0 additions & 2 deletions .ignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# Ignores for rg or ag
patches/
packages/mask/dashboard/assets/images/SetupTutorial.svg

**/locale/*.{po,json}
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v22.2.0
v23.6.0
10 changes: 6 additions & 4 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -241,15 +241,17 @@
"ignoreRegExpList": ["/[A-Za-z0-9]{44}/", "/[A-Za-z0-9]{46}/", "/[A-Za-z0-9]{59}/"],
"overrides": [],
"words": [
"Arbitrum",
"Boba",
"arbitrum",
"boba",
"cashtags",
"Celo",
"celo",
"endregion",
"linkedin",
"luma",
"muln",
"Sepolia",
"reposted",
"reposts",
"sepolia",
"tanstack",
"tiktok",
"tweetnacl",
Expand Down
3 changes: 1 addition & 2 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ const moduleSystemRules = {
'import/no-duplicates': 'warn', // duplicate specifiers
'import/no-empty-named-blocks': 'warn', // bans import T, {}
'unused-imports/no-unused-imports': 'warn',
// 'unicorn/prefer-node-protocol': 'warn',
'unicorn/prefer-node-protocol': 'warn',
'@typescript-eslint/consistent-type-exports': ['warn', { fixMixedExportsWithInlineTypeSpecifier: true }],
'@typescript-eslint/consistent-type-imports': [
'warn',
Expand Down Expand Up @@ -597,7 +597,6 @@ export default tseslint.config(
'**/i18n_generated.ts',
'**/languages.ts',
'packages/contracts',
'packages/scripts',
'packages/mask/.webpack',
],
},
Expand Down
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"type": "module",
"packageManager": "pnpm@9.12.1",
"engines": {
"node": ">=22.2.0",
"node": ">=23.6.0",
"yarn": ">=999.0.0",
"npm": ">=999.0.0"
},
"version": "2.32.2",
"version": "2.32.3",
"private": true,
"license": "AGPL-3.0-or-later",
"scripts": {
Expand Down Expand Up @@ -70,7 +70,6 @@
"@masknet/eslint-plugin": "^0.3.0",
"@masknet/typescript-plugin": "workspace:^",
"@nice-labs/git-rev": "^3.5.1",
"@swc-node/register": "^1.10.9",
"@swc/core": "1.11.7",
"@tanstack/eslint-plugin-query": "^5.66.1",
"@types/lodash-es": "^4.17.12",
Expand Down Expand Up @@ -155,10 +154,10 @@
"@protobufjs/inquire@1.1.0": "patches/@protobufjs__inquire@1.1.0.patch",
"eslint-plugin-i@2.29.1": "patches/eslint-plugin-i@2.29.1.patch",
"react-use@17.5.0": "patches/react-use@17.5.0.patch",
"gulp@5.0.0": "patches/gulp@5.0.0.patch",
"react-devtools-inline@5.3.0": "patches/react-devtools-inline@5.3.0.patch",
"@splinetool/runtime@0.9.342": "patches/@splinetool__runtime@0.9.342.patch",
"@scamsniffer/detector": "patches/@scamsniffer__detector.patch"
"@scamsniffer/detector": "patches/@scamsniffer__detector.patch",
"gulp": "patches/gulp.patch"
}
}
}
9 changes: 5 additions & 4 deletions packages/backup-format/src/version-3/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ export async function encryptBackup(password: BufferSource, binaryBackup: Buffer
export async function decryptBackup(password: BufferSource, data: ArrayBuffer | ArrayLike<number>) {
const container = await parseEncryptedJSONContainer(SupportedVersions.Version0, data)

const _ = decode(container)
if (!Array.isArray(_) || _.length !== 3) throw new TypeError(BackupErrors.UnknownFormat)
if (!_.every((x): x is Uint8Array => x instanceof Uint8Array)) throw new TypeError(BackupErrors.UnknownFormat)
const [pbkdf2IV, encryptIV, encrypted] = _
const payloadTuple = decode(container)
if (!Array.isArray(payloadTuple) || payloadTuple.length !== 3) throw new TypeError(BackupErrors.UnknownFormat)
if (!payloadTuple.every((x): x is Uint8Array => x instanceof Uint8Array))
throw new TypeError(BackupErrors.UnknownFormat)
const [pbkdf2IV, encryptIV, encrypted] = payloadTuple

const aes = await getAESFromPassword(password, pbkdf2IV)

Expand Down
2 changes: 1 addition & 1 deletion packages/backup-format/tests/encryption.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { test, expect, beforeAll } from 'vitest'
import { webcrypto } from 'crypto'
import { webcrypto } from 'node:crypto'
import { encryptBackup, decryptBackup } from '../src/index.js'

beforeAll(() => {
Expand Down
10 changes: 7 additions & 3 deletions packages/gun-utils/builder.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { createRequire } from 'module'
import { readFile, writeFile } from 'fs/promises'
import { minify } from '@swc/core'
const require = createRequire(import.meta.url)
const files = await Promise.all(
[
Expand Down Expand Up @@ -69,12 +70,15 @@ const patchedSource = files
// patch instanceof Object to instanceof globalThis.Object
.replace(/instanceof\s+Object/g, 'instanceof globalThis.Object')

const result = `(() => {
const result = await minify(
`(() => {
${init.toString().replace('// Source Code Here', patchedSource)};
if (!globalThis.Gun) {
globalThis.Gun = ${init.name}().Gun;
}
})();
undefined;
`
writeFile(new URL('./gun.js', import.meta.url), result)
`,
{ mangle: false, compress: false },
)
writeFile(new URL('./gun.js', import.meta.url), result.code)
3 changes: 3 additions & 0 deletions packages/gun-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,8 @@
"dependencies": {
"event-iterator": "^2.0.0",
"gun": "0.2020.1234"
},
"devDependencies": {
"@swc/core": "1.9.3"
}
}
14 changes: 14 additions & 0 deletions packages/icons/brands/GoogleDrive.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 0 additions & 13 deletions packages/icons/brands/X2Y2.svg

This file was deleted.

10 changes: 5 additions & 5 deletions packages/icons/icon-generated-as-jsx.js

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

2 changes: 1 addition & 1 deletion packages/icons/icon-generated-as-url.js

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

4 changes: 2 additions & 2 deletions packages/icons/plugins/GoPlus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 9 additions & 11 deletions packages/icons/plugins/ScamSniffer.dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading