From 13e5f66b02e6d23ce9208466fbad2209110f4ea5 Mon Sep 17 00:00:00 2001
From: Steve Dodier-Lazaro <sidnioulz@gmail.com>
Date: Fri, 3 Oct 2025 14:15:21 +0200
Subject: [PATCH 01/14] Ensure prettier passes on code

---
 code/.prettierignore                          |  5 ++-
 code/frameworks/angular/build-schema.json     | 32 ++++---------------
 code/frameworks/angular/start-schema.json     | 32 ++++---------------
 .../template/cli/page.stories.yaml            | 10 +++---
 code/frameworks/sveltekit/tsconfig.json       |  2 +-
 .../eslint-plugin/docs/rules/no-stories-of.md |  1 -
 6 files changed, 24 insertions(+), 58 deletions(-)

diff --git a/code/.prettierignore b/code/.prettierignore
index a66b6e6cf489..837d44fc9c8a 100644
--- a/code/.prettierignore
+++ b/code/.prettierignore
@@ -7,4 +7,7 @@ bench
 /.nx/cache
 core/report
 
-/.nx/workspace-data
\ No newline at end of file
+/.nx/workspace-data
+
+# This file contains imports with an order that must be preserved.
+core/src/core-server/presets/common-manager.ts
\ No newline at end of file
diff --git a/code/frameworks/angular/build-schema.json b/code/frameworks/angular/build-schema.json
index 12e9e2af7ebe..9753db540f2d 100644
--- a/code/frameworks/angular/build-schema.json
+++ b/code/frameworks/angular/build-schema.json
@@ -67,27 +67,18 @@
     "compodocArgs": {
       "type": "array",
       "description": "Compodoc options : https://compodoc.app/guides/options.html. Options `-p` with tsconfig path and `-d` with workspace root is always given.",
-      "default": [
-        "-e",
-        "json"
-      ],
+      "default": ["-e", "json"],
       "items": {
         "type": "string"
       }
     },
     "webpackStatsJson": {
-      "type": [
-        "boolean",
-        "string"
-      ],
+      "type": ["boolean", "string"],
       "description": "Write Webpack Stats JSON to disk",
       "default": false
     },
     "statsJson": {
-      "type": [
-        "boolean",
-        "string"
-      ],
+      "type": ["boolean", "string"],
       "description": "Write stats JSON to disk",
       "default": false
     },
@@ -125,10 +116,7 @@
       }
     },
     "sourceMap": {
-      "type": [
-        "boolean",
-        "object"
-      ],
+      "type": ["boolean", "object"],
       "description": "Configure sourcemaps. See: https://angular.io/guide/workspace-config#source-map-configuration",
       "default": false
     },
@@ -170,11 +158,7 @@
             }
           },
           "additionalProperties": false,
-          "required": [
-            "glob",
-            "input",
-            "output"
-          ]
+          "required": ["glob", "input", "output"]
         },
         {
           "type": "string"
@@ -202,9 +186,7 @@
             }
           },
           "additionalProperties": false,
-          "required": [
-            "input"
-          ]
+          "required": ["input"]
         },
         {
           "type": "string",
@@ -213,4 +195,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/code/frameworks/angular/start-schema.json b/code/frameworks/angular/start-schema.json
index 7befb6f8b727..84d6bd80861b 100644
--- a/code/frameworks/angular/start-schema.json
+++ b/code/frameworks/angular/start-schema.json
@@ -93,10 +93,7 @@
     "compodocArgs": {
       "type": "array",
       "description": "Compodoc options : https://compodoc.app/guides/options.html. Options `-p` with tsconfig path and `-d` with workspace root is always given.",
-      "default": [
-        "-e",
-        "json"
-      ],
+      "default": ["-e", "json"],
       "items": {
         "type": "string"
       }
@@ -135,18 +132,12 @@
       "description": "URL path to be appended when visiting Storybook for the first time"
     },
     "webpackStatsJson": {
-      "type": [
-        "boolean",
-        "string"
-      ],
+      "type": ["boolean", "string"],
       "description": "Write Webpack Stats JSON to disk",
       "default": false
     },
     "statsJson": {
-      "type": [
-        "boolean",
-        "string"
-      ],
+      "type": ["boolean", "string"],
       "description": "Write stats JSON to disk",
       "default": false
     },
@@ -160,10 +151,7 @@
       "pattern": "(silly|verbose|info|warn|silent)"
     },
     "sourceMap": {
-      "type": [
-        "boolean",
-        "object"
-      ],
+      "type": ["boolean", "object"],
       "description": "Configure sourcemaps. See: https://angular.io/guide/workspace-config#source-map-configuration",
       "default": false
     },
@@ -205,11 +193,7 @@
             }
           },
           "additionalProperties": false,
-          "required": [
-            "glob",
-            "input",
-            "output"
-          ]
+          "required": ["glob", "input", "output"]
         },
         {
           "type": "string"
@@ -237,9 +221,7 @@
             }
           },
           "additionalProperties": false,
-          "required": [
-            "input"
-          ]
+          "required": ["input"]
         },
         {
           "type": "string",
@@ -248,4 +230,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/code/frameworks/server-webpack5/template/cli/page.stories.yaml b/code/frameworks/server-webpack5/template/cli/page.stories.yaml
index 08915865c89d..6dcca1651d0a 100644
--- a/code/frameworks/server-webpack5/template/cli/page.stories.yaml
+++ b/code/frameworks/server-webpack5/template/cli/page.stories.yaml
@@ -1,10 +1,10 @@
-title: "Example/Page"
+title: 'Example/Page'
 parameters:
   server:
-    url: "https://storybook-server-demo.netlify.app/api"
-    id: "page"
+    url: 'https://storybook-server-demo.netlify.app/api'
+    id: 'page'
 stories:
-  - name: "LoggedIn"
+  - name: 'LoggedIn'
     args:
       user: {}
-  - name: "LoggedOut"
+  - name: 'LoggedOut'
diff --git a/code/frameworks/sveltekit/tsconfig.json b/code/frameworks/sveltekit/tsconfig.json
index 39029c2ce294..f5ab5afaf6a4 100644
--- a/code/frameworks/sveltekit/tsconfig.json
+++ b/code/frameworks/sveltekit/tsconfig.json
@@ -3,7 +3,7 @@
     "baseUrl": ".",
     "paths": {
       "storybook/internal/*": ["../../lib/cli/core/*"]
-    },
+    }
   },
   "extends": "../../tsconfig.json",
   "include": ["src/**/*"]
diff --git a/code/lib/eslint-plugin/docs/rules/no-stories-of.md b/code/lib/eslint-plugin/docs/rules/no-stories-of.md
index a58f962f43e9..9a8cb23162f5 100644
--- a/code/lib/eslint-plugin/docs/rules/no-stories-of.md
+++ b/code/lib/eslint-plugin/docs/rules/no-stories-of.md
@@ -14,7 +14,6 @@ Examples of **incorrect** code for this rule:
 
 ```js
 import { storiesOf } from '@storybook/react';
-
 import Button from '../components/Button';
 
 storiesOf('Button', module).add('primary', () => <Button primary />);

From 24be579ddc9bdb186de5377d31269960adfb4e20 Mon Sep 17 00:00:00 2001
From: Steve Dodier-Lazaro <sidnioulz@gmail.com>
Date: Fri, 3 Oct 2025 14:24:05 +0200
Subject: [PATCH 02/14] CI: Ensure workflows run only on storybookjs, and add
 fork-only basic checks

---
 .github/workflows/cron-weekly.yml             |  1 +
 .github/workflows/generate-sandboxes.yml      |  2 +
 .github/workflows/handle-release-branches.yml |  1 +
 .../workflows/prepare-non-patch-release.yml   |  1 +
 .github/workflows/prepare-patch-release.yml   |  1 +
 .github/workflows/publish.yml                 |  2 +
 .github/workflows/stale.yml                   |  1 +
 .github/workflows/tests-unit.yml              | 62 ++++++++++++++++++-
 .github/workflows/triage.yml                  |  1 +
 .../workflows/trigger-circle-ci-workflow.yml  |  4 +-
 10 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cron-weekly.yml b/.github/workflows/cron-weekly.yml
index 07026c97fb8a..60d9ba29824e 100644
--- a/.github/workflows/cron-weekly.yml
+++ b/.github/workflows/cron-weekly.yml
@@ -6,6 +6,7 @@ on:
 
 jobs:
   check-links:
+    if: github.repository_owner == 'storybookjs'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/generate-sandboxes.yml b/.github/workflows/generate-sandboxes.yml
index b30b4a7b7f2f..3e86e63c2547 100644
--- a/.github/workflows/generate-sandboxes.yml
+++ b/.github/workflows/generate-sandboxes.yml
@@ -24,6 +24,7 @@ defaults:
 jobs:
   generate-next:
     name: Generate to next
+    if: github.repository_owner == 'storybookjs'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -76,6 +77,7 @@ jobs:
 
   generate-main:
     name: Generate to main
+    if: github.repository_owner == 'storybookjs'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/handle-release-branches.yml b/.github/workflows/handle-release-branches.yml
index 84cebf0aee54..2b8b4922d13e 100644
--- a/.github/workflows/handle-release-branches.yml
+++ b/.github/workflows/handle-release-branches.yml
@@ -5,6 +5,7 @@ on:
 
 jobs:
   branch-checks:
+    if: github.repository_owner == 'storybookjs'
     runs-on: ubuntu-latest
     steps:
       - id: get-branch
diff --git a/.github/workflows/prepare-non-patch-release.yml b/.github/workflows/prepare-non-patch-release.yml
index 7443d0d4df42..d57d6bfc8fc5 100644
--- a/.github/workflows/prepare-non-patch-release.yml
+++ b/.github/workflows/prepare-non-patch-release.yml
@@ -36,6 +36,7 @@ concurrency:
 jobs:
   prepare-non-patch-pull-request:
     name: Prepare non-patch pull request
+    if: github.repository_owner == 'storybookjs'
     runs-on: ubuntu-latest
     environment: Release
     defaults:
diff --git a/.github/workflows/prepare-patch-release.yml b/.github/workflows/prepare-patch-release.yml
index f8012dcb7e69..e8c7d2250154 100644
--- a/.github/workflows/prepare-patch-release.yml
+++ b/.github/workflows/prepare-patch-release.yml
@@ -18,6 +18,7 @@ concurrency:
 jobs:
   prepare-patch-pull-request:
     name: Prepare patch pull request
+    if: github.repository_owner == 'storybookjs'
     runs-on: ubuntu-latest
     environment: Release
     defaults:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 691a9e9c31fe..800056ca139a 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -39,6 +39,7 @@ jobs:
     name: Publish normal version
     runs-on: ubuntu-latest
     if: |
+      github.repository_owner == 'storybookjs' &&
       github.event_name == 'push' &&
       (github.ref_name == 'latest-release' || github.ref_name == 'next-release') &&
       contains(github.event.head_commit.message, '[skip ci]') != true
@@ -221,6 +222,7 @@ jobs:
     name: Publish canary version
     runs-on: ubuntu-latest
     if: |
+      github.repository_owner == 'storybookjs' &&
       (
         github.event_name == 'workflow_dispatch' ||
         (github.event_name == 'pull_request' && endsWith(github.head_ref, 'with-canary-release'))
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index dfedf4d4ca4c..d70dbdd80059 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -6,6 +6,7 @@ on:
 jobs:
   stale:
     runs-on: ubuntu-latest
+    if: github.repository_owner == 'storybookjs'
     steps:
       - uses: actions/stale@v9
         with:
diff --git a/.github/workflows/tests-unit.yml b/.github/workflows/tests-unit.yml
index d3b64ec3b796..7cc0883fbbcf 100644
--- a/.github/workflows/tests-unit.yml
+++ b/.github/workflows/tests-unit.yml
@@ -8,7 +8,7 @@ on:
     types: [opened, synchronize, reopened]
 
 env:
-  NODE_OPTIONS: "--max_old_space_size=4096"
+  NODE_OPTIONS: '--max_old_space_size=4096'
 
 jobs:
   build:
@@ -32,3 +32,63 @@ jobs:
 
       - name: test
         run: yarn test
+
+  # This job is only for forks, so they can get basic checks in without a CircleCI API key
+  linux:
+    name: Core Unit Tests, ubuntu-latest
+    if: github.repository_owner != 'storybookjs'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: Setup Node.js and Install Dependencies
+        uses: ./.github/actions/setup-node-and-install
+        with:
+          install-code-deps: true
+
+      - name: compile
+        run: yarn task --task compile --start-from=compile
+
+      - name: Install Playwright Dependencies
+        run: cd code && yarn exec playwright install chromium --with-deps
+
+      - name: test
+        run: yarn test
+
+  # This job is only for forks, so they can get basic checks in without a CircleCI API key
+  check:
+    name: Core Type Checking
+    if: github.repository_owner != 'storybookjs'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: Setup Node.js and Install Dependencies
+        uses: ./.github/actions/setup-node-and-install
+        with:
+          install-code-deps: true
+
+      - name: check
+        run: yarn task --task check
+
+  # This job is only for forks, so they can get basic checks in without a CircleCI API key
+  prettier:
+    name: Core Formatting
+    if: github.repository_owner != 'storybookjs'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: Setup Node.js and Install Dependencies
+        uses: ./.github/actions/setup-node-and-install
+        with:
+          install-code-deps: true
+
+      - name: prettier
+        run: yarn lint:prettier --check code
diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml
index adf6ad3b9bfc..af45b109da06 100644
--- a/.github/workflows/triage.yml
+++ b/.github/workflows/triage.yml
@@ -15,6 +15,7 @@ permissions:
 jobs:
   triage:
     name: Nissuer
+    if: github.repository_owner == 'storybookjs'
     runs-on: ubuntu-latest
     steps:
       - uses: balazsorban44/nissuer@1.10.0
diff --git a/.github/workflows/trigger-circle-ci-workflow.yml b/.github/workflows/trigger-circle-ci-workflow.yml
index a35a74868f10..967caa5c569c 100644
--- a/.github/workflows/trigger-circle-ci-workflow.yml
+++ b/.github/workflows/trigger-circle-ci-workflow.yml
@@ -16,6 +16,7 @@ concurrency:
 
 jobs:
   get-branch:
+    if: github.repository_owner == 'storybookjs'
     runs-on: ubuntu-latest
     steps:
       - id: get-branch
@@ -37,6 +38,7 @@ jobs:
       branch: ${{ env.branch }}
 
   get-parameters:
+    if: github.repository_owner == 'storybookjs'
     runs-on: ubuntu-latest
     steps:
       - if: github.event_name == 'pull_request_target' && (contains(github.event.pull_request.labels.*.name, 'ci:normal'))
@@ -55,7 +57,7 @@ jobs:
   trigger-circle-ci-workflow:
     runs-on: ubuntu-latest
     needs: [get-branch, get-parameters]
-    if: needs.get-parameters.outputs.workflow != ''
+    if: needs.get-parameters.outputs.workflow != '' && github.repository_owner == 'storybookjs'
     steps:
       - name: Trigger Normal tests
         uses: fjogeleit/http-request-action@v1

From 2f147c7e2d1f7dd4674616ef8a1299fd6eefee9d Mon Sep 17 00:00:00 2001
From: Steve Dodier-Lazaro <sidnioulz@gmail.com>
Date: Fri, 3 Oct 2025 14:40:46 +0200
Subject: [PATCH 03/14] CI: Iterate on fork-only jobs and protect extra jobs

---
 .github/workflows/fork-checks.yml             | 48 +++++++++++++++++++
 .github/workflows/handle-release-branches.yml |  4 +-
 .github/workflows/tests-unit.yml              | 36 --------------
 3 files changed, 50 insertions(+), 38 deletions(-)
 create mode 100644 .github/workflows/fork-checks.yml

diff --git a/.github/workflows/fork-checks.yml b/.github/workflows/fork-checks.yml
new file mode 100644
index 000000000000..4908d5a5e8cf
--- /dev/null
+++ b/.github/workflows/fork-checks.yml
@@ -0,0 +1,48 @@
+name: Fork Checks
+
+on:
+  push:
+    branches:
+      - next
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+env:
+  NODE_OPTIONS: '--max_old_space_size=4096'
+
+jobs:
+  # This job is only for forks, so they can get basic checks in without a CircleCI API key
+  check:
+    name: Core Type Checking
+    if: github.repository_owner != 'storybookjs'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: Setup Node.js and Install Dependencies
+        uses: ./.github/actions/setup-node-and-install
+        with:
+          install-code-deps: true
+
+      - name: check
+        run: yarn task --task check
+
+  # This job is only for forks, so they can get basic checks in without a CircleCI API key
+  prettier:
+    name: Core Formatting
+    if: github.repository_owner != 'storybookjs'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: Setup Node.js and Install Dependencies
+        uses: ./.github/actions/setup-node-and-install
+        with:
+          install-code-deps: true
+
+      - name: prettier
+        run: yarn lint:prettier --check code
diff --git a/.github/workflows/handle-release-branches.yml b/.github/workflows/handle-release-branches.yml
index 2b8b4922d13e..021ed04934ff 100644
--- a/.github/workflows/handle-release-branches.yml
+++ b/.github/workflows/handle-release-branches.yml
@@ -69,7 +69,7 @@ jobs:
       branch: ${{ needs.get-next-release-branch.outputs.branch }}
 
   next-release-branch-check:
-    if: ${{ always() }}
+    if: ${{ always() && github.repository_owner == 'storybookjs' }}
     needs: [branch-checks, get-next-release-branch]
     runs-on: ubuntu-latest
     steps:
@@ -88,7 +88,7 @@ jobs:
       check: ${{ env.is-next-release-branch }}
 
   request-create-frontpage-branch:
-    if: ${{ always() }}
+    if: ${{ always() && github.repository_owner == 'storybookjs' }}
     needs:
       [branch-checks, next-release-branch-check, create-next-release-branch]
     runs-on: ubuntu-latest
diff --git a/.github/workflows/tests-unit.yml b/.github/workflows/tests-unit.yml
index 7cc0883fbbcf..b307213d4204 100644
--- a/.github/workflows/tests-unit.yml
+++ b/.github/workflows/tests-unit.yml
@@ -56,39 +56,3 @@ jobs:
 
       - name: test
         run: yarn test
-
-  # This job is only for forks, so they can get basic checks in without a CircleCI API key
-  check:
-    name: Core Type Checking
-    if: github.repository_owner != 'storybookjs'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
-
-      - name: Setup Node.js and Install Dependencies
-        uses: ./.github/actions/setup-node-and-install
-        with:
-          install-code-deps: true
-
-      - name: check
-        run: yarn task --task check
-
-  # This job is only for forks, so they can get basic checks in without a CircleCI API key
-  prettier:
-    name: Core Formatting
-    if: github.repository_owner != 'storybookjs'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
-
-      - name: Setup Node.js and Install Dependencies
-        uses: ./.github/actions/setup-node-and-install
-        with:
-          install-code-deps: true
-
-      - name: prettier
-        run: yarn lint:prettier --check code

From 12ec9ab0340741941456ac771414746fc39dcd54 Mon Sep 17 00:00:00 2001
From: Steve Dodier-Lazaro <sidnioulz@gmail.com>
Date: Fri, 3 Oct 2025 14:47:12 +0200
Subject: [PATCH 04/14] CI: Fix path to prettier command

---
 .github/workflows/fork-checks.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/fork-checks.yml b/.github/workflows/fork-checks.yml
index 4908d5a5e8cf..5148ac91d7a4 100644
--- a/.github/workflows/fork-checks.yml
+++ b/.github/workflows/fork-checks.yml
@@ -1,4 +1,4 @@
-name: Fork Checks
+name: Fork checks
 
 on:
   push:
@@ -45,4 +45,4 @@ jobs:
           install-code-deps: true
 
       - name: prettier
-        run: yarn lint:prettier --check code
+        run: cd code && yarn lint:prettier --check .

From 006d4272cecd800a8073cd7632623f8b78ed371f Mon Sep 17 00:00:00 2001
From: Steve Dodier-Lazaro <sidnioulz@gmail.com>
Date: Fri, 3 Oct 2025 14:50:42 +0200
Subject: [PATCH 05/14] CI: Fix syntax of logic branch in circleci workflow

---
 .github/workflows/trigger-circle-ci-workflow.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/trigger-circle-ci-workflow.yml b/.github/workflows/trigger-circle-ci-workflow.yml
index 967caa5c569c..2ec4d455972f 100644
--- a/.github/workflows/trigger-circle-ci-workflow.yml
+++ b/.github/workflows/trigger-circle-ci-workflow.yml
@@ -57,7 +57,7 @@ jobs:
   trigger-circle-ci-workflow:
     runs-on: ubuntu-latest
     needs: [get-branch, get-parameters]
-    if: needs.get-parameters.outputs.workflow != '' && github.repository_owner == 'storybookjs'
+    if: ${{ github.repository_owner == 'storybookjs' && needs.get-parameters.outputs.workflow != '' }}
     steps:
       - name: Trigger Normal tests
         uses: fjogeleit/http-request-action@v1

From fc37ed922fc69e7a3bb437ac579e7d543bc4906d Mon Sep 17 00:00:00 2001
From: Steve Dodier-Lazaro <sidnioulz@gmail.com>
Date: Fri, 3 Oct 2025 15:03:55 +0200
Subject: [PATCH 06/14] CI: Rework trigger conditions for fork-only checks

---
 .github/workflows/fork-checks.yml | 2 --
 .github/workflows/tests-unit.yml  | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/fork-checks.yml b/.github/workflows/fork-checks.yml
index 5148ac91d7a4..8803adfa1551 100644
--- a/.github/workflows/fork-checks.yml
+++ b/.github/workflows/fork-checks.yml
@@ -2,8 +2,6 @@ name: Fork checks
 
 on:
   push:
-    branches:
-      - next
   pull_request:
     types: [opened, synchronize, reopened]
 
diff --git a/.github/workflows/tests-unit.yml b/.github/workflows/tests-unit.yml
index b307213d4204..93460b572dc7 100644
--- a/.github/workflows/tests-unit.yml
+++ b/.github/workflows/tests-unit.yml
@@ -2,8 +2,6 @@ name: Unit tests
 
 on:
   push:
-    branches:
-      - next
   pull_request:
     types: [opened, synchronize, reopened]
 
@@ -13,6 +11,8 @@ env:
 jobs:
   build:
     name: Core Unit Tests, windows-latest
+    # Always run on forks, only run on next in our own repo
+    if: ${{ github.repository_owner != 'storybookjs' || github.ref == 'next' }}
     runs-on: windows-11-arm
     steps:
       - uses: actions/checkout@v4

From 0d172c0d29dac5559431e3681eada719752bcc00 Mon Sep 17 00:00:00 2001
From: Steve Dodier-Lazaro <sidnioulz@gmail.com>
Date: Fri, 3 Oct 2025 15:29:38 +0200
Subject: [PATCH 07/14] CI: Separate our unit test jobs from fork jobs

---
 .github/workflows/fork-checks.yml | 50 +++++++++++++++++++++++++++++--
 .github/workflows/tests-unit.yml  | 29 ++----------------
 2 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/fork-checks.yml b/.github/workflows/fork-checks.yml
index 8803adfa1551..8dcc1e5c7e0b 100644
--- a/.github/workflows/fork-checks.yml
+++ b/.github/workflows/fork-checks.yml
@@ -1,5 +1,6 @@
 name: Fork checks
 
+# This workflow is only for forks, so they can get basic checks in without a CircleCI API key
 on:
   push:
   pull_request:
@@ -9,7 +10,6 @@ env:
   NODE_OPTIONS: '--max_old_space_size=4096'
 
 jobs:
-  # This job is only for forks, so they can get basic checks in without a CircleCI API key
   check:
     name: Core Type Checking
     if: github.repository_owner != 'storybookjs'
@@ -27,7 +27,6 @@ jobs:
       - name: check
         run: yarn task --task check
 
-  # This job is only for forks, so they can get basic checks in without a CircleCI API key
   prettier:
     name: Core Formatting
     if: github.repository_owner != 'storybookjs'
@@ -44,3 +43,50 @@ jobs:
 
       - name: prettier
         run: cd code && yarn lint:prettier --check .
+
+  test-windows:
+    name: Core Unit Tests, windows-latest
+    # Dont run windows tests on every commit, that's fairly costly
+    if: github.repository_owner != 'storybookjs' && github.event_name == 'pull_request'
+    runs-on: windows-11-arm
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: Setup Node.js and Install Dependencies
+        uses: ./.github/actions/setup-node-and-install
+        with:
+          install-code-deps: true
+
+      - name: compile
+        run: yarn task --task compile --start-from=compile
+
+      - name: Install Playwright Dependencies
+        run: cd code && yarn exec playwright install chromium --with-deps
+
+      - name: test
+        run: yarn test
+
+  test-ubuntu:
+    name: Core Unit Tests, ubuntu-latest
+    if: github.repository_owner != 'storybookjs'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: Setup Node.js and Install Dependencies
+        uses: ./.github/actions/setup-node-and-install
+        with:
+          install-code-deps: true
+
+      - name: compile
+        run: yarn task --task compile --start-from=compile
+
+      - name: Install Playwright Dependencies
+        run: cd code && yarn exec playwright install chromium --with-deps
+
+      - name: test
+        run: yarn test
diff --git a/.github/workflows/tests-unit.yml b/.github/workflows/tests-unit.yml
index 93460b572dc7..cf48ebae5015 100644
--- a/.github/workflows/tests-unit.yml
+++ b/.github/workflows/tests-unit.yml
@@ -2,6 +2,8 @@ name: Unit tests
 
 on:
   push:
+    branches:
+      - next
   pull_request:
     types: [opened, synchronize, reopened]
 
@@ -11,8 +13,7 @@ env:
 jobs:
   build:
     name: Core Unit Tests, windows-latest
-    # Always run on forks, only run on next in our own repo
-    if: ${{ github.repository_owner != 'storybookjs' || github.ref == 'next' }}
+    if: github.repository_owner == 'storybookjs'
     runs-on: windows-11-arm
     steps:
       - uses: actions/checkout@v4
@@ -32,27 +33,3 @@ jobs:
 
       - name: test
         run: yarn test
-
-  # This job is only for forks, so they can get basic checks in without a CircleCI API key
-  linux:
-    name: Core Unit Tests, ubuntu-latest
-    if: github.repository_owner != 'storybookjs'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
-
-      - name: Setup Node.js and Install Dependencies
-        uses: ./.github/actions/setup-node-and-install
-        with:
-          install-code-deps: true
-
-      - name: compile
-        run: yarn task --task compile --start-from=compile
-
-      - name: Install Playwright Dependencies
-        run: cd code && yarn exec playwright install chromium --with-deps
-
-      - name: test
-        run: yarn test

From bbc93d2df8bd4be099525b92fe5bfd0acb2a93e6 Mon Sep 17 00:00:00 2001
From: Steve Dodier-Lazaro <sidnioulz@gmail.com>
Date: Fri, 3 Oct 2025 15:36:06 +0200
Subject: [PATCH 08/14] CI: Avoid double run on fork checks by skipping PR
 pipelines

---
 .github/workflows/fork-checks.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/fork-checks.yml b/.github/workflows/fork-checks.yml
index 8dcc1e5c7e0b..898f0094a1df 100644
--- a/.github/workflows/fork-checks.yml
+++ b/.github/workflows/fork-checks.yml
@@ -3,8 +3,6 @@ name: Fork checks
 # This workflow is only for forks, so they can get basic checks in without a CircleCI API key
 on:
   push:
-  pull_request:
-    types: [opened, synchronize, reopened]
 
 env:
   NODE_OPTIONS: '--max_old_space_size=4096'
@@ -46,8 +44,7 @@ jobs:
 
   test-windows:
     name: Core Unit Tests, windows-latest
-    # Dont run windows tests on every commit, that's fairly costly
-    if: github.repository_owner != 'storybookjs' && github.event_name == 'pull_request'
+    if: github.repository_owner != 'storybookjs'
     runs-on: windows-11-arm
     steps:
       - uses: actions/checkout@v4

From 5a55a1f24300fb8efdd6115f3c8697f3b6590d9f Mon Sep 17 00:00:00 2001
From: Steve Dodier-Lazaro <sidnioulz@gmail.com>
Date: Fri, 3 Oct 2025 15:48:20 +0200
Subject: [PATCH 09/14] Docs: Remove mention of disabling CI in forks

---
 CONTRIBUTING.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1d8db751182a..7e67e8c7238a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -129,7 +129,9 @@ Here's a highlight of notable directories and files:
 
 ### Fork the repository 
 
-If you plan to contribute to Storybook's codebase, you should fork the repository to your GitHub account. This will allow you to make changes to the codebase and submit a pull request to the main repository when you're ready to contribute your changes. Once you've forked the repository, you should [disable Github Actions for your forked repository](https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository) as most of them (e.g., pushing to sandbox) will fail without proper authorization. In your forked repository, go to Settings > Actions > General > set the Actions Permissions to **Disable actions**. Additionally, adding our codebase as upstream ensures you can rebase against the latest changes in the main repository. To do this, run the following commands:
+If you plan to contribute to Storybook's codebase, you should fork the repository to your GitHub account. This will allow you to make changes to the codebase and submit a pull request to the main repository when you're ready to contribute your changes.
+
+Additionally, adding our codebase as upstream ensures you can rebase against the latest changes in the main repository. To do this, run the following commands:
 
 ```shell
 git remote add upstream https://github.com/storybookjs/storybook.git

From aaf43f589902586d5521fdad503ed293c0babb49 Mon Sep 17 00:00:00 2001
From: Steve Dodier-Lazaro <sidnioulz@gmail.com>
Date: Mon, 6 Oct 2025 09:49:19 +0200
Subject: [PATCH 10/14] Core: Have prettier ignore MD file with unstable
 whitespace

---
 code/.prettierignore                               | 5 ++++-
 code/lib/eslint-plugin/docs/rules/no-stories-of.md | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/.prettierignore b/code/.prettierignore
index 837d44fc9c8a..6f24e6a798d8 100644
--- a/code/.prettierignore
+++ b/code/.prettierignore
@@ -10,4 +10,7 @@ core/report
 /.nx/workspace-data
 
 # This file contains imports with an order that must be preserved.
-core/src/core-server/presets/common-manager.ts
\ No newline at end of file
+core/src/core-server/presets/common-manager.ts
+
+# This file is modified by build/check, causing errors when changed in CI jobs.
+lib/eslint-plugin/docs/rules/no-stories-of.md
\ No newline at end of file
diff --git a/code/lib/eslint-plugin/docs/rules/no-stories-of.md b/code/lib/eslint-plugin/docs/rules/no-stories-of.md
index 9a8cb23162f5..a58f962f43e9 100644
--- a/code/lib/eslint-plugin/docs/rules/no-stories-of.md
+++ b/code/lib/eslint-plugin/docs/rules/no-stories-of.md
@@ -14,6 +14,7 @@ Examples of **incorrect** code for this rule:
 
 ```js
 import { storiesOf } from '@storybook/react';
+
 import Button from '../components/Button';
 
 storiesOf('Button', module).add('primary', () => <Button primary />);

From 56b4955da1a607fd86655fae17529354ef60d185 Mon Sep 17 00:00:00 2001
From: Steve Dodier-Lazaro <sidnioulz@gmail.com>
Date: Mon, 6 Oct 2025 09:50:20 +0200
Subject: [PATCH 11/14] CI: Run fork Windows job on public runner

---
 .github/workflows/fork-checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/fork-checks.yml b/.github/workflows/fork-checks.yml
index 898f0094a1df..41a771161d98 100644
--- a/.github/workflows/fork-checks.yml
+++ b/.github/workflows/fork-checks.yml
@@ -45,7 +45,7 @@ jobs:
   test-windows:
     name: Core Unit Tests, windows-latest
     if: github.repository_owner != 'storybookjs'
-    runs-on: windows-11-arm
+    runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
         with:

From c367d7e47d67263087bb0b7d1a686999b35bb541 Mon Sep 17 00:00:00 2001
From: Steve Dodier-Lazaro <sidnioulz@gmail.com>
Date: Mon, 6 Oct 2025 10:20:23 +0200
Subject: [PATCH 12/14] Core: Remove prettier disable guards on prettierignored
 file

---
 code/core/src/core-server/presets/common-manager.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/code/core/src/core-server/presets/common-manager.ts b/code/core/src/core-server/presets/common-manager.ts
index 66b87c66277d..563443222ac3 100644
--- a/code/core/src/core-server/presets/common-manager.ts
+++ b/code/core/src/core-server/presets/common-manager.ts
@@ -3,7 +3,6 @@ import { global } from '@storybook/global';
 
 import { addons } from 'storybook/manager-api';
 
-/* eslint-disable prettier/prettier */
 // THE ORDER OF THESE IMPORTS MATTERS! IT DEFINES THE ORDER OF PANELS AND TOOLS!
 import controlsManager from '../../controls/manager';
 import actionsManager from '../../actions/manager';
@@ -12,7 +11,6 @@ import backgroundsManager from '../../backgrounds/manager';
 import measureManager from '../../measure/manager';
 import outlineManager from '../../outline/manager';
 import viewportManager from '../../viewport/manager';
-/* eslint-enable prettier/prettier */
 
 const TAG_FILTERS = 'tag-filters';
 const STATIC_FILTER = 'static-filter';

From eece31d18474cb80fb2e0b470add6c9d32d4af39 Mon Sep 17 00:00:00 2001
From: Steve Dodier-Lazaro <Sidnioulz@users.noreply.github.com>
Date: Mon, 6 Oct 2025 20:01:06 +0200
Subject: [PATCH 13/14] CI: Align syntax with other files in
 trigger-circle-ci-workflow.yml

---
 .github/workflows/trigger-circle-ci-workflow.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/trigger-circle-ci-workflow.yml b/.github/workflows/trigger-circle-ci-workflow.yml
index 2ec4d455972f..7b1cedda19f1 100644
--- a/.github/workflows/trigger-circle-ci-workflow.yml
+++ b/.github/workflows/trigger-circle-ci-workflow.yml
@@ -57,7 +57,7 @@ jobs:
   trigger-circle-ci-workflow:
     runs-on: ubuntu-latest
     needs: [get-branch, get-parameters]
-    if: ${{ github.repository_owner == 'storybookjs' && needs.get-parameters.outputs.workflow != '' }}
+    if: github.repository_owner == 'storybookjs' && needs.get-parameters.outputs.workflow != ''
     steps:
       - name: Trigger Normal tests
         uses: fjogeleit/http-request-action@v1

From 79cac23dd30acef83a338bd69b6ed5116743b62e Mon Sep 17 00:00:00 2001
From: Steve Dodier-Lazaro <sidnioulz@gmail.com>
Date: Mon, 20 Oct 2025 09:31:48 +0200
Subject: [PATCH 14/14] CI: Factorise fork test jobs

---
 .github/workflows/fork-checks.yml | 32 ++++++-------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/fork-checks.yml b/.github/workflows/fork-checks.yml
index 41a771161d98..a8a33580f1f1 100644
--- a/.github/workflows/fork-checks.yml
+++ b/.github/workflows/fork-checks.yml
@@ -42,33 +42,13 @@ jobs:
       - name: prettier
         run: cd code && yarn lint:prettier --check .
 
-  test-windows:
-    name: Core Unit Tests, windows-latest
+  test:
+    strategy:
+      matrix:
+        os: [windows-latest, ubuntu-latest]
+    runs-on: ${{ matrix.os }}
+    name: Core Unit Tests, ${{ matrix.os }}
     if: github.repository_owner != 'storybookjs'
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
-
-      - name: Setup Node.js and Install Dependencies
-        uses: ./.github/actions/setup-node-and-install
-        with:
-          install-code-deps: true
-
-      - name: compile
-        run: yarn task --task compile --start-from=compile
-
-      - name: Install Playwright Dependencies
-        run: cd code && yarn exec playwright install chromium --with-deps
-
-      - name: test
-        run: yarn test
-
-  test-ubuntu:
-    name: Core Unit Tests, ubuntu-latest
-    if: github.repository_owner != 'storybookjs'
-    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with: