Merge pull request #25012 from storybookjs/version-patch-from-7.6.0

Release: Patch 7.6.1

Author: kasperpeulen

.circleci/config.yml

@@ -560,27 +560,27 @@ workflows:
           requires:
             - unit-tests
       - create-sandboxes:
-          parallelism: 23
+          parallelism: 21
           requires:
             - build
       - build-sandboxes:
-          parallelism: 23
+          parallelism: 21
           requires:
             - create-sandboxes
       - chromatic-sandboxes:
-          parallelism: 20
+          parallelism: 18
           requires:
             - build-sandboxes
       - e2e-production:
-          parallelism: 18
+          parallelism: 16
           requires:
             - build-sandboxes
       - e2e-dev:
-          parallelism: 4
+          parallelism: 2
           requires:
             - create-sandboxes
       - test-runner-production:
-          parallelism: 18
+          parallelism: 16
           requires:
             - build-sandboxes
       - bench:
@@ -614,30 +614,30 @@ workflows:
           requires:
             - build
       - create-sandboxes:
-          parallelism: 38
+          parallelism: 36
           requires:
             - build
       # - smoke-test-sandboxes: # disabled for now
       #     requires:
       #       - create-sandboxes
       - build-sandboxes:
-          parallelism: 38
+          parallelism: 36
           requires:
             - create-sandboxes
       - chromatic-sandboxes:
-          parallelism: 35
+          parallelism: 33
           requires:
             - build-sandboxes
       - e2e-production:
-          parallelism: 33
+          parallelism: 31
           requires:
             - build-sandboxes
       - e2e-dev:
-          parallelism: 4
+          parallelism: 2
           requires:
             - create-sandboxes
       - test-runner-production:
-          parallelism: 33
+          parallelism: 31
           requires:
             - build-sandboxes
       # TODO: reenable once we find out the source of flakyness

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 7.6.1
+
+- Next.js: Fix AppRouterProvider usage - [#25032](https://github.com/storybookjs/storybook/pull/25032), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!
+- SvelteKit: Fix HMR not working - [#25031](https://github.com/storybookjs/storybook/pull/25031), thanks [@JReinhold](https://github.com/JReinhold)!
+- Test: Downgrade @testing-library/user-event to 14.3.0 - [#25004](https://github.com/storybookjs/storybook/pull/25004), thanks [@kasperpeulen](https://github.com/kasperpeulen)!
+- Webpack: Fix exclude regex in react-docgen-loader - [#25030](https://github.com/storybookjs/storybook/pull/25030), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!
+
 ## 7.6.0
 
 Storybook 7.6 is here with increased performance and much more!

code/frameworks/nextjs/package.json

@@ -32,6 +32,16 @@
       "require": "./dist/image-context.js",
       "import": "./dist/image-context.mjs"
     },
+    "./dist/routing/app-router-provider": {
+      "types": "./dist/routing/app-router-provider.d.ts",
+      "require": "./dist/routing/app-router-provider.js",
+      "import": "./dist/routing/app-router-provider.mjs"
+    },
+    "./dist/routing/app-router-provider-mock": {
+      "types": "./dist/routing/app-router-provider-mock.d.ts",
+      "require": "./dist/routing/app-router-provider-mock.js",
+      "import": "./dist/routing/app-router-provider-mock.mjs"
+    },
     "./preset": {
       "types": "./dist/preset.d.ts",
       "require": "./dist/preset.js"
@@ -161,6 +171,8 @@
       "./src/images/next-future-image.tsx",
       "./src/images/next-legacy-image.tsx",
       "./src/images/next-image.tsx",
+      "./src/routing/app-router-provider.tsx",
+      "./src/routing/app-router-provider-mock.tsx",
       "./src/font/webpack/loader/storybook-nextjs-font-loader.ts",
       "./src/swc/next-swc-loader-patch.ts"
     ],

code/frameworks/nextjs/src/dependency-map.ts

@@ -13,6 +13,10 @@ const mapping: Record<string, Record<string, string>> = {
     'next/dist/shared/lib/hooks-client-context.shared-runtime':
       'next/dist/shared/lib/hooks-client-context',
   },
+  '<13.0.0': {
+    '@storybook/nextjs/dist/routing/app-router-provider':
+      '@storybook/nextjs/dist/routing/app-router-provider-mock',
+  },
   '<13.5.0': {
     'next/dist/shared/lib/router-context.shared-runtime': 'next/dist/shared/lib/router-context',
     'next/dist/shared/lib/head-manager-context.shared-runtime':

code/frameworks/nextjs/src/routing/app-router-provider-mock.tsx

@@ -0,0 +1,6 @@
+import React from 'react';
+
+// The mock is used for Next.js < 13, where the AppRouterProvider doesn't exist
+export const AppRouterProvider: React.FC<React.PropsWithChildren<{}>> = ({ children }) => {
+  return <>{children}</>;
+};

code/frameworks/nextjs/src/routing/decorator.tsx

@@ -1,8 +1,10 @@
 import * as React from 'react';
 import type { Addon_StoryContext } from '@storybook/types';
 import { action } from '@storybook/addon-actions';
+// @ts-expect-error Using absolute path import to 1) avoid prebundling and 2) being able to substitute the module for Next.js < 13
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { AppRouterProvider } from '@storybook/nextjs/dist/routing/app-router-provider';
 import { PageRouterProvider } from './page-router-provider';
-import type { AppRouterProvider as TAppRouterProvider } from './app-router-provider';
 import type { RouteParams, NextAppDirectory } from './types';
 
 const defaultRouterParams: RouteParams = {
@@ -17,19 +19,6 @@ export const RouterDecorator = (
   const nextAppDirectory =
     (parameters.nextjs?.appDirectory as NextAppDirectory | undefined) ?? false;
 
-  const [AppRouterProvider, setAppRouterProvider] = React.useState<
-    typeof TAppRouterProvider | undefined
-  >();
-
-  React.useEffect(() => {
-    if (!nextAppDirectory) {
-      return;
-    }
-    import('./app-router-provider').then((exports) =>
-      setAppRouterProvider(() => exports.AppRouterProvider)
-    );
-  }, [nextAppDirectory]);
-
   if (nextAppDirectory) {
     if (!AppRouterProvider) {
       return null;

code/frameworks/sveltekit/src/plugins/mock-sveltekit-stores.ts

@@ -1,17 +1,15 @@
 import { resolve } from 'node:path';
-import { mergeConfig, type Plugin } from 'vite';
+import type { Plugin } from 'vite';
 
 export function mockSveltekitStores() {
   return {
     name: 'storybook:sveltekit-mock-stores',
-    enforce: 'post',
-    config: (config) =>
-      mergeConfig(config, {
-        resolve: {
-          alias: {
-            $app: resolve(__dirname, '../src/mocks/app/'),
-          },
+    config: () => ({
+      resolve: {
+        alias: {
+          $app: resolve(__dirname, '../src/mocks/app/'),
         },
-      }),
+      },
+    }),
   } satisfies Plugin;
 }

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

@@ -466,34 +466,6 @@ const baseTemplates = {
  * They will be hidden by default in the Storybook status page.
  */
 const internalTemplates = {
-  'internal/ssv6-vite': {
-    ...baseTemplates['react-vite/default-ts'],
-    name: 'StoryStore v6 (react-vite/default-ts)',
-    isInternal: true,
-    modifications: {
-      mainConfig: {
-        features: {
-          storyStoreV7: false,
-          storyStoreV7MdxErrors: false,
-        },
-      },
-    },
-    skipTasks: ['bench'],
-  },
-  'internal/ssv6-webpack': {
-    ...baseTemplates['cra/default-ts'],
-    name: 'StoryStore v6 (cra/default-ts)',
-    isInternal: true,
-    modifications: {
-      mainConfig: {
-        features: {
-          storyStoreV7: false,
-          storyStoreV7MdxErrors: false,
-        },
-      },
-    },
-    skipTasks: ['bench'],
-  },
   'internal/swc-webpack': {
     ...baseTemplates['react-webpack/18-ts'],
     name: 'SWC (react-webpack/18-ts)',
@@ -615,8 +587,6 @@ export const merged: TemplateKey[] = [
   'preact-vite/default-ts',
   'html-webpack/default',
   'html-vite/default-ts',
-  'internal/ssv6-vite',
-  'internal/ssv6-webpack',
 ];
 export const daily: TemplateKey[] = [
   ...merged,

code/lib/test/package.json

@@ -49,7 +49,7 @@
     "@storybook/preview-api": "workspace:*",
     "@testing-library/dom": "^9.3.1",
     "@testing-library/jest-dom": "^6.1.3",
-    "@testing-library/user-event": "^14.4.3",
+    "@testing-library/user-event": "14.3.0",
     "@types/chai": "^4",
     "@vitest/expect": "^0.34.2",
     "@vitest/spy": "^0.34.1",

code/package.json

@@ -328,5 +328,6 @@
         "Dependency Upgrades"
       ]
     ]
-  }
+  },
+  "deferredNextVersion": "7.6.1"
 }