Skip to content

Commit

Permalink
Merge branch 'main' into svglineelement
Browse files Browse the repository at this point in the history
  • Loading branch information
estelle authored Jan 6, 2025
2 parents d67e0d3 + cb6a3d6 commit bbf607f
Show file tree
Hide file tree
Showing 2,270 changed files with 117,601 additions and 114,722 deletions.
45 changes: 36 additions & 9 deletions .github/workflows/pr-check-lint_content.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ jobs:
echo "FM_LINT_FAILED=${FM_LINT_FAILED}" >> $GITHUB_ENV
echo "Running Prettier"
PRETTIER_FAILED=false
PRETTIER_LOG=$(yarn prettier --check ${files_to_lint} 2>&1) || PRETTIER_FAILED=true
echo "PRETTIER_LOG<<${EOF}" >> $GITHUB_ENV
echo "${PRETTIER_LOG}" >> $GITHUB_ENV
echo "${EOF}" >> $GITHUB_ENV
echo "PRETTIER_FAILED=${PRETTIER_FAILED}" >> $GITHUB_ENV
yarn prettier -w ${files_to_lint}
if [[ -n $(git diff) ]]; then
Expand All @@ -110,16 +116,17 @@ jobs:
# info for troubleshooting
echo MD_LINT_FAILED=${MD_LINT_FAILED}
echo FM_LINT_FAILED=${FM_LINT_FAILED}
echo PRETTIER_FAILED=${PRETTIER_FAILED}
git diff
- name: Setup reviewdog
if: env.FILES_MODIFIED == 'true' || env.MD_LINT_FAILED == 'true'
if: ${{ env.FILES_MODIFIED == 'true' || env.MD_LINT_FAILED == 'true' }}
uses: reviewdog/action-setup@v1
with:
reviewdog_version: latest

- name: Suggest changes using diff
if: env.FILES_MODIFIED == 'true'
if: ${{ env.FILES_MODIFIED == 'true' }}
env:
REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
Expand All @@ -134,7 +141,7 @@ jobs:
-reporter=github-pr-review < "${TMPFILE}"
- name: Add reviews for markdownlint errors
if: env.MD_LINT_FAILED == 'true'
if: ${{ env.MD_LINT_FAILED == 'true' }}
env:
REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
Expand All @@ -147,11 +154,31 @@ jobs:
-reporter="github-pr-review"
- name: Fail if any issues pending
if: env.FILES_MODIFIED == 'true' || env.MD_LINT_FAILED == 'true' || env.FM_LINT_FAILED == 'true'
if: ${{ env.FILES_MODIFIED == 'true' || env.MD_LINT_FAILED == 'true' || env.FM_LINT_FAILED == 'true' }}
env:
MD_LINT_FAILED: ${{ env.MD_LINT_FAILED }}
FM_LINT_FAILED: ${{ env.FM_LINT_FAILED }}
PRETTIER_FAILED: ${{ env.PRETTIER_FAILED }}
MD_LINT_LOG: ${{ env.MD_LINT_LOG }}
FM_LINT_LOG: ${{ env.FM_LINT_LOG }}
PRETTIER_LOG: ${{ env.PRETTIER_LOG }}
run: |
echo -e "\nLogs from markdownlint:"
echo "${MD_LINT_LOG}"
echo -e "\nLogs from front-matter linter:"
echo "${FM_LINT_LOG}"
echo -e "\nPlease fix all the linting issues mentioned in above logs and in the review comments."
echo -e "\nPlease fix all the linting issues mentioned in the following logs and in the PR review comments."
if [[ ${MD_LINT_FAILED} == 'true' ]]; then
echo -e "\n\n🪵 Logs from markdownlint:"
echo "${MD_LINT_LOG}"
fi
if [[ ${FM_LINT_FAILED} == 'true' ]]; then
echo -e "\n\n🪵 Logs from front-matter linter:"
echo "${FM_LINT_LOG}"
fi
if [[ ${PRETTIER_FAILED} == 'true' ]]; then
echo -e "\n\n🪵 Logs from Prettier formatter:"
echo "${PRETTIER_LOG}"
echo -e "\nYou can use Prettier playground to format the files online (configuration pre-filled): https://prettier.io/playground/#N4Igxg9gdgLgprEAuEBiABABwIYGd7owAWc6CMAlgE6kBmFANqSTSADQgSaXS7KjYqVCAHcACoIR8U2BiOwBPPhwBGVbGADWcGAGVsAWzgAZClDjIYVAK5xV6rTt04wZgOaWbdkLjgGKnrYccAAemHBUFEawsgAqEVCCFHDStLK+HLjuTACK1hDwyGkMGSAAVrghutlweQUWSMWlAI758GLCmNIgeAC05nAAJkPsIFbYjO4AwhAGBtjIPQwMo1lQbkwAgjBWFCrW7RGm5kXp3kQwBgwA6kQU8LgucLpS9xQAbvcKi2C4yiDvWwASSgw1gujAkW4m1BuhgCiYpxK3kwwl813UmEWqJSEXeFg4Zl8VBgHWwbnmSNKOCoxMW8yomkGoigo1RZhg1wog2IyAAHAAGDg0VrUOBkikLRpnDgwbAqLk8ojIABMHGsvli8tSMpAfhUQ2Gg2M2HW1nJcAAYhAqPMdu5FtgDhAQABfV1AA \n"
fi
exit 1
5 changes: 5 additions & 0 deletions .vscode/dictionaries/ignore-list.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ aaba
aabaac
aabbcc
aabbccdd
AACA
aacbbbcac
abaac
abbbbbc
Expand Down Expand Up @@ -110,6 +111,7 @@ DSWbdfnrstvw
dubby
Duden
dXNlcm5hbWU6cGFzc3dvcmQ
EACC
eirmod
elitr
ERHGDFy
Expand Down Expand Up @@ -144,6 +146,7 @@ futurelibrary.no
gaesamplesite
gims
globalprivacycontrol.org
glossarysidebar.yaml
GNF576746573fhdg4737dh4
gogerychwyrndrobwllllantysiliogogogoch
Graece
Expand Down Expand Up @@ -182,6 +185,7 @@ kitchensink
lambdatest
Latine
latinmodern-math
learntocodewith.me
leopardskin
letmein
libpkcs11testmodule
Expand All @@ -198,6 +202,7 @@ magis
Mand
manis
Markmarkimark
mdnsidebar.yaml
megastore
meinheld
montecarlo
Expand Down
1 change: 1 addition & 0 deletions .vscode/dictionaries/non-english.txt
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ setembro
shān
studiorum
tiene
Tipos
traducido
trimestre
tslí
Expand Down
10 changes: 10 additions & 0 deletions .vscode/dictionaries/proper-names.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ a11ysupport
Academind
Acrosync
Addy
Adham
Adilah
Akhgari
alastairc
Expand All @@ -14,6 +15,7 @@ Amorim
AMPPS
Amstelvar
Anand
ANDI
Andreessen
Andrzej
Anek
Expand Down Expand Up @@ -56,6 +58,7 @@ Bloggs
Bocoup
Boonie
bottosson
Boulton
Brians
Browserleaks
Browsershots
Expand All @@ -65,6 +68,7 @@ BugZilla
Bundlesize
Bunyakovsky
Burson
Butterick
Buzzcocks
Bynens
Bézier
Expand All @@ -81,6 +85,7 @@ Caterina
Chadha
Chakra
Chamakh
Chimero
Chloé
chrisdavidmills
chrismills
Expand All @@ -101,6 +106,7 @@ Colomb
ColorZilla
Conde
Condei
COPPA
Corber
Cortana
Coursera
Expand All @@ -116,6 +122,7 @@ Célestes
Dahlkemper
Dailymotion
Danilo
Dannaway
Darmok
Datumizer
davbrito
Expand Down Expand Up @@ -172,6 +179,7 @@ Esben
ethertank
Exljbris
Fairchild
FDCP
ffconf
FileZilla
Firefogg
Expand Down Expand Up @@ -220,6 +228,7 @@ Hidde
Highrise
Hildy
hmatrjp
Hobday
Hobson
hochan
Hochberg
Expand Down Expand Up @@ -471,6 +480,7 @@ Rekapi
Remy
Resig
Rhiana
Riazhskikh
Rigby
Rocher
Rohini
Expand Down
5 changes: 4 additions & 1 deletion .vscode/dictionaries/terms-abbreviations.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ ANMF
anonymization
antialiasing
antitracking
apideck
APNG
appcontent
arcosh
Expand Down Expand Up @@ -94,7 +95,6 @@ catchable
CAVLC
CCPA
CCPL
CDLR
CELP
CGATS
cheatsheet
Expand Down Expand Up @@ -529,6 +529,7 @@ quickmenu
qvalues
QWERTZ
randomizer
rari
rasterizes
RDBMS
RDBMSes
Expand Down Expand Up @@ -562,6 +563,7 @@ retarget
retargeted
retargeting
retargetings
reviewdog
RFCOMM
RGTC
roadmaps
Expand Down Expand Up @@ -879,6 +881,7 @@ xrayed
Xrays
XRCPU
XSSI
yari
yearless
Zalgo
zoomable
Expand Down
10 changes: 3 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,12 +200,7 @@ This will make it easier to submit a pull request for your changes.
2. Open a browser and navigate to the equivalent pages you've changed.
If you changed `files/en-us/web/javascript/index.md`, you would navigate to `http://localhost:5042/en-us/docs/web/javascript` in your browser, for example.

3. Check for errors by clicking `Show flaws` on each previewed page.
You may be able to fix flaws by running:

```bash
yarn content flaws <page_slug>
```
3. Check for detected flaws at the top of the previewed page. Some flaws may be automatically fixable.

4. Commit your changes to the branch (our example is using the `fix-typo` branch) and push the changes to your fork's remote:

Expand Down Expand Up @@ -254,7 +249,8 @@ yarn content move <from-slug> <to-slug> [locale]
> See the [Redirecting a document](#redirecting-a-document) section for more information.
To use `yarn content move`, provide the slug of the document you'd like to move (e.g., `Learn/Accessibility`), and the slug of its new location (e.g., `Learn/A11y`).
The locale of the existing document can be provided as an optional third argument (this defaults to `en-US`).
The locale of the existing document can be provided as an optional third argument (this defaults to `en-US`). For other locales,
`CONTENT_TRANSLATED_ROOT` has to be set correctly in your environment.
If the document you'd like to move contains child documents (i.e. it represents a document tree), the `yarn content move` command will move the entire tree.

Let's say you want to move the entire `/en-US/Learn/Accessibility` tree to `/en-US/Learn/A11y`, you can do so as follows:
Expand Down
Loading

0 comments on commit bbf607f

Please sign in to comment.