From cabe235f4a7f1e99be3a0422994eaabaf4b55362 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <ndelangen@me.com>
Date: Tue, 13 Aug 2024 11:59:35 +0200
Subject: [PATCH 1/2] add e2e test for save-from-controls, testing if the
 preview is actually rendered. This tests HMR ;)

---
 code/e2e-tests/save-from-controls.spec.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/e2e-tests/save-from-controls.spec.ts b/code/e2e-tests/save-from-controls.spec.ts
index 0fbc24b3859..eeba0ab5ed4 100644
--- a/code/e2e-tests/save-from-controls.spec.ts
+++ b/code/e2e-tests/save-from-controls.spec.ts
@@ -1,4 +1,4 @@
-import { test } from '@playwright/test';
+import { expect, test } from '@playwright/test';
 import process from 'process';
 
 import { SbPage } from './util';
@@ -68,5 +68,8 @@ test.describe('save-from-controls', () => {
     const notification2 = await sbPage.page.waitForSelector('[title="Story created"]');
     await notification2.isVisible();
     await notification2.click();
+
+    // Assert the Button components is rendered in the preview
+    await expect(sbPage.previewRoot()).toContainText('Button');
   });
 });

From fe8bf33b762349e57280956fc577e65e688269c2 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <ndelangen@me.com>
Date: Tue, 13 Aug 2024 12:32:04 +0200
Subject: [PATCH 2/2] revert
 https://github.com/storybookjs/storybook/pull/28863

---
 .../src/plugins/code-generator-plugin.ts             | 12 ++++++------
 1 file changed, 6 insertions(+), 6 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
index ac0fe2a3b97..89f6430f758 100644
--- a/code/builders/builder-vite/src/plugins/code-generator-plugin.ts
+++ b/code/builders/builder-vite/src/plugins/code-generator-plugin.ts
@@ -70,33 +70,33 @@ export function codeGeneratorPlugin(options: Options): Plugin {
     },
     resolveId(source) {
       if (source === virtualFileId) {
-        return `\0${virtualFileId}`;
+        return `${virtualFileId}`;
       }
       if (source === iframePath) {
         return iframeId;
       }
       if (source === virtualStoriesFile) {
-        return `\0${virtualStoriesFile}`;
+        return `${virtualStoriesFile}`;
       }
       if (source === virtualPreviewFile) {
         return virtualPreviewFile;
       }
       if (source === virtualAddonSetupFile) {
-        return `\0${virtualAddonSetupFile}`;
+        return `${virtualAddonSetupFile}`;
       }
 
       return undefined;
     },
     async load(id, config) {
-      if (id === `\0${virtualStoriesFile}`) {
+      if (id === `${virtualStoriesFile}`) {
         return generateImportFnScriptCode(options);
       }
 
-      if (id === `\0${virtualAddonSetupFile}`) {
+      if (id === `${virtualAddonSetupFile}`) {
         return generateAddonSetupCode();
       }
 
-      if (id === `\0${virtualFileId}`) {
+      if (id === `${virtualFileId}`) {
         return generateModernIframeScriptCode(options, projectRoot);
       }