Merge remote-tracking branch 'origin/next' into kasper/fix-sandboxes

2025-04-09 00:19:13 +08:00 · 2025-02-26 15:25:47 +01:00 · 2025-02-26 15:25:47 +01:00 · 1497eff6fd
commit 1497eff6fd
parent 2d22c09f59 81bae0e754
25 changed files with 134 additions and 1980 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -856,15 +856,15 @@ workflows:
          requires:
            - unit-tests
      - create-sandboxes:
-          parallelism: 14
+          parallelism: 13
          requires:
            - build
      - chromatic-sandboxes:
-          parallelism: 11
+          parallelism: 10
          requires:
            - create-sandboxes
      - e2e-production:
-          parallelism: 9
+          parallelism: 8
          requires:
            - create-sandboxes
      - e2e-dev:
@ -876,7 +876,7 @@ workflows:
          requires:
            - create-sandboxes
      - vitest-integration:
-          parallelism: 5
+          parallelism: 4
          requires:
            - create-sandboxes
      - bench-sandboxes:
@ -931,15 +931,15 @@ workflows:
          requires:
            - unit-tests
      - create-sandboxes:
-          parallelism: 20
+          parallelism: 19
          requires:
            - build
      - chromatic-sandboxes:
-          parallelism: 17
+          parallelism: 16
          requires:
            - create-sandboxes
      - e2e-production:
-          parallelism: 15
+          parallelism: 14
          requires:
            - create-sandboxes
      - e2e-dev:
@ -951,7 +951,7 @@ workflows:
          requires:
            - create-sandboxes
      - vitest-integration:
-          parallelism: 5
+          parallelism: 4
          requires:
            - create-sandboxes
      - test-portable-stories:
@ -1004,18 +1004,18 @@ workflows:
          requires:
            - build
      - create-sandboxes:
-          parallelism: 36
+          parallelism: 34
          requires:
            - build
      # - smoke-test-sandboxes: # disabled for now
      #     requires:
      #       - create-sandboxes
      - chromatic-sandboxes:
-          parallelism: 33
+          parallelism: 31
          requires:
            - create-sandboxes
      - e2e-production:
-          parallelism: 31
+          parallelism: 29
          requires:
            - create-sandboxes
      - e2e-dev:
@ -1027,7 +1027,7 @@ workflows:
          requires:
            - create-sandboxes
      - vitest-integration:
-          parallelism: 11
+          parallelism: 9
          requires:
            - create-sandboxes
      - test-portable-stories:
--- a/code/core/src/common/utils/cli.ts
+++ b/code/core/src/common/utils/cli.ts
@ -82,7 +82,7 @@ export async function getCoercedStorybookVersion(packageManager: JsPackageManage
    )
  ).filter(({ version }) => !!version);

-  return packages[0]?.version;
+  return packages[0]?.version || versions.storybook;
 }

 export function getEnvConfig(program: Record<string, any>, configEnv: Record<string, any>): void {
--- a/code/deprecated/builder-manager/package.json
+++ b/code/deprecated/builder-manager/package.json
@ -39,7 +39,7 @@
    "*.d.ts"
  ],
  "peerDependencies": {
-    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 || ^9.0.0-0"
  },
  "publishConfig": {
    "access": "public"
--- a/code/deprecated/channels/package.json
+++ b/code/deprecated/channels/package.json
@ -39,7 +39,7 @@
    "*.d.ts"
  ],
  "peerDependencies": {
-    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 || ^9.0.0-0"
  },
  "publishConfig": {
    "access": "public"
--- a/code/deprecated/client-logger/package.json
+++ b/code/deprecated/client-logger/package.json
@ -39,7 +39,7 @@
    "*.d.ts"
  ],
  "peerDependencies": {
-    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 || ^9.0.0-0"
  },
  "publishConfig": {
    "access": "public"
--- a/code/deprecated/components/package.json
+++ b/code/deprecated/components/package.json
@ -39,7 +39,7 @@
    "*.d.ts"
  ],
  "peerDependencies": {
-    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 || ^9.0.0-0"
  },
  "publishConfig": {
    "access": "public"
--- a/code/deprecated/core-common/package.json
+++ b/code/deprecated/core-common/package.json
@ -38,7 +38,7 @@
    "*.d.ts"
  ],
  "peerDependencies": {
-    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 || ^9.0.0-0"
  },
  "publishConfig": {
    "access": "public"
--- a/code/deprecated/core-events/package.json
+++ b/code/deprecated/core-events/package.json
@ -70,7 +70,7 @@
    "*.d.ts"
  ],
  "peerDependencies": {
-    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 || ^9.0.0-0"
  },
  "publishConfig": {
    "access": "public"
--- a/code/deprecated/core-server/package.json
+++ b/code/deprecated/core-server/package.json
@ -39,7 +39,7 @@
    "*.d.ts"
  ],
  "peerDependencies": {
-    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 || ^9.0.0-0"
  },
  "publishConfig": {
    "access": "public"
--- a/code/deprecated/csf-tools/package.json
+++ b/code/deprecated/csf-tools/package.json
@ -38,7 +38,7 @@
    "*.d.ts"
  ],
  "peerDependencies": {
-    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 || ^9.0.0-0"
  },
  "publishConfig": {
    "access": "public"
--- a/code/deprecated/docs-tools/package.json
+++ b/code/deprecated/docs-tools/package.json
@ -39,7 +39,7 @@
    "*.d.ts"
  ],
  "peerDependencies": {
-    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 || ^9.0.0-0"
  },
  "publishConfig": {
    "access": "public"
--- a/code/deprecated/manager-api/package.json
+++ b/code/deprecated/manager-api/package.json
@ -38,7 +38,7 @@
    "*.d.ts"
  ],
  "peerDependencies": {
-    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 || ^9.0.0-0"
  },
  "publishConfig": {
    "access": "public"
--- a/code/deprecated/manager/package.json
+++ b/code/deprecated/manager/package.json
@ -36,7 +36,7 @@
    "*.d.ts"
  ],
  "peerDependencies": {
-    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 || ^9.0.0-0"
  },
  "publishConfig": {
    "access": "public"
--- a/code/deprecated/node-logger/package.json
+++ b/code/deprecated/node-logger/package.json
@ -39,7 +39,7 @@
    "*.d.ts"
  ],
  "peerDependencies": {
-    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 || ^9.0.0-0"
  },
  "publishConfig": {
    "access": "public"
--- a/code/deprecated/preview-api/package.json
+++ b/code/deprecated/preview-api/package.json
@ -40,7 +40,7 @@
    "*.d.ts"
  ],
  "peerDependencies": {
-    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 || ^9.0.0-0"
  },
  "publishConfig": {
    "access": "public"
--- a/code/deprecated/preview/package.json
+++ b/code/deprecated/preview/package.json
@ -36,7 +36,7 @@
    "*.d.ts"
  ],
  "peerDependencies": {
-    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 || ^9.0.0-0"
  },
  "publishConfig": {
    "access": "public"
--- a/code/deprecated/router/package.json
+++ b/code/deprecated/router/package.json
@ -44,7 +44,7 @@
    "*.d.ts"
  ],
  "peerDependencies": {
-    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 || ^9.0.0-0"
  },
  "publishConfig": {
    "access": "public"
--- a/code/deprecated/telemetry/package.json
+++ b/code/deprecated/telemetry/package.json
@ -39,7 +39,7 @@
    "*.d.ts"
  ],
  "peerDependencies": {
-    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 || ^9.0.0-0"
  },
  "publishConfig": {
    "access": "public"
--- a/code/deprecated/theming/package.json
+++ b/code/deprecated/theming/package.json
@ -44,7 +44,7 @@
    "*.d.ts"
  ],
  "peerDependencies": {
-    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 || ^9.0.0-0"
  },
  "publishConfig": {
    "access": "public"
--- a/code/deprecated/types/package.json
+++ b/code/deprecated/types/package.json
@ -39,7 +39,7 @@
    "*.d.ts"
  ],
  "peerDependencies": {
-    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
+    "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 || ^9.0.0-0"
  },
  "publishConfig": {
    "access": "public"
--- a/code/lib/cli-storybook/src/automigrate/fixes/vta.ts
+++ b/code/lib/cli-storybook/src/automigrate/fixes/vta.ts
@ -44,7 +44,8 @@ export const vta: Fix<Options> = {
      const packageJson = await packageManager.retrievePackageJson();
      await packageManager.addDependencies(
        { installAsDevDependencies: true, skipInstall, packageJson },
-        [`@chromatic-com/storybook@^3`]
+        // TODO: change the semver range to '^4' when VTA 4 and SB 9 is released
+        [`@chromatic-com/storybook@^4.0.0-0`]
      );

      await updateMainConfig({ mainConfigPath, dryRun: !!dryRun }, async (main) => {
--- a/code/lib/cli-storybook/src/sandbox-templates.ts
+++ b/code/lib/cli-storybook/src/sandbox-templates.ts
@ -523,28 +523,28 @@ export const baseTemplates = {
    },
    skipTasks: ['e2e-tests-dev', 'bench', 'vitest-integration'],
  },
-  'svelte-kit/skeleton-js': {
-    name: 'SvelteKit Latest (Vite | JavaScript)',
-    script:
-      'yarn create svelte-with-args --name=svelte-kit/skeleton-js --directory={{beforeDir}} --template=skeleton --types=null --no-prettier --no-eslint --no-playwright --no-vitest --no-svelte5',
-    expected: {
-      framework: '@storybook/sveltekit',
-      renderer: '@storybook/svelte',
-      builder: '@storybook/builder-vite',
-    },
-    skipTasks: ['e2e-tests-dev', 'bench', 'test-runner'],
-  },
-  'svelte-kit/skeleton-ts': {
-    name: 'SvelteKit Latest (Vite | TypeScript)',
-    script:
-      'yarn create svelte-with-args --name=svelte-kit/skeleton-ts --directory={{beforeDir}} --template=skeleton --types=typescript --no-prettier --no-eslint --no-playwright --no-vitest --no-svelte5',
-    expected: {
-      framework: '@storybook/sveltekit',
-      renderer: '@storybook/svelte',
-      builder: '@storybook/builder-vite',
-    },
-    skipTasks: ['e2e-tests-dev', 'bench', 'test-runner'],
-  },
+  // 'svelte-kit/skeleton-js': {
+  //   name: 'SvelteKit Latest (Vite | JavaScript)',
+  //   script:
+  //     'yarn create svelte-with-args --name=svelte-kit/skeleton-js --directory={{beforeDir}} --template=skeleton --types=null --no-prettier --no-eslint --no-playwright --no-vitest --no-svelte5',
+  //   expected: {
+  //     framework: '@storybook/sveltekit',
+  //     renderer: '@storybook/svelte',
+  //     builder: '@storybook/builder-vite',
+  //   },
+  //   skipTasks: ['e2e-tests-dev', 'bench', 'test-runner'],
+  // },
+  // 'svelte-kit/skeleton-ts': {
+  //   name: 'SvelteKit Latest (Vite | TypeScript)',
+  //   script:
+  //     'yarn create svelte-with-args --name=svelte-kit/skeleton-ts --directory={{beforeDir}} --template=skeleton --types=typescript --no-prettier --no-eslint --no-playwright --no-vitest --no-svelte5',
+  //   expected: {
+  //     framework: '@storybook/sveltekit',
+  //     renderer: '@storybook/svelte',
+  //     builder: '@storybook/builder-vite',
+  //   },
+  //   skipTasks: ['e2e-tests-dev', 'bench', 'test-runner'],
+  // },
  'svelte-kit/prerelease-ts': {
    name: 'SvelteKit Prerelease (Vite | TypeScript)',
    script:
@ -854,7 +854,7 @@ export const normal: TemplateKey[] = [
  'nuxt-vite/default-ts',
  'lit-vite/default-ts',
  'svelte-vite/default-ts',
-  'svelte-kit/skeleton-ts',
+  // 'svelte-kit/skeleton-ts',
  'nextjs/default-ts',
  'experimental-nextjs-vite/default-ts',
  'bench/react-vite-default-ts',
@ -886,7 +886,7 @@ export const daily: TemplateKey[] = [
  'vue3-vite/default-js',
  'vue-cli/default-js',
  'lit-vite/default-js',
-  'svelte-kit/skeleton-js',
+  // 'svelte-kit/skeleton-js',
  'svelte-kit/prerelease-ts',
  'svelte-vite/default-js',
  'nextjs/prerelease',
--- a/code/lib/create-storybook/src/generators/baseGenerator.ts
+++ b/code/lib/create-storybook/src/generators/baseGenerator.ts
@ -282,7 +282,8 @@ export async function baseGenerator(
        })
      : extraAddonPackages;

-  extraAddonsToInstall.push('@chromatic-com/storybook@^3');
+  // TODO: change the semver range to '^4' when VTA 4 and SB 9 is released
+  extraAddonsToInstall.push('@chromatic-com/storybook@^4.0.0-0');

  // added to main.js
  const addons = [
--- a/code/package.json
+++ b/code/package.json
@ -94,7 +94,7 @@
    "typescript": "^5.7.3"
  },
  "dependencies": {
-    "@chromatic-com/storybook": "^3.2.4",
+    "@chromatic-com/storybook": "^4.0.0-0",
    "@happy-dom/global-registrator": "^14.12.0",
    "@nx/eslint": "20.2.2",
    "@nx/vite": "20.2.2",
--- a/code/yarn.lock
+++ b/code/yarn.lock