Merge pull request #23091 from storybookjs/version-prerelease-from-7.…

…1.0-alpha.35 Bump version on `next`: prerelease from 7.1.0-alpha.35 to 7.1.0-alpha.36
storybookjs · Jun 15, 2023 · 9ab5e17 · 9ab5e17
2 parents 3b2a575 + 3c95cf1
commit 9ab5e17
Show file tree

Hide file tree

Showing 175 changed files with 3,162 additions and 2,628 deletions.
diff --git a/.github/workflows/check-release-tasks.yml b/.github/workflows/check-release-tasks.yml
diff --git a/.github/workflows/prepare-patch-release.yml b/.github/workflows/prepare-patch-release.yml
@@ -56,7 +56,7 @@ jobs:
         id: check-frozen
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: yarn release:is-pr-frozen
+        run: yarn release:is-pr-frozen --patch
 
       - name: Cancel when frozen
         if: steps.check-frozen.outputs.frozen == 'true' && github.event_name != 'workflow_dispatch'
@@ -138,13 +138,14 @@ jobs:
           if PR_STATE=$(gh pr view --json state --jq .state 2>/dev/null) && [[ -n "$PR_STATE" && "$PR_STATE" == *"OPEN"* ]]; then
             gh pr edit \
               --repo "${{github.repository }}" \
-              --title "Bump version on \`main\`: patch from ${{ steps.versions.outputs.current }} to ${{ steps.versions.outputs.next }}" \
+              --title "Release: Patch ${{ steps.versions.outputs.next }}" \
               --body "${{ steps.description.outputs.description }}"
           else
             gh pr create \
               --repo "${{github.repository }}" \
-              --title "Bump version on \`main\`: patch from ${{ steps.versions.outputs.current }} to ${{ steps.versions.outputs.next }}" \
+              --title "Release: Patch ${{ steps.versions.outputs.next }}" \
               --base latest-release \
+              --label "maintenance"
               --head version-patch-from-${{ steps.versions.outputs.current }} \
               --body "${{ steps.description.outputs.description }}"
           fi
@@ -157,13 +158,14 @@ jobs:
           if PR_STATE=$(gh pr view --json state --jq .state 2>/dev/null) && [[ -n "$PR_STATE" && "$PR_STATE" == *"OPEN"* ]]; then
             gh pr edit \
               --repo "${{github.repository }}"\
-              --title "Merge patches to \`main\`" \
+              --title "Release: Merge patches to \`main\` (without version bump)" \
               --body "${{ steps.description.outputs.description }}"
           else
             gh pr create \
               --repo "${{github.repository }}"\
-              --title "Merge patches to \`main\`" \
+              --title "Release: Merge patches to \`main\` (without version bump)" \
               --base latest-release \
+              --label "build" \
               --head version-patch-from-${{ steps.versions.outputs.current }} \
               --body "${{ steps.description.outputs.description }}"
           fi

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -88,11 +88,11 @@ jobs:
 
       # tags are needed to get list of patches to label as picked
       - name: Fetch git tags
-        if: github.ref_name == 'main-release'
+        if: github.ref_name == 'latest-release'
         run: git fetch --tags origin
 
       - name: Label patch PRs as picked
-        if: github.ref_name == 'main-release'
+        if: github.ref_name == 'latest-release'
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: yarn release:label-patches
@@ -119,6 +119,17 @@ jobs:
           git merge ${{ github.ref_name }}
           git push origin ${{ steps.target.outputs.target }}
 
+      - name: Sync CHANGELOG.md from `main` to `next`
+        if: github.ref_name == 'latest-release'
+        run: |
+          git fetch origin next
+          git checkout next
+          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 push origin next
+
       # Force push from next 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 release-next, next and main all tracking v7.1.0

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/CHANGELOG.prerelease.md b/CHANGELOG.prerelease.md
@@ -1,3 +1,9 @@
+## 7.1.0-alpha.36
+
+- CLI: Fix "Invalid version null" issues by improved version detection - [#22642](https://github.com/storybookjs/storybook/pull/22642), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!
+- CLI: Prebundle boxen to resolve a ESM/CJS incompatibility - [#23080](https://github.com/storybookjs/storybook/pull/23080), thanks [@ndelangen](https://github.com/ndelangen)!
+- Telemetry: Count onboarding stories - [#23092](https://github.com/storybookjs/storybook/pull/23092), thanks [@shilman](https://github.com/shilman)!
+
 ## 7.1.0-alpha.35
 
 - CLI: Skip builder selection for react native - [#23042](https://github.com/storybookjs/storybook/pull/23042), thanks [@dannyhw](https://github.com/dannyhw)!

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-alpha.35",
+  "version": "7.1.0-alpha.36",
   "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-alpha.35",
-    "@storybook/channels": "7.1.0-alpha.35",
-    "@storybook/client-logger": "7.1.0-alpha.35",
-    "@storybook/components": "7.1.0-alpha.35",
-    "@storybook/core-events": "7.1.0-alpha.35",
+    "@storybook/addon-highlight": "7.1.0-alpha.36",
+    "@storybook/channels": "7.1.0-alpha.36",
+    "@storybook/client-logger": "7.1.0-alpha.36",
+    "@storybook/components": "7.1.0-alpha.36",
+    "@storybook/core-events": "7.1.0-alpha.36",
     "@storybook/global": "^5.0.0",
-    "@storybook/manager-api": "7.1.0-alpha.35",
-    "@storybook/preview-api": "7.1.0-alpha.35",
-    "@storybook/theming": "7.1.0-alpha.35",
-    "@storybook/types": "7.1.0-alpha.35",
+    "@storybook/manager-api": "7.1.0-alpha.36",
+    "@storybook/preview-api": "7.1.0-alpha.36",
+    "@storybook/theming": "7.1.0-alpha.36",
+    "@storybook/types": "7.1.0-alpha.36",
     "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-alpha.35",
+  "version": "7.1.0-alpha.36",
   "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-alpha.35",
-    "@storybook/components": "7.1.0-alpha.35",
-    "@storybook/core-events": "7.1.0-alpha.35",
+    "@storybook/client-logger": "7.1.0-alpha.36",
+    "@storybook/components": "7.1.0-alpha.36",
+    "@storybook/core-events": "7.1.0-alpha.36",
     "@storybook/global": "^5.0.0",
-    "@storybook/manager-api": "7.1.0-alpha.35",
-    "@storybook/preview-api": "7.1.0-alpha.35",
-    "@storybook/theming": "7.1.0-alpha.35",
-    "@storybook/types": "7.1.0-alpha.35",
+    "@storybook/manager-api": "7.1.0-alpha.36",
+    "@storybook/preview-api": "7.1.0-alpha.36",
+    "@storybook/theming": "7.1.0-alpha.36",
+    "@storybook/types": "7.1.0-alpha.36",
     "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-alpha.35",
+  "version": "7.1.0-alpha.36",
   "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-alpha.35",
-    "@storybook/components": "7.1.0-alpha.35",
-    "@storybook/core-events": "7.1.0-alpha.35",
+    "@storybook/client-logger": "7.1.0-alpha.36",
+    "@storybook/components": "7.1.0-alpha.36",
+    "@storybook/core-events": "7.1.0-alpha.36",
     "@storybook/global": "^5.0.0",
-    "@storybook/manager-api": "7.1.0-alpha.35",
-    "@storybook/preview-api": "7.1.0-alpha.35",
-    "@storybook/theming": "7.1.0-alpha.35",
-    "@storybook/types": "7.1.0-alpha.35",
+    "@storybook/manager-api": "7.1.0-alpha.36",
+    "@storybook/preview-api": "7.1.0-alpha.36",
+    "@storybook/theming": "7.1.0-alpha.36",
+    "@storybook/types": "7.1.0-alpha.36",
     "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-alpha.35",
+  "version": "7.1.0-alpha.36",
   "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-alpha.35",
-    "@storybook/client-logger": "7.1.0-alpha.35",
-    "@storybook/components": "7.1.0-alpha.35",
-    "@storybook/core-common": "7.1.0-alpha.35",
-    "@storybook/manager-api": "7.1.0-alpha.35",
-    "@storybook/node-logger": "7.1.0-alpha.35",
-    "@storybook/preview-api": "7.1.0-alpha.35",
-    "@storybook/theming": "7.1.0-alpha.35",
-    "@storybook/types": "7.1.0-alpha.35",
+    "@storybook/blocks": "7.1.0-alpha.36",
+    "@storybook/client-logger": "7.1.0-alpha.36",
+    "@storybook/components": "7.1.0-alpha.36",
+    "@storybook/core-common": "7.1.0-alpha.36",
+    "@storybook/manager-api": "7.1.0-alpha.36",
+    "@storybook/node-logger": "7.1.0-alpha.36",
+    "@storybook/preview-api": "7.1.0-alpha.36",
+    "@storybook/theming": "7.1.0-alpha.36",
+    "@storybook/types": "7.1.0-alpha.36",
     "lodash": "^4.17.21",
     "ts-dedent": "^2.0.0"
   },

diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-docs",
-  "version": "7.1.0-alpha.35",
+  "version": "7.1.0-alpha.36",
   "description": "Document component usage and properties in Markdown",
   "keywords": [
     "addon",
@@ -99,19 +99,19 @@
   "dependencies": {
     "@jest/transform": "^29.3.1",
     "@mdx-js/react": "^2.1.5",
-    "@storybook/blocks": "7.1.0-alpha.35",
-    "@storybook/client-logger": "7.1.0-alpha.35",
-    "@storybook/components": "7.1.0-alpha.35",
-    "@storybook/csf-plugin": "7.1.0-alpha.35",
-    "@storybook/csf-tools": "7.1.0-alpha.35",
+    "@storybook/blocks": "7.1.0-alpha.36",
+    "@storybook/client-logger": "7.1.0-alpha.36",
+    "@storybook/components": "7.1.0-alpha.36",
+    "@storybook/csf-plugin": "7.1.0-alpha.36",
+    "@storybook/csf-tools": "7.1.0-alpha.36",
     "@storybook/global": "^5.0.0",
     "@storybook/mdx2-csf": "^1.0.0",
-    "@storybook/node-logger": "7.1.0-alpha.35",
-    "@storybook/postinstall": "7.1.0-alpha.35",
-    "@storybook/preview-api": "7.1.0-alpha.35",
-    "@storybook/react-dom-shim": "7.1.0-alpha.35",
-    "@storybook/theming": "7.1.0-alpha.35",
-    "@storybook/types": "7.1.0-alpha.35",
+    "@storybook/node-logger": "7.1.0-alpha.36",
+    "@storybook/postinstall": "7.1.0-alpha.36",
+    "@storybook/preview-api": "7.1.0-alpha.36",
+    "@storybook/react-dom-shim": "7.1.0-alpha.36",
+    "@storybook/theming": "7.1.0-alpha.36",
+    "@storybook/types": "7.1.0-alpha.36",
     "fs-extra": "^11.1.0",
     "remark-external-links": "^8.0.0",
     "remark-slug": "^6.0.0",

diff --git a/code/addons/essentials/package.json b/code/addons/essentials/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-essentials",
-  "version": "7.1.0-alpha.35",
+  "version": "7.1.0-alpha.36",
   "description": "Curated addons to bring out the best of Storybook",
   "keywords": [
     "addon",
@@ -119,23 +119,23 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/addon-actions": "7.1.0-alpha.35",
-    "@storybook/addon-backgrounds": "7.1.0-alpha.35",
-    "@storybook/addon-controls": "7.1.0-alpha.35",
-    "@storybook/addon-docs": "7.1.0-alpha.35",
-    "@storybook/addon-highlight": "7.1.0-alpha.35",
-    "@storybook/addon-measure": "7.1.0-alpha.35",
-    "@storybook/addon-outline": "7.1.0-alpha.35",
-    "@storybook/addon-toolbars": "7.1.0-alpha.35",
-    "@storybook/addon-viewport": "7.1.0-alpha.35",
-    "@storybook/core-common": "7.1.0-alpha.35",
-    "@storybook/manager-api": "7.1.0-alpha.35",
-    "@storybook/node-logger": "7.1.0-alpha.35",
-    "@storybook/preview-api": "7.1.0-alpha.35",
+    "@storybook/addon-actions": "7.1.0-alpha.36",
+    "@storybook/addon-backgrounds": "7.1.0-alpha.36",
+    "@storybook/addon-controls": "7.1.0-alpha.36",
+    "@storybook/addon-docs": "7.1.0-alpha.36",
+    "@storybook/addon-highlight": "7.1.0-alpha.36",
+    "@storybook/addon-measure": "7.1.0-alpha.36",
+    "@storybook/addon-outline": "7.1.0-alpha.36",
+    "@storybook/addon-toolbars": "7.1.0-alpha.36",
+    "@storybook/addon-viewport": "7.1.0-alpha.36",
+    "@storybook/core-common": "7.1.0-alpha.36",
+    "@storybook/manager-api": "7.1.0-alpha.36",
+    "@storybook/node-logger": "7.1.0-alpha.36",
+    "@storybook/preview-api": "7.1.0-alpha.36",
     "ts-dedent": "^2.0.0"
   },
   "devDependencies": {
-    "@storybook/vue": "7.1.0-alpha.35",
+    "@storybook/vue": "7.1.0-alpha.36",
     "typescript": "^4.9.3"
   },
   "peerDependencies": {

diff --git a/code/addons/gfm/package.json b/code/addons/gfm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-mdx-gfm",
-  "version": "7.1.0-alpha.35",
+  "version": "7.1.0-alpha.36",
   "description": "GitHub Flavored Markdown in Storybook",
   "keywords": [
     "addon",
@@ -51,7 +51,7 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/node-logger": "7.1.0-alpha.35",
+    "@storybook/node-logger": "7.1.0-alpha.36",
     "remark-gfm": "^3.0.1",
     "ts-dedent": "^2.0.0"
   },

diff --git a/code/addons/highlight/package.json b/code/addons/highlight/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-highlight",
-  "version": "7.1.0-alpha.35",
+  "version": "7.1.0-alpha.36",
   "description": "Highlight DOM nodes within your stories",
   "keywords": [
     "storybook-addons",
@@ -61,9 +61,9 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/core-events": "7.1.0-alpha.35",
+    "@storybook/core-events": "7.1.0-alpha.36",
     "@storybook/global": "^5.0.0",
-    "@storybook/preview-api": "7.1.0-alpha.35"
+    "@storybook/preview-api": "7.1.0-alpha.36"
   },
   "devDependencies": {
     "@types/webpack-env": "^1.16.0",

diff --git a/code/addons/interactions/package.json b/code/addons/interactions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-interactions",
-  "version": "7.1.0-alpha.35",
+  "version": "7.1.0-alpha.36",
   "description": "Automate, test and debug user interactions",
   "keywords": [
     "storybook-addons",
@@ -72,16 +72,16 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/client-logger": "7.1.0-alpha.35",
-    "@storybook/components": "7.1.0-alpha.35",
-    "@storybook/core-common": "7.1.0-alpha.35",
-    "@storybook/core-events": "7.1.0-alpha.35",
+    "@storybook/client-logger": "7.1.0-alpha.36",
+    "@storybook/components": "7.1.0-alpha.36",
+    "@storybook/core-common": "7.1.0-alpha.36",
+    "@storybook/core-events": "7.1.0-alpha.36",
     "@storybook/global": "^5.0.0",
-    "@storybook/instrumenter": "7.1.0-alpha.35",
-    "@storybook/manager-api": "7.1.0-alpha.35",
-    "@storybook/preview-api": "7.1.0-alpha.35",
-    "@storybook/theming": "7.1.0-alpha.35",
-    "@storybook/types": "7.1.0-alpha.35",
+    "@storybook/instrumenter": "7.1.0-alpha.36",
+    "@storybook/manager-api": "7.1.0-alpha.36",
+    "@storybook/preview-api": "7.1.0-alpha.36",
+    "@storybook/theming": "7.1.0-alpha.36",
+    "@storybook/types": "7.1.0-alpha.36",
     "jest-mock": "^29.5.0",
     "polished": "^4.2.2",
     "ts-dedent": "^2.2.0"