Resolve issue with importing addon inside package examples

storybookjs · May 25, 2024 · 4349e20 · 4349e20
1 parent 66739c8
commit 4349e20
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 19 deletions.
diff --git a/src/parser/walkers/module.ts b/src/parser/walkers/module.ts
@@ -13,13 +13,7 @@ export async function walkOnModule(module: Script): Promise<AddonASTNodes> {
     ImportDeclaration(node, { state }) {
       const { source, specifiers } = node;
 
-      if (
-        source.value === pkg.name ||
-        // FIXME:
-        // This should be for this package testing purpose only.
-        // Need a condition to prevent it running outside this package
-        (typeof source.value === 'string' && source.value.includes('src/index'))
-      ) {
+      if (source.value === pkg.name) {
         for (const specifier of specifiers) {
           if (specifier.type !== 'ImportSpecifier') {
             throw new Error(`Don't use the default/namespace import from "${pkg.name}"`);

diff --git a/stories/Actions.stories.svelte b/stories/Actions.stories.svelte
@@ -1,7 +1,6 @@
 <script context="module">
   import { action } from '@storybook/addon-actions';
-
-  import { defineMeta } from '../src/index';
+  import { defineMeta } from '@storybook/addon-svelte-csf';
 
   const { Story } = defineMeta({
     title: 'Addon/Actions',

diff --git a/stories/Controls.stories.svelte b/stories/Controls.stories.svelte
@@ -1,5 +1,5 @@
 <script context="module">
-  import { defineMeta } from '../src/index';
+  import { defineMeta } from '@storybook/addon-svelte-csf';
 
   import Controls from './Controls.svelte';
 

diff --git a/stories/Example.stories.svelte b/stories/Example.stories.svelte
@@ -1,7 +1,6 @@
 <script context="module" lang="ts">
   import { action } from '@storybook/addon-actions';
-
-  import { defineMeta, setTemplate, type Args, type StoryContext } from "../src/index.js";
+  import { defineMeta, setTemplate, type Args, type StoryContext } from '@storybook/addon-svelte-csf';
 
   import Example from './Example.svelte';
 

diff --git a/stories/Interactions.stories.svelte b/stories/Interactions.stories.svelte
@@ -1,10 +1,9 @@
 <script context="module">
-  import Interactions from './Interactions.svelte';
-  import { expect } from '@storybook/test';
-  import { userEvent, within } from '@storybook/test';
+  import { defineMeta } from '@storybook/addon-svelte-csf';
+  import { expect, userEvent, within } from '@storybook/test';
   import { tick } from 'svelte';
 
-  import { defineMeta } from '../src/index';
+  import Interactions from './Interactions.svelte';
 
   const { Story } = defineMeta({
     title: 'Addon/Interactions',

diff --git a/stories/TestOverrides.stories.svelte b/stories/TestOverrides.stories.svelte
@@ -1,5 +1,5 @@
 <script context="module">
-  import { defineMeta as d } from '../src/index';
+  import { defineMeta as d } from '@storybook/addon-svelte-csf';
 
   const { Story: S, meta: m } = d({
     title: 'Test overrides',

diff --git a/stories/context.stories.svelte b/stories/context.stories.svelte
@@ -1,5 +1,5 @@
 <script context="module">
-  import { defineMeta } from '../src/index';
+  import { defineMeta } from '@storybook/addon-svelte-csf';
 
   const { Story } = defineMeta({
     title: 'StoryContext',

diff --git a/stories/templates.stories.svelte b/stories/templates.stories.svelte
@@ -1,5 +1,5 @@
 <script context="module" lang="ts">
-  import { defineMeta, type Args } from '../src/index.js';
+  import { defineMeta, type Args } from '@storybook/addon-svelte-csf';
 
   import Text from './Text.svelte';