chore: replace more

hi-ogawa · Nov 7, 2024 · a19c77f · a19c77f
1 parent dbf24ef
commit a19c77f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 20 deletions.
diff --git a/examples/browser-cli/src/cli.ts b/examples/browser-cli/src/cli.ts
@@ -8,10 +8,7 @@ import {
   parseAstAsync,
 } from "vite";
 import type { ModuleRunner } from "vite/module-runner";
-import {
-  createEnvironmentWithInvoke,
-  vitePluginFetchModuleServer,
-} from "../../web-worker/src/lib/fetch-module-server";
+import { vitePluginFetchModuleServer } from "../../web-worker/src/lib/fetch-module-server";
 
 const headless = !process.env["CLI_HEADED"];
 const extension = process.env["CLI_EXTENSION"] ?? "tsx";
@@ -33,15 +30,6 @@ async function main() {
         resolve: {
           noExternal: true,
         },
-<<<<<<< HEAD
-=======
-        dev: {
-          createEnvironment: createEnvironmentWithInvoke,
-          optimizeDeps: {
-            exclude: ["vite/module-runner"],
-          },
-        },
->>>>>>> 45db83b (refactor: createEnvironmentWithInvoke)
       },
     },
     server: {

diff --git a/examples/web-worker-rsc/src/lib/runner.ts b/examples/web-worker-rsc/src/lib/runner.ts
@@ -1,5 +1,5 @@
 import { ESModulesEvaluator, ModuleRunner } from "vite/module-runner";
-import { fetchClientFetchModule } from "./fetch-module-client";
+import { fetchClientFetchModule } from "../../../web-worker/src/lib/fetch-module-client";
 
 export function createFetchRunner(options: {
   root: string;
@@ -10,7 +10,7 @@ export function createFetchRunner(options: {
       root: options.root,
       sourcemapInterceptor: false,
       transport: {
-        fetchModule: fetchClientFetchModule(options.environmentName),
+        invoke: fetchClientFetchModule(options.environmentName),
       },
       hmr: false,
     },

diff --git a/examples/web-worker-rsc/vite.config.ts b/examples/web-worker-rsc/vite.config.ts
@@ -1,7 +1,7 @@
 import react from "@vitejs/plugin-react";
 import { defineConfig } from "vite";
+import { vitePluginFetchModuleServer } from "../web-worker/src/lib/fetch-module-server";
 import { vitePluginWorkerEnvironment } from "../web-worker/vite.config";
-import { vitePluginFetchModuleServer } from "./src/lib/fetch-module-server";
 
 export default defineConfig((_env) => ({
   clearScreen: false,

diff --git a/examples/web-worker/vite.config.ts b/examples/web-worker/vite.config.ts
@@ -2,10 +2,7 @@ import { rmSync } from "node:fs";
 import react from "@vitejs/plugin-react";
 import MagicString from "magic-string";
 import { type Plugin, defineConfig } from "vite";
-import {
-  createEnvironmentWithInvoke,
-  vitePluginFetchModuleServer,
-} from "./src/lib/fetch-module-server";
+import { vitePluginFetchModuleServer } from "./src/lib/fetch-module-server";
 
 export default defineConfig((_env) => ({
   clearScreen: false,