Skip to content

Commit 1777800

Browse files
Merge branch 'develop' into feat/moonriver
2 parents 16d7b44 + 30857ae commit 1777800

File tree

77 files changed

+2316
-120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+2316
-120
lines changed

.ecrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"Disable": {
3+
"Indentation": true
4+
}
5+
}

.github/workflows/linters.yml

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,23 @@ jobs:
2121
with:
2222
ref: ${{ github.event.pull_request.head.sha }}
2323
- uses: actions/setup-node@v2
24-
- run: npx [email protected] --list-different .
24+
- run: npx [email protected] --check .
25+
markdownlint:
26+
runs-on: ubuntu-20.04
27+
steps:
28+
- uses: actions/checkout@v2
29+
with:
30+
ref: ${{ github.event.pull_request.head.sha }}
31+
- uses: actions/setup-node@v2
32+
- run: npx markdownlint-cli .
33+
editorconfig:
34+
runs-on: ubuntu-20.04
35+
steps:
36+
- uses: actions/checkout@v2
37+
with:
38+
ref: ${{ github.event.pull_request.head.sha }}
39+
- uses: DimensionDev/setup-editorconfig-action@latest
40+
- run: editorconfig-checker
2541
anti-trojan-source:
2642
runs-on: ubuntu-20.04
2743
steps:
@@ -38,11 +54,11 @@ jobs:
3854
ref: ${{ github.event.pull_request.head.sha }}
3955
- uses: pnpm/action-setup@v2
4056
with:
41-
version: '6.23.1'
57+
version: "6.23.1"
4258
- uses: actions/setup-node@v2
4359
with:
44-
node-version: '16'
45-
cache: 'pnpm'
60+
node-version: "16"
61+
cache: "pnpm"
4662
- run: pnpm install
4763
- run: npx gulp locale-kit
4864
type-check-and-jest:
@@ -57,11 +73,11 @@ jobs:
5773
ref: ${{ github.event.pull_request.head.sha }}
5874
- uses: pnpm/action-setup@v2
5975
with:
60-
version: '6.23.1'
76+
version: "6.23.1"
6177
- uses: actions/setup-node@v2
6278
with:
63-
node-version: '16'
64-
cache: 'pnpm'
79+
node-version: "16"
80+
cache: "pnpm"
6581
- run: pnpm install
6682
- run: npx gulp codegen
6783
- run: npx gulp polyfill
@@ -74,11 +90,11 @@ jobs:
7490
ref: ${{ github.event.pull_request.head.sha }}
7591
- uses: pnpm/action-setup@v2
7692
with:
77-
version: '6.23.1'
93+
version: "6.23.1"
7894
- uses: actions/setup-node@v2
7995
with:
80-
node-version: '16'
81-
cache: 'pnpm'
96+
node-version: "16"
97+
cache: "pnpm"
8298
- run: pnpm install
8399
- run: pnpm run lint:ci
84100
- name: Upload eslint report

.markdownlint.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"line-length": false
3+
}

.markdownlintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules

.vscode/settings.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
}
2626
],
2727
"cSpell.words": ["Reificated"],
28-
"markdownlint.config": {
29-
"no-inline-html": false
30-
},
3128
"files.associations": {
3229
"**/.env/*": "ini"
3330
},

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<!-- cspell:disable -->
2+
<!-- markdownlint-disable no-inline-html first-line-heading -->
23
<a href="https://mask.io">
3-
<img src="https://raw.githubusercontent.com/DimensionDev/Maskbook-Website/master/img/MB--CircleCanvas--WhiteOverBlue.svg"
4+
<img src="https://dimensiondev.github.io/Mask-VI/assets/Logo/MB--Logo--Geo--ForceCircle--Blue.svg"
45
width="200" height="200" title="([I:b])" alt="([I:b])">
56
</a>
7+
<!-- markdownlint-enable no-inline-html first-line-heading -->
68

79
# Mask Network
810

cspell.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"caip",
4545
"canonify",
4646
"cashtag",
47-
"CBTC",
47+
"cbtc",
4848
"celo",
4949
"checksummed",
5050
"choudhary",

docs/css-in-js.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ maintainer:
1111

1212
- ✅ For recommendations
1313
- &#9888; For warnings
14-
- 🚫 For forbiddens
14+
- 🚫 For forbidden
1515
- ✅ Use [the Box component provided by the library](https://next.material-ui.com/components/box/#main-content)
1616
when the CSS is simple and only used once.
1717
- ✅ CSS custom variables is OK but do not abuse it.
@@ -53,7 +53,7 @@ const Title = style.div`
5353
// 🚫 Bad
5454
const Title = style(Typography)(
5555
({ theme }) => `
56-
marign-left: ${theme.spacing(4)};
56+
margin-left: ${theme.spacing(4)};
5757
`,
5858
)
5959

docs/form-guide.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ You can set error message with i18n, you can read this file to learn about [i18n
1212
import { z as zod } from 'zod'
1313

1414
export function ComponentForm() {
15-
const t = useComponentI18N() // Set errror messge with i18n.
15+
const t = useComponentI18N() // Set error message with i18n.
1616
const schema = zod.object({
1717
name: zod.string(), // string
1818
age: zod.number(t.needBeNumber()).positive(t.needGreaterThanZero()), // > 0
19-
country: zod.string(t.countyNeedBeString()).optional(), // string | undefiend
19+
country: zod.string(t.countyNeedBeString()).optional(), // string | undefined
2020
address: zod
2121
.string()
2222
.min(1)
@@ -43,7 +43,7 @@ const methods = useForm<formType>({
4343
})
4444
```
4545

46-
`react-hook-form` provides [optional argumenjs](https://react-hook-form.com/api/useform), you can change it on demand.
46+
`react-hook-form` provides [optional arguments](https://react-hook-form.com/api/useform), you can change it on demand.
4747

4848
### 3. Create form UI with `Controller` and Material-UI component
4949

docs/rfc/000-Payload-v37.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Payload version -37
22

3+
<!-- markdownlint-disable no-duplicate-heading -->
4+
35
## Design target
46

57
- MUST be a binary format.

0 commit comments

Comments
 (0)