chore(deps): vite@6.0.0-alpha.6 (#51)

hi-ogawa · Apr 28, 2024 · ad6ced6 · ad6ced6
1 parent 1fffbfa
commit ad6ced6
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 51 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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