Merge branch 'next' into fix/interaction-call-date-param

.git-blame-ignore-revs

@@ -1,4 +1,7 @@
 34e364a0ca1d93555d36a7367d78e8e229493de8
 c0896915fb7fb9a8dd416b9aebca17abd909d1c1
 a41c227037e7e7249b8b376f838f4f8bcc3e3e59
-13c46e6c0b7f3dd8cf4ba42d1cfd6714f4777d54
+13c46e6c0b7f3dd8cf4ba42d1cfd6714f4777d54
+0a4522a3f84773f39daec4820c49b8a92e9f9d11
+e12039c0593ba021ce27cb7245b6067677f27625
+513bb66bb9729ece57581b6eb50e5b338c47c0b9

.github/PULL_REQUEST_TEMPLATE.md

@@ -19,6 +19,7 @@ Thank you for contributing to Storybook! Please submit all PRs to the `next` bra
 <!-- Please check (put an "x" inside the "[ ]") the applicable items below to communicate how to test your changes -->
 
 #### The changes in this PR are covered in the following automated tests:
+
 - [ ] stories
 - [ ] unit tests
 - [ ] integration tests
@@ -46,21 +47,21 @@ _This section is mandatory for all contributions. If you believe no manual test
 
 ## Checklist for Maintainers
 
-- [ ] When this PR is ready for testing, make sure to add `ci:normal`, `ci:merged` or `ci:daily` GH label to it to run a specific set of sandboxes. The particular set of sandboxes can be found in `code/lib/cli/src/sandbox-templates.ts`
+- [ ] When this PR is ready for testing, make sure to add `ci:normal`, `ci:merged` or `ci:daily` GH label to it to run a specific set of sandboxes. The particular set of sandboxes can be found in `code/lib/cli-storybook/src/sandbox-templates.ts`
 - [ ] Make sure this PR contains **one** of the labels below:
    <details>
      <summary>Available labels</summary>
 
-     - `bug`: Internal changes that fixes incorrect behavior.
-     - `maintenance`: User-facing maintenance tasks.
-     - `dependencies`: Upgrading (sometimes downgrading) dependencies.
-     - `build`: Internal-facing build tooling & test updates. Will not show up in release changelog.
-     - `cleanup`: Minor cleanup style change. Will not show up in release changelog.
-     - `documentation`: Documentation **only** changes. Will not show up in release changelog.
-     - `feature request`: Introducing a new feature.
-     - `BREAKING CHANGE`: Changes that break compatibility in some way with current major version.
-     - `other`: Changes that don't fit in the above categories.
-   
+  - `bug`: Internal changes that fixes incorrect behavior.
+  - `maintenance`: User-facing maintenance tasks.
+  - `dependencies`: Upgrading (sometimes downgrading) dependencies.
+  - `build`: Internal-facing build tooling & test updates. Will not show up in release changelog.
+  - `cleanup`: Minor cleanup style change. Will not show up in release changelog.
+  - `documentation`: Documentation **only** changes. Will not show up in release changelog.
+  - `feature request`: Introducing a new feature.
+  - `BREAKING CHANGE`: Changes that break compatibility in some way with current major version.
+  - `other`: Changes that don't fit in the above categories.
+
    </details>
 
 ### 🦋 Canary release
@@ -74,4 +75,4 @@ _core team members can create a canary release [here](https://github.com/storybo
 <!-- CANARY_RELEASE_SECTION -->
 
 <!-- BENCHMARK_SECTION -->
-<!-- BENCHMARK_SECTION -->
+<!-- BENCHMARK_SECTION -->

.github/workflows/canary-release-pr.yml

@@ -60,10 +60,6 @@ jobs:
         with:
           node-version-file: ".nvmrc"
 
-      - uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: 1.1.1
-
       - name: Cache dependencies
         uses: actions/cache@v4
         with:

.github/workflows/generate-sandboxes.yml

@@ -30,10 +30,6 @@ jobs:
         with:
           ref: next
 
-      - uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: 1.1.1
-
       - uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
@@ -86,10 +82,6 @@ jobs:
         with:
           ref: main
 
-      - uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: 1.1.1
-
       - uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"

.github/workflows/prepare-non-patch-release.yml

@@ -56,10 +56,6 @@ jobs:
         with:
           node-version-file: ".nvmrc"
 
-      - uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: 1.1.1
-
       - name: Cache dependencies
         uses: actions/cache@v4
         with:

.github/workflows/prepare-patch-release.yml

@@ -35,10 +35,6 @@ jobs:
         with:
           node-version-file: ".nvmrc"
 
-      - uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: 1.1.1
-
       - name: Cache dependencies
         uses: actions/cache@v4
         with:

.github/workflows/publish.yml

@@ -47,10 +47,6 @@ jobs:
         with:
           node-version-file: ".nvmrc"
 
-      - uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: 1.1.1
-
       - name: Cache dependencies
         uses: actions/cache@v4
         with:
@@ -163,8 +159,8 @@ jobs:
         run: |
           git checkout next
           git pull
-          git push --force origin latest-release
-          git push --force origin main
+          git push origin --force next:latest-release
+          git push origin --force next:main
 
       - name: Sync CHANGELOG.md from `main` to `next`
         if: steps.target.outputs.target == 'main'
@@ -178,6 +174,7 @@ jobs:
           git commit -m "Update CHANGELOG.md for v${{ steps.version.outputs.current-version }} [skip ci]" || true
           git push origin next
 
+      # TODO: remove this step - @JReinhold
       - name: Sync version JSONs from `next-release` to `main`
         if: github.ref_name == 'next-release'
         working-directory: .

.github/workflows/tests-unit.yml

@@ -17,15 +17,18 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - uses: oven-sh/setup-bun@v1
         with:
-          bun-version: 1.1.1
+          fetch-depth: 2
       - name: Set node version
         uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
 
       - name: install and compile
         run: yarn task --task compile --start-from=auto
+
+      - name: Install Playwright Dependencies
+        run: cd code && yarn exec playwright install chromium --with-deps
+
       - name: test
         run: yarn test

.gitignore

@@ -12,6 +12,7 @@ test-results
 /repros
 /sandbox
 /bench
+/code/bench
 .verdaccio-cache
 .next
 /.npmrc
@@ -54,4 +55,11 @@ code/bench-results/
 
 /packs
 code/.nx/cache
-!**/fixtures/**/yarn.lock
+code/.nx/workspace-data
+code/.vite-inspect
+.nx/cache
+.nx/workspace-data
+!**/fixtures/**/yarn.lock
+code/core/report
+
+*storybook.log

.nvmrc

@@ -1 +1 @@
-18.19.1
+22.6.0

.vscode/settings.json

@@ -24,14 +24,7 @@
   "eslint.options": {
     "cache": true,
     "cacheLocation": ".cache/eslint",
-    "extensions": [
-      ".js",
-      ".jsx",
-      ".mjs",
-      ".json",
-      ".ts",
-      ".tsx"
-    ]
+    "extensions": [".js", ".jsx", ".mjs", ".json", ".ts", ".tsx"]
   },
   "eslint.useESLintClass": true,
   "eslint.validate": [
@@ -42,10 +35,7 @@
     "typescript",
     "typescriptreact"
   ],
-  "eslint.workingDirectories": [
-    "./code",
-    "./scripts"
-  ],
+  "eslint.workingDirectories": ["./code", "./scripts"],
   "files.associations": {
     "*.js": "javascriptreact"
   },
@@ -59,5 +49,6 @@
   "typescript.preferences.preferTypeOnlyAutoImports": true,
   "typescript.preferences.quoteStyle": "single",
   "typescript.preferGoToSourceDefinition": true,
-  "typescript.tsdk": "./code/node_modules/typescript/lib"
-}
+  "typescript.tsdk": "./code/node_modules/typescript/lib",
+  "vitest.workspaceConfig": "./code/vitest.workspace.ts"
+}