Skip to content

Commit 9b55adf

Browse files
Khakim Aidarkhanovclaude
authored andcommitted
Fix unresolved merge conflicts in package.json, yarn.lock, and conferences.md
Resolve leftover conflict markers from sync/dependabot PR merges: update next to 16.1.5, regenerate yarn.lock, and keep latest conference data. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 8753b22 commit 9b55adf

3 files changed

Lines changed: 67 additions & 141 deletions

File tree

package.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@
3535
"classnames": "^2.2.6",
3636
"debounce": "^1.2.1",
3737
"github-slugger": "^1.3.0",
38-
<<<<<<< HEAD
39-
"next": "15.4.8",
40-
=======
41-
"next": "15.1.9",
42-
>>>>>>> e22544e68d6fffda33332771efe27034739f35a4
38+
"next": "16.1.5",
4339
"next-remote-watch": "^1.0.0",
4440
"parse-numeric-range": "^1.2.0",
4541
"react": "^19.0.0",

src/content/community/conferences.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,10 @@ 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-
<<<<<<< HEAD
14-
### React Universe Conf 2025 {/*react-universe-conf-2025*/}
15-
16-
[Website](https://reactday.berlin/) - [Twitter](https://x.com/reactdayberlin)
17-
=======
1813
### React Paris 2026 {/*react-paris-2026*/}
1914
March 26 - 27, 2026. In-person in Paris, France (hybrid event)
2015

2116
[Website](https://react.paris/) - [Twitter](https://x.com/BeJS_)
22-
>>>>>>> 7c90c6eb4bb93a5eacb9cb4ad4ca496c32984636
2317

2418
### CityJS London 2026 {/*cityjs-london-2026*/}
2519
April 14-17, 2026. In-person in London

yarn.lock

Lines changed: 66 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -1250,17 +1250,10 @@
12501250
unist-util-visit "^4.0.0"
12511251
vfile "^5.0.0"
12521252

1253-
<<<<<<< HEAD
1254-
"@next/env@15.4.8":
1255-
version "15.4.8"
1256-
resolved "https://registry.yarnpkg.com/@next/env/-/env-15.4.8.tgz#f41741d07651958bccb31fb685da0303a9ef1373"
1257-
integrity sha512-LydLa2MDI1NMrOFSkO54mTc8iIHSttj6R6dthITky9ylXV2gCGi0bHQjVCtLGRshdRPjyh2kXbxJukDtBWQZtQ==
1258-
=======
1259-
"@next/env@15.1.9":
1260-
version "15.1.9"
1261-
resolved "https://registry.yarnpkg.com/@next/env/-/env-15.1.9.tgz#3569b6dd6a9b0af998fc6e4902da6b9ed2fc36c9"
1262-
integrity sha512-Te1wbiJ//I40T7UePOUG8QBwh+VVMCc0OTuqesOcD3849TVOVOyX4Hdrkx7wcpLpy/LOABIcGyLX5P/SzzXhFA==
1263-
>>>>>>> e22544e68d6fffda33332771efe27034739f35a4
1253+
"@next/env@16.1.5":
1254+
version "16.1.5"
1255+
resolved "https://registry.yarnpkg.com/@next/env/-/env-16.1.5.tgz#83740cf3a0e617848c53c154b41cf141f0f536ca"
1256+
integrity sha512-CRSCPJiSZoi4Pn69RYBDI9R7YK2g59vLexPQFXY0eyw+ILevIenCywzg+DqmlBik9zszEnw2HLFOUlLAcJbL7g==
12641257

12651258
"@next/eslint-plugin-next@12.0.3":
12661259
version "12.0.3"
@@ -1269,87 +1262,45 @@
12691262
dependencies:
12701263
glob "7.1.7"
12711264

1272-
<<<<<<< HEAD
1273-
"@next/swc-darwin-arm64@15.4.8":
1274-
version "15.4.8"
1275-
resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.4.8.tgz#f5030219421079036720b5948ea9de9bee02ac34"
1276-
integrity sha512-Pf6zXp7yyQEn7sqMxur6+kYcywx5up1J849psyET7/8pG2gQTVMjU3NzgIt8SeEP5to3If/SaWmaA6H6ysBr1A==
1277-
1278-
"@next/swc-darwin-x64@15.4.8":
1279-
version "15.4.8"
1280-
resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-15.4.8.tgz#3fc796bd522aee30eff608448919e0ea1c1da7d1"
1281-
integrity sha512-xla6AOfz68a6kq3gRQccWEvFC/VRGJmA/QuSLENSO7CZX5WIEkSz7r1FdXUjtGCQ1c2M+ndUAH7opdfLK1PQbw==
1282-
1283-
"@next/swc-linux-arm64-gnu@15.4.8":
1284-
version "15.4.8"
1285-
resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.4.8.tgz#5c7bf6a0de49c2b4c21bc8bdb3b5e431dd922c7d"
1286-
integrity sha512-y3fmp+1Px/SJD+5ntve5QLZnGLycsxsVPkTzAc3zUiXYSOlTPqT8ynfmt6tt4fSo1tAhDPmryXpYKEAcoAPDJw==
1287-
1288-
"@next/swc-linux-arm64-musl@15.4.8":
1289-
version "15.4.8"
1290-
resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.4.8.tgz#94e47838715e68a696b33295f4389a60bd8af00a"
1291-
integrity sha512-DX/L8VHzrr1CfwaVjBQr3GWCqNNFgyWJbeQ10Lx/phzbQo3JNAxUok1DZ8JHRGcL6PgMRgj6HylnLNndxn4Z6A==
1292-
1293-
"@next/swc-linux-x64-gnu@15.4.8":
1294-
version "15.4.8"
1295-
resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.4.8.tgz#4f9656e8bf9f28dac1970d6ff95a245014646417"
1296-
integrity sha512-9fLAAXKAL3xEIFdKdzG5rUSvSiZTLLTCc6JKq1z04DR4zY7DbAPcRvNm3K1inVhTiQCs19ZRAgUerHiVKMZZIA==
1297-
1298-
"@next/swc-linux-x64-musl@15.4.8":
1299-
version "15.4.8"
1300-
resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.4.8.tgz#c5c64e18370f54f6474e58bb01b12594a4ecdde6"
1301-
integrity sha512-s45V7nfb5g7dbS7JK6XZDcapicVrMMvX2uYgOHP16QuKH/JA285oy6HcxlKqwUNaFY/UC6EvQ8QZUOo19cBKSA==
1302-
1303-
"@next/swc-win32-arm64-msvc@15.4.8":
1304-
version "15.4.8"
1305-
resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.4.8.tgz#722d18ed569bee9e4a6651acdc756f9633cbee1f"
1306-
integrity sha512-KjgeQyOAq7t/HzAJcWPGA8X+4WY03uSCZ2Ekk98S9OgCFsb6lfBE3dbUzUuEQAN2THbwYgFfxX2yFTCMm8Kehw==
1307-
1308-
"@next/swc-win32-x64-msvc@15.4.8":
1309-
version "15.4.8"
1310-
resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.4.8.tgz#a29a53cd262ec5093b9ac24a5fd5e4540ec64eb4"
1311-
integrity sha512-Exsmf/+42fWVnLMaZHzshukTBxZrSwuuLKFvqhGHJ+mC1AokqieLY/XzAl3jc/CqhXLqLY3RRjkKJ9YnLPcRWg==
1312-
=======
1313-
"@next/swc-darwin-arm64@15.1.9":
1314-
version "15.1.9"
1315-
resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.1.9.tgz#7b95fc3b2cd5108b514c949c3bddb3a9b42a714e"
1316-
integrity sha512-sQF6MfW4nk0PwMYYq8xNgqyxZJGIJV16QqNDgaZ5ze9YoVzm4/YNx17X0exZudayjL9PF0/5RGffDtzXapch0Q==
1317-
1318-
"@next/swc-darwin-x64@15.1.9":
1319-
version "15.1.9"
1320-
resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-15.1.9.tgz#bda6b37e0deeb64f4139cc70b37e370bd3367be8"
1321-
integrity sha512-fp0c1rB6jZvdSDhprOur36xzQvqelAkNRXM/An92sKjjtaJxjlqJR8jiQLQImPsClIu8amQn+ZzFwl1lsEf62w==
1322-
1323-
"@next/swc-linux-arm64-gnu@15.1.9":
1324-
version "15.1.9"
1325-
resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.1.9.tgz#546717f65de5fa610cd211183bd1be63050ab1c4"
1326-
integrity sha512-77rYykF6UtaXvxh9YyRIKoaYPI6/YX6cy8j1DL5/1XkjbfOwFDfTEhH7YGPqG/ePl+emBcbDYC2elgEqY2e+ag==
1327-
1328-
"@next/swc-linux-arm64-musl@15.1.9":
1329-
version "15.1.9"
1330-
resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.1.9.tgz#3594f47a94fd52e1aba00f59793171de9386f71a"
1331-
integrity sha512-uZ1HazKcyWC7RA6j+S/8aYgvxmDqwnG+gE5S9MhY7BTMj7ahXKunpKuX8/BA2M7OvINLv7LTzoobQbw928p3WA==
1332-
1333-
"@next/swc-linux-x64-gnu@15.1.9":
1334-
version "15.1.9"
1335-
resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.1.9.tgz#77cc834636688e44fea4c9cee800649a4ed92b0d"
1336-
integrity sha512-gQIX1d3ct2RBlgbbWOrp+SHExmtmFm/HSW1Do5sSGMDyzbkYhS2sdq5LRDJWWsQu+/MqpgJHqJT6ORolKp/U1g==
1337-
1338-
"@next/swc-linux-x64-musl@15.1.9":
1339-
version "15.1.9"
1340-
resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.1.9.tgz#88783a8968d0c0e4f274b68569b73c19ee2feecb"
1341-
integrity sha512-fJOwxAbCeq6Vo7pXZGDP6iA4+yIBGshp7ie2Evvge7S7lywyg7b/SGqcvWq/jYcmd0EbXdb7hBfdqSQwTtGTPg==
1342-
1343-
"@next/swc-win32-arm64-msvc@15.1.9":
1344-
version "15.1.9"
1345-
resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.1.9.tgz#1b7024cee3eefe4bcf8f81e7cbffe6aeb15d32ea"
1346-
integrity sha512-crfbUkAd9PVg9nGfyjSzQbz82dPvc4pb1TeP0ZaAdGzTH6OfTU9kxidpFIogw0DYIEadI7hRSvuihy2NezkaNQ==
1347-
1348-
"@next/swc-win32-x64-msvc@15.1.9":
1349-
version "15.1.9"
1350-
resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.1.9.tgz#92044825d0f9e017d6a27ab69fc8c8f5ca9dc239"
1351-
integrity sha512-SBB0oA4E2a0axUrUwLqXlLkSn+bRx9OWU6LheqmRrO53QEAJP7JquKh3kF0jRzmlYOWFZtQwyIWJMEJMtvvDcQ==
1352-
>>>>>>> e22544e68d6fffda33332771efe27034739f35a4
1265+
"@next/swc-darwin-arm64@16.1.5":
1266+
version "16.1.5"
1267+
resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.1.5.tgz#d664b92c24f2b96e5bd21251644540e5991e44fb"
1268+
integrity sha512-eK7Wdm3Hjy/SCL7TevlH0C9chrpeOYWx2iR7guJDaz4zEQKWcS1IMVfMb9UKBFMg1XgzcPTYPIp1Vcpukkjg6Q==
1269+
1270+
"@next/swc-darwin-x64@16.1.5":
1271+
version "16.1.5"
1272+
resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-16.1.5.tgz#196cc91fcf535f0caceb21c9d4f656fe08d26caf"
1273+
integrity sha512-foQscSHD1dCuxBmGkbIr6ScAUF6pRoDZP6czajyvmXPAOFNnQUJu2Os1SGELODjKp/ULa4fulnBWoHV3XdPLfA==
1274+
1275+
"@next/swc-linux-arm64-gnu@16.1.5":
1276+
version "16.1.5"
1277+
resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.1.5.tgz#3e55467655850d5daebaabcfc62be170589b4cbc"
1278+
integrity sha512-qNIb42o3C02ccIeSeKjacF3HXotGsxh/FMk/rSRmCzOVMtoWH88odn2uZqF8RLsSUWHcAqTgYmPD3pZ03L9ZAA==
1279+
1280+
"@next/swc-linux-arm64-musl@16.1.5":
1281+
version "16.1.5"
1282+
resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.1.5.tgz#c034c1783338d597d5b9aa0735ce9648592b7dfb"
1283+
integrity sha512-U+kBxGUY1xMAzDTXmuVMfhaWUZQAwzRaHJ/I6ihtR5SbTVUEaDRiEU9YMjy1obBWpdOBuk1bcm+tsmifYSygfw==
1284+
1285+
"@next/swc-linux-x64-gnu@16.1.5":
1286+
version "16.1.5"
1287+
resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.1.5.tgz#82d946ade981b8ee2cc308427817841d5ccb8fa4"
1288+
integrity sha512-gq2UtoCpN7Ke/7tKaU7i/1L7eFLfhMbXjNghSv0MVGF1dmuoaPeEVDvkDuO/9LVa44h5gqpWeJ4mRRznjDv7LA==
1289+
1290+
"@next/swc-linux-x64-musl@16.1.5":
1291+
version "16.1.5"
1292+
resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.1.5.tgz#3f3738014c9555d7fd195e9413840a485cedfbba"
1293+
integrity sha512-bQWSE729PbXT6mMklWLf8dotislPle2L70E9q6iwETYEOt092GDn0c+TTNj26AjmeceSsC4ndyGsK5nKqHYXjQ==
1294+
1295+
"@next/swc-win32-arm64-msvc@16.1.5":
1296+
version "16.1.5"
1297+
resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.1.5.tgz#359e0ab022a41389a8d9700e41b71338752bd0ba"
1298+
integrity sha512-LZli0anutkIllMtTAWZlDqdfvjWX/ch8AFK5WgkNTvaqwlouiD1oHM+WW8RXMiL0+vAkAJyAGEzPPjO+hnrSNQ==
1299+
1300+
"@next/swc-win32-x64-msvc@16.1.5":
1301+
version "16.1.5"
1302+
resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.1.5.tgz#92c0161dec3c466b120a312199a376d029b92ce2"
1303+
integrity sha512-7is37HJTNQGhjPpQbkKjKEboHYQnCgpVt/4rBrrln0D9nderNxZ8ZWs8w1fAtzUx7wEyYjQ+/13myFgFj6K2Ng==
13531304

13541305
"@nodelib/fs.scandir@2.1.5":
13551306
version "2.1.5"
@@ -2369,6 +2320,11 @@ base64-js@^1.3.1:
23692320
resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
23702321
integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
23712322

2323+
baseline-browser-mapping@^2.8.3:
2324+
version "2.10.0"
2325+
resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.0.tgz#5b09935025bf8a80e29130251e337c6a7fc8cbb9"
2326+
integrity sha512-lIyg0szRfYbiy67j9KN8IyeD7q7hcmqnJ1ddWmNt19ItGpNN64mnllmxUNFIOdOm6by97jlL6wfpTTJrmnjWAA==
2327+
23722328
binary-extensions@^2.0.0:
23732329
version "2.2.0"
23742330
resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
@@ -3508,6 +3464,7 @@ eslint-plugin-jsx-a11y@^6.4.1:
35083464

35093465
"eslint-plugin-local-rules@link:eslint-local-rules":
35103466
version "0.0.0"
3467+
uid ""
35113468

35123469
eslint-plugin-react-compiler@^19.0.0-beta-e552027-20250112:
35133470
version "19.0.0-beta-e552027-20250112"
@@ -5930,48 +5887,27 @@ next-tick@^1.1.0:
59305887
resolved "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz"
59315888
integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
59325889

5933-
<<<<<<< HEAD
5934-
next@15.4.8:
5935-
version "15.4.8"
5936-
resolved "https://registry.yarnpkg.com/next/-/next-15.4.8.tgz#0f20a6cad613dc34547fa6519b2d09005ac370ca"
5937-
integrity sha512-jwOXTz/bo0Pvlf20FSb6VXVeWRssA2vbvq9SdrOPEg9x8E1B27C2rQtvriAn600o9hH61kjrVRexEffv3JybuA==
5938-
dependencies:
5939-
"@next/env" "15.4.8"
5940-
=======
5941-
next@15.1.9:
5942-
version "15.1.9"
5943-
resolved "https://registry.yarnpkg.com/next/-/next-15.1.9.tgz#eaab46d7a57c881fadf748d8ba2a8c65ec27ad8f"
5944-
integrity sha512-OoQpDPV2i3o5Hnn46nz2x6fzdFxFO+JsU4ZES12z65/feMjPHKKHLDVQ2NuEvTaXTRisix/G5+6hyTkwK329kA==
5945-
dependencies:
5946-
"@next/env" "15.1.9"
5947-
"@swc/counter" "0.1.3"
5948-
>>>>>>> e22544e68d6fffda33332771efe27034739f35a4
5890+
next@16.1.5:
5891+
version "16.1.5"
5892+
resolved "https://registry.yarnpkg.com/next/-/next-16.1.5.tgz#95c9bc91bfb1bb0d3f2d441fdbb550bf18939edf"
5893+
integrity sha512-f+wE+NSbiQgh3DSAlTaw2FwY5yGdVViAtp8TotNQj4kk4Q8Bh1sC/aL9aH+Rg1YAVn18OYXsRDT7U/079jgP7w==
5894+
dependencies:
5895+
"@next/env" "16.1.5"
59495896
"@swc/helpers" "0.5.15"
5897+
baseline-browser-mapping "^2.8.3"
59505898
caniuse-lite "^1.0.30001579"
59515899
postcss "8.4.31"
59525900
styled-jsx "5.1.6"
59535901
optionalDependencies:
5954-
<<<<<<< HEAD
5955-
"@next/swc-darwin-arm64" "15.4.8"
5956-
"@next/swc-darwin-x64" "15.4.8"
5957-
"@next/swc-linux-arm64-gnu" "15.4.8"
5958-
"@next/swc-linux-arm64-musl" "15.4.8"
5959-
"@next/swc-linux-x64-gnu" "15.4.8"
5960-
"@next/swc-linux-x64-musl" "15.4.8"
5961-
"@next/swc-win32-arm64-msvc" "15.4.8"
5962-
"@next/swc-win32-x64-msvc" "15.4.8"
5963-
sharp "^0.34.3"
5964-
=======
5965-
"@next/swc-darwin-arm64" "15.1.9"
5966-
"@next/swc-darwin-x64" "15.1.9"
5967-
"@next/swc-linux-arm64-gnu" "15.1.9"
5968-
"@next/swc-linux-arm64-musl" "15.1.9"
5969-
"@next/swc-linux-x64-gnu" "15.1.9"
5970-
"@next/swc-linux-x64-musl" "15.1.9"
5971-
"@next/swc-win32-arm64-msvc" "15.1.9"
5972-
"@next/swc-win32-x64-msvc" "15.1.9"
5973-
sharp "^0.33.5"
5974-
>>>>>>> e22544e68d6fffda33332771efe27034739f35a4
5902+
"@next/swc-darwin-arm64" "16.1.5"
5903+
"@next/swc-darwin-x64" "16.1.5"
5904+
"@next/swc-linux-arm64-gnu" "16.1.5"
5905+
"@next/swc-linux-arm64-musl" "16.1.5"
5906+
"@next/swc-linux-x64-gnu" "16.1.5"
5907+
"@next/swc-linux-x64-musl" "16.1.5"
5908+
"@next/swc-win32-arm64-msvc" "16.1.5"
5909+
"@next/swc-win32-x64-msvc" "16.1.5"
5910+
sharp "^0.34.4"
59755911

59765912
nice-try@^1.0.4:
59775913
version "1.0.5"
@@ -7451,7 +7387,7 @@ setprototypeof@1.2.0, setprototypeof@~1.2.0:
74517387
resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"
74527388
integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
74537389

7454-
sharp@^0.34.3:
7390+
sharp@^0.34.4:
74557391
version "0.34.5"
74567392
resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.34.5.tgz#b6f148e4b8c61f1797bde11a9d1cfebbae2c57b0"
74577393
integrity sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==

0 commit comments

Comments
 (0)