Skip to content

Commit f5028fa

Browse files
authored
Merge branch 'main' into bundler
2 parents 3915031 + bad53d6 commit f5028fa

File tree

1,467 files changed

+122865
-24312
lines changed

Some content is hidden

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

1,467 files changed

+122865
-24312
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,3 @@ Fixes #
1111
## Preview
1212

1313
<!-- Provide a PR preview link to the page(s) changed. -->
14-
15-
## Checklist
16-
17-
Complete this checklist before merging your PR:
18-
19-
- [ ] If this PR contains a major change to the documentation content, I have added an entry to the top of the ["What's new?"](https://github.com/MetaMask/metamask-docs/blob/main/docs/whats-new.md) page.
20-
- [ ] The proposed changes have been reviewed and approved by a member of the documentation team.

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
name: Build
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323
- name: Build
2424
uses: ConsenSys/github-actions/docs-build@main
2525

@@ -30,7 +30,7 @@ jobs:
3030
matrix:
3131
folder: ['docs']
3232
steps:
33-
- uses: actions/checkout@v4
33+
- uses: actions/checkout@v5
3434
- name: Case check action
3535
uses: ConsenSys/github-actions/docs-case-check@main
3636
with:
@@ -41,7 +41,7 @@ jobs:
4141
name: Lint Code Base
4242
runs-on: ubuntu-latest
4343
steps:
44-
- uses: actions/checkout@v4
44+
- uses: actions/checkout@v5
4545
- name: Lint
4646
uses: ConsenSys/github-actions/docs-lint-all@main
4747

@@ -52,7 +52,7 @@ jobs:
5252
matrix:
5353
file-extensions: ['.md', '.mdx']
5454
steps:
55-
- uses: actions/checkout@v4
55+
- uses: actions/checkout@v5
5656
- name: Vale
5757
uses: Consensys/github-actions/docs-spelling-check@main
5858
with:
@@ -65,7 +65,7 @@ jobs:
6565
matrix:
6666
file-extensions: ['.md', '.mdx']
6767
steps:
68-
- uses: actions/checkout@v4
68+
- uses: actions/checkout@v5
6969
- name: LinkCheck
7070
uses: ConsenSys/github-actions/docs-link-check@main
7171
with:

.github/workflows/crowdin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v5
1616

1717
- name: Synchronize with Crowdin
1818
uses: crowdin/github-action@v1

.github/workflows/dependency_review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
permissions:
1717
contents: read
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020

2121
- name: Dependency review
2222
uses: ConsenSys/github-actions/js-dependency-review@main

.github/workflows/nightly.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
permissions:
1818
contents: read
1919
steps:
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@v5
2121
- name: LinkCheck mdx files
2222
uses: ConsenSys/github-actions/docs-link-check@main
2323
with:
@@ -32,9 +32,9 @@
3232
permissions:
3333
contents: read
3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v5
3636
- name: LinkCheck md files
3737
uses: ConsenSys/github-actions/docs-link-check@main
3838
with:
3939
FILE_EXTENSION: md
40-
MODIFIED_FILES_ONLY: no
40+
MODIFIED_FILES_ONLY: no

.github/workflows/security-code-scanner.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
contents: read
1818
security-events: write
1919
steps:
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@v5
2121
- name: MetaMask Security Code Scanner
2222
uses: ConsenSys/github-actions/mm-security-scanner@main
2323
with:

.github/workflows/trivy-cache.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
name: Run trivy scanner
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v5
1818
- name: Trivy Cache
1919
uses: ConsenSys/github-actions/trivy-update-cache@main

.github/workflows/trivy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
name: Run trivy scanner
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
- name: Trivy
1616
uses: ConsenSys/github-actions/trivy@main
1717
with:
18-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
18+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@
2121
npm-debug.log*
2222
.vercel
2323
.envrc
24-
.env
24+
.env
25+
.integrationBuilderCache

.prettierrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"singleQuote": true,
88
"tabWidth": 2,
99
"trailingComma": "es5",
10-
"proseWrap": "never",
10+
"proseWrap": "preserve",
1111
"printWidth": 100,
1212
"htmlWhitespaceSensitivity": "css",
1313
"vueIndentScriptAndStyle": true

0 commit comments

Comments
 (0)