Skip to content

Commit 15a19d4

Browse files
dletoreydletorey
authored
Merge branch 'main' into 37519-contenteditable-early-beta-ff-release
2 parents a6ab295 + 35fbd84 commit 15a19d4

File tree

1,364 files changed

+36541
-7432
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,364 files changed

+36541
-7432
lines changed

‎.github/CODEOWNERS

+13-18
Original file line numberDiff line numberDiff line change
@@ -8,41 +8,36 @@
88
# Default content owners
99
/files/en-us/ @mdn/yari-content-mdn
1010

11+
# MDN Firefox release notes
12+
/files/en-us/mozilla/ @mdn/core-yari-content
13+
14+
# Mozilla Add-ons
15+
/files/en-us/mozilla/add-ons/ @mdn/yari-content-mozilla-add-ons
16+
1117
# Accessibility
1218
/files/en-us/web/accessibility/ @mdn/yari-content-accessibility
13-
/files/en-us/learn/accessibility/ @mdn/yari-content-accessibility
19+
20+
# Web API
21+
/files/en-us/web/api/ @mdn/yari-content-web-api
1422

1523
# CSS
1624
/files/en-us/web/css/ @mdn/yari-content-css
17-
/files/en-us/learn/css/ @mdn/yari-content-css
1825

1926
# HTML
2027
/files/en-us/web/html/ @mdn/yari-content-html
21-
/files/en-us/learn/html/ @mdn/yari-content-html
22-
23-
# JavaScript
24-
/files/en-us/web/javascript/ @mdn/yari-content-javascript
25-
/files/en-us/learn/javascript/ @mdn/yari-content-javascript
2628

2729
# HTTP
2830
/files/en-us/web/http/ @mdn/yari-content-http
29-
/files/en-us/learn/server-side/ @mdn/yari-content-http
3031

31-
# Web API
32-
/files/en-us/web/api/ @mdn/yari-content-web-api
33-
34-
# Mozilla Add-ons
35-
/files/en-us/mozilla/add-ons/ @mdn/yari-content-mozilla-add-ons
32+
# JavaScript
33+
/files/en-us/web/javascript/ @mdn/yari-content-javascript
3634

3735
# MathML
3836
/files/en-us/web/mathml/ @mdn/content-mathml
3937

40-
# MDN Firefox Release Notes
41-
/files/en-us/mozilla/firefox @mdn/core-yari-content
42-
43-
# New templates and sidebars
38+
# Templates and sidebars (rari)
4439
/files/jsondata/L10n-Template.json @mdn/core-dev
45-
/files/sidebars @mdn/core-dev
40+
/files/sidebars/ @mdn/core-dev
4641

4742
# ============================= CONTROL FILES ============================= #
4843
# The CODEOWNERS file must end with these matches: Any pull request changing

‎.github/issue-regex-labeler.yml

+23-21
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,29 @@ Content:HTTP:
1919
Content:JS:
2020
- '\/docs\/Web\/JavaScript'
2121
Content:Learn:
22-
- '\/docs\/Learn\/(Common|Front|Getting|Learning|Performance)'
23-
Content:Learn:Accessibility:
24-
- '\/docs\/Learn\/Accessibility'
25-
Content:Learn:Client-side:
26-
- '\/docs\/Learn\/Tools_and_testing\/(Client-side|Understanding_client-side)'
27-
Content:Learn:Cross-Browser-Testing:
28-
- '\/docs\/Learn\/Tools_and_testing\/Cross_browser_testing'
29-
Content:Learn:CSS:
30-
- '\/docs\/Learn\/CSS'
31-
Content:Learn:Django:
32-
- '\/docs\/Learn\/Server-side\/Django'
33-
Content:Learn:Express:
34-
- '\/docs\/Learn\/Server-side\/Express_Nodejs'
35-
Content:Learn:Forms:
36-
- '\/docs\/Learn\/Forms'
37-
Content:Learn:GitHub:
38-
- '\/docs\/Learn\/Tools_and_testing\/GitHub'
39-
Content:Learn:HTML:
40-
- '\/docs\/Learn\/HTML'
41-
Content:Learn:JavaScript:
42-
- '\/docs\/Learn\/JavaScript'
22+
- '\/docs\/Learn_web_development\/'
23+
# Mapping for old directories, see https://github.com/mdn/content/pull/36967
24+
#
25+
# Content:Learn:Accessibility:
26+
# - '\/docs\/Learn\/Accessibility'
27+
# Content:Learn:Client-side:
28+
# - '\/docs\/Learn\/Tools_and_testing\/(Client-side|Understanding_client-side)'
29+
# Content:Learn:Cross-Browser-Testing:
30+
# - '\/docs\/Learn\/Tools_and_testing\/Cross_browser_testing'
31+
# Content:Learn:CSS:
32+
# - '\/docs\/Learn\/CSS'
33+
# Content:Learn:Django:
34+
# - '\/docs\/Learn\/Server-side\/Django'
35+
# Content:Learn:Express:
36+
# - '\/docs\/Learn\/Server-side\/Express_Nodejs'
37+
# Content:Learn:Forms:
38+
# - '\/docs\/Learn\/Forms'
39+
# Content:Learn:GitHub:
40+
# - '\/docs\/Learn\/Tools_and_testing\/GitHub'
41+
# Content:Learn:HTML:
42+
# - '\/docs\/Learn\/HTML'
43+
# Content:Learn:JavaScript:
44+
# - '\/docs\/Learn\/JavaScript'
4345
Content:Manifest:
4446
- '\/docs\/Web\/Manifest'
4547
Content:MathML:

‎.github/labeler.yml

+44-54
Original file line numberDiff line numberDiff line change
@@ -57,62 +57,53 @@ Content:JS:
5757
Content:Learn:
5858
- changed-files:
5959
- all-globs-to-any-file:
60-
- files/en-us/learn/**
61-
- "!files/en-us/learn/accessibility/**"
62-
- "!files/en-us/learn/tools_and_testing/client-side_javascript_frameworks/**"
63-
- "!files/en-us/learn/tools_and_testing/understanding_client-side_tools/**"
64-
- "!files/en-us/learn/tools_and_testing/cross_browser_testing/**"
65-
- "!files/en-us/learn/css/**"
66-
- "!files/en-us/learn/server-side/django/**"
67-
- "!files/en-us/learn/server-side/express_nodejs/**"
68-
- "!files/en-us/learn/forms/**"
69-
- "!files/en-us/learn/tools_and_testing/github/**"
70-
- "!files/en-us/learn/html/**"
71-
- "!files/en-us/learn/javascript/**"
60+
- files/en-us/learn_web_development/**
7261
- changed-files:
7362
- any-glob-to-any-file:
7463
- files/en-us/web/tutorials/**
75-
Content:Learn:Accessibility:
76-
- changed-files:
77-
- any-glob-to-any-file:
78-
- files/en-us/learn/accessibility/**
79-
Content:Learn:Client-side:
80-
- changed-files:
81-
- any-glob-to-any-file:
82-
- files/en-us/learn/tools_and_testing/client-side_javascript_frameworks/**
83-
- files/en-us/learn/tools_and_testing/understanding_client-side_tools/**
84-
Content:Learn:Cross-Browser-Testing:
85-
- changed-files:
86-
- any-glob-to-any-file:
87-
- files/en-us/learn/tools_and_testing/cross_browser_testing/**
88-
Content:Learn:CSS:
89-
- changed-files:
90-
- any-glob-to-any-file:
91-
- files/en-us/learn/css/**
92-
Content:Learn:Django:
93-
- changed-files:
94-
- any-glob-to-any-file:
95-
- files/en-us/learn/server-side/django/**
96-
Content:Learn:Express:
97-
- changed-files:
98-
- any-glob-to-any-file:
99-
- files/en-us/learn/server-side/express_nodejs/**
100-
Content:Learn:Forms:
101-
- changed-files:
102-
- any-glob-to-any-file:
103-
- files/en-us/learn/forms/**
104-
Content:Learn:GitHub:
105-
- changed-files:
106-
- any-glob-to-any-file:
107-
- files/en-us/learn/tools_and_testing/github/**
108-
Content:Learn:HTML:
109-
- changed-files:
110-
- any-glob-to-any-file:
111-
- files/en-us/learn/html/**
112-
Content:Learn:JavaScript:
113-
- changed-files:
114-
- any-glob-to-any-file:
115-
- files/en-us/learn/javascript/**
64+
# Mapping for old directories, see https://github.com/mdn/content/pull/36967
65+
#
66+
# Content:Learn:Accessibility:
67+
# - changed-files:
68+
# - any-glob-to-any-file:
69+
# - files/en-us/learn/accessibility/**
70+
# Content:Learn:Client-side:
71+
# - changed-files:
72+
# - any-glob-to-any-file:
73+
# - files/en-us/learn/tools_and_testing/client-side_javascript_frameworks/**
74+
# - files/en-us/learn/tools_and_testing/understanding_client-side_tools/**
75+
# Content:Learn:Cross-Browser-Testing:
76+
# - changed-files:
77+
# - any-glob-to-any-file:
78+
# - files/en-us/learn/tools_and_testing/cross_browser_testing/**
79+
# Content:Learn:CSS:
80+
# - changed-files:
81+
# - any-glob-to-any-file:
82+
# - files/en-us/learn/css/**
83+
# Content:Learn:Django:
84+
# - changed-files:
85+
# - any-glob-to-any-file:
86+
# - files/en-us/learn/server-side/django/**
87+
# Content:Learn:Express:
88+
# - changed-files:
89+
# - any-glob-to-any-file:
90+
# - files/en-us/learn/server-side/express_nodejs/**
91+
# Content:Learn:Forms:
92+
# - changed-files:
93+
# - any-glob-to-any-file:
94+
# - files/en-us/learn/forms/**
95+
# Content:Learn:GitHub:
96+
# - changed-files:
97+
# - any-glob-to-any-file:
98+
# - files/en-us/learn/tools_and_testing/github/**
99+
# Content:Learn:HTML:
100+
# - changed-files:
101+
# - any-glob-to-any-file:
102+
# - files/en-us/learn/html/**
103+
# Content:Learn:JavaScript:
104+
# - changed-files:
105+
# - any-glob-to-any-file:
106+
# - files/en-us/learn/javascript/**
116107
Content:Manifest:
117108
- changed-files:
118109
- any-glob-to-any-file:
@@ -170,7 +161,6 @@ Content:Other:
170161
- changed-files:
171162
- any-glob-to-any-file:
172163
- files/en-us/related/**
173-
- files/en-us/web/demos/**
174164
- files/en-us/web/exslt/**
175165
- files/en-us/web/opensearch/**
176166
- files/en-us/web/privacy/**

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

+27-9
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ jobs:
3939
echo "DIFF_DOCUMENTS=${DIFF_DOCUMENTS}" >> $GITHUB_ENV
4040
4141
- name: Checkout HEAD
42-
if: ${{ env.DIFF_DOCUMENTS }}
42+
if: env.DIFF_DOCUMENTS
4343
uses: actions/checkout@v4
4444
with:
4545
ref: ${{ github.event.pull_request.head.sha }}
4646
path: pr_head
4747

4848
- name: Get changed content from HEAD
49-
if: ${{ env.DIFF_DOCUMENTS }}
49+
if: env.DIFF_DOCUMENTS
5050
run: |
5151
git config --global user.email "[email protected]"
5252
git config --global user.name "mdn-bot"
@@ -62,28 +62,36 @@ jobs:
6262
git commit -m "Code from PR head"
6363
6464
- name: Setup Node.js environment
65-
if: ${{ env.DIFF_DOCUMENTS }}
65+
if: env.DIFF_DOCUMENTS
6666
uses: actions/setup-node@v4
6767
with:
6868
node-version-file: ".nvmrc"
6969
cache: yarn
7070

7171
- name: Install all yarn packages
72-
if: ${{ env.DIFF_DOCUMENTS }}
72+
if: env.DIFF_DOCUMENTS
7373
run: yarn --frozen-lockfile
7474
env:
7575
# https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
7676
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7777

7878
- name: Lint and format markdown files
79-
if: ${{ env.DIFF_DOCUMENTS }}
79+
if: env.DIFF_DOCUMENTS
8080
run: |
8181
# Generate random delimiter
8282
# https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
8383
EOF="$(openssl rand -hex 8)"
8484
8585
files_to_lint="$DIFF_DOCUMENTS"
8686
87+
echo "crlf line ending check"
88+
CRLF_FAILED=true
89+
CRLF_LOG=$(git ls-files --eol ${files_to_lint} | grep -E 'w/(mixed|crlf)') || CRLF_FAILED=false
90+
echo "CRLF_LOG<<${EOF}" >> $GITHUB_ENV
91+
echo "${CRLF_LOG}" >> $GITHUB_ENV
92+
echo "${EOF}" >> $GITHUB_ENV
93+
echo "CRLF_FAILED=${CRLF_FAILED}" >> $GITHUB_ENV
94+
8795
echo "Running markdownlint --fix"
8896
MD_LINT_FAILED=false
8997
MD_LINT_LOG=$(yarn markdownlint-cli2 --fix ${files_to_lint} 2>&1) || MD_LINT_FAILED=true
@@ -114,19 +122,20 @@ jobs:
114122
fi
115123
116124
# info for troubleshooting
125+
echo CRLF_FAILED=${CRLF_FAILED}
117126
echo MD_LINT_FAILED=${MD_LINT_FAILED}
118127
echo FM_LINT_FAILED=${FM_LINT_FAILED}
119128
echo PRETTIER_FAILED=${PRETTIER_FAILED}
120129
git diff
121130
122131
- name: Setup reviewdog
123-
if: ${{ env.FILES_MODIFIED == 'true' || env.MD_LINT_FAILED == 'true' }}
132+
if: env.FILES_MODIFIED == 'true' || env.MD_LINT_FAILED == 'true'
124133
uses: reviewdog/action-setup@v1
125134
with:
126135
reviewdog_version: latest
127136

128137
- name: Suggest changes using diff
129-
if: ${{ env.FILES_MODIFIED == 'true' }}
138+
if: env.FILES_MODIFIED == 'true'
130139
env:
131140
REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
132141
run: |
@@ -141,7 +150,7 @@ jobs:
141150
-reporter=github-pr-review < "${TMPFILE}"
142151
143152
- name: Add reviews for markdownlint errors
144-
if: ${{ env.MD_LINT_FAILED == 'true' }}
153+
if: env.MD_LINT_FAILED == 'true'
145154
env:
146155
REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
147156
run: |
@@ -154,17 +163,26 @@ jobs:
154163
-reporter="github-pr-review"
155164
156165
- name: Fail if any issues pending
157-
if: ${{ env.FILES_MODIFIED == 'true' || env.MD_LINT_FAILED == 'true' || env.FM_LINT_FAILED == 'true' }}
166+
if: env.FILES_MODIFIED == 'true' || env.CRLF_FAILED == 'true' || env.MD_LINT_FAILED == 'true' || env.FM_LINT_FAILED == 'true'
158167
env:
168+
CRLF_FAILED: ${{ env.CRLF_FAILED }}
159169
MD_LINT_FAILED: ${{ env.MD_LINT_FAILED }}
160170
FM_LINT_FAILED: ${{ env.FM_LINT_FAILED }}
161171
PRETTIER_FAILED: ${{ env.PRETTIER_FAILED }}
172+
CRLF_LOG: ${{ env.CRLF_LOG }}
162173
MD_LINT_LOG: ${{ env.MD_LINT_LOG }}
163174
FM_LINT_LOG: ${{ env.FM_LINT_LOG }}
164175
PRETTIER_LOG: ${{ env.PRETTIER_LOG }}
165176
run: |
166177
echo -e "\nPlease fix all the linting issues mentioned in the following logs and in the PR review comments."
167178
179+
if [[ ${CRLF_FAILED} == 'true' ]]; then
180+
echo -e "\n\n🪵 In the following files make sure all the lines end with only Line Feed (LF) character and not with Carriage Return Line Feed (CRLF) characters:"
181+
echo "${CRLF_LOG}"
182+
echo "For more information refer https://gist.github.com/LunarLambda/3df0840b336a5e314e4ffdac03cbf619 ."
183+
echo "You may use https://app.execeratics.com/LFandCRLFonline/?l=en online tool to convert line endings from CRLF to LF."
184+
fi
185+
168186
if [[ ${MD_LINT_FAILED} == 'true' ]]; then
169187
echo -e "\n\n🪵 Logs from markdownlint:"
170188
echo "${MD_LINT_LOG}"

‎.github/workflows/pr-check_redirects.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ jobs:
4040

4141
- name: Check redirects file(s)
4242
if: steps.filter.outputs.required_files == 'true'
43-
run: yarn content validate-redirects en-us --strict
43+
run: yarn content validate-redirects en-US

‎.github/workflows/pr-check_scripts.yml

+4
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@ jobs:
111111

112112
- run: yarn content --help
113113

114+
- run: yarn content fix-redirects en-US
115+
116+
- run: yarn content validate-redirects en-US
117+
114118
build:
115119
runs-on: ubuntu-latest
116120

0 commit comments

Comments
 (0)