Some more fixes

Author: kasperpeulen

code/frameworks/nextjs-vite-rsc/src/index.ts

@@ -10,7 +10,7 @@ import type vitePluginStorybookNextJs from 'vite-plugin-storybook-nextjs';
 import * as nextPreview from './preview';
 import type { NextJsTypes } from './types';
 
-export * from '@storybook/react';
+// export * from '@storybook/react';
 export * from './types';
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment

code/frameworks/nextjs-vite-rsc/src/preview.tsx

@@ -5,8 +5,7 @@ import { type RenderContext } from 'storybook/internal/types';
 
 import type { Decorator, Preview, ReactRenderer } from '@storybook/react';
 
-import { NextRouter } from '@storybook/nextjs-vite-rsc/rsc/client';
-
+// import { NextRouter } from '@storybook/nextjs-vite-rsc/rsc/client';
 import { isNextRouterError } from 'next/dist/client/components/is-next-router-error';
 import { defaultDecorateStory } from 'storybook/preview-api';
 
@@ -54,11 +53,11 @@ globalThis.addEventListener('error', (ev: WindowEventMap['error']): void => {
 });
 
 export const decorators: Decorator[] = [
-  (Story, context) => (
-    <NextRouter>
-      <Story />
-    </NextRouter>
-  ),
+  // (Story, context) => (
+  //   <NextRouter>
+  //     <Story />
+  //   </NextRouter>
+  // ),
   // TODO
   // StyledJsxDecorator,
   // ImageDecorator,

code/frameworks/nextjs-vite-rsc/src/rsc-plugin.ts

@@ -20,6 +20,12 @@ export function rscBrowserModePlugin(): Plugin[] {
           define: {
             'import.meta.env.__vite_rsc_build__': JSON.stringify(env.command === 'build'),
           },
+          optimizeDeps: {
+            exclude: [
+              'virtual:vite-rsc-browser-mode/build-server-references',
+              'virtual:vite-rsc-browser-mode/load-client',
+            ],
+          },
           environments: {
             client: {
               keepProcessEnv: false,
@@ -57,6 +63,7 @@ export function rscBrowserModePlugin(): Plugin[] {
                   'react/jsx-runtime',
                   'react/jsx-dev-runtime',
                   '@vitejs/plugin-rsc/vendor/react-server-dom/client.browser',
+                  '@storybook/nextjs-vite-rsc/navigation',
                 ],
                 exclude: ['@vitejs/plugin-rsc'],
                 esbuildOptions: {

code/frameworks/nextjs-vite-rsc/src/rsc/headers.ts

@@ -1,7 +1,17 @@
 import { RequestCookies } from 'next/dist/compiled/@edge-runtime/cookies';
 import { HeadersAdapter } from 'next/dist/server/web/spec-extension/adapters/headers';
-import { RequestCookiesAdapter } from 'next/dist/server/web/spec-extension/adapters/request-cookies';
+import { fn } from 'storybook/test';
 
-const headersAdapter = new HeadersAdapter({});
-export const headers = () => headersAdapter;
-export const cookies = () => RequestCookiesAdapter.seal(new RequestCookies(headersAdapter));
+let headersAdapter = new HeadersAdapter({});
+let requestCookies = new RequestCookies(headersAdapter);
+
+export const cookies = fn(() => requestCookies);
+export const headers = fn(() => headersAdapter);
+
+const originalRestore = cookies.mockRestore.bind(null);
+
+cookies.mockRestore = () => {
+  originalRestore();
+  headersAdapter = new HeadersAdapter({});
+  requestCookies = new RequestCookies(headersAdapter);
+};

code/frameworks/nextjs-vite-rsc/src/rsc/navigation.ts

@@ -1 +1,39 @@
-export * from 'next/navigation';
+'use client';
+
+import {
+  ReadonlyURLSearchParams,
+  RedirectType,
+  ServerInsertedHTMLContext,
+  forbidden,
+  notFound,
+  permanentRedirect,
+  redirect,
+  unauthorized,
+  unstable_rethrow,
+  useParams,
+  usePathname,
+  useRouter,
+  useSearchParams,
+  useSelectedLayoutSegment,
+  useSelectedLayoutSegments,
+  useServerInsertedHTML,
+} from 'next/dist/client/components/navigation';
+
+export {
+  useParams,
+  usePathname,
+  useRouter,
+  useSearchParams,
+  useSelectedLayoutSegment,
+  useSelectedLayoutSegments,
+  useServerInsertedHTML,
+  notFound,
+  forbidden,
+  permanentRedirect,
+  ReadonlyURLSearchParams,
+  redirect,
+  ServerInsertedHTMLContext,
+  unauthorized,
+  unstable_rethrow,
+  RedirectType,
+};