Merge branch 'release-8-0' into fix-notifications-in-new-layout

storybookjs · Sep 26, 2023 · 534a635 · 534a635
2 parents 49b599b + f6cb6ac
commit 534a635
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/.github/workflows/prepare-patch-release.yml b/.github/workflows/prepare-patch-release.yml
@@ -88,15 +88,6 @@ jobs:
           git config --global user.email '[email protected]'
           yarn release:pick-patches
 
-      - name: Cancel when 0 picked
-        if: steps.pick-patches.outputs.pr-count == '0'
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        # From https://stackoverflow.com/a/75809743
-        run: |
-          gh run cancel ${{ github.run_id }}
-          gh run watch ${{ github.run_id }}
-
       - name: Bump version deferred
         id: bump-version
         if: steps.unreleased-changes.outputs.has-changes-to-release == 'true'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 7.4.5
+
+- UI: Fix infinite hook call causing browsers to freeze - [#24291](https://github.com/storybookjs/storybook/pull/24291), thanks [@yannbf](https://github.com/yannbf)!
+
 ## 7.4.4
 
 - Core: Fix Promise cycle bug in useSharedState - [#24268](https://github.com/storybookjs/storybook/pull/24268), thanks [@ndelangen](https://github.com/ndelangen)!

diff --git a/code/lib/manager-api/src/index.tsx b/code/lib/manager-api/src/index.tsx
@@ -397,7 +397,6 @@ export function useSharedState<S>(stateId: string, defaultState?: S) {
     existingState,
     STORYBOOK_ADDON_STATE[stateId] ? STORYBOOK_ADDON_STATE[stateId] : defaultState
   );
-
   let quicksync = false;
 
   if (state === defaultState && defaultState !== undefined) {
@@ -409,7 +408,7 @@ export function useSharedState<S>(stateId: string, defaultState?: S) {
     if (quicksync) {
       api.setAddonState<S>(stateId, defaultState);
     }
-  });
+  }, [quicksync]);
 
   const setState = async (s: S | API_StateMerger<S>, options?: Options) => {
     const result = await api.setAddonState<S>(stateId, s, options);

diff --git a/scripts/release/pick-patches.ts b/scripts/release/pick-patches.ts
@@ -48,10 +48,6 @@ export const run = async (_: unknown) => {
     spinner.warn('No PRs found.');
   }
 
-  if (process.env.GITHUB_ACTIONS === 'true') {
-    setOutput('pr-count', JSON.stringify(patchPRs.length));
-  }
-
   const failedCherryPicks: string[] = [];
 
   // eslint-disable-next-line no-restricted-syntax