+1 -1

packages/mocker/src/browser/interceptor-msw.ts

Reviewed

··· 55 55 this.mocks.delete(url) 56 56 } 57 57 58 58 - invalidate(): void { 58 58 + async invalidate(): Promise<void> { 59 59 this.mocks.clear() 60 60 } 61 61

+2 -2

packages/mocker/src/browser/interceptor-native.ts

Reviewed

··· 11 11 await rpc('vitest:interceptor:delete', id) 12 12 } 13 13 14 14 - invalidate(): void { 15 15 - rpc('vitest:interceptor:invalidate') 14 14 + async invalidate(): Promise<void> { 15 15 + await rpc('vitest:interceptor:invalidate') 16 16 } 17 17 }

+1 -1

packages/mocker/src/browser/interceptor.ts

Reviewed

··· 3 3 export interface ModuleMockerInterceptor { 4 4 register: (module: MockedModule) => Promise<void> 5 5 delete: (url: string) => Promise<void> 6 6 - invalidate: () => void 6 6 + invalidate: () => Promise<void> 7 7 }

+1 -1

packages/mocker/src/browser/mocker.ts

Reviewed

··· 53 53 return 54 54 } 55 55 await this.rpc.invalidate(ids) 56 56 - this.interceptor.invalidate() 56 56 + await this.interceptor.invalidate() 57 57 this.registry.clear() 58 58 } 59 59

+22 -16

packages/browser/src/node/providers/playwright.ts

Reviewed

··· 179 179 const ids = sessionIds.get(sessionId) || [] 180 180 ids.push(moduleUrl.href) 181 181 sessionIds.set(sessionId, ids) 182 182 - idPreficates.set(moduleUrl.href, predicate) 182 182 + idPreficates.set(predicateKey(sessionId, moduleUrl.href), predicate) 183 183 return predicate 184 184 + } 185 185 + 186 186 + function predicateKey(sessionId: string, url: string) { 187 187 + return `${sessionId}:${url}` 184 188 } 185 189 186 190 return { ··· 200 204 // https://github.com/microsoft/playwright/issues/18318 201 205 const isWebkit = this.browserName === 'webkit' 202 206 if (isWebkit) { 203 203 - const url = module.type === 'redirect' 204 204 - ? (() => { 205 205 - // url has http:// which vite.trasnformRequest doesn't understand 206 206 - const url = new URL(module.redirect) 207 207 - return url.href.slice(url.origin.length) 208 208 - })() 209 209 - : (() => { 210 210 - const url = new URL(route.request().url()) 211 211 - url.searchParams.set('mock', module.type) 212 212 - return url.href.slice(url.origin.length) 213 213 - })() 207 207 + let url: string 208 208 + if (module.type === 'redirect') { 209 209 + const redirect = new URL(module.redirect) 210 210 + url = redirect.href.slice(redirect.origin.length) 211 211 + } 212 212 + else { 213 213 + const request = new URL(route.request().url()) 214 214 + request.searchParams.set('mock', module.type) 215 215 + url = request.href.slice(request.origin.length) 216 216 + } 217 217 + 214 218 const result = await this.project.browser!.vite.transformRequest(url).catch(() => null) 215 219 if (!result) { 216 220 return route.continue() ··· 252 256 }, 253 257 delete: async (sessionId: string, id: string): Promise<void> => { 254 258 const page = this.getPage(sessionId) 255 255 - const predicate = idPreficates.get(id) 259 259 + const key = predicateKey(sessionId, id) 260 260 + const predicate = idPreficates.get(key) 256 261 if (predicate) { 257 257 - await page.unroute(predicate).finally(() => idPreficates.delete(id)) 262 262 + await page.unroute(predicate).finally(() => idPreficates.delete(key)) 258 263 } 259 264 }, 260 265 clear: async (sessionId: string): Promise<void> => { 261 266 const page = this.getPage(sessionId) 262 267 const ids = sessionIds.get(sessionId) || [] 263 268 const promises = ids.map((id) => { 264 264 - const predicate = idPreficates.get(id) 269 269 + const key = predicateKey(sessionId, id) 270 270 + const predicate = idPreficates.get(key) 265 271 if (predicate) { 266 266 - return page.unroute(predicate).finally(() => idPreficates.delete(id)) 272 272 + return page.unroute(predicate).finally(() => idPreficates.delete(key)) 267 273 } 268 274 return null 269 275 })