Builder-Vite: Add null character prefix to virtual file IDs in code g…

…enerator plugin
storybookjs · Aug 13, 2024 · 8066f72 · 8066f72
1 parent db593fa
commit 8066f72
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/code/builders/builder-vite/src/plugins/code-generator-plugin.ts b/code/builders/builder-vite/src/plugins/code-generator-plugin.ts
@@ -15,6 +15,10 @@ import {
   virtualStoriesFile,
 } from '../virtual-file-names';
 
+function resolvedVirtualPath(path: string): string {
+  return `\0${path}`;
+}
+
 export function codeGeneratorPlugin(options: Options): Plugin {
   const iframePath = require.resolve('@storybook/builder-vite/input/iframe.html');
   let iframeId: string;
@@ -70,33 +74,33 @@ export function codeGeneratorPlugin(options: Options): Plugin {
     },
     resolveId(source) {
       if (source === virtualFileId) {
-        return virtualFileId;
+        return resolvedVirtualPath(virtualFileId);
       }
       if (source === iframePath) {
         return iframeId;
       }
       if (source === virtualStoriesFile) {
-        return virtualStoriesFile;
+        return resolvedVirtualPath(virtualStoriesFile);
       }
       if (source === virtualPreviewFile) {
         return virtualPreviewFile;
       }
       if (source === virtualAddonSetupFile) {
-        return virtualAddonSetupFile;
+        return resolvedVirtualPath(virtualAddonSetupFile);
       }
 
       return undefined;
     },
     async load(id, config) {
-      if (id === virtualStoriesFile) {
+      if (id === resolvedVirtualPath(virtualStoriesFile)) {
         return generateImportFnScriptCode(options);
       }
 
-      if (id === virtualAddonSetupFile) {
+      if (id === resolvedVirtualPath(virtualAddonSetupFile)) {
         return generateAddonSetupCode();
       }
 
-      if (id === virtualFileId) {
+      if (id === resolvedVirtualPath(virtualFileId)) {
         return generateModernIframeScriptCode(options, projectRoot);
       }
 

diff --git a/code/builders/builder-vite/src/virtual-file-names.ts b/code/builders/builder-vite/src/virtual-file-names.ts
@@ -1,4 +1,4 @@
-export const virtualFileId = '\0virtual:/@storybook/builder-vite/vite-app.js';
-export const virtualStoriesFile = '\0virtual:/@storybook/builder-vite/storybook-stories.js';
-export const virtualPreviewFile = '\0virtual:/@storybook/builder-vite/preview-entry.js';
-export const virtualAddonSetupFile = '\0virtual:/@storybook/builder-vite/setup-addons.js';
+export const virtualFileId = 'virtual:/@storybook/builder-vite/vite-app.js';
+export const virtualStoriesFile = 'virtual:/@storybook/builder-vite/storybook-stories.js';
+export const virtualPreviewFile = 'virtual:/@storybook/builder-vite/preview-entry.js';
+export const virtualAddonSetupFile = 'virtual:/@storybook/builder-vite/setup-addons.js';