Skip to content

Commit 72bade8

Browse files
authored
Merge pull request #35 from reactjs/sync-3563d95e
Sync with react.dev @ 3563d95
2 parents e306321 + 0e5f385 commit 72bade8

4 files changed

Lines changed: 12 additions & 23 deletions

File tree

src/components/MDX/ErrorDecoder.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,17 @@ function replaceArgs(
1818
/**
1919
* Sindre Sorhus <https://sindresorhus.com>
2020
* Released under MIT license
21-
* https://github.com/sindresorhus/linkify-urls/blob/b2397096df152e2f799011f7a48e5f73b4bf1c7e/index.js#L5C1-L7C1
21+
* https://github.com/sindresorhus/linkify-urls/blob/edd75a64a9c36d7025f102f666ddbb6cf0afa7cd/index.js#L4C25-L4C137
2222
*
2323
* The regex is used to extract URL from the string for linkify.
2424
*/
25-
const urlRegex = () =>
26-
/((?:https?(?::\/\/))(?:www\.)?(?:[a-zA-Z\d-_.]+(?:(?:\.|@)[a-zA-Z\d]{2,})|localhost)(?:(?:[-a-zA-Z\d:%_+.~#!?&//=@]*)(?:[,](?![\s]))*)*)/g;
25+
const urlRegex =
26+
/((?<!\+)https?:\/\/(?:www\.)?(?:[-\w.]+?[.@][a-zA-Z\d]{2,}|localhost)(?:[-\w.:%+~#*$!?&/=@]*?(?:,(?!\s))*?)*)/g;
2727

2828
// When the message contains a URL (like https://fb.me/react-refs-must-have-owner),
2929
// make it a clickable link.
3030
function urlify(str: string): React.ReactNode[] {
31-
32-
const segments = str.split(urlRegex());
31+
const segments = str.split(urlRegex);
3332

3433
return segments.map((message, i) => {
3534
if (i % 2 === 1) {

src/content/community/conferences.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c
1010

1111
## Upcoming Conferences {/*upcoming-conferences*/}
1212

13-
### React Summit 2024 {/*react-summit-2024*/}
14-
June 14 & 18, 2024. In-person in Amsterdam, Netherlands + remote (hybrid event)
15-
16-
[Website](https://reactsummit.com/) - [Twitter](https://twitter.com/reactsummit) - [Videos](https://portal.gitnation.org/)
17-
1813
### React Paris 2024 {/*react-paris-2024*/}
1914
March 22, 2024. In-person in Paris, France + Remote (hybrid)
2015

@@ -25,11 +20,6 @@ April 19 - 20, 2024. In-person in Miami, FL, USA
2520

2621
[Website](https://reactmiami.com/) - [Twitter](https://twitter.com/ReactMiamiConf)
2722

28-
### Epic Web Conf 2024 {/*epic-web-2024*/}
29-
April 10 - 11, 2024. In-person in Park City, UT, USA
30-
31-
[Website](https://www.epicweb.dev/conf) - [YouTube](https://www.youtube.com/@EpicWebDev)
32-
3323
### App.js Conf 2024 {/*appjs-conf-2024*/}
3424
May 22 - 24, 2024. In-person in Kraków, Poland + remote
3525

src/content/community/team.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ Current members of the React team are listed in alphabetical order below.
4242
Josh majored in Mathematics and discovered programming while in college. His first professional developer job was to program insurance rate calculations in Microsoft Excel, the paragon of Reactive Programming which must be why he now works on React. In between that time Josh has been an IC, Manager, and Executive at a few startups. outside of work he likes to push his limits with cooking.
4343
</TeamMember>
4444

45+
<TeamMember name="Kathryn Middleton" permalink="kathryn-middleton" photo="/images/team/kathryn-middleton.jpg" github="kmiddleton14" twitter="kmiddleton14" title="Engineering Manager at Meta">
46+
Kathryn initially discovered web development when she wanted to make her myspace page look cool. She ended up majoring in Computer Science, and quickly became a huge fan of React building features on the Instagram.com team. Outside of work she loves playing pingpong, teaching spin classes, and going plant shopping.
47+
</TeamMember>
48+
4549
<TeamMember name="Lauren Tan" permalink="lauren-tan" photo="/images/team/lauren.jpg" github="poteto" twitter="potetotes" threads="potetotes" personal="no.lol" title="Engineer at Meta">
4650
Lauren’s programming career peaked when she first discovered the `<marquee>` tag. She’s been chasing that high ever since. When she’s not adding bugs into React, she enjoys dropping cheeky memes in chat, and playing all too many video games with her partner, and her dog Zelda.
4751
</TeamMember>
@@ -58,14 +62,14 @@ Current members of the React team are listed in alphabetical order below.
5862
Mofei started programming when she realized it can help her cheat in video games. She focused on operating systems in undergrad / grad school, but now finds herself happily tinkering on React. Outside of work, she enjoys debugging bouldering problems and planning her next backpacking trip(s).
5963
</TeamMember>
6064

61-
<TeamMember name="Noah Lemen" permalink="noah-lemen" photo="/images/team/noahlemen.jpg" github="noahlemen" twitter="noahlemen" threads="noahlemen" personal="noahle.men" title="Engineer at Meta">
62-
Noah’s interest in UI programming sparked during his education in music technology at NYU. At Meta, he's worked on internal tools, browsers, web performance, and is currently focused on React. Outside of work, Noah can be found tinkering with synthesizers or spending time with his cat.
63-
</TeamMember>
64-
6565
<TeamMember name="Rick Hanlon" permalink="rick-hanlon" photo="/images/team/rickhanlonii.jpg" github="rickhanlonii" twitter="rickhanlonii" threads="rickhanlonii" personal="rickhanlon.codes" title="Engineer at Meta">
6666
Ricky majored in theoretical math and somehow found himself on the React Native team for a couple years before joining the React team. When he's not programming you can find him snowboarding, biking, climbing, golfing, or closing GitHub issues that do not match the issue template.
6767
</TeamMember>
6868

69+
<TeamMember name="Samuel Susla" permalink="samuel-susla" photo="/images/team/sam.jpg" github="sammy-SC" twitter="SamuelSusla" threads="samuelsusla" title="Engineer at Meta">
70+
Samuel’s interest in programming started with the movie Matrix. He still has Matrix screen saver. Before working on React, he was focused on writing iOS apps. Outside of work, Samuel enjoys playing beach volleyball, squash, badminton and spending time with his family.
71+
</TeamMember>
72+
6973
<TeamMember name="Sathya Gunasekaran " permalink="sathya-gunasekaran" photo="/images/team/sathya.jpg" github="gsathya" twitter="_gsathya" threads="gsathya.03" title="Engineer at Meta">
7074
Sathya hated the Dragon Book in school but somehow ended up working on compilers all his career. When he's not compiling React components, he's either drinking coffee or eating yet another Dosa.
7175
</TeamMember>

tailwind.config.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@ module.exports = {
6060
...defaultTheme.maxWidth,
6161
'custom-xs': '21rem',
6262
},
63-
minWidth:{
64-
...defaultTheme.minWidth,
65-
80: '20rem',
66-
},
6763
outline: {
6864
blue: ['1px auto ' + colors.link, '3px'],
6965
},

0 commit comments

Comments
 (0)