Skip to content

Commit 6ff6c6e

Browse files
authored
feat: use custom source-map-support implementation (#2905)
1 parent 855047d commit 6ff6c6e

File tree

9 files changed

+549
-97
lines changed

9 files changed

+549
-97
lines changed

packages/coverage-c8/src/provider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type { Profiler } from 'inspector'
44
import { extname, resolve } from 'pathe'
55
import c from 'picocolors'
66
import { provider } from 'std-env'
7-
import type { RawSourceMap } from 'vite-node'
7+
import type { EncodedSourceMap } from 'vite-node'
88
import { coverageConfigDefaults } from 'vitest/config'
99
// eslint-disable-next-line no-restricted-imports
1010
import type { AfterSuiteRunMeta, CoverageC8Options, CoverageProvider, ReportContext, ResolvedCoverageOptions } from 'vitest'
@@ -67,7 +67,7 @@ export class C8CoverageProvider implements CoverageProvider {
6767
// Overwrite C8's loader as results are in memory instead of file system
6868
report._loadReports = () => this.coverages
6969

70-
interface MapAndSource { map: RawSourceMap; source: string | undefined }
70+
interface MapAndSource { map: EncodedSourceMap; source: string | undefined }
7171
type SourceMapMeta = { url: string; filepath: string } & MapAndSource
7272

7373
// add source maps

packages/vite-node/package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,11 @@
8181
"mlly": "^1.1.0",
8282
"pathe": "^1.1.0",
8383
"picocolors": "^1.0.0",
84-
"source-map": "^0.6.1",
85-
"source-map-support": "^0.5.21",
8684
"vite": "^3.0.0 || ^4.0.0"
8785
},
8886
"devDependencies": {
87+
"@jridgewell/trace-mapping": "^0.3.17",
8988
"@types/debug": "^4.1.7",
90-
"@types/source-map": "^0.5.7",
91-
"@types/source-map-support": "^0.5.6",
9289
"rollup": "^2.79.1"
9390
}
9491
}

packages/vite-node/src/client.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,6 @@ export class ViteNodeRunner {
170170
return await this.cachedRequest(id, url, [])
171171
}
172172

173-
getSourceMap(id: string) {
174-
return this.moduleCache.getSourceMap(id)
175-
}
176-
177173
/** @internal */
178174
async cachedRequest(id: string, fsPath: string, callstack: string[]) {
179175
const importee = callstack[callstack.length - 1]

packages/vite-node/src/server.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { performance } from 'node:perf_hooks'
22
import { resolve } from 'pathe'
33
import type { TransformResult, ViteDevServer } from 'vite'
44
import createDebug from 'debug'
5-
import type { DebuggerOptions, FetchResult, RawSourceMap, ViteNodeResolveId, ViteNodeServerOptions } from './types'
5+
import type { EncodedSourceMap } from '@jridgewell/trace-mapping'
6+
import type { DebuggerOptions, FetchResult, ViteNodeResolveId, ViteNodeServerOptions } from './types'
67
import { shouldExternalize } from './externalize'
78
import { normalizeModuleId, toArray, toFilePath } from './utils'
89
import { Debugger } from './debug'
@@ -76,7 +77,7 @@ export class ViteNodeServer {
7677
if (fetchResult?.map)
7778
return fetchResult.map
7879
const ssrTransformResult = this.server.moduleGraph.getModuleById(source)?.ssrTransformResult
79-
return (ssrTransformResult?.map || null) as unknown as RawSourceMap | null
80+
return (ssrTransformResult?.map || null) as unknown as EncodedSourceMap | null
8081
}
8182

8283
async fetchModule(id: string): Promise<FetchResult> {
@@ -144,7 +145,7 @@ export class ViteNodeServer {
144145
const start = performance.now()
145146
const r = await this._transformRequest(id)
146147
duration = performance.now() - start
147-
result = { code: r?.code, map: r?.map as unknown as RawSourceMap }
148+
result = { code: r?.code, map: r?.map as any }
148149
}
149150

150151
this.fetchCache.set(filePath, {

0 commit comments

Comments
 (0)