diff --git a/examples/custom/src/optimize-deps/runner.ts b/examples/custom/src/optimize-deps/runner.ts index 4ebbff96..3f0ce0cc 100644 --- a/examples/custom/src/optimize-deps/runner.ts +++ b/examples/custom/src/optimize-deps/runner.ts @@ -25,7 +25,7 @@ const server = await createServer({ const environment = server.environments["custom"]; tinyassert(environment); -const runner = createServerModuleRunner(server, environment); +const runner = createServerModuleRunner(environment); const mod = await runner.import("/entry"); mod.default(); diff --git a/examples/react-server/package.json b/examples/react-server/package.json index 0977b978..02f10f95 100644 --- a/examples/react-server/package.json +++ b/examples/react-server/package.json @@ -4,7 +4,7 @@ "type": "module", "scripts": { "dev": "vite", - "build": "vite build --all", + "build": "vite build --app", "preview": "vite preview", "test": "vitest", "test-e2e": "playwright test", diff --git a/examples/react-server/vite.config.ts b/examples/react-server/vite.config.ts index a92c7b8b..9606458e 100644 --- a/examples/react-server/vite.config.ts +++ b/examples/react-server/vite.config.ts @@ -63,10 +63,10 @@ export default defineConfig((_env) => ({ }, builder: { - async buildEnvironments(builder, build) { - await build(builder.environments["react-server"]!); - await build(builder.environments["client"]!); - await build(builder.environments["ssr"]!); + async buildApp(builder) { + await builder.build(builder.environments["react-server"]!); + await builder.build(builder.environments["client"]!); + await builder.build(builder.environments["ssr"]!); }, }, @@ -120,10 +120,7 @@ function vitePluginReactServer(): PluginOption { async configureServer(server) { const reactServerEnv = server.environments["react-server"]; tinyassert(reactServerEnv); - const reactServerRunner = createServerModuleRunner( - server, - reactServerEnv, - ); + const reactServerRunner = createServerModuleRunner(reactServerEnv); $__global.server = server; $__global.reactServerRunner = reactServerRunner; }, diff --git a/examples/react-ssr/package.json b/examples/react-ssr/package.json index 73c15e38..f38a5d06 100644 --- a/examples/react-ssr/package.json +++ b/examples/react-ssr/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "vite", "dev-workerd": "vite --config vite.config.workerd.ts", - "build": "vite build --all", + "build": "vite build --app", "preview": "vite preview", "test-e2e": "playwright test", "test-e2e-preview": "E2E_PREVIEW=1 playwright test", diff --git a/examples/react-ssr/vite.config.ts b/examples/react-ssr/vite.config.ts index 08dea0ce..4f2634fd 100644 --- a/examples/react-ssr/vite.config.ts +++ b/examples/react-ssr/vite.config.ts @@ -33,9 +33,9 @@ export default defineConfig((_env) => ({ }, builder: { - async buildEnvironments(builder, build) { - await build(builder.environments["client"]!); - await build(builder.environments["ssr"]!); + async buildApp(builder) { + await builder.build(builder.environments["client"]!); + await builder.build(builder.environments["ssr"]!); }, }, })); diff --git a/examples/vue-ssr-extra/package.json b/examples/vue-ssr-extra/package.json index fe6b8241..034c5a6f 100644 --- a/examples/vue-ssr-extra/package.json +++ b/examples/vue-ssr-extra/package.json @@ -4,7 +4,7 @@ "type": "module", "scripts": { "dev": "vite", - "build": "vite build --all && rm -rf dist/client/index.html", + "build": "vite build --app && rm -rf dist/client/index.html", "preview": "wrangler dev", "release": "wrangler deploy", "tsc": "vue-tsc -b", diff --git a/examples/vue-ssr-extra/vite.config.ts b/examples/vue-ssr-extra/vite.config.ts index 49741b43..73ac4dec 100644 --- a/examples/vue-ssr-extra/vite.config.ts +++ b/examples/vue-ssr-extra/vite.config.ts @@ -54,9 +54,9 @@ export default defineConfig((_env) => ({ }, }, builder: { - async buildEnvironments(builder, build) { - await build(builder.environments["client"]!); - await build(builder.environments["workerd"]!); + async buildApp(builder) { + await builder.build(builder.environments["client"]!); + await builder.build(builder.environments["workerd"]!); }, }, })); diff --git a/examples/vue-ssr/package.json b/examples/vue-ssr/package.json index 3f801536..21356b45 100644 --- a/examples/vue-ssr/package.json +++ b/examples/vue-ssr/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "vite", "dev-workerd": "vite --config vite.config.workerd.ts", - "build": "vite build --all", + "build": "vite build --app", "preview": "vite preview", "tsc": "vue-tsc -b", "tsc-dev": "vue-tsc -b --watch --preserveWatchOutput", diff --git a/examples/vue-ssr/vite.config.ts b/examples/vue-ssr/vite.config.ts index 20db6e1c..64b02537 100644 --- a/examples/vue-ssr/vite.config.ts +++ b/examples/vue-ssr/vite.config.ts @@ -31,9 +31,9 @@ export default defineConfig((_env) => ({ }, builder: { - async buildEnvironments(builder, build) { - await build(builder.environments["client"]!); - await build(builder.environments["ssr"]!); + async buildApp(builder) { + await builder.build(builder.environments["client"]!); + await builder.build(builder.environments["ssr"]!); }, }, })); diff --git a/package.json b/package.json index 137758e5..a5b042d1 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "tsup": "^8.0.2", "tsx": "^4.7.1", "typescript": "^5.4.3", - "vite": "6.0.0-alpha.3", + "vite": "6.0.0-alpha.6", "vitest": "^1.5.1", "wrangler": "^3.48.0" }, diff --git a/packages/ssr-middleware/src/plugin.ts b/packages/ssr-middleware/src/plugin.ts index 8c02db47..e1bdb187 100644 --- a/packages/ssr-middleware/src/plugin.ts +++ b/packages/ssr-middleware/src/plugin.ts @@ -4,7 +4,6 @@ import { type PluginOption, createServerModuleRunner, } from "vite"; -import type { ModuleRunner } from "vite/module-runner"; export function vitePluginSsrMiddleware({ entry, @@ -13,8 +12,6 @@ export function vitePluginSsrMiddleware({ entry: string; preview?: string; }): PluginOption { - let runner: ModuleRunner; - const plugin: Plugin = { name: vitePluginSsrMiddleware.name, @@ -36,7 +33,7 @@ export function vitePluginSsrMiddleware({ }, configureServer(server) { - runner = createServerModuleRunner(server, server.environments.ssr); + const runner = createServerModuleRunner(server.environments.ssr); const handler: Connect.NextHandleFunction = async (req, res, next) => { try { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 791b9c02..95b1c37f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,7 +5,7 @@ settings: excludeLinksFromLockfile: false overrides: - vite: 6.0.0-alpha.3 + vite: 6.0.0-alpha.6 importers: @@ -22,7 +22,7 @@ importers: version: 1.6.4-pre.1 '@hiogawa/vite-plugin-ssr-middleware': specifier: ^0.0.3 - version: 0.0.3(vite@6.0.0-alpha.3) + version: 0.0.3(vite@6.0.0-alpha.6) '@playwright/test': specifier: ^1.42.1 version: 1.42.1 @@ -34,7 +34,7 @@ importers: version: 20.11.30 '@vitejs/plugin-react': specifier: ^4.2.1 - version: 4.2.1(vite@6.0.0-alpha.3) + version: 4.2.1(vite@6.0.0-alpha.6) esbuild: specifier: ^0.20.2 version: 0.20.2 @@ -54,8 +54,8 @@ importers: specifier: ^5.4.3 version: 5.4.3 vite: - specifier: 6.0.0-alpha.3 - version: 6.0.0-alpha.3(@types/node@20.11.30) + specifier: 6.0.0-alpha.6 + version: 6.0.0-alpha.6(@types/node@20.11.30) vitest: specifier: ^1.5.1 version: 1.5.1(@types/node@20.11.30) @@ -177,7 +177,7 @@ importers: version: link:../../packages/workerd '@vitejs/plugin-vue': specifier: ^5.0.4 - version: 5.0.4(vite@6.0.0-alpha.3)(vue@3.4.23) + version: 5.0.4(vite@6.0.0-alpha.6)(vue@3.4.23) vue-tsc: specifier: ^2.0.13 version: 2.0.13(typescript@5.4.3) @@ -202,7 +202,7 @@ importers: version: link:../../packages/workerd '@vitejs/plugin-vue': specifier: ^5.0.4 - version: 5.0.4(vite@6.0.0-alpha.3)(vue@3.4.23) + version: 5.0.4(vite@6.0.0-alpha.6)(vue@3.4.23) vue-tsc: specifier: ^2.0.13 version: 2.0.13(typescript@5.4.3) @@ -216,8 +216,8 @@ importers: packages/ssr-middleware: dependencies: vite: - specifier: 6.0.0-alpha.3 - version: 6.0.0-alpha.3(@types/node@20.11.30) + specifier: 6.0.0-alpha.6 + version: 6.0.0-alpha.6(@types/node@20.11.30) packages/workerd: dependencies: @@ -225,8 +225,8 @@ importers: specifier: ^3.20240404.0 version: 3.20240404.0 vite: - specifier: 6.0.0-alpha.3 - version: 6.0.0-alpha.3(@types/node@20.11.30) + specifier: 6.0.0-alpha.6 + version: 6.0.0-alpha.6(@types/node@20.11.30) wrangler: specifier: ^3.48.0 version: 3.48.0(@cloudflare/workers-types@4.20240405.0) @@ -1152,12 +1152,12 @@ packages: resolution: {integrity: sha512-L8g6kQuPKJXKoqF1XuFYXXHQ3Z4VXuEX8tlOz/gPO6uP2VQ95JUyONsr93RpVTLc/GGblXY30/YK4r56kJzzgQ==} dev: true - /@hiogawa/vite-plugin-ssr-middleware@0.0.3(vite@6.0.0-alpha.3): + /@hiogawa/vite-plugin-ssr-middleware@0.0.3(vite@6.0.0-alpha.6): resolution: {integrity: sha512-84bzaAuImty4s4vHjOk5MQMzmDs0W0GP43fOTFhsBfj/MSJCNJ68elmPNZWs57WkIEzcdB4haY/P8Nf4ZGH8Qw==} peerDependencies: - vite: 6.0.0-alpha.3 + vite: 6.0.0-alpha.6 dependencies: - vite: 6.0.0-alpha.3(@types/node@20.11.30) + vite: 6.0.0-alpha.6(@types/node@20.11.30) dev: true /@isaacs/cliui@8.0.2: @@ -1439,30 +1439,30 @@ packages: csstype: 3.1.3 dev: true - /@vitejs/plugin-react@4.2.1(vite@6.0.0-alpha.3): + /@vitejs/plugin-react@4.2.1(vite@6.0.0-alpha.6): resolution: {integrity: sha512-oojO9IDc4nCUUi8qIR11KoQm0XFFLIwsRBwHRR4d/88IWghn1y6ckz/bJ8GHDCsYEJee8mDzqtJxh15/cisJNQ==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: - vite: 6.0.0-alpha.3 + vite: 6.0.0-alpha.6 dependencies: '@babel/core': 7.24.3 '@babel/plugin-transform-react-jsx-self': 7.24.1(@babel/core@7.24.3) '@babel/plugin-transform-react-jsx-source': 7.24.1(@babel/core@7.24.3) '@types/babel__core': 7.20.5 react-refresh: 0.14.0 - vite: 6.0.0-alpha.3(@types/node@20.11.30) + vite: 6.0.0-alpha.6(@types/node@20.11.30) transitivePeerDependencies: - supports-color dev: true - /@vitejs/plugin-vue@5.0.4(vite@6.0.0-alpha.3)(vue@3.4.23): + /@vitejs/plugin-vue@5.0.4(vite@6.0.0-alpha.6)(vue@3.4.23): resolution: {integrity: sha512-WS3hevEszI6CEVEx28F8RjTX97k3KsrcY6kvTg7+Whm5y3oYvcqzVeGCU3hxSAn4uY2CLCkeokkGKpoctccilQ==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: - vite: 6.0.0-alpha.3 + vite: 6.0.0-alpha.6 vue: ^3.2.25 dependencies: - vite: 6.0.0-alpha.3(@types/node@20.11.30) + vite: 6.0.0-alpha.6(@types/node@20.11.30) vue: 3.4.23(typescript@5.4.3) dev: true @@ -3491,7 +3491,7 @@ packages: debug: 4.3.4 pathe: 1.1.2 picocolors: 1.0.0 - vite: 6.0.0-alpha.3(@types/node@20.11.30) + vite: 6.0.0-alpha.6(@types/node@20.11.30) transitivePeerDependencies: - '@types/node' - less @@ -3503,8 +3503,8 @@ packages: - terser dev: true - /vite@6.0.0-alpha.3(@types/node@20.11.30): - resolution: {integrity: sha512-9AyUOuPF80CW+Jh1iTEVrSOl2miUPzLKCaF8QhgCFoRzB9FB/t8wmKqM3id2Hdg/czcStGU0bXMaOM0CsgWtQw==} + /vite@6.0.0-alpha.6(@types/node@20.11.30): + resolution: {integrity: sha512-enY4/W2GNJ41fTMXvNeG/3Otfqrao7a1cnBJWxNrxCMpZnUQzQ6Vb248+DT8uVVtGq8GV67SADgt+CVUK5Gpfw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -3581,7 +3581,7 @@ packages: strip-literal: 2.1.0 tinybench: 2.8.0 tinypool: 0.8.4 - vite: 6.0.0-alpha.3(@types/node@20.11.30) + vite: 6.0.0-alpha.6(@types/node@20.11.30) vite-node: 1.5.1(@types/node@20.11.30) why-is-node-running: 2.2.2 transitivePeerDependencies: