Skip to content

Commit d92b360

Browse files
authored
Merge pull request #261 from reactjs/sync-84ad3308
Sync with reactjs.org @ 84ad330
2 parents 9bbd3a0 + c86e4a3 commit d92b360

File tree

279 files changed

+13597
-6208
lines changed

Some content is hidden

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

279 files changed

+13597
-6208
lines changed

.circleci/config.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/analyze.yml

Lines changed: 1 addition & 1 deletion
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

.github/workflows/beta_site_lint.yml

Lines changed: 5 additions & 2 deletions
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

Lines changed: 5 additions & 2 deletions
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

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ The documentation is divided into several sections with a different tone and pur
5353
1. `git push my-fork-name the-name-of-my-branch`
5454
1. Go to the [reactjs.org repo](https://github.com/reactjs/reactjs.org) and you should see recently pushed branches.
5555
1. Follow GitHub's instructions.
56-
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.
56+
1. If possible, include screenshots of visual changes. A preview build is triggered after your changes are pushed to GitHub.
5757

5858
## Translation
5959

beta/.env.development

Lines changed: 0 additions & 2 deletions
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

Lines changed: 1 addition & 2 deletions
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

Lines changed: 5 additions & 2 deletions
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

Lines changed: 1 addition & 0 deletions
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*

beta/.husky/pre-commit

Lines changed: 1 addition & 4 deletions
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

0 commit comments

Comments
 (0)