Merge pull request #32060 from storybookjs/version-non-patch-from-9.1.0-alpha.8

Release: Prerelease 9.1.0-alpha.9

Author: yannbf

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 9.0.17
+
+- Addon Vitest: Fix support for plain `stories.tsx` files - [#32041](https://github.com/storybookjs/storybook/pull/32041), thanks @ghengeveld!
+- Onboarding: Intent survey - [#31944](https://github.com/storybookjs/storybook/pull/31944), thanks @ghengeveld!
+- UI: Fix text color for failing stories in sidebar - [#32042](https://github.com/storybookjs/storybook/pull/32042), thanks @ghengeveld!
+
 ## 9.0.16
 
 - Automigration: Fail with non-zero exit code on migration failure - [#31923](https://github.com/storybookjs/storybook/pull/31923), thanks @mrginglymus!

CHANGELOG.prerelease.md

@@ -1,3 +1,10 @@
+## 9.1.0-alpha.9
+
+- CLI: Fix Storybook doctor compatibility checks - [#32077](https://github.com/storybookjs/storybook/pull/32077), thanks @yannbf!
+- Svelte: Fix union types generating invalid labels in argTypes - [#31980](https://github.com/storybookjs/storybook/pull/31980), thanks @grantralls!
+- Telemetry: Add nodeLinker to telemetry - [#32072](https://github.com/storybookjs/storybook/pull/32072), thanks @valentinpalkovic!
+- Test: Add mock capabilities - [#31987](https://github.com/storybookjs/storybook/pull/31987), thanks @valentinpalkovic!
+
 ## 9.1.0-alpha.8
 
 - Addon Vitest: Fix support for plain `stories.tsx` files - [#32041](https://github.com/storybookjs/storybook/pull/32041), thanks @ghengeveld!

code/.storybook/preview.tsx

@@ -1,15 +1,16 @@
+/* eslint-disable depend/ban-dependencies */
 import React, { type FC, Fragment, useEffect } from 'react';
 
 import type { Channel } from 'storybook/internal/channels';
 
 import { global } from '@storybook/global';
 
 import type { Decorator, Loader, ReactRenderer } from '@storybook/react-vite';
-// TODO add empty preview
-// import * as designs from '@storybook/addon-designs/preview';
 import { definePreview } from '@storybook/react-vite';
 
 import addonA11y from '@storybook/addon-a11y';
+// TODO add empty preview
+// import * as designs from '@storybook/addon-designs/preview';
 import addonDocs from '@storybook/addon-docs';
 import { DocsContext } from '@storybook/addon-docs/blocks';
 import addonThemes from '@storybook/addon-themes';
@@ -18,6 +19,7 @@ import addonTest from '@storybook/addon-vitest';
 import addonPseudoStates from 'storybook-addon-pseudo-states';
 import { DocsContext as DocsContextProps, useArgs } from 'storybook/preview-api';
 import type { PreviewWeb } from 'storybook/preview-api';
+import { sb } from 'storybook/test';
 import {
   Global,
   ThemeProvider,
@@ -33,6 +35,13 @@ import * as templatePreview from '../core/template/stories/preview';
 import '../renderers/react/template/components/index';
 import { isChromatic } from './isChromatic';
 
+sb.mock(import('../core/template/stories/test/ModuleMocking.utils'));
+sb.mock(import('../core/template/stories/test/ModuleSpyMocking.utils'), { spy: true });
+sb.mock(import('../core/template/stories/test/ModuleAutoMocking.utils'));
+sb.mock(import('lodash-es'));
+sb.mock(import('lodash-es/add'));
+sb.mock(import('lodash-es/sum'));
+
 const { document } = global;
 globalThis.CONFIG_TYPE = 'DEVELOPMENT';
 

code/.storybook/utils/todo.tsx

@@ -0,0 +1,3 @@
+export function getTodos() {
+  return ['some todo'];
+}

code/__mocks__/lodash-es.js

@@ -0,0 +1,3 @@
+export default {
+  VERSION: '1.0.0-mocked!',
+};

code/__mocks__/lodash-es/add.js

@@ -0,0 +1,5 @@
+function add(a, b) {
+  return 'mocked 3';
+}
+
+export default add;

code/addons/vitest/src/vitest-plugin/index.ts

@@ -29,7 +29,6 @@ import sirv from 'sirv';
 import { dedent } from 'ts-dedent';
 
 // ! Relative import to prebundle it without needing to depend on the Vite builder
-import { INCLUDE_CANDIDATES } from '../../../../builders/builder-vite/src/constants';
 import { withoutVitePlugins } from '../../../../builders/builder-vite/src/utils/without-vite-plugins';
 import type { InternalOptions, UserOptions } from './types';
 

code/builders/builder-vite/src/codegen-modern-iframe-script.ts

@@ -117,23 +117,24 @@ export async function generateModernIframeScriptCodeFromPreviews(options: {
    */
   const code = dedent`
   import { setup } from 'storybook/internal/preview/runtime';
-
+  
   import '${SB_VIRTUAL_FILES.VIRTUAL_ADDON_SETUP_FILE}';
-
+  
   setup();
-
+  
   import { composeConfigs, PreviewWeb } from 'storybook/preview-api';
   import { isPreview } from 'storybook/internal/csf';
   import { importFn } from '${SB_VIRTUAL_FILES.VIRTUAL_STORIES_FILE}';
-
+  
   ${options.isCsf4 ? previewFileImport : imports.join('\n')}
   ${getPreviewAnnotationsFunction}
-
+  
   window.__STORYBOOK_PREVIEW__ = window.__STORYBOOK_PREVIEW__ || new PreviewWeb(importFn, getProjectAnnotations);
-
+  
   window.__STORYBOOK_STORY_STORE__ = window.__STORYBOOK_STORY_STORE__ || window.__STORYBOOK_PREVIEW__.storyStore;
-
+  
   ${generateHMRHandler()};
+  
   `.trim();
   return code;
 }

code/builders/builder-vite/src/vite-config.ts

@@ -85,7 +85,6 @@ export async function commonConfig(
 }
 
 export async function pluginConfig(options: Options) {
-  const frameworkName = await getFrameworkName(options);
   const build = await options.presets.apply('build');
 
   const externals: Record<string, string> = globalsNameReferenceMap;

code/builders/builder-webpack5/src/loaders/export-order-loader.ts

@@ -17,37 +17,40 @@ export default async function loader(
     const magicString = new MagicString(source);
 
     // Trying to parse as ES module
-    try {
-      // Do NOT remove await here. The types are wrong! It has to be awaited,
-      // otherwise it will return a Promise<Promise<...>> when wasm isn't loaded.
-      const parseResult = await parseEs(source);
-      const namedExportsOrder = (parseResult[1] || [])
-        .map((e) => source.substring(e.s, e.e))
-        .filter((e) => e !== 'default');
-
-      assert(
-        namedExportsOrder.length > 0,
-        'No named exports found. Very likely that this is not a ES module.'
-      );
-
-      magicString.append(
-        `;export const __namedExportsOrder = ${JSON.stringify(namedExportsOrder)};`
-      );
-      // Try to parse as CJS module
-    } catch {
-      await initCjsParser();
-      const namedExportsOrder = (parseCjs(source).exports || []).filter(
-        (e: string) => e !== 'default' && e !== '__esModule'
-      );
-
-      assert(
-        namedExportsOrder.length > 0,
-        'No named exports found. Very likely that this is not a CJS module.'
-      );
-
-      magicString.append(
-        `;module.exports.__namedExportsOrder = ${JSON.stringify(namedExportsOrder)};`
-      );
+    if (!source.includes('__namedExportsOrder')) {
+      try {
+        // Do NOT remove await here. The types are wrong! It has to be awaited,
+        // otherwise it will return a Promise<Promise<...>> when wasm isn't loaded.
+        const parseResult = await parseEs(source);
+        const namedExportsOrder = (parseResult[1] || [])
+          .map((e) => source.substring(e.s, e.e))
+          .filter((e) => e !== 'default');
+
+        assert(
+          namedExportsOrder.length > 0,
+          'No named exports found. Very likely that this is not a ES module.'
+        );
+
+        magicString.append(
+          `;export const __namedExportsOrder = ${JSON.stringify(namedExportsOrder)};`
+        );
+
+        // Try to parse as CJS module
+      } catch {
+        await initCjsParser();
+        const namedExportsOrder = (parseCjs(source).exports || []).filter(
+          (e: string) => e !== 'default' && e !== '__esModule'
+        );
+
+        assert(
+          namedExportsOrder.length > 0,
+          'No named exports found. Very likely that this is not a CJS module.'
+        );
+
+        magicString.append(
+          `;module.exports.__namedExportsOrder = ${JSON.stringify(namedExportsOrder)};`
+        );
+      }
     }
 
     return callback(null, magicString.toString(), map, meta);