88 editFile ,
99 getBg ,
1010 getColor ,
11+ gotoLatestBuild ,
12+ hotUpdatedLog ,
1113 isBuild ,
1214 isBundledDev ,
1315 page ,
@@ -513,26 +515,25 @@ if (!isBuild) {
513515 )
514516 } )
515517
516- // bundled dev: partial accept (`import.meta.hot.acceptExports`) is not
517- // supported (rolldown#10061)
518- describe . skipIf ( isBundledDev ) ( 'acceptExports' , ( ) => {
518+ describe ( 'acceptExports' , ( ) => {
519519 const HOT_UPDATED = / h o t u p d a t e d /
520520 const CONNECTED = / c o n n e c t e d /
521521
522522 const baseDir = 'accept-exports'
523+ const openPage = ( testDir : string ) =>
524+ gotoLatestBuild ( `${ viteTestUrl } /${ testDir } /` )
523525
524526 describe ( 'when all used exports are accepted' , ( ) => {
525527 const testDir = baseDir + '/main-accepted'
526528
527529 const fileName = 'target.ts'
528530 const file = `${ testDir } /${ fileName } `
529- const url = '/' + file
530531
531532 let dep = 'dep0'
532533
533534 beforeAll ( async ( ) => {
534535 await untilBrowserLogAfter (
535- ( ) => page . goto ( ` ${ viteTestUrl } / ${ testDir } /` ) ,
536+ ( ) => openPage ( testDir ) ,
536537 [ CONNECTED , / > > > > > > / ] ,
537538 ( logs ) => {
538539 expect ( logs ) . toContain ( `<<<<<< A0 B0 D0 ; ${ dep } ` )
@@ -543,7 +544,6 @@ if (!isBuild) {
543544
544545 it ( 'the callback is called with the new version the module' , async ( ) => {
545546 const callbackFile = `${ testDir } /callback.ts`
546- const callbackUrl = '/' + callbackFile
547547
548548 await untilBrowserLogAfter (
549549 ( ) => {
@@ -557,7 +557,7 @@ if (!isBuild) {
557557 ( logs ) => {
558558 expect ( logs ) . toEqual ( [
559559 'reloaded >>> Y' ,
560- `[vite] hot updated: ${ callbackUrl } ` ,
560+ hotUpdatedLog ( callbackFile ) ,
561561 ] )
562562 } ,
563563 )
@@ -572,7 +572,7 @@ if (!isBuild) {
572572 ( logs ) => {
573573 expect ( logs ) . toEqual ( [
574574 'reloaded (2) >>> Z' ,
575- `[vite] hot updated: ${ callbackUrl } ` ,
575+ hotUpdatedLog ( callbackFile ) ,
576576 ] )
577577 } ,
578578 )
@@ -593,7 +593,7 @@ if (!isBuild) {
593593 ( logs ) => {
594594 expect ( logs ) . toEqual ( [
595595 `<<<<<< A0 B0 D0 ; ${ dep } ` ,
596- `[vite] hot updated: ${ url } ` ,
596+ hotUpdatedLog ( file ) ,
597597 ] )
598598 } ,
599599 )
@@ -608,7 +608,7 @@ if (!isBuild) {
608608 ( logs ) => {
609609 expect ( logs ) . toEqual ( [
610610 `<<<<<< A1 B1 D1 ; ${ dep } ` ,
611- `[vite] hot updated: ${ url } ` ,
611+ hotUpdatedLog ( file ) ,
612612 ] )
613613 } ,
614614 )
@@ -632,7 +632,7 @@ if (!isBuild) {
632632 ( logs ) => {
633633 expect ( logs ) . toEqual ( [
634634 `<<<<<< A2 B2 D2 ; ${ dep } ` ,
635- `[vite] hot updated: ${ url } ` ,
635+ hotUpdatedLog ( file ) ,
636636 ] )
637637 } ,
638638 )
@@ -668,7 +668,7 @@ if (!isBuild) {
668668
669669 beforeAll ( async ( ) => {
670670 await untilBrowserLogAfter (
671- ( ) => page . goto ( ` ${ viteTestUrl } / ${ testDir } /` ) ,
671+ ( ) => openPage ( testDir ) ,
672672 [ CONNECTED , / > > > > > > / ] ,
673673 ( logs ) => {
674674 expect ( logs ) . toContain ( `<<< named: ${ a } ; ${ dep } ` )
@@ -731,7 +731,7 @@ if (!isBuild) {
731731 const file = 'side-effects.ts'
732732
733733 await untilBrowserLogAfter (
734- ( ) => page . goto ( ` ${ viteTestUrl } / ${ testDir } /` ) ,
734+ ( ) => openPage ( testDir ) ,
735735 [ CONNECTED , / > > > / ] ,
736736 ( logs ) => {
737737 expect ( logs ) . toContain ( '>>> side FX' )
@@ -748,7 +748,7 @@ if (!isBuild) {
748748 ( logs ) => {
749749 expect ( logs ) . toEqual ( [
750750 '>>> side FX !!' ,
751- `[vite] hot updated: / ${ testDir } /${ file } `,
751+ hotUpdatedLog ( ` ${ testDir } /${ file } `) ,
752752 ] )
753753 } ,
754754 )
@@ -760,10 +760,9 @@ if (!isBuild) {
760760 test ( 'accepts itself if no exports are imported' , async ( ) => {
761761 const fileName = 'unused.ts'
762762 const file = `${ testDir } /${ fileName } `
763- const url = '/' + file
764763
765764 await untilBrowserLogAfter (
766- ( ) => page . goto ( ` ${ viteTestUrl } / ${ testDir } /` ) ,
765+ ( ) => openPage ( testDir ) ,
767766 [ CONNECTED , '-- unused --' ] ,
768767 ( logs ) => {
769768 expect ( logs ) . toContain ( '-- unused --' )
@@ -779,7 +778,7 @@ if (!isBuild) {
779778 } ,
780779 HOT_UPDATED ,
781780 ( logs ) => {
782- expect ( logs ) . toEqual ( [ '-> unused <-' , `[vite] hot updated: ${ url } ` ] )
781+ expect ( logs ) . toEqual ( [ '-> unused <-' , hotUpdatedLog ( file ) ] )
783782 } ,
784783 )
785784 } )
@@ -789,7 +788,7 @@ if (!isBuild) {
789788 const file = `${ testDir } /${ fileName } `
790789
791790 await untilBrowserLogAfter (
792- ( ) => page . goto ( ` ${ viteTestUrl } / ${ testDir } /` ) ,
791+ ( ) => openPage ( testDir ) ,
793792 [ CONNECTED , '-- used --' ] ,
794793 ( logs ) => {
795794 expect ( logs ) . toContain ( '-- used --' )
@@ -824,10 +823,9 @@ if (!isBuild) {
824823 it ( 'accepts itself if all its exports are accepted' , async ( ) => {
825824 const fileName = 'deps-all-accepted.ts'
826825 const file = `${ testDir } /${ fileName } `
827- const url = '/' + file
828826
829827 await untilBrowserLogAfter (
830- ( ) => page . goto ( ` ${ viteTestUrl } / ${ testDir } /` ) ,
828+ ( ) => openPage ( testDir ) ,
831829 [ CONNECTED , '>>> ready <<<' ] ,
832830 ( logs ) => {
833831 expect ( logs ) . toContain ( 'loaded:all:a0b0c0default0' )
@@ -843,7 +841,7 @@ if (!isBuild) {
843841 ( logs ) => {
844842 expect ( logs ) . toEqual ( [
845843 'all >>>>>> a1, b1, c1' ,
846- `[vite] hot updated: ${ url } ` ,
844+ hotUpdatedLog ( file ) ,
847845 ] )
848846 } ,
849847 )
@@ -856,7 +854,7 @@ if (!isBuild) {
856854 ( logs ) => {
857855 expect ( logs ) . toEqual ( [
858856 'all >>>>>> a2, b2, c2' ,
859- `[vite] hot updated: ${ url } ` ,
857+ hotUpdatedLog ( file ) ,
860858 ] )
861859 } ,
862860 )
@@ -867,7 +865,7 @@ if (!isBuild) {
867865 const file = `${ testDir } /${ fileName } `
868866
869867 await untilBrowserLogAfter (
870- ( ) => page . goto ( ` ${ viteTestUrl } / ${ testDir } /` ) ,
868+ ( ) => openPage ( testDir ) ,
871869 [ CONNECTED , '>>> ready <<<' ] ,
872870 ( logs ) => {
873871 expect ( logs ) . toContain ( 'loaded:some:a0b0c0default0' )
0 commit comments