Skip to content

Commit 236e449

Browse files
QC-LQC-L
committed
Merge branch 'main' into pr/679
2 parents 34f7ba5 + 86b66cc commit 236e449

File tree

341 files changed

+11922
-12999
lines changed

Some content is hidden

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

341 files changed

+11922
-12999
lines changed

‎.github/workflows/analyze.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
node-version: "14.x"
2020

2121
- name: Install dependencies
22-
uses: bahmutov/npm-install@v1.6.0
22+
uses: bahmutov/npm-install@v1.7.10
2323
with:
2424
working-directory: 'beta'
2525

@@ -54,7 +54,7 @@ jobs:
5454
uses: dawidd6/action-download-artifact@v2
5555
if: success() && github.event.number
5656
with:
57-
workflow: bundle_analysis_upload.yml
57+
workflow: analyze.yml
5858
branch: ${{ github.event.pull_request.base.ref }}
5959
name: bundle_analysis.json
6060
path: beta/.next/analyze/base/bundle

‎.github/workflows/beta_site_lint.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
name: Beta Site Lint
1+
name: Beta Site Lint / Heading ID check
22

33
on:
4+
push:
5+
branches:
6+
- main # change this if your default branch is named differently
47
pull_request:
58
types: [opened, synchronize, reopened]
69

@@ -18,7 +21,7 @@ jobs:
1821
node-version: 12.x
1922

2023
- name: Install deps and build (with cache)
21-
uses: bahmutov/npm-install@v1.6.0
24+
uses: bahmutov/npm-install@v1.7.10
2225
with:
2326
working-directory: 'beta'
2427

‎.github/workflows/nodejs.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
name: Build
1+
name: Lint / Flow check
22

33
on:
4+
push:
5+
branches:
6+
- main # change this if your default branch is named differently
47
pull_request:
58
types: [opened, synchronize, reopened]
69

@@ -18,7 +21,7 @@ jobs:
1821
node-version: 12.x
1922

2023
- name: Install deps and build (with cache)
21-
uses: bahmutov/npm-install@v1.6.0
24+
uses: bahmutov/npm-install@v1.7.10
2225

2326
- name: Lint codebase
2427
run: yarn ci-check

‎.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.16.1
1+
12.22.0

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ The documentation is divided into several sections with a different tone and pur
141141
1. `git push my-fork-name the-name-of-my-branch`
142142
1. Go to the [reactjs.org repo](https://github.com/reactjs/reactjs.org) and you should see recently pushed branches.
143143
1. Follow GitHub's instructions.
144-
1. If possible, include screenshots of visual changes. A [Netlify](https://www.netlify.com/) build will also be automatically created once you make your PR so other people can see your change.
144+
1. If possible, include screenshots of visual changes. A preview build is triggered after your changes are pushed to GitHub.
145145

146146
## Translation
147147

‎beta/.env.development

-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
NEXT_PUBLIC_HJ_SITE_ID = 2411683
2-
NEXT_PUBLIC_HJ_SITE_V = 6

‎beta/.env.production

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
NEXT_PUBLIC_HJ_SITE_ID = 2411651
2-
NEXT_PUBLIC_HJ_SITE_V = 6
1+
NEXT_PUBLIC_GA_TRACKING_ID = 'UA-41298772-4'

‎beta/.eslintrc

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{
22
"root": true,
3-
"extends": "next",
3+
"extends": "next/core-web-vitals",
4+
"rules": {
5+
"no-unused-vars": "warn"
6+
},
47
"env": {
58
"node": true,
69
"commonjs": true,
710
"browser": true,
811
"es6": true
912
}
10-
}
13+
}

‎beta/.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
# misc
1919
.DS_Store
2020
*.pem
21+
tsconfig.tsbuildinfo
2122

2223
# debug
2324
npm-debug.log*
@@ -32,3 +33,8 @@ yarn-error.log*
3233

3334
# vercel
3435
.vercel
36+
37+
# external fonts
38+
public/fonts/Optimistic_Display_W_Lt.woff2
39+
public/fonts/Optimistic_Display_W_Md.woff2
40+
public/fonts/Optimistic_Display_W_Bd.woff2

‎beta/.husky/pre-commit

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,4 @@
22
. "$(dirname "$0")/_/husky.sh"
33

44
cd beta
5-
yarn generate-ids
6-
git add -u src/pages/**/*.md
7-
yarn prettier
8-
yarn lint:fix
5+
yarn lint-staged

‎beta/.prettierrc

+15-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,19 @@
33
"singleQuote": true,
44
"bracketSameLine": true,
55
"trailingComma": "es5",
6-
"printWidth": 80
6+
"printWidth": 80,
7+
"overrides": [
8+
{
9+
"files": "*.css",
10+
"options": {
11+
"parser": "css"
12+
}
13+
},
14+
{
15+
"files": "*.md",
16+
"options": {
17+
"parser": "mdx"
18+
}
19+
}
20+
]
721
}

‎beta/CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The documentation is divided into sections to cater to different learning styles
2020

2121
**[Learn React](https://beta.reactjs.org/learn)** is designed to introduce fundamental concepts in a step-by-step way. Each individual article in Learn React builds on the knowledge from the previous ones, so make sure not to add any "cyclical dependencies" between them. It is important that the reader can start with the first article and work their way to the last Learn React article without ever having to "look ahead" for a definition. This explains some ordering choices (e.g. that state is explained before events, or that "thinking in React" doesn't use refs). Learn React also serves as a reference manual for React concepts, so it is important to be very strict about their definitions and relationships between them.
2222

23-
**[API Reference](https://reactjs.org/reference)** is organized by APIs rather than concepts. It is intended to be exhaustive. Any corner cases or recommendations that were skipped for brevity in Learn React should be mentioned in the reference documentation for the corresponding APIs.
23+
**[API Reference](https://reactjs.org/apis)** is organized by APIs rather than concepts. It is intended to be exhaustive. Any corner cases or recommendations that were skipped for brevity in Learn React should be mentioned in the reference documentation for the corresponding APIs.
2424

2525
**Try to follow your own instructions.**
2626

‎beta/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ The documentation is divided into several sections with a different tone and pur
5656
1. `git push my-fork-name the-name-of-my-branch`
5757
1. Go to the [reactjs.org repo](https://github.com/reactjs/reactjs.org) and you should see recently pushed branches.
5858
1. Follow GitHub's instructions.
59-
1. If possible, include screenshots of visual changes. A [Netlify](https://www.netlify.com/) build will also be automatically created once you make your PR so other people can see your change.
59+
1. If possible, include screenshots of visual changes. A preview build is triggered after your changes are pushed to GitHub.
6060

6161
## Translation
6262

‎beta/illustrations/import-export.ai

-4,950
This file was deleted.

0 commit comments

Comments
 (0)