Skip to content

Commit 9ab1d07

Browse files
markdalgleishmarkdalgleish
authored
fix: migrate route default property to Component (#68)
update to latest experimental release: `0.0.0-experimental-f2b42587c`
1 parent 0989296 commit 9ab1d07

File tree

6 files changed

+30
-45
lines changed

6 files changed

+30
-45
lines changed

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"devDependencies": {
2727
"@parcel/runtime-rsc": "^2.15.0",
2828
"@playwright/test": "^1.52.0",
29-
"@react-router/dev": "0.0.0-experimental-e7eb25a7b",
30-
"@react-router/fs-routes": "0.0.0-experimental-e7eb25a7b",
29+
"@react-router/dev": "0.0.0-experimental-f2b42587c",
30+
"@react-router/fs-routes": "0.0.0-experimental-f2b42587c",
3131
"@trivago/prettier-plugin-sort-imports": "^5.2.2",
3232
"@types/express": "^4",
3333
"@types/node": "^22.14.1",
@@ -38,7 +38,7 @@
3838
"prettier": "^3.5.3",
3939
"react": "^19.1.0",
4040
"react-dom": "^19.1.0",
41-
"react-router": "0.0.0-experimental-e7eb25a7b",
41+
"react-router": "0.0.0-experimental-f2b42587c",
4242
"react-server-dom-parcel": "^19.1.0",
4343
"remix-utils": "^8.7.0",
4444
"server-only": "0.0.1",

‎packages/resolver/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
},
3131
"devDependencies": {
3232
"@parcel/types": "^2.15.0",
33-
"@react-router/dev": "0.0.0-experimental-e7eb25a7b",
33+
"@react-router/dev": "0.0.0-experimental-f2b42587c",
3434
"@types/express": "^5.0.1",
3535
"@types/react": "^19.1.2",
3636
"@types/react-dom": "^19.1.2",
3737
"react": "^19.1.0",
3838
"react-dom": "^19.1.0",
39-
"react-router": "0.0.0-experimental-e7eb25a7b",
39+
"react-router": "0.0.0-experimental-f2b42587c",
4040
"react-server-dom-parcel": "^19.1.0",
4141
"tsup": "^8.4.0"
4242
},

‎packages/transformer/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"@types/react-dom": "^19.1.2",
4040
"react": "^19.1.0",
4141
"react-dom": "^19.1.0",
42-
"react-router": "0.0.0-experimental-e7eb25a7b",
42+
"react-router": "0.0.0-experimental-f2b42587c",
4343
"tsup": "^8.4.0"
4444
},
4545
"engines": {

‎packages/transformer/src/transformer.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ export default new Transformer({
204204
if (CLIENT_NON_COMPONENT_EXPORTS_SET.has(staticExport)) {
205205
code += `export { ${staticExport} } from "${getClientModuleId()}";\n`;
206206
} else if (staticExport === "ServerComponent") {
207-
code += `export { ServerComponent as default } from "${getServerModuleId()}";\n`;
207+
code += `export { ServerComponent as Component } from "${getServerModuleId()}";\n`;
208208
} else {
209209
code += `export { ${staticExport} } from "${getServerModuleId()}";\n`;
210210
}
@@ -214,7 +214,8 @@ export default new Transformer({
214214
if (CLIENT_NON_COMPONENT_EXPORTS_SET.has(staticExport)) {
215215
code += `export { ${staticExport} } from "${getClientModuleId()}";\n`;
216216
} else {
217-
code += `export { ${staticExport} } from "${getServerModuleId()}";\n`;
217+
const reexportName = staticExport === "default" ? "Component" : null;
218+
code += `export { ${staticExport}${reexportName ? ` as ${reexportName}` : ""} } from "${getServerModuleId()}";\n`;
218219
}
219220
}
220221
}

‎packages/typegen/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
"@parcel/plugin": "^2.15.0"
2323
},
2424
"devDependencies": {
25-
"@react-router/dev": "0.0.0-experimental-e7eb25a7b",
25+
"@react-router/dev": "0.0.0-experimental-f2b42587c",
2626
"execa": "^9.5.2",
27-
"react-router": "0.0.0-experimental-e7eb25a7b",
27+
"react-router": "0.0.0-experimental-f2b42587c",
2828
"tsup": "^8.4.0"
2929
},
3030
"engines": {

‎yarn.lock‎

Lines changed: 19 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1707,10 +1707,10 @@
17071707
dependencies:
17081708
playwright "1.52.0"
17091709

1710-
"@react-router/dev@0.0.0-experimental-e7eb25a7b":
1711-
version "0.0.0-experimental-e7eb25a7b"
1712-
resolved "https://registry.yarnpkg.com/@react-router/dev/-/dev-0.0.0-experimental-e7eb25a7b.tgz#19c287b601d419a90508ef777cf5e3f482461903"
1713-
integrity sha512-hYKLldbl0xN6jlF242FCvTOMy6JeGAIOG4NvXPDNcKP7+N37a1kEZIMqpDNWaGdhQ/XtIGF50U3Ym9hWXavcug==
1710+
"@react-router/dev@0.0.0-experimental-f2b42587c":
1711+
version "0.0.0-experimental-f2b42587c"
1712+
resolved "https://registry.yarnpkg.com/@react-router/dev/-/dev-0.0.0-experimental-f2b42587c.tgz#7d25d32417cde62d637474f8a6d1b33cd8dad317"
1713+
integrity sha512-CMKdj0URx1tUrB1qJl0WD+60yqDwKTa0dgGxRKBZkqLW1rO5T5fPPhf+VE+TaGZc+KWCL+iQZVuk+pOz4NQ/gA==
17141714
dependencies:
17151715
"@babel/core" "^7.21.8"
17161716
"@babel/generator" "^7.21.5"
@@ -1721,7 +1721,7 @@
17211721
"@babel/traverse" "^7.23.2"
17221722
"@babel/types" "^7.22.5"
17231723
"@npmcli/package-json" "^4.0.1"
1724-
"@react-router/node" "0.0.0-experimental-e7eb25a7b"
1724+
"@react-router/node" "0.0.0-experimental-f2b42587c"
17251725
arg "^5.0.1"
17261726
babel-dead-code-elimination "^1.0.6"
17271727
chokidar "^4.0.0"
@@ -1740,17 +1740,17 @@
17401740
valibot "^0.41.0"
17411741
vite-node "^3.1.4"
17421742

1743-
"@react-router/fs-routes@0.0.0-experimental-e7eb25a7b":
1744-
version "0.0.0-experimental-e7eb25a7b"
1745-
resolved "https://registry.yarnpkg.com/@react-router/fs-routes/-/fs-routes-0.0.0-experimental-e7eb25a7b.tgz#ec32a902432c07932f36f0f3628a37fb2c5ce2a1"
1746-
integrity sha512-YcNC6Ulw2kMljCusi4lQoXqUA/bTdhbQaqepgeYnq3jV/MrXqhciKHxvPm02bOmL9vvvqsXmrSIH0wcdcjx0Mg==
1743+
"@react-router/fs-routes@0.0.0-experimental-f2b42587c":
1744+
version "0.0.0-experimental-f2b42587c"
1745+
resolved "https://registry.yarnpkg.com/@react-router/fs-routes/-/fs-routes-0.0.0-experimental-f2b42587c.tgz#38b69498a477ffdb45c105f87365c0e9b0519935"
1746+
integrity sha512-7LE5VGHSPyXpK7KiWutQur4poWfx8Nz5Aeu1kE33HCLMe9P+dpx12PS3I5K7gP+cP0p9RXPNJnEq6MwNn0S6Tw==
17471747
dependencies:
17481748
minimatch "^9.0.0"
17491749

1750-
"@react-router/node@0.0.0-experimental-e7eb25a7b":
1751-
version "0.0.0-experimental-e7eb25a7b"
1752-
resolved "https://registry.yarnpkg.com/@react-router/node/-/node-0.0.0-experimental-e7eb25a7b.tgz#07f59256705bdb54488ff2da90bf9b684c6c7b9a"
1753-
integrity sha512-1VZWz4R2+V6QsKaiSFy3512I0iNXPHMT/5VUa4AD+zVPvd+heBx1PuPGJs850oyioLfcAvVSnWOn6jaFSPi83w==
1750+
"@react-router/node@0.0.0-experimental-f2b42587c":
1751+
version "0.0.0-experimental-f2b42587c"
1752+
resolved "https://registry.yarnpkg.com/@react-router/node/-/node-0.0.0-experimental-f2b42587c.tgz#39f49a19df47dd800e2be78e7b7a9bd8bb06cc26"
1753+
integrity sha512-/a8ti2a+eUvaQI3Ac1aVgyiqPgTM8kxJhyBlM29nxLAqe+fecnm9FAPTLJw97NLCsR+Hz1u8GrT4QseGQH055Q==
17541754
dependencies:
17551755
"@mjackson/node-fetch-server" "^0.2.0"
17561756
source-map-support "^0.5.21"
@@ -3802,10 +3802,10 @@ react-refresh@^0.16.0:
38023802
resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.16.0.tgz#e7d45625f05c9709466d09348a25d22f79b2ad23"
38033803
integrity sha512-FPvF2XxTSikpJxcr+bHut2H4gJ17+18Uy20D5/F+SKzFap62R3cM5wH6b8WN3LyGSYeQilLEcJcR1fjBSI2S1A==
38043804

3805-
react-router@0.0.0-experimental-e7eb25a7b:
3806-
version "0.0.0-experimental-e7eb25a7b"
3807-
resolved "https://registry.yarnpkg.com/react-router/-/react-router-0.0.0-experimental-e7eb25a7b.tgz#bba469b9ee9ab0242f5152db1a4976c9d8dffc80"
3808-
integrity sha512-BGdwBLRD+7MvN0N5XE1ODBaq07kDrU7EiYsIQMNhb7+trqPjaEfWBylKKrnOqUNgHPjT4mQRo9iv6r3zh6kczg==
3805+
react-router@0.0.0-experimental-f2b42587c:
3806+
version "0.0.0-experimental-f2b42587c"
3807+
resolved "https://registry.yarnpkg.com/react-router/-/react-router-0.0.0-experimental-f2b42587c.tgz#039d5dd438300e25ca22c6c17c8a56eb0001ca04"
3808+
integrity sha512-jtHyQr0zw6AncwYe1gaHGXIxT823lGY0XyRWYBKE79HeBK5/E0KKGJh9NpkoMz4wvM3oCDiDRJ+D0bI9lMHmXA==
38093809
dependencies:
38103810
cookie "^1.0.1"
38113811
set-cookie-parser "^2.6.0"
@@ -4116,16 +4116,7 @@ stream-slice@^0.1.2:
41164116
resolved "https://registry.yarnpkg.com/stream-slice/-/stream-slice-0.1.2.tgz#2dc4f4e1b936fb13f3eb39a2def1932798d07a4b"
41174117
integrity sha512-QzQxpoacatkreL6jsxnVb7X5R/pGw9OUv2qWTYWnmLpg4NdN31snPy/f3TdQE1ZUXaThRvj1Zw4/OGg0ZkaLMA==
41184118

4119-
"string-width-cjs@npm:string-width@^4.2.0":
4120-
version "4.2.3"
4121-
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
4122-
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
4123-
dependencies:
4124-
emoji-regex "^8.0.0"
4125-
is-fullwidth-code-point "^3.0.0"
4126-
strip-ansi "^6.0.1"
4127-
4128-
string-width@^4.1.0:
4119+
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0:
41294120
version "4.2.3"
41304121
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
41314122
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -4143,14 +4134,7 @@ string-width@^5.0.1, string-width@^5.1.2:
41434134
emoji-regex "^9.2.2"
41444135
strip-ansi "^7.0.1"
41454136

4146-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
4147-
version "6.0.1"
4148-
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
4149-
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
4150-
dependencies:
4151-
ansi-regex "^5.0.1"
4152-
4153-
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
4137+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
41544138
version "6.0.1"
41554139
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
41564140
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==

0 commit comments

Comments
 (0)