|
1 | | -import { describe, expect } from 'vitest' |
| 1 | +import { describe, expect, onTestFinished } from 'vitest' |
2 | 2 | import { createModuleRunnerTester } from './utils' |
3 | 3 |
|
4 | 4 | describe( |
@@ -36,6 +36,103 @@ describe( |
36 | 36 | expect(runner.hmrClient!.ctxToListenersMap.has(fixture)).toBe(true) |
37 | 37 | } |
38 | 38 | }) |
| 39 | + |
| 40 | + it('does not expose partial exports during concurrent updates', async ({ |
| 41 | + runner, |
| 42 | + }) => { |
| 43 | + const testGlobal = globalThis as any |
| 44 | + |
| 45 | + testGlobal.__vite_ssr_hmr_reexport_race__ = { |
| 46 | + wait: () => Promise.resolve(), |
| 47 | + } |
| 48 | + onTestFinished(() => { |
| 49 | + delete testGlobal.__vite_ssr_hmr_reexport_race__ |
| 50 | + }) |
| 51 | + |
| 52 | + await runner.import('/fixtures/hmr-reexport-race/entry-a.js') |
| 53 | + await runner.import('/fixtures/hmr-reexport-race/entry-b.js') |
| 54 | + |
| 55 | + const sharedModule = runner.evaluatedModules.getModuleByUrl( |
| 56 | + '/fixtures/hmr-reexport-race/shared.js', |
| 57 | + ) |
| 58 | + const coreModule = runner.evaluatedModules.getModuleByUrl( |
| 59 | + '/fixtures/hmr-reexport-race/core.js', |
| 60 | + ) |
| 61 | + const entryAModule = runner.evaluatedModules.getModuleByUrl( |
| 62 | + '/fixtures/hmr-reexport-race/entry-a.js', |
| 63 | + ) |
| 64 | + const entryBModule = runner.evaluatedModules.getModuleByUrl( |
| 65 | + '/fixtures/hmr-reexport-race/entry-b.js', |
| 66 | + ) |
| 67 | + expect(sharedModule).toBeDefined() |
| 68 | + expect(coreModule).toBeDefined() |
| 69 | + expect(entryAModule).toBeDefined() |
| 70 | + expect(entryBModule).toBeDefined() |
| 71 | + |
| 72 | + let waitStarted!: () => void |
| 73 | + const waitStartedPromise = new Promise<void>((resolve) => { |
| 74 | + waitStarted = resolve |
| 75 | + }) |
| 76 | + let releaseWait!: () => void |
| 77 | + const waitPromise = new Promise<void>((resolve) => { |
| 78 | + releaseWait = resolve |
| 79 | + }) |
| 80 | + |
| 81 | + testGlobal.__vite_ssr_hmr_reexport_race__ = { |
| 82 | + wait: () => { |
| 83 | + waitStarted() |
| 84 | + return waitPromise |
| 85 | + }, |
| 86 | + } |
| 87 | + |
| 88 | + for (const module of [ |
| 89 | + entryAModule!, |
| 90 | + entryBModule!, |
| 91 | + sharedModule!, |
| 92 | + coreModule!, |
| 93 | + ]) { |
| 94 | + runner.evaluatedModules.invalidateModule(module) |
| 95 | + } |
| 96 | + |
| 97 | + const importA = runner.import('/fixtures/hmr-reexport-race/entry-a.js') |
| 98 | + await waitStartedPromise |
| 99 | + |
| 100 | + const importB = runner.import('/fixtures/hmr-reexport-race/entry-b.js') |
| 101 | + // Wait deterministically until entry-b has reached the point where it |
| 102 | + // observes shared as in-flight. The `mod.imports.add(depMod.id)` line |
| 103 | + // in `request()` runs synchronously immediately before `cachedRequest` |
| 104 | + // executes its cycle-detection prefix, so observing this edge means |
| 105 | + // the buggy/fixed branch has either just run or is about to run on |
| 106 | + // the same microtask. `imports` is cleared by invalidateModule, so |
| 107 | + // this is a fresh signal (unlike `importers`, which is preserved). |
| 108 | + const entryBNode = runner.evaluatedModules.getModuleByUrl( |
| 109 | + '/fixtures/hmr-reexport-race/entry-b.js', |
| 110 | + )! |
| 111 | + while (!entryBNode.imports.has(sharedModule!.id)) { |
| 112 | + await new Promise((resolve) => setImmediate(resolve)) |
| 113 | + } |
| 114 | + releaseWait() |
| 115 | + const results = await Promise.allSettled([importA, importB] as const) |
| 116 | + |
| 117 | + expect(results).toEqual([ |
| 118 | + { |
| 119 | + status: 'fulfilled', |
| 120 | + value: expect.objectContaining({ result: 'a' }), |
| 121 | + }, |
| 122 | + { |
| 123 | + status: 'fulfilled', |
| 124 | + value: expect.objectContaining({ result: 'b' }), |
| 125 | + }, |
| 126 | + ]) |
| 127 | + |
| 128 | + const hmrListeners = runner.hmrClient!.hotModulesMap |
| 129 | + expect(hmrListeners.has('/fixtures/hmr-reexport-race/entry-a.js')).toBe( |
| 130 | + true, |
| 131 | + ) |
| 132 | + expect(hmrListeners.has('/fixtures/hmr-reexport-race/entry-b.js')).toBe( |
| 133 | + true, |
| 134 | + ) |
| 135 | + }) |
39 | 136 | }, |
40 | 137 | process.env.CI ? 50_00 : 5_000, |
41 | 138 | ) |
0 commit comments