throw when mainConfig is missing or unable to be evaluated, also thro…

…w when version is missing

code/lib/cli/src/upgrade.ts

@@ -6,6 +6,7 @@ import { withTelemetry } from '@storybook/core-server';
 import {
   UpgradeStorybookToLowerVersionError,
   UpgradeStorybookToSameVersionError,
+  UpgradeStorybookUnknownCurrentVersionError,
 } from '@storybook/core-events/server-errors';
 
 import chalk from 'chalk';
@@ -189,26 +190,11 @@ export const doUpgrade = async ({
   );
   const configDir = userSpecifiedConfigDir || inferredConfigDir || '.storybook';
 
-  let mainConfigLoadingError = '';
-
-  const mainConfig = await loadMainConfig({ configDir }).catch((err) => {
-    mainConfigLoadingError = String(err);
-    return false;
-  });
+  const mainConfig = await loadMainConfig({ configDir });
 
   // GUARDS
   if (!storybookVersion) {
-    logger.info(missingStorybookVersionMessage());
-    results = { preCheckFailure: PreCheckFailure.UNDETECTED_SB_VERSION };
-  } else if (
-    typeof mainConfigPath === 'undefined' ||
-    mainConfigLoadingError.includes('No configuration files have been found')
-  ) {
-    logger.info(mainjsNotFoundMessage(configDir));
-    results = { preCheckFailure: PreCheckFailure.MAINJS_NOT_FOUND };
-  } else if (typeof mainConfig === 'boolean') {
-    logger.info(mainjsExecutionFailureMessage(mainConfigPath, mainConfigLoadingError));
-    results = { preCheckFailure: PreCheckFailure.MAINJS_EVALUATION };
+    throw new UpgradeStorybookUnknownCurrentVersionError();
   }
 
   // BLOCKERS
@@ -293,32 +279,6 @@ export const doUpgrade = async ({
   }
 };
 
-function missingStorybookVersionMessage(): string {
-  return dedent`
-      [Storybook automigrate] ❌ Unable to determine Storybook version so that the automigrations will be skipped.
-        🤔 Are you running automigrate from your project directory? Please specify your Storybook config directory with the --config-dir flag.
-      `;
-}
-
-function mainjsExecutionFailureMessage(
-  mainConfigPath: string,
-  mainConfigLoadingError: string
-): string {
-  return dedent`
-    [Storybook automigrate] ❌ Failed trying to evaluate ${chalk.blue(
-      mainConfigPath
-    )} with the following error: ${mainConfigLoadingError}
-    
-    Please fix the error and try again.
-  `;
-}
-
-function mainjsNotFoundMessage(configDir: string): string {
-  return dedent`[Storybook automigrate] Could not find or evaluate your Storybook main.js config directory at ${chalk.blue(
-    configDir
-  )} so the automigrations will be skipped. You might be running this command in a monorepo or a non-standard project structure. If that is the case, please rerun this command by specifying the path to your Storybook config directory via the --config-dir option.`;
-}
-
 export async function upgrade(options: UpgradeOptions): Promise<void> {
   await withTelemetry('upgrade', { cliOptions: options }, () => doUpgrade(options));
 }

code/lib/core-common/src/utils/load-main-config.ts

@@ -3,7 +3,10 @@ import type { StorybookConfig } from '@storybook/types';
 import { serverRequire, serverResolve } from './interpret-require';
 import { validateConfigurationFiles } from './validate-configuration-files';
 import { readFile } from 'fs/promises';
-import { MainFileESMOnlyImportError } from '@storybook/core-events/server-errors';
+import {
+  MainFileESMOnlyImportError,
+  MainFileFailedEvaluationError,
+} from '@storybook/core-events/server-errors';
 
 export async function loadMainConfig({
   configDir = '.storybook',
@@ -50,7 +53,10 @@ export async function loadMainConfig({
 
       throw out;
     }
-    throw e;
-    //
+
+    throw new MainFileFailedEvaluationError({
+      location: relative(process.cwd(), mainJsPath),
+      error: e,
+    });
   }
 }

code/lib/core-common/src/utils/validate-configuration-files.ts

@@ -5,6 +5,7 @@ import slash from 'slash';
 import { once } from '@storybook/node-logger';
 
 import { boost } from './interpret-files';
+import { MainFileMissingError } from '@storybook/core-events/server-errors';
 
 export async function validateConfigurationFiles(configDir: string) {
   const extensionsPattern = `{${Array.from(boost).join(',')}}`;
@@ -20,9 +21,6 @@ export async function validateConfigurationFiles(configDir: string) {
   }
 
   if (!mainConfigPath) {
-    throw new Error(dedent`
-      No configuration files have been found in your configDir (${path.resolve(configDir)}).
-      Storybook needs "main.js" file, please add it (or pass a custom config dir flag to Storybook to tell where your main.js file is located at).
-    `);
+    throw new MainFileMissingError({ location: configDir });
   }
 }

code/lib/core-events/src/errors/server-errors.ts

@@ -400,6 +400,9 @@ export class MainFileESMOnlyImportError extends StorybookError {
 
   readonly code = 5;
 
+  public documentation =
+    'https://github.com/storybookjs/storybook/issues/23972#issuecomment-1948534058';
+
   constructor(
     public data: { location: string; line: string | undefined; num: number | undefined }
   ) {
@@ -428,14 +431,55 @@ export class MainFileESMOnlyImportError extends StorybookError {
 
     message.push(
       '',
-      white(`Convert the dynamic import to an dynamic import where they are used.`),
+      white(`Convert the static import to an dynamic import where they are used.`),
       white(`Example:`) + ' ' + gray(`await import(<your ESM only module>);`)
     );
 
     return message.join('\n');
   }
 }
 
+export class MainFileMissingError extends StorybookError {
+  readonly category = Category.CORE_SERVER;
+
+  readonly code = 6;
+
+  public readonly documentation = 'https://storybook.js.org/docs/configure';
+
+  constructor(public data: { location: string }) {
+    super();
+  }
+
+  template() {
+    return dedent`
+      No configuration files have been found in your configDir: ${yellow(this.data.location)}.
+      Storybook needs "main.js" file, please add it.
+      
+      You can pass a --config-dir flag to tell Storybook, where your main.js file is located at).
+    `;
+  }
+}
+
+export class MainFileFailedEvaluationError extends StorybookError {
+  readonly category = Category.CORE_SERVER;
+
+  readonly code = 7;
+
+  public readonly documentation = 'https://storybook.js.org/docs/configure';
+
+  constructor(public data: { location: string; error: Error }) {
+    super();
+  }
+
+  template() {
+    return dedent`
+      Storybook couldn't evaluate your ${yellow(this.data.location)} file.
+
+      ${this.data.error.message}
+    `;
+  }
+}
+
 export class GenerateNewProjectOnInitError extends StorybookError {
   readonly category = Category.CLI_INIT;
 
@@ -510,3 +554,18 @@ export class UpgradeStorybookToSameVersionError extends StorybookError {
     `;
   }
 }
+
+export class UpgradeStorybookUnknownCurrentVersionError extends StorybookError {
+  readonly category = Category.CLI_UPGRADE;
+
+  readonly code = 5;
+
+  template() {
+    return dedent`
+      We couldn't determine the current version of Storybook in your project.
+
+      Are you running the storybook CLI in a project without Storybook?
+      It might help if you specify your Storybook config directory with the --config-dir flag.
+    `;
+  }
+}