diff --git a/.gitignore b/.gitignore index 1a2663c4..bad88298 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ dist .wrangler .mf test-results +*.tsbuildinfo diff --git a/examples/child-process/src/lib/ambient.d.ts b/examples/child-process/src/lib/ambient.d.ts index ace12053..d21256e0 100644 --- a/examples/child-process/src/lib/ambient.d.ts +++ b/examples/child-process/src/lib/ambient.d.ts @@ -1,4 +1,2 @@ declare const __vite_server: import("vite").ViteDevServer; -declare const __vite_environment_rsc__: import( - "./vite/environment", -).ChildProcessFetchDevEnvironment; +declare const __vite_environment_rsc__: import("./vite/environment").ChildProcessFetchDevEnvironment; diff --git a/examples/react-server/e2e/helper.ts b/examples/react-server/e2e/helper.ts index e654f308..f1cf1475 100644 --- a/examples/react-server/e2e/helper.ts +++ b/examples/react-server/e2e/helper.ts @@ -3,6 +3,7 @@ import { sleep } from "@hiogawa/utils"; import { type Page, type Request, expect, test } from "@playwright/test"; export const testNoJs = test.extend({ + // @ts-ignore javaScriptEnabled: ({}, use) => use(false), }); diff --git a/examples/react-server/src/types/react-modules.d.ts b/examples/react-server/src/types/react-modules.d.ts index b2566737..6035a63a 100644 --- a/examples/react-server/src/types/react-modules.d.ts +++ b/examples/react-server/src/types/react-modules.d.ts @@ -8,9 +8,7 @@ declare module "react-server-dom-webpack/server.edge" { data: T, bundlerConfig: import(".").BundlerConfig, opitons?: { - onError: import( - "react-dom/server", - ).RenderToReadableStreamOptions["onError"]; + onError: import("react-dom/server").RenderToReadableStreamOptions["onError"]; }, ): ReadableStream; diff --git a/packages/workerd/src/worker.ts b/packages/workerd/src/worker.ts index 81a21fb1..3c8af967 100644 --- a/packages/workerd/src/worker.ts +++ b/packages/workerd/src/worker.ts @@ -44,10 +44,11 @@ export class RunnerObject extends DurableObject implements RunnerRpc { tinyassert(handler.fetch); const env = objectPickBy(this.#env, (_v, k) => !k.startsWith("__vite")); - return handler.fetch(request, env, { + return handler.fetch(request as any, env, { waitUntil(_promise: Promise) {}, passThroughOnException() {}, abort(_reason?: any) {}, + props: {}, }); } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1cc1ffa0..27d1fbce 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,7 +5,7 @@ settings: excludeLinksFromLockfile: false overrides: - vite: ^6.0.3 + vite: ^6.0.11 importers: @@ -844,7 +844,7 @@ packages: '@hiogawa/vite-plugin-ssr-middleware@0.0.3': resolution: {integrity: sha512-84bzaAuImty4s4vHjOk5MQMzmDs0W0GP43fOTFhsBfj/MSJCNJ68elmPNZWs57WkIEzcdB4haY/P8Nf4ZGH8Qw==} peerDependencies: - vite: ^6.0.3 + vite: ^6.0.11 '@iconify/types@2.0.0': resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==} @@ -1026,9 +1026,6 @@ packages: '@types/json-schema@7.0.15': resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} - '@types/node@20.17.15': - resolution: {integrity: sha512-ymrDMpEhuYz7PXTItXhY0ZDBDZT/RgsmFM9rBiRLOSVX1HKJhhrLXuLY00fHsFsugYT1wZU3IC4dleUUC22UDQ==} - '@types/node@22.10.8': resolution: {integrity: sha512-rk+QvAEGsbX/ZPiiyel6hJHNUS9cnSbPWVaZLvE+Er3tLqQFzWMz9JOfWW7XUmKvRPfxJfbl3qYWve+RGXncFw==} @@ -1046,7 +1043,7 @@ packages: '@unocss/astro@65.4.3': resolution: {integrity: sha512-yhPKH4CT2CFjvKR8lL6oS/7jarMWp4iSnYcNlTlZLmvTIS3dGxyhAsVy/xkdzdJ6sM+6FS0hUuQNv+NYvArRNg==} peerDependencies: - vite: ^6.0.3 + vite: ^6.0.11 peerDependenciesMeta: vite: optional: true @@ -1121,19 +1118,19 @@ packages: '@unocss/vite@65.4.3': resolution: {integrity: sha512-YajF8Z2J/KvXdnC5BsGJjt3fm4D14vmYaHdlTyzi92Rkh/67JtaCz2OhElDoF6k4S4fm9B8uLRP10p+smRe9Fw==} peerDependencies: - vite: ^6.0.3 + vite: ^6.0.11 '@vitejs/plugin-react@4.3.4': resolution: {integrity: sha512-SCCPBJtYLdE8PX/7ZQAs1QAZ8Jqwih+0VBLum1EGqmCCQal+MIUqLCzj3ZUy8ufbC0cAM4LRlSTm7IQJwWT4ug==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: - vite: ^6.0.3 + vite: ^6.0.11 '@vitejs/plugin-vue@5.2.1': resolution: {integrity: sha512-cxh314tzaWwOLqVes2gnnCtvBDcM1UMdn+iFR+UjAn411dPT3tOmqrJjbMd7koZpMAmBM/GqeV4n9ge7JSiJJQ==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: - vite: ^6.0.3 + vite: ^6.0.11 vue: ^3.2.25 '@vitest/expect@3.0.3': @@ -1143,7 +1140,7 @@ packages: resolution: {integrity: sha512-XT2XBc4AN9UdaxJAeIlcSZ0ILi/GzmG5G8XSly4gaiqIvPV3HMTSIDZWJVX6QRJ0PX1m+W8Cy0K9ByXNb/bPIA==} peerDependencies: msw: ^2.4.9 - vite: ^6.0.3 + vite: ^6.0.11 peerDependenciesMeta: msw: optional: true @@ -2194,9 +2191,6 @@ packages: unconfig@0.6.1: resolution: {integrity: sha512-cVU+/sPloZqOyJEAfNwnQSFCzFrZm85vcVkryH7lnlB/PiTycUkAjt5Ds79cfIshGOZ+M5v3PBDnKgpmlE5DtA==} - undici-types@6.19.8: - resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} - undici-types@6.20.0: resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==} @@ -2212,7 +2206,7 @@ packages: engines: {node: '>=14'} peerDependencies: '@unocss/webpack': 65.4.3 - vite: ^6.0.3 + vite: ^6.0.11 peerDependenciesMeta: '@unocss/webpack': optional: true @@ -3016,10 +3010,6 @@ snapshots: '@types/json-schema@7.0.15': {} - '@types/node@20.17.15': - dependencies: - undici-types: 6.19.8 - '@types/node@22.10.8': dependencies: undici-types: 6.20.0 @@ -3830,7 +3820,7 @@ snapshots: jest-worker@27.5.1: dependencies: - '@types/node': 20.17.15 + '@types/node': 22.10.8 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -4319,8 +4309,6 @@ snapshots: transitivePeerDependencies: - supports-color - undici-types@6.19.8: {} - undici-types@6.20.0: {} undici@5.28.5: