Merge branch 'next' into yann/next-15-support

.circleci/config.yml

@@ -220,16 +220,42 @@ jobs:
           clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
-      - run:
+      # if there is a base branch AND a PR number in parameters, benchmark packages against those
-          name: Benchmarking Packages
+      # this happens when run against a PR
-          working_directory: scripts
+      - when:
-          command: |
+          condition:
-            yarn local-registry --open &
+            and:
-            until curl -s http://localhost:6001 > /dev/null; do
+              - << pipeline.parameters.ghBaseBranch >>
-              echo 'Waiting for local registry to be available...'
+              - << pipeline.parameters.ghPrNumber >>
-              sleep 2
+          steps:
-            done
+            - run:
-            yarn bench-packages --baseBranch << pipeline.parameters.ghBaseBranch >> --pull-request << pipeline.parameters.ghPrNumber >> --upload
+                name: Benchmarking packages against base branch
+                working_directory: scripts
+                command: |
+                  yarn local-registry --open &
+                  until curl -s http://localhost:6001 > /dev/null; do
+                    echo 'Waiting for local registry to be available...'
+                    sleep 2
+                  done
+                  yarn bench-packages --base-branch << pipeline.parameters.ghBaseBranch >> --pull-request << pipeline.parameters.ghPrNumber >> --upload
+      # if there is a NOT a base branch OR NOT a PR number in parameters, just upload benchmarks for the branch
+      # this happens when runned directly on branches, like next or main
+      - when:
+          condition:
+            or:
+              - not: << pipeline.parameters.ghBaseBranch >>
+              - not: << pipeline.parameters.ghPrNumber >>
+          steps:
+            - run:
+                name: Uploading package benchmarks for branch
+                working_directory: scripts
+                command: |
+                  yarn local-registry --open &
+                  until curl -s http://localhost:6001 > /dev/null; do
+                    echo 'Waiting for local registry to be available...'
+                    sleep 2
+                  done
+                  yarn bench-packages --upload
       - store_artifacts:
           path: bench/packages/results.json
       - store_artifacts:

code/core/src/manager/components/upgrade/UpgradeBlock.tsx

@@ -14,7 +14,7 @@ interface UpgradeBlockProps {
 
 export const UpgradeBlock: FC<UpgradeBlockProps> = ({ onNavigateToWhatsNew }) => {
   const api = useStorybookApi();
-  const [activeTab, setActiveTab] = useState<'npm' | 'pnpm'>('npm');
+  const [activeTab, setActiveTab] = useState<'npm' | 'yarn' | 'pnpm'>('npm');
 
   return (
     <Container>
@@ -24,12 +24,17 @@ export const UpgradeBlock: FC<UpgradeBlockProps> = ({ onNavigateToWhatsNew }) =>
         <ButtonTab active={activeTab === 'npm'} onClick={() => setActiveTab('npm')}>
           npm
         </ButtonTab>
+        <ButtonTab active={activeTab === 'yarn'} onClick={() => setActiveTab('yarn')}>
+          yarn
+        </ButtonTab>
         <ButtonTab active={activeTab === 'pnpm'} onClick={() => setActiveTab('pnpm')}>
           pnpm
         </ButtonTab>
       </Tabs>
       <Code>
-        {activeTab === 'npm' ? 'npx storybook@latest upgrade' : 'pnpm dlx storybook@latest upgrade'}
+        {activeTab === 'npm'
+          ? 'npx storybook@latest upgrade'
+          : `${activeTab} dlx storybook@latest upgrade`}
       </Code>
       {onNavigateToWhatsNew && (
         // eslint-disable-next-line jsx-a11y/anchor-is-valid

scripts/bench/bench-packages.ts

@@ -370,7 +370,7 @@ const uploadToGithub = async ({
 const run = async () => {
   program
     .option(
-      '-b, --baseBranch <string>',
+      '-b, --base-branch <string>',
       'The base branch to compare the results with. Requires GCP_CREDENTIALS env var'
     )
     .option(