Merge pull request #1037 from storybookjs/next

Create a new pull request by comparing changes across two branches.

Author: GulajavaMinistudio

.circleci/config.yml

@@ -25,7 +25,7 @@ executors:
         default: "small"
     working_directory: /tmp/storybook
     docker:
-      - image: cimg/node:22.13.1
+      - image: cimg/node:22.15.0
         environment:
           NODE_OPTIONS: --max_old_space_size=6144
     resource_class: <<parameters.class>>
@@ -51,7 +51,7 @@ executors:
         default: "small"
     working_directory: /tmp/storybook
     docker:
-      - image: cimg/node:22.13.1-browsers
+      - image: cimg/node:22.15.0-browsers
         environment:
           NODE_OPTIONS: --max_old_space_size=6144
     resource_class: <<parameters.class>>
@@ -115,15 +115,15 @@ jobs:
       - restore_cache:
           name: Restore Yarn cache
           keys:
-            - prettydocs-yarn-2-cache-v7--{{ checksum "code/yarn.lock" }}--{{ checksum "scripts/yarn.lock" }}
+            - prettydocs-yarn-2-cache-v8--{{ checksum "code/yarn.lock" }}--{{ checksum "scripts/yarn.lock" }}
       - run:
           name: Install
           command: |
             cd scripts
             yarn install
       - save_cache:
           name: Save Yarn cache
-          key: prettydocs-yarn-2-cache-v7--{{ checksum "code/yarn.lock" }}--{{ checksum "scripts/yarn.lock" }}
+          key: prettydocs-yarn-2-cache-v8--{{ checksum "code/yarn.lock" }}--{{ checksum "scripts/yarn.lock" }}
           paths:
             - ~/.yarn/berry/cache
       - run:
@@ -141,7 +141,7 @@ jobs:
       - restore_cache:
           name: Restore Yarn cache
           keys:
-            - build-yarn-2-cache-v4--{{ checksum "code/yarn.lock" }}--{{ checksum "scripts/yarn.lock" }}
+            - build-yarn-2-cache-v5--{{ checksum "code/yarn.lock" }}--{{ checksum "scripts/yarn.lock" }}
       - run:
           name: Compile
           command: |
@@ -158,7 +158,7 @@ jobs:
           path: code/bench/esbuild-metafiles
       - save_cache:
           name: Save Yarn cache
-          key: build-yarn-2-cache-v4--{{ checksum "code/yarn.lock" }}--{{ checksum "scripts/yarn.lock" }}
+          key: build-yarn-2-cache-v5--{{ checksum "code/yarn.lock" }}--{{ checksum "scripts/yarn.lock" }}
           paths:
             - ~/.yarn/berry/cache
       - persist_to_workspace:
@@ -170,7 +170,6 @@ jobs:
             - code/bench
             - code/examples
             - code/frameworks
-            - code/deprecated
             - code/lib
             - code/core
             - code/builders
@@ -195,7 +194,7 @@ jobs:
       - cancel-workflow-on-failure
   knip:
     executor:
-      class: medium
+      class: large
       name: sb_node_22_classic
     steps:
       - git-shallow-clone/checkout_advanced:
@@ -271,7 +270,7 @@ jobs:
       - restore_cache:
           name: Restore Yarn cache
           keys:
-            - build-yarn-2-cache-v4--{{ checksum "code/yarn.lock" }}--{{ checksum "scripts/yarn.lock" }}
+            - build-yarn-2-cache-v5--{{ checksum "code/yarn.lock" }}--{{ checksum "scripts/yarn.lock" }}
       - run:
           name: Compile
           command: |
@@ -314,9 +313,9 @@ jobs:
       - cancel-workflow-on-failure
   unit-tests:
     executor:
-      class: large
+      class: xlarge
       name: sb_playwright
-    parallelism: 4
+    parallelism: 2
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: "--depth 1 --verbose"
@@ -368,10 +367,10 @@ jobs:
       - report-workflow-on-failure
   chromatic-internal-storybook:
     executor:
-      class: medium
+      class: large
       name: sb_node_22_browsers
     environment:
-      NODE_OPTIONS: --max_old_space_size=6144
+      NODE_OPTIONS: --max_old_space_size=4096
     steps:
       # switched this to the CircleCI helper to get the full git history for TurboSnap
       - checkout
@@ -399,8 +398,14 @@ jobs:
       - attach_workspace:
           at: .
       - run:
-          name: Enable Corepack
-          command: sudo corepack enable yarn
+          name: Setup Corepack
+          command: |
+            # Enable corepack
+            sudo corepack enable
+
+            # Verify yarn is working
+            which yarn
+            yarn --version
       - run:
           name: Starting Event Collector
           command: yarn jiti ./event-log-collector.ts
@@ -475,7 +480,7 @@ jobs:
       parallelism:
         type: integer
     executor:
-      class: large
+      class: xlarge
       name: sb_playwright
     parallelism: << parameters.parallelism >>
     steps:
@@ -621,7 +626,33 @@ jobs:
           command: yarn upload-bench $(yarn get-template --cadence << pipeline.parameters.workflow >> --task bench) << pipeline.parameters.ghPrNumber >> << pipeline.parameters.ghBaseBranch >>
       - report-workflow-on-failure:
           template: $(yarn get-template --cadence << pipeline.parameters.workflow >> --task bench)
-  test-empty-init:
+  test-init-features:
+    executor:
+      class: small
+      name: sb_node_22_browsers
+    steps:
+      - git-shallow-clone/checkout_advanced:
+          clone_options: "--depth 1 --verbose"
+      - attach_workspace:
+          at: .
+      - run:
+          name: Storybook init for features
+          command: |
+            cd code
+            yarn local-registry --open &
+            yarn wait-on tcp:127.0.0.1:6001
+            cd ../../
+            mkdir features-1
+            cd features-1
+            npm set registry http://localhost:6001
+            npx create-storybook --yes --package-manager npm --features dev docs test
+            npx vitest
+          environment:
+            IN_STORYBOOK_SANDBOX: true
+            STORYBOOK_INIT_EMPTY_TYPE: react-vite-ts
+            STORYBOOK_DISABLE_TELEMETRY: true
+
+  test-init-empty:
     executor:
       class: small
       name: sb_node_22_browsers
@@ -853,13 +884,17 @@ workflows:
           parallelism: 5
           requires:
             - create-sandboxes
-      - bench-sandboxes:
-          parallelism: 5
-          requires:
-            - create-sandboxes
+      # TODO: don't forget to reenable this
+      #      - bench-sandboxes:
+      #          parallelism: 5
+      #          requires:
+      #            - create-sandboxes
       - test-ui-testing-module:
           requires:
             - build
+      - test-init-features:
+          requires:
+            - build
       - test-portable-stories:
           requires:
             - build
@@ -902,23 +937,23 @@ workflows:
           requires:
             - unit-tests
       - create-sandboxes:
-          parallelism: 20
+          parallelism: 18
           requires:
             - build
       - chromatic-sandboxes:
-          parallelism: 17
+          parallelism: 15
           requires:
             - create-sandboxes
       - e2e-production:
-          parallelism: 15
+          parallelism: 13
           requires:
             - create-sandboxes
       - e2e-dev:
           parallelism: 1
           requires:
             - create-sandboxes
       - test-runner-production:
-          parallelism: 15
+          parallelism: 13
           requires:
             - create-sandboxes
       - vitest-integration:
@@ -934,15 +969,19 @@ workflows:
       - test-ui-testing-module:
           requires:
             - build
-      - bench-sandboxes:
-          parallelism: 5
+      - test-init-features:
           requires:
-            - create-sandboxes
-      # TODO: reenable once we find out the source of flakyness
-      # - test-runner-dev:
-      #     parallelism: 4
-      #     requires:
-      #       - create-sandboxes
+            - build
+  # TODO: don't forget to reenable this
+  #      - bench-sandboxes:
+  #          parallelism: 5
+  #          requires:
+  #            - create-sandboxes
+  # TODO: reenable once we find out the source of flakyness
+  # - test-runner-dev:
+  #     parallelism: 4
+  #     requires:
+  #       - create-sandboxes
   daily:
     when:
       equal: [daily, << pipeline.parameters.workflow >>]
@@ -972,30 +1011,30 @@ workflows:
           requires:
             - build
       - create-sandboxes:
-          parallelism: 37
+          parallelism: 31
           requires:
             - build
       # - smoke-test-sandboxes: # disabled for now
       #     requires:
       #       - create-sandboxes
       - chromatic-sandboxes:
-          parallelism: 34
+          parallelism: 28
           requires:
             - create-sandboxes
       - e2e-production:
-          parallelism: 32
+          parallelism: 26
           requires:
             - create-sandboxes
       - e2e-dev:
           parallelism: 1
           requires:
             - create-sandboxes
       - test-runner-production:
-          parallelism: 32
+          parallelism: 26
           requires:
             - create-sandboxes
       - vitest-integration:
-          parallelism: 11
+          parallelism: 9
           requires:
             - create-sandboxes
       - test-portable-stories:
@@ -1007,7 +1046,10 @@ workflows:
       - test-ui-testing-module:
           requires:
             - build
-      - test-empty-init:
+      - test-init-features:
+          requires:
+            - build
+      - test-init-empty:
           requires:
             - build
           matrix:
@@ -1025,13 +1067,14 @@ workflows:
                 # --smoke-test is not supported for the angular builder right now
                 # - "angular-cli"
                 - "lit-vite-ts"
-      - bench-sandboxes:
-          parallelism: 5
-          requires:
-            - create-sandboxes
+# TODO: don't forget to reenable this
+#      - bench-sandboxes:
+#          parallelism: 5
+#          requires:
+#            - create-sandboxes
 
-      # TODO: reenable once we find out the source of flakyness
-      # - test-runner-dev:
-      #     parallelism: 4
-      #     requires:
-      #       - create-sandboxes
+# TODO: reenable once we find out the source of flakyness
+# - test-runner-dev:
+#     parallelism: 4
+#     requires:
+#       - create-sandboxes

.cursor/rules/spy-mocking.mdc

@@ -0,0 +1,43 @@
+---
+description: Rules for consistent and type-safe mocking in Vitest tests
+globs: "**/*.test.{ts,tsx,js,jsx}"
+alwaysApply: true
+---
+
+# Spy Mocking Rules for Vitest Tests
+
+## Mocking Approach
+
+When mocking packages or files in Vitest-based tests, follow these rules:
+
+1. Use `vi.mock()` with the `spy: true` option for all package and file mocks
+2. Place all mocks at the top of the test file before any test cases
+3. Use `vi.mocked()` to type and access the mocked functions
+4. Implement mock behaviors in `beforeEach` blocks
+5. Mock all required dependencies that the test subject uses
+
+## Mock Implementation Rules
+
+1. Mock implementations should be placed in `beforeEach` blocks
+2. Each mock implementation should return a Promise for async functions
+3. Mock implementations should match the expected return type of the original function
+4. Use `vi.mocked()` to access and implement mock behaviors
+5. Mock all required properties and methods that the test subject uses
+
+## Avoided Patterns
+
+The following mocking patterns should be avoided:
+
+1. Direct function mocking without `vi.mocked()`
+2. Mock implementations outside of `beforeEach` blocks
+3. Mocking without the `spy: true` option
+4. Inline mock implementations within test cases
+5. Mocking only a subset of required dependencies
+
+## Best Practices
+
+1. Mock at the highest level of abstraction needed
+2. Keep mock implementations simple and focused
+3. Use type-safe mocking with `vi.mocked()`
+4. Document complex mock behaviors
+5. Group related mocks together