Release: Prerelease 10.1.0-alpha.14

.circleci/config.yml

@@ -950,7 +950,7 @@ jobs:
                     mkdir features-1
                     cd features-1
                     npm set registry http://localhost:6001
-                    npx create-storybook --yes --package-manager npm --features docs test a11y
+                    npx create-storybook --yes --package-manager npm --features docs test a11y --loglevel=debug
                     npx vitest
                 environment:
                     IN_STORYBOOK_SANDBOX: true
@@ -1172,15 +1172,15 @@ workflows:
                 requires:
                     - build
             - create-sandboxes:
-                parallelism: 34
+                parallelism: 38
                 requires:
                     - build
             - check-sandboxes:
                 parallelism: 1
                 requires:
                     - create-sandboxes
             - chromatic-sandboxes:
-                parallelism: 31
+                parallelism: 35
                 requires:
                     - create-sandboxes
             - e2e-production:
@@ -1192,7 +1192,7 @@ workflows:
                 requires:
                     - create-sandboxes
             - test-runner-production:
-                parallelism: 29
+                parallelism: 33
                 requires:
                     - create-sandboxes
             - vitest-integration:
@@ -1286,11 +1286,11 @@ workflows:
                 requires:
                     - unit-tests
             - create-sandboxes:
-                parallelism: 19
+                parallelism: 21
                 requires:
                     - build
             - chromatic-sandboxes:
-                parallelism: 16
+                parallelism: 18
                 requires:
                     - create-sandboxes
             - e2e-production:
@@ -1302,7 +1302,7 @@ workflows:
                 requires:
                     - create-sandboxes
             - test-runner-production:
-                parallelism: 14
+                parallelism: 16
                 requires:
                     - create-sandboxes
             - vitest-integration:
@@ -1381,11 +1381,11 @@ workflows:
                 requires:
                     - unit-tests
             - create-sandboxes:
-                parallelism: 13
+                parallelism: 14
                 requires:
                     - build
             - chromatic-sandboxes:
-                parallelism: 10
+                parallelism: 11
                 requires:
                     - create-sandboxes
             - e2e-production:
@@ -1397,7 +1397,7 @@ workflows:
                 requires:
                     - create-sandboxes
             - test-runner-production:
-                parallelism: 8
+                parallelism: 9
                 requires:
                     - create-sandboxes
             - vitest-integration:

.circleci/src/workflows/daily.yml

@@ -31,7 +31,7 @@ jobs:
       requires:
         - build
   - create-sandboxes:
-      parallelism: 34
+      parallelism: 38
       requires:
         - build
   - check-sandboxes:
@@ -42,7 +42,7 @@ jobs:
   #     requires:
   #       - create-sandboxes
   - chromatic-sandboxes:
-      parallelism: 31
+      parallelism: 35
       requires:
         - create-sandboxes
   - e2e-production:
@@ -54,7 +54,7 @@ jobs:
       requires:
         - create-sandboxes
   - test-runner-production:
-      parallelism: 29
+      parallelism: 33
       requires:
         - create-sandboxes
   - vitest-integration:

.circleci/src/workflows/merged.yml

@@ -34,11 +34,11 @@ jobs:
       requires:
         - unit-tests
   - create-sandboxes:
-      parallelism: 19
+      parallelism: 21
       requires:
         - build
   - chromatic-sandboxes:
-      parallelism: 16
+      parallelism: 18
       requires:
         - create-sandboxes
   - e2e-production:
@@ -50,7 +50,7 @@ jobs:
       requires:
         - create-sandboxes
   - test-runner-production:
-      parallelism: 14
+      parallelism: 16
       requires:
         - create-sandboxes
   - vitest-integration:

.circleci/src/workflows/normal.yml

@@ -34,11 +34,11 @@ jobs:
       requires:
         - unit-tests
   - create-sandboxes:
-      parallelism: 13
+      parallelism: 14
       requires:
         - build
   - chromatic-sandboxes:
-      parallelism: 10
+      parallelism: 11
       requires:
         - create-sandboxes
   - e2e-production:
@@ -50,7 +50,7 @@ jobs:
       requires:
         - create-sandboxes
   - test-runner-production:
-      parallelism: 8
+      parallelism: 9
       requires:
         - create-sandboxes
   - vitest-integration:

CHANGELOG.prerelease.md

@@ -1,3 +1,9 @@
+## 10.1.0-alpha.14
+
+- Angular: Add support for v21 - [#33098](https://github.com/storybookjs/storybook/pull/33098), thanks @valentinpalkovic!
+- Build: Add Rsbuild-based sandboxes - [#33039](https://github.com/storybookjs/storybook/pull/33039), thanks @valentinpalkovic!
+- CLI: Change yarn package manager value to yarn1 - [#33099](https://github.com/storybookjs/storybook/pull/33099), thanks @valentinpalkovic!
+
 ## 10.1.0-alpha.13
 
 - CLI: Modernize Storybook CLI with new init workflow, Clack UI, and Generator System - [#32717](https://github.com/storybookjs/storybook/pull/32717), thanks @valentinpalkovic!

code/addons/a11y/vitest.config.ts

@@ -1,6 +1,6 @@
 import { defineConfig, mergeConfig } from 'vitest/config';
 
-import { vitestCommonConfig } from '../../vitest.workspace';
+import { vitestCommonConfig } from '../../vitest.shared';
 
 export default mergeConfig(
   vitestCommonConfig,

code/addons/docs/vitest.config.ts

@@ -1,6 +1,6 @@
 import { defineConfig, mergeConfig } from 'vitest/config';
 
-import { vitestCommonConfig } from '../../vitest.workspace';
+import { vitestCommonConfig } from '../../vitest.shared';
 
 export default mergeConfig(
   vitestCommonConfig,

code/addons/links/vitest.config.ts

@@ -1,6 +1,6 @@
 import { defineConfig, mergeConfig } from 'vitest/config';
 
-import { vitestCommonConfig } from '../../vitest.workspace';
+import { vitestCommonConfig } from '../../vitest.shared';
 
 export default mergeConfig(
   vitestCommonConfig,

code/addons/onboarding/vitest.config.ts

@@ -1,6 +1,6 @@
 import { defineConfig, mergeConfig } from 'vitest/config';
 
-import { vitestCommonConfig } from '../../vitest.workspace';
+import { vitestCommonConfig } from '../../vitest.shared';
 
 export default mergeConfig(
   vitestCommonConfig,

code/addons/pseudo-states/vitest.config.ts

@@ -1,6 +1,6 @@
 import { defineConfig, mergeConfig } from 'vitest/config';
 
-import { vitestCommonConfig } from '../../vitest.workspace';
+import { vitestCommonConfig } from '../../vitest.shared';
 
 export default mergeConfig(
   vitestCommonConfig,

code/addons/themes/src/postinstall.ts

@@ -1,17 +1,19 @@
+import { PackageManagerName } from 'storybook/internal/common';
+
 import { spawnSync } from 'child_process';
 
 const PACKAGE_MANAGER_TO_COMMAND = {
-  npm: 'npx',
-  pnpm: 'pnpm dlx',
-  yarn1: 'npx',
-  yarn2: 'yarn dlx',
-  bun: 'bunx',
+  [PackageManagerName.NPM]: 'npx',
+  [PackageManagerName.PNPM]: 'pnpm dlx',
+  [PackageManagerName.YARN1]: 'npx',
+  [PackageManagerName.YARN2]: 'yarn dlx',
+  [PackageManagerName.BUN]: 'bunx',
 };
 
 const selectPackageManagerCommand = (packageManager: string) =>
   PACKAGE_MANAGER_TO_COMMAND[packageManager as keyof typeof PACKAGE_MANAGER_TO_COMMAND];
 
-export default async function postinstall({ packageManager = 'npm' }) {
+export default async function postinstall({ packageManager = PackageManagerName.NPM }) {
   const commandString = selectPackageManagerCommand(packageManager);
   const [command, ...commandArgs] = commandString.split(' ');
 

code/addons/themes/vitest.config.ts

@@ -1,6 +1,6 @@
 import { defineConfig, mergeConfig } from 'vitest/config';
 
-import { vitestCommonConfig } from '../../vitest.workspace';
+import { vitestCommonConfig } from '../../vitest.shared';
 
 export default mergeConfig(
   vitestCommonConfig,

code/addons/vitest/vitest.config.ts

@@ -1,6 +1,6 @@
 import { defineConfig, mergeConfig } from 'vitest/config';
 
-import { vitestCommonConfig } from '../../vitest.workspace';
+import { vitestCommonConfig } from '../../vitest.shared';
 
 export default mergeConfig(
   vitestCommonConfig,

code/builders/builder-vite/vitest.config.ts

@@ -1,6 +1,6 @@
 import { defineConfig, mergeConfig } from 'vitest/config';
 
-import { vitestCommonConfig } from '../../vitest.workspace';
+import { vitestCommonConfig } from '../../vitest.shared';
 
 export default mergeConfig(
   vitestCommonConfig,

code/builders/builder-webpack5/vitest.config.ts

@@ -1,6 +1,6 @@
 import { defineConfig, mergeConfig } from 'vitest/config';
 
-import { vitestCommonConfig } from '../../vitest.workspace';
+import { vitestCommonConfig } from '../../vitest.shared';
 
 export default mergeConfig(
   vitestCommonConfig,

code/core/src/common/js-package-manager/JsPackageManager.ts

@@ -21,7 +21,7 @@ import type { InstallationMetadata } from './types';
 
 export enum PackageManagerName {
   NPM = 'npm',
-  YARN1 = 'yarn',
+  YARN1 = 'yarn1',
   YARN2 = 'yarn2',
   PNPM = 'pnpm',
   BUN = 'bun',

code/core/src/common/js-package-manager/JsPackageManagerFactory.ts

@@ -163,11 +163,11 @@ export class JsPackageManagerFactory {
 
   /** Look up map of package manager proxies by name */
   private static PROXY_MAP: Record<PackageManagerName, PackageManagerProxy> = {
-    npm: NPMProxy,
-    pnpm: PNPMProxy,
-    yarn: Yarn1Proxy,
-    yarn2: Yarn2Proxy,
-    bun: BUNProxy,
+    [PackageManagerName.NPM]: NPMProxy,
+    [PackageManagerName.PNPM]: PNPMProxy,
+    [PackageManagerName.YARN1]: Yarn1Proxy,
+    [PackageManagerName.YARN2]: Yarn2Proxy,
+    [PackageManagerName.BUN]: BUNProxy,
   };
 
   /**

code/core/src/csf-tools/ConfigFile.ts

@@ -1179,7 +1179,7 @@ export const isCsfFactoryPreview = (previewConfig: ConfigFile) => {
   return !!program.body.find((node) => {
     return (
       t.isImportDeclaration(node) &&
-      node.source.value.includes('@storybook') &&
+      node.source.value.includes('storybook') &&
       node.specifiers.some((specifier) => {
         return (
           t.isImportSpecifier(specifier) &&

code/core/src/telemetry/get-framework-info.test.ts

@@ -1,58 +1,47 @@
-import { sep } from 'node:path';
-
-import { describe, expect, it, vi } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import type { StorybookConfig } from 'storybook/internal/types';
 
 import { getFrameworkInfo } from './get-framework-info';
-import { getActualPackageJson } from './package-json';
 
-vi.mock('./package-json', () => ({
-  getActualPackageJson: vi.fn(),
+vi.mock('storybook/internal/common', () => ({
+  getStorybookInfo: vi.fn(),
 }));
 
 describe('getFrameworkInfo', () => {
-  it('should return an empty object if mainConfig.framework is undefined', async () => {
-    const result = await getFrameworkInfo({} as StorybookConfig);
-    expect(result).toEqual({});
+  const defaultInfo = {
+    frameworkPackage: '@storybook/react',
+    rendererPackage: '@storybook/react',
+    builderPackage: '@storybook/builder-vite',
+  };
+
+  beforeEach(async () => {
+    const { getStorybookInfo } = await import('storybook/internal/common');
+    vi.mocked(getStorybookInfo).mockResolvedValue(defaultInfo as any);
   });
 
-  it('should return an empty object if mainConfig.framework name is undefined', async () => {
-    const result = await getFrameworkInfo({ framework: {} } as StorybookConfig);
-    expect(result).toEqual({});
+  it('returns framework/builder/renderer with empty options when no framework provided', async () => {
+    const result = await getFrameworkInfo({} as StorybookConfig, '/tmp/.storybook');
+    expect(result).toEqual({
+      framework: { name: defaultInfo.frameworkPackage, options: {} },
+      builder: defaultInfo.builderPackage,
+      renderer: defaultInfo.rendererPackage,
+    });
   });
 
-  it('should call getActualPackageJson with the correct package name', async () => {
-    const packageName = '@storybook/react';
-    const framework = { name: packageName };
-    await getFrameworkInfo({ framework } as StorybookConfig);
-    expect(getActualPackageJson).toHaveBeenCalledWith(packageName);
+  it('passes configDir to getStorybookInfo', async () => {
+    const configDir = '/my/project/.storybook';
+    const { getStorybookInfo } = await import('storybook/internal/common');
+    await getFrameworkInfo({} as StorybookConfig, configDir);
+    expect(getStorybookInfo).toHaveBeenCalledWith(configDir);
   });
 
-  it('should resolve the framework package json correctly and strip project paths in the metadata', async () => {
-    const packageName = `${process.cwd()}/@storybook/react`.split('/').join(sep);
-    const framework = { name: packageName };
-    const frameworkPackageJson = {
-      name: packageName,
-      dependencies: {
-        '@storybook/react': '7.0.0',
-        '@storybook/builder-vite': '7.0.0',
-      },
-    };
-
-    vi.mocked(getActualPackageJson).mockResolvedValueOnce(frameworkPackageJson);
-
-    const result = await getFrameworkInfo({ framework } as StorybookConfig);
-
-    expect(getActualPackageJson).toHaveBeenCalledWith(packageName);
-
-    expect(result).toEqual({
-      framework: {
-        name: '$SNIP/@storybook/react'.split('/').join(sep),
-        options: undefined,
-      },
-      builder: '@storybook/builder-vite',
-      renderer: '@storybook/react',
-    });
+  it('returns provided framework options when object is passed', async () => {
+    const options = { foo: 'bar' } as any;
+    const result = await getFrameworkInfo(
+      { framework: { name: '@storybook/react', options } } as any,
+      '/tmp/.storybook'
+    );
+    expect(result.framework.options).toEqual(options);
   });
 });