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

…2.0-rc.0

Release: Minor 7.2.0

.circleci/config.yml

@@ -4,7 +4,7 @@ parameters:
   workflow:
     description: Which workflow to run
     type: enum
-    enum: ['normal', 'merged', 'daily', 'skipped']
+    enum: ['normal', 'merged', 'daily', 'skipped', 'docs']
     default: 'skipped'
 
 executors:

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

CHANGELOG.md

@@ -1,3 +1,35 @@
+## 7.2.0
+
+This month, we're going to experiment with our launch cycle by making smaller but more frequent releases. Our goal is to bring you new features more quickly, while also smoothing the upgrade process.
+
+Storybook 7.2 is the first of these new, faster releases:
+
+- Automigration: Fix wrap-require automigration for common js main.js files - [#23644](https://github.com/storybookjs/storybook/pull/23644), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!
+- CSF Tools: Use recast for printing in csf-tools - [#23427](https://github.com/storybookjs/storybook/pull/23427), thanks [@kasperpeulen](https://github.com/kasperpeulen)!
+- CSF-tools: Parse stories using typescript keywords 'satisfies' and 'as' - [#23638](https://github.com/storybookjs/storybook/pull/23638), thanks [@joaonunomota](https://github.com/joaonunomota)!
+- Core: Fix channelOptions for serverChannel - [#23615](https://github.com/storybookjs/storybook/pull/23615), thanks [@ndelangen](https://github.com/ndelangen)!
+- NextJS: Add `@babel/core` as a dependency - [#22450](https://github.com/storybookjs/storybook/pull/22450), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!
+- Vite: Fix config loading - project directory - [#22240](https://github.com/storybookjs/storybook/pull/22240), thanks [@nVitius](https://github.com/nVitius)!
+- Angular: Fix initialization of Storybook in Angular 16.1 - [#23598](https://github.com/storybookjs/storybook/pull/23598), 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)!
+- Router: Support RegExp in Route component - [#23292](https://github.com/storybookjs/storybook/pull/23292), thanks [@ndelangen](https://github.com/ndelangen)!
+- UI: Improve tabs component, more type correct, allow for FC as title - [#23288](https://github.com/storybookjs/storybook/pull/23288), thanks [@ndelangen](https://github.com/ndelangen)!
+- Addons: Improve code quality by using title as FC & sharing state via useAddonState - [#23298](https://github.com/storybookjs/storybook/pull/23298), thanks [@ndelangen](https://github.com/ndelangen)!
+- InteractionsAddon: Improve code quality by using title as FC & sharing state via useAddonState - [#23291](https://github.com/storybookjs/storybook/pull/23291), thanks [@ndelangen](https://github.com/ndelangen)!
+- UI: Add storyStatus to sidebar UI - [#23342](https://github.com/storybookjs/storybook/pull/23342), thanks [@ndelangen](https://github.com/ndelangen)!
+- Addon API: Add experimental page addon type - [#23307](https://github.com/storybookjs/storybook/pull/23307), thanks [@ndelangen](https://github.com/ndelangen)!
+- UI: refactor Canvas component so we can improve types for PREVIEW addons and TAB addons - [#23311](https://github.com/storybookjs/storybook/pull/23311), thanks [@ndelangen](https://github.com/ndelangen)!
+- UI: Improve Button layout and props - [#23356](https://github.com/storybookjs/storybook/pull/23356), thanks [@cdedreuille](https://github.com/cdedreuille)!
+- Dependencies: Remove references to api and the 2 deprecated channel packages - [#23384](https://github.com/storybookjs/storybook/pull/23384), thanks [@ndelangen](https://github.com/ndelangen)!
+- UI: Show the story status in the search results - [#23441](https://github.com/storybookjs/storybook/pull/23441), thanks [@ndelangen](https://github.com/ndelangen)!
+- UI: Create new form elements in the new Core UI (Input, TextArea, Select) - [#23469](https://github.com/storybookjs/storybook/pull/23469), thanks [@cdedreuille](https://github.com/cdedreuille)!
+
+
 ## 7.1.1
 
 - Angular: Make enableProdMode optional - [#23489](https://github.com/storybookjs/storybook/pull/23489), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!

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

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>

SECURITY.md

@@ -2,9 +2,9 @@
 
 ## Supported Versions
 
-| Version       | Supported          |
-| ------------- | ------------------ |
-| 6.3, 6.4, 6.5 | :white_check_mark: |
+We release patches for fixing security vulnerabilities, primarily focusing on the latest release only. 
+
+In the event of a high-risk vulnerability, we may backport the security fixes to the minor versions of the software, starting from the latest minor version up to the latest major release. The decision to backport security fixes to older versions will be made based on a risk assessment and the feasibility of implementing the patch in those versions.
 
 ## Reporting a Vulnerability
 

code/addons/a11y/package.json

@@ -63,16 +63,16 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@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/addon-highlight": "workspace:*",
+    "@storybook/channels": "workspace:*",
+    "@storybook/client-logger": "workspace:*",
+    "@storybook/components": "workspace:*",
+    "@storybook/core-events": "workspace:*",
     "@storybook/global": "^5.0.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",
+    "@storybook/manager-api": "workspace:*",
+    "@storybook/preview-api": "workspace:*",
+    "@storybook/theming": "workspace:*",
+    "@storybook/types": "workspace:*",
     "axe-core": "^4.2.0",
     "lodash": "^4.17.21",
     "react-resize-detector": "^7.1.2"

code/addons/actions/package.json

@@ -80,14 +80,14 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/client-logger": "7.2.0-rc.0",
-    "@storybook/components": "7.2.0-rc.0",
-    "@storybook/core-events": "7.2.0-rc.0",
+    "@storybook/client-logger": "workspace:*",
+    "@storybook/components": "workspace:*",
+    "@storybook/core-events": "workspace:*",
     "@storybook/global": "^5.0.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",
+    "@storybook/manager-api": "workspace:*",
+    "@storybook/preview-api": "workspace:*",
+    "@storybook/theming": "workspace:*",
+    "@storybook/types": "workspace:*",
     "dequal": "^2.0.2",
     "lodash": "^4.17.21",
     "polished": "^4.2.2",

code/addons/backgrounds/package.json

@@ -76,14 +76,14 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/client-logger": "7.2.0-rc.0",
-    "@storybook/components": "7.2.0-rc.0",
-    "@storybook/core-events": "7.2.0-rc.0",
+    "@storybook/client-logger": "workspace:*",
+    "@storybook/components": "workspace:*",
+    "@storybook/core-events": "workspace:*",
     "@storybook/global": "^5.0.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",
+    "@storybook/manager-api": "workspace:*",
+    "@storybook/preview-api": "workspace:*",
+    "@storybook/theming": "workspace:*",
+    "@storybook/types": "workspace:*",
     "memoizerific": "^1.11.3",
     "ts-dedent": "^2.0.0"
   },

code/addons/controls/package.json

@@ -68,15 +68,15 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@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",
+    "@storybook/blocks": "workspace:*",
+    "@storybook/client-logger": "workspace:*",
+    "@storybook/components": "workspace:*",
+    "@storybook/core-common": "workspace:*",
+    "@storybook/manager-api": "workspace:*",
+    "@storybook/node-logger": "workspace:*",
+    "@storybook/preview-api": "workspace:*",
+    "@storybook/theming": "workspace:*",
+    "@storybook/types": "workspace:*",
     "lodash": "^4.17.21",
     "ts-dedent": "^2.0.0"
   },

code/addons/docs/package.json

@@ -99,19 +99,19 @@
   "dependencies": {
     "@jest/transform": "^29.3.1",
     "@mdx-js/react": "^2.1.5",
-    "@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/blocks": "workspace:*",
+    "@storybook/client-logger": "workspace:*",
+    "@storybook/components": "workspace:*",
+    "@storybook/csf-plugin": "workspace:*",
+    "@storybook/csf-tools": "workspace:*",
     "@storybook/global": "^5.0.0",
     "@storybook/mdx2-csf": "^1.0.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",
+    "@storybook/node-logger": "workspace:*",
+    "@storybook/postinstall": "workspace:*",
+    "@storybook/preview-api": "workspace:*",
+    "@storybook/react-dom-shim": "workspace:*",
+    "@storybook/theming": "workspace:*",
+    "@storybook/types": "workspace:*",
     "fs-extra": "^11.1.0",
     "remark-external-links": "^8.0.0",
     "remark-slug": "^6.0.0",

code/addons/essentials/package.json

@@ -93,16 +93,6 @@
       "require": "./dist/outline/manager.js",
       "import": "./dist/outline/manager.mjs"
     },
-    "./themes/manager": {
-      "types": "./dist/themes/manager.d.ts",
-      "require": "./dist/themes/manager.js",
-      "import": "./dist/themes/manager.mjs"
-    },
-    "./themes/preview": {
-      "types": "./dist/themes/preview.d.ts",
-      "require": "./dist/themes/preview.js",
-      "import": "./dist/themes/preview.mjs"
-    },
     "./toolbars/manager": {
       "types": "./dist/toolbars/manager.d.ts",
       "require": "./dist/toolbars/manager.js",
@@ -129,24 +119,23 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@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",
+    "@storybook/addon-actions": "workspace:*",
+    "@storybook/addon-backgrounds": "workspace:*",
+    "@storybook/addon-controls": "workspace:*",
+    "@storybook/addon-docs": "workspace:*",
+    "@storybook/addon-highlight": "workspace:*",
+    "@storybook/addon-measure": "workspace:*",
+    "@storybook/addon-outline": "workspace:*",
+    "@storybook/addon-toolbars": "workspace:*",
+    "@storybook/addon-viewport": "workspace:*",
+    "@storybook/core-common": "workspace:*",
+    "@storybook/manager-api": "workspace:*",
+    "@storybook/node-logger": "workspace:*",
+    "@storybook/preview-api": "workspace:*",
     "ts-dedent": "^2.0.0"
   },
   "devDependencies": {
-    "@storybook/vue": "7.2.0-rc.0",
+    "@storybook/vue": "workspace:*",
     "typescript": "^4.9.3"
   },
   "peerDependencies": {
@@ -173,9 +162,7 @@
       "./src/outline/preview.ts",
       "./src/outline/manager.ts",
       "./src/toolbars/manager.ts",
-      "./src/viewport/manager.ts",
-      "./src/themes/manager.ts",
-      "./src/themes/preview.ts"
+      "./src/viewport/manager.ts"
     ],
     "platform": "node"
   },

code/addons/essentials/src/index.ts

@@ -50,7 +50,6 @@ export function addons(options: PresetOptions) {
     'measure',
     'outline',
     'highlight',
-    'themes',
   ]
     .filter((key) => (options as any)[key] !== false)
     .filter((addon) => !checkInstalled(addon, main))

code/addons/gfm/package.json

@@ -51,7 +51,7 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/node-logger": "7.2.0-rc.0",
+    "@storybook/node-logger": "workspace:*",
     "remark-gfm": "^3.0.1",
     "ts-dedent": "^2.0.0"
   },

code/addons/highlight/package.json

@@ -61,9 +61,9 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/core-events": "7.2.0-rc.0",
+    "@storybook/core-events": "workspace:*",
     "@storybook/global": "^5.0.0",
-    "@storybook/preview-api": "7.2.0-rc.0"
+    "@storybook/preview-api": "workspace:*"
   },
   "devDependencies": {
     "@types/webpack-env": "^1.16.0",

code/addons/interactions/package.json

@@ -72,16 +72,16 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@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/client-logger": "workspace:*",
+    "@storybook/components": "workspace:*",
+    "@storybook/core-common": "workspace:*",
+    "@storybook/core-events": "workspace:*",
     "@storybook/global": "^5.0.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",
+    "@storybook/instrumenter": "workspace:*",
+    "@storybook/manager-api": "workspace:*",
+    "@storybook/preview-api": "workspace:*",
+    "@storybook/theming": "workspace:*",
+    "@storybook/types": "workspace:*",
     "jest-mock": "^27.0.6",
     "polished": "^4.2.2",
     "ts-dedent": "^2.2.0"

code/addons/interactions/src/components/MatcherResult.tsx

@@ -1,3 +1,4 @@
+/* eslint-disable react/no-array-index-key */
 import React from 'react';
 import { styled, typography } from '@storybook/theming';
 import { Node } from './MethodCall';

code/addons/interactions/src/components/MethodCall.tsx

@@ -1,3 +1,4 @@
+/* eslint-disable react/no-array-index-key */
 import { ObjectInspector } from '@devtools-ds/object-inspector';
 import type { Call, CallRef, ElementRef } from '@storybook/instrumenter';
 import { useTheme } from '@storybook/theming';