Merge branch 'next' into tech/tsup-core-server-v2

code/frameworks/nextjs/template/cli/js/Introduction.mdx

@@ -1,4 +1,4 @@
-import { Meta } from '@storybook/addon-docs';
+import { Meta } from '@storybook/blocks';
 import Image from 'next/image';
 
 import Code from './assets/code-brackets.svg';

code/frameworks/nextjs/template/cli/ts-legacy/Introduction.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta } from '@storybook/addon-docs';
+import { Meta } from '@storybook/blocks';
 import Image from 'next/image';
 
 import Code from './assets/code-brackets.svg';

code/lib/cli/rendererAssets/common/Introduction.mdx

@@ -1,4 +1,4 @@
-import { Meta } from '@storybook/addon-docs';
+import { Meta } from '@storybook/blocks';
 import Code from './assets/code-brackets.svg';
 import Colors from './assets/colors.svg';
 import Comments from './assets/comments.svg';

code/lib/cli/src/automigrate/fixes/new-frameworks.ts

@@ -70,7 +70,20 @@ export const getBuilder = (builder: string | { name: string }) => {
 };
 
 export const getFrameworkOptions = (framework: string, main: ConfigFile) => {
-  const frameworkOptions = main.getFieldValue([`${framework}Options`]);
+  let frameworkOptions = {};
+  try {
+    frameworkOptions = main.getFieldValue([`${framework}Options`]);
+  } catch (e) {
+    logger.warn(dedent`
+      Unable to get the ${framework}Options field.
+      
+      Please review the changes made to your main.js config and make any necessary changes.
+      The ${framework}Options should be moved to the framework.options field.
+
+      The following error occurred when we tried to get the ${framework}Options field:
+    `);
+    console.log(e);
+  }
   return frameworkOptions || {};
 };
 

code/lib/cli/src/generators/baseGenerator.ts

@@ -144,6 +144,7 @@ export async function baseGenerator(
   const addonPackages = [
     '@storybook/addon-links',
     '@storybook/addon-essentials',
+    '@storybook/blocks',
     ...extraAddonPackages,
   ];
 
@@ -152,8 +153,6 @@ export async function baseGenerator(
     addonPackages.push('@storybook/addon-interactions', '@storybook/testing-library');
   }
 
-  const yarn2ExtraPackages = packageManager.type === 'yarn2' ? ['@storybook/addon-docs'] : [];
-
   const files = await fse.readdir(process.cwd());
 
   const packageJson = packageManager.retrievePackageJson();
@@ -187,7 +186,6 @@ export async function baseGenerator(
     ...frameworkPackages,
     ...addonPackages,
     ...extraPackages,
-    ...yarn2ExtraPackages,
   ]
     .filter(Boolean)
     .filter(

code/lib/core-server/src/build-static.ts

@@ -5,7 +5,7 @@ import { dedent } from 'ts-dedent';
 import global from 'global';
 
 import { logger } from '@storybook/node-logger';
-import { telemetry } from '@storybook/telemetry';
+import { telemetry, getPrecedingUpgrade } from '@storybook/telemetry';
 import type {
   BuilderOptions,
   CLIOptions,
@@ -176,11 +176,14 @@ export async function buildStaticStandalone(
     effects.push(
       initializedStoryIndexGenerator.then(async (generator) => {
         const storyIndex = await generator?.getIndex();
-        const payload = storyIndex
-          ? {
-              storyIndex: summarizeIndex(storyIndex),
-            }
-          : undefined;
+        const payload = {
+          precedingUpgrade: await getPrecedingUpgrade(),
+        };
+        if (storyIndex) {
+          Object.assign(payload, {
+            storyIndex: summarizeIndex(storyIndex),
+          });
+        }
         await telemetry('build', payload, { configDir: options.configDir });
       })
     );

code/lib/core-server/src/utils/doTelemetry.ts

@@ -1,5 +1,5 @@
 import type { CoreConfig, Options } from '@storybook/types';
-import { telemetry } from '@storybook/telemetry';
+import { telemetry, getPrecedingUpgrade } from '@storybook/telemetry';
 import { useStorybookMetadata } from './metadata';
 import type { StoryIndexGenerator } from './StoryIndexGenerator';
 import { summarizeIndex } from './summarizeIndex';
@@ -15,12 +15,15 @@ export async function doTelemetry(
     initializedStoryIndexGenerator.then(async (generator) => {
       const storyIndex = await generator?.getIndex();
       const { versionCheck, versionUpdates } = options;
-      const payload = storyIndex
-        ? {
-            versionStatus: versionUpdates ? versionStatus(versionCheck) : 'disabled',
-            storyIndex: summarizeIndex(storyIndex),
-          }
-        : undefined;
+      const payload = {
+        precedingUpgrade: await getPrecedingUpgrade(),
+      };
+      if (storyIndex) {
+        Object.assign(payload, {
+          versionStatus: versionUpdates ? versionStatus(versionCheck) : 'disabled',
+          storyIndex: summarizeIndex(storyIndex),
+        });
+      }
       telemetry('dev', payload, { configDir: options.configDir });
     });
   }

code/lib/core-server/src/withTelemetry.test.ts

@@ -63,10 +63,10 @@ describe('when command fails', () => {
       withTelemetry('dev', { presetOptions: {} as any }, run)
     ).rejects.toThrow(error);
 
-    expect(telemetry).toHaveBeenCalledTimes(1);
-    expect(telemetry).not.toHaveBeenCalledWith(
+    expect(telemetry).toHaveBeenCalledTimes(2);
+    expect(telemetry).toHaveBeenCalledWith(
       'error',
-      { eventType: 'dev', error },
+      { eventType: 'dev' },
       expect.objectContaining({})
     );
   });
@@ -88,7 +88,7 @@ describe('when command fails', () => {
     );
   });
 
-  it('does not send error message when telemetry is disabled', async () => {
+  it('does not send full error message when telemetry is disabled', async () => {
     jest.mocked(loadAllPresets).mockResolvedValueOnce({
       apply: async () => ({ disableTelemetry: true } as any),
     });
@@ -132,10 +132,10 @@ describe('when command fails', () => {
       withTelemetry('dev', { presetOptions: {} as any }, run)
     ).rejects.toThrow(error);
 
-    expect(telemetry).toHaveBeenCalledTimes(1);
-    expect(telemetry).not.toHaveBeenCalledWith(
+    expect(telemetry).toHaveBeenCalledTimes(2);
+    expect(telemetry).toHaveBeenCalledWith(
       'error',
-      { eventType: 'dev', error },
+      { eventType: 'dev' },
       expect.objectContaining({})
     );
   });
@@ -169,10 +169,10 @@ describe('when command fails', () => {
       withTelemetry('dev', { presetOptions: {} as any }, run)
     ).rejects.toThrow(error);
 
-    expect(telemetry).toHaveBeenCalledTimes(1);
-    expect(telemetry).not.toHaveBeenCalledWith(
+    expect(telemetry).toHaveBeenCalledTimes(2);
+    expect(telemetry).toHaveBeenCalledWith(
       'error',
-      { eventType: 'dev', error },
+      { eventType: 'dev' },
       expect.objectContaining({})
     );
   });

code/lib/core-server/src/withTelemetry.ts

@@ -1,7 +1,7 @@
 import prompts from 'prompts';
 import type { CLIOptions, CoreConfig } from '@storybook/types';
 import { loadAllPresets, cache } from '@storybook/core-common';
-import { telemetry } from '@storybook/telemetry';
+import { telemetry, getPrecedingUpgrade } from '@storybook/telemetry';
 import type { EventType } from '@storybook/telemetry';
 
 type TelemetryOptions = {
@@ -26,11 +26,13 @@ const promptCrashReports = async () => {
   return enableCrashReports;
 };
 
-async function shouldSendError({ cliOptions, presetOptions }: TelemetryOptions) {
-  if (cliOptions?.disableTelemetry) return false;
+type ErrorLevel = 'none' | 'error' | 'full';
+
+async function getErrorLevel({ cliOptions, presetOptions }: TelemetryOptions): Promise<ErrorLevel> {
+  if (cliOptions?.disableTelemetry) return 'none';
 
   // If we are running init or similar, we just have to go with true here
-  if (!presetOptions) return true;
+  if (!presetOptions) return 'full';
 
   // should we load the preset?
   const presets = await loadAllPresets({
@@ -42,18 +44,18 @@ async function shouldSendError({ cliOptions, presetOptions }: TelemetryOptions)
   // If the user has chosen to enable/disable crash reports in main.js
   // or disabled telemetry, we can return that
   const core = await presets.apply<CoreConfig>('core');
-  if (core?.enableCrashReports !== undefined) return core.enableCrashReports;
-  if (core?.disableTelemetry) return false;
+  if (core?.enableCrashReports !== undefined) return core.enableCrashReports ? 'full' : 'error';
+  if (core?.disableTelemetry) return 'none';
 
   // Deal with typo, remove in future version (7.1?)
   const valueFromCache =
     (await cache.get('enableCrashReports')) ?? (await cache.get('enableCrashreports'));
-  if (valueFromCache !== undefined) return valueFromCache;
+  if (valueFromCache !== undefined) return valueFromCache ? 'full' : 'error';
 
   const valueFromPrompt = await promptCrashReports();
-  if (valueFromPrompt !== undefined) return valueFromPrompt;
+  if (valueFromPrompt !== undefined) return valueFromPrompt ? 'full' : 'error';
 
-  return true;
+  return 'full';
 }
 
 export async function withTelemetry(
@@ -67,14 +69,17 @@ export async function withTelemetry(
     await run();
   } catch (error) {
     try {
-      if (await shouldSendError(options)) {
+      const errorLevel = await getErrorLevel(options);
+      if (errorLevel !== 'none') {
+        const precedingUpgrade = await getPrecedingUpgrade();
+
         await telemetry(
           'error',
-          { eventType, error },
+          { eventType, precedingUpgrade, error: errorLevel === 'full' ? error : undefined },
           {
             immediate: true,
             configDir: options.cliOptions?.configDir || options.presetOptions?.configDir,
-            enableCrashReports: true,
+            enableCrashReports: errorLevel === 'full',
           }
         );
       }