@@ -8,6 +8,7 @@ import { generateImportFnScriptCode } from '../codegen-importfn-script';
8
8
import { generateModernIframeScriptCode } from '../codegen-modern-iframe-script' ;
9
9
import { generateAddonSetupCode } from '../codegen-set-addon-channel' ;
10
10
import { transformIframeHtml } from '../transform-iframe-html' ;
11
+ import { getResolvedVirtualModuleId } from '../utils/virtual-module' ;
11
12
import {
12
13
virtualAddonSetupFile ,
13
14
virtualFileId ,
@@ -28,11 +29,15 @@ export function codeGeneratorPlugin(options: Options): Plugin {
28
29
// invalidate the whole vite-app.js script on every file change.
29
30
// (this might be a little too aggressive?)
30
31
server . watcher . on ( 'change' , ( ) => {
31
- const appModule = server . moduleGraph . getModuleById ( virtualFileId ) ;
32
+ const appModule = server . moduleGraph . getModuleById (
33
+ getResolvedVirtualModuleId ( virtualFileId )
34
+ ) ;
32
35
if ( appModule ) {
33
36
server . moduleGraph . invalidateModule ( appModule ) ;
34
37
}
35
- const storiesModule = server . moduleGraph . getModuleById ( virtualStoriesFile ) ;
38
+ const storiesModule = server . moduleGraph . getModuleById (
39
+ getResolvedVirtualModuleId ( virtualStoriesFile )
40
+ ) ;
36
41
if ( storiesModule ) {
37
42
server . moduleGraph . invalidateModule ( storiesModule ) ;
38
43
}
@@ -70,33 +75,33 @@ export function codeGeneratorPlugin(options: Options): Plugin {
70
75
} ,
71
76
resolveId ( source ) {
72
77
if ( source === virtualFileId ) {
73
- return ` ${ virtualFileId } ` ;
78
+ return getResolvedVirtualModuleId ( virtualFileId ) ;
74
79
}
75
80
if ( source === iframePath ) {
76
81
return iframeId ;
77
82
}
78
83
if ( source === virtualStoriesFile ) {
79
- return ` ${ virtualStoriesFile } ` ;
84
+ return getResolvedVirtualModuleId ( virtualStoriesFile ) ;
80
85
}
81
86
if ( source === virtualPreviewFile ) {
82
- return virtualPreviewFile ;
87
+ return getResolvedVirtualModuleId ( virtualPreviewFile ) ;
83
88
}
84
89
if ( source === virtualAddonSetupFile ) {
85
- return ` ${ virtualAddonSetupFile } ` ;
90
+ return getResolvedVirtualModuleId ( virtualAddonSetupFile ) ;
86
91
}
87
92
88
93
return undefined ;
89
94
} ,
90
95
async load ( id , config ) {
91
- if ( id === ` ${ virtualStoriesFile } ` ) {
96
+ if ( id === getResolvedVirtualModuleId ( virtualStoriesFile ) ) {
92
97
return generateImportFnScriptCode ( options ) ;
93
98
}
94
99
95
- if ( id === ` ${ virtualAddonSetupFile } ` ) {
100
+ if ( id === getResolvedVirtualModuleId ( virtualAddonSetupFile ) ) {
96
101
return generateAddonSetupCode ( ) ;
97
102
}
98
103
99
- if ( id === ` ${ virtualFileId } ` ) {
104
+ if ( id === getResolvedVirtualModuleId ( virtualFileId ) ) {
100
105
return generateModernIframeScriptCode ( options , projectRoot ) ;
101
106
}
102
107
0 commit comments