Merge branch 'next' into update-security-md

storybookjs · Jul 26, 2023 · 3ab7f57 · 3ab7f57
2 parents 8caaffe + 5dcc66f
commit 3ab7f57
Show file tree

Hide file tree

Showing 106 changed files with 1,079 additions and 1,076 deletions.
diff --git a/.github/workflows/canary-release-pr.yml b/.github/workflows/canary-release-pr.yml
@@ -78,7 +78,7 @@ jobs:
         id: version
         working-directory: scripts
         run: |
-          yarn release:version --release-type prerelease --pre-id canary-${{ inputs.pr }}-${{ steps.info.outputs.timestamp }}-${{ steps.info.outputs.shortSha }} --verbose
+          yarn release:version --exact 0.0.0-pr-${{ inputs.pr }}-sha-${{ steps.info.outputs.shortSha }} --verbose
 
       - name: Publish v${{ steps.version.outputs.next-version }}
         env:

diff --git a/CHANGELOG.prerelease.md b/CHANGELOG.prerelease.md
@@ -1,3 +1,15 @@
+## 7.2.0-rc.0
+
+- Addon: Create @storybook/addon-themes - [#23524](https://github.com/storybookjs/storybook/pull/23524), thanks [@Integrayshaun](https://github.com/Integrayshaun)!
+- Angular: Fix initialization of Storybook in Angular 16.1 - [#23598](https://github.com/storybookjs/storybook/pull/23598), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!
+- CLI: Gracefully shutdown and cleanup execa child processes - [#23538](https://github.com/storybookjs/storybook/pull/23538), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!
+- Dependencies: Downgrade `jest-mock` - [#23597](https://github.com/storybookjs/storybook/pull/23597), thanks [@ndelangen](https://github.com/ndelangen)!
+- Dependencies: Upgrade simple-update-notifier - [#23396](https://github.com/storybookjs/storybook/pull/23396), thanks [@dartess](https://github.com/dartess)!
+- Storyshots: fix broken storyshots with angular - [#23555](https://github.com/storybookjs/storybook/pull/23555), thanks [@mattlewis92](https://github.com/mattlewis92)!
+- TypeScript: Added `expanded` to `CoreCommon_StorybookRefs` to fix typescript errors - [#23488](https://github.com/storybookjs/storybook/pull/23488), thanks [@DotwoodMedia](https://github.com/DotwoodMedia)!
+- TypeScript: Downgrade to the last version of type-fest that doesn't need typescript 5.0 - [#23574](https://github.com/storybookjs/storybook/pull/23574), thanks [@ndelangen](https://github.com/ndelangen)!
+- Vue2: Source Decorator reactivity - [#23149](https://github.com/storybookjs/storybook/pull/23149), thanks [@chakAs3](https://github.com/chakAs3)!
+
 ## 7.2.0-alpha.0
 
 - Angular: Make enableProdMode optional - [#23489](https://github.com/storybookjs/storybook/pull/23489), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -6,7 +6,7 @@
 .yarnrc.yml @ndelangen @JReinhold
 
 # Docs
-docs/ @kylegach @jonniebigodes
+/docs/ @kylegach @jonniebigodes
 
 # Scripts
 /scripts/         @ndelangen @kasperpeulen
@@ -39,8 +39,8 @@ docs/ @kylegach @jonniebigodes
 
 # Frameworks
 /code/frameworks/angular/                 @valentinpalkovic @yannbf
-/code/frameworks/html-vite/               @kasperpeulen @JReinhold 
-/code/frameworks/html-webpack5/           @kasperpeulen @JReinhold 
+/code/frameworks/html-vite/               @kasperpeulen @JReinhold
+/code/frameworks/html-webpack5/           @kasperpeulen @JReinhold
 /code/frameworks/nextjs/                  @valentinpalkovic @kasperpeulen @yannbf
 /code/frameworks/react-vite/              @valentinpalkovic @kasperpeulen
 /code/frameworks/react-webpack5/          @valentinpalkovic @kasperpeulen
@@ -61,7 +61,7 @@ docs/ @kylegach @jonniebigodes
 /code/lib/codemod/        @kasperpeulen @ndelangen
 /code/lib/core-common/    @ndelangen @yannbf
 /code/lib/core-events/    @ndelangen @kasperpeulen
-/code/lib/core-server/    @ndelangen @JReinhold @tmeasday @shilman 
+/code/lib/core-server/    @ndelangen @JReinhold @tmeasday @shilman
 /code/lib/core-webpack/   @valentinpalkovic @ndelangen
 /code/lib/csf-plugin/     @ndelangen @valentinpalkovic
 /code/lib/csf-tools/      @kasperpeulen @shilman
@@ -71,7 +71,7 @@ docs/ @kylegach @jonniebigodes
 /code/lib/node-logger/    @yannbf @ndelangen
 /code/lib/preview/        @ndelangen @kasperpeulen
 /code/lib/preview-api/    @yannbf @ndelangen @tmeasday
-/code/lib/react-dom-shim/ @ndelangen @valentinpalkovic @tmeasday 
+/code/lib/react-dom-shim/ @ndelangen @valentinpalkovic @tmeasday
 /code/lib/router/         @ndelangen @JReinhold
 /code/lib/telemetry/      @shilman @yannbf @ndelangen
 /code/lib/theming/        @cdedreuille @ndelangen @JReinhold

diff --git a/CONTRIBUTING/RELEASING.md b/CONTRIBUTING/RELEASING.md
@@ -410,14 +410,10 @@ gh workflow run --repo storybookjs/storybook canary-release-pr.yml --field pr=<P
 
 When the release succeeds, it will update the "Canary release" section of the pull request with information about the release and how to use it (see example [here](https://github.com/storybookjs/storybook/pull/23508)). If it fails, it will create a comment on the pull request, tagging the triggering actor to let them know that it failed (see example [here](https://github.com/storybookjs/storybook/pull/23508#issuecomment-1642850467)).
 
-The canary release will have the following version format: `<CURRENT_VERSION>-canary-<PR_NUMBER>-<TIMESTAMP>-<COMMIT_SHA>.0`, e.g., `7.1.1-canary-23508-1689802571-5ec8c1c3.0`.
-
-- The current version has no actual meaning but softly indicates which version the pull request is based on (e.g., a pull request based on v7.1.0 will get released as a canary version of v7.1.1).
-- The timestamp ensures that any subsequent releases are always considered newer.
-- The commit hash indicates which exact code has been released.
+The canary release will have the following version format: `0.0.0-pr-<PR_NUMBER>-sha-<COMMIT_SHA>`, e.g., `0.0.0-pr-23508-5ec8c1c3`. Using v0.0.0 ensures that no user will accidentally get the canary release when using a canary with prereleases, eg. `^7.2.0-alpha.0`
 
 > ** Note **
-> All canary releases are released under the same "canary" dist tag. This means you'll technically be able to install it with `npm install @storybook/cli@canary`. However, this doesn't make sense, as releases from subsequent pull requests will overwrite that tag quickly. Therefore you should always install the specific version string, e.g., `npm install @storybook/cli@7.1.1-canary-23508-1689802571-5ec8c1c3.0.
+> All canary releases are released under the same "canary" dist tag. This means you'll technically be able to install it with `npm install @storybook/cli@canary`. However, this doesn't make sense, as releases from subsequent pull requests will overwrite that tag quickly. Therefore you should always install the specific version string, e.g., `npm install @storybook/cli@0.0.0-pr-23508-sha-5ec8c1c3`.
 
 <details>
   <summary>Isn't there a simpler/smarter way to do this?</summary>

diff --git a/code/addons/a11y/package.json b/code/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "7.2.0-alpha.0",
+  "version": "7.2.0-rc.0",
   "description": "Test component compliance with web accessibility standards",
   "keywords": [
     "a11y",
@@ -63,16 +63,16 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/addon-highlight": "7.2.0-alpha.0",
-    "@storybook/channels": "7.2.0-alpha.0",
-    "@storybook/client-logger": "7.2.0-alpha.0",
-    "@storybook/components": "7.2.0-alpha.0",
-    "@storybook/core-events": "7.2.0-alpha.0",
+    "@storybook/addon-highlight": "7.2.0-rc.0",
+    "@storybook/channels": "7.2.0-rc.0",
+    "@storybook/client-logger": "7.2.0-rc.0",
+    "@storybook/components": "7.2.0-rc.0",
+    "@storybook/core-events": "7.2.0-rc.0",
     "@storybook/global": "^5.0.0",
-    "@storybook/manager-api": "7.2.0-alpha.0",
-    "@storybook/preview-api": "7.2.0-alpha.0",
-    "@storybook/theming": "7.2.0-alpha.0",
-    "@storybook/types": "7.2.0-alpha.0",
+    "@storybook/manager-api": "7.2.0-rc.0",
+    "@storybook/preview-api": "7.2.0-rc.0",
+    "@storybook/theming": "7.2.0-rc.0",
+    "@storybook/types": "7.2.0-rc.0",
     "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.2.0-alpha.0",
+  "version": "7.2.0-rc.0",
   "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.2.0-alpha.0",
-    "@storybook/components": "7.2.0-alpha.0",
-    "@storybook/core-events": "7.2.0-alpha.0",
+    "@storybook/client-logger": "7.2.0-rc.0",
+    "@storybook/components": "7.2.0-rc.0",
+    "@storybook/core-events": "7.2.0-rc.0",
     "@storybook/global": "^5.0.0",
-    "@storybook/manager-api": "7.2.0-alpha.0",
-    "@storybook/preview-api": "7.2.0-alpha.0",
-    "@storybook/theming": "7.2.0-alpha.0",
-    "@storybook/types": "7.2.0-alpha.0",
+    "@storybook/manager-api": "7.2.0-rc.0",
+    "@storybook/preview-api": "7.2.0-rc.0",
+    "@storybook/theming": "7.2.0-rc.0",
+    "@storybook/types": "7.2.0-rc.0",
     "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.2.0-alpha.0",
+  "version": "7.2.0-rc.0",
   "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.2.0-alpha.0",
-    "@storybook/components": "7.2.0-alpha.0",
-    "@storybook/core-events": "7.2.0-alpha.0",
+    "@storybook/client-logger": "7.2.0-rc.0",
+    "@storybook/components": "7.2.0-rc.0",
+    "@storybook/core-events": "7.2.0-rc.0",
     "@storybook/global": "^5.0.0",
-    "@storybook/manager-api": "7.2.0-alpha.0",
-    "@storybook/preview-api": "7.2.0-alpha.0",
-    "@storybook/theming": "7.2.0-alpha.0",
-    "@storybook/types": "7.2.0-alpha.0",
+    "@storybook/manager-api": "7.2.0-rc.0",
+    "@storybook/preview-api": "7.2.0-rc.0",
+    "@storybook/theming": "7.2.0-rc.0",
+    "@storybook/types": "7.2.0-rc.0",
     "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.2.0-alpha.0",
+  "version": "7.2.0-rc.0",
   "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.2.0-alpha.0",
-    "@storybook/client-logger": "7.2.0-alpha.0",
-    "@storybook/components": "7.2.0-alpha.0",
-    "@storybook/core-common": "7.2.0-alpha.0",
-    "@storybook/manager-api": "7.2.0-alpha.0",
-    "@storybook/node-logger": "7.2.0-alpha.0",
-    "@storybook/preview-api": "7.2.0-alpha.0",
-    "@storybook/theming": "7.2.0-alpha.0",
-    "@storybook/types": "7.2.0-alpha.0",
+    "@storybook/blocks": "7.2.0-rc.0",
+    "@storybook/client-logger": "7.2.0-rc.0",
+    "@storybook/components": "7.2.0-rc.0",
+    "@storybook/core-common": "7.2.0-rc.0",
+    "@storybook/manager-api": "7.2.0-rc.0",
+    "@storybook/node-logger": "7.2.0-rc.0",
+    "@storybook/preview-api": "7.2.0-rc.0",
+    "@storybook/theming": "7.2.0-rc.0",
+    "@storybook/types": "7.2.0-rc.0",
     "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.2.0-alpha.0",
+  "version": "7.2.0-rc.0",
   "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.2.0-alpha.0",
-    "@storybook/client-logger": "7.2.0-alpha.0",
-    "@storybook/components": "7.2.0-alpha.0",
-    "@storybook/csf-plugin": "7.2.0-alpha.0",
-    "@storybook/csf-tools": "7.2.0-alpha.0",
+    "@storybook/blocks": "7.2.0-rc.0",
+    "@storybook/client-logger": "7.2.0-rc.0",
+    "@storybook/components": "7.2.0-rc.0",
+    "@storybook/csf-plugin": "7.2.0-rc.0",
+    "@storybook/csf-tools": "7.2.0-rc.0",
     "@storybook/global": "^5.0.0",
     "@storybook/mdx2-csf": "^1.0.0",
-    "@storybook/node-logger": "7.2.0-alpha.0",
-    "@storybook/postinstall": "7.2.0-alpha.0",
-    "@storybook/preview-api": "7.2.0-alpha.0",
-    "@storybook/react-dom-shim": "7.2.0-alpha.0",
-    "@storybook/theming": "7.2.0-alpha.0",
-    "@storybook/types": "7.2.0-alpha.0",
+    "@storybook/node-logger": "7.2.0-rc.0",
+    "@storybook/postinstall": "7.2.0-rc.0",
+    "@storybook/preview-api": "7.2.0-rc.0",
+    "@storybook/react-dom-shim": "7.2.0-rc.0",
+    "@storybook/theming": "7.2.0-rc.0",
+    "@storybook/types": "7.2.0-rc.0",
     "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.2.0-alpha.0",
+  "version": "7.2.0-rc.0",
   "description": "Curated addons to bring out the best of Storybook",
   "keywords": [
     "addon",
@@ -129,24 +129,24 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/addon-actions": "7.2.0-alpha.0",
-    "@storybook/addon-backgrounds": "7.2.0-alpha.0",
-    "@storybook/addon-controls": "7.2.0-alpha.0",
-    "@storybook/addon-docs": "7.2.0-alpha.0",
-    "@storybook/addon-highlight": "7.2.0-alpha.0",
-    "@storybook/addon-measure": "7.2.0-alpha.0",
-    "@storybook/addon-outline": "7.2.0-alpha.0",
-    "@storybook/addon-themes": "7.2.0-alpha.0",
-    "@storybook/addon-toolbars": "7.2.0-alpha.0",
-    "@storybook/addon-viewport": "7.2.0-alpha.0",
-    "@storybook/core-common": "7.2.0-alpha.0",
-    "@storybook/manager-api": "7.2.0-alpha.0",
-    "@storybook/node-logger": "7.2.0-alpha.0",
-    "@storybook/preview-api": "7.2.0-alpha.0",
+    "@storybook/addon-actions": "7.2.0-rc.0",
+    "@storybook/addon-backgrounds": "7.2.0-rc.0",
+    "@storybook/addon-controls": "7.2.0-rc.0",
+    "@storybook/addon-docs": "7.2.0-rc.0",
+    "@storybook/addon-highlight": "7.2.0-rc.0",
+    "@storybook/addon-measure": "7.2.0-rc.0",
+    "@storybook/addon-outline": "7.2.0-rc.0",
+    "@storybook/addon-themes": "7.2.0-rc.0",
+    "@storybook/addon-toolbars": "7.2.0-rc.0",
+    "@storybook/addon-viewport": "7.2.0-rc.0",
+    "@storybook/core-common": "7.2.0-rc.0",
+    "@storybook/manager-api": "7.2.0-rc.0",
+    "@storybook/node-logger": "7.2.0-rc.0",
+    "@storybook/preview-api": "7.2.0-rc.0",
     "ts-dedent": "^2.0.0"
   },
   "devDependencies": {
-    "@storybook/vue": "7.2.0-alpha.0",
+    "@storybook/vue": "7.2.0-rc.0",
     "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.2.0-alpha.0",
+  "version": "7.2.0-rc.0",
   "description": "GitHub Flavored Markdown in Storybook",
   "keywords": [
     "addon",
@@ -51,7 +51,7 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/node-logger": "7.2.0-alpha.0",
+    "@storybook/node-logger": "7.2.0-rc.0",
     "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.2.0-alpha.0",
+  "version": "7.2.0-rc.0",
   "description": "Highlight DOM nodes within your stories",
   "keywords": [
     "storybook-addons",
@@ -61,9 +61,9 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/core-events": "7.2.0-alpha.0",
+    "@storybook/core-events": "7.2.0-rc.0",
     "@storybook/global": "^5.0.0",
-    "@storybook/preview-api": "7.2.0-alpha.0"
+    "@storybook/preview-api": "7.2.0-rc.0"
   },
   "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.2.0-alpha.0",
+  "version": "7.2.0-rc.0",
   "description": "Automate, test and debug user interactions",
   "keywords": [
     "storybook-addons",
@@ -72,16 +72,16 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/client-logger": "7.2.0-alpha.0",
-    "@storybook/components": "7.2.0-alpha.0",
-    "@storybook/core-common": "7.2.0-alpha.0",
-    "@storybook/core-events": "7.2.0-alpha.0",
+    "@storybook/client-logger": "7.2.0-rc.0",
+    "@storybook/components": "7.2.0-rc.0",
+    "@storybook/core-common": "7.2.0-rc.0",
+    "@storybook/core-events": "7.2.0-rc.0",
     "@storybook/global": "^5.0.0",
-    "@storybook/instrumenter": "7.2.0-alpha.0",
-    "@storybook/manager-api": "7.2.0-alpha.0",
-    "@storybook/preview-api": "7.2.0-alpha.0",
-    "@storybook/theming": "7.2.0-alpha.0",
-    "@storybook/types": "7.2.0-alpha.0",
+    "@storybook/instrumenter": "7.2.0-rc.0",
+    "@storybook/manager-api": "7.2.0-rc.0",
+    "@storybook/preview-api": "7.2.0-rc.0",
+    "@storybook/theming": "7.2.0-rc.0",
+    "@storybook/types": "7.2.0-rc.0",
     "jest-mock": "^27.0.6",
     "polished": "^4.2.2",
     "ts-dedent": "^2.2.0"

diff --git a/code/addons/jest/package.json b/code/addons/jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-jest",
-  "version": "7.2.0-alpha.0",
+  "version": "7.2.0-rc.0",
   "description": "React storybook addon that show component jest report",
   "keywords": [
     "addon",
@@ -70,13 +70,13 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/client-logger": "7.2.0-alpha.0",
-    "@storybook/components": "7.2.0-alpha.0",
-    "@storybook/core-events": "7.2.0-alpha.0",
+    "@storybook/client-logger": "7.2.0-rc.0",
+    "@storybook/components": "7.2.0-rc.0",
+    "@storybook/core-events": "7.2.0-rc.0",
     "@storybook/global": "^5.0.0",
-    "@storybook/manager-api": "7.2.0-alpha.0",
-    "@storybook/preview-api": "7.2.0-alpha.0",
-    "@storybook/theming": "7.2.0-alpha.0",
+    "@storybook/manager-api": "7.2.0-rc.0",
+    "@storybook/preview-api": "7.2.0-rc.0",
+    "@storybook/theming": "7.2.0-rc.0",
     "react-resize-detector": "^7.1.2",
     "tiny-invariant": "^1.3.1",
     "upath": "^2.0.1"