diff --git a/patches/react-router-hono-server.patch b/patches/react-router-hono-server.patch index 7a9ea4e..6b09840 100644 --- a/patches/react-router-hono-server.patch +++ b/patches/react-router-hono-server.patch @@ -14,10 +14,37 @@ index 68742808892c1282ccff1e3321167862196d1229..f9a9249e1d1e573018d7ff3d3b967c4a /** * The Node.js Adapter rewrites the global Request/Response and uses a lightweight Request/Response to improve performance. diff --git a/dist/adapters/node.js b/dist/adapters/node.js -index 481dec801537f6ccf7f7a8a8e2294f4b0f20bb7d..0fbc43c3a345b341a08e8179ea0eabfaca62e3b3 100644 +index 481dec801537f6ccf7f7a8a8e2294f4b0f20bb7d..980fecf219dd0c501ed415e36985ec56d997f14f 100644 --- a/dist/adapters/node.js +++ b/dist/adapters/node.js -@@ -86,6 +86,7 @@ async function createHonoServer(options) { +@@ -46,16 +46,22 @@ async function createHonoServer(options) { + } + await mergedOptions.beforeAll?.(app); + app.use( +- `/${import.meta.env.REACT_ROUTER_HONO_SERVER_ASSETS_DIR}/*`, ++ `${__PREFIX__}/${import.meta.env.REACT_ROUTER_HONO_SERVER_ASSETS_DIR}/*`, + cache(60 * 60 * 24 * 365), + // 1 year +- serveStatic({ root: clientBuildPath }) ++ serveStatic({ ++ root: clientBuildPath, ++ rewriteRequestPath: path => path.replace(__PREFIX__, "/") ++ }) + ); + app.use( +- "*", ++ `${__PREFIX__}/assets/*`, + cache(60 * 60), + // 1 hour +- serveStatic({ root: PRODUCTION ? clientBuildPath : "./public" }) ++ serveStatic({ ++ root: PRODUCTION ? clientBuildPath : "./public", ++ rewriteRequestPath: path => path.replace(__PREFIX__, "/") ++ }) + ); + if (mergedOptions.defaultLogger) { + app.use("*", logger()); +@@ -86,6 +92,7 @@ async function createHonoServer(options) { ...app, ...mergedOptions.customNodeServer, port: mergedOptions.port, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 16b08ef..f4ca1fe 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,7 +9,7 @@ patchedDependencies: hash: 915164bae9a5d47bb0e7edf0cbbc4c7f0fedb1a2f9a5f6ef5c53d8fef6856211 path: patches/@shopify__lang-jsonc@1.0.0.patch react-router-hono-server: - hash: 3e40672a2de5e41f1467bc15484f757a23322b7df7b9a8b257ab7133e23f95b4 + hash: c547fd5480e282b40f1c4e668ab066a78abdde8fe04871a65bda306896b0a39e path: patches/react-router-hono-server.patch importers: @@ -111,7 +111,7 @@ importers: version: 7.4.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) react-router-hono-server: specifier: ^2.11.0 - version: 2.11.0(patch_hash=3e40672a2de5e41f1467bc15484f757a23322b7df7b9a8b257ab7133e23f95b4)(@react-router/dev@7.4.0(@types/node@22.10.7)(jiti@1.21.7)(react-router@7.4.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(terser@5.39.0)(tsx@4.19.2)(typescript@5.8.2)(vite@6.2.2(@types/node@22.10.7)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.2)(yaml@2.7.0))(yaml@2.7.0))(@types/react@19.0.2)(bufferutil@4.0.9)(react-router@7.4.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(utf-8-validate@5.0.10)(vite@6.2.2(@types/node@22.10.7)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.0(patch_hash=c547fd5480e282b40f1c4e668ab066a78abdde8fe04871a65bda306896b0a39e)(@react-router/dev@7.4.0(@types/node@22.10.7)(jiti@1.21.7)(react-router@7.4.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(terser@5.39.0)(tsx@4.19.2)(typescript@5.8.2)(vite@6.2.2(@types/node@22.10.7)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.2)(yaml@2.7.0))(yaml@2.7.0))(@types/react@19.0.2)(bufferutil@4.0.9)(react-router@7.4.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(utf-8-validate@5.0.10)(vite@6.2.2(@types/node@22.10.7)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.2)(yaml@2.7.0)) react-stately: specifier: ^3.35.0 version: 3.35.0(react@19.0.0) @@ -6255,7 +6255,7 @@ snapshots: react-dom: 19.0.0(react@19.0.0) react-router: 7.4.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) - react-router-hono-server@2.11.0(patch_hash=3e40672a2de5e41f1467bc15484f757a23322b7df7b9a8b257ab7133e23f95b4)(@react-router/dev@7.4.0(@types/node@22.10.7)(jiti@1.21.7)(react-router@7.4.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(terser@5.39.0)(tsx@4.19.2)(typescript@5.8.2)(vite@6.2.2(@types/node@22.10.7)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.2)(yaml@2.7.0))(yaml@2.7.0))(@types/react@19.0.2)(bufferutil@4.0.9)(react-router@7.4.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(utf-8-validate@5.0.10)(vite@6.2.2(@types/node@22.10.7)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.2)(yaml@2.7.0)): + react-router-hono-server@2.11.0(patch_hash=c547fd5480e282b40f1c4e668ab066a78abdde8fe04871a65bda306896b0a39e)(@react-router/dev@7.4.0(@types/node@22.10.7)(jiti@1.21.7)(react-router@7.4.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(terser@5.39.0)(tsx@4.19.2)(typescript@5.8.2)(vite@6.2.2(@types/node@22.10.7)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.2)(yaml@2.7.0))(yaml@2.7.0))(@types/react@19.0.2)(bufferutil@4.0.9)(react-router@7.4.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(utf-8-validate@5.0.10)(vite@6.2.2(@types/node@22.10.7)(jiti@1.21.7)(terser@5.39.0)(tsx@4.19.2)(yaml@2.7.0)): dependencies: '@drizzle-team/brocli': 0.11.0 '@hono/node-server': 1.14.0(hono@4.7.5)