Merge branch 'next' into chore/strict-ts-cra

storybookjs · Oct 2, 2023 · 509f22b · 509f22b
2 parents c22085e + 8c7d53c
commit 509f22b
Show file tree

Hide file tree

Showing 713 changed files with 13,524 additions and 9,801 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -183,15 +183,25 @@ jobs:
             git diff --exit-code
       - report-workflow-on-failure
       - cancel-workflow-on-failure
-  script-unit-tests:
+  script-checks:
     executor: sb_node_16_browsers
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: '--depth 1 --verbose'
       - attach_workspace:
           at: .
       - run:
-          name: Test
+          name: Check parallelism count
+          command: |
+            cd scripts
+            yarn get-template --check
+      - run:
+          name: Type check
+          command: |
+            cd scripts
+            yarn check
+      - run:
+          name: Run tests
           command: |
             cd scripts
             yarn test --coverage --ci
@@ -479,7 +489,7 @@ workflows:
       - unit-tests:
           requires:
             - build
-      - script-unit-tests:
+      - script-checks:
           requires:
             - build
       - chromatic-internal-storybooks:
@@ -489,11 +499,11 @@ workflows:
           requires:
             - unit-tests
       - create-sandboxes:
-          parallelism: 11
+          parallelism: 12
           requires:
             - build
       - build-sandboxes:
-          parallelism: 11
+          parallelism: 12
           requires:
             - create-sandboxes
       - chromatic-sandboxes:
@@ -513,7 +523,7 @@ workflows:
           requires:
             - build-sandboxes
       - bench:
-          parallelism: 2
+          parallelism: 3
           requires:
             - build-sandboxes
       # TODO: reenable once we find out the source of flakyness
@@ -535,7 +545,7 @@ workflows:
       - unit-tests:
           requires:
             - build
-      - script-unit-tests:
+      - script-checks:
           requires:
             - build
       - chromatic-internal-storybooks:
@@ -545,11 +555,11 @@ workflows:
           requires:
             - unit-tests
       - create-sandboxes:
-          parallelism: 20
+          parallelism: 21
           requires:
             - build
       - build-sandboxes:
-          parallelism: 20
+          parallelism: 21
           requires:
             - create-sandboxes
       - chromatic-sandboxes:
@@ -569,7 +579,7 @@ workflows:
           requires:
             - build-sandboxes
       - bench:
-          parallelism: 2
+          parallelism: 3
           requires:
             - build-sandboxes
       # TODO: reenable once we find out the source of flakyness
@@ -592,7 +602,7 @@ workflows:
       - unit-tests:
           requires:
             - build
-      - script-unit-tests:
+      - script-checks:
           requires:
             - build
       - chromatic-internal-storybooks:
@@ -610,19 +620,19 @@ workflows:
           requires:
             - create-sandboxes
       - chromatic-sandboxes:
-          parallelism: 32
+          parallelism: 31
           requires:
             - build-sandboxes
       - e2e-production:
-          parallelism: 32
+          parallelism: 31
           requires:
             - build-sandboxes
       - e2e-dev:
           parallelism: 4
           requires:
             - create-sandboxes
       - test-runner-production:
-          parallelism: 32
+          parallelism: 31
           requires:
             - build-sandboxes
       # TODO: reenable once we find out the source of flakyness

diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,2 @@
 /**/.yarn/** linguist-generated
+* -text
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -30,7 +30,7 @@ body:
     attributes:
       label: System
       description: Please paste the results of `npx storybook@latest info` here.
-      render: shell
+      render: bash
   - type: textarea
     id: context
     attributes:

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,12 +1,33 @@
 Closes #
 
-<!-- Thank you for contributing to Storybook! If your PR is related to an issue, provide the number(s) above; if it resolves multiple issues, be sure to break them up (e.g. "closes #1000, closes #1001"). -->
+<!-- If your PR is related to an issue, provide the number(s) above; if it resolves multiple issues, be sure to break them up (e.g. "closes #1000, closes #1001"). -->
+
+<!--
+
+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
+
+-->
+
 
 ## What I did
 
 <!-- Briefly describe what your PR does -->
 
-## How to test
+## Checklist for Contributors
+
+### Testing
+
+<!-- Please check (put an "x" inside the "[ ]") the applicable items below to communicate how to test your changes -->
+
+#### The changes in this PR are covered in the following automated tests:
+- [ ] stories
+- [ ] unit tests
+- [ ] integration tests
+- [ ] end-to-end tests
+
+#### Manual testing
+
+_This section is mandatory for all contributions. If you believe no manual test is necessary, please state so explicitly. Thanks!_
 
 <!-- Please include the steps to test your changes here. For example:
 
@@ -16,27 +37,32 @@ Closes #
 
 -->
 
-## Checklist
+### Documentation
 
-<!-- Please check (put an "x" inside the "[ ]") the applicable items below to make sure your PR is ready to be reviewed. -->
+<!-- Please check (put an "x" inside the "[ ]") the applicable items below to indicate which documentation has been updated. -->
 
-- [ ] Make sure your changes are tested (stories and/or unit, integration, or end-to-end tests)
-- [ ] Make sure to add/update documentation regarding your changes
+- [ ] Add or update documentation reflecting your changes
 - [ ] If you are deprecating/removing a feature, make sure to update
       [MIGRATION.MD](https://github.com/storybookjs/storybook/blob/next/MIGRATION.md)
 
-#### Maintainers
+## Checklist for Maintainers
 
 - [ ] When this PR is ready for testing, make sure to add `ci:normal`, `ci:merged` or `ci:daily` GH label to it to run a specific set of sandboxes. The particular set of sandboxes can be found in `code/lib/cli/src/sandbox-templates.ts`
-- [ ] Make sure this PR contains **one** of the labels below.
-
-`["cleanup", "BREAKING CHANGE", "feature request", "bug", "build", "documentation", "maintenance", "dependencies", "other"]`
-
-<!--
-
-Everybody: 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
-
--->
+- [ ] Make sure this PR contains **one** of the labels below:
+   <details>
+     <summary>Available labels</summary>
+
+     - `bug`: Internal changes that fixes incorrect behavior.
+     - `maintenance`: User-facing maintenance tasks.
+     - `dependencies`: Upgrading (sometimes downgrading) dependencies.
+     - `build`: Internal-facing build tooling & test updates. Will not show up in release changelog.
+     - `cleanup`: Minor cleanup style change. Will not show up in release changelog.
+     - `documentation`: Documentation **only** changes. Will not show up in release changelog.
+     - `feature request`: Introducing a new feature.
+     - `BREAKING CHANGE`: Changes that break compatibility in some way with current major version.
+     - `other`: Changes that don't fit in the above categories.
+
+   </details>
 
 ### 🦋 Canary release
 

diff --git a/.github/workflows/canary-release-pr.yml b/.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:

diff --git a/.github/workflows/danger-js.yml b/.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:

diff --git a/.github/workflows/generate-sandboxes-main.yml b/.github/workflows/generate-sandboxes-main.yml
@@ -43,7 +43,7 @@ jobs:
         run: yarn wait-on http://localhost:6001
         working-directory: ./code
       - name: Generate
-        run: yarn generate-sandboxes --local-registry
+        run: yarn generate-sandboxes --local-registry --exclude=angular-cli/prerelease
         working-directory: ./code
       - name: Publish
         run: yarn publish-sandboxes --remote=https://storybook-bot:${{ secrets.PAT_STORYBOOK_BOT}}@github.com/storybookjs/sandboxes.git --push --branch=main

diff --git a/.github/workflows/generate-sandboxes-next.yml b/.github/workflows/generate-sandboxes-next.yml
@@ -43,7 +43,7 @@ jobs:
         run: yarn wait-on http://localhost:6001
         working-directory: ./code
       - name: Generate
-        run: yarn generate-sandboxes --local-registry
+        run: yarn generate-sandboxes --local-registry --exclude=angular-cli/prerelease
         working-directory: ./code
       - name: Publish
         run: yarn publish-sandboxes --remote=https://storybook-bot:${{ secrets.PAT_STORYBOOK_BOT}}@github.com/storybookjs/sandboxes.git --push --branch=next

diff --git a/.github/workflows/prepare-patch-release.yml b/.github/workflows/prepare-patch-release.yml
@@ -33,7 +33,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

diff --git a/.github/workflows/prepare-prerelease.yml b/.github/workflows/prepare-prerelease.yml
@@ -54,7 +54,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

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -45,7 +45,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
@@ -176,30 +176,9 @@ jobs:
           git commit -m "Update $VERSION_FILE for v${{ steps.version.outputs.current-version }}"
           git push origin main
 
-      # TODO: this is currently disabled, because we may have a better strategy that we want to try out manually first before comitting to it:
-      #     - create a branch "release-<VERSION>" from HEAD of main
-      #     - git push --force origin ${{ steps.target.outputs.target }}:main
-      #     - ... this will keep the "main" history in the new release branch, and then overwrite main's history with next's
-
-      # Sync next-release to main if it is not a prerelease, and this release is from next-release
-      # This happens when eg. next has been tracking 7.1.0-alpha.X, and now we want to release 7.1.0
-      # This will keep next-release, next and main all tracking v7.1.0
-      # See "Alternative merge strategies" in https://stackoverflow.com/a/36321787
-      # - name: Sync next-release to main
-      #   if: steps.publish-needed.outputs.published == 'false' && steps.target.outputs.target == 'next' && !steps.is-prerelease.outputs.prerelease
-      #   working-directory: .
-      #   run: |
-      #     git fetch origin next-release
-      #     git checkout next-release
-      #     git pull
-      #     git fetch origin main
-      #     git checkout main
-      #     git pull
-      #     git merge --no-commit -s ours next-release
-      #     git rm -rf .
-      #     git checkout next-release -- .
-      #     git commit -m "Sync next-release to main"
-      #     git push origin main
+      - name: Overwrite main with next
+        if: steps.target.outputs.target == 'next' && steps.is-prerelease.outputs.prerelease == 'false'
+        run: git push --force origin next:main
 
       - name: Report job failure to Discord
         if: failure()

diff --git a/.gitignore b/.gitignore
@@ -37,7 +37,6 @@ coverage/
 /**/LICENSE
 code/docs/public
 package-lock.json
-.nvmrc
 storybook-static
 .jest-test-results.json
 *.jar
@@ -50,3 +49,5 @@ code/playwright-results/
 code/playwright-report/
 code/playwright/.cache/
 code/bench-results/
+
+/packs
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+16.20