Merge branch 'next' into shilman/viewport-globals

storybookjs · Jul 14, 2023 · dd1e3ba · dd1e3ba
2 parents 026f844 + 9f9070d
commit dd1e3ba
Show file tree

Hide file tree

Showing 122 changed files with 1,391 additions and 1,147 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,8 +4,8 @@ parameters:
   workflow:
     description: Which workflow to run
     type: enum
-    enum: ['ci', 'pr', 'merged', 'daily']
-    default: 'ci'
+    enum: ['normal', 'merged', 'daily', 'skipped']
+    default: 'skipped'
 
 executors:
   sb_node_16_classic:
@@ -257,7 +257,6 @@ jobs:
     parameters:
       parallelism:
         type: integer
-        default: 2
     executor:
       class: medium
       name: sb_node_16_browsers
@@ -282,7 +281,6 @@ jobs:
     parameters:
       parallelism:
         type: integer
-        default: 2
     executor:
       class: medium
       name: sb_node_16_browsers
@@ -303,7 +301,6 @@ jobs:
     parameters:
       parallelism:
         type: integer
-        default: 2
     executor:
       class: large
       name: sb_node_16_browsers
@@ -338,7 +335,6 @@ jobs:
     parameters:
       parallelism:
         type: integer
-        default: 2
     executor:
       class: medium
       name: sb_playwright
@@ -359,7 +355,6 @@ jobs:
     parameters:
       parallelism:
         type: integer
-        default: 2
     executor:
       class: large
       name: sb_playwright
@@ -380,7 +375,6 @@ jobs:
     parameters:
       parallelism:
         type: integer
-        default: 2
     executor:
       class: medium
       name: sb_node_16_browsers
@@ -400,7 +394,6 @@ jobs:
     parameters:
       parallelism:
         type: integer
-        default: 2
     executor:
       class: medium
       name: sb_playwright
@@ -424,7 +417,6 @@ jobs:
     parameters:
       parallelism:
         type: integer
-        default: 2
     executor:
       class: medium
       name: sb_playwright
@@ -448,7 +440,6 @@ jobs:
     parameters:
       parallelism:
         type: integer
-        default: 2
     executor:
       class: medium
       name: sb_playwright
@@ -468,54 +459,9 @@ jobs:
           template: $(yarn get-template --cadence << pipeline.parameters.workflow >> --task bench)
 
 workflows:
-  ci:
+  normal:
     when:
-      and:
-        - equal: [api, << pipeline.trigger_source >>]
-        - equal: [ci, << pipeline.parameters.workflow >>]
-    jobs:
-      - pretty-docs
-      - build
-      - lint:
-          requires:
-            - build
-      - check:
-          requires:
-            - build
-      - unit-tests:
-          requires:
-            - build
-      - script-unit-tests:
-          requires:
-            - build
-      - chromatic-internal-storybooks:
-          requires:
-            - build
-      - create-sandboxes:
-          requires:
-            - build
-      - build-sandboxes:
-          requires:
-            - create-sandboxes
-      - chromatic-sandboxes:
-          requires:
-            - build-sandboxes
-      - e2e-production:
-          requires:
-            - build-sandboxes
-      - e2e-dev:
-          requires:
-            - create-sandboxes
-      - test-runner-production:
-          requires:
-            - build-sandboxes
-      # TODO: reenable once we find out the source of flakyness
-      # - test-runner-dev:
-      #     requires:
-      #       - create-sandboxes
-  pr:
-    when:
-      equal: [pr, << pipeline.parameters.workflow >>]
+      equal: [normal, << pipeline.parameters.workflow >>]
     jobs:
       - pretty-docs
       - build
@@ -554,6 +500,7 @@ workflows:
           requires:
             - build-sandboxes
       - e2e-dev:
+          parallelism: 2
           requires:
             - create-sandboxes
       - test-runner-production:

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -27,8 +27,7 @@ Closes #
 
 #### Maintainers
 
-- [ ] If this PR should be tested against many or all sandboxes,
-      make sure to add the `ci:merged` or `ci:daily` GH label to it.
+- [ ] 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", "documentation", "maintenance", "dependencies", "other"]`

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -27,6 +27,15 @@ jobs:
       run:
         working-directory: scripts
     steps:
+      - name: Cancel if [skip ci]
+        if: contains(github.event.head_commit.message, '[skip ci]')
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        # From https://stackoverflow.com/a/75809743
+        run: |
+          gh run cancel ${{ github.run_id }}
+          gh run watch ${{ github.run_id }}
+
       - name: Checkout ${{ github.ref_name }}
         uses: actions/checkout@v3
         with:
@@ -71,7 +80,7 @@ jobs:
           git config --global user.name "storybook-bot"
           git config --global user.email "[email protected]"
           git add .
-          git commit -m "Bump version from $CURRENT_VERSION to $DEFERRED_NEXT_VERSION" || true
+          git commit -m "Bump version from $CURRENT_VERSION to $DEFERRED_NEXT_VERSION [skip ci]" || true
           git push origin ${{ github.ref_name }}
 
       - name: Get current version
@@ -149,7 +158,7 @@ jobs:
           git pull
           git checkout origin/main ./CHANGELOG.md
           git add ./CHANGELOG.md
-          git commit -m "Update CHANGELOG.md for v${{ steps.version.outputs.current-version }}"
+          git commit -m "Update CHANGELOG.md for v${{ steps.version.outputs.current-version }} [skip ci]"
           git push origin next
 
       - name: Sync versions/next.json from `next` to `main`

diff --git a/.github/workflows/trigger-circle-ci-workflow.yml b/.github/workflows/trigger-circle-ci-workflow.yml
@@ -10,6 +10,10 @@ on:
       - next
       - main
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   get-branch:
     runs-on: ubuntu-latest
@@ -32,39 +36,20 @@ jobs:
     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:
+  trigger-normal-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, 'release')) || 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'))
+    if: github.event_name == 'pull_request_target' && contains(github.event.pull_request.labels.*.name, 'ci:normal')
     steps:
-      - name: Trigger PR tests
+      - name: Trigger Normal 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"
+                    "workflow": "normal"
                   }
                 }'
         env:
@@ -73,7 +58,7 @@ jobs:
   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'))
+    if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'ci:merged')
     steps:
       - name: Trigger merged tests
         run: >

diff --git a/CHANGELOG.prerelease.md b/CHANGELOG.prerelease.md
@@ -1,3 +1,11 @@
+## 7.1.0-rc.2
+
+- CLI: Exit when user does not select a storybook project type - [#23201](https://github.com/storybookjs/storybook/pull/23201), thanks [@yannbf](https://github.com/yannbf)!
+- CLI: Fix Javascript language detection - [#23426](https://github.com/storybookjs/storybook/pull/23426), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!
+- Core: Fix onboarding detection in what's new module - [#23424](https://github.com/storybookjs/storybook/pull/23424), thanks [@yannbf](https://github.com/yannbf)!
+- Dependencies: Bump `@sveltejs/vite-plugin-svelte` - [#23233](https://github.com/storybookjs/storybook/pull/23233), thanks [@JReinhold](https://github.com/JReinhold)!
+- Telemetry: Add globals usage to project.json - [#23431](https://github.com/storybookjs/storybook/pull/23431), thanks [@shilman](https://github.com/shilman)!
+
 ## 7.1.0-rc.1
 
 - Angular: Enable prod mode when Storybook is built - [#23404](https://github.com/storybookjs/storybook/pull/23404), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!

diff --git a/code/addons/a11y/package.json b/code/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "7.1.0-rc.1",
+  "version": "7.1.0-rc.2",
   "description": "Test component compliance with web accessibility standards",
   "keywords": [
     "a11y",
@@ -63,16 +63,16 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/addon-highlight": "7.1.0-rc.1",
-    "@storybook/channels": "7.1.0-rc.1",
-    "@storybook/client-logger": "7.1.0-rc.1",
-    "@storybook/components": "7.1.0-rc.1",
-    "@storybook/core-events": "7.1.0-rc.1",
+    "@storybook/addon-highlight": "7.1.0-rc.2",
+    "@storybook/channels": "7.1.0-rc.2",
+    "@storybook/client-logger": "7.1.0-rc.2",
+    "@storybook/components": "7.1.0-rc.2",
+    "@storybook/core-events": "7.1.0-rc.2",
     "@storybook/global": "^5.0.0",
-    "@storybook/manager-api": "7.1.0-rc.1",
-    "@storybook/preview-api": "7.1.0-rc.1",
-    "@storybook/theming": "7.1.0-rc.1",
-    "@storybook/types": "7.1.0-rc.1",
+    "@storybook/manager-api": "7.1.0-rc.2",
+    "@storybook/preview-api": "7.1.0-rc.2",
+    "@storybook/theming": "7.1.0-rc.2",
+    "@storybook/types": "7.1.0-rc.2",
     "axe-core": "^4.2.0",
     "lodash": "^4.17.21",
     "react-resize-detector": "^7.1.2"

diff --git a/code/addons/actions/package.json b/code/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "7.1.0-rc.1",
+  "version": "7.1.0-rc.2",
   "description": "Get UI feedback when an action is performed on an interactive element",
   "keywords": [
     "storybook",
@@ -80,14 +80,14 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/client-logger": "7.1.0-rc.1",
-    "@storybook/components": "7.1.0-rc.1",
-    "@storybook/core-events": "7.1.0-rc.1",
+    "@storybook/client-logger": "7.1.0-rc.2",
+    "@storybook/components": "7.1.0-rc.2",
+    "@storybook/core-events": "7.1.0-rc.2",
     "@storybook/global": "^5.0.0",
-    "@storybook/manager-api": "7.1.0-rc.1",
-    "@storybook/preview-api": "7.1.0-rc.1",
-    "@storybook/theming": "7.1.0-rc.1",
-    "@storybook/types": "7.1.0-rc.1",
+    "@storybook/manager-api": "7.1.0-rc.2",
+    "@storybook/preview-api": "7.1.0-rc.2",
+    "@storybook/theming": "7.1.0-rc.2",
+    "@storybook/types": "7.1.0-rc.2",
     "dequal": "^2.0.2",
     "lodash": "^4.17.21",
     "polished": "^4.2.2",

diff --git a/code/addons/backgrounds/package.json b/code/addons/backgrounds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "7.1.0-rc.1",
+  "version": "7.1.0-rc.2",
   "description": "Switch backgrounds to view components in different settings",
   "keywords": [
     "addon",
@@ -76,14 +76,14 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/client-logger": "7.1.0-rc.1",
-    "@storybook/components": "7.1.0-rc.1",
-    "@storybook/core-events": "7.1.0-rc.1",
+    "@storybook/client-logger": "7.1.0-rc.2",
+    "@storybook/components": "7.1.0-rc.2",
+    "@storybook/core-events": "7.1.0-rc.2",
     "@storybook/global": "^5.0.0",
-    "@storybook/manager-api": "7.1.0-rc.1",
-    "@storybook/preview-api": "7.1.0-rc.1",
-    "@storybook/theming": "7.1.0-rc.1",
-    "@storybook/types": "7.1.0-rc.1",
+    "@storybook/manager-api": "7.1.0-rc.2",
+    "@storybook/preview-api": "7.1.0-rc.2",
+    "@storybook/theming": "7.1.0-rc.2",
+    "@storybook/types": "7.1.0-rc.2",
     "memoizerific": "^1.11.3",
     "ts-dedent": "^2.0.0"
   },

diff --git a/code/addons/controls/package.json b/code/addons/controls/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-controls",
-  "version": "7.1.0-rc.1",
+  "version": "7.1.0-rc.2",
   "description": "Interact with component inputs dynamically in the Storybook UI",
   "keywords": [
     "addon",
@@ -68,15 +68,15 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/blocks": "7.1.0-rc.1",
-    "@storybook/client-logger": "7.1.0-rc.1",
-    "@storybook/components": "7.1.0-rc.1",
-    "@storybook/core-common": "7.1.0-rc.1",
-    "@storybook/manager-api": "7.1.0-rc.1",
-    "@storybook/node-logger": "7.1.0-rc.1",
-    "@storybook/preview-api": "7.1.0-rc.1",
-    "@storybook/theming": "7.1.0-rc.1",
-    "@storybook/types": "7.1.0-rc.1",
+    "@storybook/blocks": "7.1.0-rc.2",
+    "@storybook/client-logger": "7.1.0-rc.2",
+    "@storybook/components": "7.1.0-rc.2",
+    "@storybook/core-common": "7.1.0-rc.2",
+    "@storybook/manager-api": "7.1.0-rc.2",
+    "@storybook/node-logger": "7.1.0-rc.2",
+    "@storybook/preview-api": "7.1.0-rc.2",
+    "@storybook/theming": "7.1.0-rc.2",
+    "@storybook/types": "7.1.0-rc.2",
     "lodash": "^4.17.21",
     "ts-dedent": "^2.0.0"
   },