Merge branch 'next' into fix/auto-title-dotted-component

.circleci/config.yml

@@ -262,6 +262,48 @@ 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:
@@ -608,31 +650,34 @@ workflows:
       - chromatic-internal-storybooks:
           requires:
             - build
+      - angular-prerelease-sandbox:
+          requires:
+            - build
       - create-sandboxes:
-          parallelism: 35
+          parallelism: 34
           requires:
             - build
       # - smoke-test-sandboxes: # disabled for now
       #     requires:
       #       - create-sandboxes
       - build-sandboxes:
-          parallelism: 35
+          parallelism: 34
           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

.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:

.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
 

.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:

.github/workflows/generate-sandboxes-main.yml → .github/workflows/generate-sandboxes.yml

@@ -1,4 +1,4 @@
-name: Generate and push sandboxes (main)
+name: Generate and push sandboxes
 
 on:
   schedule:
@@ -10,48 +10,74 @@ on:
   #   branches:
   #     - <your-branch-name>
   # 2. change the "ref" value to <your-branch-name> in the actions/checkout step below.
-  # 3. 👉 DON'T FORGET TO UNDO THE VALUES BACK TO `main` BEFORE YOU MERGE YOUR CHANGES!
+  # 3. 👉 DON'T FORGET TO UNDO THE VALUES BACK BEFORE YOU MERGE YOUR CHANGES!
 
 jobs:
   generate:
     runs-on: ubuntu-latest
     env:
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
       CLEANUP_SANDBOX_NODE_MODULES: true
+    strategy:
+      fail-fast: false
+      matrix:
+        node_version:
+          - 16
+          - 18
+        branch:
+          - main
+          - next
+        include:
+          - node_version: 16
+            # space-delimited list of templates
+            exclude: 'angular-cli/prerelease'
+          - node_version: 18
+            # space-delimited list of templates
+            templates: 'angular-cli/prerelease'
     steps:
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: ${{ matrix.node_version }}
+
       - uses: actions/checkout@v3
         with:
-          ref: main
+          ref: ${{ matrix.branch }}
+
       - name: Setup git user
         run: |
           git config --global user.name "Storybook Bot"
           git config --global user.email "[email protected]"
+
       - name: Install dependencies
         run: node ./scripts/check-dependencies.js
+
       - name: Compile Storybook libraries
         run: yarn task --task compile --start-from=auto --no-link
+
       - name: Publishing to local registry
         run: yarn local-registry --publish
         working-directory: ./code
+
       - name: Running local registry
         run: yarn local-registry --open &
         working-directory: ./code
+
       - name: Wait for registry
         run: yarn wait-on http://localhost:6001
         working-directory: ./code
+
       - name: Generate
-        run: yarn generate-sandboxes --local-registry
+        run: yarn generate-sandboxes --local-registry --templates ${{matrix.templates}} --exclude ${{matrix.exclude}}
         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
+        run: yarn publish-sandboxes --remote=https://storybook-bot:${{ secrets.PAT_STORYBOOK_BOT}}@github.com/storybookjs/sandboxes.git --push --branch=${{ matrix.branch }}
         working-directory: ./code
+
       - name: The job has failed
         if: ${{ failure() || cancelled() }}
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_MONITORING_URL }}
         uses: Ilshidur/action-discord@master
         with:
-          args: 'The generation of sandboxes in the **main** branch has failed. [View Run](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})'
+          args: 'The generation of sandboxes with Node version **${{ matrix.node_version }}** in the **${{ matrix.branch }}** branch has failed. [View Run](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})'

.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

.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

.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

.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

.nvmrc

@@ -0,0 +1 @@
+16.20