Merge branch 'next' into norbert/fix-modal-in-popover

Author: ndelangen

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 10.2.4
+
+- CSF-Factories: Fix codemod for preview files without exports - [#33673](https://github.com/storybookjs/storybook/pull/33673), thanks @kasperpeulen!
+- CSF: Fix false positive detection of Zod v4 .meta() as CSF Factory - [#33666](https://github.com/storybookjs/storybook/pull/33666), thanks @kasperpeulen!
+- CSFFactories: Add non-interactive mode and --glob flag - [#33648](https://github.com/storybookjs/storybook/pull/33648), thanks @kasperpeulen!
+- CSFFactories: Preserve leading comments when adding imports - [#33645](https://github.com/storybookjs/storybook/pull/33645), thanks @kasperpeulen!
+- Codemod: Fix csf-2-to-3 failing due to quoted filenames - [#33646](https://github.com/storybookjs/storybook/pull/33646), thanks @kasperpeulen!
+- Codemod: Fix glob pattern handling on Windows - [#33714](https://github.com/storybookjs/storybook/pull/33714), thanks @kasperpeulen!
+- Manager: Remove deprecated `active` prop warning in ZoomButton - [#33697](https://github.com/storybookjs/storybook/pull/33697), thanks @yatishgoel!
+- Next.js: Alias AppRouterContext to shared runtime to fix Link navigation - [#33419](https://github.com/storybookjs/storybook/pull/33419), thanks @pallaprolus!
+
 ## 10.2.3
 
 - Addon-Vitest: Normalize Windows paths in addon-vitest automigration - [#33340](https://github.com/storybookjs/storybook/pull/33340), thanks @tanujbhaud!

code/builders/builder-vite/src/build.ts

@@ -40,6 +40,29 @@ export async function build(options: Options) {
 
   const finalConfig = (await presets.apply('viteFinal', config, options)) as InlineConfig;
 
+  // Add a plugin to enforce Storybook's outDir after all other plugins.
+  // This prevents frameworks like Nitro from redirecting
+  // build output to their own directories (e.g., .output/public/).
+  // The 'enforce: post' ensures this runs after all other config hooks.
+  finalConfig.plugins?.push({
+    name: 'storybook:enforce-output-dir',
+    enforce: 'post',
+    config: (config) => ({
+      ...config,
+      build: {
+        outDir: options.outputDir,
+      },
+    }),
+    // configEnvironment is a new method in Vite 6
+    // It is used to configure configs based on the environment
+    // E.g. Nitro uses this method to set the output directory to .output/public/
+    configEnvironment: () => ({
+      build: {
+        outDir: options.outputDir,
+      },
+    }),
+  });
+
   if (options.features?.developmentModeForBuild) {
     finalConfig.plugins?.push({
       name: 'storybook:define-env',

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

@@ -46,24 +46,26 @@ export async function storybookDevServer(options: Options) {
   const storyIndexGeneratorPromise =
     options.presets.apply<StoryIndexGenerator>('storyIndexGenerator');
 
-  registerIndexJsonRoute({
-    app,
-    storyIndexGeneratorPromise,
-    normalizedStories,
-    serverChannel,
-    workingDir,
-    configDir,
-  });
-
   app.use(compression({ level: 1 }));
 
   if (typeof options.extendServer === 'function') {
     options.extendServer(server);
   }
 
+  // CORS middleware must be registered BEFORE route handlers to ensure all routes
+  // (including /index.json) receive proper CORS headers for Storybook Composition
   app.use(getAccessControlMiddleware(core?.crossOriginIsolated ?? false));
   app.use(getCachingMiddleware());
 
+  registerIndexJsonRoute({
+    app,
+    storyIndexGeneratorPromise,
+    normalizedStories,
+    serverChannel,
+    workingDir,
+    configDir,
+  });
+
   (await getMiddleware(options.configDir))(app);
 
   // Apply experimental_devServer preset to allow addons/frameworks to extend the dev server with middlewares, etc.

code/core/src/core-server/server-channel/file-search-channel.ts

@@ -105,7 +105,7 @@ export async function initFileSearchChannel(
         if (!coreOptions.disableTelemetry) {
           telemetry('create-new-story-file-search', {
             success: false,
-            error: `An error occured while searching for components: ${e}`,
+            error: `An error occurred while searching for components: ${e}`,
           });
         }
       }

code/core/src/manager-api/tests/globals.test.ts

@@ -71,7 +71,7 @@ describe('globals API', () => {
     });
   });
 
-  it('emits UPDATE_GLOBALS if retains a globals value different to what recieves on SET_GLOBALS', () => {
+  it('emits UPDATE_GLOBALS if retains a globals value different to what receives on SET_GLOBALS', () => {
     const channel = new EventEmitter();
     const listener = vi.fn();
     channel.on(UPDATE_GLOBALS, listener);

code/core/src/manager/components/sidebar/FileSearchModal.stories.tsx

@@ -116,7 +116,7 @@ export const WithSearchResultsAndError: Story = {
     fileSearchQuery: 'src',
     fileSearchQueryDeferred: 'src',
     isLoading: false,
-    error: { error: 'Some error occured', selectedItemId: 'src/module-multiple-exports.js' },
+    error: { error: 'Some error occurred', selectedItemId: 'src/module-multiple-exports.js' },
     searchResults: WithResults.args.searchResults,
   },
 };
@@ -130,7 +130,7 @@ export const WithSearchResultsAndMultiLineError: Story = {
     fileSearchQueryDeferred: 'src',
     isLoading: false,
     error: {
-      error: 'A very long error occured. A very long error occured. A very long error occured.',
+      error: 'A very long error occurred. A very long error occurred. A very long error occurred.',
       selectedItemId: 'src/module-multiple-exports.js',
     },
     searchResults: WithResults.args.searchResults,

code/e2e-tests/framework-vue3.spec.ts

@@ -31,7 +31,7 @@
     },
     "loglevel": {
       "type": "string",
-      "description": "Controls level of logging during build. Can be one of: [silly, verbose, info (default), warn, error, silent].",
+      "description": "Controls level of logging during build. Can be one of: [trace, debug, info (default), warn, error, silent].",
       "pattern": "(trace|debug|info|warn|error|silent)"
     },
     "logfile": {

code/frameworks/angular/build-schema.json

@@ -147,7 +147,7 @@
     },
     "loglevel": {
       "type": "string",
-      "description": "Controls level of logging during build. Can be one of: [silly, verbose, info (default), warn, error, silent].",
+      "description": "Controls level of logging during build. Can be one of: [trace, debug, info (default), warn, error, silent].",
       "pattern": "(trace|debug|info|warn|error|silent)"
     },
     "logfile": {

code/frameworks/angular/start-schema.json

@@ -178,7 +178,8 @@ async function runStorybookDev(result: {
 
     const parts = storybookCommand.split(' ');
 
-    if (packageManager.type === 'npm') {
+    // Angular CLI throws "Unknown argument: silent"
+    if (packageManager.type === 'npm' && projectType !== ProjectType.ANGULAR) {
       parts.push('--silent');
     }