fix(vrowzer): isolate projects that share a Service Worker registration

e2e/playground/define/define.spec.ts

@@ -183,8 +183,10 @@ describe('define', () => {
       }
     })
 
+    // The filter rewrites the source with the Vite base, the preview base path of the instance
+    const previewBasePath = await page.evaluate(() => (window as any).__vrowzer__.previewBasePath)
     expect(await result.jsonValue()).toEqual({
-      rewritten: '/__preview__/data.json',
+      rewritten: `${previewBasePath}data.json`,
       untouched: '/data.json'
     })
   })

e2e/vite-vanilla/vanilla-basic.spec.ts

@@ -95,11 +95,12 @@ if (import.meta.hot) { import.meta.hot.accept() }
 
     await expect.poll(() => iframeInnerText(), { timeout: 10000 }).toContain('Virtual updated')
     expect(await body.getAttribute('data-hmr-token')).toBe('preserved')
+    const previewBasePath = await page.evaluate(() => (window as any).__vrowzer__.previewBasePath)
     expect(
       browserRequests.some(request => {
         const url = new URL(request)
         return (
-          url.pathname === '/__preview__/@id/__x00__virtual:invalidation' &&
+          url.pathname === `${previewBasePath}@id/__x00__virtual:invalidation` &&
           url.searchParams.get('variant') === 'query' &&
           url.searchParams.has('t')
         )

e2e/vite-worker-config/worker-config.spec.ts

@@ -15,9 +15,12 @@ describe('dedicated Worker config', () => {
     expect(await page.textContent('#status')).toBe('Ready')
     await expect.poll(() => page.textContent('#react-host')).toBe('React host: host define')
     await expect.poll(() => iframeInnerText(), { timeout: 30000 }).toContain('Worker preview')
+    // The preview loads from the preview base path of the instance, under the custom basePath
+    const previewBasePath = await page.evaluate(() => (window as any).__vrowzer__.previewBasePath)
+    expect(previewBasePath).toMatch(/^\/worker-preview\/[0-9a-f]{12}\/$/)
     expect(
       browserResponses.some(
-        response => new URL(response.url).pathname === '/worker-preview/' && response.status === 200
+        response => new URL(response.url).pathname === previewBasePath && response.status === 200
       )
     ).toBe(true)
   })

packages/vite-dev-server/src/client/client.ts

@@ -54,8 +54,10 @@ const transport = normalizeModuleRunnerTransport(
       throw new Error('No active Service Worker controller found for HMR transport')
     }
 
+    // The base names the runtime that owns this preview, and its Web Worker gets the port
     let transport = createMessageChannelModuleRunnerTransport(navigator.serviceWorker.controller.postMessage.bind(navigator.serviceWorker.controller), {
       pingInterval: hmrTimeout,
+      base,
     })
 
     return {

packages/vite-dev-server/src/node/server/environment.test.ts

@@ -225,12 +225,9 @@ function createRegistrationContext(
   } | null | undefined>,
 ) {
   const safeModulePaths = new Set<string>()
-  const syncSafeModulePaths = vi.fn<(paths: string[]) => Promise<void>>(
-    async () => undefined,
-  )
   const resolver = vi.fn(resolveId)
 
-  return { input, resolver, safeModulePaths, syncSafeModulePaths }
+  return { input, resolver, safeModulePaths }
 }
 
 function createLifecycleEnvironment(plugins: Plugin[]) {
@@ -274,7 +271,7 @@ describe('DevEnvironment input registration', () => {
       external: 'virtual:external',
       relative: 'virtual:relative',
     }
-    const { resolver, safeModulePaths, syncSafeModulePaths } =
+    const { resolver, safeModulePaths } =
       createRegistrationContext(input, async (id) => {
         if (id === 'virtual:external') {
           return { id: '/outside/external.ts', external: true }
@@ -289,7 +286,6 @@ describe('DevEnvironment input registration', () => {
       input,
       resolver,
       safeModulePaths,
-      syncSafeModulePaths,
     )
 
     expect(resolver).toHaveBeenCalledTimes(4)
@@ -301,12 +297,10 @@ describe('DevEnvironment input registration', () => {
       )
     }
     expect(safeModulePaths).toEqual(new Set(['/outside/main.ts']))
-    expect(syncSafeModulePaths).toHaveBeenCalledOnce()
-    expect(syncSafeModulePaths).toHaveBeenCalledWith(['/outside/main.ts'])
   })
 
   test('silently ignores fallback index resolution errors', async () => {
-    const { resolver, safeModulePaths, syncSafeModulePaths } =
+    const { resolver, safeModulePaths } =
       createRegistrationContext(undefined, async () => {
         throw new Error('index.html is not available')
       })
@@ -316,7 +310,6 @@ describe('DevEnvironment input registration', () => {
         undefined,
         resolver,
         safeModulePaths,
-        syncSafeModulePaths,
       ),
     ).resolves.toBeUndefined()
     expect(resolver).toHaveBeenCalledWith(
@@ -325,30 +318,10 @@ describe('DevEnvironment input registration', () => {
       { isEntry: true, scan: true },
     )
     expect(safeModulePaths).toEqual(new Set())
-    expect(syncSafeModulePaths).not.toHaveBeenCalled()
-  })
-
-  test('syncs an input path that is already registered locally', async () => {
-    const resolvedInput = '/outside/main.ts'
-    const { resolver, safeModulePaths, syncSafeModulePaths } =
-      createRegistrationContext('virtual:entry', async () => ({
-        id: resolvedInput,
-      }))
-    safeModulePaths.add(resolvedInput)
-
-    await registerInputsAsSafeModules(
-      'virtual:entry',
-      resolver,
-      safeModulePaths,
-      syncSafeModulePaths,
-    )
-
-    expect(safeModulePaths).toEqual(new Set([resolvedInput]))
-    expect(syncSafeModulePaths).toHaveBeenCalledWith([resolvedInput])
   })
 
   test('propagates explicit input resolution errors', async () => {
-    const { resolver, safeModulePaths, syncSafeModulePaths } =
+    const { resolver, safeModulePaths } =
       createRegistrationContext(
         'virtual:entry',
         async () => {
@@ -361,7 +334,6 @@ describe('DevEnvironment input registration', () => {
         'virtual:entry',
         resolver,
         safeModulePaths,
-        syncSafeModulePaths,
       ),
     ).rejects.toThrow('explicit input failed')
   })

packages/vite-dev-server/src/node/server/environment.ts

@@ -87,13 +87,6 @@ export class DevEnvironment extends BaseEnvironment {
    */
   _pluginContainer: EnvironmentPluginContainer<DevEnvironment> | undefined
 
-  /**
-   * @internal Vrowzer synchronizes safe paths to the Service Worker.
-   */
-  _syncSafeModulePaths:
-    | ((paths: string[]) => Promise<void>)
-    | undefined
-
   /**
    * @internal
    */
@@ -245,7 +238,6 @@ export class DevEnvironment extends BaseEnvironment {
       (id, importer, options) =>
         this.pluginContainer.resolveId(id, importer, options),
       this.getTopLevelConfig().safeModulePaths,
-      this._syncSafeModulePaths,
     )
   }