Skip to content

Commit 81d43f3

Browse files
gaearongaearon
authored
Merge pull request reactjs#838 from reactjs/merge-react-dev
Merge latest react.dev changes
2 parents e740176 + d5a060c commit 81d43f3

File tree

1,646 files changed

+69390
-106201
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,646 files changed

+69390
-106201
lines changed

Diff for: ‎.babelrc

-41
This file was deleted.

Diff for: ‎.env.development

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SANDPACK_BARE_COMPONENTS=true

Diff for: ‎.env.production

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
NEXT_PUBLIC_GA_TRACKING_ID = 'UA-41298772-4'
2+
SANDPACK_BARE_COMPONENTS=true

Diff for: ‎.eslintignore

+3-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
node_modules/*
2-
3-
# Skip beta
4-
beta/*
5-
6-
# Ignore markdown files and examples
7-
content/*
8-
9-
# Ignore built files
10-
public/*
11-
12-
# Ignore examples
13-
examples/*
1+
scripts
2+
plugins
3+
next.config.js

Diff for: ‎.eslintrc

+9-11
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
{
2-
"extends": [
3-
"fbjs"
4-
],
5-
"plugins": [
6-
"prettier",
7-
"react"
8-
],
9-
"parser": "babel-eslint",
2+
"root": true,
3+
"extends": "next/core-web-vitals",
4+
"parser": "@typescript-eslint/parser",
5+
"plugins": ["@typescript-eslint"],
106
"rules": {
11-
"relay/graphql-naming": 0,
12-
"max-len": 0
7+
"no-unused-vars": "off",
8+
"@typescript-eslint/no-unused-vars": "warn"
139
},
1410
"env": {
1511
"node": true,
16-
"browser": true
12+
"commonjs": true,
13+
"browser": true,
14+
"es6": true
1715
}
1816
}

Diff for: ‎.flowconfig

-36
This file was deleted.

Diff for: ‎.github/labeler.yml

-2
This file was deleted.

Diff for: ‎.github/workflows/analyze.yml

+4-9
Original file line numberDiff line numberDiff line change
@@ -20,34 +20,30 @@ jobs:
2020

2121
- name: Install dependencies
2222
uses: bahmutov/[email protected]
23-
with:
24-
working-directory: 'beta'
2523

2624
- name: Restore next build
2725
uses: actions/cache@v2
2826
id: restore-build-cache
2927
env:
3028
cache-name: cache-next-build
3129
with:
32-
path: beta/.next/cache
30+
path: .next/cache
3331
# change this if you prefer a more strict cache
3432
key: ${{ runner.os }}-build-${{ env.cache-name }}
3533

3634
- name: Build next.js app
3735
# change this if your site requires a custom build command
3836
run: ./node_modules/.bin/next build
39-
working-directory: beta
4037

4138
# Here's the first place where next-bundle-analysis' own script is used
4239
# This step pulls the raw bundle stats for the current bundle
4340
- name: Analyze bundle
4441
run: npx -p nextjs-bundle-analysis report
45-
working-directory: beta
4642

4743
- name: Upload bundle
4844
uses: actions/upload-artifact@v2
4945
with:
50-
path: beta/.next/analyze/__bundle_analysis.json
46+
path: .next/analyze/__bundle_analysis.json
5147
name: bundle_analysis.json
5248

5349
- name: Download base branch bundle stats
@@ -57,7 +53,7 @@ jobs:
5753
workflow: analyze.yml
5854
branch: ${{ github.event.pull_request.base.ref }}
5955
name: bundle_analysis.json
60-
path: beta/.next/analyze/base/bundle
56+
path: .next/analyze/base/bundle
6157

6258
# And here's the second place - this runs after we have both the current and
6359
# base branch bundle stats, and will compare them to determine what changed.
@@ -75,13 +71,12 @@ jobs:
7571
- name: Compare with base branch bundle
7672
if: success() && github.event.number
7773
run: ls -laR .next/analyze/base && npx -p nextjs-bundle-analysis compare
78-
working-directory: beta
7974

8075
- name: Upload analysis comment
8176
uses: actions/upload-artifact@v2
8277
with:
8378
name: analysis_comment.txt
84-
path: beta/.next/analyze/__bundle_analysis_comment.txt
79+
path: .next/analyze/__bundle_analysis_comment.txt
8580

8681
- name: Save PR number
8782
run: echo ${{ github.event.number }} > ./pr_number

Diff for: ‎.github/workflows/analyze_comment.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,19 @@ jobs:
3333
id: get-comment-body
3434
if: success()
3535
run: |
36+
echo 'body<<EOF' >> $GITHUB_OUTPUT
37+
echo '' >> $GITHUB_OUTPUT
38+
echo '## Size changes' >> $GITHUB_OUTPUT
39+
echo '' >> $GITHUB_OUTPUT
40+
echo '<details>' >> $GITHUB_OUTPUT
41+
echo '' >> $GITHUB_OUTPUT
42+
cat analysis_comment.txt/__bundle_analysis_comment.txt >> $GITHUB_OUTPUT
43+
echo '' >> $GITHUB_OUTPUT
44+
echo '</details>' >> $GITHUB_OUTPUT
45+
echo '' >> $GITHUB_OUTPUT
46+
echo 'EOF' >> $GITHUB_OUTPUT
3647
pr_number=$(cat pr_number/pr_number)
37-
body=$(cat analysis_comment.txt/__bundle_analysis_comment.txt)
38-
body="## Size Changes
39-
<details>
40-
41-
${body}
42-
43-
</details>"
44-
body="${body//'%'/'%25'}"
45-
body="${body//$'\n'/'%0A'}"
46-
body="${body//$'\r'/'%0D'}"
47-
echo ::set-output name=body::$body
48-
echo ::set-output name=pr-number::$pr_number
48+
echo "pr-number=$pr_number" >> $GITHUB_OUTPUT
4949
5050
- name: Find Comment
5151
uses: peter-evans/find-comment@v1
@@ -69,4 +69,4 @@ jobs:
6969
issue-number: ${{ steps.get-comment-body.outputs.pr-number }}
7070
body: ${{ steps.get-comment-body.outputs.body }}
7171
comment-id: ${{ steps.fc.outputs.comment-id }}
72-
edit-mode: replace
72+
edit-mode: replace

Diff for: ‎.github/workflows/beta_site_lint.yml

-30
This file was deleted.

Diff for: ‎.github/workflows/label.yml

-22
This file was deleted.

Diff for: ‎.github/workflows/nodejs.yml

-27
This file was deleted.

Diff for: ‎.github/workflows/site_lint.yml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Site Lint / Heading ID check
2+
3+
on:
4+
push:
5+
branches:
6+
- main # change this if your default branch is named differently
7+
pull_request:
8+
types: [opened, synchronize, reopened]
9+
10+
jobs:
11+
lint:
12+
runs-on: ubuntu-latest
13+
14+
name: Lint on node 12.x and ubuntu-latest
15+
16+
steps:
17+
- uses: actions/checkout@v1
18+
- name: Use Node.js 12.x
19+
uses: actions/setup-node@v1
20+
with:
21+
node-version: 12.x
22+
23+
- name: Install deps and build (with cache)
24+
uses: bahmutov/[email protected]
25+
26+
- name: Lint codebase
27+
run: yarn ci-check

Diff for: ‎.gitignore

+38-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,38 @@
1-
.cache
2-
.DS_STORE
3-
.idea
4-
node_modules
5-
/public
6-
yarn-error.log
1+
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
2+
3+
# dependencies
4+
/node_modules
5+
/.pnp
6+
.pnp.js
7+
8+
# testing
9+
/coverage
10+
11+
# next.js
12+
/.next/
13+
/out/
14+
15+
# production
16+
/build
17+
18+
# misc
19+
.DS_Store
20+
*.pem
21+
tsconfig.tsbuildinfo
22+
23+
# debug
24+
npm-debug.log*
25+
yarn-debug.log*
26+
yarn-error.log*
27+
28+
# local env files
29+
.env.local
30+
.env.development.local
31+
.env.test.local
32+
.env.production.local
33+
34+
# vercel
35+
.vercel
36+
37+
# external fonts
38+
public/fonts/**/Optimistic_*.woff2

Diff for: ‎beta/.husky/pre-commit renamed to ‎.husky/pre-commit

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/sh
22
. "$(dirname "$0")/_/husky.sh"
33

4-
cd beta
54
yarn lint-staged

0 commit comments

Comments
 (0)