Skip to content

Commit 80d88d8

Browse files
Merge branch 'main' into sync-5d2f7105
2 parents e98c81b + 2094707 commit 80d88d8

File tree

4 files changed

+17
-5
lines changed

4 files changed

+17
-5
lines changed

src/components/MDX/ErrorDecoder.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ function replaceArgs(
1818
/**
1919
* Sindre Sorhus <https://sindresorhus.com>
2020
* Released under MIT license
21+
2122
* https://github.com/sindresorhus/linkify-urls/blob/b2397096df152e2f799011f7a48e5f73b4bf1c7e/index.js#L5C1-L7C1
2223
*
2324
* The regex is used to extract URL from the string for linkify.
@@ -28,6 +29,7 @@ const urlRegex = () =>
2829
// When the message contains a URL (like https://fb.me/react-refs-must-have-owner),
2930
// make it a clickable link.
3031
function urlify(str: string): React.ReactNode[] {
32+
3133
const segments = str.split(urlRegex());
3234

3335
return segments.map((message, i) => {

src/content/community/conferences.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -48,24 +48,23 @@ July 04 & 05, 2024. Bangalore, India (In-person event)
4848
### React India 2024 {/*react-india-2024*/}
4949
October 17 - 19, 2024. In-person in Goa, India (hybrid event) + Oct 15 2024 - remote day
5050

51-
[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)
52-
5351
## Past Conferences {/*past-conferences*/}
5452

5553
### React Day Berlin 2023 {/*react-day-berlin-2023*/}
5654
December 8 & 12, 2023. In-person in Berlin, Germany + remote first interactivity (hybrid event)
5755

56+
5857
[Website](https://reactday.berlin) - [Twitter](https://twitter.com/reactdayberlin) - [Facebook](https://www.facebook.com/reactdayberlin/) - [Videos](https://portal.gitnation.org/events/react-day-berlin-2023)
5958

6059
### React Summit US 2023 {/*react-summit-us-2023*/}
6160
November 13 & 15, 2023. In-person in New York, US + remote first interactivity (hybrid event)
6261

6362
[Website](https://reactsummit.us) - [Twitter](https://twitter.com/reactsummit) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://portal.gitnation.org/events/react-summit-us-2023)
6463

65-
### reactjsday 2023 {/*reactjsday-2023*/}
66-
October 27th 2023. In-person in Verona, Italy and online (hybrid event)
64+
### React Brussels 2023 {/*react-brussels-2023*/}
65+
October 13th 2023. In-person in Brussels, Belgium + Remote (hybrid)
6766

68-
[Website](https://2023.reactjsday.it/) - [Twitter](https://twitter.com/reactjsday) - [Facebook](https://www.facebook.com/GrUSP/) - [YouTube](https://www.youtube.com/c/grusp)
67+
[Website](https://www.react.brussels/) - [Twitter](https://twitter.com/BrusselsReact) - [Videos](https://www.youtube.com/playlist?list=PL53Z0yyYnpWh85KeMomUoVz8_brrmh_aC)
6968

7069
### React Advanced 2023 {/*react-advanced-2023*/}
7170
October 20 & 23, 2023. In-person in London, UK + remote first interactivity (hybrid event)

src/content/community/team.md

+7
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>
@@ -64,6 +68,9 @@ Current members of the React team are listed in alphabetical order below.
6468

6569
<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">
6670
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.
71+
72+
<TeamMember name="Samuel Susla" permalink="samuel-susla" photo="/images/team/sam.jpg" github="sammy-SC" twitter="SamuelSusla" threads="samuelsusla" title="Engineer at Meta">
73+
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.
6774
</TeamMember>
6875

6976
<TeamMember name="Sathya Gunasekaran " permalink="sathya-gunasekaran" photo="/images/team/sathya.jpg" github="gsathya" twitter="_gsathya" threads="gsathya.03" title="Engineer at Meta">

tailwind.config.js

+4
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ module.exports = {
6060
...defaultTheme.maxWidth,
6161
'custom-xs': '21rem',
6262
},
63+
minWidth:{
64+
...defaultTheme.minWidth,
65+
80: '20rem',
66+
},
6367
outline: {
6468
blue: ['1px auto ' + colors.link, '3px'],
6569
},

0 commit comments

Comments
 (0)