fix order issues

storybookjs · Oct 22, 2024 · 292516a · 292516a
1 parent 881a820
commit 292516a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 24 deletions.
diff --git a/src/compiler/pre-transform/index.test.ts b/src/compiler/pre-transform/index.test.ts
@@ -208,7 +208,6 @@ describe(codemodLegacyNodes.name, () => {
 
     expect(print(transformed)).toMatchInlineSnapshot(`
       "<script context="module">
-      	import Button from "./Button.svelte";
       	import { defineMeta } from "@storybook/addon-svelte-csf";
       	import Button from "./Button.svelte";
 
@@ -273,6 +272,7 @@ describe(codemodLegacyNodes.name, () => {
 
     expect(print(transformed)).toMatchInlineSnapshot(`
       "<script context="module" lang="ts">
+      	import { defineMeta } from "@storybook/addon-svelte-csf";
       	import Button from "./Button.svelte";
 
       	const { Story } = defineMeta({ component: Button });

diff --git a/src/compiler/pre-transform/index.ts b/src/compiler/pre-transform/index.ts
@@ -202,33 +202,11 @@ export async function codemodLegacyNodes(params: Params): Promise<SvelteAST.Root
       instance = instance ? (visit(instance, state) as SvelteAST.Script) : null;
 
       if (!module) {
-        const {
-          pkgImportDeclaration,
-          defineMetaFromExportConstMeta,
-          storiesComponentImportDeclaration,
-        } = state;
-
-        let body: ESTreeAST.Program['body'] = [];
-
-        // WARN: This scope is bug prone
-
-        if (pkgImportDeclaration) {
-          body.push(pkgImportDeclaration);
-        }
-
-        if (storiesComponentImportDeclaration) {
-          body.push(storiesComponentImportDeclaration);
-        }
-
-        if (defineMetaFromExportConstMeta) {
-          body.push(defineMetaFromExportConstMeta);
-        }
-
         module = createASTScript({
           module: true,
           content: {
             type: 'Program',
-            body,
+            body: [],
             sourceType: 'module',
           },
         });
@@ -303,6 +281,14 @@ export async function codemodLegacyNodes(params: Params): Promise<SvelteAST.Root
           node.body.unshift(state.storiesComponentImportDeclaration);
         }
 
+        if (state.pkgImportDeclaration) {
+          node.body.unshift(state.pkgImportDeclaration);
+        }
+
+        if (state.defineMetaFromExportConstMeta) {
+          node.body.push(state.defineMetaFromExportConstMeta);
+        }
+
         if (state.defineMetaFromComponentMeta) {
           node.body.push(state.defineMetaFromComponentMeta);
         }