Merge branch 'next' into sri-ram-contribution

.github/workflows/generate-repros-next.yml

@@ -14,6 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
+      CLEANUP_REPRO_NODE_MODULES: true
     steps:
       - uses: actions/setup-node@v3
         with:
@@ -27,6 +28,12 @@ jobs:
         run: node ./scripts/check-dependencies.js
       - name: Compile Storybook libraries
         run: yarn task --task publish --start-from=auto --no-link
+      - name: Running local registry
+        run: yarn local-registry --port 6001 --open &
+        working-directory: ./code
+      - name: Wait for registry
+        run: yarn wait-on http://localhost:6001
+        working-directory: ./code
       - name: Generate repros
         run: yarn generate-repros-next --local-registry
         working-directory: ./code

.github/workflows/handle-release-branches.yml

@@ -40,7 +40,7 @@ jobs:
       - id: next-version
         uses: notiz-dev/github-action-json-property@release
         with:
-          path: ${{ github.workspace }}/next/package.json
+          path: ${{ github.workspace }}/next/code/package.json
           prop_path: version
 
       - run: |

.github/workflows/tests-unit.yml

@@ -5,12 +5,11 @@ on:
     branches:
       - next
   pull_request:
-    types: [opened, reopened, labeled, synchronize]
+    types: [opened, synchronize, reopened]
 
 jobs:
   build:
     name: Core Unit Tests node-${{ matrix.node_version }}, ${{ matrix.os }}
-    if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'ci:matrix')
     strategy:
       fail-fast: false
       matrix:
@@ -28,8 +27,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node_version }}
-          cache: yarn
       - name: install and compile
-        run: yarn task --task compile --start-from=auto
+        run: yarn task --task compile --start-from=auto --no-link
       - name: test
         run: yarn test --runInBand --ci

.github/workflows/trigger-circle-ci-workflow.yml

@@ -1,21 +1,109 @@
 name: Trigger CircleCI workflow
 
 on:
-  pull_request:
-    types: [labeled]
+  # Use pull_request_target, as we don't need to check out the actual code of the fork in this script.
+  # And this is the only way to trigger the Circle CI API on forks as well.
+  pull_request_target:
+    types: [opened, synchronize, labeled, unlabeled, reopened, converted_to_draft, ready_for_review]
+  push:
+    branches:
+      - next
 
 jobs:
-  trigger:
-    if: github.event.label.name == 'run e2e extended test suite' && github.event.pull_request.head.repo.fork == false
-    name: Run workflow with all e2e tests
+  get-branch:
     runs-on: ubuntu-latest
     steps:
-      - name: Make request to CircleCI
+      - id: get-branch
+        env:
+          # Stored as environment variable to prevent script injection
+          REF_NAME: ${{ github.ref_name }}
+          PR_REF_NAME: ${{ github.event.pull_request.head.ref }}
+        run: |
+          if  [ "${{ github.event.pull_request.head.repo.fork }}" = "true" ]; then
+            export BRANCH=pull/${{ github.event.pull_request.number }}/head
+            elif [ "${{ github.event_name }}" = "push" ]; then
+            export BRANCH="$REF_NAME"
+            else
+            export BRANCH="$PR_REF_NAME"
+          fi
+          echo "$BRANCH"
+          echo "branch=$BRANCH" >> $GITHUB_ENV
+    outputs:
+      branch: ${{ env.branch }}
+
+  trigger-ci-tests:
+    runs-on: ubuntu-latest
+    needs: get-branch
+    if: github.event_name == 'pull_request_target' && github.event.pull_request.draft == true && !contains(github.event.pull_request.labels.*.name, 'ci:pr') && !contains(github.event.pull_request.labels.*.name, 'ci:merged') && !contains(github.event.pull_request.labels.*.name, 'ci:daily')
+    steps:
+      - name: Trigger draft PR tests
+        run: >
+          curl -X POST --location "https://circleci.com/api/v2/project/gh/storybookjs/storybook/pipeline" \
+            -H "Content-Type: application/json" \
+            -H "Circle-Token: $CIRCLE_CI_TOKEN" \
+            -d '{
+                  "branch": "'"$BRANCH"'",
+                  "parameters": {
+                    "workflow": "ci"
+                  }
+                }'
+        env:
+          CIRCLE_CI_TOKEN: ${{ secrets.CIRCLE_CI_TOKEN }}
+          BRANCH: ${{ needs.get-branch.outputs.branch }}
+  trigger-pr-tests:
+    runs-on: ubuntu-latest
+    needs: get-branch
+    if: github.event_name == 'pull_request_target' && ((github.event.pull_request.draft == false || contains(github.event.pull_request.labels.*.name, 'ci:pr')) && !contains(github.event.pull_request.labels.*.name, 'ci:merged') && !contains(github.event.pull_request.labels.*.name, 'ci:daily'))
+    steps:
+      - name: Trigger PR tests
+        run: >
+          curl -X POST --location "https://circleci.com/api/v2/project/gh/storybookjs/storybook/pipeline" \
+            -H "Content-Type: application/json" \
+            -H "Circle-Token: $CIRCLE_CI_TOKEN" \
+            -d '{
+                  "branch": "'"$BRANCH"'",
+                  "parameters": {
+                    "workflow": "pr"
+                  }
+                }'
+        env:
+          CIRCLE_CI_TOKEN: ${{ secrets.CIRCLE_CI_TOKEN }}
+          BRANCH: ${{ needs.get-branch.outputs.branch }}
+  trigger-merged-tests:
+    runs-on: ubuntu-latest
+    needs: get-branch
+    if: github.event_name == 'push' || (contains(github.event.pull_request.labels.*.name, 'ci:merged') && !contains(github.event.pull_request.labels.*.name, 'ci:daily'))
+    steps:
+      - name: Trigger merged tests
+        run: >
+          curl -X POST --location "https://circleci.com/api/v2/project/gh/storybookjs/storybook/pipeline" \
+            -H "Content-Type: application/json" \
+            -H "Circle-Token: $CIRCLE_CI_TOKEN" \
+            -d '{
+                  "branch": "'"$BRANCH"'",
+                  "parameters": {
+                    "workflow": "merged"
+                  }
+                }'
+        env:
+          CIRCLE_CI_TOKEN: ${{ secrets.CIRCLE_CI_TOKEN }}
+          BRANCH: ${{ needs.get-branch.outputs.branch }}
+  trigger-daily-tests:
+    runs-on: ubuntu-latest
+    needs: get-branch
+    if: github.event_name == 'pull_request_target' && contains(github.event.pull_request.labels.*.name, 'ci:daily')
+    steps:
+      - name: Trigger the daily tests
         run: >
-          curl --request POST
-          --url https://circleci.com/api/v2/project/gh/storybookjs/storybook/pipeline
-          --header 'Circle-Token: '"$CIRCLE_CI_TOKEN"' '
-          --header 'content-type: application/json'
-          --data '{"branch":"${{ github.event.pull_request.head.ref }}"}'
+          curl -X POST --location "https://circleci.com/api/v2/project/gh/storybookjs/storybook/pipeline" \
+            -H "Content-Type: application/json" \
+            -H "Circle-Token: $CIRCLE_CI_TOKEN" \
+            -d '{
+                  "branch": "'"$BRANCH"'",
+                  "parameters": {
+                    "workflow": "daily"
+                  }
+                }'
         env:
           CIRCLE_CI_TOKEN: ${{ secrets.CIRCLE_CI_TOKEN }}
+          BRANCH: ${{ needs.get-branch.outputs.branch }}

.gitignore

@@ -3,13 +3,17 @@ node_modules
 .idea
 *.iml
 *.sw*
+!.swcrc
 dist
 *.DS_Store
 .cache
 junit.xml
+test-results
 /repros
 /sandbox
+/bench
 .verdaccio-cache
+.next
 
 # Yarn stuff
 /**/.yarn/*

.vscode/extensions.json

@@ -0,0 +1,7 @@
+{
+  "recommendations": [
+    "dbaeumer.vscode-eslint",
+    "unifiedjs.vscode-mdx",
+    "yzhang.markdown-all-in-one"
+  ]
+}

.vscode/settings.json

@@ -1,4 +1,55 @@
 {
-  "deepscan.enable": true,
+  "[javascript]": {
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint",
+    "editor.formatOnSave": true
+  },
+  "[javascriptreact]": {
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint",
+    "editor.formatOnSave": true
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint",
+    "editor.formatOnSave": true
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint",
+    "editor.formatOnSave": true
+  },
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true
+  },
+  "editor.tabSize": 2,
+  "editor.formatOnSave": true,
+  "eslint.format.enable": true,
+  "eslint.options": {
+    "cache": true,
+    "cacheLocation": ".cache/eslint",
+    "extensions": [
+      ".js",
+      ".jsx",
+      ".mjs",
+      ".json",
+      ".ts",
+      ".tsx"
+    ]
+  },
+  "eslint.packageManager": "yarn",
+  "eslint.useESLintClass": true,
+  "eslint.validate": [
+    "json",
+    "javascript",
+    "javascriptreact",
+    "html",
+    "typescript",
+    "typescriptreact"
+  ],
+  "eslint.workingDirectories": [
+    "./code",
+    "./scripts"
+  ],
+  "files.associations": {
+    "*.js": "javascriptreact"
+  },
+  "prettier.ignorePath": "./code/.prettierignore",
   "typescript.tsdk": "./code/node_modules/typescript/lib"
-}
+}

.yarnrc.yml

@@ -2,4 +2,4 @@ installStatePath: ./.yarn/root-install-state.gz
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.2.4.cjs
+yarnPath: .yarn/releases/yarn-3.3.0.cjs