fix: fix external

Author: hi-ogawa

packages/vitest/src/node/reporters/blob.ts

@@ -101,13 +101,24 @@ export class BlobReporter implements Reporter {
       })
     })
 
+    const externalized: SerializedExternalizedByProject = {}
+    this.ctx.projects.forEach((project) => {
+      externalized[project.name] = []
+      for (const [k, v] of project._resolver.externalizeCache.entries()) {
+        if (typeof v === 'string') {
+          externalized[project.name].push([k, v])
+        }
+      }
+    })
+
     const report = [
       this.ctx.version,
       files,
       errors,
       coverage,
       executionTime,
       environmentModules,
+      externalized,
     ] satisfies MergeReport
 
     const reportFile = resolve(this.ctx.config.root, outputFile)
@@ -145,15 +156,15 @@ export async function readBlobs(
       )
     }
     const content = await readFile(fullPath, 'utf-8')
-    const [version, files, errors, coverage, executionTime, environmentModules] = parse(
+    const [version, files, errors, coverage, executionTime, environmentModules, externalized] = parse(
       content,
     ) as MergeReport
     if (!version) {
       throw new TypeError(
         `vitest.mergeReports() expects all paths in "${blobsDirectory}" to be files generated by the blob reporter, but "${filename}" is not a valid blob file`,
       )
     }
-    return { version, files, errors, coverage, file: filename, executionTime, environmentModules }
+    return { version, files, errors, coverage, file: filename, executionTime, environmentModules, externalized }
   })
   const blobs = await Promise.all(promises)
 
@@ -183,6 +194,16 @@ export async function readBlobs(
   )
 
   blobs.forEach((blob) => {
+    Object.entries(blob.externalized).forEach(([projectName, entries]) => {
+      const project = projects[projectName]
+      if (!project) {
+        return
+      }
+      entries.forEach(([id, externalized]) => {
+        project._resolver.externalizeCache.set(id, externalized)
+      })
+    })
+
     Object.entries(blob.environmentModules).forEach(([projectName, environments]) => {
       const project = projects[projectName]
       if (!project) {
@@ -284,6 +305,7 @@ type MergeReport = [
   coverage: unknown,
   executionTime: number,
   environmentModules: MergeReportEnvironmentModules,
+  externalized: SerializedExternalizedByProject,
 ]
 
 interface MergeReportEnvironmentModules {
@@ -295,6 +317,10 @@ interface MergeReportEnvironmentModules {
   }
 }
 
+interface SerializedExternalizedByProject {
+  [projectName: string]: [id: string, externalized: string][]
+}
+
 type SerializedEnvironmentModuleNode = [
   id: number,
   file: number,

packages/vitest/src/node/resolver.ts

@@ -12,7 +12,7 @@ import { isWindows } from '../utils/env'
 export class VitestResolver {
   public readonly options: ExternalizeOptions
   private externalizeConcurrentCache = new Map<string, Promise<string | false | undefined>>()
-  private externalizeCache = new Map<string, string | false | undefined>()
+  public externalizeCache: Map<string, string | false | undefined> = new Map<string, string | false | undefined>()
 
   constructor(cacheDir: string, config: ResolvedConfig) {
     // sorting to make cache consistent

test/cli/fixtures/reporters/merge-reports-module-graph/second.test.ts

@@ -1,11 +1,11 @@
 import { test, expect } from 'vitest'
 import { hello } from './util'
-// import * as obug from "obug"
+import * as obug from "obug"
 
 test('also passes', () => {
   expect(hello()).toBe('Hello, graph!')
 })
 
-// test('external', () => {
-//   expect(obug).toBeTypeOf('object')
-// })
+test('external', () => {
+  expect(obug).toBeTypeOf('object')
+})

test/cli/test/reporters/merge-reports.test.ts

@@ -256,7 +256,7 @@ test('total and merged execution times are shown', async () => {
     file.tasks.push(createTest('some test', file))
 
     await writeBlob(
-      [version, [file], [], undefined, 1500 * index, {}],
+      [version, [file], [], undefined, 1500 * index, {}, {}],
       resolve(`./fixtures/reporters/merge-reports/.vitest-reports/blob-${index}-2.json`),
     )
   }
@@ -279,8 +279,8 @@ test('module graph available', async () => {
   const reportsDir = resolve(root, '.vitest-reports')
   rmSync(reportsDir, { force: true, recursive: true })
 
-  async function getModuleGraphs(ctx: Vitest) {
-    const files = ctx.state.getFiles().slice().sort((a, b) => a.filepath.localeCompare(b.filepath))
+  async function getSerializedModuleGraph(ctx: Vitest) {
+    const files = ctx.state.getFiles().slice().sort()
     const moduleGraphs = Object.fromEntries(
       await Promise.all(
         files.map(async (file) => {
@@ -296,7 +296,9 @@ test('module graph available', async () => {
         }),
       ),
     )
-    return JSON.stringify(moduleGraphs, null, 2).replaceAll(ctx.config.root, '<root>')
+    return JSON.stringify(moduleGraphs, null, 2)
+      .replaceAll(ctx.config.root, '<root>')
+      .replace(/"\/[^"\n]*\/node_modules\//g, '"<node_modules>/')
   }
 
   // generate blob
@@ -305,7 +307,7 @@ test('module graph available', async () => {
     reporters: ['blob'],
   })
   expect.assert(result.ctx)
-  const generatedModuleGraphJson = await getModuleGraphs(result.ctx)
+  const generatedModuleGraphJson = await getSerializedModuleGraph(result.ctx)
   expect(generatedModuleGraphJson).toMatchInlineSnapshot(`
     "{
       "<root>/basic.test.ts": {
@@ -337,10 +339,13 @@ test('module graph available', async () => {
             "<root>/sub/subject.ts"
           ],
           "<root>/second.test.ts": [
-            "<root>/util.ts"
+            "<root>/util.ts",
+            "<node_modules>/obug/dist/node.js"
           ]
         },
-        "externalized": [],
+        "externalized": [
+          "<node_modules>/obug/dist/node.js"
+        ],
         "inlined": [
           "<root>/second.test.ts",
           "<root>/util.ts",
@@ -357,7 +362,7 @@ test('module graph available', async () => {
   })
   expect(result2.stderr).toMatchInlineSnapshot(`""`)
   expect.assert(result2.ctx)
-  const restoredModuleGraphJson = await getModuleGraphs(result2.ctx)
+  const restoredModuleGraphJson = await getSerializedModuleGraph(result2.ctx)
   expect(restoredModuleGraphJson).toBe(generatedModuleGraphJson)
 
   // also check html reporter doesn't crash