diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 984d553d62..c8312ad3ca 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -79,7 +79,7 @@ "@tanstack/router-core": "workspace:*", "@tanstack/start-client-core": "workspace:*", "@tanstack/start-storage-context": "workspace:*", - "h3-v2": "npm:h3@2.0.1-rc.5", + "h3-v2": "npm:h3@2.0.0-beta.5", "seroval": "^1.4.0", "tiny-invariant": "^1.3.3" }, diff --git a/packages/start-server-core/src/request-response.ts b/packages/start-server-core/src/request-response.ts index 2ed47f23ec..cf0e426db9 100644 --- a/packages/start-server-core/src/request-response.ts +++ b/packages/start-server-core/src/request-response.ts @@ -327,7 +327,7 @@ export function clearSession(config: Partial): Promise { // not public API export function getResponse() { const event = getH3Event() - return event.res + return event._res } // not public API (yet) diff --git a/packages/start-server-core/src/server-functions-handler.ts b/packages/start-server-core/src/server-functions-handler.ts index ba89eee858..8cd98cf30b 100644 --- a/packages/start-server-core/src/server-functions-handler.ts +++ b/packages/start-server-core/src/server-functions-handler.ts @@ -221,8 +221,8 @@ export const handleServerAction = async ({ return new Response( nonStreamingBody ? JSON.stringify(nonStreamingBody) : undefined, { - status: response.status, - statusText: response.statusText, + status: response?.status, + statusText: response?.statusText, headers: { 'Content-Type': 'application/json', [X_TSS_SERIALIZED]: 'true', @@ -251,8 +251,8 @@ export const handleServerAction = async ({ }, }) return new Response(stream, { - status: response.status, - statusText: response.statusText, + status: response?.status, + statusText: response?.statusText, headers: { 'Content-Type': 'application/x-ndjson', [X_TSS_SERIALIZED]: 'true', @@ -261,8 +261,8 @@ export const handleServerAction = async ({ } return new Response(undefined, { - status: response.status, - statusText: response.statusText, + status: response?.status, + statusText: response?.statusText, }) } catch (error: any) { if (error instanceof Response) { @@ -301,8 +301,8 @@ export const handleServerAction = async ({ ) const response = getResponse() return new Response(serializedError, { - status: response.status ?? 500, - statusText: response.statusText, + status: response?.status ?? 500, + statusText: response?.statusText, headers: { 'Content-Type': 'application/json', [X_TSS_SERIALIZED]: 'true', diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4c29a3d0e8..ab8840a37c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10101,8 +10101,8 @@ importers: specifier: workspace:* version: link:../start-storage-context h3-v2: - specifier: npm:h3@2.0.1-rc.5 - version: h3@2.0.1-rc.5(crossws@0.4.1(srvx@0.9.6)) + specifier: npm:h3@2.0.0-beta.5 + version: h3@2.0.0-beta.5(crossws@0.4.1(srvx@0.8.15)) seroval: specifier: ^1.4.0 version: 1.4.0 @@ -17718,8 +17718,8 @@ packages: h3@1.15.4: resolution: {integrity: sha512-z5cFQWDffyOe4vQ9xIqNfCZdV4p//vy6fBnr8Q1AWnVZ0teurKMG66rLj++TKwKPUP3u7iMUvrvKaEUiQw2QWQ==} - h3@2.0.1-rc.2: - resolution: {integrity: sha512-2vS7OETzPDzGQxmmcs6ttu7p0NW25zAdkPXYOr43dn4GZf81uUljJvupa158mcpUGpsQUqIy4O4THWUQT1yVeA==} + h3@2.0.0-beta.5: + resolution: {integrity: sha512-ApIkLH+nTxzCC0Nq/GN1v6jkvu2eOLfdTnTs6ghiuG1EYHWJBDLzhk5tn7SZMEUNsLUjG4qfmqzBx2LG9I7Q/w==} engines: {node: '>=20.11.1'} peerDependencies: crossws: ^0.4.1 @@ -17727,8 +17727,8 @@ packages: crossws: optional: true - h3@2.0.1-rc.5: - resolution: {integrity: sha512-qkohAzCab0nLzXNm78tBjZDvtKMTmtygS8BJLT3VPczAQofdqlFXDPkXdLMJN4r05+xqneG8snZJ0HgkERCZTg==} + h3@2.0.1-rc.2: + resolution: {integrity: sha512-2vS7OETzPDzGQxmmcs6ttu7p0NW25zAdkPXYOr43dn4GZf81uUljJvupa158mcpUGpsQUqIy4O4THWUQT1yVeA==} engines: {node: '>=20.11.1'} peerDependencies: crossws: ^0.4.1 @@ -20032,9 +20032,6 @@ packages: rou3@0.5.1: resolution: {integrity: sha512-OXMmJ3zRk2xeXFGfA3K+EOPHC5u7RDFG7lIOx0X1pdnhUkI8MdVrbV+sNsD80ElpUZ+MRHdyxPnFthq9VHs8uQ==} - rou3@0.7.10: - resolution: {integrity: sha512-aoFj6f7MJZ5muJ+Of79nrhs9N3oLGqi2VEMe94Zbkjb6Wupha46EuoYgpWSOZlXww3bbd8ojgXTAA2mzimX5Ww==} - rou3@0.7.8: resolution: {integrity: sha512-21X/el5fdOaEsqwl3an/d9kpZ8hshVIyrwFCpsoleJ4ccAGRbN+PVoxyXzWXkHDxfMkVnLe4yzx+imz2qoem2Q==} @@ -20345,11 +20342,6 @@ packages: engines: {node: '>=20.16.0'} hasBin: true - srvx@0.9.6: - resolution: {integrity: sha512-5L4rT6qQqqb+xcoDoklUgCNdmzqJ6vbcDRwPVGRXewF55IJH0pqh0lQlrJ266ZWTKJ4mfeioqHQJeAYesS+RrQ==} - engines: {node: '>=20.16.0'} - hasBin: true - stable-hash-x@0.2.0: resolution: {integrity: sha512-o3yWv49B/o4QZk5ZcsALc6t0+eCelPc44zZsLtCQnZPDwFpDYSWcDnrv2TtMmMbQ7uKo3J0HTURCqckw23czNQ==} engines: {node: '>=12.0.0'} @@ -28764,11 +28756,6 @@ snapshots: optionalDependencies: srvx: 0.8.15 - crossws@0.4.1(srvx@0.9.6): - optionalDependencies: - srvx: 0.9.6 - optional: true - css-loader@7.1.2(@rspack/core@1.2.2(@swc/helpers@0.5.15))(webpack@5.97.1): dependencies: icss-utils: 5.1.0(postcss@8.5.6) @@ -30123,7 +30110,7 @@ snapshots: ufo: 1.6.1 uncrypto: 0.1.3 - h3@2.0.1-rc.2(crossws@0.4.1(srvx@0.8.15)): + h3@2.0.0-beta.5(crossws@0.4.1(srvx@0.8.15)): dependencies: cookie-es: 2.0.0 fetchdts: 0.1.7 @@ -30132,12 +30119,14 @@ snapshots: optionalDependencies: crossws: 0.4.1(srvx@0.8.15) - h3@2.0.1-rc.5(crossws@0.4.1(srvx@0.9.6)): + h3@2.0.1-rc.2(crossws@0.4.1(srvx@0.8.15)): dependencies: - rou3: 0.7.10 - srvx: 0.9.6 + cookie-es: 2.0.0 + fetchdts: 0.1.7 + rou3: 0.7.8 + srvx: 0.8.15 optionalDependencies: - crossws: 0.4.1(srvx@0.9.6) + crossws: 0.4.1(srvx@0.8.15) handle-thing@2.0.1: {} @@ -32650,8 +32639,6 @@ snapshots: rou3@0.5.1: {} - rou3@0.7.10: {} - rou3@0.7.8: {} router@2.2.0: @@ -33055,8 +33042,6 @@ snapshots: dependencies: cookie-es: 2.0.0 - srvx@0.9.6: {} - stable-hash-x@0.2.0: {} stack-trace@0.0.10: {}