Merge branch 'tom/sb-849-cant-run-the-v6-store-in-sandboxes-2' into tom/sb-732-docs2-support-docs-only-stories-in-v6

code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts

@@ -68,7 +68,6 @@ export default async (
     serverChannelUrl,
   } = options;
 
-  const frameworkName = await getFrameworkName(options);
   const frameworkOptions = await presets.apply('frameworkOptions');
 
   const isProd = configType === 'PRODUCTION';

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

@@ -12,6 +12,7 @@ import {
   cache,
   loadMainConfig,
   validateFrameworkName,
+  resolveAddonName,
 } from '@storybook/core-common';
 import prompts from 'prompts';
 import global from 'global';
@@ -90,7 +91,7 @@ export async function buildDevStandalone(options: CLIOptions & LoadOptions & Bui
       require.resolve('./presets/common-preset'),
       ...(managerBuilder.corePresets || []),
       ...(previewBuilder.corePresets || []),
-      ...(renderer ? [renderer] : []),
+      ...(renderer ? [resolveAddonName(options.configDir, renderer, options)] : []),
       ...corePresets,
       require.resolve('./presets/babel-cache-preset'),
     ],

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

@@ -20,6 +20,7 @@ import {
   normalizeStories,
   logConfig,
   loadMainConfig,
+  resolveAddonName,
 } from '@storybook/core-common';
 
 import { outputStats } from './utils/output-stats';
@@ -84,7 +85,7 @@ export async function buildStaticStandalone(
       require.resolve('./presets/common-preset'),
       ...(managerBuilder.corePresets || []),
       ...(previewBuilder.corePresets || []),
-      ...(renderer ? [renderer] : []),
+      ...(renderer ? [resolveAddonName(options.configDir, renderer, options)] : []),
       ...corePresets,
       require.resolve('./presets/babel-cache-preset'),
     ],