Merge pull request #27162 from storybookjs/version-patch-from-8.1.1

Release: Merge patches to `main` (without version bump)

.github/workflows/publish.yml

@@ -154,18 +154,6 @@ jobs:
           git merge ${{ github.ref_name }}
           git push origin ${{ steps.target.outputs.target }}
 
-      - name: Ensure `next` is a minor version ahead of `main`
-        if: steps.target.outputs.target == 'main'
-        run: |
-          git checkout next
-          git pull
-
-          yarn release:ensure-next-ahead --main-version "${{ steps.version.outputs.current-version }}"
-
-          git add ..
-          git diff --staged --quiet || git commit -m "Bump next to be one minor ahead of main [skip ci]"
-          git push origin next
-
       - name: Sync CHANGELOG.md from `main` to `next`
         if: steps.target.outputs.target == 'main'
         working-directory: .

code/addons/docs/docs/docspage.md

@@ -165,8 +165,8 @@ You can override this default behavior in `.storybook/preview.js` (or in any of
 ```js
 export const parameters = {
   docs: {
-    source: {
-      state: 'open',
+    canvas: {
+      sourceState: 'shown',
     },
   },
 };

docs/api/portable-stories-playwright.md

@@ -1,5 +1,5 @@
 ---
-title: 'Portable stories in Playwright'
+title: 'Portable stories in Playwright CT'
 ---
 
 export const SUPPORTED_RENDERERS = ['react', 'vue'];
@@ -34,6 +34,8 @@ Normally, Storybook composes a story and its [annotations](#annotations) automat
 
 <Callout variant="warning">
 
+Your project must be using React 18+ to use the portable stories API with Playwright CT.
+
 **Using `Next.js`?** The portable stories API is not yet supported in Next.js with Playwright CT.
 
 <!-- **Using `Next.js`?** Next.js requires specific configuration that is only available in [Jest](./portable-stories-jest.md). The portable stories API is not supported in Next.js with Playwright CT. -->

docs/versions/next.json

@@ -1 +1 @@
-{"version":"8.2.0-alpha.0","info":{"plain":""}}
+{"version":"8.2.0-alpha.1","info":{"plain":"- CLI: Add optional `--dev` and `--no-dev` options to `storybook init` CLI - [#26918](https://github.com/storybookjs/storybook/pull/26918), thanks @fastfrwrd!\n- CLI: Include `@storybook/addon-svelte-csf` when initializing new projects - [#27070](https://github.com/storybookjs/storybook/pull/27070), thanks @benmccann!\n- Dependency: Upgrade `webpack-virtual-modules` to 0.6.0 - [#27102](https://github.com/storybookjs/storybook/pull/27102), thanks @fyodorovandrei!\n- Dependency: bump `markdown-to-jsx` to v7.4.5 - [#26694](https://github.com/storybookjs/storybook/pull/26694), thanks @xyy94813!\n- Docgen: Only add react-docgen info when a component is defined in the file - [#26967](https://github.com/storybookjs/storybook/pull/26967), thanks @glenjamin!\n- Docs: Fix MDX Stories block tag-filtering behavior - [#27144](https://github.com/storybookjs/storybook/pull/27144), thanks @shilman!\n- Docs: Fix Subtitle block when no `of` prop passed - [#27147](https://github.com/storybookjs/storybook/pull/27147), thanks @JReinhold!\n- Next.js: Add typing for NextImage to main framework options type - [#27105](https://github.com/storybookjs/storybook/pull/27105), thanks @valentinpalkovic!\n- Next.js: Avoid conflicts with the raw loader - [#27093](https://github.com/storybookjs/storybook/pull/27093), thanks @seanparmelee!\n- Types: Fix typing for main.framework/builder fields - [#27088](https://github.com/storybookjs/storybook/pull/27088), thanks @valentinpalkovic!"}}

docs/writing-stories/mocking-modules.md

@@ -95,6 +95,16 @@ import { getUserFromSession } from '#lib/session';
 // ... rest of the file
 ```
 
+<Callout variant="info">
+
+Subpath imports will only be correctly resolved and typed when the [`moduleResolution` property](https://www.typescriptlang.org/tsconfig/#moduleResolution) is set to `'Bundler'`, `'NodeNext'`, or `'Node16'` in your TypeScript configuration.
+
+If you are currently using `'node'`, that is intended for projects using a Node.js version older than v10. Projects written with modern code likely do not need to use `'node'`.
+
+Storybook recommends the [TSConfig Cheat Sheet](https://www.totaltypescript.com/tsconfig-cheat-sheet) for guidance on setting up your TypeScript configuration.
+
+</Callout>
+
 ## Builder aliases
 
 If your project is unable to use [subpath imports](#subpath-imports), you can configure your Storybook builder to alias the module to the mock file. This will instruct the builder to replace the module with the mock file when bundling your Storybook stories.

scripts/package.json

@@ -19,7 +19,6 @@
     "local-registry": "node --loader esbuild-register/loader -r esbuild-register ./run-registry.ts",
     "publish": "node --loader esbuild-register/loader -r esbuild-register ./sandbox/publish.ts",
     "release:cancel-preparation-runs": "node --loader esbuild-register/loader -r esbuild-register ./release/cancel-preparation-runs.ts",
-    "release:ensure-next-ahead": "node --loader esbuild-register/loader -r esbuild-register ./release/ensure-next-ahead.ts",
     "release:generate-pr-description": "node --loader esbuild-register/loader -r esbuild-register ./release/generate-pr-description.ts",
     "release:get-changelog-from-file": "node --loader esbuild-register/loader -r esbuild-register ./release/get-changelog-from-file.ts",
     "release:get-current-version": "node --loader esbuild-register/loader -r esbuild-register ./release/get-current-version.ts",