+8

pnpm-lock.yaml

Reviewed

··· 1393 1393 test-dep-simple: 1394 1394 specifier: file:./deps/dep-simple 1395 1395 version: file:test/e2e/deps/dep-simple 1396 1396 + test-dep-simple2: 1397 1397 + specifier: file:./deps/dep-simple2 1398 1398 + version: file:test/e2e/deps/dep-simple2 1396 1399 tinyexec: 1397 1400 specifier: ^1.0.2 1398 1401 version: 1.0.2 ··· 9665 9668 9666 9669 test-dep-error@file:test/browser/deps/test-dep-error: 9667 9670 resolution: {directory: test/browser/deps/test-dep-error, type: directory} 9671 9671 + 9672 9672 + test-dep-simple2@file:test/e2e/deps/dep-simple2: 9673 9673 + resolution: {directory: test/e2e/deps/dep-simple2, type: directory} 9668 9674 9669 9675 test-dep-simple@file:test/e2e/deps/dep-simple: 9670 9676 resolution: {directory: test/e2e/deps/dep-simple, type: directory} ··· 19000 19006 test-dep-conditions-indirect: file:test/e2e/deps/test-dep-conditions-indirect 19001 19007 19002 19008 test-dep-error@file:test/browser/deps/test-dep-error: {} 19009 19009 + 19010 19010 + test-dep-simple2@file:test/e2e/deps/dep-simple2: {} 19003 19011 19004 19012 test-dep-simple@file:test/e2e/deps/dep-simple: {} 19005 19013

+2 -1

test/tsconfig.json

Reviewed

··· 2 2 "extends": "../tsconfig.base.json", 3 3 "compilerOptions": { 4 4 "types": [ 5 5 - "node" 5 5 + "node", 6 6 + "vite/client" 6 7 ] 7 8 }, 8 9 "include": [

+1

test/e2e/package.json

Reviewed

··· 40 40 "test-dep-conditions": "file:./deps/test-dep-conditions", 41 41 "test-dep-invalid": "link:./deps/dep-invalid", 42 42 "test-dep-simple": "file:./deps/dep-simple", 43 43 + "test-dep-simple2": "file:./deps/dep-simple2", 43 44 "tinyexec": "^1.0.2", 44 45 "tinyspy": "catalog:", 45 46 "typescript": "catalog:",

+21

test/e2e/test/optimize-deps-mock.test.ts

Reviewed

··· 1 1 + import { expect, test } from 'vitest' 2 2 + import { runVitest } from '../../test-utils' 3 3 + 4 4 + test.for(['forks', 'threads', 'vmThreads', 'vmForks'])( 5 5 + 'optimize deps and mock - %s', 6 6 + async (pool) => { 7 7 + const { errorTree, stderr } = await runVitest({ 8 8 + root: './fixtures/optimize-deps-mock', 9 9 + pool, 10 10 + }) 11 11 + 12 12 + expect(stderr).toBe('') 13 13 + expect(errorTree()).toMatchInlineSnapshot(` 14 14 + { 15 15 + "basic.test.ts": { 16 16 + "basic": "passed", 17 17 + }, 18 18 + } 19 19 + `) 20 20 + }, 21 21 + )

+1

test/e2e/deps/dep-simple2/index.js

Reviewed

··· 1 1 + export default 'test-dep-simple2'

+6

test/e2e/deps/dep-simple2/package.json

Reviewed

··· 1 1 + { 2 2 + "name": "test-dep-simple2", 3 3 + "type": "module", 4 4 + "private": true, 5 5 + "exports": "./index.js" 6 6 + }

+40

test/e2e/fixtures/optimize-deps-mock/basic.test.ts

Reviewed

··· 1 1 + import { expect, test, vi } from 'vitest' 2 2 + // @ts-expect-error no type 3 3 + import * as dep from "@test/test-dep-url" 4 4 + // @ts-expect-error no type 5 5 + import * as simple from "test-dep-simple" 6 6 + // @ts-expect-error no type 7 7 + import * as simple2 from "test-dep-simple2" 8 8 + 9 9 + // mock + optimized 10 10 + vi.mock('@test/test-dep-url', async (importOriginal) => { 11 11 + const original = await importOriginal<any>() 12 12 + return { ...original, mocked: "ok" }; 13 13 + }) 14 14 + 15 15 + // mock + not optimized + no external 16 16 + vi.mock('test-dep-simple', async (importOriginal) => { 17 17 + const original = await importOriginal<any>() 18 18 + return { ...original, mocked: "ok" }; 19 19 + }) 20 20 + 21 21 + // mock + not optimized + external 22 22 + vi.mock('test-dep-simple2', async (importOriginal) => { 23 23 + const original = await importOriginal<any>() 24 24 + return { ...original, mocked: "ok" }; 25 25 + }) 26 26 + 27 27 + test('basic', () => { 28 28 + expect.soft({...dep}).toEqual({ 29 29 + mocked: 'ok', 30 30 + importMetaUrl: expect.stringContaining('/node_modules/.vite/vitest/') 31 31 + }) 32 32 + expect({...simple}).toEqual({ 33 33 + mocked: 'ok', 34 34 + default: 'test-dep-simple', 35 35 + }) 36 36 + expect({...simple2}).toEqual({ 37 37 + mocked: 'ok', 38 38 + default: 'test-dep-simple2', 39 39 + }) 40 40 + })

+19

test/e2e/fixtures/optimize-deps-mock/vitest.config.ts

Reviewed

··· 1 1 + import { defineConfig } from 'vitest/config' 2 2 + 3 3 + export default defineConfig({ 4 4 + ssr: { 5 5 + noExternal: ["test-dep-simple"], 6 6 + optimizeDeps: { 7 7 + include: ["@test/test-dep-url"], 8 8 + }, 9 9 + }, 10 10 + test: { 11 11 + deps: { 12 12 + optimizer: { 13 13 + ssr: { 14 14 + enabled: true, 15 15 + }, 16 16 + }, 17 17 + }, 18 18 + }, 19 19 + })

+1

test/unit/test/mocking/import-actual-query-target.ts

Reviewed

··· 1 1 + export default 'import-actual-query-target'

+20

test/unit/test/mocking/import-actual-query.test.ts

Reviewed

··· 1 1 + import { expect, test, vi } from 'vitest' 2 2 + import * as target from './import-actual-query-target?raw' 3 3 + 4 4 + vi.mock(import('./import-actual-query-target?raw'), async (importOriginal) => { 5 5 + const original = await importOriginal<any>() 6 6 + return { 7 7 + ...original, 8 8 + mocked: 'ok', 9 9 + } 10 10 + }) 11 11 + 12 12 + test('importOriginal preserves query parameters', () => { 13 13 + expect({ ...target }).toMatchInlineSnapshot(` 14 14 + { 15 15 + "default": "export default 'import-actual-query-target' 16 16 + ", 17 17 + "mocked": "ok", 18 18 + } 19 19 + `) 20 20 + })

+6 -3

packages/vitest/src/runtime/moduleRunner/utils.ts

Reviewed

··· 1 1 - // copied from vite/src/shared/utils.ts 1 1 + // copied from vite 2 2 + // https://github.com/vitejs/vite/blob/4417b4f305623b2850bd6ae6553834c017694672/packages/vite/src/shared/utils.ts 3 3 + // https://github.com/vitejs/vite/blob/4417b4f305623b2850bd6ae6553834c017694672/packages/vite/src/node/utils.ts 2 4 const postfixRE = /[?#].*$/ 5 5 + const trailingSeparatorRE = /[?&]$/ 3 6 4 7 function cleanUrl(url: string): string { 5 8 return url.replace(postfixRE, '') ··· 16 19 17 20 export function removeQuery(url: string, queryToRemove: string): string { 18 21 return url 19 19 - .replace(new RegExp(`[?&]${queryToRemove}(?=[&#]|$)`), '') 20 20 - .replace(/\?$/, '') 22 22 + .replace(new RegExp(`([?&])${queryToRemove}(?:&|$)`), '$1') 23 23 + .replace(trailingSeparatorRE, '') 21 24 }