Merge pull request #28756 from storybookjs/valentin/rsc-portable-stories-compat

Next.js: Make RSC portable-stories compatible

Author: valentinpalkovic

code/frameworks/nextjs/src/portable-stories.ts

@@ -16,6 +16,7 @@ import type {
 
 // ! ATTENTION: This needs to be a relative import so it gets prebundled. This is to avoid ESM issues in Nextjs + Jest setups
 import { INTERNAL_DEFAULT_PROJECT_ANNOTATIONS as reactAnnotations } from '../../../renderers/react/src/portable-stories';
+import * as rscAnnotations from '../../../renderers/react/src/entry-preview-rsc';
 import * as nextJsAnnotations from './preview';
 
 import type { ReactRenderer, Meta } from '@storybook/react';
@@ -46,6 +47,7 @@ export function setProjectAnnotations(
 // This will not be necessary once we have auto preset loading
 const defaultProjectAnnotations: ProjectAnnotations<ReactRenderer> = composeConfigs([
   reactAnnotations,
+  rscAnnotations,
   nextJsAnnotations,
 ]);
 

code/renderers/react/src/preset.ts

@@ -11,14 +11,15 @@ export const previewAnnotations: PresetProperty<'previewAnnotations'> = async (
   options
 ) => {
   const docsConfig = await options.presets.apply('docs', {}, options);
+  const features = await options.presets.apply('features', {}, options);
   const docsEnabled = Object.keys(docsConfig).length > 0;
   const result: string[] = [];
 
   return result
     .concat(input)
     .concat([join(__dirname, 'entry-preview.mjs')])
     .concat(docsEnabled ? [join(__dirname, 'entry-preview-docs.mjs')] : [])
-    .concat(FEATURES?.experimentalRSC ? [join(__dirname, 'entry-preview-rsc.mjs')] : []);
+    .concat(features?.experimentalRSC ? [join(__dirname, 'entry-preview-rsc.mjs')] : []);
 };
 
 /**