Merge branch 'next' into pr/subhajit20/24069

.circleci/config.yml

@@ -17,7 +17,7 @@ executors:
         default: 'small'
     working_directory: /tmp/storybook
     docker:
-      - image: cimg/node:16.20.0
+      - image: cimg/node:18.18.0
         environment:
           NODE_OPTIONS: --max_old_space_size=6144
     resource_class: <<parameters.class>>
@@ -30,7 +30,7 @@ executors:
         default: 'small'
     working_directory: /tmp/storybook
     docker:
-      - image: cimg/node:16.20.0-browsers
+      - image: cimg/node:18.18.0-browsers
         environment:
           NODE_OPTIONS: --max_old_space_size=6144
     resource_class: <<parameters.class>>
@@ -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:
@@ -262,48 +262,6 @@ jobs:
       - report-workflow-on-failure
       - store_test_results:
           path: test-results
-  angular-prerelease-sandbox:
-    executor:
-      class: large
-      name: sb_playwright
-    steps:
-      - git-shallow-clone/checkout_advanced:
-          clone_options: '--depth 1 --verbose'
-      - attach_workspace:
-          at: .
-      - run:
-          name: Create Sandbox
-          command: |
-            yarn task --template angular-cli/prerelease --no-link --start-from=never --junit --task sandbox
-      - run:
-          name: Build Sandbox
-          command: |
-            yarn task --template angular-cli/prerelease --no-link --start-from=never --junit --task build
-      - run:
-          name: Chromatic
-          command: |
-            yarn task --template angular-cli/prerelease --no-link --start-from=never --junit --task chromatic
-      - run:
-          name: E2E Tests Production
-          command: |
-            yarn task --template angular-cli/prerelease --no-link --start-from=never --junit --task e2e-tests
-      - run:
-          name: E2E Tests Development
-          command: |
-            yarn task --template angular-cli/prerelease --no-link --start-from=never --junit --task e2e-tests-dev
-      - run:
-          name: Test Runner
-          command: |
-            yarn task --template angular-cli/prerelease --no-link --start-from=never --junit --task test-runner
-      - report-workflow-on-failure:
-          template: angular-cli/prerelease
-      - persist_to_workspace:
-          root: .
-          paths:
-            - sandbox
-      - store_test_results:
-          path: test-results
-
   ## new workflow
   create-sandboxes:
     parameters:
@@ -364,15 +322,20 @@ jobs:
           at: .
       - run:
           name: Starting Event Collector
-          command: yarn ts-node ./event-log-collector.ts
+          command: node --loader esbuild-register/loader -r esbuild-register ./event-log-collector.ts
           working_directory: scripts
           background: true
       - run:
           name: Building Sandboxes
           command: yarn task --task build --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task build) --no-link --start-from=never --junit
       - run:
           name: Verifying Telemetry
-          command: yarn ts-node ./event-log-checker build $(yarn get-template --cadence << pipeline.parameters.workflow >> --task build)
+          command: |
+            TEMPLATE=$(yarn get-template --cadence << pipeline.parameters.workflow >> --task build)
+            if [[ $TEMPLATE != bench/* ]]
+            then
+              node --loader esbuild-register/loader -r esbuild-register ./event-log-checker build $TEMPLATE
+            fi
           working_directory: scripts
       - report-workflow-on-failure:
           template: $(yarn get-template --cadence << pipeline.parameters.workflow >> --task build)
@@ -541,15 +504,15 @@ workflows:
           requires:
             - unit-tests
       - create-sandboxes:
-          parallelism: 12
+          parallelism: 14
           requires:
             - build
       - build-sandboxes:
-          parallelism: 12
+          parallelism: 14
           requires:
             - create-sandboxes
       - chromatic-sandboxes:
-          parallelism: 9
+          parallelism: 11
           requires:
             - build-sandboxes
       - e2e-production:
@@ -565,7 +528,7 @@ workflows:
           requires:
             - build-sandboxes
       - bench:
-          parallelism: 3
+          parallelism: 5
           requires:
             - build-sandboxes
       # TODO: reenable once we find out the source of flakyness
@@ -609,19 +572,19 @@ workflows:
           requires:
             - build-sandboxes
       - e2e-production:
-          parallelism: 18
+          parallelism: 16
           requires:
             - build-sandboxes
       - e2e-dev:
-          parallelism: 4
+          parallelism: 2
           requires:
             - create-sandboxes
       - test-runner-production:
-          parallelism: 18
+          parallelism: 16
           requires:
             - build-sandboxes
       - bench:
-          parallelism: 3
+          parallelism: 5
           requires:
             - build-sandboxes
       # TODO: reenable once we find out the source of flakyness
@@ -650,30 +613,27 @@ workflows:
       - chromatic-internal-storybooks:
           requires:
             - build
-      - angular-prerelease-sandbox:
-          requires:
-            - build
       - create-sandboxes:
-          parallelism: 34
+          parallelism: 36
           requires:
             - build
       # - smoke-test-sandboxes: # disabled for now
       #     requires:
       #       - create-sandboxes
       - build-sandboxes:
-          parallelism: 34
+          parallelism: 36
           requires:
             - create-sandboxes
       - chromatic-sandboxes:
-          parallelism: 31
+          parallelism: 33
           requires:
             - build-sandboxes
       - e2e-production:
           parallelism: 31
           requires:
             - build-sandboxes
       - e2e-dev:
-          parallelism: 4
+          parallelism: 2
           requires:
             - create-sandboxes
       - test-runner-production:

.gitattributes

@@ -1 +1,2 @@
 /**/.yarn/** linguist-generated
+* -text

.github/DISCUSSION_TEMPLATE/help.yml

@@ -0,0 +1,40 @@
+body:
+- type: markdown
+  id: intro
+  attributes:
+    value: |
+      Thanks for taking the time to start a new discussion!
+      
+      ### Before you post
+      Check if someone has already asked/answered your question in a previous discussion.
+      
+      ### When you're ready to post
+      Add labels to your discussion (e.g. React, Vue, Vite) to make it clearer for other users.
+
+- type: textarea
+  id: summary
+  attributes:
+    label: Summary
+    description: How can we help?
+  validations:
+    required: true
+
+- type: textarea
+  id: additional-info
+  attributes:
+    label: Additional information
+    description: |
+      Share Your Storybook configuration (`main.js` or `main.ts`), your Storybook version number, any error messages, and any relevant dependencies. These help us get a clearer understanding of what might be going wrong.
+
+      P.S. Please [share code as text](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/creating-and-highlighting-code-blocks) rather than as a screenshot! It makes debugging much easier and faster.
+  validations:
+    required: false
+
+- type: input
+  id: reproduction
+  attributes:
+    label: Create a reproduction
+    description: |
+      Help us debug by creating a minimal reproduction with [https://storybook.new](https://storybook.new). Learn more about creating a reproduction [here](https://storybook.js.org/docs/react/contribute/how-to-reproduce).
+  validations:
+    required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -3,15 +3,18 @@ contact_links:
   - name: View documentation 📚
     url: https://storybook.js.org/docs/
     about: Check out the official docs for answers to common questions.
-  - name: Feature Requests 💡
+  - name: Feature requests 💡
     url: https://github.com/storybookjs/storybook/discussions/new?category=ideas
     about: Suggest a feature idea for this project.
   - name: Open an RFC 🦄
     url: https://github.com/storybookjs/storybook/discussions/new?category=rfc
     about: Do you want to propose a more involved change to Storybook? Open an RFC (Request for Comments) to start a discussion.
-  - name: Questions & discussions 🤔
+  - name: Questions 💭
+    url: https://github.com/storybookjs/storybook/discussions/new?category=help
+    about: Need support with a Storybook problem? Open up a help request.
+  - name: Discussions 🙌
     url: https://github.com/storybookjs/storybook/discussions
-    about: Ask questions, show off your Storybook, etc. 
-  - name: Community Discord 💬
+    about: Show off your Storybook or discuss the project.
+  - name: Community Discord 🎉
     url: https://discord.gg/storybook
-    about: Community discussions, interactive support, contributor help
+    about: Meet other community members and get contributor help.

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,11 +4,10 @@ Closes #
 
 <!--
 
-Thank you for contributing to Storybook! Please submit all PRs to the `next` branch unless they are specific to the current release. Storybook maintainers cherry-pick bug and documentation fixes into the `main` branch as part of the release process, so you shouldn't need to worry about this. For additional guidance: https://storybook.js.org/docs/react/contribute/how-to-contribute
+Thank you for contributing to Storybook! Please submit all PRs to the `next` branch unless they are specific to the current release. Storybook maintainers cherry-pick bug and documentation fixes into the `main` branch as part of the release process, so you shouldn't need to worry about this. For additional guidance: https://storybook.js.org/docs/contribute
 
 -->
 
-
 ## What I did
 
 <!-- Briefly describe what your PR does -->

.github/workflows/canary-release-pr.yml

@@ -58,8 +58,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
-
+          node-version-file: '.nvmrc'
       - name: Cache dependencies
         uses: actions/cache@v3
         with:

.github/workflows/danger-js.yml

@@ -21,10 +21,10 @@ jobs:
     name: Danger JS
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: '16'
-      - uses: actions/checkout@v3
+          node-version-file: '.nvmrc'
       - name: Danger JS
         uses: danger/[email protected]
         env: