From dc0886027a18b540bc585d5a80686ac96c6d4e37 Mon Sep 17 00:00:00 2001 From: Ben Amor Aymen Date: Mon, 24 Jun 2024 19:36:08 +0200 Subject: [PATCH 01/10] Add React Brussels 2024 and React Africa 2024 (#6990) --- src/content/community/conferences.md | 42 +++++++++++++++++----------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/src/content/community/conferences.md b/src/content/community/conferences.md index 45418e683..bebc17157 100644 --- a/src/content/community/conferences.md +++ b/src/content/community/conferences.md @@ -10,21 +10,6 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c ## Upcoming Conferences {/*upcoming-conferences*/} -### React Summit 2024 {/*react-summit-2024*/} -June 14 & 18, 2024. In-person in Amsterdam, Netherlands + remote (hybrid event) - -[Website](https://reactsummit.com/) - [Twitter](https://twitter.com/reactsummit) - [Videos](https://portal.gitnation.org/) - -### Render(ATL) 2024 ๐Ÿ‘ {/*renderatl-2024-*/} -June 12 - June 14, 2024. Atlanta, GA, USA - -[Website](https://renderatl.com) - [Discord](https://www.renderatl.com/discord) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/) - [LinkedIn](https://www.linkedin.com/company/renderatl) - [Podcast](https://www.renderatl.com/culture-and-code#/) - -### React Norway 2024 {/*react-norway-2024*/} -June 14, 2024. In-person at Farris Bad Hotel in Larvik, Norway and online (hybrid event). - -[Website](https://reactnorway.com/) - [Twitter](https://twitter.com/ReactNorway) - ### React Nexus 2024 {/*react-nexus-2024*/} July 04 & 05, 2024. Bangalore, India (In-person event) @@ -61,8 +46,33 @@ October 17 - 19, 2024. In-person in Goa, India (hybrid event) + Oct 15 2024 - re [Website](https://www.reactindia.io) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia) - [Youtube](https://www.youtube.com/channel/UCaFbHCBkPvVv1bWs_jwYt3w) +### React Brussels 2024 {/*react-brussels-2024*/} +October 18, 2024. In-person in Brussels, Belgium (hybrid event) + +[Website](https://www.react.brussels/) - [Twitter](https://x.com/BrusselsReact) + +### React Africa 2024 {/*react-africa-2024*/} +November 29, 2024. In-person in Casablanca, Morocco (hybrid event) + +[Website](https://react-africa.com/) - [Twitter](https://x.com/BeJS_) + ## Past Conferences {/*past-conferences*/} +### React Summit 2024 {/*react-summit-2024*/} +June 14 & 18, 2024. In-person in Amsterdam, Netherlands + remote (hybrid event) + +[Website](https://reactsummit.com/) - [Twitter](https://twitter.com/reactsummit) - [Videos](https://portal.gitnation.org/) + +### React Norway 2024 {/*react-norway-2024*/} +June 14, 2024. In-person at Farris Bad Hotel in Larvik, Norway and online (hybrid event). + +[Website](https://reactnorway.com/) - [Twitter](https://twitter.com/ReactNorway) + +### Render(ATL) 2024 ๐Ÿ‘ {/*renderatl-2024-*/} +June 12 - June 14, 2024. Atlanta, GA, USA + +[Website](https://renderatl.com) - [Discord](https://www.renderatl.com/discord) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/) - [LinkedIn](https://www.linkedin.com/company/renderatl) - [Podcast](https://www.renderatl.com/culture-and-code#/) + ### Frontend Nation 2024 {/*frontend-nation-2024*/} June 4 - 7, 2024. Online @@ -96,7 +106,7 @@ April 10 - 11, 2024. In-person in Park City, UT, USA ### React Paris 2024 {/*react-paris-2024*/} March 22, 2024. In-person in Paris, France + Remote (hybrid) -[Website](https://react.paris/) - [Twitter](https://twitter.com/BeJS_) - [LinkedIn](https://www.linkedin.com/events/7150816372074192900/comments/) +[Website](https://react.paris/) - [Twitter](https://twitter.com/BeJS_) - [LinkedIn](https://www.linkedin.com/events/7150816372074192900/comments/) - [Videos](https://www.youtube.com/playlist?list=PL53Z0yyYnpWhUzgvr2Nys3kZBBLcY0TA7) ### React Day Berlin 2023 {/*react-day-berlin-2023*/} December 8 & 12, 2023. In-person in Berlin, Germany + remote first interactivity (hybrid event) From 4eacc736ef9ebef87a2b453a7d4fbd490e720741 Mon Sep 17 00:00:00 2001 From: Matt Carroll <7158882+mattcarrollcode@users.noreply.github.com> Date: Mon, 24 Jun 2024 13:38:52 -0700 Subject: [PATCH 02/10] Remove uwuQueryParam console.log (#6993) --- src/pages/_document.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/_document.tsx b/src/pages/_document.tsx index 876735a53..6849df35d 100644 --- a/src/pages/_document.tsx +++ b/src/pages/_document.tsx @@ -87,7 +87,6 @@ const MyDocument = () => { } } const uwuQueryParam = checkQueryParam(); - console.log('uwuQueryParam', uwuQueryParam); if (uwuQueryParam != null) { setUwu(uwuQueryParam); } else if (checkLocalStorage()) { From e9d2c63e94b259fc74d8a61c86fe373a51072582 Mon Sep 17 00:00:00 2001 From: lauren Date: Fri, 28 Jun 2024 09:27:06 -0400 Subject: [PATCH 03/10] Update compiler docs for Expo apps (#7000) Expo now has its own instructions for enabling the compiler. --- src/content/learn/react-compiler.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/learn/react-compiler.md b/src/content/learn/react-compiler.md index 3fef7d5cc..d40c064ca 100644 --- a/src/content/learn/react-compiler.md +++ b/src/content/learn/react-compiler.md @@ -351,7 +351,7 @@ module.exports = reactCompilerLoader; ### Expo {/*usage-with-expo*/} -Expo uses Babel via Metro, so refer to the [Usage with Babel](#usage-with-babel) section for installation instructions. +Please refer to [Expo's docs](https://docs.expo.dev/preview/react-compiler/) to enable and use the React Compiler in Expo apps. ### Metro (React Native) {/*usage-with-react-native-metro*/} From 53fbed3f676013508fb9cce22a3fc8664b1dc5a1 Mon Sep 17 00:00:00 2001 From: Nikhil Kumaran Date: Mon, 1 Jul 2024 00:37:18 +0530 Subject: [PATCH 04/10] Add Chennai React meetup (#7004) --- src/content/community/meetups.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/community/meetups.md b/src/content/community/meetups.md index a12a5349c..d8887c3de 100644 --- a/src/content/community/meetups.md +++ b/src/content/community/meetups.md @@ -100,7 +100,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet * [Ahmedabad](https://www.meetup.com/react-ahmedabad/) * [Bangalore (React)](https://www.meetup.com/ReactJS-Bangalore/) * [Bangalore (React Native)](https://www.meetup.com/React-Native-Bangalore-Meetup) -* [Chennai](https://www.meetup.com/React-Chennai/) +* [Chennai](https://www.linkedin.com/company/chennaireact) * [Delhi NCR](https://www.meetup.com/React-Delhi-NCR/) * [Mumbai](https://reactmumbai.dev) * [Pune](https://www.meetup.com/ReactJS-and-Friends/) From 1a3a3ef9bbb602f0fdb65ec329094759663b2ea3 Mon Sep 17 00:00:00 2001 From: Sandra Dylus Date: Thu, 4 Jul 2024 07:45:17 +0200 Subject: [PATCH 05/10] fix: Correct reference to sandboxed file App.js in challenge (#7010) --- src/content/learn/reusing-logic-with-custom-hooks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/learn/reusing-logic-with-custom-hooks.md b/src/content/learn/reusing-logic-with-custom-hooks.md index 13a556c7b..67de5e97f 100644 --- a/src/content/learn/reusing-logic-with-custom-hooks.md +++ b/src/content/learn/reusing-logic-with-custom-hooks.md @@ -1899,7 +1899,7 @@ export default function Counter() { } ``` -You'll need to write your custom Hook in `useCounter.js` and import it into the `Counter.js` file. +You'll need to write your custom Hook in `useCounter.js` and import it into the `App.js` file. From 2a2e02f1d88f4d2828728ce352626e84ed8abda0 Mon Sep 17 00:00:00 2001 From: neverland Date: Fri, 5 Jul 2024 19:12:29 +0800 Subject: [PATCH 06/10] Update compiler docs for Rspack and Rsbuild apps (#7031) --- src/content/learn/react-compiler.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/content/learn/react-compiler.md b/src/content/learn/react-compiler.md index d40c064ca..f34c382ed 100644 --- a/src/content/learn/react-compiler.md +++ b/src/content/learn/react-compiler.md @@ -357,6 +357,14 @@ Please refer to [Expo's docs](https://docs.expo.dev/preview/react-compiler/) to React Native uses Babel via Metro, so refer to the [Usage with Babel](#usage-with-babel) section for installation instructions. +### Rspack {/*usage-with-rspack*/} + +Please refer to [Rspack's docs](https://rspack.dev/guide/tech/react#react-compiler) to enable and use the React Compiler in Rspack apps. + +### Rsbuild {/*usage-with-rsbuild*/} + +Please refer to [Rsbuild's docs](https://rsbuild.dev/guide/framework/react#react-compiler) to enable and use the React Compiler in Rsbuild apps. + ## Troubleshooting {/*troubleshooting*/} To report issues, please first create a minimal repro on the [React Compiler Playground](https://playground.react.dev/) and include it in your bug report. You can open issues in the [facebook/react](https://github.com/facebook/react/issues) repo. From 4c91abc78b20be10e7d40cf57a80a6a6247e6e9a Mon Sep 17 00:00:00 2001 From: Jan Kassens Date: Wed, 10 Jul 2024 11:48:48 -0400 Subject: [PATCH 07/10] Update /link/legacy-context to removal blog post (#7047) --- vercel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index 9edafb3d4..eac0efb9c 100644 --- a/vercel.json +++ b/vercel.json @@ -91,7 +91,7 @@ }, { "source": "/link/legacy-context", - "destination": "https://legacy.reactjs.org/docs/legacy-context.html", + "destination": "https://react.dev/blog/2024/04/25/react-19-upgrade-guide#removed-removing-legacy-context", "permanent": false }, { From de726d2add494d569740467ec1eeb7ae27ab0ba7 Mon Sep 17 00:00:00 2001 From: Ryan Bonnell Date: Fri, 19 Jul 2024 23:19:54 -0700 Subject: [PATCH 08/10] Update verb usage in sentence (#7070) --- src/content/learn/adding-interactivity.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/learn/adding-interactivity.md b/src/content/learn/adding-interactivity.md index 0d4a3b23f..5c87a3e79 100644 --- a/src/content/learn/adding-interactivity.md +++ b/src/content/learn/adding-interactivity.md @@ -265,7 +265,7 @@ setCount(count + 1); // Request a re-render with 1 console.log(count); // Still 0! ``` -This behavior help you avoid subtle bugs. Here is a little chat app. Try to guess what happens if you press "Send" first and *then* change the recipient to Bob. Whose name will appear in the `alert` five seconds later? +This behavior helps you avoid subtle bugs. Here is a little chat app. Try to guess what happens if you press "Send" first and *then* change the recipient to Bob. Whose name will appear in the `alert` five seconds later? From 6274d4faf5afcef74357871d06191558050e23d3 Mon Sep 17 00:00:00 2001 From: ramadevsign <50571688+orama254@users.noreply.github.com> Date: Sat, 20 Jul 2024 09:20:45 +0300 Subject: [PATCH 09/10] docs: Add RenderCon Kenya 2024 conference (#6914) --- src/content/community/conferences.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/content/community/conferences.md b/src/content/community/conferences.md index bebc17157..5070fbc41 100644 --- a/src/content/community/conferences.md +++ b/src/content/community/conferences.md @@ -40,6 +40,10 @@ September 19-21, 2024. Alicante, Spain. [Website](https://reactalicante.es/) - [Twitter](https://twitter.com/ReactAlicante) - [YouTube](https://www.youtube.com/channel/UCaSdUaITU1Cz6PvC97A7e0w) +### RenderCon Kenya 2024 {/*rendercon-kenya-2024*/} +October 04 - 05, 2024. Nairobi, Kenya + +[Website](https://rendercon.org/) - [Twitter](https://twitter.com/renderconke) - [LinkedIn](https://www.linkedin.com/company/renderconke/) - [YouTube](https://www.youtube.com/channel/UC0bCcG8gHUL4njDOpQGcMIA) ### React India 2024 {/*react-india-2024*/} October 17 - 19, 2024. In-person in Goa, India (hybrid event) + Oct 15 2024 - remote day From 94cf27b54796f306f304194e83e105eb26015b8f Mon Sep 17 00:00:00 2001 From: Soichiro Miki Date: Fri, 26 Jul 2024 14:04:21 +0900 Subject: [PATCH 10/10] Resolve conflicts --- src/content/learn/adding-interactivity.md | 4 ---- src/content/learn/react-compiler.md | 16 ++++------------ .../learn/reusing-logic-with-custom-hooks.md | 6 +----- 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/src/content/learn/adding-interactivity.md b/src/content/learn/adding-interactivity.md index b8d60efaa..17cb9217f 100644 --- a/src/content/learn/adding-interactivity.md +++ b/src/content/learn/adding-interactivity.md @@ -265,11 +265,7 @@ setCount(count + 1); // Request a re-render with 1 console.log(count); // Still 0! ``` -<<<<<<< HEAD ใ“ใฎใŠใ‹ใ’ใงใ€่ฆ‹้€ƒใ—ใ‚„ใ™ใ„ๅฐใ•ใชใƒใ‚ฐใ‚’ๅ›ž้ฟใ™ใ‚‹ใ“ใจใŒใงใใพใ™ใ€‚ใ“ใ“ใซๅฐใ•ใชใƒใƒฃใƒƒใƒˆใ‚ขใƒ—ใƒชใŒใ‚ใ‚Šใพใ™ใ€‚ใพใšใ€Œ้€ไฟกใ€ใ‚’ๆŠผใ—ใฆใ€*ๆฌกใซ*ๅ—ไฟก่€…ใ‚’ใ€Œใƒœใƒ–ใ€ใซๅค‰ๆ›ดใ—ใŸใ‚‰ไฝ•ใŒ่ตทใ“ใ‚‹ใ‹ใ€ๆŽจๆธฌใ—ใฆใฟใฆใใ ใ•ใ„ใ€‚5 ็ง’ๅพŒใฎ `alert` ใซใฏ่ชฐใฎๅๅ‰ใŒ่กจ็คบใ•ใ‚Œใ‚‹ใงใ—ใ‚‡ใ†ใ‹๏ผŸ -======= -This behavior helps you avoid subtle bugs. Here is a little chat app. Try to guess what happens if you press "Send" first and *then* change the recipient to Bob. Whose name will appear in the `alert` five seconds later? ->>>>>>> 6274d4faf5afcef74357871d06191558050e23d3 diff --git a/src/content/learn/react-compiler.md b/src/content/learn/react-compiler.md index 631e4e36a..7fc1680d7 100644 --- a/src/content/learn/react-compiler.md +++ b/src/content/learn/react-compiler.md @@ -351,29 +351,21 @@ module.exports = reactCompilerLoader; ### Expo {/*usage-with-expo*/} -<<<<<<< HEAD -Expo ใฏ Metro ็ตŒ็”ฑใง Babel ใ‚’ไฝฟ็”จใ™ใ‚‹ใŸใ‚ใ€ใ‚คใƒณใ‚นใƒˆใƒผใƒซๆ‰‹้ †ใซใคใ„ใฆใฏ [Babel ใงใฎไฝฟ็”จ](#usage-with-babel)ใ‚ปใ‚ฏใ‚ทใƒงใƒณใ‚’ๅ‚็…งใ—ใฆใใ ใ•ใ„ใ€‚ -======= -Please refer to [Expo's docs](https://docs.expo.dev/preview/react-compiler/) to enable and use the React Compiler in Expo apps. ->>>>>>> 6274d4faf5afcef74357871d06191558050e23d3 +Expo ใ‚ขใƒ—ใƒชใง React Compiler ใ‚’ๆœ‰ๅŠนๅŒ–ใ™ใ‚‹ๆ–นๆณ•ใซใคใ„ใฆใฏ [Expo ใฎใƒ‰ใ‚ญใƒฅใƒกใƒณใƒˆ](https://docs.expo.dev/preview/react-compiler/)ใ‚’ๅ‚็…งใ—ใฆใใ ใ•ใ„ใ€‚ ### Metro (React Native) {/*usage-with-react-native-metro*/} React Native ใฏ Metro ็ตŒ็”ฑใง Babel ใ‚’ไฝฟ็”จใ™ใ‚‹ใŸใ‚ใ€ใ‚คใƒณใ‚นใƒˆใƒผใƒซๆ‰‹้ †ใซใคใ„ใฆใฏ [Babel ใงใฎไฝฟ็”จ](#usage-with-babel)ใ‚ปใ‚ฏใ‚ทใƒงใƒณใ‚’ๅ‚็…งใ—ใฆใใ ใ•ใ„ใ€‚ -<<<<<<< HEAD -## ใƒˆใƒฉใƒ–ใƒซใ‚ทใƒฅใƒผใƒ†ใ‚ฃใƒณใ‚ฐ {/*troubleshooting*/} -======= ### Rspack {/*usage-with-rspack*/} -Please refer to [Rspack's docs](https://rspack.dev/guide/tech/react#react-compiler) to enable and use the React Compiler in Rspack apps. +Rspack ใ‚ขใƒ—ใƒชใง React Compiler ใ‚’ๆœ‰ๅŠนๅŒ–ใ™ใ‚‹ๆ–นๆณ•ใซใคใ„ใฆใฏ [Rspack ใฎใƒ‰ใ‚ญใƒฅใƒกใƒณใƒˆ](https://rspack.dev/guide/tech/react#react-compiler)ใ‚’ๅ‚็…งใ—ใฆใใ ใ•ใ„ใ€‚ ### Rsbuild {/*usage-with-rsbuild*/} -Please refer to [Rsbuild's docs](https://rsbuild.dev/guide/framework/react#react-compiler) to enable and use the React Compiler in Rsbuild apps. +Rsbuild ใ‚ขใƒ—ใƒชใง React Compiler ใ‚’ๆœ‰ๅŠนๅŒ–ใ™ใ‚‹ๆ–นๆณ•ใซใคใ„ใฆใฏ [Rsbuild ใฎใƒ‰ใ‚ญใƒฅใƒกใƒณใƒˆ](https://rsbuild.dev/guide/framework/react#react-compiler)ใ‚’ๅ‚็…งใ—ใฆใใ ใ•ใ„ใ€‚ -## Troubleshooting {/*troubleshooting*/} ->>>>>>> 6274d4faf5afcef74357871d06191558050e23d3 +## ใƒˆใƒฉใƒ–ใƒซใ‚ทใƒฅใƒผใƒ†ใ‚ฃใƒณใ‚ฐ {/*troubleshooting*/} ๅ•้กŒใ‚’ๅ ฑๅ‘Šใ™ใ‚‹ใซใฏใ€ใพใš [React Compiler Playground](https://playground.react.dev/) ใงๆœ€ๅฐ้™ใฎๅ†็พใ‚ณใƒผใƒ‰ใ‚’ไฝœๆˆใ—ใ€ใใ‚Œใ‚’ใƒใ‚ฐๅ ฑๅ‘Šใซๅซใ‚ใฆใใ ใ•ใ„ใ€‚ๅ•้กŒใฏ [facebook/react](https://github.com/facebook/react/issues) ใƒชใƒใ‚ธใƒˆใƒชใงๅ ฑๅ‘Šใงใใพใ™ใ€‚ diff --git a/src/content/learn/reusing-logic-with-custom-hooks.md b/src/content/learn/reusing-logic-with-custom-hooks.md index 6269b23b8..a13f0000f 100644 --- a/src/content/learn/reusing-logic-with-custom-hooks.md +++ b/src/content/learn/reusing-logic-with-custom-hooks.md @@ -1899,11 +1899,7 @@ export default function Counter() { } ``` -<<<<<<< HEAD -ใ‚ซใ‚นใ‚ฟใƒ ใƒ•ใƒƒใ‚ฏใ‚’ `useCounter.js` ใซ่จ˜่ฟฐใ—ใฆใ€`Counter.js` ใƒ•ใ‚กใ‚คใƒซใซใ‚คใƒณใƒใƒผใƒˆใ™ใ‚‹ๅฟ…่ฆใŒใ‚ใ‚Šใพใ™ใ€‚ -======= -You'll need to write your custom Hook in `useCounter.js` and import it into the `App.js` file. ->>>>>>> 6274d4faf5afcef74357871d06191558050e23d3 +ใ‚ซใ‚นใ‚ฟใƒ ใƒ•ใƒƒใ‚ฏใ‚’ `useCounter.js` ใซ่จ˜่ฟฐใ—ใฆใ€`App.js` ใƒ•ใ‚กใ‚คใƒซใซใ‚คใƒณใƒใƒผใƒˆใ™ใ‚‹ๅฟ…่ฆใŒใ‚ใ‚Šใพใ™ใ€‚