@@ -133,6 +133,103 @@ describe(
133133 true ,
134134 )
135135 } )
136+
137+ it ( 'does not treat evaluated imports as live circular requests' , async ( {
138+ runner,
139+ } ) => {
140+ const testGlobal = globalThis as any
141+ const sharedUrl = '/fixtures/hmr-evaluated-import-race/shared.js'
142+ const evaluatedUrl = '/fixtures/hmr-evaluated-import-race/evaluated.js'
143+
144+ testGlobal . __vite_ssr_hmr_evaluated_import_race__ = {
145+ wait : ( ) => Promise . resolve ( ) ,
146+ importShared : ( ) => false ,
147+ }
148+ onTestFinished ( ( ) => {
149+ delete testGlobal . __vite_ssr_hmr_evaluated_import_race__
150+ } )
151+
152+ await runner . import ( sharedUrl )
153+
154+ const sharedModule = runner . evaluatedModules . getModuleByUrl ( sharedUrl )
155+ const evaluatedModule =
156+ runner . evaluatedModules . getModuleByUrl ( evaluatedUrl )
157+ expect ( sharedModule ) . toBeDefined ( )
158+ expect ( evaluatedModule ) . toBeDefined ( )
159+
160+ let waitStarted ! : ( ) => void
161+ const waitStartedPromise = new Promise < void > ( ( resolve ) => {
162+ waitStarted = resolve
163+ } )
164+ let releaseWait ! : ( ) => void
165+ const waitPromise = new Promise < void > ( ( resolve ) => {
166+ releaseWait = resolve
167+ } )
168+ let evaluatedWaitStarted ! : ( ) => void
169+ const evaluatedWaitStartedPromise = new Promise < void > ( ( resolve ) => {
170+ evaluatedWaitStarted = resolve
171+ } )
172+ let releaseEvaluatedWait ! : ( ) => void
173+ const evaluatedWaitPromise = new Promise < void > ( ( resolve ) => {
174+ releaseEvaluatedWait = resolve
175+ } )
176+ let evaluatedRequestCount = 0
177+
178+ testGlobal . __vite_ssr_hmr_evaluated_import_race__ = {
179+ wait : ( ) => {
180+ waitStarted ( )
181+ return waitPromise
182+ } ,
183+ importShared : async ( ) => {
184+ if ( evaluatedRequestCount ++ === 0 ) {
185+ evaluatedWaitStarted ( )
186+ await evaluatedWaitPromise
187+ return true
188+ }
189+ return false
190+ } ,
191+ }
192+
193+ runner . evaluatedModules . invalidateModule ( sharedModule ! )
194+
195+ const sharedRequest = runner . import ( sharedUrl )
196+ await waitStartedPromise
197+ expect ( sharedModule ! . imports . has ( evaluatedModule ! . id ) ) . toBe ( true )
198+
199+ // Start an evaluation that pauses before dynamically importing shared.
200+ runner . evaluatedModules . invalidateModule ( evaluatedModule ! )
201+
202+ let staleEvaluatedRequestSettled = false
203+ const staleEvaluatedRequest = runner
204+ . import ( evaluatedUrl )
205+ . then ( ( result ) => {
206+ staleEvaluatedRequestSettled = true
207+ return result
208+ } )
209+ await evaluatedWaitStartedPromise
210+
211+ // Simulate HMR restarting evaluated while the older evaluation is still
212+ // paused. The newer evaluation completes without importing shared.
213+ runner . evaluatedModules . invalidateModule ( evaluatedModule ! )
214+ await runner . import ( evaluatedUrl )
215+ expect ( evaluatedModule ! . evaluated ) . toBe ( true )
216+
217+ releaseEvaluatedWait ( )
218+ while ( ! evaluatedModule ! . imports . has ( sharedModule ! . id ) ) {
219+ await new Promise ( ( resolve ) => setImmediate ( resolve ) )
220+ }
221+
222+ await new Promise ( ( resolve ) => setImmediate ( resolve ) )
223+ expect ( staleEvaluatedRequestSettled ) . toBe ( false )
224+
225+ releaseWait ( )
226+ const [ sharedResult , evaluatedResult ] = await Promise . all ( [
227+ sharedRequest ,
228+ staleEvaluatedRequest ,
229+ ] )
230+ expect ( sharedResult . value ) . toBe ( 'ready' )
231+ expect ( evaluatedResult . sharedValue ) . toBe ( 'ready' )
232+ } )
136233 } ,
137234 process . env . CI ? 50_00 : 5_000 ,
138235)
0 commit comments