Merge branch 'next' into marklb/fix-csp-error-in-a11y-addon

storybookjs · Oct 27, 2023 · 55eccb3 · 55eccb3
2 parents c80c4a2 + 1b0ca54
commit 55eccb3
Show file tree

Hide file tree

Showing 238 changed files with 14,494 additions and 12,665 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -84,23 +84,23 @@ commands:
 jobs:
   pretty-docs:
     executor:
-      class: small
+      class: medium
       name: sb_node_16_classic
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: '--depth 1 --verbose'
       - restore_cache:
           name: Restore Yarn cache
           keys:
-            - prettydocs-yarn-2-cache-v4--{{ checksum "code/yarn.lock" }}--{{ checksum "scripts/yarn.lock" }}
+            - prettydocs-yarn-2-cache-v7--{{ 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-v4--{{ checksum "code/yarn.lock" }}--{{ checksum "scripts/yarn.lock" }}
+          key: prettydocs-yarn-2-cache-v7--{{ checksum "code/yarn.lock" }}--{{ checksum "scripts/yarn.lock" }}
           paths:
             - ~/.yarn/berry/cache
       - run:
@@ -499,11 +499,11 @@ workflows:
           requires:
             - unit-tests
       - create-sandboxes:
-          parallelism: 12
+          parallelism: 14
           requires:
             - build
       - build-sandboxes:
-          parallelism: 12
+          parallelism: 14
           requires:
             - create-sandboxes
       - chromatic-sandboxes:
@@ -523,7 +523,7 @@ workflows:
           requires:
             - build-sandboxes
       - bench:
-          parallelism: 3
+          parallelism: 5
           requires:
             - build-sandboxes
       # TODO: reenable once we find out the source of flakyness
@@ -555,11 +555,11 @@ workflows:
           requires:
             - unit-tests
       - create-sandboxes:
-          parallelism: 21
+          parallelism: 23
           requires:
             - build
       - build-sandboxes:
-          parallelism: 21
+          parallelism: 23
           requires:
             - create-sandboxes
       - chromatic-sandboxes:
@@ -579,7 +579,7 @@ workflows:
           requires:
             - build-sandboxes
       - bench:
-          parallelism: 3
+          parallelism: 5
           requires:
             - build-sandboxes
       # TODO: reenable once we find out the source of flakyness
@@ -609,14 +609,14 @@ workflows:
           requires:
             - build
       - create-sandboxes:
-          parallelism: 36
+          parallelism: 38
           requires:
             - build
       # - smoke-test-sandboxes: # disabled for now
       #     requires:
       #       - create-sandboxes
       - build-sandboxes:
-          parallelism: 36
+          parallelism: 38
           requires:
             - create-sandboxes
       - chromatic-sandboxes:
@@ -640,3 +640,4 @@ workflows:
       #     parallelism: 4
       #     requires:
       #       - create-sandboxes
+
diff --git a/.github/workflows/prepare-non-patch-release.yml b/.github/workflows/prepare-non-patch-release.yml
@@ -93,13 +93,14 @@ jobs:
         run: git fetch --tags origin
 
       - name: Check for unreleased changes
+        if: github.event_name != 'workflow_dispatch'
         id: unreleased-changes
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: yarn release:unreleased-changes-exists
 
       - name: Cancel when no release necessary
-        if: steps.unreleased-changes.outputs.has-changes-to-release == 'false'
+        if: steps.unreleased-changes.outputs.has-changes-to-release == 'false' && github.event_name != 'workflow_dispatch'
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         # From https://stackoverflow.com/a/75809743
@@ -114,7 +115,7 @@ jobs:
 
       - name: Check release vs prerelease
         id: is-prerelease
-        run: yarn release:is-prerelease
+        run: yarn release:is-prerelease ${{ steps.bump-version.outputs.next-version }} --verbose
 
       - name: Write changelog
         env:
@@ -143,6 +144,7 @@ jobs:
           git checkout --ours .
           git add .
           git commit --no-verify -m "Merge latest-release into version-non-patch-from-${{ steps.bump-version.outputs.current-version }} with conflicts resolved to ours [skip ci]"
+          git push origin version-non-patch-from-${{ steps.bump-version.outputs.current-version }}
 
       - name: Generate PR description
         id: description

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -98,7 +98,7 @@ jobs:
       - name: Check release vs prerelease
         if: steps.publish-needed.outputs.published == 'false'
         id: is-prerelease
-        run: yarn release:is-prerelease
+        run: yarn release:is-prerelease ${{ steps.version.outputs.current-version }} --verbose
 
       - name: Install code dependencies
         if: steps.publish-needed.outputs.published == 'false'

diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,7 @@ test-results
 !/**/.yarn/plugins
 !/**/.yarn/sdks
 !/**/.yarn/versions
+!/**/.yarn/patches
 /**/.pnp.*
 !/node_modules
 

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-18.18
+18.18.2
diff --git a/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs b/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
diff --git a/.yarn/releases/yarn-3.5.1.cjs b/.yarn/releases/yarn-3.5.1.cjs
diff --git a/.yarn/releases/yarn-4.0.0.cjs b/.yarn/releases/yarn-4.0.0.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1,11 +1,11 @@
+compressionLevel: mixed
+
+enableGlobalCache: false
+
 installStatePath: ./.yarn/root-install-state.gz
 
 nodeLinker: node-modules
 
 npmPublishAccess: public
 
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: "@yarnpkg/plugin-workspace-tools"
-
-yarnPath: .yarn/releases/yarn-3.5.1.cjs
+yarnPath: .yarn/releases/yarn-4.0.0.cjs
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,52 @@
+## 7.5.0
+
+Storybook 7.5 enhances your Storybook experience with several key updates:
+
+- 💃🏼 Now supports Lit 3.0 and Vite 5
+- 👻 storiesOf and storyStoreV6 officially deprecated
+- 🔨 Fix Webpack5 build errors not being propagated
+- 🀄 Support rename font import for Next.js
+- ⬆️ Upgrade react-docgen to 6.0.x and improve argTypes
+- ✨ Many Angular improvements such as introducing argsToTemplate , new schema debugging options, support for standalone directives, etc.
+<details>
+  <summary>
+    List of all updates
+  </summary>
+
+- Angular: Introduce argsToTemplate for property and event Bindings - [#24434](/~https://github.com/storybookjs/storybook/pull/24434), thanks [@valentinpalkovic](/~https://github.com/valentinpalkovic)!
+- Angular: Add schema options (debugWebpack, webpackStatsJson, and more) - [#24388](/~https://github.com/storybookjs/storybook/pull/24388), thanks [@yannbf](/~https://github.com/yannbf)!
+- Angular: Categorize legacy build options error - [#24014](/~https://github.com/storybookjs/storybook/pull/24014), thanks [@yannbf](/~https://github.com/yannbf)!
+- Angular: Fix Angular 15 support and add zone.js v0.14.x support - [#24367](/~https://github.com/storybookjs/storybook/pull/24367), thanks [@valentinpalkovic](/~https://github.com/valentinpalkovic)!
+- Angular: Allow loading standalone directives - [#24448](/~https://github.com/storybookjs/storybook/pull/24448), thanks [@osnoser1](/~https://github.com/osnoser1)!
+- CLI: Inform the user how to dedupe and strip color from info command - [#24087](/~https://github.com/storybookjs/storybook/pull/24087), thanks [@kasperpeulen](/~https://github.com/kasperpeulen)!
+- CLI: Add more information to storybook info command - [#24003](/~https://github.com/storybookjs/storybook/pull/24003), thanks [@JReinhold](/~https://github.com/JReinhold)!
+- CLI: Change /Date$/ to /Dates$/i - [#24195](/~https://github.com/storybookjs/storybook/pull/24195), thanks [@arup1221](/~https://github.com/arup1221)!
+- CLI: Improve sanitization logic in crash reports - [#24028](/~https://github.com/storybookjs/storybook/pull/24028), thanks [@yannbf](/~https://github.com/yannbf)!
+- CLI: Remove random commas in storybook upgrade logs - [#22333](/~https://github.com/storybookjs/storybook/pull/22333), thanks [@joaonunomota](/~https://github.com/joaonunomota)!
+- Controls: Fix select / multiselect when value contains multiple spaces - [#22334](/~https://github.com/storybookjs/storybook/pull/22334), thanks [@oxcened](/~https://github.com/oxcened)!
+- Core: Add class name to Storybook error name - [#24371](/~https://github.com/storybookjs/storybook/pull/24371), thanks [@yannbf](/~https://github.com/yannbf)!
+- Core: Deprecate storyStoreV6 (including storiesOf) and storyIndexers - [#23938](/~https://github.com/storybookjs/storybook/pull/23938), thanks [@JReinhold](/~https://github.com/JReinhold)!
+- Doc Blocks: Add title to Meta prop types - [#23370](/~https://github.com/storybookjs/storybook/pull/23370), thanks [@iqbalcodes6602](/~https://github.com/iqbalcodes6602)!
+- ManagerAPI: Fix bug with story redirection when URL has partial storyId - [#24345](/~https://github.com/storybookjs/storybook/pull/24345), thanks [@ndelangen](/~https://github.com/ndelangen)!
+- NextJS: Support rename font import - [#24406](/~https://github.com/storybookjs/storybook/pull/24406), thanks [@yoshi2no](/~https://github.com/yoshi2no)!
+- NextJS: Change babel plugins from proposal-... to transform-... - [#24290](/~https://github.com/storybookjs/storybook/pull/24290), thanks [@roottool](/~https://github.com/roottool)!
+- NextJS: Fix default next image loader when src has params - [#24187](/~https://github.com/storybookjs/storybook/pull/24187), thanks [@json-betsec](/~https://github.com/json-betsec)!
+- NextJS: Fix Image Context re-use via singleton - [#24146](/~https://github.com/storybookjs/storybook/pull/24146), thanks [@martinnabhan](/~https://github.com/martinnabhan)!
+- NextJS: Improve support for Windows-style paths - [#23695](/~https://github.com/storybookjs/storybook/pull/23695), thanks [@T99](/~https://github.com/T99)!
+- React: Upgrade `react-docgen` to `6.0.x` and improve argTypes - [#23825](/~https://github.com/storybookjs/storybook/pull/23825), thanks [@shilman](/~https://github.com/shilman)!
+- Svelte: Fix docs generating when using `lang="ts"` or optional chaining - [#24096](/~https://github.com/storybookjs/storybook/pull/24096), thanks [@j3rem1e](/~https://github.com/j3rem1e)!
+- UI: Filter some manager errors - [#24217](/~https://github.com/storybookjs/storybook/pull/24217), thanks [@yannbf](/~https://github.com/yannbf)!
+- UI: Update ScrollArea with radix - [#24413](/~https://github.com/storybookjs/storybook/pull/24413), thanks [@cdedreuille](/~https://github.com/cdedreuille)!
+- UI: Improve contrast ratio between focus / hover - [#24205](/~https://github.com/storybookjs/storybook/pull/24205), thanks [@chocoscoding](/~https://github.com/chocoscoding)!
+- UI: Fix className missing in syntaxhighlighter - [#24491](/~https://github.com/storybookjs/storybook/pull/24491), thanks [@ndelangen](/~https://github.com/ndelangen)!
+- Vite: Move mdx-plugin from `@storybook/builder-vite` to `@storybook/addon-docs` - [#24166](/~https://github.com/storybookjs/storybook/pull/24166), thanks [@bryanjtc](/~https://github.com/bryanjtc)!
+- Vite: Support Vite 5 - [#24395](/~https://github.com/storybookjs/storybook/pull/24395), thanks [@IanVS](/~https://github.com/IanVS)!
+- Web-components: Add Lit3 support - [#24437](/~https://github.com/storybookjs/storybook/pull/24437), thanks [@shilman](/~https://github.com/shilman)!
+- Webpack: Display errors on build - [#24377](/~https://github.com/storybookjs/storybook/pull/24377), thanks [@yannbf](/~https://github.com/yannbf)!
+- Webpack: Categorize builder error - [#24031](/~https://github.com/storybookjs/storybook/pull/24031), thanks [@yannbf](/~https://github.com/yannbf)!
+- Webpack: Use logger.warn on warnings - [#24472](/~https://github.com/storybookjs/storybook/pull/24472), thanks [@yannbf](/~https://github.com/yannbf)!
+</details>
+
 ## 7.4.6
 
 - CLI: Fix Nextjs project detection - [#24346](/~https://github.com/storybookjs/storybook/pull/24346), thanks [@yannbf](/~https://github.com/yannbf)!

diff --git a/CHANGELOG.prerelease.md b/CHANGELOG.prerelease.md
@@ -1,3 +1,23 @@
+## 7.6.0-alpha.2
+
+- Actions: Fix missing crypto module crashing React Native - [#24546](/~https://github.com/storybookjs/storybook/pull/24546), thanks [@dannyhw](/~https://github.com/dannyhw)!
+- Core: Fix post message channel location.search access for React Native - [#24545](/~https://github.com/storybookjs/storybook/pull/24545), thanks [@dannyhw](/~https://github.com/dannyhw)!
+- ManagerBuilder: Fix `"type": "commonjs"` compatibility - [#24534](/~https://github.com/storybookjs/storybook/pull/24534), thanks [@ndelangen](/~https://github.com/ndelangen)!
+- React: Upgrade `react-docgen` to v7 - [#24530](/~https://github.com/storybookjs/storybook/pull/24530), thanks [@shilman](/~https://github.com/shilman)!
+
+## 7.6.0-alpha.1
+
+- Angular: Add source-map option to builder - [#24466](/~https://github.com/storybookjs/storybook/pull/24466), thanks [@valentinpalkovic](/~https://github.com/valentinpalkovic)!
+- Angular: update wrong type for webpackStatsJson in start-storybook schema.json - [#24494](/~https://github.com/storybookjs/storybook/pull/24494), thanks [@LucaVazz](/~https://github.com/LucaVazz)!
+- CLI: Add @storybook/addon-designs to non-core list - [#24507](/~https://github.com/storybookjs/storybook/pull/24507), thanks [@yannbf](/~https://github.com/yannbf)!
+- Doc Blocks: Add support for `of` prop to `Primary` block - [#23849](/~https://github.com/storybookjs/storybook/pull/23849), thanks [@Wilson2k](/~https://github.com/Wilson2k)!
+- Doc Blocks: Remove `defaultProps` in `Stories` block - [#24506](/~https://github.com/storybookjs/storybook/pull/24506), thanks [@WouterK12](/~https://github.com/WouterK12)!
+- Themes: Run postinstall in shell for windows - [#24389](/~https://github.com/storybookjs/storybook/pull/24389), thanks [@Integrayshaun](/~https://github.com/Integrayshaun)!
+
+## 7.6.0-alpha.0
+
+Empty release identical to `7.5.0`.
+
 ## 7.5.0-alpha.7
 
 - Angular: Allow loading standalone directives - [#24448](/~https://github.com/storybookjs/storybook/pull/24448), thanks [@osnoser1](/~https://github.com/osnoser1)!
@@ -122,7 +142,7 @@
 - Publish: Don't distribute src files or unnecessary template files - [#23853](/~https://github.com/storybookjs/storybook/pull/23853), thanks [@shilman](/~https://github.com/shilman)!
 - UI: Add an experimental API for adding sidebar filter functions at runtime - [#23722](/~https://github.com/storybookjs/storybook/pull/23722), thanks [@ndelangen](/~https://github.com/ndelangen)!
 - UI: Removal of experimental components - [#23907](/~https://github.com/storybookjs/storybook/pull/23907), thanks [@ndelangen](/~https://github.com/ndelangen)!
-- Vue3: Add support for  Global Apps install - [#23772](/~https://github.com/storybookjs/storybook/pull/23772), thanks [@chakAs3](/~https://github.com/chakAs3)!
+- Vue3: Add support for Global Apps install - [#23772](/~https://github.com/storybookjs/storybook/pull/23772), thanks [@chakAs3](/~https://github.com/chakAs3)!
 - Vue3: Use slot value directly if it's a string in source decorator - [#23784](/~https://github.com/storybookjs/storybook/pull/23784), thanks [@nasvillanueva](/~https://github.com/nasvillanueva)!
 
 ## 7.4.0-alpha.0

diff --git a/CONTRIBUTING/RELEASING.md b/CONTRIBUTING/RELEASING.md
@@ -476,7 +476,7 @@ No process is defined for this.
 
 ### Merges to `main` without versioning
 
-As described in more details in [the Patch Releases section](#patch-releases), there are scenarios where you want to patch [unreleasable](#which-changes-are-considered-releasable-and-what-does-it-mean) content back to `main` without bumping versions or publishing a new release. This happens automatically as long as all the unpicked patch pull requests have unreleasable labels. In that case the prepared patch pull request will change form slighty, to just cherry-picking the patches without bumping the versions.
+As described in more details in [the Patch Releases section](#patch-releases), there are scenarios where you want to patch [unreleasable](#which-changes-are-considered-releasable-and-what-does-it-mean) content back to `main` without bumping versions or publishing a new release. This happens automatically as long as all the unpicked patch pull requests have unreleasable labels. In that case the prepared patch pull request will change form slightly, to just cherry-picking the patches without bumping the versions.
 
 ## FAQ
 

diff --git a/MIGRATION.md b/MIGRATION.md
@@ -1,5 +1,7 @@
 <h1>Migration</h1>
 
+- [From version 7.5.0 to 7.6.0](#from-version-750-to-760)
+  - [Primary doc block accepts of prop](#primary-doc-block-accepts-of-prop)
 - [From version 7.4.0 to 7.5.0](#from-version-740-to-750)
   - [`storyStoreV6` and `storiesOf` is deprecated](#storystorev6-and-storiesof-is-deprecated)
   - [`storyIndexers` is replaced with `experimental_indexers`](#storyindexers-is-replaced-with-experimental_indexers)
@@ -305,6 +307,12 @@
   - [Packages renaming](#packages-renaming)
   - [Deprecated embedded addons](#deprecated-embedded-addons)
 
+## From version 7.5.0 to 7.6.0
+
+##### Primary doc block accepts of prop
+
+The `Primary` doc block now also accepts an `of` prop as described in the [Doc Blocks](#doc-blocks) section. It still accepts being passed `name` or no props at all.
+
 ## From version 7.4.0 to 7.5.0
 
 #### `storyStoreV6` and `storiesOf` is deprecated

diff --git a/code/.yarn/patches/@vitest-expect-npm-0.34.5-8031508efe.patch b/code/.yarn/patches/@vitest-expect-npm-0.34.5-8031508efe.patch
diff --git a/code/.yarnrc.yml b/code/.yarnrc.yml
@@ -25,5 +25,5 @@ plugins:
 unsafeHttpWhitelist:
   - localhost
 
-yarnPath: ../.yarn/releases/yarn-3.5.1.cjs
+yarnPath: ../.yarn/releases/yarn-4.0.0.cjs
 installStatePath: '../.yarn/code-install-state.gz'
diff --git a/code/addons/a11y/package.json b/code/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "7.5.0-alpha.7",
+  "version": "7.6.0-alpha.2",
   "description": "Test component compliance with web accessibility standards",
   "keywords": [
     "a11y",

diff --git a/code/addons/actions/package.json b/code/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "7.5.0-alpha.7",
+  "version": "7.6.0-alpha.2",
   "description": "Get UI feedback when an action is performed on an interactive element",
   "keywords": [
     "storybook",

diff --git a/code/addons/actions/src/addArgs.ts b/code/addons/actions/src/addArgs.ts
@@ -1,7 +1,12 @@
 import type { ArgsEnhancer } from '@storybook/types';
-import { addActionsFromArgTypes, inferActionsFromArgTypesRegex } from './addArgsHelpers';
+import {
+  addActionsFromArgTypes,
+  attachActionsToFunctionMocks,
+  inferActionsFromArgTypesRegex,
+} from './addArgsHelpers';
 
 export const argsEnhancers: ArgsEnhancer[] = [
   addActionsFromArgTypes,
   inferActionsFromArgTypesRegex,
+  attachActionsToFunctionMocks,
 ];
-Original file line number
+Diff line change
@@ Expand Up / @@ -476,7 +476,7 @@ No process is defined for this. @@
     ### Merges to `main` without versioning
-    As described in more details in [the Patch Releases section](#patch-releases), there are scenarios where you want to patch [unreleasable](#which-changes-are-considered-releasable-and-what-does-it-mean) content back to `main` without bumping versions or publishing a new release. This happens automatically as long as all the unpicked patch pull requests have unreleasable labels. In that case the prepared patch pull request will change form slighty, to just cherry-picking the patches without bumping the versions.
+    As described in more details in [the Patch Releases section](#patch-releases), there are scenarios where you want to patch [unreleasable](#which-changes-are-considered-releasable-and-what-does-it-mean) content back to `main` without bumping versions or publishing a new release. This happens automatically as long as all the unpicked patch pull requests have unreleasable labels. In that case the prepared patch pull request will change form slightly, to just cherry-picking the patches without bumping the versions.
     ## FAQ
@@ Expand Down @@