Merge branch 'next' into shilman/auto-component-path

.circleci/config.yml

@@ -8,7 +8,7 @@ parameters:
     default: "skipped"
 
 executors:
-  sb_node_16_classic:
+  sb_node_18_classic:
     parameters:
       class:
         description: The Resource class
@@ -17,11 +17,11 @@ executors:
         default: "small"
     working_directory: /tmp/storybook
     docker:
-      - image: cimg/node:18.18.0
+      - image: cimg/node:18.19.1
         environment:
           NODE_OPTIONS: --max_old_space_size=6144
     resource_class: <<parameters.class>>
-  sb_node_16_browsers:
+  sb_node_18_browsers:
     parameters:
       class:
         description: The Resource class
@@ -30,7 +30,7 @@ executors:
         default: "small"
     working_directory: /tmp/storybook
     docker:
-      - image: cimg/node:18.18.0-browsers
+      - image: cimg/node:18.19.1-browsers
         environment:
           NODE_OPTIONS: --max_old_space_size=6144
     resource_class: <<parameters.class>>
@@ -66,6 +66,7 @@ orbs:
   browser-tools: circleci/browser-tools@1.4.1
   discord: antonioned/discord@0.1.0
   codecov: codecov/codecov@3.2.4
+  nx: nrwl/nx@1.6.2
 
 commands:
   cancel-workflow-on-failure:
@@ -98,7 +99,7 @@ jobs:
   pretty-docs:
     executor:
       class: medium
-      name: sb_node_16_classic
+      name: sb_node_18_classic
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: "--depth 1 --verbose"
@@ -123,8 +124,8 @@ jobs:
             yarn docs:prettier:check
   build:
     executor:
-      class: large
-      name: sb_node_16_classic
+      class: xlarge
+      name: sb_node_18_classic
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: "--depth 1 --verbose"
@@ -168,7 +169,7 @@ jobs:
   lint:
     executor:
       class: large
-      name: sb_node_16_classic
+      name: sb_node_18_classic
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: "--depth 1 --verbose"
@@ -184,12 +185,15 @@ jobs:
   check:
     executor:
       class: xlarge
-      name: sb_node_16_classic
+      name: sb_node_18_classic
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
+      - nx/set-shas:
+          main-branch-name: "next"
+          workflow-name: << pipeline.parameters.workflow >>
       - run:
           name: Check
           command: |
@@ -198,7 +202,7 @@ jobs:
       - report-workflow-on-failure
       - cancel-workflow-on-failure
   script-checks:
-    executor: sb_node_16_browsers
+    executor: sb_node_18_browsers
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: "--depth 1 --verbose"
@@ -226,7 +230,7 @@ jobs:
   unit-tests:
     executor:
       class: xlarge
-      name: sb_node_16_browsers
+      name: sb_node_18_browsers
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: "--depth 1 --verbose"
@@ -248,7 +252,7 @@ jobs:
   coverage:
     executor:
       class: small
-      name: sb_node_16_browsers
+      name: sb_node_18_browsers
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: "--depth 1 --verbose"
@@ -259,7 +263,7 @@ jobs:
   chromatic-internal-storybooks:
     executor:
       class: medium+
-      name: sb_node_16_browsers
+      name: sb_node_18_browsers
     environment:
       NODE_OPTIONS: --max_old_space_size=6144
     steps:
@@ -283,13 +287,16 @@ jobs:
         type: integer
     executor:
       class: medium
-      name: sb_node_16_browsers
+      name: sb_node_18_browsers
     parallelism: << parameters.parallelism >>
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: "--depth 1 --verbose"
       - attach_workspace:
           at: .
+      - run:
+          name: Enable Corepack
+          command: sudo corepack enable yarn
       - run:
           name: Creating Sandboxes
           command: yarn task --task sandbox --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task sandbox) --no-link --start-from=never --junit
@@ -307,7 +314,7 @@ jobs:
         type: integer
     executor:
       class: medium
-      name: sb_node_16_browsers
+      name: sb_node_18_browsers
     parallelism: << parameters.parallelism >>
     steps:
       - git-shallow-clone/checkout_advanced:
@@ -327,7 +334,7 @@ jobs:
         type: integer
     executor:
       class: large
-      name: sb_node_16_browsers
+      name: sb_node_18_browsers
     parallelism: << parameters.parallelism >>
     steps:
       - git-shallow-clone/checkout_advanced:
@@ -406,7 +413,7 @@ jobs:
         type: integer
     executor:
       class: medium
-      name: sb_node_16_browsers
+      name: sb_node_18_browsers
     parallelism: << parameters.parallelism >>
     steps:
       - checkout
@@ -489,7 +496,7 @@ jobs:
   test-empty-init:
     executor:
       class: medium
-      name: sb_node_16_browsers
+      name: sb_node_18_browsers
     parameters:
       packageManager:
         type: string
@@ -592,7 +599,7 @@ jobs:
           at: .
       - run:
           name: Install dependencies
-          command: yarn install
+          command: yarn install --no-immutable
           working_directory: test-storybooks/portable-stories-kitchen-sink/<< parameters.directory >>
       - run:
           name: Run Jest tests
@@ -764,30 +771,30 @@ workflows:
           requires:
             - build
       - create-sandboxes:
-          parallelism: 35
+          parallelism: 37
           requires:
             - build
       # - smoke-test-sandboxes: # disabled for now
       #     requires:
       #       - create-sandboxes
       - build-sandboxes:
-          parallelism: 35
+          parallelism: 37
           requires:
             - create-sandboxes
       - chromatic-sandboxes:
-          parallelism: 32
+          parallelism: 34
           requires:
             - build-sandboxes
       - e2e-production:
-          parallelism: 30
+          parallelism: 32
           requires:
             - build-sandboxes
       - e2e-dev:
           parallelism: 2
           requires:
             - create-sandboxes
       - test-runner-production:
-          parallelism: 30
+          parallelism: 32
           requires:
             - build-sandboxes
       - test-portable-stories:

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,7 +1,7 @@
 name: Bug report 🐞
 description: >-
   Something is broken and you have a reliable reproduction? Let us know here.
-  For questions, please use "Question" below.
+  For questions, please post in GitHub Discussion.
 title: '[Bug]: '
 labels:
   - needs triage
@@ -14,16 +14,26 @@ body:
       description: A clear and concise description of what the bug is
     validations:
       required: true
-  - type: textarea
-    id: reproduce
+  - type: input
+    id: repro-link
     attributes:
-      label: To Reproduce
+      label: Reproduction link
       description: >-
-        Due to the high volume of reports we receive, we can only prioritize bug reports that include a clear reproduction of the problem. Please use [storybook.new](https://storybook.new) to create one, and consult our [documentation](https://storybook.js.org/docs/react/contribute/how-to-reproduce) for guidance. Thank you for your understanding!
-      placeholder: >-
-        Please provide a link to your reproduction here. If creating a reproduction really isn't feasible, let us know and be sure to include as much detail as you can to help us understand the issue. 
+        Please provide a link to a reproduction of the issue. We accept reproductions hosted on GitHub, CodeSandbox, and StackBlitz. Due to the high volume of reports, we prioritize those with clear reproductions. The easiest way to create a reproduction is to use [storybook.new](https://storybook.new). For detailed guidance, please refer to our [documentation](https://storybook.js.org/docs/react/contribute/how-to-reproduce).
+
+        Important: If the provided URL is invalid (e.g., 404 error or private repository), we may close the issue. Thank you for your understanding!
     validations:
       required: true
+  - type: textarea
+    id: repro-steps
+    attributes:
+      label: Reproduction steps
+      description: >-
+        Include the steps to reproduce the issue using the provided link. Additionally, provide a clear and concise description of what you expected to happen.
+      placeholder: >-
+        1. Go to above link
+        2. Click on '....'
+        3. ...
   - type: textarea
     id: system
     attributes:

.github/comments/good-first-issue.md

@@ -0,0 +1,12 @@
+The issue was marked with the `good first issue` label by a maintainer.
+
+This means that it is a good candidate for someone interested in contributing to the project, but does not know where to start.
+
+To get started, read the [Contributing Guide](https://storybook.js.org/docs/contribute/how-to-contribute). When you are ready, open a PR and link back to this issue in the form of adding `Fixes #1234` to the PR description, where `1234` is the issue number. This will automatically close the issue when the PR gets merged, making it easier for us to keep track of what has been fixed.
+
+Please remember to add tests to confirm your code changes will fix the issue and we do not regress in the future.
+
+If you have any questions, feel free to ask below or hop onto the [Storybook Discord](https://discord.gg/storybook) and ask in the #contributing channel. We're looking forward to your contribution! ✨
+
+> [!NOTE]
+> There is no need to ask to be assigned or for permission (e.g. "can I work on this?"). Please, go ahead if there is no linked PR. :slightly_smiling_face:

.github/comments/invalid-link.md

@@ -0,0 +1,50 @@
+We could not detect a valid reproduction link. **Make sure to follow the bug report template carefully.**
+
+### Why was this issue closed?
+
+To be able to investigate, we need access to a reproduction to identify what triggered the issue. We need a link to a **public** GitHub repository, Stackblitz or CodeSandbox. The easiest way to create a reproduction is with [storybook.new](https://storybook.new).
+
+The bug template that you filled out has a section called "To reproduce", which is where you should provide the link to the reproduction.
+
+- If you did not provide a link or the link you provided is not valid, we will close the issue.
+- If you provide a link to a private repository, we will close the issue.
+- If you provide a link to a repository but not in the correct section, we will close the issue.
+
+### What should I do?
+
+Depending on the reason the issue was closed, you can do the following:
+
+- If you did not provide a link, please open a new issue with a link to a reproduction.
+- If you provided a link to a private repository, please open a new issue with a link to a public repository.
+- If you provided a link to a repository but not in the correct section, please open a new issue with a link to a reproduction in the correct section.
+
+**In general, assume that we should not go through a lengthy onboarding process at your company code only to be able to verify an issue.**
+
+### My repository is private and cannot be public
+
+In most cases, a private repo will not be a sufficient **minimal reproduction**, as this codebase might contain a lot of unrelated parts that would make our investigation take longer. Please do **not** make it public. Instead, create a new repository using the templates above, adding the relevant code to reproduce the issue. Common things to look out for:
+
+- Remove any code that is not related to the issue. (pages, API routes, irrelevant components, etc.)
+- Remove any dependencies that are not related to the issue.
+- Remove any third-party service that would require us to sign up for an account to reproduce the issue.
+- Remove any environment variables that are not related to the issue.
+- Remove private packages that we do not have access to.
+- If the issue is not related to a monorepo specifically, try to reproduce the issue without a complex monorepo setup
+
+### I did not open this issue, but it is relevant to me, what can I do to help?
+
+Anyone experiencing the same issue is welcome to provide a minimal reproduction following the above steps by opening a new issue.
+
+### I think my reproduction is good enough, why aren't you looking into it quickly?
+
+We look into every Storybook issue and constantly monitor open issues for new comments.
+
+However, sometimes we might miss one or two due to the popularity/high traffic of the repository. We apologize, and kindly ask you to refrain from tagging core maintainers, as that will usually not result in increased priority.
+
+Upvoting issues to show your interest will help us prioritize and address them as quickly as possible. That said, every issue is important to us, and if an issue gets closed by accident, we encourage you to open a new one linking to the old issue and we will look into it.
+
+### Useful Resources
+
+- [Create a Storybook reproduction](https://storybook.js.org/docs/react/contribute/how-to-reproduce)
+- [How to create a Minimal, Complete, and Verifiable example](https://stackoverflow.com/help/mcve)
+- [Contributing to Storybook](https://storybook.js.org/docs/contribute/how-to-contribute)

.github/workflows/prepare-non-patch-release.yml

@@ -113,10 +113,6 @@ jobs:
         run: |
           yarn release:version --deferred --release-type ${{ inputs.release-type || 'prerelease' }} ${{ inputs.pre-id && format('{0} {1}', '--pre-id', inputs.pre-id) || '' }} --verbose
 
-      - name: Check release vs prerelease
-        id: is-prerelease
-        run: yarn release:is-prerelease ${{ steps.bump-version.outputs.next-version }} --verbose
-
       - name: Write changelog
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -133,19 +129,6 @@ jobs:
           git commit -m "Write changelog for ${{ steps.bump-version.outputs.next-version }} [skip ci]" || true
           git push --force origin version-non-patch-from-${{ steps.bump-version.outputs.current-version }}
 
-      - name: Resolve merge-conflicts with base branch
-        if: steps.is-prerelease.outputs.prerelease == 'false'
-        working-directory: .
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          git config pull.rebase false
-          git pull --no-commit --no-ff origin latest-release || true
-          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
         env:
@@ -162,14 +145,13 @@ jobs:
             gh pr edit \
               --repo "${{github.repository }}" \
               --title "Release: $CAPITALIZED_RELEASE_TYPE ${{ inputs.pre-id && format('{0} ', inputs.pre-id) }}${{ steps.bump-version.outputs.next-version }}" \
-              --base ${{ steps.is-prerelease.outputs.prerelease == 'true' && 'next-release' || 'latest-release' }} \
               --body "${{ steps.description.outputs.description }}"
           else
             gh pr create \
               --repo "${{github.repository }}"\
               --title "Release: $CAPITALIZED_RELEASE_TYPE ${{ inputs.pre-id && format('{0} ', inputs.pre-id) }}${{ steps.bump-version.outputs.next-version }}" \
               --label "release" \
-              --base ${{ steps.is-prerelease.outputs.prerelease == 'true' && 'next-release' || 'latest-release' }} \
+              --base next-release \
               --head version-non-patch-from-${{ steps.bump-version.outputs.current-version }} \
               --body "${{ steps.description.outputs.description }}"
           fi

.github/workflows/publish.yml

@@ -154,17 +154,13 @@ 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'
+      - name: Force push from 'next' to 'latest-release' and 'main' on minor/major releases
+        if: github.ref_name == 'next-release' && steps.is-prerelease.outputs.prerelease == 'false'
         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
+          git push --force origin latest-release
+          git push --force origin main
 
       - name: Sync CHANGELOG.md from `main` to `next`
         if: steps.target.outputs.target == 'main'