Merge branch 'next' into outline-ts

storybookjs · May 4, 2023 · 1219960 · 1219960
2 parents d0cc7b6 + 2350c14
commit 1219960
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/code/lib/builder-webpack5/src/preview/babel-loader-preview.ts b/code/lib/builder-webpack5/src/preview/babel-loader-preview.ts
@@ -1,7 +1,11 @@
 import { getProjectRoot } from '@storybook/core-common';
 import type { TypescriptOptions } from '../types';
 
-export const createBabelLoader = (options: any, typescriptOptions: TypescriptOptions) => {
+export const createBabelLoader = (
+  options: any,
+  typescriptOptions: TypescriptOptions,
+  excludes: string[] = []
+) => {
   return {
     test: typescriptOptions.skipBabel ? /\.(mjs|jsx?)$/ : /\.(mjs|tsx?|jsx?)$/,
     use: [
@@ -11,6 +15,6 @@ export const createBabelLoader = (options: any, typescriptOptions: TypescriptOpt
       },
     ],
     include: [getProjectRoot()],
-    exclude: /node_modules/,
+    exclude: [/node_modules/, ...excludes],
   };
 };
diff --git a/code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts b/code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts
@@ -294,7 +294,7 @@ export default async (
             fullySpecified: false,
           },
         },
-        createBabelLoader(babelOptions, typescriptOptions),
+        createBabelLoader(babelOptions, typescriptOptions, Object.keys(virtualModuleMapping)),
         {
           test: /\.md$/,
           type: 'asset/source',

diff --git a/docs/snippets/common/checkbox-story.mdx.mdx b/docs/snippets/common/checkbox-story.mdx.mdx
@@ -1,7 +1,7 @@
 ```mdx
 {/* Checkbox.mdx */}
 
-import { Canvas, Meta, Story } from '@storybook/blocks';
+import { Canvas, Meta } from '@storybook/blocks';
 
 import * as CheckboxStories from './Checkbox.stories';
 

diff --git a/docs/snippets/common/storybook-auto-docs-mdx-docs-imports.mdx.mdx b/docs/snippets/common/storybook-auto-docs-mdx-docs-imports.mdx.mdx
@@ -1,7 +1,7 @@
 ```mdx
 {/* Checkbox.mdx */}
 
-import { Canvas, Meta, Story } from '@storybook/blocks';
+import { Canvas, Meta } from '@storybook/blocks';
 
 import * as CheckboxStories from './Checkbox.stories';
 ```
diff --git a/docs/snippets/vue/button-story-click-handler-args.3.js.mdx b/docs/snippets/vue/button-story-click-handler-args.3.js.mdx
@@ -23,7 +23,7 @@ export const Text = {
         onClick: action('clicked'),
       };
     },
-    template: '<Button @onClick="onClick" :label="label" />',
+    template: '<Button @click="onClick" :label="label" />',
   }),
   args: {
     label: 'Hello',

diff --git a/docs/snippets/vue/button-story-click-handler-args.3.ts-4-9.mdx b/docs/snippets/vue/button-story-click-handler-args.3.ts-4-9.mdx
@@ -33,7 +33,7 @@ export const Primary: Story = {
         onClick: action('clicked'),
       };
     },
-    template: '<Button @onClick="onClick" :label="label" />',
+    template: '<Button @click="onClick" :label="label" />',
   }),
   args: {
     label: 'Hello',

diff --git a/docs/snippets/vue/button-story-click-handler-args.3.ts.mdx b/docs/snippets/vue/button-story-click-handler-args.3.ts.mdx
@@ -33,7 +33,7 @@ export const Primary: Story = {
         onClick: action('clicked'),
       };
     },
-    template: '<Button @onClick="onClick" :label="label" />',
+    template: '<Button @click="onClick" :label="label" />',
   }),
   args: {
     label: 'Hello',