remove all references of storyStoreV7

code/builders/builder-vite/src/codegen-importfn-script.ts

@@ -28,11 +28,7 @@ function toImportPath(relativePath: string) {
 async function toImportFn(stories: string[]) {
   const { normalizePath } = await import('vite');
   const objectEntries = stories.map((file) => {
-    const ext = path.extname(file);
     const relativePath = normalizePath(path.relative(process.cwd(), file));
-    if (!['.js', '.jsx', '.ts', '.tsx', '.mdx', '.svelte', '.vue'].includes(ext)) {
-      logger.warn(`Cannot process ${ext} file with storyStoreV7: ${relativePath}`);
-    }
 
     return `  '${toImportPath(relativePath)}': async () => import('/@fs/${file}')`;
   });

code/builders/builder-vite/src/plugins/code-generator-plugin.ts

@@ -90,27 +90,16 @@ export function codeGeneratorPlugin(options: Options): Plugin {
       return undefined;
     },
     async load(id, config) {
-      const storyStoreV7 = options.features?.storyStoreV7;
       if (id === virtualStoriesFile) {
-        if (storyStoreV7) {
-          return generateImportFnScriptCode(options);
-        }
-        return generateVirtualStoryEntryCode(options);
+        return generateImportFnScriptCode(options);
       }
 
       if (id === virtualAddonSetupFile) {
         return generateAddonSetupCode();
       }
 
-      if (id === virtualPreviewFile && !storyStoreV7) {
-        return generatePreviewEntryCode(options);
-      }
-
       if (id === virtualFileId) {
-        if (storyStoreV7) {
-          return generateModernIframeScriptCode(options, projectRoot);
-        }
-        return generateIframeScriptCode(options, projectRoot);
+        return generateModernIframeScriptCode(options, projectRoot);
       }
 
       if (id === iframeId) {

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

@@ -13,16 +13,14 @@ import type { Options, CoreConfig, DocsOptions, PreviewAnnotation } from '@story
 import { globals } from '@storybook/preview/globals';
 import {
   getBuilderOptions,
-  getRendererName,
   stringifyProcessEnvs,
   handlebars,
-  interpolate,
   normalizeStories,
   readTemplate,
   loadPreviewOrConfigFile,
   isPreservingSymlinks,
 } from '@storybook/core-common';
-import { toRequireContextString, toImportFn } from '@storybook/core-webpack';
+import { toImportFn } from '@storybook/core-webpack';
 import { dedent } from 'ts-dedent';
 import type { BuilderOptions, TypescriptOptions } from '../types';
 import { createBabelLoader, createSWCLoader } from './loaders';
@@ -132,68 +130,25 @@ export default async (
   ].filter(Boolean);
 
   const virtualModuleMapping: Record<string, string> = {};
-  if (features?.storyStoreV7) {
-    const storiesFilename = 'storybook-stories.js';
-    const storiesPath = resolve(join(workingDir, storiesFilename));
+  const storiesFilename = 'storybook-stories.js';
+  const storiesPath = resolve(join(workingDir, storiesFilename));
 
-    const needPipelinedImport = !!builderOptions.lazyCompilation && !isProd;
-    virtualModuleMapping[storiesPath] = toImportFn(stories, { needPipelinedImport });
-    const configEntryPath = resolve(join(workingDir, 'storybook-config-entry.js'));
-    virtualModuleMapping[configEntryPath] = handlebars(
-      await readTemplate(
-        require.resolve(
-          '@storybook/builder-webpack5/templates/virtualModuleModernEntry.js.handlebars'
-        )
-      ),
-      {
-        storiesFilename,
-        previewAnnotations,
-      }
-      // We need to double escape `\` for webpack. We may have some in windows paths
-    ).replace(/\\/g, '\\\\');
-    entries.push(configEntryPath);
-  } else {
-    const rendererName = await getRendererName(options);
-
-    const rendererInitEntry = resolve(join(workingDir, 'storybook-init-renderer-entry.js'));
-    virtualModuleMapping[rendererInitEntry] = `import '${slash(rendererName)}';`;
-    entries.push(rendererInitEntry);
-
-    const entryTemplate = await readTemplate(
-      join(__dirname, '..', '..', 'templates', 'virtualModuleEntry.template.js')
-    );
-
-    previewAnnotations.forEach((previewAnnotationFilename: string | undefined) => {
-      if (!previewAnnotationFilename) return;
-
-      // Ensure that relative paths end up mapped to a filename in the cwd, so a later import
-      // of the `previewAnnotationFilename` in the template works.
-      const entryFilename = previewAnnotationFilename.startsWith('.')
-        ? `${previewAnnotationFilename.replace(/(\w)(\/|\\)/g, '$1-')}-generated-config-entry.js`
-        : `${previewAnnotationFilename}-generated-config-entry.js`;
-      // NOTE: although this file is also from the `dist/cjs` directory, it is actually a ESM
-      // file, see https://github.com/storybookjs/storybook/pull/16727#issuecomment-986485173
-      virtualModuleMapping[entryFilename] = interpolate(entryTemplate, {
-        previewAnnotationFilename,
-      });
-      entries.push(entryFilename);
-    });
-    if (stories.length > 0) {
-      const storyTemplate = await readTemplate(
-        join(__dirname, '..', '..', 'templates', 'virtualModuleStory.template.js')
-      );
-      // NOTE: this file has a `.cjs` extension as it is a CJS file (from `dist/cjs`) and runs
-      // in the user's webpack mode, which may be strict about the use of require/import.
-      // See https://github.com/storybookjs/storybook/issues/14877
-      const storiesFilename = resolve(join(workingDir, `generated-stories-entry.cjs`));
-      virtualModuleMapping[storiesFilename] = interpolate(storyTemplate, {
-        rendererName,
-      })
-        // Make sure we also replace quotes for this one
-        .replace("'{{stories}}'", stories.map(toRequireContextString).join(','));
-      entries.push(storiesFilename);
+  const needPipelinedImport = !!builderOptions.lazyCompilation && !isProd;
+  virtualModuleMapping[storiesPath] = toImportFn(stories, { needPipelinedImport });
+  const configEntryPath = resolve(join(workingDir, 'storybook-config-entry.js'));
+  virtualModuleMapping[configEntryPath] = handlebars(
+    await readTemplate(
+      require.resolve(
+        '@storybook/builder-webpack5/templates/virtualModuleModernEntry.js.handlebars'
+      )
+    ),
+    {
+      storiesFilename,
+      previewAnnotations,
     }
-  }
+    // We need to double escape `\` for webpack. We may have some in windows paths
+  ).replace(/\\/g, '\\\\');
+  entries.push(configEntryPath);
 
   const shouldCheckTs = typescriptOptions.check && !typescriptOptions.skipBabel;
   const tsCheckOptions = typescriptOptions.checkOptions || {};

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

@@ -62,7 +62,7 @@ export type Template = {
   inDevelopment?: boolean;
   /**
    * Some sandboxes might need extra modifications in the initialized Storybook,
-   * such as extend main.js, for setting specific feature flags like storyStoreV7, etc.
+   * such as extend main.js, for setting specific feature flags.
    */
   modifications?: {
     skipTemplateStories?: boolean;

code/lib/core-server/src/__for-testing__/main.ts

@@ -29,9 +29,6 @@ const config: StorybookConfig = {
     disableTelemetry: true,
   },
   logLevel: 'debug',
-  features: {
-    storyStoreV7: false,
-  },
   framework: {
     name: '@storybook/react-webpack5',
     options: {

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

@@ -124,13 +124,6 @@ export async function buildStaticStandalone(options: BuildStaticStandaloneOption
       presets.apply<DocsOptions>('docs', {}),
     ]);
 
-  if (features?.storyStoreV7 === false) {
-    deprecate(
-      dedent`storyStoreV6 is deprecated, please migrate to storyStoreV7 instead.
-        - Refer to the migration guide at https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#storystorev6-and-storiesof-is-deprecated`
-    );
-  }
-
   const fullOptions: Options = {
     ...options,
     presets,
@@ -164,7 +157,7 @@ export async function buildStaticStandalone(options: BuildStaticStandaloneOption
 
   let initializedStoryIndexGenerator: Promise<StoryIndexGenerator | undefined> =
     Promise.resolve(undefined);
-  if ((features?.buildStoriesJson || features?.storyStoreV7) && !options.ignorePreview) {
+  if (features?.buildStoriesJson && !options.ignorePreview) {
     const workingDir = process.cwd();
     const directories = {
       configDir: options.configDir,
@@ -176,8 +169,6 @@ export async function buildStaticStandalone(options: BuildStaticStandaloneOption
       storyIndexers: deprecatedStoryIndexers,
       indexers,
       docs: docsOptions,
-      storiesV2Compatibility: !features?.storyStoreV7,
-      storyStoreV7: !!features?.storyStoreV7,
     });
 
     initializedStoryIndexGenerator = generator.initialize().then(() => generator);

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

@@ -38,13 +38,6 @@ export async function storybookDevServer(options: Options) {
     getServerChannel(server)
   );
 
-  if (features?.storyStoreV7 === false) {
-    deprecate(
-      dedent`storyStoreV6 is deprecated, please migrate to storyStoreV7 instead.
-      - Refer to the migration guide at https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#storystorev6-and-storiesof-is-deprecated`
-    );
-  }
-
   let indexError: Error | undefined;
   // try get index generator, if failed, send telemetry without storyCount, then rethrow the error
   const initializedStoryIndexGenerator: Promise<StoryIndexGenerator | undefined> =

code/lib/core-server/src/presets/common-preset.ts

@@ -191,7 +191,6 @@ export const features = async (
   ...existing,
   warnOnLegacyHierarchySeparator: true,
   buildStoriesJson: false,
-  storyStoreV7: true,
   argTypeTargetsV7: true,
   legacyDecoratorFileOrder: false,
 });

code/lib/core-server/src/utils/StoryIndexGenerator.deprecated.test.ts

@@ -53,8 +53,6 @@ const options: StoryIndexGeneratorOptions = {
     { test: /\.stories\.(m?js|ts)x?$/, indexer: csfIndexer },
   ],
   indexers: [],
-  storiesV2Compatibility: false,
-  storyStoreV7: true,
   docs: { defaultName: 'docs', autodocs: false },
 };
 

code/lib/core-server/src/utils/StoryIndexGenerator.test.ts

@@ -48,8 +48,6 @@ const options: StoryIndexGeneratorOptions = {
   workingDir: path.join(__dirname, '__mockdata__'),
   storyIndexers: [],
   indexers: [csfIndexer, createStoriesMdxIndexer(false)],
-  storiesV2Compatibility: false,
-  storyStoreV7: true,
   docs: { defaultName: 'docs', autodocs: false },
 };
 

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

@@ -53,8 +53,6 @@ type SpecifierStoriesCache = Record<Path, CacheEntry>;
 export type StoryIndexGeneratorOptions = {
   workingDir: Path;
   configDir: Path;
-  storiesV2Compatibility: boolean;
-  storyStoreV7: boolean;
   storyIndexers: StoryIndexer[];
   indexers: Indexer[];
   docs: DocsOptions;
@@ -429,11 +427,6 @@ export class StoryIndexGenerator {
   async extractDocs(specifier: NormalizedStoriesSpecifier, absolutePath: Path) {
     const relativePath = path.relative(this.options.workingDir, absolutePath);
     try {
-      invariant(
-        this.options.storyStoreV7,
-        `You cannot use \`.mdx\` files without using \`storyStoreV7\`.`
-      );
-
       const normalizedPath = normalizeStoryPath(relativePath);
       const importPath = slash(normalizedPath);
 
@@ -613,13 +606,9 @@ export class StoryIndexGenerator {
   async sortStories(entries: StoryIndex['entries']) {
     const sortableStories = Object.values(entries);
 
-    // Skip sorting if we're in v6 mode because we don't have
-    // all the info we need here
-    if (this.options.storyStoreV7) {
-      const storySortParameter = await this.getStorySortParameter();
-      const fileNameOrder = this.storyFileNames();
-      sortStoriesV7(sortableStories, storySortParameter, fileNameOrder);
-    }
+    const storySortParameter = await this.getStorySortParameter();
+    const fileNameOrder = this.storyFileNames();
+    sortStoriesV7(sortableStories, storySortParameter, fileNameOrder);
 
     return sortableStories.reduce((acc, item) => {
       acc[item.id] = item;
@@ -659,31 +648,7 @@ export class StoryIndexGenerator {
 
       const sorted = await this.sortStories(indexEntries);
 
-      let compat = sorted;
-      if (this.options.storiesV2Compatibility) {
-        const titleToStoryCount = Object.values(sorted).reduce((acc, story) => {
-          acc[story.title] = (acc[story.title] || 0) + 1;
-          return acc;
-        }, {} as Record<ComponentTitle, number>);
-
-        // @ts-expect-error (Converted from ts-ignore)
-        compat = Object.entries(sorted).reduce((acc, entry) => {
-          const [id, story] = entry;
-          if (story.type === 'docs') return acc;
-
-          acc[id] = {
-            ...story,
-            kind: story.title,
-            story: story.name,
-            parameters: {
-              __id: story.id,
-              docsOnly: titleToStoryCount[story.title] === 1 && story.name === 'Page',
-              fileName: story.importPath,
-            },
-          };
-          return acc;
-        }, {} as Record<StoryId, V3CompatIndexEntry>);
-      }
+      const compat = sorted;
 
       this.lastIndex = {
         v: 4,

code/lib/core-server/src/utils/__tests__/index-extraction.test.ts

@@ -19,7 +19,6 @@ const options: StoryIndexGeneratorOptions = {
   storyIndexers: [],
   indexers: [],
   storiesV2Compatibility: false,
-  storyStoreV7: true,
   docs: { defaultName: 'docs', autodocs: false },
 };
 

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

@@ -8,16 +8,12 @@ import { router } from './router';
 export async function getStoryIndexGenerator(
   features: {
     buildStoriesJson?: boolean;
-    storyStoreV7?: boolean;
     argTypeTargetsV7?: boolean;
     warnOnLegacyHierarchySeparator?: boolean;
   },
   options: Options,
   serverChannel: ServerChannel
 ): Promise<StoryIndexGenerator | undefined> {
-  if (!features?.buildStoriesJson && !features?.storyStoreV7) {
-    return undefined;
-  }
   const workingDir = process.cwd();
   const directories = {
     configDir: options.configDir,
@@ -35,8 +31,6 @@ export async function getStoryIndexGenerator(
     indexers: await indexers,
     docs: await docsOptions,
     workingDir,
-    storiesV2Compatibility: !features?.storyStoreV7,
-    storyStoreV7: features.storyStoreV7 ?? false,
   });
 
   const initializedStoryIndexGenerator = generator.initialize().then(() => generator);