Skip to content

Commit 15e5fb0

Browse files
estelleestelle
authored
Merge branch 'main' into estelle-patch-2
2 parents ea35a8a + 1dbba9f commit 15e5fb0

File tree

557 files changed

+16202
-8530
lines changed

Some content is hidden

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

557 files changed

+16202
-8530
lines changed

‎.github/CODEOWNERS‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,10 @@
5959
/SECURITY.md @mdn/engineering
6060
# Scripts and Tests
6161
/scripts @mdn/engineering
62+
/scripts/content @mdn/content-team
6263
/tests @mdn/engineering
6364

64-
# These are @mdn-bot because the auto-merge GHA workflow uses the PAT of this account.
65-
# If another reviewer is specified, update the PAT token or auto-merge will cease to be automatic.
66-
/package.json @mdn/engineering @mdn-bot
67-
/yarn.lock @mdn/engineering @mdn-bot
65+
# Dependencies
66+
/package.json @mdn/engineering @mdn-bot
67+
/package-lock.json @mdn/engineering @mdn-bot
68+
/yarn.lock @mdn/engineering @mdn-bot

‎.github/labeler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ system:
44
- changed-files:
55
- any-glob-to-any-file:
66
- package.json
7-
- yarn.lock
7+
- package-lock.json
88
- .github/**
99
- .vscode/**
1010
- .*

‎.github/workflows/auto-cleanup-bot.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,17 @@ jobs:
2525
node-version-file: ".nvmrc"
2626
package-manager-cache: false
2727

28-
- name: Install all yarn packages
29-
run: yarn --frozen-lockfile
28+
- name: Install
29+
run: npm ci
3030
env:
31-
# https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
3231
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3332
LEFTHOOK: 0
3433

3534
- name: Lint markdown files
3635
run: |
37-
yarn content fix-flaws
38-
yarn fix:md
39-
yarn fix:fm
36+
npm run content fix-flaws
37+
npm run fix:md
38+
npm run fix:fm
4039
node scripts/sort_and_unique_file_lines.js .vscode/dictionaries
4140
env:
4241
# Used by the `rari` cli to avoid rate limiting issues

‎.github/workflows/markdown-lint.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- .nvmrc
88
- .prettier*
99
- package.json
10-
- yarn.lock
10+
- package-lock.json
1111
- .github/workflows/markdown-lint.yml
1212
- .github/workflows/markdownlint-problem-matcher.json
1313

@@ -27,16 +27,15 @@ jobs:
2727
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
2828
with:
2929
node-version-file: ".nvmrc"
30-
cache: yarn
30+
cache: npm
3131

32-
- name: Install all yarn packages
33-
run: yarn --frozen-lockfile
32+
- name: Install
33+
run: npm ci
3434
env:
35-
# https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
3635
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3736

3837
- name: Lint markdown files
3938
run: |
4039
echo "::add-matcher::.github/workflows/markdownlint-problem-matcher.json"
41-
yarn lint:md
42-
yarn lint:fm
40+
npm run lint:md
41+
npm run lint:fm

‎.github/workflows/pr-check-lint_content.yml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
# Get files as newline-separated list
3939
FILTERED_FILES=$(gh api repos/{owner}/{repo}/compare/${BASE_SHA}...${HEAD_SHA} \
4040
--jq '.files | .[] | select(.status|IN("added", "modified", "renamed", "copied", "changed")) | .filename' | \
41-
egrep -i "^files/.*\.md$")
41+
egrep -i "^files/.*\.md$" || true)
4242
4343
# Store as multiline output
4444
EOF="$(openssl rand -hex 8)"
@@ -82,13 +82,12 @@ jobs:
8282
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
8383
with:
8484
node-version-file: ".nvmrc"
85-
cache: yarn
85+
cache: npm
8686

87-
- name: Install all yarn packages
87+
- name: Install
8888
if: steps.check.outputs.HAS_FILES == 'true'
89-
run: yarn --frozen-lockfile
89+
run: npm ci
9090
env:
91-
# https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
9291
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9392

9493
- name: Lint and format markdown files
@@ -119,7 +118,7 @@ jobs:
119118
120119
echo "Running markdownlint --fix"
121120
MD_LINT_FAILED=false
122-
MD_LINT_LOG=$(yarn markdownlint-cli2 --fix "${files_to_lint[@]}" 2>&1) || MD_LINT_FAILED=true
121+
MD_LINT_LOG=$(npx markdownlint-cli2 --fix "${files_to_lint[@]}" 2>&1) || MD_LINT_FAILED=true
123122
echo "MD_LINT_LOG<<${EOF}" >> "$GITHUB_OUTPUT"
124123
echo "${MD_LINT_LOG}" >> "$GITHUB_OUTPUT"
125124
echo "${EOF}" >> "$GITHUB_OUTPUT"
@@ -135,12 +134,12 @@ jobs:
135134
136135
echo "Running Prettier"
137136
PRETTIER_FAILED=false
138-
PRETTIER_LOG=$(yarn prettier --check "${files_to_lint[@]}" 2>&1) || PRETTIER_FAILED=true
137+
PRETTIER_LOG=$(npx prettier --check "${files_to_lint[@]}" 2>&1) || PRETTIER_FAILED=true
139138
echo "PRETTIER_LOG<<${EOF}" >> "$GITHUB_OUTPUT"
140139
echo "${PRETTIER_LOG}" >> "$GITHUB_OUTPUT"
141140
echo "${EOF}" >> "$GITHUB_OUTPUT"
142141
echo "PRETTIER_FAILED=${PRETTIER_FAILED}" >> "$GITHUB_OUTPUT"
143-
yarn prettier -w "${files_to_lint[@]}"
142+
npx prettier -w "${files_to_lint[@]}"
144143
145144
if [[ -n $(git diff) ]]; then
146145
echo "FILES_MODIFIED=true" >> "$GITHUB_OUTPUT"

‎.github/workflows/pr-check_javascript.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,12 @@ jobs:
2424
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
2525
with:
2626
node-version-file: ".nvmrc"
27-
cache: yarn
27+
cache: npm
2828

29-
- name: Install all yarn packages
30-
run: yarn --frozen-lockfile
29+
- name: Install
30+
run: npm ci
3131
env:
32-
# https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
3332
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3433

3534
- name: Lint JavaScript files
36-
run: yarn lint:js
35+
run: npm run lint:js

‎.github/workflows/pr-check_json.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,12 @@ jobs:
2424
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
2525
with:
2626
node-version-file: ".nvmrc"
27-
cache: yarn
27+
cache: npm
2828

29-
- name: Install all yarn packages
30-
run: yarn --frozen-lockfile
29+
- name: Install
30+
run: npm ci
3131
env:
32-
# https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
3332
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3433

3534
- name: Lint JSON files
36-
run: yarn lint:json
35+
run: npm run lint:json

‎.github/workflows/pr-check_redirects.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
2020
with:
2121
node-version-file: ".nvmrc"
22-
cache: yarn
22+
cache: npm
2323

2424
# This is a "required" workflow so path filtering can not be used:
2525
# https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks#handling-skipped-but-required-checks
@@ -34,16 +34,15 @@ jobs:
3434
- "files/**"
3535
- ".github/workflows/pr-check_redirects.yml"
3636
37-
- name: Install all yarn packages
37+
- name: Install
3838
if: steps.filter.outputs.required_files == 'true'
39-
run: yarn --frozen-lockfile
39+
run: npm ci
4040
env:
41-
# https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
4241
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4342

4443
- name: Check redirects file(s)
4544
if: steps.filter.outputs.required_files == 'true'
46-
run: yarn content validate-redirects en-US
45+
run: npm run content validate-redirects en-US
4746
env:
4847
# Used by the `rari` cli to avoid rate limiting issues
4948
# when fetching the latest releases info from the GitHub API.

‎.github/workflows/pr-check_scripts.yml‎

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
paths:
66
- .nvmrc
77
- package.json
8-
- yarn.lock
8+
- package-lock.json
99
- .github/workflows/pr-check_scripts.yml
1010

1111
# No GITHUB_TOKEN permissions, as we only use it to increase API limit.
@@ -24,15 +24,14 @@ jobs:
2424
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
2525
with:
2626
node-version-file: ".nvmrc"
27-
cache: yarn
27+
cache: npm
2828

29-
- name: yarn install
30-
run: yarn --frozen-lockfile
29+
- name: npm ci
30+
run: npm ci
3131
env:
32-
# https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
3332
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3433

35-
- run: yarn up-to-date-check
34+
- run: npm run up-to-date-check
3635

3736
start:
3837
runs-on: ubuntu-latest
@@ -46,16 +45,17 @@ jobs:
4645
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
4746
with:
4847
node-version-file: ".nvmrc"
49-
cache: yarn
48+
cache: npm
5049

51-
- name: yarn install
52-
run: yarn --frozen-lockfile
50+
- name: npm ci
51+
run: npm ci
5352
env:
54-
# https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
5553
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5654

57-
- name: yarn start
58-
run: yarn start > /tmp/stdout.log 2> /tmp/stderr.log &
55+
- name: npm start
56+
run: npm start > /tmp/stdout.log 2> /tmp/stderr.log &
57+
env:
58+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5959

6060
- name: Wait for Rari (localhost:8083)
6161
run: curl --retry-connrefused --retry 5 -I http://localhost:8083/en-US/
@@ -88,15 +88,14 @@ jobs:
8888
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
8989
with:
9090
node-version-file: ".nvmrc"
91-
cache: yarn
91+
cache: npm
9292

93-
- name: yarn install
94-
run: yarn --frozen-lockfile
93+
- name: npm ci
94+
run: npm ci
9595
env:
96-
# https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
9796
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9897

99-
- run: yarn filecheck --help
98+
- run: npm run filecheck -- --help
10099

101100
content:
102101
runs-on: ubuntu-latest
@@ -110,19 +109,18 @@ jobs:
110109
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
111110
with:
112111
node-version-file: ".nvmrc"
113-
cache: yarn
112+
cache: npm
114113

115-
- name: Install all yarn packages
116-
run: yarn --frozen-lockfile
114+
- name: Install
115+
run: npm ci
117116
env:
118-
# https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
119117
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
120118

121-
- run: yarn content --help
119+
- run: npm run content -- --help
122120

123-
- run: yarn content fix-redirects en-US
121+
- run: npm run content fix-redirects en-US
124122

125-
- run: yarn content validate-redirects en-US
123+
- run: npm run content validate-redirects en-US
126124

127125
build:
128126
runs-on: ubuntu-latest
@@ -136,12 +134,11 @@ jobs:
136134
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
137135
with:
138136
node-version-file: ".nvmrc"
139-
cache: yarn
137+
cache: npm
140138

141-
- name: yarn install
142-
run: yarn --frozen-lockfile
139+
- name: npm ci
140+
run: npm ci
143141
env:
144-
# https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
145142
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
146143

147-
- run: yarn build --help
144+
- run: npm run build -- --help

‎.github/workflows/pr-check_url-issues.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
2424
with:
2525
node-version-file: ".nvmrc"
26-
cache: yarn
26+
cache: npm
2727

2828
- name: Check URL deletions and broken fragments
2929
run: |

0 commit comments

Comments
 (0)