Merge branch 'next' into norbert/delete-deprecated

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 8.6.1
+
+- CSF: Only export definePreview from the framework - [#30676](https://github.com/storybookjs/storybook/pull/30676), thanks @kasperpeulen!
+- Codemod: Only remove types when they are unused - [#30644](https://github.com/storybookjs/storybook/pull/30644), thanks @yannbf!
+
 ## 8.6.0
 
 The 8.6 release focuses on [Storybook Test](https://storybook.js.org/blog/storybook-test-sneak-peek/), which brings realtime component, accessibility, and visual UI tests to your favorite component workshop.

code/.storybook/preview.tsx

@@ -25,7 +25,7 @@ import addonTest from '@storybook/experimental-addon-test';
 import { definePreview } from '@storybook/react-vite';
 
 import addonA11y from '@storybook/addon-a11y';
-import addonEssentials from '@storybook/addon-essentials';
+import * as addonEssentials from '@storybook/addon-essentials/entry-preview';
 import addonThemes from '@storybook/addon-themes';
 
 import * as addonsPreview from '../addons/toolbars/template/stories/preview';
@@ -372,7 +372,7 @@ const parameters = {
 export default definePreview({
   addons: [
     addonThemes(),
-    addonEssentials(),
+    addonEssentials,
     addonA11y(),
     addonTest(),
     addonsPreview,

code/frameworks/experimental-nextjs-vite/src/preview.tsx

@@ -25,7 +25,8 @@ function addNextHeadCount() {
 function isAsyncClientComponentError(error: unknown) {
   return (
     typeof error === 'string' &&
-    (error.includes('A component was suspended by an uncached promise.') ||
+    (error.includes('Only Server Components can be async at the moment.') ||
+      error.includes('A component was suspended by an uncached promise.') ||
       error.includes('async/await is not yet supported in Client Components'))
   );
 }

code/frameworks/nextjs/src/preview.tsx

@@ -30,7 +30,8 @@ function addNextHeadCount() {
 function isAsyncClientComponentError(error: unknown) {
   return (
     typeof error === 'string' &&
-    (error.includes('A component was suspended by an uncached promise.') ||
+    (error.includes('Only Server Components can be async at the moment.') ||
+      error.includes('A component was suspended by an uncached promise.') ||
       error.includes('async/await is not yet supported in Client Components'))
   );
 }

code/lib/cli-storybook/src/sandbox-templates.ts

@@ -235,7 +235,7 @@ export const baseTemplates = {
   'experimental-nextjs-vite/default-ts': {
     name: 'Next.js Latest (Vite | TypeScript)',
     script:
-      'npx create-next-app {{beforeDir}} --eslint --tailwind --app --import-alias="@/*" --src-dir',
+      'npx create-next-app {{beforeDir}} --eslint --no-tailwind --app --import-alias="@/*" --src-dir',
     expected: {
       framework: '@storybook/experimental-nextjs-vite',
       renderer: '@storybook/react',

code/lib/create-storybook/src/initiate.ts

@@ -330,6 +330,7 @@ export async function doInitiate(options: CommandOptions): Promise<
       choices: Object.entries(selectableFeatures).map(([value, { name, description }]) => ({
         title: `${name}: ${description}`,
         value,
+        selected: true,
       })),
     });
     selectedFeatures = new Set(out.features);

code/renderers/react/src/preview.tsx

@@ -66,7 +66,7 @@ interface ReactMeta<
   ): ReactStory;
 
   story<
-    const TInput extends Simplify<
+    TInput extends Simplify<
       StoryAnnotations<
         ReactRenderer,
         // TODO: infer mocks from story itself as well