fix: failing tests & issue with prettier inside tests

storybookjs · Jun 6, 2024 · efeeaf8 · efeeaf8
1 parent 7881a71
commit efeeaf8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/src/parser/analyse/Story/children.test.ts b/src/parser/analyse/Story/children.test.ts
@@ -31,7 +31,7 @@ describe(getStoryChildrenRawSource.name, () => {
       const svelteASTNodes = await extractSvelteASTNodes({ ast });
       const { storyComponents } = svelteASTNodes;
       const component = storyComponents[0].component;
-      const rawSource = getStoryChildrenRawSource({
+      const rawSource = await getStoryChildrenRawSource({
         component,
         svelteASTNodes,
         originalCode: code,
@@ -66,7 +66,7 @@ describe(getStoryChildrenRawSource.name, () => {
       const svelteASTNodes = await extractSvelteASTNodes({ ast });
       const { storyComponents } = svelteASTNodes;
       const component = storyComponents[0].component;
-      const rawSource = getStoryChildrenRawSource({
+      const rawSource = await getStoryChildrenRawSource({
         component,
         svelteASTNodes,
         originalCode: code,
@@ -107,7 +107,7 @@ describe(getStoryChildrenRawSource.name, () => {
       const svelteASTNodes = await extractSvelteASTNodes({ ast });
       const { storyComponents } = svelteASTNodes;
       const component = storyComponents[0].component;
-      const rawSource = getStoryChildrenRawSource({
+      const rawSource = await getStoryChildrenRawSource({
         component,
         svelteASTNodes,
         originalCode: code,
@@ -134,7 +134,7 @@ describe(getStoryChildrenRawSource.name, () => {
       const svelteASTNodes = await extractSvelteASTNodes({ ast });
       const { storyComponents } = svelteASTNodes;
       const component = storyComponents[0].component;
-      const rawSource = getStoryChildrenRawSource({
+      const rawSource = await getStoryChildrenRawSource({
         component,
         svelteASTNodes,
         originalCode: code,
@@ -165,7 +165,7 @@ describe(getStoryChildrenRawSource.name, () => {
       const svelteASTNodes = await extractSvelteASTNodes({ ast });
       const { storyComponents } = svelteASTNodes;
       const component = storyComponents[0].component;
-      const rawSource = getStoryChildrenRawSource({
+      const rawSource = await getStoryChildrenRawSource({
         component,
         svelteASTNodes,
         originalCode: code,
@@ -196,7 +196,7 @@ describe(getStoryChildrenRawSource.name, () => {
       const svelteASTNodes = await extractSvelteASTNodes({ ast });
       const { storyComponents } = svelteASTNodes;
       const component = storyComponents[0].component;
-      const rawSource = getStoryChildrenRawSource({
+      const rawSource = await getStoryChildrenRawSource({
         component,
         svelteASTNodes,
         originalCode: code,
@@ -237,7 +237,7 @@ describe(getStoryChildrenRawSource.name, () => {
       const svelteASTNodes = await extractSvelteASTNodes({ ast });
       const { storyComponents } = svelteASTNodes;
       const component = storyComponents[0].component;
-      const rawSource = getStoryChildrenRawSource({
+      const rawSource = await getStoryChildrenRawSource({
         component,
         svelteASTNodes,
         originalCode: code,

diff --git a/src/parser/analyse/Story/children.ts b/src/parser/analyse/Story/children.ts
@@ -1,5 +1,4 @@
 import type { Component, SnippetBlock } from 'svelte/compiler';
-import { format } from 'prettier';
 
 import { getDefineMetaComponentValue } from '../meta/component-identifier.js';
 
@@ -206,11 +205,19 @@ async function getSnippetBlockBodyRawCode(originalCode: string, node: SnippetBlo
 }
 
 async function prettifyCodeSlice(rawCode: string) {
+  const { format } = await import('prettier');
+
   /**
    * FIXME: Perhaps we don't need to prettify the code at this point, and do it at runtime instead?
    */
-  return await format(rawCode, {
-    plugins: ['prettier-plugin-svelte'],
+  const formatted = await format(rawCode, {
+    plugins: [
+      // @ts-expect-error FIXME: Upstream issue?
+      import('prettier-plugin-svelte'),
+    ],
     parser: 'svelte',
   });
+
+  // NOTE: Remove trailing new line
+  return formatted.replace(/\n$/, '');
 }