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 .lintstagedrc.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ export default {
'*': 'prettier --write --ignore-unknown',
'packages/**/*.{ts,tsx,js,jsx}': 'eslint -c packages/.eslintrc.json --fix',
'packages/mask/**/*': () => 'gulp locale-kit --sync-keys --remove-unused-keys',
'packages/web3-constants/**/*': 'pnpm start --filter web3-constants',
'packages/web3-constants/**/*': () => 'pnpm --filter ./packages/web3-constants start',
'cspell.json': () => 'gulp reorder-spellcheck',
}
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
@dimensiondev:registry=https://npm.dimension.im/
strict-peer-dependencies=false
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"name": "mask-network",
"packageManager": "pnpm@6.32.2",
"packageManager": "pnpm@7.0.0",
"engines": {
"node": ">=17.0.0",
"pnpm": ">=6.32.1",
"we-only-allow-pnpm-in-our-project": ">=999.0.0",
"pnpm": ">=7.0.0",
"yarn": ">=999.0.0",
"npm": ">=999.0.0"
},
Expand All @@ -20,7 +19,7 @@
"build-ios": "build --preset iOS",
"lint": "eslint -c packages/.eslintrc.json packages --ext .ts,.tsx,.js --cache --fix",
"lint:ci": "eslint -c packages/.eslintrc.json packages --ext .ts,.tsx,.js --cache",
"lint:ci-report": "pnpm lint:ci -- --format=junit --output-file=reports/junit/eslint-results.xml --max-warnings=0",
"lint:ci-report": "pnpm run lint:ci --format=junit --output-file=reports/junit/eslint-results.xml --max-warnings=0",
"postinstall": "patch-package",
"prepare": "husky install",
"test": "node --experimental-vm-modules ./node_modules/jest/bin/jest.js",
Expand Down Expand Up @@ -63,7 +62,7 @@
"@jest/globals": "^28.0.0-alpha.8",
"@magic-works/i18n-codegen": "^0.1.0",
"@masknet/cli": "workspace:*",
"@masknet/serializer": "workspace:^0.0.0",
"@masknet/serializer": "workspace:*",
"@nice-labs/git-rev": "^3.5.0",
"@swc/core": "^1.2.165",
"@types/lodash-es": "^4.17.6",
Expand Down
3 changes: 3 additions & 0 deletions packages/backup-format/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@
"@msgpack/msgpack": "^2.7.2",
"elliptic": "^6.5.3",
"pvtsutils": "^1.2.2"
},
"devDependencies": {
"@types/elliptic": "^6.4.14"
}
}
3 changes: 1 addition & 2 deletions packages/backup-format/tsconfig.tests.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"extends": "../../tsconfig.json",
"compilerOptions": {
"noEmit": true,
"tsBuildInfoFile": "./dist/tests.tsbuildinfo",
"types": ["node"]
"tsBuildInfoFile": "./dist/tests.tsbuildinfo"
},
"include": ["./tests"],
"references": [{ "path": "./tsconfig.json" }]
Expand Down
2 changes: 2 additions & 0 deletions packages/dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@
"@storybook/builder-webpack5": "^6.4.22",
"@storybook/manager-webpack5": "^6.4.22",
"@storybook/react": "^6.4.22",
"@types/use-subscription": "^1.0.0",
"@types/uuid": "^8.3.4",
"babel-loader": "^8.2.5"
}
}
3 changes: 1 addition & 2 deletions packages/encryption/tsconfig.tests.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"extends": "../../tsconfig.json",
"compilerOptions": {
"noEmit": true,
"tsBuildInfoFile": "./dist/tests.tsbuildinfo",
"types": ["node", "web"]
"tsBuildInfoFile": "./dist/tests.tsbuildinfo"
},
"include": ["./tests"],
"references": [{ "path": "./tsconfig.json" }]
Expand Down
1 change: 1 addition & 0 deletions packages/mask/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@
"@dimensiondev/webextension-shim": "0.0.3-20210823035705-4257e12",
"@nice-labs/emit-file-webpack-plugin": "^1.1.2",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
"@types/color": "^3.0.3",
"@typescript-eslint/eslint-plugin": "^5.20.0",
"@typescript-eslint/parser": "^5.20.0",
"binaryen": "^106.0.0",
Expand Down
1 change: 1 addition & 0 deletions packages/plugin-infra/src/env.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/// <reference types="@masknet/global-types/webpack" />
/// <reference types="@masknet/global-types/flag" />
17 changes: 13 additions & 4 deletions packages/polyfills/builder.mjs
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { fileURLToPath } from 'url'
import { fileURLToPath } from 'node:url'
import { readFile, writeFile } from 'node:fs/promises'
import { spawn } from 'node:child_process'
import { createHash } from 'node:crypto'
import { createRequire } from 'node:module'
import builder from 'core-js-builder'
import { rollup } from 'rollup'
import { readFile, writeFile } from 'fs/promises'
import { createRequire } from 'module'
import { createHash } from 'crypto'

// https://github.com/rollup/rollup/issues/4253
// import loadConfigFile from 'rollup/dist/loadConfigFile.js'
Expand All @@ -26,6 +27,14 @@ let polyfillVersion = '__'
const versionFilePath = fileURLToPath(new URL('./dist/version.txt', import.meta.url))
if ((await readFile(versionFilePath, 'utf-8').catch(() => '')) === polyfillVersion) process.exit(0)

// looks like pnpm 7 _may_ be skip the running of postinstall script?
// https://github.com/pnpm/pnpm/issues/4649
spawn('npx', ['patch-package'], {
cwd: fileURLToPath(new URL('../../', import.meta.url)),
stdio: 'inherit',
shell: true,
})

await builder({
modules: ['core-js/stable'],
targets: [
Expand Down
1 change: 1 addition & 0 deletions packages/scripts/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "@masknet/cli",
"version": "0.0.0",
"private": true,
"bin": {
"build": "./src/bin/build.ts",
Expand Down
5 changes: 4 additions & 1 deletion packages/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"dependencies": {
"@dimensiondev/holoflows-kit": "^0.9.0-20210902104757-7c3d0d0",
"@masknet/icons": "workspace:*",
"@masknet/shared-base-ui": "workspace:*",
"@masknet/plugin-infra": "workspace:*",
"@masknet/shared-base": "workspace:*",
"@masknet/shared-base-ui": "workspace:*",
"@masknet/theme": "workspace:*",
"@masknet/web3-shared-base": "workspace:*",
"@masknet/web3-shared-evm": "workspace:*",
Expand All @@ -26,5 +26,8 @@
"react-use": "^17.3.2",
"urlcat": "^2.0.4",
"use-subscription": "^1.6.0"
},
"devDependencies": {
"@types/qrcode": "^1.4.2"
}
}
1 change: 1 addition & 0 deletions packages/theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"@storybook/builder-webpack5": "^6.4.22",
"@storybook/manager-webpack5": "^6.4.22",
"@storybook/react": "^6.4.22",
"@types/react-window": "^1.8.4",
"babel-loader": "^8.2.5"
}
}
1 change: 1 addition & 0 deletions packages/web3-providers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"@masknet/web3-contracts": "workspace:*",
"@masknet/web3-shared-base": "workspace:*",
"@masknet/web3-shared-evm": "workspace:*",
"@types/socket.io-client": "^1.4.36",
"bignumber.js": "9.0.2",
"date-fns": "^2.28.0",
"graphql-request": "^3.4.0",
Expand Down
3 changes: 2 additions & 1 deletion packages/web3-shared/evm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"web3-utils": "1.7.3"
},
"devDependencies": {
"@types/use-subscription": "^1.0.0"
"@types/use-subscription": "^1.0.0",
"@types/uuid": "^8.3.4"
}
}
Loading