Skip to content

Commit ae2f7f9

Browse files
merging all conflicts
2 parents be62f92 + ab18d2f commit ae2f7f9

File tree

111 files changed

+3879
-1452
lines changed

Some content is hidden

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

111 files changed

+3879
-1452
lines changed

.eslintrc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
"root": true,
33
"extends": "next/core-web-vitals",
44
"parser": "@typescript-eslint/parser",
5-
"plugins": ["@typescript-eslint"],
5+
"plugins": ["@typescript-eslint", "eslint-plugin-react-compiler"],
66
"rules": {
77
"no-unused-vars": "off",
8-
"@typescript-eslint/no-unused-vars": ["error", { "varsIgnorePattern": "^_" }],
9-
"react-hooks/exhaustive-deps": "error"
8+
"@typescript-eslint/no-unused-vars": ["error", {"varsIgnorePattern": "^_"}],
9+
"react-hooks/exhaustive-deps": "error",
10+
"react/no-unknown-property": ["error", {"ignore": ["meta"]}],
11+
"react-compiler/react-compiler": "error"
1012
},
1113
"env": {
1214
"node": true,

.github/workflows/discord_notify.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Discord Notify
2+
3+
on:
4+
pull_request_target:
5+
types: [opened, ready_for_review]
6+
7+
jobs:
8+
check_maintainer:
9+
uses: facebook/react/.github/workflows/shared_check_maintainer.yml@main
10+
with:
11+
actor: ${{ github.event.pull_request.user.login }}
12+
is_remote: true
13+
14+
notify:
15+
if: ${{ needs.check_maintainer.outputs.is_core_team == 'true' }}
16+
needs: check_maintainer
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Discord Webhook Action
20+
uses: tsickert/[email protected]
21+
with:
22+
webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
23+
embed-author-name: ${{ github.event.pull_request.user.login }}
24+
embed-author-url: ${{ github.event.pull_request.user.html_url }}
25+
embed-author-icon-url: ${{ github.event.pull_request.user.avatar_url }}
26+
embed-title: '#${{ github.event.number }} (+${{github.event.pull_request.additions}} -${{github.event.pull_request.deletions}}): ${{ github.event.pull_request.title }}'
27+
embed-description: ${{ github.event.pull_request.body }}
28+
embed-url: ${{ github.event.pull_request.html_url }}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Label Core Team PRs
2+
3+
on:
4+
pull_request_target:
5+
6+
env:
7+
TZ: /usr/share/zoneinfo/America/Los_Angeles
8+
# https://github.com/actions/cache/blob/main/tips-and-workarounds.md#cache-segment-restore-timeout
9+
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
10+
11+
jobs:
12+
check_maintainer:
13+
uses: facebook/react/.github/workflows/shared_check_maintainer.yml@main
14+
with:
15+
actor: ${{ github.event.pull_request.user.login }}
16+
is_remote: true
17+
18+
label:
19+
if: ${{ needs.check_maintainer.outputs.is_core_team == 'true' }}
20+
runs-on: ubuntu-latest
21+
needs: check_maintainer
22+
steps:
23+
- name: Label PR as React Core Team
24+
uses: actions/github-script@v7
25+
with:
26+
script: |
27+
github.rest.issues.addLabels({
28+
owner: context.repo.owner,
29+
repo: context.repo.repo,
30+
issue_number: ${{ github.event.number }},
31+
labels: ['React Core Team']
32+
});

next-env.d.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/// <reference types="next" />
22
/// <reference types="next/image-types/global" />
3+
/// <reference types="next/navigation-types/compat/navigation" />
34

45
// NOTE: This file should not be edited
5-
// see https://nextjs.org/docs/basic-features/typescript for more information.
6+
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

next.config.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ const nextConfig = {
99
pageExtensions: ['jsx', 'js', 'ts', 'tsx', 'mdx', 'md'],
1010
reactStrictMode: true,
1111
experimental: {
12-
// TODO: Remove after https://github.com/vercel/next.js/issues/49355 is fixed
13-
appDir: false,
1412
scrollRestoration: true,
15-
legacyBrowsers: false,
13+
reactCompiler: true,
1614
},
1715
env: {},
1816
webpack: (config, {dev, isServer, ...options}) => {

package.json

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,29 @@
1818
"ci-check": "npm-run-all prettier:diff --parallel lint tsc lint-heading-ids rss",
1919
"tsc": "tsc --noEmit",
2020
"start": "next start",
21-
"postinstall": "patch-package && (is-ci || husky install .husky)",
21+
"postinstall": "is-ci || husky install .husky",
2222
"check-all": "npm-run-all prettier lint:fix tsc rss",
2323
"rss": "node scripts/generateRss.js",
2424
"textlint": "cd textlint && yarn --frozen-lockfile && yarn textlint",
2525
"textlint-staged": "cd textlint && yarn --frozen-lockfile && yarn textlint-staged --"
2626
},
2727
"dependencies": {
2828
"@codesandbox/sandpack-react": "2.13.5",
29-
"@docsearch/css": "^3.6.1",
30-
"@docsearch/react": "^3.6.1",
29+
"@docsearch/css": "^3.8.3",
30+
"@docsearch/react": "^3.8.3",
3131
"@headlessui/react": "^1.7.0",
3232
"@radix-ui/react-context-menu": "^2.1.5",
3333
"body-scroll-lock": "^3.1.3",
3434
"classnames": "^2.2.6",
3535
"date-fns": "^2.16.1",
3636
"debounce": "^1.2.1",
3737
"github-slugger": "^1.3.0",
38-
"next": "^13.4.1",
38+
"next": "15.1.0",
3939
"next-remote-watch": "^1.0.0",
4040
"parse-numeric-range": "^1.2.0",
41-
"react": "^0.0.0-experimental-16d053d59-20230506",
41+
"react": "^19.0.0",
4242
"react-collapsed": "4.0.4",
43-
"react-dom": "^0.0.0-experimental-16d053d59-20230506",
43+
"react-dom": "^19.0.0",
4444
"remark-frontmatter": "^4.0.1",
4545
"remark-gfm": "^3.0.1"
4646
},
@@ -56,20 +56,22 @@
5656
"@types/mdx-js__react": "^1.5.2",
5757
"@types/node": "^14.6.4",
5858
"@types/parse-numeric-range": "^0.0.1",
59-
"@types/react": "^18.0.9",
60-
"@types/react-dom": "^18.0.5",
59+
"@types/react": "^19.0.0",
60+
"@types/react-dom": "^19.0.0",
6161
"@typescript-eslint/eslint-plugin": "^5.36.2",
6262
"@typescript-eslint/parser": "^5.36.2",
6363
"asyncro": "^3.0.0",
6464
"autoprefixer": "^10.4.2",
6565
"babel-eslint": "10.x",
66+
"babel-plugin-react-compiler": "19.0.0-beta-e552027-20250112",
6667
"eslint": "7.x",
6768
"eslint-config-next": "12.0.3",
6869
"eslint-config-react-app": "^5.2.1",
6970
"eslint-plugin-flowtype": "4.x",
7071
"eslint-plugin-import": "2.x",
7172
"eslint-plugin-jsx-a11y": "6.x",
7273
"eslint-plugin-react": "7.x",
74+
"eslint-plugin-react-compiler": "^19.0.0-beta-e552027-20250112",
7375
"eslint-plugin-react-hooks": "^0.0.0-experimental-fabef7a6b-20221215",
7476
"fs-extra": "^9.0.1",
7577
"globby": "^11.0.1",
@@ -80,7 +82,6 @@
8082
"mdast-util-to-string": "^1.1.0",
8183
"metro-cache": "0.72.2",
8284
"npm-run-all": "^4.1.5",
83-
"patch-package": "^6.2.2",
8485
"postcss": "^8.4.5",
8586
"postcss-flexbugs-fixes": "4.2.1",
8687
"postcss-preset-env": "^6.7.0",
@@ -96,7 +97,7 @@
9697
"retext-smartypants": "^4.0.0",
9798
"rss": "^1.2.2",
9899
"tailwindcss": "^3.4.1",
99-
"typescript": "^4.0.2",
100+
"typescript": "^5.7.2",
100101
"unist-util-visit": "^2.0.3",
101102
"webpack-bundle-analyzer": "^4.5.0"
102103
},
@@ -110,6 +111,12 @@
110111
},
111112
"lint-staged": {
112113
"*.{js,ts,jsx,tsx,css}": "yarn prettier",
114+
<<<<<<< HEAD
113115
"src/**/*.md": ["yarn fix-headings", "yarn textlint-staged --"]
114116
}
117+
=======
118+
"src/**/*.md": "yarn fix-headings"
119+
},
120+
"packageManager": "[email protected]"
121+
>>>>>>> ab18d2f0f5151ab0c927a12eb0a64f8170762eff
115122
}

patches/next+13.4.1.patch

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

patches/next-remote-watch+1.0.0.patch

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

public/images/team/andrey-lunyov.jpg

-56.2 KB
Binary file not shown.

public/images/team/hendrik.jpg

306 KB
Loading

0 commit comments

Comments
 (0)