diff --git a/CHANGELOG.md b/CHANGELOG.md index 22b272ee60c..0f704ba880a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,30 @@ +## 7.0.0-beta.3 (December 10, 2022) + +#### Bug Fixes + +- CLI: Fix sb migrate codemods [#20191](https://github.com/storybooks/storybook/pull/20191) +- Measure: Fix measure not working on disabled elements [#19985](https://github.com/storybooks/storybook/pull/19985) + +#### Maintenance + +- SvelteKit: Automigration [#20094](https://github.com/storybooks/storybook/pull/20094) +- Tech: change `package.json` engines fields, set to minimal node16 and up [#20170](https://github.com/storybooks/storybook/pull/20170) + +## 7.0.0-beta.2 (December 9, 2022) + +#### Bug Fixes + +- Core: Catch and do nothing to avoid triggering unhandled exception problems [#20177](https://github.com/storybooks/storybook/pull/20177) +- Controls: Fix color control not resetting when initial value is defined [#20049](https://github.com/storybooks/storybook/pull/20049) +- Core: Fix typescript.checkOptions not a valid interface [#20166](https://github.com/storybooks/storybook/pull/20166) +- NextJS: Fixlogic around `next/future/image` [#20173](https://github.com/storybooks/storybook/pull/20173) + +#### Maintenance + +- Revert "Revert "Telemetry: Add precedingUpgrade data to dev/build/error events"" [#20176](https://github.com/storybooks/storybook/pull/20176) +- Telemetry: Add `chromatic` to addons list [#20143](https://github.com/storybooks/storybook/pull/20143) +- Vite: Support vite 4 [#20139](https://github.com/storybooks/storybook/pull/20139) + ## 7.0.0-beta.1 (December 9, 2022) #### Bug Fixes diff --git a/MIGRATION.md b/MIGRATION.md index eef9f812750..7ac06afbec0 100644 --- a/MIGRATION.md +++ b/MIGRATION.md @@ -586,6 +586,8 @@ When using a [Vite-based framework](#framework-field-mandatory), Storybook will Some settings will be overridden by storybook so that it can function properly, and the merged settings can be modified using `viteFinal` in `.storybook/main.js` (see the [Storybook Vite configuration docs](https://storybook.js.org/docs/react/builders/vite#configuration)). If you were using `viteFinal` in 6.5 to simply merge in your project's standard vite config, you can now remove it. +For Svelte projects this means that the `svelteOptions` property in the `main.js` config can be omitted in most cases, as it will be loaded automatically via the project's `vite.config.js`. An exception to this is when the project needs different Svelte options for Storybook than the Vite config provides for the application itself. + #### Vite cache moved to node_modules/.cache/.vite-storybook Previously, Storybook's Vite builder placed cache files in node_modules/.vite-storybook. However, it's more common for tools to place cached files into `node_modules/.cache`, and putting them there makes it quick and easy to clear the cache for multiple tools at once. We don't expect this change will cause any problems, but it's something that users of Storybook Vite projects should know about. It can be configured by setting `cacheDir` in `viteFinal` within `.storybook/main.js` [Storybook Vite configuration docs](https://storybook.js.org/docs/react/builders/vite#configuration)). @@ -601,6 +603,8 @@ export default { }; ``` +Also see the note in [Vite builder uses vite config automatically](#vite-builder-uses-vite-config-automatically) about removing `svelteOptions`. + #### Removed docs.getContainer and getPage parameters It is no longer possible to set `parameters.docs.getContainer()` and `getPage()`. Instead use `parameters.docs.container` or `parameters.docs.page` directly. @@ -643,7 +647,7 @@ Starting in 7.0 the `grid.cellSize` parameter should now be `backgrounds.grid.ce #### Addon-docs: Removed deprecated blocks.js entry -Removed `@storybook/addon-docs/blocks` entry. Import directly from `@storybook/addon-docs` instead. This was [deprecated in SB 6.3](#deprecated-scoped-blocks-imports). +Removed `@storybook/addon-docs/blocks` entry. Import directly from `@storybook/blocks` instead. This was [deprecated in SB 6.3](#deprecated-scoped-blocks-imports). #### Addon-a11y: Removed deprecated withA11y decorator diff --git a/code/addons/a11y/package.json b/code/addons/a11y/package.json index 5c91e4778df..4063e451f87 100644 --- a/code/addons/a11y/package.json +++ b/code/addons/a11y/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-a11y", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Test component compliance with web accessibility standards", "keywords": [ "a11y", @@ -62,15 +62,15 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addon-highlight": "7.0.0-beta.1", - "@storybook/channels": "7.0.0-beta.1", - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/components": "7.0.0-beta.1", - "@storybook/core-events": "7.0.0-beta.1", - "@storybook/manager-api": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/theming": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/addon-highlight": "7.0.0-beta.3", + "@storybook/channels": "7.0.0-beta.3", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/components": "7.0.0-beta.3", + "@storybook/core-events": "7.0.0-beta.3", + "@storybook/manager-api": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/theming": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "axe-core": "^4.2.0", "global": "^4.4.0", "lodash": "^4.17.21", @@ -102,7 +102,7 @@ "./src/preview.tsx" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd", + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880", "storybook": { "displayName": "Accessibility", "icon": "https://user-images.githubusercontent.com/263385/101991665-47042f80-3c7c-11eb-8f00-64b5a18f498a.png", diff --git a/code/addons/actions/package.json b/code/addons/actions/package.json index 495295333eb..a0be675cdce 100644 --- a/code/addons/actions/package.json +++ b/code/addons/actions/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-actions", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Get UI feedback when an action is performed on an interactive element", "keywords": [ "storybook", @@ -76,13 +76,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/components": "7.0.0-beta.1", - "@storybook/core-events": "7.0.0-beta.1", - "@storybook/manager-api": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/theming": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/components": "7.0.0-beta.3", + "@storybook/core-events": "7.0.0-beta.3", + "@storybook/manager-api": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/theming": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "dequal": "^2.0.2", "global": "^4.4.0", "lodash": "^4.17.21", @@ -120,7 +120,7 @@ "./src/preview.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd", + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880", "storybook": { "displayName": "Actions", "unsupportedFrameworks": [ diff --git a/code/addons/backgrounds/package.json b/code/addons/backgrounds/package.json index 82c7b22ae32..14a6f4656b0 100644 --- a/code/addons/backgrounds/package.json +++ b/code/addons/backgrounds/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-backgrounds", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Switch backgrounds to view components in different settings", "keywords": [ "addon", @@ -75,13 +75,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/components": "7.0.0-beta.1", - "@storybook/core-events": "7.0.0-beta.1", - "@storybook/manager-api": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/theming": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/components": "7.0.0-beta.3", + "@storybook/core-events": "7.0.0-beta.3", + "@storybook/manager-api": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/theming": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "global": "^4.4.0", "memoizerific": "^1.11.3", "ts-dedent": "^2.0.0" @@ -111,7 +111,7 @@ "./src/preview.tsx" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd", + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880", "storybook": { "displayName": "Backgrounds", "icon": "https://user-images.githubusercontent.com/263385/101991667-479cc600-3c7c-11eb-96d3-410e936252e7.png", diff --git a/code/addons/controls/package.json b/code/addons/controls/package.json index 068d631e055..e355984632d 100644 --- a/code/addons/controls/package.json +++ b/code/addons/controls/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-controls", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Interact with component inputs dynamically in the Storybook UI", "keywords": [ "addon", @@ -67,15 +67,15 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/blocks": "7.0.0-beta.1", - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/components": "7.0.0-beta.1", - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/manager-api": "7.0.0-beta.1", - "@storybook/node-logger": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/theming": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/blocks": "7.0.0-beta.3", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/components": "7.0.0-beta.3", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/manager-api": "7.0.0-beta.3", + "@storybook/node-logger": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/theming": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "lodash": "^4.17.21", "ts-dedent": "^2.0.0" }, @@ -101,7 +101,7 @@ ], "platform": "browser" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd", + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880", "storybook": { "displayName": "Controls", "icon": "https://user-images.githubusercontent.com/263385/101991669-479cc600-3c7c-11eb-93d9-38b67e8371f2.png", diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json index 37d0c11713e..7a0c76d7944 100644 --- a/code/addons/docs/package.json +++ b/code/addons/docs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-docs", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Document component usage and properties in Markdown", "keywords": [ "addon", @@ -99,16 +99,16 @@ "@babel/plugin-transform-react-jsx": "^7.19.0", "@jest/transform": "^29.3.1", "@mdx-js/react": "^2.1.5", - "@storybook/blocks": "7.0.0-beta.1", - "@storybook/components": "7.0.0-beta.1", - "@storybook/csf-plugin": "7.0.0-beta.1", - "@storybook/csf-tools": "7.0.0-beta.1", + "@storybook/blocks": "7.0.0-beta.3", + "@storybook/components": "7.0.0-beta.3", + "@storybook/csf-plugin": "7.0.0-beta.3", + "@storybook/csf-tools": "7.0.0-beta.3", "@storybook/mdx2-csf": "next", - "@storybook/node-logger": "7.0.0-beta.1", - "@storybook/postinstall": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/theming": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/node-logger": "7.0.0-beta.3", + "@storybook/postinstall": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/theming": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "fs-extra": "^9.0.1", "global": "^4.4.0", "remark-external-links": "^8.0.0", @@ -135,7 +135,7 @@ "./src/shims/mdx-react-shim.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd", + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880", "storybook": { "displayName": "Docs", "icon": "https://user-images.githubusercontent.com/263385/101991672-48355c80-3c7c-11eb-82d9-95fa12438f64.png", diff --git a/code/addons/essentials/package.json b/code/addons/essentials/package.json index cd1de4efe7c..aa70dcd16ca 100644 --- a/code/addons/essentials/package.json +++ b/code/addons/essentials/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-essentials", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Curated addons to bring out the best of Storybook", "keywords": [ "addon", @@ -116,23 +116,23 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addon-actions": "7.0.0-beta.1", - "@storybook/addon-backgrounds": "7.0.0-beta.1", - "@storybook/addon-controls": "7.0.0-beta.1", - "@storybook/addon-docs": "7.0.0-beta.1", - "@storybook/addon-highlight": "7.0.0-beta.1", - "@storybook/addon-measure": "7.0.0-beta.1", - "@storybook/addon-outline": "7.0.0-beta.1", - "@storybook/addon-toolbars": "7.0.0-beta.1", - "@storybook/addon-viewport": "7.0.0-beta.1", - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/manager-api": "7.0.0-beta.1", - "@storybook/node-logger": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", + "@storybook/addon-actions": "7.0.0-beta.3", + "@storybook/addon-backgrounds": "7.0.0-beta.3", + "@storybook/addon-controls": "7.0.0-beta.3", + "@storybook/addon-docs": "7.0.0-beta.3", + "@storybook/addon-highlight": "7.0.0-beta.3", + "@storybook/addon-measure": "7.0.0-beta.3", + "@storybook/addon-outline": "7.0.0-beta.3", + "@storybook/addon-toolbars": "7.0.0-beta.3", + "@storybook/addon-viewport": "7.0.0-beta.3", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/manager-api": "7.0.0-beta.3", + "@storybook/node-logger": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", "ts-dedent": "^2.0.0" }, "devDependencies": { - "@storybook/vue": "7.0.0-beta.1", + "@storybook/vue": "7.0.0-beta.3", "typescript": "^4.9.3" }, "peerDependencies": { @@ -163,5 +163,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/addons/highlight/package.json b/code/addons/highlight/package.json index 78bf99b72db..5beebe74259 100644 --- a/code/addons/highlight/package.json +++ b/code/addons/highlight/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-highlight", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Highlight DOM nodes within your stories", "keywords": [ "storybook-addons", @@ -60,8 +60,8 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-events": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", + "@storybook/core-events": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", "global": "^4.4.0" }, "devDependencies": { @@ -77,7 +77,7 @@ "./src/preview.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd", + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880", "sbmodern": "dist/modern/index.js", "storybook": { "displayName": "Highlight", diff --git a/code/addons/interactions/package.json b/code/addons/interactions/package.json index 5befc6bd0b7..44a809dc466 100644 --- a/code/addons/interactions/package.json +++ b/code/addons/interactions/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-interactions", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Automate, test and debug user interactions", "keywords": [ "storybook-addons", @@ -71,15 +71,15 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/components": "7.0.0-beta.1", - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/core-events": "7.0.0-beta.1", - "@storybook/instrumenter": "7.0.0-beta.1", - "@storybook/manager-api": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/theming": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/components": "7.0.0-beta.3", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/core-events": "7.0.0-beta.3", + "@storybook/instrumenter": "7.0.0-beta.3", + "@storybook/manager-api": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/theming": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "global": "^4.4.0", "jest-mock": "^27.0.6", "polished": "^4.2.2", @@ -117,7 +117,7 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd", + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880", "storybook": { "displayName": "Interactions", "unsupportedFrameworks": [ diff --git a/code/addons/jest/package.json b/code/addons/jest/package.json index a77f3723a46..9f8fb45ab71 100644 --- a/code/addons/jest/package.json +++ b/code/addons/jest/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-jest", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "React storybook addon that show component jest report", "keywords": [ "addon", @@ -69,12 +69,12 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/components": "7.0.0-beta.1", - "@storybook/core-events": "7.0.0-beta.1", - "@storybook/manager-api": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/theming": "7.0.0-beta.1", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/components": "7.0.0-beta.3", + "@storybook/core-events": "7.0.0-beta.3", + "@storybook/manager-api": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/theming": "7.0.0-beta.3", "global": "^4.4.0", "react-sizeme": "^3.0.1", "upath": "^1.2.0" @@ -104,7 +104,7 @@ ], "platform": "browser" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd", + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880", "storybook": { "displayName": "Jest", "icon": "https://pbs.twimg.com/profile_images/821713465245102080/mMtKIMax_400x400.jpg", diff --git a/code/addons/links/package.json b/code/addons/links/package.json index f80ba5a013f..a9368c3a848 100644 --- a/code/addons/links/package.json +++ b/code/addons/links/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-links", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Link stories together to build demos and prototypes with your UI components", "keywords": [ "addon", @@ -76,13 +76,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/core-events": "7.0.0-beta.1", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/core-events": "7.0.0-beta.3", "@storybook/csf": "next", - "@storybook/manager-api": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/router": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/manager-api": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/router": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "global": "^4.4.0", "prop-types": "^15.7.2", "ts-dedent": "^2.0.0" @@ -113,7 +113,7 @@ "./src/react/index.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd", + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880", "storybook": { "displayName": "Links", "icon": "https://user-images.githubusercontent.com/263385/101991673-48355c80-3c7c-11eb-9b6e-b627c96a75f6.png", diff --git a/code/addons/measure/package.json b/code/addons/measure/package.json index 539277db4b4..05a9a6fe57a 100644 --- a/code/addons/measure/package.json +++ b/code/addons/measure/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-measure", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Inspect layouts by visualizing the box model", "keywords": [ "storybook-addons", @@ -74,12 +74,12 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/components": "7.0.0-beta.1", - "@storybook/core-events": "7.0.0-beta.1", - "@storybook/manager-api": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/components": "7.0.0-beta.3", + "@storybook/core-events": "7.0.0-beta.3", + "@storybook/manager-api": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "global": "^4.4.0" }, "devDependencies": { @@ -107,7 +107,7 @@ "./src/preview.tsx" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd", + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880", "storybook": { "displayName": "Measure", "unsupportedFrameworks": [ diff --git a/code/addons/measure/src/withMeasure.ts b/code/addons/measure/src/withMeasure.ts index e821e6f8c90..8a6b2a41489 100644 --- a/code/addons/measure/src/withMeasure.ts +++ b/code/addons/measure/src/withMeasure.ts @@ -17,7 +17,7 @@ export const withMeasure = (StoryFn: StoryFunction, context: StoryCont const { measureEnabled } = context.globals; useEffect(() => { - const onMouseMove = (event: MouseEvent) => { + const onPointerMove = (event: MouseEvent) => { window.requestAnimationFrame(() => { event.stopPropagation(); pointer.x = event.clientX; @@ -25,15 +25,15 @@ export const withMeasure = (StoryFn: StoryFunction, context: StoryCont }); }; - document.addEventListener('mousemove', onMouseMove); + document.addEventListener('pointermove', onPointerMove); return () => { - document.removeEventListener('mousemove', onMouseMove); + document.removeEventListener('pointermove', onPointerMove); }; }, []); useEffect(() => { - const onMouseOver = (event: MouseEvent) => { + const onPointerOver = (event: MouseEvent) => { window.requestAnimationFrame(() => { event.stopPropagation(); findAndDrawElement(event.clientX, event.clientY); @@ -47,7 +47,7 @@ export const withMeasure = (StoryFn: StoryFunction, context: StoryCont }; if (measureEnabled) { - document.addEventListener('mouseover', onMouseOver); + document.addEventListener('pointerover', onPointerOver); init(); window.addEventListener('resize', onResize); // Draw the element below the pointer when first enabled diff --git a/code/addons/outline/package.json b/code/addons/outline/package.json index d94a298d3b5..2f8db6140fe 100644 --- a/code/addons/outline/package.json +++ b/code/addons/outline/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-outline", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Outline all elements with CSS to help with layout placement and alignment", "keywords": [ "storybook-addons", @@ -77,12 +77,12 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/components": "7.0.0-beta.1", - "@storybook/core-events": "7.0.0-beta.1", - "@storybook/manager-api": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/components": "7.0.0-beta.3", + "@storybook/core-events": "7.0.0-beta.3", + "@storybook/manager-api": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "global": "^4.4.0", "ts-dedent": "^2.0.0" }, @@ -111,7 +111,7 @@ "./src/preview.tsx" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd", + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880", "storybook": { "displayName": "Outline", "unsupportedFrameworks": [ diff --git a/code/addons/storyshots/storyshots-core/package.json b/code/addons/storyshots/storyshots-core/package.json index a0f65b64ac1..eedcda227c7 100644 --- a/code/addons/storyshots/storyshots-core/package.json +++ b/code/addons/storyshots/storyshots-core/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storyshots", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Take a code snapshot of every story automatically with Jest", "keywords": [ "addon", @@ -39,11 +39,11 @@ "dependencies": { "@jest/transform": "^29.3.1", "@storybook/babel-plugin-require-context-hook": "1.0.1", - "@storybook/client-api": "7.0.0-beta.1", - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/core-webpack": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/client-api": "7.0.0-beta.3", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/core-webpack": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "@types/glob": "^7.1.3", "@types/jest-specific-snapshot": "^0.5.6", "core-js": "^3.8.2", @@ -60,11 +60,11 @@ "@angular/core": "^13.3.6", "@angular/platform-browser-dynamic": "^13.3.6", "@emotion/jest": "^11.8.0", - "@storybook/addon-docs": "7.0.0-beta.1", - "@storybook/angular": "7.0.0-beta.1", - "@storybook/react": "7.0.0-beta.1", - "@storybook/vue": "7.0.0-beta.1", - "@storybook/vue3": "7.0.0-beta.1", + "@storybook/addon-docs": "7.0.0-beta.3", + "@storybook/angular": "7.0.0-beta.3", + "@storybook/react": "7.0.0-beta.3", + "@storybook/vue": "7.0.0-beta.3", + "@storybook/vue3": "7.0.0-beta.3", "babel-loader": "^8.3.0", "enzyme": "^3.11.0", "enzyme-to-json": "^3.6.1", @@ -142,7 +142,7 @@ "publishConfig": { "access": "public" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd", + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880", "storybook": { "displayName": "Storyshots", "icon": "https://user-images.githubusercontent.com/263385/101991676-48cdf300-3c7c-11eb-8aa1-944dab6ab29b.png", diff --git a/code/addons/storyshots/storyshots-puppeteer/package.json b/code/addons/storyshots/storyshots-puppeteer/package.json index 44f1325fbda..2060817db99 100644 --- a/code/addons/storyshots/storyshots-puppeteer/package.json +++ b/code/addons/storyshots/storyshots-puppeteer/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storyshots-puppeteer", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Image snapshots addition to StoryShots based on puppeteer", "keywords": [ "addon", @@ -35,8 +35,8 @@ "dependencies": { "@axe-core/puppeteer": "^4.2.0", "@storybook/csf": "next", - "@storybook/node-logger": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/node-logger": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "@types/jest-image-snapshot": "^5.1.0", "jest-image-snapshot": "^6.0.0" }, @@ -45,7 +45,7 @@ "puppeteer": "^2.0.0 || ^3.0.0" }, "peerDependencies": { - "@storybook/addon-storyshots": "7.0.0-beta.1", + "@storybook/addon-storyshots": "7.0.0-beta.3", "puppeteer": ">=2.0.0" }, "peerDependenciesMeta": { @@ -56,5 +56,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/addons/storysource/package.json b/code/addons/storysource/package.json index 44be2f4d921..2af9ab71893 100644 --- a/code/addons/storysource/package.json +++ b/code/addons/storysource/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storysource", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "View a story’s source code to see how it works and paste into your app", "keywords": [ "addon", @@ -53,13 +53,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/components": "7.0.0-beta.1", - "@storybook/manager-api": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/router": "7.0.0-beta.1", - "@storybook/source-loader": "7.0.0-beta.1", - "@storybook/theming": "7.0.0-beta.1", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/components": "7.0.0-beta.3", + "@storybook/manager-api": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/router": "7.0.0-beta.3", + "@storybook/source-loader": "7.0.0-beta.3", + "@storybook/theming": "7.0.0-beta.3", "estraverse": "^5.2.0", "prop-types": "^15.7.2", "react-syntax-highlighter": "^15.5.0" @@ -91,7 +91,7 @@ "./src/preset.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd", + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880", "storybook": { "displayName": "Storysource", "icon": "https://user-images.githubusercontent.com/263385/101991675-48cdf300-3c7c-11eb-9400-58de5ac6daa7.png", diff --git a/code/addons/toolbars/package.json b/code/addons/toolbars/package.json index 62ef51723b6..0ddec5e528a 100644 --- a/code/addons/toolbars/package.json +++ b/code/addons/toolbars/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-toolbars", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Create your own toolbar items that control story rendering", "keywords": [ "addon", @@ -67,11 +67,11 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/components": "7.0.0-beta.1", - "@storybook/manager-api": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/theming": "7.0.0-beta.1" + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/components": "7.0.0-beta.3", + "@storybook/manager-api": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/theming": "7.0.0-beta.3" }, "devDependencies": { "typescript": "~4.9.3" @@ -98,7 +98,7 @@ ], "platform": "browser" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd", + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880", "storybook": { "displayName": "Toolbars", "icon": "https://user-images.githubusercontent.com/263385/101991677-48cdf300-3c7c-11eb-93b4-19b0e3366959.png", diff --git a/code/addons/viewport/package.json b/code/addons/viewport/package.json index dbe18e4b483..e1ea13d365e 100644 --- a/code/addons/viewport/package.json +++ b/code/addons/viewport/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-viewport", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Build responsive components by adjusting Storybook’s viewport size and orientation", "keywords": [ "addon", @@ -72,12 +72,12 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/components": "7.0.0-beta.1", - "@storybook/core-events": "7.0.0-beta.1", - "@storybook/manager-api": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/theming": "7.0.0-beta.1", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/components": "7.0.0-beta.3", + "@storybook/core-events": "7.0.0-beta.3", + "@storybook/manager-api": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/theming": "7.0.0-beta.3", "global": "^4.4.0", "memoizerific": "^1.11.3", "prop-types": "^15.7.2" @@ -108,7 +108,7 @@ "./src/preview.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd", + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880", "storybook": { "displayName": "Viewport", "icon": "https://user-images.githubusercontent.com/263385/101991678-48cdf300-3c7c-11eb-9764-f8af293c1b28.png", diff --git a/code/frameworks/angular/package.json b/code/frameworks/angular/package.json index 7208534e9e0..7067fa5872b 100644 --- a/code/frameworks/angular/package.json +++ b/code/frameworks/angular/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/angular", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for Angular: Develop Angular components in isolation with hot reloading.", "keywords": [ "storybook", @@ -34,18 +34,18 @@ "prep": "rimraf dist && ../../../scripts/node_modules/.bin/tsc --project tsconfig.build.json && echo \"Preventing passing flags to tsc\"" }, "dependencies": { - "@storybook/builder-webpack5": "7.0.0-beta.1", - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/core-client": "7.0.0-beta.1", - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/core-events": "7.0.0-beta.1", - "@storybook/core-server": "7.0.0-beta.1", - "@storybook/core-webpack": "7.0.0-beta.1", - "@storybook/docs-tools": "7.0.0-beta.1", - "@storybook/manager-api": "7.0.0-beta.1", - "@storybook/node-logger": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/builder-webpack5": "7.0.0-beta.3", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/core-client": "7.0.0-beta.3", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/core-events": "7.0.0-beta.3", + "@storybook/core-server": "7.0.0-beta.3", + "@storybook/core-webpack": "7.0.0-beta.3", + "@storybook/docs-tools": "7.0.0-beta.3", + "@storybook/manager-api": "7.0.0-beta.3", + "@storybook/node-logger": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "@types/node": "^16.0.0", "@types/react": "^16.14.34", "@types/react-dom": "^16.9.14", @@ -116,11 +116,11 @@ } }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" }, "builders": "dist/builders/builders.json", - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/frameworks/ember/package.json b/code/frameworks/ember/package.json index f5cbd6487c6..844fffbf2ae 100644 --- a/code/frameworks/ember/package.json +++ b/code/frameworks/ember/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/ember", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for Ember: Develop Ember Component in isolation with Hot Reloading.", "homepage": "https://github.com/storybookjs/storybook/tree/main/frameworks/ember", "bugs": { @@ -31,11 +31,11 @@ "prep": "node ../../../scripts/prepare.js" }, "dependencies": { - "@storybook/builder-webpack5": "7.0.0-beta.1", - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/docs-tools": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/builder-webpack5": "7.0.0-beta.3", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/docs-tools": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "global": "^4.4.0", "read-pkg-up": "^7.0.1", "ts-dedent": "^2.0.0" @@ -54,10 +54,10 @@ "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/frameworks/html-vite/package.json b/code/frameworks/html-vite/package.json index 280dd37188b..92116d4d0db 100644 --- a/code/frameworks/html-vite/package.json +++ b/code/frameworks/html-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/html-vite", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for HTML and Vite: Develop HTML in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -51,22 +51,20 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-beta.1", - "@storybook/builder-vite": "7.0.0-beta.1", - "@storybook/channel-postmessage": "7.0.0-beta.1", - "@storybook/channel-websocket": "7.0.0-beta.1", - "@storybook/client-api": "7.0.0-beta.1", - "@storybook/core-server": "7.0.0-beta.1", - "@storybook/html": "7.0.0-beta.1", - "@storybook/node-logger": "7.0.0-beta.1", - "@storybook/preview-web": "7.0.0-beta.1", - "magic-string": "^0.26.1", - "vite": "3" + "@storybook/addons": "7.0.0-beta.3", + "@storybook/builder-vite": "7.0.0-beta.3", + "@storybook/channel-postmessage": "7.0.0-beta.3", + "@storybook/channel-websocket": "7.0.0-beta.3", + "@storybook/client-api": "7.0.0-beta.3", + "@storybook/core-server": "7.0.0-beta.3", + "@storybook/html": "7.0.0-beta.3", + "@storybook/node-logger": "7.0.0-beta.3", + "@storybook/preview-web": "7.0.0-beta.3", + "magic-string": "^0.26.1" }, "devDependencies": { "@types/node": "^16.0.0", - "typescript": "~4.9.3", - "vite": "^3.1.0" + "typescript": "~4.9.3" }, "engines": { "node": "^14.18 || >=16" @@ -81,5 +79,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/frameworks/html-webpack5/package.json b/code/frameworks/html-webpack5/package.json index c2ce64d870f..58030d19ad5 100644 --- a/code/frameworks/html-webpack5/package.json +++ b/code/frameworks/html-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/html-webpack5", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -50,10 +50,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.0.0-beta.1", - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/html": "7.0.0-beta.1", - "@storybook/preset-html-webpack": "7.0.0-beta.1", + "@storybook/builder-webpack5": "7.0.0-beta.3", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/html": "7.0.0-beta.3", + "@storybook/preset-html-webpack": "7.0.0-beta.3", "@types/node": "^16.0.0", "global": "^4.4.0" }, @@ -66,7 +66,7 @@ "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -78,5 +78,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/frameworks/nextjs/package.json b/code/frameworks/nextjs/package.json index 02c02b30815..db284bca549 100644 --- a/code/frameworks/nextjs/package.json +++ b/code/frameworks/nextjs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/nextjs", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for Next.js", "keywords": [ "storybook", @@ -59,12 +59,12 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.0.0-beta.1", - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/node-logger": "7.0.0-beta.1", - "@storybook/preset-react-webpack": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/react": "7.0.0-beta.1", + "@storybook/builder-webpack5": "7.0.0-beta.3", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/node-logger": "7.0.0-beta.3", + "@storybook/preset-react-webpack": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/react": "7.0.0-beta.3", "@types/node": "^16.0.0", "find-up": "^5.0.0", "fs-extra": "^9.0.1", @@ -80,7 +80,7 @@ "tsconfig-paths-webpack-plugin": "^3.5.2" }, "devDependencies": { - "@storybook/addon-actions": "7.0.0-beta.1", + "@storybook/addon-actions": "7.0.0-beta.3", "next": "^13.0.5", "typescript": "^4.9.3", "webpack": "^5.65.0" @@ -105,7 +105,7 @@ } }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -119,5 +119,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/frameworks/nextjs/src/nextImport/webpack.ts b/code/frameworks/nextjs/src/nextImport/webpack.ts index 1e8f40d2256..b017462ae25 100644 --- a/code/frameworks/nextjs/src/nextImport/webpack.ts +++ b/code/frameworks/nextjs/src/nextImport/webpack.ts @@ -8,6 +8,7 @@ export function configureNextImport(baseConfig: WebpackConfig) { const isNext12 = semver.satisfies(nextJSVersion, '~12'); const isNext13 = semver.satisfies(nextJSVersion, '~13'); + const isNextVersionSmallerThan12dot2 = semver.lt(nextJSVersion, '12.2.0'); const isNextVersionSmallerThan13 = semver.lt(nextJSVersion, '13.0.0'); baseConfig.plugins = baseConfig.plugins ?? []; @@ -20,7 +21,7 @@ export function configureNextImport(baseConfig: WebpackConfig) { ); } - if (!isNext12) { + if (!isNext12 || isNextVersionSmallerThan12dot2) { baseConfig.plugins.push( new IgnorePlugin({ resourceRegExp: /next\/future\/image$/, @@ -36,7 +37,7 @@ export function configureNextImport(baseConfig: WebpackConfig) { ); } - if (semver.lt(nextJSVersion, '12.2.0')) { + if (isNextVersionSmallerThan12dot2) { baseConfig.plugins.push( new IgnorePlugin({ resourceRegExp: /next\/dist\/shared\/lib\/app-router-context$/, diff --git a/code/frameworks/preact-webpack5/package.json b/code/frameworks/preact-webpack5/package.json index 32c32c3aadb..aa6b92aebad 100644 --- a/code/frameworks/preact-webpack5/package.json +++ b/code/frameworks/preact-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preact-webpack5", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for Preact: Develop Preact Component in isolation.", "keywords": [ "storybook" @@ -50,10 +50,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.0.0-beta.1", - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/preact": "7.0.0-beta.1", - "@storybook/preset-preact-webpack": "7.0.0-beta.1", + "@storybook/builder-webpack5": "7.0.0-beta.3", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/preact": "7.0.0-beta.3", + "@storybook/preset-preact-webpack": "7.0.0-beta.3", "@types/node": "^16.0.0" }, "devDependencies": { @@ -67,7 +67,7 @@ "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -79,5 +79,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/frameworks/react-vite/package.json b/code/frameworks/react-vite/package.json index cc36a88af36..a60433f7c87 100644 --- a/code/frameworks/react-vite/package.json +++ b/code/frameworks/react-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react-vite", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for React and Vite: Develop React components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -53,18 +53,18 @@ "dependencies": { "@joshwooding/vite-plugin-react-docgen-typescript": "^0.0.5", "@rollup/pluginutils": "^4.2.0", - "@storybook/builder-vite": "7.0.0-beta.1", - "@storybook/react": "7.0.0-beta.1", + "@storybook/builder-vite": "7.0.0-beta.3", + "@storybook/react": "7.0.0-beta.3", "@vitejs/plugin-react": "^2.0.0", "ast-types": "^0.14.2", "magic-string": "^0.26.1", "react-docgen": "^6.0.0-alpha.3", - "vite": "^3.1.3" + "vite": "^3.0.0||^4.0.0" }, "devDependencies": { "@types/node": "^16.0.0", "typescript": "~4.9.3", - "vite": "^3.1.3" + "vite": "^4.0.0-beta.2" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0", @@ -83,5 +83,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/frameworks/react-webpack5/package.json b/code/frameworks/react-webpack5/package.json index 218aa767596..800d6a5a211 100644 --- a/code/frameworks/react-webpack5/package.json +++ b/code/frameworks/react-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react-webpack5", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -51,9 +51,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.0.0-beta.1", - "@storybook/preset-react-webpack": "7.0.0-beta.1", - "@storybook/react": "7.0.0-beta.1", + "@storybook/builder-webpack5": "7.0.0-beta.3", + "@storybook/preset-react-webpack": "7.0.0-beta.3", + "@storybook/react": "7.0.0-beta.3", "@types/node": "^16.0.0" }, "devDependencies": { @@ -74,7 +74,7 @@ } }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -86,5 +86,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/frameworks/server-webpack5/package.json b/code/frameworks/server-webpack5/package.json index 59aa4e505eb..20c8f2926ed 100644 --- a/code/frameworks/server-webpack5/package.json +++ b/code/frameworks/server-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/server-webpack5", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for Server: View HTML snippets from a server in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -50,10 +50,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.0.0-beta.1", - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/preset-server-webpack": "7.0.0-beta.1", - "@storybook/server": "7.0.0-beta.1", + "@storybook/builder-webpack5": "7.0.0-beta.3", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/preset-server-webpack": "7.0.0-beta.3", + "@storybook/server": "7.0.0-beta.3", "@types/node": "^16.0.0" }, "devDependencies": { @@ -64,7 +64,7 @@ "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -76,5 +76,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json index b1c89e91ad4..212520711e5 100644 --- a/code/frameworks/svelte-vite/package.json +++ b/code/frameworks/svelte-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/svelte-vite", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for Svelte and Vite: Develop Svelte components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -52,19 +52,20 @@ }, "dependencies": { "@storybook/addon-svelte-csf": "^2.0.0", - "@storybook/builder-vite": "7.0.0-beta.1", - "@storybook/node-logger": "7.0.0-beta.1", - "@storybook/svelte": "7.0.0-beta.1", + "@storybook/builder-vite": "7.0.0-beta.3", + "@storybook/node-logger": "7.0.0-beta.3", + "@storybook/svelte": "7.0.0-beta.3", "@sveltejs/vite-plugin-svelte": "^2.0.0", "magic-string": "^0.26.1", "svelte": "^3.0.0", "sveltedoc-parser": "^4.2.1", - "vite": "^3.1.3" + "ts-dedent": "^2.2.0", + "vite": "^3.0.0||^4.0.0" }, "devDependencies": { "@types/node": "^16.0.0", "typescript": "~4.9.3", - "vite": "^3.1.3" + "vite": "^4.0.0-beta.2" }, "peerDependencies": { "@storybook/addon-svelte-csf": "^2.0.0", @@ -89,5 +90,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/frameworks/svelte-vite/src/preset.ts b/code/frameworks/svelte-vite/src/preset.ts index 669473bfa35..e14062debeb 100644 --- a/code/frameworks/svelte-vite/src/preset.ts +++ b/code/frameworks/svelte-vite/src/preset.ts @@ -8,7 +8,7 @@ export const core: StorybookConfig['core'] = { }; export const viteFinal: NonNullable = async (config, options) => { - let { plugins = [] } = config; + const { plugins = [] } = config; const { svelte, loadSvelteConfig } = await import('@sveltejs/vite-plugin-svelte'); const svelteOptions: Record = await options.presets.apply( 'svelteOptions', @@ -25,8 +25,7 @@ export const viteFinal: NonNullable = async (confi // Add docgen plugin plugins.push(svelteDocgen(svelteConfig)); - // temporarily support SvelteKit - plugins = await handleSvelteKit(plugins, options); + await handleSvelteKit(plugins, options); // TODO: temporary until/unless https://github.com/storybookjs/addon-svelte-csf/issues/64 is fixed // Wrapping in try-catch in case `@storybook/addon-svelte-csf is not installed diff --git a/code/frameworks/svelte-vite/src/utils.ts b/code/frameworks/svelte-vite/src/utils.ts index 5d6e3b21d6b..b87e98f888e 100644 --- a/code/frameworks/svelte-vite/src/utils.ts +++ b/code/frameworks/svelte-vite/src/utils.ts @@ -1,7 +1,7 @@ import type { PluginOption } from 'vite'; -import { deprecate } from '@storybook/node-logger'; -import { withoutVitePlugins } from '@storybook/builder-vite'; import type { Options } from '@storybook/types'; +import dedent from 'ts-dedent'; +import { logger } from '@storybook/node-logger'; function checkName(plugin: PluginOption, name: string) { return typeof plugin === 'object' && 'name' in plugin && plugin.name === name; @@ -23,32 +23,32 @@ export function hasPlugin(plugins: PluginOption[], name: string) { * but warns the user that they should use the sveltekit framework instead. * Should be removed when we decide to remove support completely for SvelteKit in svelte-vite */ -export async function handleSvelteKit( - plugins: PluginOption[], - options: Options -): Promise { - if (!hasPlugin(plugins, 'vite-plugin-svelte-kit')) { - // this is not a SvelteKit project ✅ - return plugins; - } - +export async function handleSvelteKit(plugins: PluginOption[], options: Options) { /* the sveltekit framework uses this svelte-vite framework under the hood - so we have to take extra care of only warning when the user is actually using + so we have to take extra care of only throwing when the user is actually using svelte-vite directly and not just through sveltekit */ - const frameworkPreset = await options.presets.apply('framework', {}, options); const framework = typeof frameworkPreset === 'string' ? frameworkPreset : frameworkPreset.name; - if (framework === '@storybook/sveltekit') { - // this uses @storybook/sveltekit, so everything is fine ✅ - return plugins; - } + const hasSvelteKitPlugins = + hasPlugin(plugins, 'vite-plugin-svelte-kit') || + hasPlugin(plugins, 'vite-plugin-sveltekit-build') || + hasPlugin(plugins, 'vite-plugin-sveltekit-middleware'); - // this is a SvelteKit project but doesn't use @storybook/sveltekit, warn user about this and remove vite-plugin-svelte-kit ❌ - deprecate( - 'SvelteKit support in @storybook/svelte-vite is deprecated in Storybook 7.0, use @storybook/sveltekit instead.' - ); - return withoutVitePlugins(plugins, ['vite-plugin-svelte-kit']); + if (hasSvelteKitPlugins && framework !== '@storybook/sveltekit') { + logger.error( + dedent` + We've detected a SvelteKit project using the @storybook/svelte-vite framework, which is not supported in Storybook 7.0 + Please use the @storybook/sveltekit framework instead. + You can migrate automatically by running + + npx sb@next automigrate sveltekitFramework + + See https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#sveltekit-needs-the-storybooksveltekit-framework + ` + ); + throw new Error(); + } } diff --git a/code/frameworks/svelte-webpack5/package.json b/code/frameworks/svelte-webpack5/package.json index f5bed68e0c9..bbb806324c9 100644 --- a/code/frameworks/svelte-webpack5/package.json +++ b/code/frameworks/svelte-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/svelte-webpack5", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -51,10 +51,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.0.0-beta.1", - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/preset-svelte-webpack": "7.0.0-beta.1", - "@storybook/svelte": "7.0.0-beta.1" + "@storybook/builder-webpack5": "7.0.0-beta.3", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/preset-svelte-webpack": "7.0.0-beta.3", + "@storybook/svelte": "7.0.0-beta.3" }, "devDependencies": { "svelte": "^3.48.0", @@ -69,7 +69,7 @@ "svelte-loader": "*" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -81,5 +81,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/frameworks/sveltekit/package.json b/code/frameworks/sveltekit/package.json index ffba08de92a..a501636ca44 100644 --- a/code/frameworks/sveltekit/package.json +++ b/code/frameworks/sveltekit/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/sveltekit", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for SvelteKit", "keywords": [ "storybook", @@ -51,13 +51,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-vite": "7.0.0-beta.1", - "@storybook/svelte-vite": "7.0.0-beta.1" + "@storybook/builder-vite": "7.0.0-beta.3", + "@storybook/svelte": "7.0.0-beta.3", + "@storybook/svelte-vite": "7.0.0-beta.3" }, "devDependencies": { "@types/node": "^16.0.0", - "typescript": "^4.9.3", - "vite": "^3.1.3" + "typescript": "^4.9.3" }, "peerDependencies": { "@storybook/addon-svelte-csf": "^2.0.0" @@ -80,5 +80,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/frameworks/sveltekit/src/preset.ts b/code/frameworks/sveltekit/src/preset.ts index 2719f02b7b5..d5650f52cb6 100644 --- a/code/frameworks/sveltekit/src/preset.ts +++ b/code/frameworks/sveltekit/src/preset.ts @@ -15,7 +15,13 @@ export const viteFinal: NonNullable = async (confi // Remove vite-plugin-svelte-kit from plugins if using SvelteKit // see https://github.com/storybookjs/storybook/issues/19280#issuecomment-1281204341 - plugins = withoutVitePlugins(plugins, ['vite-plugin-svelte-kit']); + plugins = withoutVitePlugins(plugins, [ + // pre @sveltejs/kit@1.0.0-next.574 + 'vite-plugin-svelte-kit', + // @sveltejs/kit@1.0.0-next.574 and later + 'vite-plugin-sveltekit-build', + 'vite-plugin-sveltekit-middleware', + ]); return { ...baseConfig, plugins }; }; diff --git a/code/frameworks/vue-vite/package.json b/code/frameworks/vue-vite/package.json index f1732bff0b5..38c34381900 100644 --- a/code/frameworks/vue-vite/package.json +++ b/code/frameworks/vue-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue-vite", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for Vue2 and Vite: Develop Vue2 Components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -50,16 +50,17 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-vite": "7.0.0-beta.1", - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/core-server": "7.0.0-beta.1", - "@storybook/vue": "7.0.0-beta.1", + "@storybook/builder-vite": "7.0.0-beta.3", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/core-server": "7.0.0-beta.3", + "@storybook/vue": "7.0.0-beta.3", "magic-string": "^0.26.1", - "vite": "^3.1.3", + "vite": "^3.0.0||^4.0.0", "vue-docgen-api": "^4.40.0" }, "devDependencies": { "typescript": "~4.9.3", + "vite": "^4.0.0-beta.2", "vue": "^2.7.10" }, "peerDependencies": { @@ -68,7 +69,7 @@ "vue": "^2.7.0" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -80,5 +81,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/frameworks/vue-webpack5/package.json b/code/frameworks/vue-webpack5/package.json index 79e6712e620..4904fc323e2 100644 --- a/code/frameworks/vue-webpack5/package.json +++ b/code/frameworks/vue-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue-webpack5", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -50,10 +50,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.0.0-beta.1", - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/preset-vue-webpack": "7.0.0-beta.1", - "@storybook/vue": "7.0.0-beta.1", + "@storybook/builder-webpack5": "7.0.0-beta.3", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/preset-vue-webpack": "7.0.0-beta.3", + "@storybook/vue": "7.0.0-beta.3", "@types/node": "^16.0.0" }, "devDependencies": { @@ -73,7 +73,7 @@ "vue-template-compiler": "^2.6.8" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -85,5 +85,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/frameworks/vue3-vite/package.json b/code/frameworks/vue3-vite/package.json index 40663b6d297..fc79091bd03 100644 --- a/code/frameworks/vue3-vite/package.json +++ b/code/frameworks/vue3-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue3-vite", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for Vue3 and Vite: Develop Vue3 components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -51,18 +51,18 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-vite": "7.0.0-beta.1", - "@storybook/core-server": "7.0.0-beta.1", - "@storybook/vue3": "7.0.0-beta.1", + "@storybook/builder-vite": "7.0.0-beta.3", + "@storybook/core-server": "7.0.0-beta.3", + "@storybook/vue3": "7.0.0-beta.3", "@vitejs/plugin-vue": "^3.0.0", "magic-string": "^0.26.1", - "vite": "^3.1.3", + "vite": "^3.0.0||^4.0.0", "vue-docgen-api": "^4.40.0" }, "devDependencies": { "@types/node": "^16.0.0", "typescript": "~4.9.3", - "vite": "^3.1.3" + "vite": "^4.0.0-beta.2" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0", @@ -81,5 +81,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/frameworks/vue3-webpack5/package.json b/code/frameworks/vue3-webpack5/package.json index 392a618cc80..2595fc0a7b2 100644 --- a/code/frameworks/vue3-webpack5/package.json +++ b/code/frameworks/vue3-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue3-webpack5", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for Vue 3: Develop Vue 3 Components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -50,10 +50,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.0.0-beta.1", - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/preset-vue3-webpack": "7.0.0-beta.1", - "@storybook/vue3": "7.0.0-beta.1", + "@storybook/builder-webpack5": "7.0.0-beta.3", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/preset-vue3-webpack": "7.0.0-beta.3", + "@storybook/vue3": "7.0.0-beta.3", "@types/node": "^16.0.0" }, "devDependencies": { @@ -70,7 +70,7 @@ "vue": "^3.0.0" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -82,5 +82,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/frameworks/web-components-vite/package.json b/code/frameworks/web-components-vite/package.json index 954aa7892e4..a434f136d64 100644 --- a/code/frameworks/web-components-vite/package.json +++ b/code/frameworks/web-components-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/web-components-vite", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for web-components and Vite: Develop Web Components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -51,17 +51,15 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-vite": "7.0.0-beta.1", - "@storybook/core-server": "7.0.0-beta.1", - "@storybook/node-logger": "7.0.0-beta.1", - "@storybook/web-components": "7.0.0-beta.1", - "magic-string": "^0.26.1", - "vite": "3" + "@storybook/builder-vite": "7.0.0-beta.3", + "@storybook/core-server": "7.0.0-beta.3", + "@storybook/node-logger": "7.0.0-beta.3", + "@storybook/web-components": "7.0.0-beta.3", + "magic-string": "^0.26.1" }, "devDependencies": { "@types/node": "^16.0.0", - "typescript": "~4.9.3", - "vite": "^3.1.0" + "typescript": "~4.9.3" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0", @@ -80,5 +78,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/frameworks/web-components-webpack5/package.json b/code/frameworks/web-components-webpack5/package.json index ca9b798955f..bff997d8072 100644 --- a/code/frameworks/web-components-webpack5/package.json +++ b/code/frameworks/web-components-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/web-components-webpack5", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for web-components: View web components snippets in isolation with Hot Reloading.", "keywords": [ "lit-html", @@ -53,10 +53,10 @@ }, "dependencies": { "@babel/preset-env": "^7.20.2", - "@storybook/builder-webpack5": "7.0.0-beta.1", - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/preset-web-components-webpack": "7.0.0-beta.1", - "@storybook/web-components": "7.0.0-beta.1", + "@storybook/builder-webpack5": "7.0.0-beta.3", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/preset-web-components-webpack": "7.0.0-beta.3", + "@storybook/web-components": "7.0.0-beta.3", "@types/node": "^16.0.0" }, "devDependencies": { @@ -69,7 +69,7 @@ "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -81,5 +81,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lerna.json b/code/lerna.json index 9196b40f242..bf024315a28 100644 --- a/code/lerna.json +++ b/code/lerna.json @@ -2,5 +2,5 @@ "npmClient": "yarn", "useWorkspaces": true, "registry": "https://registry.npmjs.org", - "version": "7.0.0-beta.1" + "version": "7.0.0-beta.3" } diff --git a/code/lib/addons/package.json b/code/lib/addons/package.json index 5309212e30f..96cfcc9d792 100644 --- a/code/lib/addons/package.json +++ b/code/lib/addons/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addons", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook addons store", "keywords": [ "storybook" @@ -42,9 +42,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/manager-api": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1" + "@storybook/manager-api": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0", @@ -58,5 +58,5 @@ "./src/index.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/builder-manager/package.json b/code/lib/builder-manager/package.json index ca896b8be11..e04b0cf4738 100644 --- a/code/lib/builder-manager/package.json +++ b/code/lib/builder-manager/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/builder-manager", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook manager builder", "keywords": [ "storybook" @@ -42,9 +42,9 @@ }, "dependencies": { "@fal-works/esbuild-plugin-global-externals": "^2.1.2", - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/manager": "7.0.0-beta.1", - "@storybook/node-logger": "7.0.0-beta.1", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/manager": "7.0.0-beta.3", + "@storybook/node-logger": "7.0.0-beta.3", "@types/ejs": "^3.1.1", "@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.10", "browser-assert": "^1.2.1", @@ -69,5 +69,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/builder-vite/package.json b/code/lib/builder-vite/package.json index e213a15449b..80be86279ee 100644 --- a/code/lib/builder-vite/package.json +++ b/code/lib/builder-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/builder-vite", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "A plugin to run and build Storybooks with Vite", "homepage": "https://github.com/storybookjs/storybook/tree/main/code/lib/builder-vite/#readme", "bugs": { @@ -42,14 +42,14 @@ }, "dependencies": { "@joshwooding/vite-plugin-react-docgen-typescript": "0.0.5", - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/csf-plugin": "7.0.0-beta.1", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/csf-plugin": "7.0.0-beta.3", "@storybook/mdx2-csf": "next", - "@storybook/node-logger": "7.0.0-beta.1", - "@storybook/preview": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/node-logger": "7.0.0-beta.3", + "@storybook/preview": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "@vitejs/plugin-react": "^2.0.0", "browser-assert": "^1.2.1", "es-module-lexer": "^0.9.3", @@ -61,14 +61,14 @@ "rollup": "^2.25.0 || ^3.3.0", "rollup-plugin-external-globals": "^0.7.1", "slash": "^3.0.0", - "vite": "^3.1.3" + "vite": "^3.0.0||^4.0.0" }, "devDependencies": { "@types/express": "^4.17.13", "@types/node": "^16.0.0", "rollup": "^3.0.0", "typescript": "~4.9.3", - "vite": "^3.1.3" + "vite": "^4.0.0-beta.2" }, "peerDependencies": { "@preact/preset-vite": "*", @@ -91,5 +91,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/builder-webpack5/package.json b/code/lib/builder-webpack5/package.json index 4e6fdf5c6bc..b16ac601306 100644 --- a/code/lib/builder-webpack5/package.json +++ b/code/lib/builder-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/builder-webpack5", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" @@ -54,24 +54,24 @@ }, "dependencies": { "@babel/core": "^7.12.10", - "@storybook/addons": "7.0.0-beta.1", - "@storybook/api": "7.0.0-beta.1", - "@storybook/channel-postmessage": "7.0.0-beta.1", - "@storybook/channel-websocket": "7.0.0-beta.1", - "@storybook/channels": "7.0.0-beta.1", - "@storybook/client-api": "7.0.0-beta.1", - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/components": "7.0.0-beta.1", - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/core-events": "7.0.0-beta.1", - "@storybook/core-webpack": "7.0.0-beta.1", - "@storybook/manager-api": "7.0.0-beta.1", - "@storybook/node-logger": "7.0.0-beta.1", - "@storybook/preview": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/router": "7.0.0-beta.1", - "@storybook/store": "7.0.0-beta.1", - "@storybook/theming": "7.0.0-beta.1", + "@storybook/addons": "7.0.0-beta.3", + "@storybook/api": "7.0.0-beta.3", + "@storybook/channel-postmessage": "7.0.0-beta.3", + "@storybook/channel-websocket": "7.0.0-beta.3", + "@storybook/channels": "7.0.0-beta.3", + "@storybook/client-api": "7.0.0-beta.3", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/components": "7.0.0-beta.3", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/core-events": "7.0.0-beta.3", + "@storybook/core-webpack": "7.0.0-beta.3", + "@storybook/manager-api": "7.0.0-beta.3", + "@storybook/node-logger": "7.0.0-beta.3", + "@storybook/preview": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/router": "7.0.0-beta.3", + "@storybook/store": "7.0.0-beta.3", + "@storybook/theming": "7.0.0-beta.3", "@types/node": "^16.0.0", "@types/semver": "^7.3.4", "babel-loader": "^8.3.0", @@ -126,5 +126,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/builder-webpack5/src/types.ts b/code/lib/builder-webpack5/src/types.ts index 6b13b02adf9..6e55f145ca2 100644 --- a/code/lib/builder-webpack5/src/types.ts +++ b/code/lib/builder-webpack5/src/types.ts @@ -16,7 +16,7 @@ export interface TypescriptOptions extends TypeScriptOptionsBase { /** * Configures `fork-ts-checker-webpack-plugin` */ - checkOptions?: ForkTsCheckerWebpackPlugin['options']; + checkOptions?: ConstructorParameters[0]; } export interface StorybookConfigWebpack extends Pick { diff --git a/code/lib/channel-postmessage/package.json b/code/lib/channel-postmessage/package.json index cb59cb9bdc7..6c49a7e8713 100644 --- a/code/lib/channel-postmessage/package.json +++ b/code/lib/channel-postmessage/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channel-postmessage", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "", "keywords": [ "storybook" @@ -42,9 +42,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/channels": "7.0.0-beta.1", - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/core-events": "7.0.0-beta.1", + "@storybook/channels": "7.0.0-beta.3", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/core-events": "7.0.0-beta.3", "global": "^4.4.0", "qs": "^6.10.0", "telejson": "^7.0.3" @@ -60,5 +60,5 @@ "./src/index.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/channel-websocket/package.json b/code/lib/channel-websocket/package.json index 9d4111f47e2..ff9d2617afb 100644 --- a/code/lib/channel-websocket/package.json +++ b/code/lib/channel-websocket/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channel-websocket", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "", "keywords": [ "storybook" @@ -42,8 +42,8 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/channels": "7.0.0-beta.1", - "@storybook/client-logger": "7.0.0-beta.1", + "@storybook/channels": "7.0.0-beta.3", + "@storybook/client-logger": "7.0.0-beta.3", "global": "^4.4.0", "telejson": "^7.0.3" }, @@ -58,5 +58,5 @@ "./src/index.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/channels/package.json b/code/lib/channels/package.json index 4e025342b61..b7625b037e3 100644 --- a/code/lib/channels/package.json +++ b/code/lib/channels/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channels", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "", "keywords": [ "storybook" @@ -52,5 +52,5 @@ "./src/index.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/cli-sb/package.json b/code/lib/cli-sb/package.json index 06b2457ff4e..389076f6695 100644 --- a/code/lib/cli-sb/package.json +++ b/code/lib/cli-sb/package.json @@ -1,6 +1,6 @@ { "name": "sb", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook CLI", "keywords": [ "storybook" @@ -24,7 +24,7 @@ "prep": "node ../../../scripts/prepare.js" }, "dependencies": { - "@storybook/cli": "7.0.0-beta.1" + "@storybook/cli": "7.0.0-beta.3" }, "devDependencies": { "typescript": "~4.9.3" @@ -32,5 +32,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/cli-storybook/package.json b/code/lib/cli-storybook/package.json index 2b9b9fc2156..304ec3f25db 100644 --- a/code/lib/cli-storybook/package.json +++ b/code/lib/cli-storybook/package.json @@ -1,6 +1,6 @@ { "name": "storybook", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook CLI", "keywords": [ "storybook" @@ -27,7 +27,7 @@ "prep": "node ../../../scripts/prepare.js" }, "dependencies": { - "@storybook/cli": "7.0.0-beta.1" + "@storybook/cli": "7.0.0-beta.3" }, "devDependencies": { "typescript": "~4.9.3" @@ -35,5 +35,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/cli/package.json b/code/lib/cli/package.json index 16e4d6f0b8c..2419728397a 100644 --- a/code/lib/cli/package.json +++ b/code/lib/cli/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/cli", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook's CLI - easiest method of adding storybook to your projects", "keywords": [ "cli", @@ -43,13 +43,13 @@ "dependencies": { "@babel/core": "^7.20.2", "@babel/preset-env": "^7.20.2", - "@storybook/codemod": "7.0.0-beta.1", - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/core-server": "7.0.0-beta.1", - "@storybook/csf-tools": "7.0.0-beta.1", - "@storybook/node-logger": "7.0.0-beta.1", - "@storybook/telemetry": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/codemod": "7.0.0-beta.3", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/core-server": "7.0.0-beta.3", + "@storybook/csf-tools": "7.0.0-beta.3", + "@storybook/node-logger": "7.0.0-beta.3", + "@storybook/telemetry": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "@types/semver": "^7.3.4", "boxen": "^5.1.2", "chalk": "^4.1.0", @@ -77,7 +77,7 @@ "util-deprecate": "^1.0.2" }, "devDependencies": { - "@storybook/client-api": "7.0.0-beta.1", + "@storybook/client-api": "7.0.0-beta.3", "@types/cross-spawn": "^6.0.2", "@types/prompts": "^2.0.9", "@types/puppeteer-core": "^2.1.0", @@ -98,5 +98,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/cli/src/automigrate/fixes/index.ts b/code/lib/cli/src/automigrate/fixes/index.ts index 2ed72676b06..fbe9f400784 100644 --- a/code/lib/cli/src/automigrate/fixes/index.ts +++ b/code/lib/cli/src/automigrate/fixes/index.ts @@ -12,6 +12,7 @@ import { newFrameworks } from './new-frameworks'; import { removedGlobalClientAPIs } from './remove-global-client-apis'; import { mdx1to2 } from './mdx-1-to-2'; import { docsPageAutomatic } from './docsPage-automatic'; +import { sveltekitFramework } from './sveltekit-framework'; import { addReact } from './add-react'; export * from '../types'; @@ -23,6 +24,7 @@ export const fixes: Fix[] = [ vue3, mainjsFramework, eslintPlugin, + sveltekitFramework, builderVite, sbScripts, newFrameworks, diff --git a/code/lib/cli/src/automigrate/fixes/new-frameworks.ts b/code/lib/cli/src/automigrate/fixes/new-frameworks.ts index cc3c03bef1f..37f9add6b12 100644 --- a/code/lib/cli/src/automigrate/fixes/new-frameworks.ts +++ b/code/lib/cli/src/automigrate/fixes/new-frameworks.ts @@ -262,8 +262,7 @@ export const newFrameworks: Fix = { if (currentCore) { if (Object.keys(currentCore).length === 0) { - // TODO: this should delete the field instead - main.setFieldValue(['core'], {}); + main.removeField(['core']); } else { main.setFieldValue(['core'], currentCore); } diff --git a/code/lib/cli/src/automigrate/fixes/sveltekit-framework.test.ts b/code/lib/cli/src/automigrate/fixes/sveltekit-framework.test.ts new file mode 100644 index 00000000000..e24623faf51 --- /dev/null +++ b/code/lib/cli/src/automigrate/fixes/sveltekit-framework.test.ts @@ -0,0 +1,174 @@ +/* eslint-disable no-underscore-dangle */ +import type { StorybookConfig } from 'lib/types/src'; +import path from 'path'; +import type { JsPackageManager, PackageJson } from '../../js-package-manager'; +import { sveltekitFramework } from './sveltekit-framework'; + +// eslint-disable-next-line global-require, jest/no-mocks-import +jest.mock('fs-extra', () => require('../../../../../__mocks__/fs-extra')); + +const checkSvelteKitFramework = async ({ + packageJson, + main, +}: { + packageJson: PackageJson; + main?: Partial; +}) => { + if (main) { + // eslint-disable-next-line global-require + require('fs-extra').__setMockFiles({ + [path.join('.storybook', 'main.js')]: `module.exports = ${JSON.stringify(main)};`, + }); + } else { + // eslint-disable-next-line global-require + require('fs-extra').__setMockFiles({}); + } + const packageManager = { + retrievePackageJson: () => ({ dependencies: {}, devDependencies: {}, ...packageJson }), + } as JsPackageManager; + + return sveltekitFramework.check({ packageManager }); +}; + +describe('SvelteKit framework fix', () => { + describe('should no-op', () => { + it('in SB < v7.0.0', async () => { + const packageJson = { + dependencies: { '@sveltejs/kit': '^1.0.0-next.571', '@storybook/svelte': '^6.2.0' }, + }; + const main = { framework: '@storybook/svelte-vite' }; + await expect(checkSvelteKitFramework({ packageJson, main })).resolves.toBeFalsy(); + }); + + describe('in SB >= v7.0.0', () => { + it('in non-SvelteKit projects', async () => { + const packageJson = { + dependencies: { svelte: '^3.53.1', '@storybook/svelte-vite': '^7.0.0' }, + }; + const main = { + framework: '@storybook/svelte-vite', + }; + await expect(checkSvelteKitFramework({ packageJson, main })).resolves.toBeFalsy(); + }); + + it('without main', async () => { + const packageJson = { + dependencies: { '@sveltejs/kit': '^1.0.0-next.571', '@storybook/svelte': '^7.0.0' }, + }; + await expect(checkSvelteKitFramework({ packageJson })).rejects.toThrow(); + }); + + it('without framework field in main', async () => { + const packageJson = { + dependencies: { '@sveltejs/kit': '^1.0.0-next.571', '@storybook/svelte': '^7.0.0' }, + }; + const main = {}; + await expect(checkSvelteKitFramework({ packageJson, main })).rejects.toThrow(); + }); + + it('with unsupported framework', async () => { + const packageJson = { + dependencies: { + '@sveltejs/kit': '^1.0.0-next.571', + '@storybook/svelte-vite': '^7.0.0', + '@storybook/html': '^7.0.0', + }, + }; + const main = { + framework: '@storybook/html', + }; + await expect(checkSvelteKitFramework({ packageJson, main })).rejects.toThrow(); + }); + + it('with unsupported framework+builder from SB 6.5', async () => { + const packageJson = { + dependencies: { + '@sveltejs/kit': '^1.0.0-next.571', + '@storybook/svelte-webpack5': '^7.0.0', + '@storybook/svelte': '^7.0.0', + }, + }; + const main = { + framework: '@storybook/svelte', + core: { builder: '@storybook/builder-webpack5' }, + }; + await expect(checkSvelteKitFramework({ packageJson, main })).rejects.toThrow(); + }); + + it('with @storybook/svelte-webpack5 framework', async () => { + const packageJson = { + dependencies: { + '@storybook/svelte': '^7.0.0', + '@storybook/svelte-webpack5': '^7.0.0', + '@sveltejs/kit': '^1.0.0-next.571', + }, + }; + const main = { + framework: '@storybook/svelte-webpack5', + }; + await expect(checkSvelteKitFramework({ packageJson, main })).rejects.toThrow(); + }); + }); + }); + + describe('should migrate', () => { + it('from @storybook/svelte-vite', async () => { + const packageJson = { + dependencies: { + '@storybook/svelte': '^7.0.0', + '@storybook/svelte-vite': '^7.0.0', + '@sveltejs/kit': '^1.0.0-next.571', + }, + }; + const main = { + framework: '@storybook/svelte-vite', + }; + await expect(checkSvelteKitFramework({ packageJson, main })).resolves.toMatchObject({ + packageJson, + main: expect.objectContaining({}), + frameworkOptions: undefined, + dependenciesToRemove: ['@storybook/svelte-vite'], + }); + }); + + it('from @storybook/svelte framework and @storybook/builder-vite builder', async () => { + const packageJson = { + dependencies: { + '@storybook/svelte': '^7.0.0', + '@storybook/builder-vite': '^7.0.0', + '@sveltejs/kit': '^1.0.0-next.571', + }, + }; + const main = { + framework: '@storybook/svelte', + core: { builder: '@storybook/builder-vite' }, + }; + await expect(checkSvelteKitFramework({ packageJson, main })).resolves.toMatchObject({ + packageJson, + main: expect.objectContaining({}), + frameworkOptions: undefined, + dependenciesToRemove: ['@storybook/builder-vite'], + }); + }); + + it('from @storybook/svelte framework and storybook-builder-vite builder', async () => { + const packageJson = { + dependencies: { + '@storybook/svelte': '^7.0.0', + 'storybook-builder-vite': '^0.2.5', + '@sveltejs/kit': '^1.0.0-next.571', + }, + }; + const main = { + framework: '@storybook/svelte', + core: { builder: 'storybook-builder-vite' }, + }; + await expect(checkSvelteKitFramework({ packageJson, main })).resolves.toMatchObject({ + packageJson, + main: expect.objectContaining({}), + frameworkOptions: undefined, + dependenciesToRemove: ['storybook-builder-vite'], + }); + }); + }); +}); diff --git a/code/lib/cli/src/automigrate/fixes/sveltekit-framework.ts b/code/lib/cli/src/automigrate/fixes/sveltekit-framework.ts new file mode 100644 index 00000000000..dd4bfd09e5a --- /dev/null +++ b/code/lib/cli/src/automigrate/fixes/sveltekit-framework.ts @@ -0,0 +1,186 @@ +import chalk from 'chalk'; +import dedent from 'ts-dedent'; +import semver from 'semver'; +import type { ConfigFile } from '@storybook/csf-tools'; +import { readConfig, writeConfig } from '@storybook/csf-tools'; +import { getStorybookInfo } from '@storybook/core-common'; + +import type { Fix } from '../types'; +import type { PackageJsonWithDepsAndDevDeps } from '../../js-package-manager'; +import { getStorybookVersionSpecifier } from '../../helpers'; + +const logger = console; + +interface SvelteKitFrameworkRunOptions { + main: ConfigFile; + packageJson: PackageJsonWithDepsAndDevDeps; + frameworkOptions: Record | undefined; + dependenciesToRemove: string[]; +} + +const fixId = 'sveltekitFramework'; + +/** + * Does the user have a SvelteKit project but is using a Svelte+Vite setup instead of the @storybook/sveltekit framework? + * + * If so: + * - Remove the dependencies (@storybook/svelte-vite, @storybook/builder-vite, storybook-builder-vite) + * - Add the dependencies (@storybook/sveltekit) + * - Update the main config to use the new framework + */ +export const sveltekitFramework: Fix = { + id: fixId, + + async check({ packageManager }) { + const packageJson = packageManager.retrievePackageJson(); + const allDeps = { ...packageJson.dependencies, ...packageJson.devDependencies }; + + if (!allDeps['@sveltejs/kit']) { + return null; + } + + const { mainConfig, version: storybookVersion } = getStorybookInfo(packageJson); + if (!mainConfig) { + logger.warn('Unable to find storybook main.js config, skipping'); + return null; + } + + const sbVersionCoerced = storybookVersion && semver.coerce(storybookVersion)?.version; + if (!sbVersionCoerced) { + logger.warn(dedent` + ❌ Unable to determine Storybook version, skipping ${chalk.cyan(fixId)} fix. + 🤔 Are you running automigrate from your project directory? + `); + return null; + } + + if (!semver.gte(sbVersionCoerced, '7.0.0')) { + return null; + } + + const main = await readConfig(mainConfig); + const frameworkConfig = main.getFieldValue(['framework']); + + if (!frameworkConfig) { + logger.warn(dedent` + ❌ Unable to determine Storybook framework, skipping ${chalk.cyan(fixId)} fix. + 🤔 Are you running automigrate from your project directory? + `); + return null; + } + + const framework = typeof frameworkConfig === 'string' ? frameworkConfig : frameworkConfig.name; + const frameworkOptions = main.getFieldValue(['framework', 'options']); + + if (framework === '@storybook/svelte-vite') { + // direct migration from svelte-vite projects + return { + main, + frameworkOptions, + packageJson, + dependenciesToRemove: ['@storybook/svelte-vite'], + }; + } + + if (framework !== '@storybook/svelte') { + // migration from projects using Svelte but with an unrecognized framework+builder setup - not supported + logger.warn(dedent` + We've detected you are using Storybook in a SvelteKit project. + + In Storybook 7, we introduced a new framework package for SvelteKit projects: @storybook/sveltekit. + + This package provides a better experience for SvelteKit users, however it is only compatible with the Svelte framework and the Vite builder, so we can't automigrate for you, as you are using another framework and builder combination. + + If you are interested in using this package, see: ${chalk.yellow( + 'https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#sveltekit-needs-the-storybooksveltekit-framework' + )} + `); + return null; + } + + const builder = main.getFieldValue(['core', 'builder']); + + if (!['@storybook/builder-vite', 'storybook-builder-vite'].includes(builder)) { + // migration from 6.x projects using Svelte with the Webpack builder - not supported + logger.warn(dedent` + We've detected you are using Storybook in a SvelteKit project. + + In Storybook 7, we introduced a new framework package for SvelteKit projects: @storybook/sveltekit. + + This package provides a better experience for SvelteKit users, however it is only compatible with the Vite builder, so we can't automigrate for you, as you are using another builder. + + If you are interested in using this package, see: ${chalk.yellow( + 'https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#sveltekit-needs-the-storybooksveltekit-framework' + )} + `); + + return null; + } + + // migration from 6.x projects using Svelte with the Vite builder + return { + main, + frameworkOptions, + packageJson, + dependenciesToRemove: [builder], + }; + }, + + prompt() { + return dedent` + We've detected you are using Storybook in a SvelteKit project. + + In Storybook 7, we introduced a new framework package for SvelteKit projects: @storybook/sveltekit + This package is a replacement for @storybook/svelte-vite and provides a better experience for SvelteKit users. + + We can automatically migrate your project to use the new SvelteKit framework package. + + To learn more about this change, see: ${chalk.yellow( + 'https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#sveltekit-needs-the-storybooksveltekit-framework' + )} + `; + }, + + async run({ + result: { main, frameworkOptions, packageJson, dependenciesToRemove }, + packageManager, + dryRun, + }) { + logger.info(`✅ Removing redundant packages: ${dependenciesToRemove.join(', ')}`); + if (!dryRun) { + packageManager.removeDependencies({ skipInstall: true, packageJson }, dependenciesToRemove); + } + + logger.info(`✅ Installing new dependencies: @storybook/sveltekit`); + if (!dryRun) { + const versionToInstall = getStorybookVersionSpecifier(packageJson); + packageManager.addDependencies({ installAsDevDependencies: true, packageJson }, [ + `@storybook/sveltekit@${versionToInstall}`, + ]); + } + + logger.info(`✅ Updating framework field in main.js`); + if (frameworkOptions) { + main.setFieldValue(['framework', 'options'], frameworkOptions); + main.setFieldValue(['framework', 'name'], '@storybook/sveltekit'); + } else { + main.setFieldValue(['framework'], '@storybook/sveltekit'); + } + + const currentCore = main.getFieldValue(['core']); + if (currentCore.builder) { + logger.info(`✅ Updating core field in main.js`); + const { builder, ...core } = currentCore; + + if (Object.keys(core).length === 0) { + main.removeField(['core']); + } else { + main.setFieldValue(['core'], core); + } + } + + if (!dryRun) { + await writeConfig(main); + } + }, +}; diff --git a/code/lib/cli/src/automigrate/index.ts b/code/lib/cli/src/automigrate/index.ts index 7e899863643..fd142694f64 100644 --- a/code/lib/cli/src/automigrate/index.ts +++ b/code/lib/cli/src/automigrate/index.ts @@ -66,6 +66,7 @@ export const automigrate = async ({ fixId, dryRun, yes, useNpm, force }: FixOpti type: 'confirm', name: 'fix', message: `Do you want to run the '${chalk.cyan(f.id)}' migration on your project?`, + initial: true, }); } diff --git a/code/lib/cli/src/detect.test.ts b/code/lib/cli/src/detect.test.ts index b18f7c5a5a8..597e2fc7818 100644 --- a/code/lib/cli/src/detect.test.ts +++ b/code/lib/cli/src/detect.test.ts @@ -296,22 +296,19 @@ describe('Detect', () => { it(`should return language typescript if the dependency is >TS4.9`, () => { expect(detectLanguage({ dependencies: { typescript: '4.9.1' } })).toBe( - // TODO: switch to TYPESCRIPT once csf-tools and eslint-plugin-storybook support `satisfies` operator - SupportedLanguage.TYPESCRIPT_LEGACY + SupportedLanguage.TYPESCRIPT ); }); it(`should return language typescript if the dependency is =TS4.9`, () => { expect(detectLanguage({ dependencies: { typescript: '4.9.0' } })).toBe( - // TODO: switch to TYPESCRIPT once csf-tools and eslint-plugin-storybook support `satisfies` operator - SupportedLanguage.TYPESCRIPT_LEGACY + SupportedLanguage.TYPESCRIPT ); }); it(`should return language typescript if the dependency is =TS4.9beta`, () => { expect(detectLanguage({ dependencies: { typescript: '^4.9.0-beta' } })).toBe( - // TODO: switch to TYPESCRIPT once csf-tools and eslint-plugin-storybook support `satisfies` operator - SupportedLanguage.TYPESCRIPT_LEGACY + SupportedLanguage.TYPESCRIPT ); }); diff --git a/code/lib/cli/src/detect.ts b/code/lib/cli/src/detect.ts index b9eb40c672c..bf5e9efb38e 100644 --- a/code/lib/cli/src/detect.ts +++ b/code/lib/cli/src/detect.ts @@ -170,10 +170,13 @@ export function detectLanguage(packageJson?: PackageJson) { (!hasDependency(packageJson, '@typescript-eslint/parser') || hasDependency(packageJson, '@typescript-eslint/parser', (version) => semver.gte(semver.coerce(version), '5.44.0') + )) && + (!hasDependency(packageJson, 'eslint-plugin-storybook') || + hasDependency(packageJson, 'eslint-plugin-storybook', (version) => + semver.gte(semver.coerce(version), '0.6.8') )) ) { - // TODO: switch to TYPESCRIPT once csf-tools and eslint-plugin-storybook support `satisfies` operator - language = SupportedLanguage.TYPESCRIPT_LEGACY; + language = SupportedLanguage.TYPESCRIPT; } else if (hasDependency(packageJson, 'typescript')) { language = SupportedLanguage.TYPESCRIPT_LEGACY; } diff --git a/code/lib/cli/src/link.ts b/code/lib/cli/src/link.ts index f52ad93bd75..bfb45e17161 100644 --- a/code/lib/cli/src/link.ts +++ b/code/lib/cli/src/link.ts @@ -63,7 +63,7 @@ export const link = async ({ target, local, start }: LinkOptions) => { `Magic stuff related to @storybook/preset-create-react-app, we need to fix peerDependencies` ); - if (!reproPackageJson.devDependencies.vite) { + if (!reproPackageJson.devDependencies?.vite) { await exec(`yarn add -D webpack-hot-middleware`, { cwd: reproDir }); } diff --git a/code/lib/cli/src/migrate.ts b/code/lib/cli/src/migrate.ts index 89e3e6759fa..0e4ab495a74 100644 --- a/code/lib/cli/src/migrate.ts +++ b/code/lib/cli/src/migrate.ts @@ -1,13 +1,10 @@ import { listCodemods, runCodemod } from '@storybook/codemod'; -export async function migrate( - migration: any, - { configDir, glob, dryRun, list, rename, logger, parser }: any -) { +export async function migrate(migration: any, { glob, dryRun, list, rename, logger, parser }: any) { if (list) { listCodemods().forEach((key: any) => logger.log(key)); } else if (migration) { - await runCodemod(migration, { configDir, glob, dryRun, logger, rename, parser }); + await runCodemod(migration, { glob, dryRun, logger, rename, parser }); } else { throw new Error('Migrate: please specify a migration name or --list'); } diff --git a/code/lib/cli/src/repro-templates.ts b/code/lib/cli/src/repro-templates.ts index a3b36ed04e5..bede75a14a5 100644 --- a/code/lib/cli/src/repro-templates.ts +++ b/code/lib/cli/src/repro-templates.ts @@ -238,7 +238,7 @@ export const allTemplates: Record = { inDevelopment: true, name: 'Svelte Kit (JS)', script: - 'yarn create svelte-with-args --name=svelte-kit/skeleton-js --directory=. --template=skeleton --types=null --no-prettier --no-eslint --no-playwright', + 'yarn create svelte-with-args --name=svelte-kit/skeleton-js --directory=. --template=skeleton --types=null --no-prettier --no-eslint --no-playwright --no-vitest', expected: { framework: '@storybook/sveltekit', renderer: '@storybook/svelte', @@ -249,7 +249,7 @@ export const allTemplates: Record = { inDevelopment: true, name: 'Svelte Kit (TS)', script: - 'yarn create svelte-with-args --name=svelte-kit/skeleton-ts --directory=. --template=skeleton --types=typescript --no-prettier --no-eslint --no-playwright', + 'yarn create svelte-with-args --name=svelte-kit/skeleton-ts --directory=. --template=skeleton --types=typescript --no-prettier --no-eslint --no-playwright --no-vitest', expected: { framework: '@storybook/sveltekit', renderer: '@storybook/svelte', diff --git a/code/lib/cli/src/typings.d.ts b/code/lib/cli/src/typings.d.ts index 75cb2ee2221..409993b0710 100644 --- a/code/lib/cli/src/typings.d.ts +++ b/code/lib/cli/src/typings.d.ts @@ -1,2 +1 @@ -declare module '@storybook/codemod'; declare module 'envinfo'; diff --git a/code/lib/cli/src/versions.ts b/code/lib/cli/src/versions.ts index aede3d6db24..254914b07a9 100644 --- a/code/lib/cli/src/versions.ts +++ b/code/lib/cli/src/versions.ts @@ -1,89 +1,89 @@ // auto generated file, do not edit export default { - '@storybook/addon-a11y': '7.0.0-beta.1', - '@storybook/addon-actions': '7.0.0-beta.1', - '@storybook/addon-backgrounds': '7.0.0-beta.1', - '@storybook/addon-controls': '7.0.0-beta.1', - '@storybook/addon-docs': '7.0.0-beta.1', - '@storybook/addon-essentials': '7.0.0-beta.1', - '@storybook/addon-highlight': '7.0.0-beta.1', - '@storybook/addon-interactions': '7.0.0-beta.1', - '@storybook/addon-jest': '7.0.0-beta.1', - '@storybook/addon-links': '7.0.0-beta.1', - '@storybook/addon-measure': '7.0.0-beta.1', - '@storybook/addon-outline': '7.0.0-beta.1', - '@storybook/addon-storyshots': '7.0.0-beta.1', - '@storybook/addon-storyshots-puppeteer': '7.0.0-beta.1', - '@storybook/addon-storysource': '7.0.0-beta.1', - '@storybook/addon-toolbars': '7.0.0-beta.1', - '@storybook/addon-viewport': '7.0.0-beta.1', - '@storybook/addons': '7.0.0-beta.1', - '@storybook/angular': '7.0.0-beta.1', - '@storybook/manager-api': '7.0.0-beta.1', - '@storybook/blocks': '7.0.0-beta.1', - '@storybook/builder-manager': '7.0.0-beta.1', - '@storybook/builder-vite': '7.0.0-beta.1', - '@storybook/builder-webpack5': '7.0.0-beta.1', - '@storybook/channel-postmessage': '7.0.0-beta.1', - '@storybook/channel-websocket': '7.0.0-beta.1', - '@storybook/channels': '7.0.0-beta.1', - '@storybook/cli': '7.0.0-beta.1', - '@storybook/client-api': '7.0.0-beta.1', - '@storybook/client-logger': '7.0.0-beta.1', - '@storybook/codemod': '7.0.0-beta.1', - '@storybook/components': '7.0.0-beta.1', - '@storybook/core-client': '7.0.0-beta.1', - '@storybook/core-common': '7.0.0-beta.1', - '@storybook/core-events': '7.0.0-beta.1', - '@storybook/core-server': '7.0.0-beta.1', - '@storybook/core-webpack': '7.0.0-beta.1', - '@storybook/csf-tools': '7.0.0-beta.1', - '@storybook/docs-tools': '7.0.0-beta.1', - '@storybook/ember': '7.0.0-beta.1', - '@storybook/html': '7.0.0-beta.1', - '@storybook/html-webpack5': '7.0.0-beta.1', - '@storybook/html-vite': '7.0.0-beta.1', - '@storybook/instrumenter': '7.0.0-beta.1', - '@storybook/nextjs': '7.0.0-beta.1', - '@storybook/node-logger': '7.0.0-beta.1', - '@storybook/postinstall': '7.0.0-beta.1', - '@storybook/preact': '7.0.0-beta.1', - '@storybook/preact-webpack5': '7.0.0-beta.1', - '@storybook/preset-html-webpack': '7.0.0-beta.1', - '@storybook/preset-preact-webpack': '7.0.0-beta.1', - '@storybook/preset-react-webpack': '7.0.0-beta.1', - '@storybook/preset-server-webpack': '7.0.0-beta.1', - '@storybook/preset-svelte-webpack': '7.0.0-beta.1', - '@storybook/preset-vue-webpack': '7.0.0-beta.1', - '@storybook/preset-vue3-webpack': '7.0.0-beta.1', - '@storybook/preset-web-components-webpack': '7.0.0-beta.1', - '@storybook/preview': '7.0.0-beta.1', - '@storybook/preview-api': '7.0.0-beta.1', - '@storybook/preview-web': '7.0.0-beta.1', - '@storybook/react': '7.0.0-beta.1', - '@storybook/react-vite': '7.0.0-beta.1', - '@storybook/react-webpack5': '7.0.0-beta.1', - '@storybook/router': '7.0.0-beta.1', - '@storybook/server': '7.0.0-beta.1', - '@storybook/server-webpack5': '7.0.0-beta.1', - '@storybook/source-loader': '7.0.0-beta.1', - '@storybook/store': '7.0.0-beta.1', - '@storybook/svelte': '7.0.0-beta.1', - '@storybook/sveltekit': '7.0.0-beta.1', - '@storybook/svelte-vite': '7.0.0-beta.1', - '@storybook/svelte-webpack5': '7.0.0-beta.1', - '@storybook/telemetry': '7.0.0-beta.1', - '@storybook/theming': '7.0.0-beta.1', - '@storybook/manager': '7.0.0-beta.1', - '@storybook/vue': '7.0.0-beta.1', - '@storybook/vue-vite': '7.0.0-beta.1', - '@storybook/vue-webpack5': '7.0.0-beta.1', - '@storybook/vue3': '7.0.0-beta.1', - '@storybook/vue3-vite': '7.0.0-beta.1', - '@storybook/vue3-webpack5': '7.0.0-beta.1', - '@storybook/web-components': '7.0.0-beta.1', - '@storybook/web-components-webpack5': '7.0.0-beta.1', - '@storybook/web-components-vite': '7.0.0-beta.1', - sb: '7.0.0-beta.1', - storybook: '7.0.0-beta.1', + '@storybook/addon-a11y': '7.0.0-beta.3', + '@storybook/addon-actions': '7.0.0-beta.3', + '@storybook/addon-backgrounds': '7.0.0-beta.3', + '@storybook/addon-controls': '7.0.0-beta.3', + '@storybook/addon-docs': '7.0.0-beta.3', + '@storybook/addon-essentials': '7.0.0-beta.3', + '@storybook/addon-highlight': '7.0.0-beta.3', + '@storybook/addon-interactions': '7.0.0-beta.3', + '@storybook/addon-jest': '7.0.0-beta.3', + '@storybook/addon-links': '7.0.0-beta.3', + '@storybook/addon-measure': '7.0.0-beta.3', + '@storybook/addon-outline': '7.0.0-beta.3', + '@storybook/addon-storyshots': '7.0.0-beta.3', + '@storybook/addon-storyshots-puppeteer': '7.0.0-beta.3', + '@storybook/addon-storysource': '7.0.0-beta.3', + '@storybook/addon-toolbars': '7.0.0-beta.3', + '@storybook/addon-viewport': '7.0.0-beta.3', + '@storybook/addons': '7.0.0-beta.3', + '@storybook/angular': '7.0.0-beta.3', + '@storybook/manager-api': '7.0.0-beta.3', + '@storybook/blocks': '7.0.0-beta.3', + '@storybook/builder-manager': '7.0.0-beta.3', + '@storybook/builder-vite': '7.0.0-beta.3', + '@storybook/builder-webpack5': '7.0.0-beta.3', + '@storybook/channel-postmessage': '7.0.0-beta.3', + '@storybook/channel-websocket': '7.0.0-beta.3', + '@storybook/channels': '7.0.0-beta.3', + '@storybook/cli': '7.0.0-beta.3', + '@storybook/client-api': '7.0.0-beta.3', + '@storybook/client-logger': '7.0.0-beta.3', + '@storybook/codemod': '7.0.0-beta.3', + '@storybook/components': '7.0.0-beta.3', + '@storybook/core-client': '7.0.0-beta.3', + '@storybook/core-common': '7.0.0-beta.3', + '@storybook/core-events': '7.0.0-beta.3', + '@storybook/core-server': '7.0.0-beta.3', + '@storybook/core-webpack': '7.0.0-beta.3', + '@storybook/csf-tools': '7.0.0-beta.3', + '@storybook/docs-tools': '7.0.0-beta.3', + '@storybook/ember': '7.0.0-beta.3', + '@storybook/html': '7.0.0-beta.3', + '@storybook/html-webpack5': '7.0.0-beta.3', + '@storybook/html-vite': '7.0.0-beta.3', + '@storybook/instrumenter': '7.0.0-beta.3', + '@storybook/nextjs': '7.0.0-beta.3', + '@storybook/node-logger': '7.0.0-beta.3', + '@storybook/postinstall': '7.0.0-beta.3', + '@storybook/preact': '7.0.0-beta.3', + '@storybook/preact-webpack5': '7.0.0-beta.3', + '@storybook/preset-html-webpack': '7.0.0-beta.3', + '@storybook/preset-preact-webpack': '7.0.0-beta.3', + '@storybook/preset-react-webpack': '7.0.0-beta.3', + '@storybook/preset-server-webpack': '7.0.0-beta.3', + '@storybook/preset-svelte-webpack': '7.0.0-beta.3', + '@storybook/preset-vue-webpack': '7.0.0-beta.3', + '@storybook/preset-vue3-webpack': '7.0.0-beta.3', + '@storybook/preset-web-components-webpack': '7.0.0-beta.3', + '@storybook/preview': '7.0.0-beta.3', + '@storybook/preview-api': '7.0.0-beta.3', + '@storybook/preview-web': '7.0.0-beta.3', + '@storybook/react': '7.0.0-beta.3', + '@storybook/react-vite': '7.0.0-beta.3', + '@storybook/react-webpack5': '7.0.0-beta.3', + '@storybook/router': '7.0.0-beta.3', + '@storybook/server': '7.0.0-beta.3', + '@storybook/server-webpack5': '7.0.0-beta.3', + '@storybook/source-loader': '7.0.0-beta.3', + '@storybook/store': '7.0.0-beta.3', + '@storybook/svelte': '7.0.0-beta.3', + '@storybook/sveltekit': '7.0.0-beta.3', + '@storybook/svelte-vite': '7.0.0-beta.3', + '@storybook/svelte-webpack5': '7.0.0-beta.3', + '@storybook/telemetry': '7.0.0-beta.3', + '@storybook/theming': '7.0.0-beta.3', + '@storybook/manager': '7.0.0-beta.3', + '@storybook/vue': '7.0.0-beta.3', + '@storybook/vue-vite': '7.0.0-beta.3', + '@storybook/vue-webpack5': '7.0.0-beta.3', + '@storybook/vue3': '7.0.0-beta.3', + '@storybook/vue3-vite': '7.0.0-beta.3', + '@storybook/vue3-webpack5': '7.0.0-beta.3', + '@storybook/web-components': '7.0.0-beta.3', + '@storybook/web-components-webpack5': '7.0.0-beta.3', + '@storybook/web-components-vite': '7.0.0-beta.3', + sb: '7.0.0-beta.3', + storybook: '7.0.0-beta.3', }; diff --git a/code/lib/client-api/package.json b/code/lib/client-api/package.json index a522aea90ef..84af4d8979a 100644 --- a/code/lib/client-api/package.json +++ b/code/lib/client-api/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/client-api", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook Client API", "keywords": [ "storybook" @@ -42,8 +42,8 @@ "prep": "../../../scripts/prepare/facade.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1" + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3" }, "publishConfig": { "access": "public" @@ -54,5 +54,5 @@ ], "shim": "@storybook/preview-api/dist/client-api" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/client-logger/package.json b/code/lib/client-logger/package.json index 7ace262af77..a8dd4fcdf86 100644 --- a/code/lib/client-logger/package.json +++ b/code/lib/client-logger/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/client-logger", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "", "keywords": [ "storybook" @@ -55,5 +55,5 @@ "./src/index.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/codemod/package.json b/code/lib/codemod/package.json index faa018ccec5..30b98e68c65 100644 --- a/code/lib/codemod/package.json +++ b/code/lib/codemod/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/codemod", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "A collection of codemod scripts written with JSCodeshift", "keywords": [ "storybook" @@ -26,11 +26,19 @@ "import": "./dist/index.mjs", "types": "./dist/index.d.ts" }, + "./dist/transforms/add-component-parameters.js": "./dist/transforms/add-component-parameters.js", + "./dist/transforms/csf-2-to-3.js": "./dist/transforms/csf-2-to-3.js", + "./dist/transforms/csf-hoist-story-annotations.js": "./dist/transforms/csf-hoist-story-annotations.js", + "./dist/transforms/csf-to-mdx.js": "./dist/transforms/csf-to-mdx.js", + "./dist/transforms/move-builtin-addons.js": "./dist/transforms/move-builtin-addons.js", + "./dist/transforms/storiesof-to-csf.js": "./dist/transforms/storiesof-to-csf.js", + "./dist/transforms/update-addon-info.js": "./dist/transforms/update-addon-info.js", + "./dist/transforms/update-organisation-name.js": "./dist/transforms/update-organisation-name.js", + "./dist/transforms/upgrade-hierarchy-separators.js": "./dist/transforms/upgrade-hierarchy-separators.js", "./package.json": "./package.json" }, "main": "dist/index.js", "module": "dist/index.mjs", - "jsnext:main": "src/index.js", "types": "dist/index.d.ts", "scripts": { "check": "../../../scripts/node_modules/.bin/tsc --noEmit", @@ -39,9 +47,9 @@ "dependencies": { "@babel/types": "^7.20.2", "@storybook/csf": "next", - "@storybook/csf-tools": "7.0.0-beta.1", - "@storybook/node-logger": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/csf-tools": "7.0.0-beta.3", + "@storybook/node-logger": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "cross-spawn": "^7.0.3", "globby": "^11.0.2", "jscodeshift": "^0.13.1", @@ -61,8 +69,17 @@ "bundler": { "platform": "node", "entries": [ - "./src/index.js" + "./src/index.js", + "./src/transforms/add-component-parameters.js", + "./src/transforms/csf-2-to-3.ts", + "./src/transforms/csf-hoist-story-annotations.js", + "./src/transforms/csf-to-mdx.js", + "./src/transforms/move-builtin-addons.js", + "./src/transforms/storiesof-to-csf.js", + "./src/transforms/update-addon-info.js", + "./src/transforms/update-organisation-name.js", + "./src/transforms/upgrade-hierarchy-separators.js" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/basic.input.js b/code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/basic.input.mdx similarity index 100% rename from code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/basic.input.js rename to code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/basic.input.mdx diff --git a/code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/component-id.input.js b/code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/component-id.input.mdx similarity index 100% rename from code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/component-id.input.js rename to code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/component-id.input.mdx diff --git a/code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/decorators.input.js b/code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/decorators.input.mdx similarity index 100% rename from code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/decorators.input.js rename to code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/decorators.input.mdx diff --git a/code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/exclude-stories.input.js b/code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/exclude-stories.input.mdx similarity index 100% rename from code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/exclude-stories.input.js rename to code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/exclude-stories.input.mdx diff --git a/code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/parameters.input.js b/code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/parameters.input.mdx similarity index 100% rename from code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/parameters.input.js rename to code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/parameters.input.mdx diff --git a/code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/plaintext.input.js b/code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/plaintext.input.mdx similarity index 100% rename from code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/plaintext.input.js rename to code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/plaintext.input.mdx diff --git a/code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/story-function.input.js b/code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/story-function.input.mdx similarity index 100% rename from code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/story-function.input.js rename to code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/story-function.input.mdx diff --git a/code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/story-parameters.input.js b/code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/story-parameters.input.mdx similarity index 100% rename from code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/story-parameters.input.js rename to code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/story-parameters.input.mdx diff --git a/code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/story-refs.input.js b/code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/story-refs.input.mdx similarity index 100% rename from code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/story-refs.input.js rename to code/lib/codemod/src/transforms/__testfixtures__/mdx-to-csf/story-refs.input.mdx diff --git a/code/lib/codemod/tsconfig.json b/code/lib/codemod/tsconfig.json index cf1e0996590..b00caeb5450 100644 --- a/code/lib/codemod/tsconfig.json +++ b/code/lib/codemod/tsconfig.json @@ -1,7 +1,9 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "skipLibCheck": true + "skipLibCheck": true, + "allowJs": true }, - "include": ["src/**/*"] + "include": ["src/**/*"], + "exclude": ["node_modules", "__testfixtures__", "__tests__"] } diff --git a/code/lib/core-client/package.json b/code/lib/core-client/package.json index 8599d72dac2..89f55b7b1cc 100644 --- a/code/lib/core-client/package.json +++ b/code/lib/core-client/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-client", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" @@ -35,8 +35,8 @@ "prep": "../../../scripts/prepare/facade.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1" + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3" }, "publishConfig": { "access": "public" @@ -47,5 +47,5 @@ ], "shim": "@storybook/preview-api/dist/core-client" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/core-common/package.json b/code/lib/core-common/package.json index d03eda73a08..bc0700d3317 100644 --- a/code/lib/core-common/package.json +++ b/code/lib/core-common/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-common", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" @@ -47,8 +47,8 @@ }, "dependencies": { "@babel/core": "^7.20.2", - "@storybook/node-logger": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/node-logger": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "@types/babel__core": "^7.1.20", "@types/express": "^4.7.0", "@types/node": "^16.0.0", @@ -91,5 +91,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/core-events/package.json b/code/lib/core-events/package.json index edfb59b8c44..83ca0b612e6 100644 --- a/code/lib/core-events/package.json +++ b/code/lib/core-events/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-events", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Event names used in storybook core", "keywords": [ "storybook" @@ -52,5 +52,5 @@ "./src/index.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/core-server/package.json b/code/lib/core-server/package.json index aac9c56cc68..ccaceb0f2cf 100644 --- a/code/lib/core-server/package.json +++ b/code/lib/core-server/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-server", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" @@ -35,16 +35,16 @@ "dependencies": { "@aw-web-design/x-default-browser": "1.4.88", "@discoveryjs/json-ext": "^0.5.3", - "@storybook/builder-manager": "7.0.0-beta.1", - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/core-events": "7.0.0-beta.1", + "@storybook/builder-manager": "7.0.0-beta.3", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/core-events": "7.0.0-beta.3", "@storybook/csf": "next", - "@storybook/csf-tools": "7.0.0-beta.1", + "@storybook/csf-tools": "7.0.0-beta.3", "@storybook/docs-mdx": "next", - "@storybook/node-logger": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/telemetry": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/node-logger": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/telemetry": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "@types/node": "^16.0.0", "@types/node-fetch": "^2.5.7", "@types/pretty-hrtime": "^1.0.0", @@ -76,7 +76,7 @@ "ws": "^8.2.3" }, "devDependencies": { - "@storybook/builder-webpack5": "7.0.0-beta.1", + "@storybook/builder-webpack5": "7.0.0-beta.3", "@types/compression": "^1.7.0", "@types/ip": "^1.1.0", "@types/serve-favicon": "^2.5.2", @@ -101,5 +101,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/core-server/src/build-static.ts b/code/lib/core-server/src/build-static.ts index b9567b6d453..7c444c4ae6f 100644 --- a/code/lib/core-server/src/build-static.ts +++ b/code/lib/core-server/src/build-static.ts @@ -5,7 +5,7 @@ import { dedent } from 'ts-dedent'; import global from 'global'; import { logger } from '@storybook/node-logger'; -import { telemetry } from '@storybook/telemetry'; +import { telemetry, getPrecedingUpgrade } from '@storybook/telemetry'; import type { BuilderOptions, CLIOptions, @@ -173,11 +173,14 @@ export async function buildStaticStandalone( effects.push( initializedStoryIndexGenerator.then(async (generator) => { const storyIndex = await generator?.getIndex(); - const payload = storyIndex - ? { - storyIndex: summarizeIndex(storyIndex), - } - : undefined; + const payload = { + precedingUpgrade: await getPrecedingUpgrade(), + }; + if (storyIndex) { + Object.assign(payload, { + storyIndex: summarizeIndex(storyIndex), + }); + } await telemetry('build', payload, { configDir: options.configDir }); }) ); diff --git a/code/lib/core-server/src/dev-server.ts b/code/lib/core-server/src/dev-server.ts index 86e9c756283..906c39b4362 100644 --- a/code/lib/core-server/src/dev-server.ts +++ b/code/lib/core-server/src/dev-server.ts @@ -109,7 +109,9 @@ export async function storybookDevServer(options: Options) { // this is a preview route, the builder has to be started before we can serve it // this handler keeps request to that route pending until the builder is ready to serve it, preventing a 404 router.get('/iframe.html', (req, res, next) => { - previewStarted.then(() => next()); + // We need to catch here or node will treat any errors thrown by `previewStarted` as + // unhandled and exit (even though they are very much handled below) + previewStarted.catch(() => {}).then(() => next()); }); Promise.all([initializedStoryIndexGenerator, listening, usingStatics]).then(async () => { diff --git a/code/lib/core-server/src/utils/doTelemetry.ts b/code/lib/core-server/src/utils/doTelemetry.ts index ab408534945..4b262f20aff 100644 --- a/code/lib/core-server/src/utils/doTelemetry.ts +++ b/code/lib/core-server/src/utils/doTelemetry.ts @@ -1,5 +1,5 @@ import type { CoreConfig, Options } from '@storybook/types'; -import { telemetry } from '@storybook/telemetry'; +import { telemetry, getPrecedingUpgrade } from '@storybook/telemetry'; import { useStorybookMetadata } from './metadata'; import type { StoryIndexGenerator } from './StoryIndexGenerator'; import { summarizeIndex } from './summarizeIndex'; @@ -15,12 +15,15 @@ export async function doTelemetry( initializedStoryIndexGenerator.then(async (generator) => { const storyIndex = await generator?.getIndex(); const { versionCheck, versionUpdates } = options; - const payload = storyIndex - ? { - versionStatus: versionUpdates ? versionStatus(versionCheck) : 'disabled', - storyIndex: summarizeIndex(storyIndex), - } - : undefined; + const payload = { + precedingUpgrade: await getPrecedingUpgrade(), + }; + if (storyIndex) { + Object.assign(payload, { + versionStatus: versionUpdates ? versionStatus(versionCheck) : 'disabled', + storyIndex: summarizeIndex(storyIndex), + }); + } telemetry('dev', payload, { configDir: options.configDir }); }); } diff --git a/code/lib/core-server/src/withTelemetry.test.ts b/code/lib/core-server/src/withTelemetry.test.ts index d887909ecc7..121b60718af 100644 --- a/code/lib/core-server/src/withTelemetry.test.ts +++ b/code/lib/core-server/src/withTelemetry.test.ts @@ -63,10 +63,10 @@ describe('when command fails', () => { withTelemetry('dev', { presetOptions: {} as any }, run) ).rejects.toThrow(error); - expect(telemetry).toHaveBeenCalledTimes(1); - expect(telemetry).not.toHaveBeenCalledWith( + expect(telemetry).toHaveBeenCalledTimes(2); + expect(telemetry).toHaveBeenCalledWith( 'error', - { eventType: 'dev', error }, + { eventType: 'dev' }, expect.objectContaining({}) ); }); @@ -88,7 +88,7 @@ describe('when command fails', () => { ); }); - it('does not send error message when telemetry is disabled', async () => { + it('does not send full error message when telemetry is disabled', async () => { jest.mocked(loadAllPresets).mockResolvedValueOnce({ apply: async () => ({ disableTelemetry: true } as any), }); @@ -132,10 +132,10 @@ describe('when command fails', () => { withTelemetry('dev', { presetOptions: {} as any }, run) ).rejects.toThrow(error); - expect(telemetry).toHaveBeenCalledTimes(1); - expect(telemetry).not.toHaveBeenCalledWith( + expect(telemetry).toHaveBeenCalledTimes(2); + expect(telemetry).toHaveBeenCalledWith( 'error', - { eventType: 'dev', error }, + { eventType: 'dev' }, expect.objectContaining({}) ); }); @@ -169,10 +169,10 @@ describe('when command fails', () => { withTelemetry('dev', { presetOptions: {} as any }, run) ).rejects.toThrow(error); - expect(telemetry).toHaveBeenCalledTimes(1); - expect(telemetry).not.toHaveBeenCalledWith( + expect(telemetry).toHaveBeenCalledTimes(2); + expect(telemetry).toHaveBeenCalledWith( 'error', - { eventType: 'dev', error }, + { eventType: 'dev' }, expect.objectContaining({}) ); }); diff --git a/code/lib/core-server/src/withTelemetry.ts b/code/lib/core-server/src/withTelemetry.ts index fbd77d0129f..a59e6fd4a18 100644 --- a/code/lib/core-server/src/withTelemetry.ts +++ b/code/lib/core-server/src/withTelemetry.ts @@ -1,7 +1,7 @@ import prompts from 'prompts'; import type { CLIOptions, CoreConfig } from '@storybook/types'; import { loadAllPresets, cache } from '@storybook/core-common'; -import { telemetry } from '@storybook/telemetry'; +import { telemetry, getPrecedingUpgrade } from '@storybook/telemetry'; import type { EventType } from '@storybook/telemetry'; type TelemetryOptions = { @@ -26,11 +26,13 @@ const promptCrashReports = async () => { return enableCrashReports; }; -async function shouldSendError({ cliOptions, presetOptions }: TelemetryOptions) { - if (cliOptions?.disableTelemetry) return false; +type ErrorLevel = 'none' | 'error' | 'full'; + +async function getErrorLevel({ cliOptions, presetOptions }: TelemetryOptions): Promise { + if (cliOptions?.disableTelemetry) return 'none'; // If we are running init or similar, we just have to go with true here - if (!presetOptions) return true; + if (!presetOptions) return 'full'; // should we load the preset? const presets = await loadAllPresets({ @@ -42,18 +44,18 @@ async function shouldSendError({ cliOptions, presetOptions }: TelemetryOptions) // If the user has chosen to enable/disable crash reports in main.js // or disabled telemetry, we can return that const core = await presets.apply('core'); - if (core?.enableCrashReports !== undefined) return core.enableCrashReports; - if (core?.disableTelemetry) return false; + if (core?.enableCrashReports !== undefined) return core.enableCrashReports ? 'full' : 'error'; + if (core?.disableTelemetry) return 'none'; // Deal with typo, remove in future version (7.1?) const valueFromCache = (await cache.get('enableCrashReports')) ?? (await cache.get('enableCrashreports')); - if (valueFromCache !== undefined) return valueFromCache; + if (valueFromCache !== undefined) return valueFromCache ? 'full' : 'error'; const valueFromPrompt = await promptCrashReports(); - if (valueFromPrompt !== undefined) return valueFromPrompt; + if (valueFromPrompt !== undefined) return valueFromPrompt ? 'full' : 'error'; - return true; + return 'full'; } export async function withTelemetry( @@ -67,14 +69,17 @@ export async function withTelemetry( await run(); } catch (error) { try { - if (await shouldSendError(options)) { + const errorLevel = await getErrorLevel(options); + if (errorLevel !== 'none') { + const precedingUpgrade = await getPrecedingUpgrade(); + await telemetry( 'error', - { eventType, error }, + { eventType, precedingUpgrade, error: errorLevel === 'full' ? error : undefined }, { immediate: true, configDir: options.cliOptions?.configDir || options.presetOptions?.configDir, - enableCrashReports: true, + enableCrashReports: errorLevel === 'full', } ); } diff --git a/code/lib/core-webpack/package.json b/code/lib/core-webpack/package.json index d0b19c6930a..662a448c542 100644 --- a/code/lib/core-webpack/package.json +++ b/code/lib/core-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-webpack", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" @@ -42,9 +42,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/node-logger": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/node-logger": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "@types/node": "^16.0.0", "ts-dedent": "^2.0.0" }, @@ -61,5 +61,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/csf-plugin/package.json b/code/lib/csf-plugin/package.json index e15321eca52..f286b223de6 100644 --- a/code/lib/csf-plugin/package.json +++ b/code/lib/csf-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/csf-plugin", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Enrich CSF files via static analysis", "keywords": [ "storybook" @@ -42,7 +42,7 @@ "prep": "node ../../../scripts/prepare.js" }, "dependencies": { - "@storybook/csf-tools": "7.0.0-beta.1", + "@storybook/csf-tools": "7.0.0-beta.3", "unplugin": "^0.10.2" }, "devDependencies": { @@ -56,5 +56,5 @@ "./src/index.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/csf-tools/package.json b/code/lib/csf-tools/package.json index cfee0422af6..4b00a65e38d 100644 --- a/code/lib/csf-tools/package.json +++ b/code/lib/csf-tools/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/csf-tools", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "", "keywords": [ "storybook" @@ -44,7 +44,7 @@ "dependencies": { "@babel/types": "^7.20.2", "@storybook/csf": "next", - "@storybook/types": "7.0.0-beta.1", + "@storybook/types": "7.0.0-beta.3", "fs-extra": "^9.0.1", "ts-dedent": "^2.0.0" }, @@ -64,5 +64,5 @@ "./src/index.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/csf-tools/src/ConfigFile.test.ts b/code/lib/csf-tools/src/ConfigFile.test.ts index 757ed1b0567..0c528a694cd 100644 --- a/code/lib/csf-tools/src/ConfigFile.test.ts +++ b/code/lib/csf-tools/src/ConfigFile.test.ts @@ -19,6 +19,12 @@ const setField = (path: string[], value: any, source: string) => { return formatConfig(config); }; +const removeField = (path: string[], source: string) => { + const config = loadConfig(source).parse(); + config.removeField(path); + return formatConfig(config); +}; + describe('ConfigFile', () => { describe('getField', () => { describe('named exports', () => { @@ -432,4 +438,313 @@ describe('ConfigFile', () => { }); }); }); + + describe('removeField', () => { + describe('named exports', () => { + it('missing export', () => { + expect( + removeField( + ['core', 'builder'], + dedent` + export const addons = []; + ` + ) + ).toMatchInlineSnapshot(`export const addons = [];`); + }); + it('missing field', () => { + expect( + removeField( + ['core', 'builder'], + dedent` + export const core = { foo: 'bar' }; + ` + ) + ).toMatchInlineSnapshot(` + export const core = { + foo: 'bar' + }; + `); + }); + it('found scalar', () => { + expect( + removeField( + ['core', 'builder'], + dedent` + export const core = { builder: 'webpack4' }; + ` + ) + ).toMatchInlineSnapshot(`export const core = {};`); + }); + it('found object', () => { + expect( + removeField( + ['core', 'builder'], + dedent` + export const core = { builder: { name: 'webpack4' } }; + ` + ) + ).toMatchInlineSnapshot(`export const core = {};`); + }); + it('nested object', () => { + expect( + removeField( + ['core', 'builder', 'name'], + dedent` + export const core = { builder: { name: 'webpack4' } }; + ` + ) + ).toMatchInlineSnapshot(` + export const core = { + builder: {} + }; + `); + }); + it('string literal key', () => { + expect( + removeField( + ['core', 'builder'], + dedent` + export const core = { 'builder': 'webpack4' }; + ` + ) + ).toMatchInlineSnapshot(`export const core = {};`); + }); + it('variable export', () => { + expect( + removeField( + ['core', 'builder'], + dedent` + const coreVar = { builder: 'webpack4' }; + export const core = coreVar; + ` + ) + ).toMatchInlineSnapshot(` + const coreVar = {}; + export const core = coreVar; + `); + }); + it('root export variable', () => { + expect( + removeField( + ['core'], + dedent` + export const core = { builder: { name: 'webpack4' } }; + + export const addons = []; + ` + ) + ).toMatchInlineSnapshot(`export const addons = [];`); + }); + }); + + describe('module exports', () => { + it('missing export', () => { + expect( + removeField( + ['core', 'builder'], + dedent` + module.exports = { addons: [] }; + ` + ) + ).toMatchInlineSnapshot(` + module.exports = { + addons: [] + }; + `); + }); + it('missing field', () => { + expect( + removeField( + ['core', 'builder'], + dedent` + module.exports = { core: { foo: 'bar' }}; + ` + ) + ).toMatchInlineSnapshot(` + module.exports = { + core: { + foo: 'bar' + } + }; + `); + }); + it('found scalar', () => { + expect( + removeField( + ['core', 'builder'], + dedent` + module.exports = { core: { builder: 'webpack4' } }; + ` + ) + ).toMatchInlineSnapshot(` + module.exports = { + core: {} + }; + `); + }); + it('nested scalar', () => { + expect( + removeField( + ['core', 'builder', 'name'], + dedent` + module.exports = { core: { builder: { name: 'webpack4' } } }; + ` + ) + ).toMatchInlineSnapshot(` + module.exports = { + core: { + builder: {} + } + }; + `); + }); + it('string literal key', () => { + expect( + removeField( + ['core', 'builder'], + dedent` + module.exports = { 'core': { 'builder': 'webpack4' } }; + ` + ) + ).toMatchInlineSnapshot(` + module.exports = { + 'core': {} + }; + `); + }); + it('root property', () => { + expect( + removeField( + ['core'], + dedent` + module.exports = { core: { builder: { name: 'webpack4' } }, addons: [] }; + ` + ) + ).toMatchInlineSnapshot(` + module.exports = { + addons: [] + }; + `); + }); + }); + + describe('default export', () => { + it('missing export', () => { + expect( + removeField( + ['core', 'builder'], + dedent` + export default { addons: [] }; + ` + ) + ).toMatchInlineSnapshot(` + export default { + addons: [] + }; + `); + }); + it('missing field', () => { + expect( + removeField( + ['core', 'builder'], + dedent` + export default { core: { foo: 'bar' }}; + ` + ) + ).toMatchInlineSnapshot(` + export default { + core: { + foo: 'bar' + } + }; + `); + }); + it('found scalar', () => { + expect( + removeField( + ['core', 'builder'], + dedent` + export default { core: { builder: 'webpack4' } }; + ` + ) + ).toMatchInlineSnapshot(` + export default { + core: {} + }; + `); + }); + it('nested scalar', () => { + expect( + removeField( + ['core', 'builder', 'name'], + dedent` + export default { core: { builder: { name: 'webpack4' } } }; + ` + ) + ).toMatchInlineSnapshot(` + export default { + core: { + builder: {} + } + }; + `); + }); + it('string literal key', () => { + expect( + removeField( + ['core', 'builder'], + dedent` + export default { 'core': { 'builder': 'webpack4' } }; + ` + ) + ).toMatchInlineSnapshot(` + export default { + 'core': {} + }; + `); + }); + it('root property', () => { + expect( + removeField( + ['core'], + dedent` + export default { core: { builder: { name: 'webpack4' } }, addons: [] }; + ` + ) + ).toMatchInlineSnapshot(` + export default { + addons: [] + }; + `); + }); + }); + + describe('quotes', () => { + it('no quotes', () => { + expect(setField(['foo', 'bar'], 'baz', '')).toMatchInlineSnapshot(` + export const foo = { + bar: "baz" + }; + `); + }); + it('more single quotes', () => { + expect(setField(['foo', 'bar'], 'baz', `export const stories = ['a', 'b', "c"]`)) + .toMatchInlineSnapshot(` + export const stories = ['a', 'b', "c"]; + export const foo = { + bar: 'baz' + }; + `); + }); + it('more double quotes', () => { + expect(setField(['foo', 'bar'], 'baz', `export const stories = ['a', "b", "c"]`)) + .toMatchInlineSnapshot(` + export const stories = ['a', "b", "c"]; + export const foo = { + bar: "baz" + }; + `); + }); + }); + }); }); diff --git a/code/lib/csf-tools/src/ConfigFile.ts b/code/lib/csf-tools/src/ConfigFile.ts index e9fde5c61b1..37e1cb6c3e8 100644 --- a/code/lib/csf-tools/src/ConfigFile.ts +++ b/code/lib/csf-tools/src/ConfigFile.ts @@ -31,6 +31,27 @@ const _getPath = (path: string[], node: t.Node): t.Node | undefined => { return undefined; }; +// eslint-disable-next-line @typescript-eslint/naming-convention +const _getPathProperties = (path: string[], node: t.Node): t.ObjectProperty[] | undefined => { + if (path.length === 0) { + if (t.isObjectExpression(node)) { + return node.properties as t.ObjectProperty[]; + } + throw new Error('Expected object expression'); + } + if (t.isObjectExpression(node)) { + const [first, ...rest] = path; + const field = node.properties.find((p: t.ObjectProperty) => propKey(p) === first); + if (field) { + // FXIME handle spread etc. + if (rest.length === 0) return node.properties as t.ObjectProperty[]; + + return _getPathProperties(rest, (field as t.ObjectProperty).value); + } + } + return undefined; +}; + // eslint-disable-next-line @typescript-eslint/naming-convention const _findVarInitialization = (identifier: string, program: t.Program) => { let init: t.Expression | null | undefined = null; @@ -196,6 +217,13 @@ export class ConfigFile { return _getPath(rest, exported); } + getFieldProperties(path: string[]) { + const [root, ...rest] = path; + const exported = this._exports[root]; + if (!exported) return undefined; + return _getPathProperties(rest, exported); + } + getFieldValue(path: string[]) { const node = this.getFieldNode(path); if (node) { @@ -226,6 +254,63 @@ export class ConfigFile { } } + removeField(path: string[]) { + const removeProperty = (properties: t.ObjectProperty[], prop: string) => { + const index = properties.findIndex( + (p) => + (t.isIdentifier(p.key) && p.key.name === prop) || + (t.isStringLiteral(p.key) && p.key.value === prop) + ); + if (index >= 0) { + properties.splice(index, 1); + } + }; + // the structure of this._exports doesn't work for this use case + // so we have to manually bypass it here + if (path.length === 1) { + let removedRootProperty = false; + // removing the root export + this._ast.program.body.forEach((node) => { + // named export + if (t.isExportNamedDeclaration(node) && t.isVariableDeclaration(node.declaration)) { + const decl = node.declaration.declarations[0]; + if (t.isIdentifier(decl.id) && decl.id.name === path[0]) { + this._ast.program.body.splice(this._ast.program.body.indexOf(node), 1); + removedRootProperty = true; + } + } + // default export + if (t.isExportDefaultDeclaration(node) && t.isObjectExpression(node.declaration)) { + const properties = node.declaration.properties as t.ObjectProperty[]; + removeProperty(properties, path[0]); + removedRootProperty = true; + } + // module.exports + if ( + t.isExpressionStatement(node) && + t.isAssignmentExpression(node.expression) && + t.isMemberExpression(node.expression.left) && + t.isIdentifier(node.expression.left.object) && + node.expression.left.object.name === 'module' && + t.isIdentifier(node.expression.left.property) && + node.expression.left.property.name === 'exports' && + t.isObjectExpression(node.expression.right) + ) { + const properties = node.expression.right.properties as t.ObjectProperty[]; + removeProperty(properties, path[0]); + removedRootProperty = true; + } + }); + if (removedRootProperty) return; + } + + const properties = this.getFieldProperties(path) as t.ObjectProperty[]; + if (properties) { + const lastPath = path.at(-1); + removeProperty(properties, lastPath); + } + } + _inferQuotes() { if (!this._quotes) { // first 500 tokens for efficiency diff --git a/code/lib/docs-tools/package.json b/code/lib/docs-tools/package.json index 52d832ab7e4..af885dd4892 100644 --- a/code/lib/docs-tools/package.json +++ b/code/lib/docs-tools/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/docs-tools", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Shared utility functions for frameworks to implement docs", "keywords": [ "storybook" @@ -43,9 +43,9 @@ }, "dependencies": { "@babel/core": "^7.12.10", - "@storybook/core-common": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/core-common": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "doctrine": "^3.0.0", "lodash": "^4.17.21" }, @@ -62,5 +62,5 @@ "./src/index.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/instrumenter/package.json b/code/lib/instrumenter/package.json index 5d50c86e8a0..1ca2286b033 100644 --- a/code/lib/instrumenter/package.json +++ b/code/lib/instrumenter/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/instrumenter", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "", "keywords": [ "storybook" @@ -42,10 +42,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/channels": "7.0.0-beta.1", - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/core-events": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", + "@storybook/channels": "7.0.0-beta.3", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/core-events": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", "core-js": "^3.8.2", "global": "^4.4.0" }, @@ -60,5 +60,5 @@ "./src/index.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/instrumenter/src/instrumenter.ts b/code/lib/instrumenter/src/instrumenter.ts index c29b1a6fbd9..480e47b3404 100644 --- a/code/lib/instrumenter/src/instrumenter.ts +++ b/code/lib/instrumenter/src/instrumenter.ts @@ -334,7 +334,7 @@ export class Instrumenter { track(method: string, fn: Function, args: any[], options: Options) { const storyId: StoryId = args?.[0]?.__storyId__ || - global.window.__STORYBOOK_PREVIEW__.selectionStore.selection.storyId; + global.window.__STORYBOOK_PREVIEW__?.selectionStore?.selection?.storyId; const { cursor, ancestors } = this.getState(storyId); this.setState(storyId, { cursor: cursor + 1 }); const id = `${ancestors.slice(-1)[0] || storyId} [${cursor}] ${method}`; diff --git a/code/lib/manager-api-shim/package.json b/code/lib/manager-api-shim/package.json index f1ba7ffb7d4..c2d08a3cbc5 100644 --- a/code/lib/manager-api-shim/package.json +++ b/code/lib/manager-api-shim/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/api", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook Manager API (facade)", "keywords": [ "storybook" @@ -42,8 +42,8 @@ "prep": "../../../scripts/prepare/facade.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/manager-api": "7.0.0-beta.1" + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/manager-api": "7.0.0-beta.3" }, "publishConfig": { "access": "public" @@ -54,5 +54,5 @@ ], "shim": "@storybook/manager-api" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/manager-api/package.json b/code/lib/manager-api/package.json index 36c783acb44..f352bff6501 100644 --- a/code/lib/manager-api/package.json +++ b/code/lib/manager-api/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/manager-api", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Core Storybook API & Context", "keywords": [ "storybook" @@ -41,13 +41,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/channels": "7.0.0-beta.1", - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/core-events": "7.0.0-beta.1", + "@storybook/channels": "7.0.0-beta.3", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/core-events": "7.0.0-beta.3", "@storybook/csf": "next", - "@storybook/router": "7.0.0-beta.1", - "@storybook/theming": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/router": "7.0.0-beta.3", + "@storybook/theming": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "dequal": "^2.0.2", "global": "^4.4.0", "lodash": "^4.17.21", @@ -77,5 +77,5 @@ "./src/index.tsx" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/manager-api/src/version.ts b/code/lib/manager-api/src/version.ts index 1059631511c..b7c6f5eed35 100644 --- a/code/lib/manager-api/src/version.ts +++ b/code/lib/manager-api/src/version.ts @@ -1 +1 @@ -export const version = '7.0.0-beta.1'; +export const version = '7.0.0-beta.3'; diff --git a/code/lib/node-logger/package.json b/code/lib/node-logger/package.json index c2a9be8a6cb..09ea2e116a6 100644 --- a/code/lib/node-logger/package.json +++ b/code/lib/node-logger/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/node-logger", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "", "keywords": [ "storybook" @@ -59,5 +59,5 @@ "./src/index.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/postinstall/package.json b/code/lib/postinstall/package.json index 94fa0c0253b..94d370389ba 100644 --- a/code/lib/postinstall/package.json +++ b/code/lib/postinstall/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/postinstall", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook addons postinstall utilities", "keywords": [ "api", @@ -56,5 +56,5 @@ "./src/index.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/preview-api/package.json b/code/lib/preview-api/package.json index 1ae69a8b157..9dd1acd6398 100644 --- a/code/lib/preview-api/package.json +++ b/code/lib/preview-api/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preview-api", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "", "keywords": [ "storybook" @@ -67,12 +67,12 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/channel-postmessage": "7.0.0-beta.1", - "@storybook/channels": "7.0.0-beta.1", - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/core-events": "7.0.0-beta.1", + "@storybook/channel-postmessage": "7.0.0-beta.3", + "@storybook/channels": "7.0.0-beta.3", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/core-events": "7.0.0-beta.3", "@storybook/csf": "next", - "@storybook/types": "7.0.0-beta.1", + "@storybook/types": "7.0.0-beta.3", "@types/qs": "^6.9.5", "dequal": "^2.0.2", "global": "^4.4.0", @@ -86,7 +86,7 @@ }, "devDependencies": { "@jest/globals": "^26.6.2", - "@storybook/core-common": "7.0.0-beta.1", + "@storybook/core-common": "7.0.0-beta.3", "ansi-to-html": "^0.6.11", "react": "^16.14.0" }, @@ -103,5 +103,5 @@ "./src/store.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/preview-web/package.json b/code/lib/preview-web/package.json index 3e0f1513ba4..88756dcd7fe 100644 --- a/code/lib/preview-web/package.json +++ b/code/lib/preview-web/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preview-web", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "", "keywords": [ "storybook" @@ -42,8 +42,8 @@ "prep": "../../../scripts/prepare/facade.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1" + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3" }, "publishConfig": { "access": "public" @@ -54,5 +54,5 @@ ], "shim": "@storybook/preview-api/dist/preview-web" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/preview/package.json b/code/lib/preview/package.json index 5bc9d2ee5da..4e10d45d63c 100644 --- a/code/lib/preview/package.json +++ b/code/lib/preview/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preview", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "", "keywords": [ "storybook" @@ -57,12 +57,12 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "devDependencies": { - "@storybook/channel-postmessage": "7.0.0-beta.1", - "@storybook/channel-websocket": "7.0.0-beta.1", - "@storybook/channels": "7.0.0-beta.1", - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/core-events": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", + "@storybook/channel-postmessage": "7.0.0-beta.3", + "@storybook/channel-websocket": "7.0.0-beta.3", + "@storybook/channels": "7.0.0-beta.3", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/core-events": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", "typescript": "~4.9.3" }, "publishConfig": { @@ -74,5 +74,5 @@ "./src/globals.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/router/package.json b/code/lib/router/package.json index 5ff193e43ed..136f7cef974 100644 --- a/code/lib/router/package.json +++ b/code/lib/router/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/router", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Core Storybook Router", "keywords": [ "storybook" @@ -47,7 +47,7 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", + "@storybook/client-logger": "7.0.0-beta.3", "memoizerific": "^1.11.3", "qs": "^6.10.0" }, @@ -74,5 +74,5 @@ "./src/utils.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/source-loader/package.json b/code/lib/source-loader/package.json index 0d4219565a7..214c4702ea6 100644 --- a/code/lib/source-loader/package.json +++ b/code/lib/source-loader/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/source-loader", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Source loader", "keywords": [ "lib", @@ -44,7 +44,7 @@ }, "dependencies": { "@storybook/csf": "next", - "@storybook/types": "7.0.0-beta.1", + "@storybook/types": "7.0.0-beta.3", "estraverse": "^5.2.0", "lodash": "^4.17.21", "prettier": "^2.8.0" @@ -66,5 +66,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/store/package.json b/code/lib/store/package.json index 4ace883b083..0a3cdf4b055 100644 --- a/code/lib/store/package.json +++ b/code/lib/store/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/store", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "", "keywords": [ "storybook" @@ -42,8 +42,8 @@ "prep": "../../../scripts/prepare/facade.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1" + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3" }, "publishConfig": { "access": "public" @@ -55,5 +55,5 @@ "platform": "node", "shim": "@storybook/preview-api/dist/store" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/telemetry/package.json b/code/lib/telemetry/package.json index 4ae92b588da..228a1856ecf 100644 --- a/code/lib/telemetry/package.json +++ b/code/lib/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/telemetry", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Telemetry logging for crash reports and usage statistics", "keywords": [ "storybook" @@ -42,8 +42,8 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/core-common": "7.0.0-beta.1", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/core-common": "7.0.0-beta.3", "chalk": "^4.1.0", "detect-package-manager": "^2.0.1", "fetch-retry": "^5.0.2", @@ -64,5 +64,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/telemetry/src/event-cache.test.ts b/code/lib/telemetry/src/event-cache.test.ts new file mode 100644 index 00000000000..7d1fd463bd9 --- /dev/null +++ b/code/lib/telemetry/src/event-cache.test.ts @@ -0,0 +1,175 @@ +import { getPrecedingUpgrade } from './event-cache'; + +expect.addSnapshotSerializer({ + print: (val: any) => JSON.stringify(val, null, 2), + test: (val) => typeof val !== 'string', +}); + +describe('event-cache', () => { + const init = { body: { eventType: 'init', eventId: 'init' }, timestamp: 1 }; + const upgrade = { body: { eventType: 'upgrade', eventId: 'upgrade' }, timestamp: 2 }; + const dev = { body: { eventType: 'dev', eventId: 'dev' }, timestamp: 3 }; + const build = { body: { eventType: 'build', eventId: 'build' }, timestamp: 3 }; + const error = { body: { eventType: 'build', eventId: 'error' }, timestamp: 4 }; + const versionUpdate = { + body: { eventType: 'version-update', eventId: 'version-update' }, + timestamp: 5, + }; + + describe('data handling', () => { + it('errors', async () => { + const preceding = await getPrecedingUpgrade({ + init: { timestamp: 1, body: { ...init.body, error: {} } }, + }); + expect(preceding).toMatchInlineSnapshot(` + { + "timestamp": 1, + "eventType": "init", + "eventId": "init" + } + `); + }); + + it('session IDs', async () => { + const preceding = await getPrecedingUpgrade({ + init: { timestamp: 1, body: { ...init.body, sessionId: 100 } }, + }); + expect(preceding).toMatchInlineSnapshot(` + { + "timestamp": 1, + "eventType": "init", + "eventId": "init", + "sessionId": 100 + } + `); + }); + + it('extra fields', async () => { + const preceding = await getPrecedingUpgrade({ + init: { timestamp: 1, body: { ...init.body, foobar: 'baz' } }, + }); + expect(preceding).toMatchInlineSnapshot(` + { + "timestamp": 1, + "eventType": "init", + "eventId": "init" + } + `); + }); + }); + + describe('no intervening dev events', () => { + it('no upgrade events', async () => { + const preceding = await getPrecedingUpgrade({}); + expect(preceding).toBeUndefined(); + }); + + it('init', async () => { + const preceding = await getPrecedingUpgrade({ init }); + expect(preceding).toMatchInlineSnapshot(` + { + "timestamp": 1, + "eventType": "init", + "eventId": "init" + } + `); + }); + + it('upgrade', async () => { + const preceding = await getPrecedingUpgrade({ upgrade }); + expect(preceding).toMatchInlineSnapshot(` + { + "timestamp": 2, + "eventType": "upgrade", + "eventId": "upgrade" + } + `); + }); + + it('both init and upgrade', async () => { + const preceding = await getPrecedingUpgrade({ init, upgrade }); + expect(preceding).toMatchInlineSnapshot(` + { + "timestamp": 2, + "eventType": "upgrade", + "eventId": "upgrade" + } + `); + }); + }); + + describe('intervening dev events', () => { + it('no upgrade events', async () => { + const preceding = await getPrecedingUpgrade({ dev }); + expect(preceding).toBeUndefined(); + }); + + it('init', async () => { + const preceding = await getPrecedingUpgrade({ init, dev }); + expect(preceding).toBeUndefined(); + }); + + it('upgrade', async () => { + const preceding = await getPrecedingUpgrade({ upgrade, dev }); + expect(preceding).toBeUndefined(); + }); + + it('init followed by upgrade', async () => { + const preceding = await getPrecedingUpgrade({ init, upgrade, dev }); + expect(preceding).toBeUndefined(); + }); + + it('both init and upgrade with intervening dev', async () => { + const secondUpgrade = { + body: { eventType: 'upgrade', eventId: 'secondUpgrade' }, + timestamp: 4, + }; + const preceding = await getPrecedingUpgrade({ init, dev, upgrade: secondUpgrade }); + expect(preceding).toMatchInlineSnapshot(` + { + "timestamp": 4, + "eventType": "upgrade", + "eventId": "secondUpgrade" + } + `); + }); + + it('both init and upgrade with non-intervening dev', async () => { + const earlyDev = { + body: { eventType: 'dev', eventId: 'earlyDev' }, + timestamp: -1, + }; + const preceding = await getPrecedingUpgrade({ dev: earlyDev, init, upgrade }); + expect(preceding).toMatchInlineSnapshot(` + { + "timestamp": 2, + "eventType": "upgrade", + "eventId": "upgrade" + } + `); + }); + }); + + describe('intervening other events', () => { + it('build', async () => { + const preceding = await getPrecedingUpgrade({ upgrade, build }); + expect(preceding).toBeUndefined(); + }); + + it('error', async () => { + const preceding = await getPrecedingUpgrade({ upgrade, error }); + expect(preceding).toBeUndefined(); + }); + + it('version-update', async () => { + const preceding = await getPrecedingUpgrade({ upgrade, 'version-update': versionUpdate }); + expect(preceding).toMatchInlineSnapshot(` + { + "timestamp": 2, + "eventType": "upgrade", + "eventId": "upgrade" + } + `); + }); + }); +}); diff --git a/code/lib/telemetry/src/event-cache.ts b/code/lib/telemetry/src/event-cache.ts new file mode 100644 index 00000000000..4e511d3b644 --- /dev/null +++ b/code/lib/telemetry/src/event-cache.ts @@ -0,0 +1,61 @@ +import { cache } from '@storybook/core-common'; +import type { EventType } from './types'; + +interface UpgradeSummary { + timestamp: number; + eventType?: EventType; + eventId?: string; + sessionId?: string; +} + +let operation: Promise = Promise.resolve(); + +const setHelper = async (eventType: EventType, body: any) => { + const lastEvents = (await cache.get('lastEvents')) || {}; + lastEvents[eventType] = { body, timestamp: Date.now() }; + await cache.set('lastEvents', lastEvents); +}; + +export const set = async (eventType: EventType, body: any) => { + await operation; + operation = setHelper(eventType, body); + return operation; +}; + +export const get = async (eventType: EventType) => { + const lastEvents = await cache.get('lastEvents'); + return lastEvents?.[eventType]; +}; + +const upgradeFields = (event: any): UpgradeSummary => { + const { body, timestamp } = event; + return { + timestamp, + eventType: body?.eventType, + eventId: body?.eventId, + sessionId: body?.sessionId, + }; +}; + +const UPGRADE_EVENTS: EventType[] = ['init', 'upgrade']; +const RUN_EVENTS: EventType[] = ['build', 'dev', 'error']; + +const lastEvent = (lastEvents: Record, eventTypes: EventType[]) => { + const descendingEvents = eventTypes + .map((eventType) => lastEvents?.[eventType]) + .filter(Boolean) + .sort((a, b) => b.timestamp - a.timestamp); + return descendingEvents.length > 0 ? descendingEvents[0] : undefined; +}; + +export const getPrecedingUpgrade = async (events: any = undefined) => { + const lastEvents = events || (await cache.get('lastEvents')) || {}; + const lastUpgradeEvent = lastEvent(lastEvents, UPGRADE_EVENTS); + const lastRunEvent = lastEvent(lastEvents, RUN_EVENTS); + + if (!lastUpgradeEvent) return undefined; + + return !lastRunEvent?.timestamp || lastUpgradeEvent.timestamp > lastRunEvent.timestamp + ? upgradeFields(lastUpgradeEvent) + : undefined; +}; diff --git a/code/lib/telemetry/src/get-chromatic-version.test.ts b/code/lib/telemetry/src/get-chromatic-version.test.ts new file mode 100644 index 00000000000..9ee07f3d45e --- /dev/null +++ b/code/lib/telemetry/src/get-chromatic-version.test.ts @@ -0,0 +1,15 @@ +import { getChromaticVersionSpecifier } from './get-chromatic-version'; + +it('works for dependencies', () => { + expect(getChromaticVersionSpecifier({ dependencies: { chromatic: '^6.11.4' } })).toBe('^6.11.4'); +}); + +it('works for scripts', () => { + expect(getChromaticVersionSpecifier({ scripts: { chromatic: 'npx chromatic -t abc123' } })).toBe( + 'latest' + ); +}); + +it('fails otherwise', () => { + expect(getChromaticVersionSpecifier({})).toBeUndefined(); +}); diff --git a/code/lib/telemetry/src/get-chromatic-version.ts b/code/lib/telemetry/src/get-chromatic-version.ts new file mode 100644 index 00000000000..c9f8db06cfe --- /dev/null +++ b/code/lib/telemetry/src/get-chromatic-version.ts @@ -0,0 +1,15 @@ +import type { PackageJson } from '@storybook/types'; + +export function getChromaticVersionSpecifier(packageJson: PackageJson) { + const dependency = + packageJson.dependencies?.chromatic || + packageJson.devDependencies?.chromatic || + packageJson.peerDependencies?.chromatic; + if (dependency) return dependency; + + // Chromatic isn't necessarily installed in dependencies, it can be run from npx + return packageJson.scripts && + Object.values(packageJson.scripts).find((s) => s?.match(/chromatic/)) + ? 'latest' + : undefined; +} diff --git a/code/lib/telemetry/src/index.ts b/code/lib/telemetry/src/index.ts index d4ccab43aa1..a1da9bc6953 100644 --- a/code/lib/telemetry/src/index.ts +++ b/code/lib/telemetry/src/index.ts @@ -11,6 +11,8 @@ export * from './types'; export { getStorybookCoreVersion } from './package-json'; +export { getPrecedingUpgrade } from './event-cache'; + export const telemetry = async ( eventType: EventType, payload: Payload = {}, diff --git a/code/lib/telemetry/src/storybook-metadata.ts b/code/lib/telemetry/src/storybook-metadata.ts index 54a98ce8917..6973345880e 100644 --- a/code/lib/telemetry/src/storybook-metadata.ts +++ b/code/lib/telemetry/src/storybook-metadata.ts @@ -13,6 +13,7 @@ import { getActualPackageVersion, getActualPackageVersions } from './package-jso import { getMonorepoType } from './get-monorepo-type'; import { cleanPaths } from './sanitize'; import { getFrameworkInfo } from './get-framework-info'; +import { getChromaticVersionSpecifier } from './get-chromatic-version'; export const metaFrameworks = { next: 'Next', @@ -123,6 +124,15 @@ export const computeStorybookMetadata = async ({ }); } + const chromaticVersionSpecifier = getChromaticVersionSpecifier(packageJson); + if (chromaticVersionSpecifier) { + addons.chromatic = { + version: undefined, + versionSpecifier: chromaticVersionSpecifier, + options: undefined, + }; + } + const addonVersions = await getActualPackageVersions(addons); addonVersions.forEach(({ name, version }) => { addons[name].version = version; diff --git a/code/lib/telemetry/src/telemetry.ts b/code/lib/telemetry/src/telemetry.ts index d8d895395b7..a2cbe0e4391 100644 --- a/code/lib/telemetry/src/telemetry.ts +++ b/code/lib/telemetry/src/telemetry.ts @@ -3,6 +3,7 @@ import retry from 'fetch-retry'; import { nanoid } from 'nanoid'; import type { Options, TelemetryData } from './types'; import { getAnonymousProjectId } from './anonymous-id'; +import { set as saveToCache } from './event-cache'; const URL = process.env.STORYBOOK_TELEMETRY_URL || 'https://storybook.js.org/event-log'; @@ -24,7 +25,7 @@ export async function sendTelemetry( // the server actually gets the request and stores it anyway. // flatten the data before we send it - const { payload, metadata, ...rest } = data; + const { eventType, payload, metadata, ...rest } = data; const context = options.stripMetadata ? {} : { @@ -32,7 +33,7 @@ export async function sendTelemetry( inCI: Boolean(process.env.CI), }; const eventId = nanoid(); - const body = { ...rest, eventId, sessionId, metadata, payload, context }; + const body = { ...rest, eventType, eventId, sessionId, metadata, payload, context }; let request: Promise; try { @@ -48,13 +49,15 @@ export async function sendTelemetry( ? options.retryDelay : 1000), }); - tasks.push(request); + tasks.push(request); if (options.immediate) { await Promise.all(tasks); } else { await request; } + + await saveToCache(eventType, body); } catch (err) { // } finally { diff --git a/code/lib/telemetry/src/types.ts b/code/lib/telemetry/src/types.ts index 6011282a8c5..d33b8967734 100644 --- a/code/lib/telemetry/src/types.ts +++ b/code/lib/telemetry/src/types.ts @@ -15,6 +15,7 @@ export type EventType = export interface Dependency { version: string | undefined; + versionSpecifier?: string; } export interface StorybookAddon extends Dependency { diff --git a/code/lib/theming/package.json b/code/lib/theming/package.json index ef689b4d2f2..68ae0afa6ab 100644 --- a/code/lib/theming/package.json +++ b/code/lib/theming/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/theming", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Core Storybook Components", "keywords": [ "storybook" @@ -49,7 +49,7 @@ }, "dependencies": { "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0", - "@storybook/client-logger": "7.0.0-beta.1", + "@storybook/client-logger": "7.0.0-beta.3", "memoizerific": "^1.11.3" }, "devDependencies": { @@ -80,5 +80,5 @@ ], "post": "./scripts/fix-theme-type-export.ts" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/types/package.json b/code/lib/types/package.json index a1973bf1013..c993514c49f 100644 --- a/code/lib/types/package.json +++ b/code/lib/types/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/types", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Core Storybook Types", "keywords": [ "storybook" @@ -41,7 +41,7 @@ }, "dependencies": { "@babel/core": "^7.12.10", - "@storybook/channels": "7.0.0-beta.1", + "@storybook/channels": "7.0.0-beta.3", "@types/babel__core": "^7.0.0", "@types/express": "^4.7.0", "express": "^4.17.3", @@ -60,5 +60,5 @@ "./src/index.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/lib/types/src/modules/core-common.ts b/code/lib/types/src/modules/core-common.ts index 94fa3b310c0..61dc1826649 100644 --- a/code/lib/types/src/modules/core-common.ts +++ b/code/lib/types/src/modules/core-common.ts @@ -341,7 +341,7 @@ export interface StorybookConfig { /** * References external Storybooks */ - refs?: CoreCommon_StorybookRefs | ((config: any, options: Options) => CoreCommon_StorybookRefs); + refs?: PresetValue; /** * Modify or return babel config. @@ -364,17 +364,17 @@ export interface StorybookConfig { * * @deprecated use `previewAnnotations` or `/preview.js` file instead */ - config?: (entries: Entry[], options: Options) => Entry[]; + config?: PresetValue; /** * Add additional scripts to run in the preview a la `.storybook/preview.js` */ - previewAnnotations?: (entries: Entry[], options: Options) => Entry[]; + previewAnnotations?: PresetValue; /** * Process CSF files for the story index. */ - storyIndexers?: (indexers: StoryIndexer[], options: Options) => StoryIndexer[]; + storyIndexers?: PresetValue; /** * Docs related features in index generation @@ -386,11 +386,13 @@ export interface StorybookConfig { * The previewHead and previewBody functions accept a string, * which is the existing head/body, and return a modified string. */ - previewHead?: (head: string, options: Options) => string; + previewHead?: PresetValue; - previewBody?: (body: string, options: Options) => string; + previewBody?: PresetValue; } +export type PresetValue = T | ((config: T, options: Options) => T | Promise); + export type PresetProperty = | TStorybookConfig[K extends keyof TStorybookConfig ? K : never] | PresetPropertyFn; diff --git a/code/package.json b/code/package.json index f591a2b7663..af29e55ca31 100644 --- a/code/package.json +++ b/code/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/root", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "private": true, "description": "Storybook is an open source tool for developing UI components in isolation for React, Vue and Angular. It makes building stunning UIs organized and efficient.", "keywords": [ @@ -338,7 +338,7 @@ "tsup": "^6.2.2", "typescript": "~4.9.3", "util": "^0.12.4", - "vite": "^3.1.7", + "vite": "^4.0.0-beta.2", "vite-plugin-turbosnap": "^1.0.1", "wait-on": "^5.2.1", "web-component-analyzer": "^1.1.6", @@ -386,8 +386,7 @@ }, "packageManager": "yarn@3.3.0", "engines": { - "node": ">=10.13.0", - "yarn": ">=1.3.2" + "node": ">=16.0.0" }, "collective": { "type": "opencollective", diff --git a/code/presets/html-webpack/package.json b/code/presets/html-webpack/package.json index 8cb60dc5487..856bcb2c7c1 100644 --- a/code/presets/html-webpack/package.json +++ b/code/presets/html-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-html-webpack", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -50,7 +50,7 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-webpack": "7.0.0-beta.1", + "@storybook/core-webpack": "7.0.0-beta.3", "@types/node": "^16.0.0", "html-loader": "^3.1.0", "webpack": "5" @@ -62,7 +62,7 @@ "@babel/core": "*" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -73,5 +73,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/presets/preact-webpack/package.json b/code/presets/preact-webpack/package.json index 5d9b2f9deda..9f82c83010c 100644 --- a/code/presets/preact-webpack/package.json +++ b/code/presets/preact-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-preact-webpack", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for Preact: Develop Preact Component in isolation.", "keywords": [ "storybook" @@ -51,7 +51,7 @@ }, "dependencies": { "@babel/plugin-transform-react-jsx": "^7.19.0", - "@storybook/core-webpack": "7.0.0-beta.1", + "@storybook/core-webpack": "7.0.0-beta.3", "@types/node": "^16.0.0" }, "devDependencies": { @@ -63,7 +63,7 @@ "preact": "^8.0.0||^10.0.0" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -74,5 +74,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/presets/react-webpack/package.json b/code/presets/react-webpack/package.json index 1b521adf543..98c23c2f070 100644 --- a/code/presets/react-webpack/package.json +++ b/code/presets/react-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-react-webpack", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -74,10 +74,10 @@ "@babel/preset-flow": "^7.18.6", "@babel/preset-react": "^7.18.6", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.5", - "@storybook/core-webpack": "7.0.0-beta.1", - "@storybook/docs-tools": "7.0.0-beta.1", - "@storybook/node-logger": "7.0.0-beta.1", - "@storybook/react": "7.0.0-beta.1", + "@storybook/core-webpack": "7.0.0-beta.3", + "@storybook/docs-tools": "7.0.0-beta.3", + "@storybook/node-logger": "7.0.0-beta.3", + "@storybook/react": "7.0.0-beta.3", "@storybook/react-docgen-typescript-plugin": "1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0", "@types/node": "^16.0.0", "@types/semver": "^7.3.4", @@ -105,7 +105,7 @@ } }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -120,5 +120,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/presets/server-webpack/package.json b/code/presets/server-webpack/package.json index adfbc2c7b99..dc1dc17916c 100644 --- a/code/presets/server-webpack/package.json +++ b/code/presets/server-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-server-webpack", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for Server: View HTML snippets from a server in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -55,9 +55,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-server": "7.0.0-beta.1", - "@storybook/core-webpack": "7.0.0-beta.1", - "@storybook/server": "7.0.0-beta.1", + "@storybook/core-server": "7.0.0-beta.3", + "@storybook/core-webpack": "7.0.0-beta.3", + "@storybook/server": "7.0.0-beta.3", "@types/node": "^16.0.0", "global": "^4.4.0", "safe-identifier": "^0.4.1", @@ -71,7 +71,7 @@ "yaml": "^1.10.0" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -83,5 +83,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/presets/svelte-webpack/package.json b/code/presets/svelte-webpack/package.json index c498a09e037..9d95047dcc9 100644 --- a/code/presets/svelte-webpack/package.json +++ b/code/presets/svelte-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-svelte-webpack", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -65,8 +65,8 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-webpack": "7.0.0-beta.1", - "@storybook/node-logger": "7.0.0-beta.1", + "@storybook/core-webpack": "7.0.0-beta.3", + "@storybook/node-logger": "7.0.0-beta.3", "sveltedoc-parser": "^4.2.1", "ts-dedent": "^2.0.0" }, @@ -81,7 +81,7 @@ "svelte-loader": "*" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -95,5 +95,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/presets/vue-webpack/package.json b/code/presets/vue-webpack/package.json index 75fc154c589..63fb7cd8a9c 100644 --- a/code/presets/vue-webpack/package.json +++ b/code/presets/vue-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-vue-webpack", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -60,8 +60,8 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-webpack": "7.0.0-beta.1", - "@storybook/docs-tools": "7.0.0-beta.1", + "@storybook/core-webpack": "7.0.0-beta.3", + "@storybook/docs-tools": "7.0.0-beta.3", "@types/node": "^16.0.0", "ts-loader": "^9.2.8", "vue-docgen-api": "^4.44.23", @@ -84,7 +84,7 @@ "vue-template-compiler": "^2.6.14" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -97,5 +97,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/presets/vue3-webpack/package.json b/code/presets/vue3-webpack/package.json index 64d385849e2..30296905987 100644 --- a/code/presets/vue3-webpack/package.json +++ b/code/presets/vue3-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-vue3-webpack", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for Vue 3: Develop Vue 3 Components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -60,8 +60,8 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-webpack": "7.0.0-beta.1", - "@storybook/docs-tools": "7.0.0-beta.1", + "@storybook/core-webpack": "7.0.0-beta.3", + "@storybook/docs-tools": "7.0.0-beta.3", "@types/node": "^16.0.0", "ts-loader": "^9.2.8", "vue-docgen-api": "^4.46.0", @@ -81,7 +81,7 @@ "vue": "^3.0.0" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -94,5 +94,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/presets/web-components-webpack/package.json b/code/presets/web-components-webpack/package.json index 4e0056fa843..479d095dc43 100644 --- a/code/presets/web-components-webpack/package.json +++ b/code/presets/web-components-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-web-components-webpack", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook for web-components: View web components snippets in isolation with Hot Reloading.", "keywords": [ "lit-html", @@ -55,7 +55,7 @@ "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/preset-env": "^7.20.2", - "@storybook/core-webpack": "7.0.0-beta.1", + "@storybook/core-webpack": "7.0.0-beta.3", "@types/node": "^16.0.0", "babel-loader": "^7.0.0 || ^8.0.0", "babel-plugin-bundled-import-meta": "^0.3.1" @@ -68,7 +68,7 @@ "lit-html": "^1.4.1 || ^2.0.0" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -79,5 +79,5 @@ ], "platform": "node" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/renderers/html/package.json b/code/renderers/html/package.json index 8ad059ea119..5b01e88e895 100644 --- a/code/renderers/html/package.json +++ b/code/renderers/html/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/html", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook HTML renderer", "keywords": [ "storybook" @@ -51,10 +51,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-client": "7.0.0-beta.1", - "@storybook/docs-tools": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/core-client": "7.0.0-beta.3", + "@storybook/docs-tools": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "global": "^4.4.0", "ts-dedent": "^2.0.0" }, @@ -65,7 +65,7 @@ "@babel/core": "*" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -77,5 +77,5 @@ ], "platform": "browser" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/renderers/preact/package.json b/code/renderers/preact/package.json index 952632e9cb7..92f862d5675 100644 --- a/code/renderers/preact/package.json +++ b/code/renderers/preact/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preact", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook Preact renderer", "keywords": [ "storybook" @@ -51,9 +51,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-client": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/core-client": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "global": "^4.4.0", "ts-dedent": "^2.0.0" }, @@ -65,7 +65,7 @@ "preact": "^8.0.0||^10.0.0" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -77,5 +77,5 @@ ], "platform": "browser" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/renderers/react/package.json b/code/renderers/react/package.json index 1aef61c60fa..04a52bd14e3 100644 --- a/code/renderers/react/package.json +++ b/code/renderers/react/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook React renderer", "keywords": [ "storybook" @@ -52,11 +52,11 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/core-client": "7.0.0-beta.1", - "@storybook/docs-tools": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/core-client": "7.0.0-beta.3", + "@storybook/docs-tools": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "@types/estree": "^0.0.51", "@types/node": "^16.0.0", "acorn": "^7.4.1", @@ -90,7 +90,7 @@ } }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -102,5 +102,5 @@ ], "platform": "browser" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/renderers/react/src/public-types.test.tsx b/code/renderers/react/src/public-types.test.tsx index 68b68fd23b2..c955c6b59fb 100644 --- a/code/renderers/react/src/public-types.test.tsx +++ b/code/renderers/react/src/public-types.test.tsx @@ -200,3 +200,31 @@ describe('Story args can be inferred', () => { expectTypeOf(Basic).toEqualTypeOf(); }); }); + +test('StoryObj is allowed when meta is upcasted to Meta', () => { + expectTypeOf>>().toEqualTypeOf< + ReactStory< + ButtonProps & { children?: ReactNode }, + Partial + > + >(); +}); + +test('StoryObj is allowed when meta is upcasted to Meta', () => { + expectTypeOf>>().toEqualTypeOf< + ReactStory< + ButtonProps & { children?: ReactNode }, + Partial + > + >(); +}); + +test('StoryObj is allowed when all arguments are optional', () => { + expectTypeOf>>().toEqualTypeOf< + ReactStory<{ label?: string; children?: ReactNode }, { label?: string; children?: ReactNode }> + >(); +}); + +test('Meta can be used without generic', () => { + expectTypeOf({ component: Button }).toMatchTypeOf(); +}); diff --git a/code/renderers/react/template/stories/react-mdx.stories.mdx b/code/renderers/react/template/stories/react-mdx.stories.mdx.IGNORED similarity index 100% rename from code/renderers/react/template/stories/react-mdx.stories.mdx rename to code/renderers/react/template/stories/react-mdx.stories.mdx.IGNORED diff --git a/code/renderers/server/package.json b/code/renderers/server/package.json index a4e0057ea93..d97b52ee32a 100644 --- a/code/renderers/server/package.json +++ b/code/renderers/server/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/server", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook Server renderer", "keywords": [ "storybook" @@ -51,9 +51,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-client": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/core-client": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "global": "^4.4.0", "ts-dedent": "^2.0.0" }, @@ -61,7 +61,7 @@ "typescript": "~4.9.3" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -73,5 +73,5 @@ ], "platform": "browser" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json index 468779bb3f5..f28bddff51f 100644 --- a/code/renderers/svelte/package.json +++ b/code/renderers/svelte/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/svelte", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook Svelte renderer", "keywords": [ "storybook" @@ -55,11 +55,11 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/core-client": "7.0.0-beta.1", - "@storybook/docs-tools": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/core-client": "7.0.0-beta.3", + "@storybook/docs-tools": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "global": "^4.4.0", "sveltedoc-parser": "^4.2.1", "type-fest": "2.19.0" @@ -75,7 +75,7 @@ "svelte": "^3.1.0" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -87,5 +87,5 @@ ], "platform": "browser" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/renderers/vue/package.json b/code/renderers/vue/package.json index 4ed192dafbf..84bdac09200 100644 --- a/code/renderers/vue/package.json +++ b/code/renderers/vue/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook Vue renderer", "keywords": [ "storybook" @@ -51,11 +51,11 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/core-client": "7.0.0-beta.1", - "@storybook/docs-tools": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/core-client": "7.0.0-beta.3", + "@storybook/docs-tools": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "global": "^4.4.0", "ts-dedent": "^2.0.0", "type-fest": "2.19.0" @@ -77,7 +77,7 @@ } }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -89,5 +89,5 @@ ], "platform": "browser" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/renderers/vue3/package.json b/code/renderers/vue3/package.json index 158aa40ac5b..156d4ea25fa 100644 --- a/code/renderers/vue3/package.json +++ b/code/renderers/vue3/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue3", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook Vue 3 renderer", "keywords": [ "storybook" @@ -51,10 +51,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-client": "7.0.0-beta.1", - "@storybook/docs-tools": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/core-client": "7.0.0-beta.3", + "@storybook/docs-tools": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "global": "^4.4.0", "ts-dedent": "^2.0.0", "type-fest": "2.19.0" @@ -70,7 +70,7 @@ "vue": "^3.0.0" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -82,5 +82,5 @@ ], "platform": "browser" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/renderers/web-components/package.json b/code/renderers/web-components/package.json index eaf0a44d619..aa4cf0070cb 100644 --- a/code/renderers/web-components/package.json +++ b/code/renderers/web-components/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/web-components", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook web-components renderer", "keywords": [ "lit-html", @@ -53,12 +53,12 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/core-client": "7.0.0-beta.1", - "@storybook/docs-tools": "7.0.0-beta.1", - "@storybook/manager-api": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/core-client": "7.0.0-beta.3", + "@storybook/docs-tools": "7.0.0-beta.3", + "@storybook/manager-api": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "global": "^4.4.0", "ts-dedent": "^2.0.0" }, @@ -71,7 +71,7 @@ "lit-html": "^1.4.1 || ^2.0.0" }, "engines": { - "node": ">=10.13.0" + "node": ">=16.0.0" }, "publishConfig": { "access": "public" @@ -83,5 +83,5 @@ ], "platform": "browser" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/ui/blocks/package.json b/code/ui/blocks/package.json index 8b22744318e..1e54e55af1f 100644 --- a/code/ui/blocks/package.json +++ b/code/ui/blocks/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/blocks", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Storybook Doc Blocks", "keywords": [ "storybook" @@ -43,16 +43,16 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/channels": "7.0.0-beta.1", - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/components": "7.0.0-beta.1", - "@storybook/core-events": "7.0.0-beta.1", + "@storybook/channels": "7.0.0-beta.3", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/components": "7.0.0-beta.3", + "@storybook/core-events": "7.0.0-beta.3", "@storybook/csf": "next", - "@storybook/docs-tools": "7.0.0-beta.1", - "@storybook/manager-api": "7.0.0-beta.1", - "@storybook/preview-api": "7.0.0-beta.1", - "@storybook/theming": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/docs-tools": "7.0.0-beta.3", + "@storybook/manager-api": "7.0.0-beta.3", + "@storybook/preview-api": "7.0.0-beta.3", + "@storybook/theming": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "@types/lodash": "^4.14.167", "color-convert": "^2.0.1", "dequal": "^2.0.2", @@ -66,7 +66,7 @@ "util-deprecate": "^1.0.2" }, "devDependencies": { - "@storybook/addon-actions": "7.0.0-beta.1", + "@storybook/addon-actions": "7.0.0-beta.3", "@types/color-convert": "^2.0.0" }, "peerDependencies": { @@ -81,5 +81,5 @@ "./src/index.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/ui/blocks/src/blocks/Canvas.stories.tsx b/code/ui/blocks/src/blocks/Canvas.stories.tsx index 764ccd3225c..d54dbb6e6bf 100644 --- a/code/ui/blocks/src/blocks/Canvas.stories.tsx +++ b/code/ui/blocks/src/blocks/Canvas.stories.tsx @@ -1,6 +1,6 @@ import React from 'react'; import type { Meta, StoryObj } from '@storybook/react'; -import { Canvas } from './Canvas'; +import { Canvas, SourceState } from './Canvas'; import { Story as StoryComponent } from './Story'; import * as BooleanStories from '../controls/Boolean.stories'; @@ -25,12 +25,12 @@ export const BasicStory: Story = {}; export const WithSourceOpen: Story = { args: { - withSource: 'open', + withSource: SourceState.OPEN, }, }; export const WithSourceClosed: Story = { args: { - withSource: 'closed', + withSource: SourceState.CLOSED, }, }; @@ -38,7 +38,7 @@ export const WithSourceClosed: Story = { export const WithMdxSource: Story = { name: 'With MDX Source', args: { - withSource: 'open', + withSource: SourceState.OPEN, mdxSource: `const thisIsCustomSource = true; if (isSyntaxHighlighted) { console.log('syntax highlighting is working'); @@ -48,7 +48,7 @@ if (isSyntaxHighlighted) { export const WithoutSource: Story = { args: { - withSource: 'none', + withSource: SourceState.NONE, }, }; diff --git a/code/ui/blocks/src/controls/Color.tsx b/code/ui/blocks/src/controls/Color.tsx index 3fa5a655e22..7f63d74adea 100644 --- a/code/ui/blocks/src/controls/Color.tsx +++ b/code/ui/blocks/src/controls/Color.tsx @@ -214,12 +214,13 @@ const useColorInput = ( const [color, setColor] = useState(() => parseValue(value)); const [colorSpace, setColorSpace] = useState(color?.colorSpace || ColorSpace.HEX); - // Reset state when initialValue becomes undefined (when resetting controls) + // Reset state when initialValue changes (when resetting controls) useEffect(() => { - if (initialValue !== undefined) return; - setValue(''); - setColor(undefined); - setColorSpace(ColorSpace.HEX); + const nextValue = initialValue || ''; + const nextColor = parseValue(nextValue); + setValue(nextValue); + setColor(nextColor); + setColorSpace(nextColor?.colorSpace || ColorSpace.HEX); }, [initialValue]); const realValue = useMemo( diff --git a/code/ui/components/package.json b/code/ui/components/package.json index dbe1f71d707..979ea50be9d 100644 --- a/code/ui/components/package.json +++ b/code/ui/components/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/components", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Core Storybook Components", "keywords": [ "storybook" @@ -51,10 +51,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.0.0-beta.1", + "@storybook/client-logger": "7.0.0-beta.3", "@storybook/csf": "next", - "@storybook/theming": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/theming": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "memoizerific": "^1.11.3", "util-deprecate": "^1.0.2" }, @@ -87,5 +87,5 @@ ], "platform": "neutral" }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/ui/manager/package.json b/code/ui/manager/package.json index a558ffd8ed2..b640829d980 100644 --- a/code/ui/manager/package.json +++ b/code/ui/manager/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/manager", - "version": "7.0.0-beta.1", + "version": "7.0.0-beta.3", "description": "Core Storybook UI", "keywords": [ "storybook" @@ -53,18 +53,18 @@ }, "devDependencies": { "@fal-works/esbuild-plugin-global-externals": "^2.1.2", - "@storybook/addons": "7.0.0-beta.1", - "@storybook/api": "7.0.0-beta.1", - "@storybook/channel-postmessage": "7.0.0-beta.1", - "@storybook/channel-websocket": "7.0.0-beta.1", - "@storybook/channels": "7.0.0-beta.1", - "@storybook/client-logger": "7.0.0-beta.1", - "@storybook/components": "7.0.0-beta.1", - "@storybook/core-events": "7.0.0-beta.1", - "@storybook/manager-api": "7.0.0-beta.1", - "@storybook/router": "7.0.0-beta.1", - "@storybook/theming": "7.0.0-beta.1", - "@storybook/types": "7.0.0-beta.1", + "@storybook/addons": "7.0.0-beta.3", + "@storybook/api": "7.0.0-beta.3", + "@storybook/channel-postmessage": "7.0.0-beta.3", + "@storybook/channel-websocket": "7.0.0-beta.3", + "@storybook/channels": "7.0.0-beta.3", + "@storybook/client-logger": "7.0.0-beta.3", + "@storybook/components": "7.0.0-beta.3", + "@storybook/core-events": "7.0.0-beta.3", + "@storybook/manager-api": "7.0.0-beta.3", + "@storybook/router": "7.0.0-beta.3", + "@storybook/theming": "7.0.0-beta.3", + "@storybook/types": "7.0.0-beta.3", "@testing-library/react": "^11.2.2", "@types/semver": "^7.3.4", "copy-to-clipboard": "^3.3.1", @@ -100,5 +100,5 @@ "./src/runtime.ts" ] }, - "gitHead": "42c08678ac06d9c2c8e7a4c31a91e0a14bf5c2cd" + "gitHead": "9a57b4788c8b2817db516d799057d8295b187880" } diff --git a/code/yarn.lock b/code/yarn.lock index e3bf2244a66..09731993e91 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5139,15 +5139,15 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-a11y@workspace:addons/a11y" dependencies: - "@storybook/addon-highlight": 7.0.0-beta.1 - "@storybook/channels": 7.0.0-beta.1 - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/components": 7.0.0-beta.1 - "@storybook/core-events": 7.0.0-beta.1 - "@storybook/manager-api": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/theming": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/addon-highlight": 7.0.0-beta.3 + "@storybook/channels": 7.0.0-beta.3 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/components": 7.0.0-beta.3 + "@storybook/core-events": 7.0.0-beta.3 + "@storybook/manager-api": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/theming": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 "@testing-library/react": ^11.2.2 axe-core: ^4.2.0 global: ^4.4.0 @@ -5165,17 +5165,17 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-actions@7.0.0-beta.1, @storybook/addon-actions@workspace:*, @storybook/addon-actions@workspace:addons/actions": +"@storybook/addon-actions@7.0.0-beta.3, @storybook/addon-actions@workspace:*, @storybook/addon-actions@workspace:addons/actions": version: 0.0.0-use.local resolution: "@storybook/addon-actions@workspace:addons/actions" dependencies: - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/components": 7.0.0-beta.1 - "@storybook/core-events": 7.0.0-beta.1 - "@storybook/manager-api": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/theming": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/components": 7.0.0-beta.3 + "@storybook/core-events": 7.0.0-beta.3 + "@storybook/manager-api": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/theming": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 "@types/lodash": ^4.14.167 dequal: ^2.0.2 global: ^4.4.0 @@ -5198,17 +5198,17 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-backgrounds@7.0.0-beta.1, @storybook/addon-backgrounds@workspace:*, @storybook/addon-backgrounds@workspace:addons/backgrounds": +"@storybook/addon-backgrounds@7.0.0-beta.3, @storybook/addon-backgrounds@workspace:*, @storybook/addon-backgrounds@workspace:addons/backgrounds": version: 0.0.0-use.local resolution: "@storybook/addon-backgrounds@workspace:addons/backgrounds" dependencies: - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/components": 7.0.0-beta.1 - "@storybook/core-events": 7.0.0-beta.1 - "@storybook/manager-api": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/theming": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/components": 7.0.0-beta.3 + "@storybook/core-events": 7.0.0-beta.3 + "@storybook/manager-api": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/theming": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 global: ^4.4.0 memoizerific: ^1.11.3 ts-dedent: ^2.0.0 @@ -5224,19 +5224,19 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-controls@7.0.0-beta.1, @storybook/addon-controls@workspace:*, @storybook/addon-controls@workspace:addons/controls": +"@storybook/addon-controls@7.0.0-beta.3, @storybook/addon-controls@workspace:*, @storybook/addon-controls@workspace:addons/controls": version: 0.0.0-use.local resolution: "@storybook/addon-controls@workspace:addons/controls" dependencies: - "@storybook/blocks": 7.0.0-beta.1 - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/components": 7.0.0-beta.1 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/manager-api": 7.0.0-beta.1 - "@storybook/node-logger": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/theming": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/blocks": 7.0.0-beta.3 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/components": 7.0.0-beta.3 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/manager-api": 7.0.0-beta.3 + "@storybook/node-logger": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/theming": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 lodash: ^4.17.21 ts-dedent: ^2.0.0 peerDependencies: @@ -5250,7 +5250,7 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-docs@7.0.0-beta.1, @storybook/addon-docs@workspace:*, @storybook/addon-docs@workspace:addons/docs": +"@storybook/addon-docs@7.0.0-beta.3, @storybook/addon-docs@workspace:*, @storybook/addon-docs@workspace:addons/docs": version: 0.0.0-use.local resolution: "@storybook/addon-docs@workspace:addons/docs" dependencies: @@ -5258,16 +5258,16 @@ __metadata: "@babel/plugin-transform-react-jsx": ^7.19.0 "@jest/transform": ^29.3.1 "@mdx-js/react": ^2.1.5 - "@storybook/blocks": 7.0.0-beta.1 - "@storybook/components": 7.0.0-beta.1 - "@storybook/csf-plugin": 7.0.0-beta.1 - "@storybook/csf-tools": 7.0.0-beta.1 + "@storybook/blocks": 7.0.0-beta.3 + "@storybook/components": 7.0.0-beta.3 + "@storybook/csf-plugin": 7.0.0-beta.3 + "@storybook/csf-tools": 7.0.0-beta.3 "@storybook/mdx2-csf": next - "@storybook/node-logger": 7.0.0-beta.1 - "@storybook/postinstall": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/theming": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/node-logger": 7.0.0-beta.3 + "@storybook/postinstall": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/theming": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 fs-extra: ^9.0.1 global: ^4.4.0 react: ^16.14.0 @@ -5286,20 +5286,20 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-essentials@workspace:addons/essentials" dependencies: - "@storybook/addon-actions": 7.0.0-beta.1 - "@storybook/addon-backgrounds": 7.0.0-beta.1 - "@storybook/addon-controls": 7.0.0-beta.1 - "@storybook/addon-docs": 7.0.0-beta.1 - "@storybook/addon-highlight": 7.0.0-beta.1 - "@storybook/addon-measure": 7.0.0-beta.1 - "@storybook/addon-outline": 7.0.0-beta.1 - "@storybook/addon-toolbars": 7.0.0-beta.1 - "@storybook/addon-viewport": 7.0.0-beta.1 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/manager-api": 7.0.0-beta.1 - "@storybook/node-logger": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/vue": 7.0.0-beta.1 + "@storybook/addon-actions": 7.0.0-beta.3 + "@storybook/addon-backgrounds": 7.0.0-beta.3 + "@storybook/addon-controls": 7.0.0-beta.3 + "@storybook/addon-docs": 7.0.0-beta.3 + "@storybook/addon-highlight": 7.0.0-beta.3 + "@storybook/addon-measure": 7.0.0-beta.3 + "@storybook/addon-outline": 7.0.0-beta.3 + "@storybook/addon-toolbars": 7.0.0-beta.3 + "@storybook/addon-viewport": 7.0.0-beta.3 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/manager-api": 7.0.0-beta.3 + "@storybook/node-logger": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/vue": 7.0.0-beta.3 ts-dedent: ^2.0.0 typescript: ^4.9.3 peerDependencies: @@ -5308,12 +5308,12 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-highlight@7.0.0-beta.1, @storybook/addon-highlight@workspace:*, @storybook/addon-highlight@workspace:addons/highlight": +"@storybook/addon-highlight@7.0.0-beta.3, @storybook/addon-highlight@workspace:*, @storybook/addon-highlight@workspace:addons/highlight": version: 0.0.0-use.local resolution: "@storybook/addon-highlight@workspace:addons/highlight" dependencies: - "@storybook/core-events": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 + "@storybook/core-events": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 "@types/webpack-env": ^1.16.0 global: ^4.4.0 typescript: ~4.9.3 @@ -5325,17 +5325,17 @@ __metadata: resolution: "@storybook/addon-interactions@workspace:addons/interactions" dependencies: "@devtools-ds/object-inspector": ^1.1.2 - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/components": 7.0.0-beta.1 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/core-events": 7.0.0-beta.1 - "@storybook/instrumenter": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/components": 7.0.0-beta.3 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/core-events": 7.0.0-beta.3 + "@storybook/instrumenter": 7.0.0-beta.3 "@storybook/jest": ^0.0.10 - "@storybook/manager-api": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 + "@storybook/manager-api": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 "@storybook/testing-library": 0.0.14-next.0 - "@storybook/theming": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/theming": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 "@types/node": ^16.0.0 formik: ^2.2.9 global: ^4.4.0 @@ -5358,12 +5358,12 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-jest@workspace:addons/jest" dependencies: - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/components": 7.0.0-beta.1 - "@storybook/core-events": 7.0.0-beta.1 - "@storybook/manager-api": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/theming": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/components": 7.0.0-beta.3 + "@storybook/core-events": 7.0.0-beta.3 + "@storybook/manager-api": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/theming": 7.0.0-beta.3 global: ^4.4.0 react-sizeme: ^3.0.1 typescript: ~4.9.3 @@ -5383,13 +5383,13 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-links@workspace:addons/links" dependencies: - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/core-events": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/core-events": 7.0.0-beta.3 "@storybook/csf": next - "@storybook/manager-api": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/router": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/manager-api": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/router": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 global: ^4.4.0 prop-types: ^15.7.2 ts-dedent: ^2.0.0 @@ -5405,16 +5405,16 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-measure@7.0.0-beta.1, @storybook/addon-measure@workspace:*, @storybook/addon-measure@workspace:addons/measure": +"@storybook/addon-measure@7.0.0-beta.3, @storybook/addon-measure@workspace:*, @storybook/addon-measure@workspace:addons/measure": version: 0.0.0-use.local resolution: "@storybook/addon-measure@workspace:addons/measure" dependencies: - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/components": 7.0.0-beta.1 - "@storybook/core-events": 7.0.0-beta.1 - "@storybook/manager-api": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/components": 7.0.0-beta.3 + "@storybook/core-events": 7.0.0-beta.3 + "@storybook/manager-api": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 global: ^4.4.0 typescript: ~4.9.3 peerDependencies: @@ -5428,16 +5428,16 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-outline@7.0.0-beta.1, @storybook/addon-outline@workspace:*, @storybook/addon-outline@workspace:addons/outline": +"@storybook/addon-outline@7.0.0-beta.3, @storybook/addon-outline@workspace:*, @storybook/addon-outline@workspace:addons/outline": version: 0.0.0-use.local resolution: "@storybook/addon-outline@workspace:addons/outline" dependencies: - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/components": 7.0.0-beta.1 - "@storybook/core-events": 7.0.0-beta.1 - "@storybook/manager-api": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/components": 7.0.0-beta.3 + "@storybook/core-events": 7.0.0-beta.3 + "@storybook/manager-api": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 global: ^4.4.0 ts-dedent: ^2.0.0 typescript: ~4.9.3 @@ -5458,14 +5458,14 @@ __metadata: dependencies: "@axe-core/puppeteer": ^4.2.0 "@storybook/csf": next - "@storybook/node-logger": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/node-logger": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 "@types/jest-image-snapshot": ^5.1.0 "@types/puppeteer": ^5.4.0 jest-image-snapshot: ^6.0.0 puppeteer: ^2.0.0 || ^3.0.0 peerDependencies: - "@storybook/addon-storyshots": 7.0.0-beta.1 + "@storybook/addon-storyshots": 7.0.0-beta.3 puppeteer: ">=2.0.0" peerDependenciesMeta: puppeteer: @@ -5481,17 +5481,17 @@ __metadata: "@angular/platform-browser-dynamic": ^13.3.6 "@emotion/jest": ^11.8.0 "@jest/transform": ^29.3.1 - "@storybook/addon-docs": 7.0.0-beta.1 - "@storybook/angular": 7.0.0-beta.1 + "@storybook/addon-docs": 7.0.0-beta.3 + "@storybook/angular": 7.0.0-beta.3 "@storybook/babel-plugin-require-context-hook": 1.0.1 - "@storybook/client-api": 7.0.0-beta.1 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/core-webpack": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/react": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 - "@storybook/vue": 7.0.0-beta.1 - "@storybook/vue3": 7.0.0-beta.1 + "@storybook/client-api": 7.0.0-beta.3 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/core-webpack": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/react": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 + "@storybook/vue": 7.0.0-beta.3 + "@storybook/vue3": 7.0.0-beta.3 "@types/glob": ^7.1.3 "@types/jest-specific-snapshot": ^0.5.6 babel-loader: ^8.3.0 @@ -5565,13 +5565,13 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-storysource@workspace:addons/storysource" dependencies: - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/components": 7.0.0-beta.1 - "@storybook/manager-api": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/router": 7.0.0-beta.1 - "@storybook/source-loader": 7.0.0-beta.1 - "@storybook/theming": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/components": 7.0.0-beta.3 + "@storybook/manager-api": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/router": 7.0.0-beta.3 + "@storybook/source-loader": 7.0.0-beta.3 + "@storybook/theming": 7.0.0-beta.3 "@types/react": ^16.14.34 "@types/react-syntax-highlighter": 11.0.5 estraverse: ^5.2.0 @@ -5605,15 +5605,15 @@ __metadata: languageName: node linkType: hard -"@storybook/addon-toolbars@7.0.0-beta.1, @storybook/addon-toolbars@workspace:*, @storybook/addon-toolbars@workspace:addons/toolbars": +"@storybook/addon-toolbars@7.0.0-beta.3, @storybook/addon-toolbars@workspace:*, @storybook/addon-toolbars@workspace:addons/toolbars": version: 0.0.0-use.local resolution: "@storybook/addon-toolbars@workspace:addons/toolbars" dependencies: - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/components": 7.0.0-beta.1 - "@storybook/manager-api": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/theming": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/components": 7.0.0-beta.3 + "@storybook/manager-api": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/theming": 7.0.0-beta.3 typescript: ~4.9.3 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -5626,16 +5626,16 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-viewport@7.0.0-beta.1, @storybook/addon-viewport@workspace:*, @storybook/addon-viewport@workspace:addons/viewport": +"@storybook/addon-viewport@7.0.0-beta.3, @storybook/addon-viewport@workspace:*, @storybook/addon-viewport@workspace:addons/viewport": version: 0.0.0-use.local resolution: "@storybook/addon-viewport@workspace:addons/viewport" dependencies: - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/components": 7.0.0-beta.1 - "@storybook/core-events": 7.0.0-beta.1 - "@storybook/manager-api": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/theming": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/components": 7.0.0-beta.3 + "@storybook/core-events": 7.0.0-beta.3 + "@storybook/manager-api": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/theming": 7.0.0-beta.3 global: ^4.4.0 memoizerific: ^1.11.3 prop-types: ^15.7.2 @@ -5651,13 +5651,13 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addons@7.0.0-beta.1, @storybook/addons@workspace:*, @storybook/addons@workspace:lib/addons": +"@storybook/addons@7.0.0-beta.3, @storybook/addons@workspace:*, @storybook/addons@workspace:lib/addons": version: 0.0.0-use.local resolution: "@storybook/addons@workspace:lib/addons" dependencies: - "@storybook/manager-api": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/manager-api": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -5686,7 +5686,7 @@ __metadata: languageName: node linkType: hard -"@storybook/angular@7.0.0-beta.1, @storybook/angular@workspace:*, @storybook/angular@workspace:frameworks/angular": +"@storybook/angular@7.0.0-beta.3, @storybook/angular@workspace:*, @storybook/angular@workspace:frameworks/angular": version: 0.0.0-use.local resolution: "@storybook/angular@workspace:frameworks/angular" dependencies: @@ -5702,18 +5702,18 @@ __metadata: "@angular/platform-browser": ^13.3.6 "@angular/platform-browser-dynamic": ^13.3.6 "@nrwl/workspace": 14.6.1 - "@storybook/builder-webpack5": 7.0.0-beta.1 - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/core-client": 7.0.0-beta.1 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/core-events": 7.0.0-beta.1 - "@storybook/core-server": 7.0.0-beta.1 - "@storybook/core-webpack": 7.0.0-beta.1 - "@storybook/docs-tools": 7.0.0-beta.1 - "@storybook/manager-api": 7.0.0-beta.1 - "@storybook/node-logger": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/builder-webpack5": 7.0.0-beta.3 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/core-client": 7.0.0-beta.3 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/core-events": 7.0.0-beta.3 + "@storybook/core-server": 7.0.0-beta.3 + "@storybook/core-webpack": 7.0.0-beta.3 + "@storybook/docs-tools": 7.0.0-beta.3 + "@storybook/manager-api": 7.0.0-beta.3 + "@storybook/node-logger": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 "@types/node": ^16.0.0 "@types/react": ^16.14.34 "@types/react-dom": ^16.9.14 @@ -5766,12 +5766,12 @@ __metadata: languageName: unknown linkType: soft -"@storybook/api@7.0.0-beta.1, @storybook/api@workspace:*, @storybook/api@workspace:lib/manager-api-shim": +"@storybook/api@7.0.0-beta.3, @storybook/api@workspace:*, @storybook/api@workspace:lib/manager-api-shim": version: 0.0.0-use.local resolution: "@storybook/api@workspace:lib/manager-api-shim" dependencies: - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/manager-api": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/manager-api": 7.0.0-beta.3 languageName: unknown linkType: soft @@ -5810,21 +5810,21 @@ __metadata: languageName: node linkType: hard -"@storybook/blocks@7.0.0-beta.1, @storybook/blocks@workspace:*, @storybook/blocks@workspace:ui/blocks": +"@storybook/blocks@7.0.0-beta.3, @storybook/blocks@workspace:*, @storybook/blocks@workspace:ui/blocks": version: 0.0.0-use.local resolution: "@storybook/blocks@workspace:ui/blocks" dependencies: - "@storybook/addon-actions": 7.0.0-beta.1 - "@storybook/channels": 7.0.0-beta.1 - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/components": 7.0.0-beta.1 - "@storybook/core-events": 7.0.0-beta.1 + "@storybook/addon-actions": 7.0.0-beta.3 + "@storybook/channels": 7.0.0-beta.3 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/components": 7.0.0-beta.3 + "@storybook/core-events": 7.0.0-beta.3 "@storybook/csf": next - "@storybook/docs-tools": 7.0.0-beta.1 - "@storybook/manager-api": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/theming": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/docs-tools": 7.0.0-beta.3 + "@storybook/manager-api": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/theming": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 "@types/color-convert": ^2.0.0 "@types/lodash": ^4.14.167 color-convert: ^2.0.1 @@ -5843,14 +5843,14 @@ __metadata: languageName: unknown linkType: soft -"@storybook/builder-manager@7.0.0-beta.1, @storybook/builder-manager@workspace:*, @storybook/builder-manager@workspace:lib/builder-manager": +"@storybook/builder-manager@7.0.0-beta.3, @storybook/builder-manager@workspace:*, @storybook/builder-manager@workspace:lib/builder-manager": version: 0.0.0-use.local resolution: "@storybook/builder-manager@workspace:lib/builder-manager" dependencies: "@fal-works/esbuild-plugin-global-externals": ^2.1.2 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/manager": 7.0.0-beta.1 - "@storybook/node-logger": 7.0.0-beta.1 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/manager": 7.0.0-beta.3 + "@storybook/node-logger": 7.0.0-beta.3 "@types/ejs": ^3.1.1 "@yarnpkg/esbuild-plugin-pnp": ^3.0.0-rc.10 browser-assert: ^1.2.1 @@ -5866,19 +5866,19 @@ __metadata: languageName: unknown linkType: soft -"@storybook/builder-vite@7.0.0-beta.1, @storybook/builder-vite@workspace:*, @storybook/builder-vite@workspace:lib/builder-vite": +"@storybook/builder-vite@7.0.0-beta.3, @storybook/builder-vite@workspace:*, @storybook/builder-vite@workspace:lib/builder-vite": version: 0.0.0-use.local resolution: "@storybook/builder-vite@workspace:lib/builder-vite" dependencies: "@joshwooding/vite-plugin-react-docgen-typescript": 0.0.5 - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/csf-plugin": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/csf-plugin": 7.0.0-beta.3 "@storybook/mdx2-csf": next - "@storybook/node-logger": 7.0.0-beta.1 - "@storybook/preview": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/node-logger": 7.0.0-beta.3 + "@storybook/preview": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 "@types/express": ^4.17.13 "@types/node": ^16.0.0 "@vitejs/plugin-react": ^2.0.0 @@ -5893,7 +5893,7 @@ __metadata: rollup-plugin-external-globals: ^0.7.1 slash: ^3.0.0 typescript: ~4.9.3 - vite: ^3.1.3 + vite: ^4.0.0-beta.2 peerDependencies: "@preact/preset-vite": "*" vite-plugin-glimmerx: "*" @@ -5905,29 +5905,29 @@ __metadata: languageName: unknown linkType: soft -"@storybook/builder-webpack5@7.0.0-beta.1, @storybook/builder-webpack5@workspace:*, @storybook/builder-webpack5@workspace:lib/builder-webpack5": +"@storybook/builder-webpack5@7.0.0-beta.3, @storybook/builder-webpack5@workspace:*, @storybook/builder-webpack5@workspace:lib/builder-webpack5": version: 0.0.0-use.local resolution: "@storybook/builder-webpack5@workspace:lib/builder-webpack5" dependencies: "@babel/core": ^7.12.10 - "@storybook/addons": 7.0.0-beta.1 - "@storybook/api": 7.0.0-beta.1 - "@storybook/channel-postmessage": 7.0.0-beta.1 - "@storybook/channel-websocket": 7.0.0-beta.1 - "@storybook/channels": 7.0.0-beta.1 - "@storybook/client-api": 7.0.0-beta.1 - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/components": 7.0.0-beta.1 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/core-events": 7.0.0-beta.1 - "@storybook/core-webpack": 7.0.0-beta.1 - "@storybook/manager-api": 7.0.0-beta.1 - "@storybook/node-logger": 7.0.0-beta.1 - "@storybook/preview": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/router": 7.0.0-beta.1 - "@storybook/store": 7.0.0-beta.1 - "@storybook/theming": 7.0.0-beta.1 + "@storybook/addons": 7.0.0-beta.3 + "@storybook/api": 7.0.0-beta.3 + "@storybook/channel-postmessage": 7.0.0-beta.3 + "@storybook/channel-websocket": 7.0.0-beta.3 + "@storybook/channels": 7.0.0-beta.3 + "@storybook/client-api": 7.0.0-beta.3 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/components": 7.0.0-beta.3 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/core-events": 7.0.0-beta.3 + "@storybook/core-webpack": 7.0.0-beta.3 + "@storybook/manager-api": 7.0.0-beta.3 + "@storybook/node-logger": 7.0.0-beta.3 + "@storybook/preview": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/router": 7.0.0-beta.3 + "@storybook/store": 7.0.0-beta.3 + "@storybook/theming": 7.0.0-beta.3 "@types/node": ^16.0.0 "@types/pretty-hrtime": ^1.0.0 "@types/semver": ^7.3.4 @@ -5968,13 +5968,13 @@ __metadata: languageName: unknown linkType: soft -"@storybook/channel-postmessage@7.0.0-beta.1, @storybook/channel-postmessage@workspace:*, @storybook/channel-postmessage@workspace:lib/channel-postmessage": +"@storybook/channel-postmessage@7.0.0-beta.3, @storybook/channel-postmessage@workspace:*, @storybook/channel-postmessage@workspace:lib/channel-postmessage": version: 0.0.0-use.local resolution: "@storybook/channel-postmessage@workspace:lib/channel-postmessage" dependencies: - "@storybook/channels": 7.0.0-beta.1 - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/core-events": 7.0.0-beta.1 + "@storybook/channels": 7.0.0-beta.3 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/core-events": 7.0.0-beta.3 global: ^4.4.0 qs: ^6.10.0 telejson: ^7.0.3 @@ -5982,19 +5982,19 @@ __metadata: languageName: unknown linkType: soft -"@storybook/channel-websocket@7.0.0-beta.1, @storybook/channel-websocket@workspace:*, @storybook/channel-websocket@workspace:lib/channel-websocket": +"@storybook/channel-websocket@7.0.0-beta.3, @storybook/channel-websocket@workspace:*, @storybook/channel-websocket@workspace:lib/channel-websocket": version: 0.0.0-use.local resolution: "@storybook/channel-websocket@workspace:lib/channel-websocket" dependencies: - "@storybook/channels": 7.0.0-beta.1 - "@storybook/client-logger": 7.0.0-beta.1 + "@storybook/channels": 7.0.0-beta.3 + "@storybook/client-logger": 7.0.0-beta.3 global: ^4.4.0 telejson: ^7.0.3 typescript: ~4.9.3 languageName: unknown linkType: soft -"@storybook/channels@7.0.0-beta.1, @storybook/channels@workspace:*, @storybook/channels@workspace:lib/channels": +"@storybook/channels@7.0.0-beta.3, @storybook/channels@workspace:*, @storybook/channels@workspace:lib/channels": version: 0.0.0-use.local resolution: "@storybook/channels@workspace:lib/channels" dependencies: @@ -6013,20 +6013,20 @@ __metadata: languageName: node linkType: hard -"@storybook/cli@7.0.0-beta.1, @storybook/cli@workspace:*, @storybook/cli@workspace:lib/cli": +"@storybook/cli@7.0.0-beta.3, @storybook/cli@workspace:*, @storybook/cli@workspace:lib/cli": version: 0.0.0-use.local resolution: "@storybook/cli@workspace:lib/cli" dependencies: "@babel/core": ^7.20.2 "@babel/preset-env": ^7.20.2 - "@storybook/client-api": 7.0.0-beta.1 - "@storybook/codemod": 7.0.0-beta.1 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/core-server": 7.0.0-beta.1 - "@storybook/csf-tools": 7.0.0-beta.1 - "@storybook/node-logger": 7.0.0-beta.1 - "@storybook/telemetry": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/client-api": 7.0.0-beta.3 + "@storybook/codemod": 7.0.0-beta.3 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/core-server": 7.0.0-beta.3 + "@storybook/csf-tools": 7.0.0-beta.3 + "@storybook/node-logger": 7.0.0-beta.3 + "@storybook/telemetry": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 "@types/cross-spawn": ^6.0.2 "@types/prompts": ^2.0.9 "@types/puppeteer-core": ^2.1.0 @@ -6065,16 +6065,16 @@ __metadata: languageName: unknown linkType: soft -"@storybook/client-api@7.0.0-beta.1, @storybook/client-api@workspace:*, @storybook/client-api@workspace:lib/client-api": +"@storybook/client-api@7.0.0-beta.3, @storybook/client-api@workspace:*, @storybook/client-api@workspace:lib/client-api": version: 0.0.0-use.local resolution: "@storybook/client-api@workspace:lib/client-api" dependencies: - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 languageName: unknown linkType: soft -"@storybook/client-logger@7.0.0-beta.1, @storybook/client-logger@workspace:*, @storybook/client-logger@workspace:lib/client-logger": +"@storybook/client-logger@7.0.0-beta.3, @storybook/client-logger@workspace:*, @storybook/client-logger@workspace:lib/client-logger": version: 0.0.0-use.local resolution: "@storybook/client-logger@workspace:lib/client-logger" dependencies: @@ -6093,15 +6093,15 @@ __metadata: languageName: node linkType: hard -"@storybook/codemod@7.0.0-beta.1, @storybook/codemod@workspace:*, @storybook/codemod@workspace:lib/codemod": +"@storybook/codemod@7.0.0-beta.3, @storybook/codemod@workspace:*, @storybook/codemod@workspace:lib/codemod": version: 0.0.0-use.local resolution: "@storybook/codemod@workspace:lib/codemod" dependencies: "@babel/types": ^7.20.2 "@storybook/csf": next - "@storybook/csf-tools": 7.0.0-beta.1 - "@storybook/node-logger": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/csf-tools": 7.0.0-beta.3 + "@storybook/node-logger": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 cross-spawn: ^7.0.3 globby: ^11.0.2 jest: ^29.3.1 @@ -6115,15 +6115,15 @@ __metadata: languageName: unknown linkType: soft -"@storybook/components@7.0.0-beta.1, @storybook/components@workspace:*, @storybook/components@workspace:ui/components": +"@storybook/components@7.0.0-beta.3, @storybook/components@workspace:*, @storybook/components@workspace:ui/components": version: 0.0.0-use.local resolution: "@storybook/components@workspace:ui/components" dependencies: "@popperjs/core": ^2.6.0 - "@storybook/client-logger": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 "@storybook/csf": next - "@storybook/theming": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/theming": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 "@types/overlayscrollbars": ^1.12.0 "@types/react-syntax-highlighter": 11.0.5 "@types/util-deprecate": ^1.0.0 @@ -6145,22 +6145,22 @@ __metadata: languageName: unknown linkType: soft -"@storybook/core-client@7.0.0-beta.1, @storybook/core-client@workspace:*, @storybook/core-client@workspace:lib/core-client": +"@storybook/core-client@7.0.0-beta.3, @storybook/core-client@workspace:*, @storybook/core-client@workspace:lib/core-client": version: 0.0.0-use.local resolution: "@storybook/core-client@workspace:lib/core-client" dependencies: - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 languageName: unknown linkType: soft -"@storybook/core-common@7.0.0-beta.1, @storybook/core-common@workspace:*, @storybook/core-common@workspace:lib/core-common": +"@storybook/core-common@7.0.0-beta.3, @storybook/core-common@workspace:*, @storybook/core-common@workspace:lib/core-common": version: 0.0.0-use.local resolution: "@storybook/core-common@workspace:lib/core-common" dependencies: "@babel/core": ^7.20.2 - "@storybook/node-logger": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/node-logger": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 "@types/babel__core": ^7.1.20 "@types/express": ^4.7.0 "@types/mock-fs": ^4.13.1 @@ -6192,7 +6192,7 @@ __metadata: languageName: unknown linkType: soft -"@storybook/core-events@7.0.0-beta.1, @storybook/core-events@workspace:*, @storybook/core-events@workspace:lib/core-events": +"@storybook/core-events@7.0.0-beta.3, @storybook/core-events@workspace:*, @storybook/core-events@workspace:lib/core-events": version: 0.0.0-use.local resolution: "@storybook/core-events@workspace:lib/core-events" dependencies: @@ -6209,23 +6209,23 @@ __metadata: languageName: node linkType: hard -"@storybook/core-server@7.0.0-beta.1, @storybook/core-server@workspace:*, @storybook/core-server@workspace:lib/core-server": +"@storybook/core-server@7.0.0-beta.3, @storybook/core-server@workspace:*, @storybook/core-server@workspace:lib/core-server": version: 0.0.0-use.local resolution: "@storybook/core-server@workspace:lib/core-server" dependencies: "@aw-web-design/x-default-browser": 1.4.88 "@discoveryjs/json-ext": ^0.5.3 - "@storybook/builder-manager": 7.0.0-beta.1 - "@storybook/builder-webpack5": 7.0.0-beta.1 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/core-events": 7.0.0-beta.1 + "@storybook/builder-manager": 7.0.0-beta.3 + "@storybook/builder-webpack5": 7.0.0-beta.3 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/core-events": 7.0.0-beta.3 "@storybook/csf": next - "@storybook/csf-tools": 7.0.0-beta.1 + "@storybook/csf-tools": 7.0.0-beta.3 "@storybook/docs-mdx": next - "@storybook/node-logger": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/telemetry": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/node-logger": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/telemetry": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 "@types/compression": ^1.7.0 "@types/ip": ^1.1.0 "@types/node": ^16.0.0 @@ -6274,13 +6274,13 @@ __metadata: languageName: unknown linkType: soft -"@storybook/core-webpack@7.0.0-beta.1, @storybook/core-webpack@workspace:*, @storybook/core-webpack@workspace:lib/core-webpack": +"@storybook/core-webpack@7.0.0-beta.3, @storybook/core-webpack@workspace:*, @storybook/core-webpack@workspace:lib/core-webpack": version: 0.0.0-use.local resolution: "@storybook/core-webpack@workspace:lib/core-webpack" dependencies: - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/node-logger": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/node-logger": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 "@types/node": ^16.0.0 ts-dedent: ^2.0.0 typescript: ~4.9.3 @@ -6288,17 +6288,17 @@ __metadata: languageName: unknown linkType: soft -"@storybook/csf-plugin@7.0.0-beta.1, @storybook/csf-plugin@workspace:*, @storybook/csf-plugin@workspace:lib/csf-plugin": +"@storybook/csf-plugin@7.0.0-beta.3, @storybook/csf-plugin@workspace:*, @storybook/csf-plugin@workspace:lib/csf-plugin": version: 0.0.0-use.local resolution: "@storybook/csf-plugin@workspace:lib/csf-plugin" dependencies: - "@storybook/csf-tools": 7.0.0-beta.1 + "@storybook/csf-tools": 7.0.0-beta.3 typescript: ~4.9.3 unplugin: ^0.10.2 languageName: unknown linkType: soft -"@storybook/csf-tools@7.0.0-beta.1, @storybook/csf-tools@workspace:*, @storybook/csf-tools@workspace:lib/csf-tools": +"@storybook/csf-tools@7.0.0-beta.3, @storybook/csf-tools@workspace:*, @storybook/csf-tools@workspace:lib/csf-tools": version: 0.0.0-use.local resolution: "@storybook/csf-tools@workspace:lib/csf-tools" dependencies: @@ -6307,7 +6307,7 @@ __metadata: "@babel/traverse": ^7.20.1 "@babel/types": ^7.20.2 "@storybook/csf": next - "@storybook/types": 7.0.0-beta.1 + "@storybook/types": 7.0.0-beta.3 "@types/fs-extra": ^9.0.6 fs-extra: ^9.0.1 js-yaml: ^3.14.1 @@ -6335,13 +6335,13 @@ __metadata: linkType: hard "@storybook/csf@npm:next": - version: 0.0.2-next.7 - resolution: "@storybook/csf@npm:0.0.2-next.7" + version: 0.0.2-next.8 + resolution: "@storybook/csf@npm:0.0.2-next.8" dependencies: expect-type: ^0.14.2 lodash: ^4.17.15 type-fest: ^2.19.0 - checksum: 3920626fdd6dc4875ba95ae46fa0776051f544a479029ee7d561b87602511010161750a42b0d5e1371ec336b47262e1098524c834805ca686d9bc2de5cae0e4e + checksum: 86f5599c030b87cbab6fa5e4b4a9ef1aeed5e838b993b2bae5f0fc50d79ae80d5cfbf2590a05bae0a95068ef77eec88d8c102072d63c77745afe74f91cfa03a3 languageName: node linkType: hard @@ -6352,14 +6352,14 @@ __metadata: languageName: node linkType: hard -"@storybook/docs-tools@7.0.0-beta.1, @storybook/docs-tools@workspace:*, @storybook/docs-tools@workspace:lib/docs-tools": +"@storybook/docs-tools@7.0.0-beta.3, @storybook/docs-tools@workspace:*, @storybook/docs-tools@workspace:lib/docs-tools": version: 0.0.0-use.local resolution: "@storybook/docs-tools@workspace:lib/docs-tools" dependencies: "@babel/core": ^7.12.10 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 doctrine: ^3.0.0 jest-specific-snapshot: ^7.0.0 lodash: ^4.17.21 @@ -6372,11 +6372,11 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/ember@workspace:frameworks/ember" dependencies: - "@storybook/builder-webpack5": 7.0.0-beta.1 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/docs-tools": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/builder-webpack5": 7.0.0-beta.3 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/docs-tools": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 ember-source: ~3.28.1 global: ^4.4.0 read-pkg-up: ^7.0.1 @@ -6415,19 +6415,18 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/html-vite@workspace:frameworks/html-vite" dependencies: - "@storybook/addons": 7.0.0-beta.1 - "@storybook/builder-vite": 7.0.0-beta.1 - "@storybook/channel-postmessage": 7.0.0-beta.1 - "@storybook/channel-websocket": 7.0.0-beta.1 - "@storybook/client-api": 7.0.0-beta.1 - "@storybook/core-server": 7.0.0-beta.1 - "@storybook/html": 7.0.0-beta.1 - "@storybook/node-logger": 7.0.0-beta.1 - "@storybook/preview-web": 7.0.0-beta.1 + "@storybook/addons": 7.0.0-beta.3 + "@storybook/builder-vite": 7.0.0-beta.3 + "@storybook/channel-postmessage": 7.0.0-beta.3 + "@storybook/channel-websocket": 7.0.0-beta.3 + "@storybook/client-api": 7.0.0-beta.3 + "@storybook/core-server": 7.0.0-beta.3 + "@storybook/html": 7.0.0-beta.3 + "@storybook/node-logger": 7.0.0-beta.3 + "@storybook/preview-web": 7.0.0-beta.3 "@types/node": ^16.0.0 magic-string: ^0.26.1 typescript: ~4.9.3 - vite: ^3.1.0 languageName: unknown linkType: soft @@ -6435,10 +6434,10 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/html-webpack5@workspace:frameworks/html-webpack5" dependencies: - "@storybook/builder-webpack5": 7.0.0-beta.1 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/html": 7.0.0-beta.1 - "@storybook/preset-html-webpack": 7.0.0-beta.1 + "@storybook/builder-webpack5": 7.0.0-beta.3 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/html": 7.0.0-beta.3 + "@storybook/preset-html-webpack": 7.0.0-beta.3 "@types/node": ^16.0.0 global: ^4.4.0 typescript: ~4.9.3 @@ -6449,14 +6448,14 @@ __metadata: languageName: unknown linkType: soft -"@storybook/html@7.0.0-beta.1, @storybook/html@workspace:*, @storybook/html@workspace:renderers/html": +"@storybook/html@7.0.0-beta.3, @storybook/html@workspace:*, @storybook/html@workspace:renderers/html": version: 0.0.0-use.local resolution: "@storybook/html@workspace:renderers/html" dependencies: - "@storybook/core-client": 7.0.0-beta.1 - "@storybook/docs-tools": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/core-client": 7.0.0-beta.3 + "@storybook/docs-tools": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 global: ^4.4.0 ts-dedent: ^2.0.0 typescript: ~4.9.3 @@ -6465,14 +6464,14 @@ __metadata: languageName: unknown linkType: soft -"@storybook/instrumenter@7.0.0-beta.1, @storybook/instrumenter@workspace:*, @storybook/instrumenter@workspace:lib/instrumenter": +"@storybook/instrumenter@7.0.0-beta.3, @storybook/instrumenter@workspace:*, @storybook/instrumenter@workspace:lib/instrumenter": version: 0.0.0-use.local resolution: "@storybook/instrumenter@workspace:lib/instrumenter" dependencies: - "@storybook/channels": 7.0.0-beta.1 - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/core-events": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 + "@storybook/channels": 7.0.0-beta.3 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/core-events": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 core-js: ^3.8.2 global: ^4.4.0 typescript: ~4.9.3 @@ -6559,18 +6558,18 @@ __metadata: languageName: node linkType: hard -"@storybook/manager-api@7.0.0-beta.1, @storybook/manager-api@workspace:*, @storybook/manager-api@workspace:lib/manager-api": +"@storybook/manager-api@7.0.0-beta.3, @storybook/manager-api@workspace:*, @storybook/manager-api@workspace:lib/manager-api": version: 0.0.0-use.local resolution: "@storybook/manager-api@workspace:lib/manager-api" dependencies: "@jest/globals": ^29.3.1 - "@storybook/channels": 7.0.0-beta.1 - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/core-events": 7.0.0-beta.1 + "@storybook/channels": 7.0.0-beta.3 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/core-events": 7.0.0-beta.3 "@storybook/csf": next - "@storybook/router": 7.0.0-beta.1 - "@storybook/theming": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/router": 7.0.0-beta.3 + "@storybook/theming": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 "@types/lodash": ^4.14.167 "@types/qs": ^6 dequal: ^2.0.2 @@ -6590,23 +6589,23 @@ __metadata: languageName: unknown linkType: soft -"@storybook/manager@7.0.0-beta.1, @storybook/manager@workspace:*, @storybook/manager@workspace:ui/manager": +"@storybook/manager@7.0.0-beta.3, @storybook/manager@workspace:*, @storybook/manager@workspace:ui/manager": version: 0.0.0-use.local resolution: "@storybook/manager@workspace:ui/manager" dependencies: "@fal-works/esbuild-plugin-global-externals": ^2.1.2 - "@storybook/addons": 7.0.0-beta.1 - "@storybook/api": 7.0.0-beta.1 - "@storybook/channel-postmessage": 7.0.0-beta.1 - "@storybook/channel-websocket": 7.0.0-beta.1 - "@storybook/channels": 7.0.0-beta.1 - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/components": 7.0.0-beta.1 - "@storybook/core-events": 7.0.0-beta.1 - "@storybook/manager-api": 7.0.0-beta.1 - "@storybook/router": 7.0.0-beta.1 - "@storybook/theming": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/addons": 7.0.0-beta.3 + "@storybook/api": 7.0.0-beta.3 + "@storybook/channel-postmessage": 7.0.0-beta.3 + "@storybook/channel-websocket": 7.0.0-beta.3 + "@storybook/channels": 7.0.0-beta.3 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/components": 7.0.0-beta.3 + "@storybook/core-events": 7.0.0-beta.3 + "@storybook/manager-api": 7.0.0-beta.3 + "@storybook/router": 7.0.0-beta.3 + "@storybook/theming": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 "@testing-library/react": ^11.2.2 "@types/semver": ^7.3.4 copy-to-clipboard: ^3.3.1 @@ -6646,13 +6645,13 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/nextjs@workspace:frameworks/nextjs" dependencies: - "@storybook/addon-actions": 7.0.0-beta.1 - "@storybook/builder-webpack5": 7.0.0-beta.1 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/node-logger": 7.0.0-beta.1 - "@storybook/preset-react-webpack": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/react": 7.0.0-beta.1 + "@storybook/addon-actions": 7.0.0-beta.3 + "@storybook/builder-webpack5": 7.0.0-beta.3 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/node-logger": 7.0.0-beta.3 + "@storybook/preset-react-webpack": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/react": 7.0.0-beta.3 "@types/node": ^16.0.0 find-up: ^5.0.0 fs-extra: ^9.0.1 @@ -6686,7 +6685,7 @@ __metadata: languageName: unknown linkType: soft -"@storybook/node-logger@7.0.0-beta.1, @storybook/node-logger@workspace:*, @storybook/node-logger@workspace:lib/node-logger": +"@storybook/node-logger@7.0.0-beta.3, @storybook/node-logger@workspace:*, @storybook/node-logger@workspace:lib/node-logger": version: 0.0.0-use.local resolution: "@storybook/node-logger@workspace:lib/node-logger" dependencies: @@ -6699,7 +6698,7 @@ __metadata: languageName: unknown linkType: soft -"@storybook/postinstall@7.0.0-beta.1, @storybook/postinstall@workspace:*, @storybook/postinstall@workspace:lib/postinstall": +"@storybook/postinstall@7.0.0-beta.3, @storybook/postinstall@workspace:*, @storybook/postinstall@workspace:lib/postinstall": version: 0.0.0-use.local resolution: "@storybook/postinstall@workspace:lib/postinstall" dependencies: @@ -6714,10 +6713,10 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/preact-webpack5@workspace:frameworks/preact-webpack5" dependencies: - "@storybook/builder-webpack5": 7.0.0-beta.1 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/preact": 7.0.0-beta.1 - "@storybook/preset-preact-webpack": 7.0.0-beta.1 + "@storybook/builder-webpack5": 7.0.0-beta.3 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/preact": 7.0.0-beta.3 + "@storybook/preset-preact-webpack": 7.0.0-beta.3 "@types/node": ^16.0.0 preact: ^10.5.13 typescript: ~4.9.3 @@ -6729,13 +6728,13 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preact@7.0.0-beta.1, @storybook/preact@workspace:*, @storybook/preact@workspace:renderers/preact": +"@storybook/preact@7.0.0-beta.3, @storybook/preact@workspace:*, @storybook/preact@workspace:renderers/preact": version: 0.0.0-use.local resolution: "@storybook/preact@workspace:renderers/preact" dependencies: - "@storybook/core-client": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/core-client": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 global: ^4.4.0 preact: ^10.5.13 ts-dedent: ^2.0.0 @@ -6745,11 +6744,11 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-html-webpack@7.0.0-beta.1, @storybook/preset-html-webpack@workspace:*, @storybook/preset-html-webpack@workspace:presets/html-webpack": +"@storybook/preset-html-webpack@7.0.0-beta.3, @storybook/preset-html-webpack@workspace:*, @storybook/preset-html-webpack@workspace:presets/html-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-html-webpack@workspace:presets/html-webpack" dependencies: - "@storybook/core-webpack": 7.0.0-beta.1 + "@storybook/core-webpack": 7.0.0-beta.3 "@types/node": ^16.0.0 html-loader: ^3.1.0 typescript: ~4.9.3 @@ -6759,12 +6758,12 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-preact-webpack@7.0.0-beta.1, @storybook/preset-preact-webpack@workspace:*, @storybook/preset-preact-webpack@workspace:presets/preact-webpack": +"@storybook/preset-preact-webpack@7.0.0-beta.3, @storybook/preset-preact-webpack@workspace:*, @storybook/preset-preact-webpack@workspace:presets/preact-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-preact-webpack@workspace:presets/preact-webpack" dependencies: "@babel/plugin-transform-react-jsx": ^7.19.0 - "@storybook/core-webpack": 7.0.0-beta.1 + "@storybook/core-webpack": 7.0.0-beta.3 "@types/node": ^16.0.0 preact: ^10.5.13 typescript: ~4.9.3 @@ -6774,17 +6773,17 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-react-webpack@7.0.0-beta.1, @storybook/preset-react-webpack@workspace:*, @storybook/preset-react-webpack@workspace:presets/react-webpack": +"@storybook/preset-react-webpack@7.0.0-beta.3, @storybook/preset-react-webpack@workspace:*, @storybook/preset-react-webpack@workspace:presets/react-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-react-webpack@workspace:presets/react-webpack" dependencies: "@babel/preset-flow": ^7.18.6 "@babel/preset-react": ^7.18.6 "@pmmmwh/react-refresh-webpack-plugin": ^0.5.5 - "@storybook/core-webpack": 7.0.0-beta.1 - "@storybook/docs-tools": 7.0.0-beta.1 - "@storybook/node-logger": 7.0.0-beta.1 - "@storybook/react": 7.0.0-beta.1 + "@storybook/core-webpack": 7.0.0-beta.3 + "@storybook/docs-tools": 7.0.0-beta.3 + "@storybook/node-logger": 7.0.0-beta.3 + "@storybook/react": 7.0.0-beta.3 "@storybook/react-docgen-typescript-plugin": 1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0 "@types/node": ^16.0.0 "@types/semver": ^7.3.4 @@ -6807,13 +6806,13 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-server-webpack@7.0.0-beta.1, @storybook/preset-server-webpack@workspace:*, @storybook/preset-server-webpack@workspace:presets/server-webpack": +"@storybook/preset-server-webpack@7.0.0-beta.3, @storybook/preset-server-webpack@workspace:*, @storybook/preset-server-webpack@workspace:presets/server-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-server-webpack@workspace:presets/server-webpack" dependencies: - "@storybook/core-server": 7.0.0-beta.1 - "@storybook/core-webpack": 7.0.0-beta.1 - "@storybook/server": 7.0.0-beta.1 + "@storybook/core-server": 7.0.0-beta.3 + "@storybook/core-webpack": 7.0.0-beta.3 + "@storybook/server": 7.0.0-beta.3 "@types/node": ^16.0.0 fs-extra: ^9.0.1 global: ^4.4.0 @@ -6826,12 +6825,12 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-svelte-webpack@7.0.0-beta.1, @storybook/preset-svelte-webpack@workspace:*, @storybook/preset-svelte-webpack@workspace:presets/svelte-webpack": +"@storybook/preset-svelte-webpack@7.0.0-beta.3, @storybook/preset-svelte-webpack@workspace:*, @storybook/preset-svelte-webpack@workspace:presets/svelte-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-svelte-webpack@workspace:presets/svelte-webpack" dependencies: - "@storybook/core-webpack": 7.0.0-beta.1 - "@storybook/node-logger": 7.0.0-beta.1 + "@storybook/core-webpack": 7.0.0-beta.3 + "@storybook/node-logger": 7.0.0-beta.3 svelte: ^3.31.2 svelte-loader: ^3.1.2 sveltedoc-parser: ^4.2.1 @@ -6844,12 +6843,12 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-vue-webpack@7.0.0-beta.1, @storybook/preset-vue-webpack@workspace:*, @storybook/preset-vue-webpack@workspace:presets/vue-webpack": +"@storybook/preset-vue-webpack@7.0.0-beta.3, @storybook/preset-vue-webpack@workspace:*, @storybook/preset-vue-webpack@workspace:presets/vue-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-vue-webpack@workspace:presets/vue-webpack" dependencies: - "@storybook/core-webpack": 7.0.0-beta.1 - "@storybook/docs-tools": 7.0.0-beta.1 + "@storybook/core-webpack": 7.0.0-beta.3 + "@storybook/docs-tools": 7.0.0-beta.3 "@types/node": ^16.0.0 ts-loader: ^9.2.8 typescript: ~4.9.3 @@ -6869,12 +6868,12 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-vue3-webpack@7.0.0-beta.1, @storybook/preset-vue3-webpack@workspace:*, @storybook/preset-vue3-webpack@workspace:presets/vue3-webpack": +"@storybook/preset-vue3-webpack@7.0.0-beta.3, @storybook/preset-vue3-webpack@workspace:*, @storybook/preset-vue3-webpack@workspace:presets/vue3-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-vue3-webpack@workspace:presets/vue3-webpack" dependencies: - "@storybook/core-webpack": 7.0.0-beta.1 - "@storybook/docs-tools": 7.0.0-beta.1 + "@storybook/core-webpack": 7.0.0-beta.3 + "@storybook/docs-tools": 7.0.0-beta.3 "@types/node": ^16.0.0 "@vue/compiler-sfc": ^3.2.33 ts-loader: ^9.2.8 @@ -6892,14 +6891,14 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-web-components-webpack@7.0.0-beta.1, @storybook/preset-web-components-webpack@workspace:*, @storybook/preset-web-components-webpack@workspace:presets/web-components-webpack": +"@storybook/preset-web-components-webpack@7.0.0-beta.3, @storybook/preset-web-components-webpack@workspace:*, @storybook/preset-web-components-webpack@workspace:presets/web-components-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-web-components-webpack@workspace:presets/web-components-webpack" dependencies: "@babel/plugin-syntax-dynamic-import": ^7.8.3 "@babel/plugin-syntax-import-meta": ^7.10.4 "@babel/preset-env": ^7.20.2 - "@storybook/core-webpack": 7.0.0-beta.1 + "@storybook/core-webpack": 7.0.0-beta.3 "@types/node": ^16.0.0 babel-loader: ^7.0.0 || ^8.0.0 babel-plugin-bundled-import-meta: ^0.3.1 @@ -6910,18 +6909,18 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preview-api@7.0.0-beta.1, @storybook/preview-api@workspace:*, @storybook/preview-api@workspace:lib/preview-api": +"@storybook/preview-api@7.0.0-beta.3, @storybook/preview-api@workspace:*, @storybook/preview-api@workspace:lib/preview-api": version: 0.0.0-use.local resolution: "@storybook/preview-api@workspace:lib/preview-api" dependencies: "@jest/globals": ^26.6.2 - "@storybook/channel-postmessage": 7.0.0-beta.1 - "@storybook/channels": 7.0.0-beta.1 - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/core-events": 7.0.0-beta.1 + "@storybook/channel-postmessage": 7.0.0-beta.3 + "@storybook/channels": 7.0.0-beta.3 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/core-events": 7.0.0-beta.3 "@storybook/csf": next - "@storybook/types": 7.0.0-beta.1 + "@storybook/types": 7.0.0-beta.3 "@types/qs": ^6.9.5 ansi-to-html: ^0.6.11 dequal: ^2.0.2 @@ -6937,25 +6936,25 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preview-web@7.0.0-beta.1, @storybook/preview-web@workspace:*, @storybook/preview-web@workspace:lib/preview-web": +"@storybook/preview-web@7.0.0-beta.3, @storybook/preview-web@workspace:*, @storybook/preview-web@workspace:lib/preview-web": version: 0.0.0-use.local resolution: "@storybook/preview-web@workspace:lib/preview-web" dependencies: - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 languageName: unknown linkType: soft -"@storybook/preview@7.0.0-beta.1, @storybook/preview@workspace:*, @storybook/preview@workspace:lib/preview": +"@storybook/preview@7.0.0-beta.3, @storybook/preview@workspace:*, @storybook/preview@workspace:lib/preview": version: 0.0.0-use.local resolution: "@storybook/preview@workspace:lib/preview" dependencies: - "@storybook/channel-postmessage": 7.0.0-beta.1 - "@storybook/channel-websocket": 7.0.0-beta.1 - "@storybook/channels": 7.0.0-beta.1 - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/core-events": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 + "@storybook/channel-postmessage": 7.0.0-beta.3 + "@storybook/channel-websocket": 7.0.0-beta.3 + "@storybook/channels": 7.0.0-beta.3 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/core-events": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 typescript: ~4.9.3 languageName: unknown linkType: soft @@ -6984,15 +6983,15 @@ __metadata: dependencies: "@joshwooding/vite-plugin-react-docgen-typescript": ^0.0.5 "@rollup/pluginutils": ^4.2.0 - "@storybook/builder-vite": 7.0.0-beta.1 - "@storybook/react": 7.0.0-beta.1 + "@storybook/builder-vite": 7.0.0-beta.3 + "@storybook/react": 7.0.0-beta.3 "@types/node": ^16.0.0 "@vitejs/plugin-react": ^2.0.0 ast-types: ^0.14.2 magic-string: ^0.26.1 react-docgen: ^6.0.0-alpha.3 typescript: ~4.9.3 - vite: ^3.1.3 + vite: ^4.0.0-beta.2 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -7003,9 +7002,9 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/react-webpack5@workspace:frameworks/react-webpack5" dependencies: - "@storybook/builder-webpack5": 7.0.0-beta.1 - "@storybook/preset-react-webpack": 7.0.0-beta.1 - "@storybook/react": 7.0.0-beta.1 + "@storybook/builder-webpack5": 7.0.0-beta.3 + "@storybook/preset-react-webpack": 7.0.0-beta.3 + "@storybook/react": 7.0.0-beta.3 "@types/node": ^16.0.0 jest-specific-snapshot: ^7.0.0 typescript: ~4.9.3 @@ -7021,16 +7020,16 @@ __metadata: languageName: unknown linkType: soft -"@storybook/react@7.0.0-beta.1, @storybook/react@workspace:*, @storybook/react@workspace:renderers/react": +"@storybook/react@7.0.0-beta.3, @storybook/react@workspace:*, @storybook/react@workspace:renderers/react": version: 0.0.0-use.local resolution: "@storybook/react@workspace:renderers/react" dependencies: "@babel/core": ^7.20.2 - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/core-client": 7.0.0-beta.1 - "@storybook/docs-tools": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/core-client": 7.0.0-beta.3 + "@storybook/docs-tools": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 "@types/estree": ^0.0.51 "@types/node": ^16.0.0 "@types/util-deprecate": ^1.0.0 @@ -7287,7 +7286,7 @@ __metadata: util: ^0.12.4 verdaccio: ^4.10.0 verdaccio-auth-memory: ^9.7.2 - vite: ^3.1.7 + vite: ^4.0.0-beta.2 vite-plugin-turbosnap: ^1.0.1 wait-on: ^5.2.1 web-component-analyzer: ^1.1.6 @@ -7324,11 +7323,11 @@ __metadata: languageName: unknown linkType: soft -"@storybook/router@7.0.0-beta.1, @storybook/router@workspace:*, @storybook/router@workspace:lib/router": +"@storybook/router@7.0.0-beta.3, @storybook/router@workspace:*, @storybook/router@workspace:lib/router": version: 0.0.0-use.local resolution: "@storybook/router@workspace:lib/router" dependencies: - "@storybook/client-logger": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 dequal: ^2.0.2 global: ^4.4.0 lodash: ^4.17.21 @@ -7376,10 +7375,10 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/server-webpack5@workspace:frameworks/server-webpack5" dependencies: - "@storybook/builder-webpack5": 7.0.0-beta.1 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/preset-server-webpack": 7.0.0-beta.1 - "@storybook/server": 7.0.0-beta.1 + "@storybook/builder-webpack5": 7.0.0-beta.3 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/preset-server-webpack": 7.0.0-beta.3 + "@storybook/server": 7.0.0-beta.3 "@types/node": ^16.0.0 typescript: ~4.9.3 peerDependencies: @@ -7388,25 +7387,25 @@ __metadata: languageName: unknown linkType: soft -"@storybook/server@7.0.0-beta.1, @storybook/server@workspace:*, @storybook/server@workspace:renderers/server": +"@storybook/server@7.0.0-beta.3, @storybook/server@workspace:*, @storybook/server@workspace:renderers/server": version: 0.0.0-use.local resolution: "@storybook/server@workspace:renderers/server" dependencies: - "@storybook/core-client": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/core-client": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 global: ^4.4.0 ts-dedent: ^2.0.0 typescript: ~4.9.3 languageName: unknown linkType: soft -"@storybook/source-loader@7.0.0-beta.1, @storybook/source-loader@workspace:*, @storybook/source-loader@workspace:lib/source-loader": +"@storybook/source-loader@7.0.0-beta.3, @storybook/source-loader@workspace:*, @storybook/source-loader@workspace:lib/source-loader": version: 0.0.0-use.local resolution: "@storybook/source-loader@workspace:lib/source-loader" dependencies: "@storybook/csf": next - "@storybook/types": 7.0.0-beta.1 + "@storybook/types": 7.0.0-beta.3 estraverse: ^5.2.0 jest-specific-snapshot: ^7.0.0 lodash: ^4.17.21 @@ -7418,30 +7417,31 @@ __metadata: languageName: unknown linkType: soft -"@storybook/store@7.0.0-beta.1, @storybook/store@workspace:*, @storybook/store@workspace:lib/store": +"@storybook/store@7.0.0-beta.3, @storybook/store@workspace:*, @storybook/store@workspace:lib/store": version: 0.0.0-use.local resolution: "@storybook/store@workspace:lib/store" dependencies: - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 languageName: unknown linkType: soft -"@storybook/svelte-vite@7.0.0-beta.1, @storybook/svelte-vite@workspace:frameworks/svelte-vite": +"@storybook/svelte-vite@7.0.0-beta.3, @storybook/svelte-vite@workspace:frameworks/svelte-vite": version: 0.0.0-use.local resolution: "@storybook/svelte-vite@workspace:frameworks/svelte-vite" dependencies: "@storybook/addon-svelte-csf": ^2.0.0 - "@storybook/builder-vite": 7.0.0-beta.1 - "@storybook/node-logger": 7.0.0-beta.1 - "@storybook/svelte": 7.0.0-beta.1 + "@storybook/builder-vite": 7.0.0-beta.3 + "@storybook/node-logger": 7.0.0-beta.3 + "@storybook/svelte": 7.0.0-beta.3 "@sveltejs/vite-plugin-svelte": ^2.0.0 "@types/node": ^16.0.0 magic-string: ^0.26.1 svelte: ^3.0.0 sveltedoc-parser: ^4.2.1 + ts-dedent: ^2.2.0 typescript: ~4.9.3 - vite: ^3.1.3 + vite: ^4.0.0-beta.2 peerDependencies: "@storybook/addon-svelte-csf": ^2.0.0 react: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -7456,10 +7456,10 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/svelte-webpack5@workspace:frameworks/svelte-webpack5" dependencies: - "@storybook/builder-webpack5": 7.0.0-beta.1 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/preset-svelte-webpack": 7.0.0-beta.1 - "@storybook/svelte": 7.0.0-beta.1 + "@storybook/builder-webpack5": 7.0.0-beta.3 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/preset-svelte-webpack": 7.0.0-beta.3 + "@storybook/svelte": 7.0.0-beta.3 svelte: ^3.48.0 svelte-loader: ^3.1.2 typescript: ~4.9.3 @@ -7472,15 +7472,15 @@ __metadata: languageName: unknown linkType: soft -"@storybook/svelte@7.0.0-beta.1, @storybook/svelte@workspace:*, @storybook/svelte@workspace:renderers/svelte": +"@storybook/svelte@7.0.0-beta.3, @storybook/svelte@workspace:*, @storybook/svelte@workspace:renderers/svelte": version: 0.0.0-use.local resolution: "@storybook/svelte@workspace:renderers/svelte" dependencies: - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/core-client": 7.0.0-beta.1 - "@storybook/docs-tools": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/core-client": 7.0.0-beta.3 + "@storybook/docs-tools": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 expect-type: ^0.14.2 global: ^4.4.0 svelte: ^3.31.2 @@ -7498,11 +7498,11 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/sveltekit@workspace:frameworks/sveltekit" dependencies: - "@storybook/builder-vite": 7.0.0-beta.1 - "@storybook/svelte-vite": 7.0.0-beta.1 + "@storybook/builder-vite": 7.0.0-beta.3 + "@storybook/svelte": 7.0.0-beta.3 + "@storybook/svelte-vite": 7.0.0-beta.3 "@types/node": ^16.0.0 typescript: ^4.9.3 - vite: ^3.1.3 peerDependencies: "@storybook/addon-svelte-csf": ^2.0.0 peerDependenciesMeta: @@ -7511,12 +7511,12 @@ __metadata: languageName: unknown linkType: soft -"@storybook/telemetry@7.0.0-beta.1, @storybook/telemetry@workspace:*, @storybook/telemetry@workspace:lib/telemetry": +"@storybook/telemetry@7.0.0-beta.3, @storybook/telemetry@workspace:*, @storybook/telemetry@workspace:lib/telemetry": version: 0.0.0-use.local resolution: "@storybook/telemetry@workspace:lib/telemetry" dependencies: - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/core-common": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/core-common": 7.0.0-beta.3 chalk: ^4.1.0 detect-package-manager: ^2.0.1 fetch-retry: ^5.0.2 @@ -7541,7 +7541,7 @@ __metadata: languageName: node linkType: hard -"@storybook/theming@7.0.0-beta.1, @storybook/theming@workspace:*, @storybook/theming@workspace:lib/theming": +"@storybook/theming@7.0.0-beta.3, @storybook/theming@workspace:*, @storybook/theming@workspace:lib/theming": version: 0.0.0-use.local resolution: "@storybook/theming@workspace:lib/theming" dependencies: @@ -7550,7 +7550,7 @@ __metadata: "@emotion/react": ^11.10.4 "@emotion/styled": ^11.10.4 "@emotion/use-insertion-effect-with-fallbacks": ^1.0.0 - "@storybook/client-logger": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 "@types/fs-extra": ^9.0.6 "@types/node": ^16.0.0 deep-object-diff: ^1.1.0 @@ -7581,12 +7581,12 @@ __metadata: languageName: node linkType: hard -"@storybook/types@7.0.0-beta.1, @storybook/types@workspace:*, @storybook/types@workspace:lib/types": +"@storybook/types@7.0.0-beta.3, @storybook/types@workspace:*, @storybook/types@workspace:lib/types": version: 0.0.0-use.local resolution: "@storybook/types@workspace:lib/types" dependencies: "@babel/core": ^7.12.10 - "@storybook/channels": 7.0.0-beta.1 + "@storybook/channels": 7.0.0-beta.3 "@storybook/csf": next "@types/babel__core": ^7.0.0 "@types/express": ^4.7.0 @@ -7601,13 +7601,13 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/vue-vite@workspace:frameworks/vue-vite" dependencies: - "@storybook/builder-vite": 7.0.0-beta.1 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/core-server": 7.0.0-beta.1 - "@storybook/vue": 7.0.0-beta.1 + "@storybook/builder-vite": 7.0.0-beta.3 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/core-server": 7.0.0-beta.3 + "@storybook/vue": 7.0.0-beta.3 magic-string: ^0.26.1 typescript: ~4.9.3 - vite: ^3.1.3 + vite: ^4.0.0-beta.2 vue: ^2.7.10 vue-docgen-api: ^4.40.0 peerDependencies: @@ -7621,10 +7621,10 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/vue-webpack5@workspace:frameworks/vue-webpack5" dependencies: - "@storybook/builder-webpack5": 7.0.0-beta.1 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/preset-vue-webpack": 7.0.0-beta.1 - "@storybook/vue": 7.0.0-beta.1 + "@storybook/builder-webpack5": 7.0.0-beta.3 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/preset-vue-webpack": 7.0.0-beta.3 + "@storybook/vue": 7.0.0-beta.3 "@types/node": ^16.0.0 typescript: ~4.9.3 vue: ^2.6.12 @@ -7646,14 +7646,14 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/vue3-vite@workspace:frameworks/vue3-vite" dependencies: - "@storybook/builder-vite": 7.0.0-beta.1 - "@storybook/core-server": 7.0.0-beta.1 - "@storybook/vue3": 7.0.0-beta.1 + "@storybook/builder-vite": 7.0.0-beta.3 + "@storybook/core-server": 7.0.0-beta.3 + "@storybook/vue3": 7.0.0-beta.3 "@types/node": ^16.0.0 "@vitejs/plugin-vue": ^3.0.0 magic-string: ^0.26.1 typescript: ~4.9.3 - vite: ^3.1.3 + vite: ^4.0.0-beta.2 vue-docgen-api: ^4.40.0 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -7665,10 +7665,10 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/vue3-webpack5@workspace:frameworks/vue3-webpack5" dependencies: - "@storybook/builder-webpack5": 7.0.0-beta.1 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/preset-vue3-webpack": 7.0.0-beta.1 - "@storybook/vue3": 7.0.0-beta.1 + "@storybook/builder-webpack5": 7.0.0-beta.3 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/preset-vue3-webpack": 7.0.0-beta.3 + "@storybook/vue3": 7.0.0-beta.3 "@types/node": ^16.0.0 "@vue/compiler-sfc": 3.0.0 typescript: ~4.9.3 @@ -7683,15 +7683,15 @@ __metadata: languageName: unknown linkType: soft -"@storybook/vue3@7.0.0-beta.1, @storybook/vue3@workspace:*, @storybook/vue3@workspace:renderers/vue3": +"@storybook/vue3@7.0.0-beta.3, @storybook/vue3@workspace:*, @storybook/vue3@workspace:renderers/vue3": version: 0.0.0-use.local resolution: "@storybook/vue3@workspace:renderers/vue3" dependencies: "@digitak/esrun": ^3.2.2 - "@storybook/core-client": 7.0.0-beta.1 - "@storybook/docs-tools": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/core-client": 7.0.0-beta.3 + "@storybook/docs-tools": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 "@vue/vue3-jest": 29 global: ^4.4.0 ts-dedent: ^2.0.0 @@ -7704,15 +7704,15 @@ __metadata: languageName: unknown linkType: soft -"@storybook/vue@7.0.0-beta.1, @storybook/vue@workspace:*, @storybook/vue@workspace:renderers/vue": +"@storybook/vue@7.0.0-beta.3, @storybook/vue@workspace:*, @storybook/vue@workspace:renderers/vue": version: 0.0.0-use.local resolution: "@storybook/vue@workspace:renderers/vue" dependencies: - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/core-client": 7.0.0-beta.1 - "@storybook/docs-tools": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/core-client": 7.0.0-beta.3 + "@storybook/docs-tools": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 global: ^4.4.0 ts-dedent: ^2.0.0 type-fest: 2.19.0 @@ -7734,14 +7734,13 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/web-components-vite@workspace:frameworks/web-components-vite" dependencies: - "@storybook/builder-vite": 7.0.0-beta.1 - "@storybook/core-server": 7.0.0-beta.1 - "@storybook/node-logger": 7.0.0-beta.1 - "@storybook/web-components": 7.0.0-beta.1 + "@storybook/builder-vite": 7.0.0-beta.3 + "@storybook/core-server": 7.0.0-beta.3 + "@storybook/node-logger": 7.0.0-beta.3 + "@storybook/web-components": 7.0.0-beta.3 "@types/node": ^16.0.0 magic-string: ^0.26.1 typescript: ~4.9.3 - vite: ^3.1.0 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -7753,10 +7752,10 @@ __metadata: resolution: "@storybook/web-components-webpack5@workspace:frameworks/web-components-webpack5" dependencies: "@babel/preset-env": ^7.20.2 - "@storybook/builder-webpack5": 7.0.0-beta.1 - "@storybook/core-common": 7.0.0-beta.1 - "@storybook/preset-web-components-webpack": 7.0.0-beta.1 - "@storybook/web-components": 7.0.0-beta.1 + "@storybook/builder-webpack5": 7.0.0-beta.3 + "@storybook/core-common": 7.0.0-beta.3 + "@storybook/preset-web-components-webpack": 7.0.0-beta.3 + "@storybook/web-components": 7.0.0-beta.3 "@types/node": ^16.0.0 lit-html: 2.0.2 typescript: ~4.9.3 @@ -7767,16 +7766,16 @@ __metadata: languageName: unknown linkType: soft -"@storybook/web-components@7.0.0-beta.1, @storybook/web-components@workspace:*, @storybook/web-components@workspace:renderers/web-components": +"@storybook/web-components@7.0.0-beta.3, @storybook/web-components@workspace:*, @storybook/web-components@workspace:renderers/web-components": version: 0.0.0-use.local resolution: "@storybook/web-components@workspace:renderers/web-components" dependencies: - "@storybook/client-logger": 7.0.0-beta.1 - "@storybook/core-client": 7.0.0-beta.1 - "@storybook/docs-tools": 7.0.0-beta.1 - "@storybook/manager-api": 7.0.0-beta.1 - "@storybook/preview-api": 7.0.0-beta.1 - "@storybook/types": 7.0.0-beta.1 + "@storybook/client-logger": 7.0.0-beta.3 + "@storybook/core-client": 7.0.0-beta.3 + "@storybook/docs-tools": 7.0.0-beta.3 + "@storybook/manager-api": 7.0.0-beta.3 + "@storybook/preview-api": 7.0.0-beta.3 + "@storybook/types": 7.0.0-beta.3 global: ^4.4.0 lit: 2.3.1 lit-html: 2.0.2 @@ -26625,7 +26624,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.1.10, postcss@npm:^8.2.14, postcss@npm:^8.2.15, postcss@npm:^8.3.7, postcss@npm:^8.4.14, postcss@npm:^8.4.18": +"postcss@npm:^8.1.10, postcss@npm:^8.2.14, postcss@npm:^8.2.15, postcss@npm:^8.3.7, postcss@npm:^8.4.14, postcss@npm:^8.4.18, postcss@npm:^8.4.19": version: 8.4.19 resolution: "postcss@npm:8.4.19" dependencies: @@ -29159,20 +29158,6 @@ __metadata: languageName: node linkType: hard -"rollup@npm:^2.79.1": - version: 2.79.1 - resolution: "rollup@npm:2.79.1" - dependencies: - fsevents: ~2.3.2 - dependenciesMeta: - fsevents: - optional: true - bin: - rollup: dist/bin/rollup - checksum: 421418687f5dcd7324f4387f203c6bfc7118b7ace789e30f5da022471c43e037a76f5fd93837052754eeeae798a4fb266ac05ccee1e594406d912a59af98dde9 - languageName: node - linkType: hard - "rollup@npm:^3.0.0, rollup@npm:^3.2.5": version: 3.5.1 resolution: "rollup@npm:3.5.1" @@ -29187,6 +29172,20 @@ __metadata: languageName: node linkType: hard +"rollup@npm:^3.6.0": + version: 3.6.0 + resolution: "rollup@npm:3.6.0" + dependencies: + fsevents: ~2.3.2 + dependenciesMeta: + fsevents: + optional: true + bin: + rollup: dist/bin/rollup + checksum: cb0ac6ba2e02ec544ca4658a184255b843ea3b7d4d62266706052f93e036bb1ab9e200ccfb8716855497cf52462551774b5fd54412bd02fcd6e8d7159533f54b + languageName: node + linkType: hard + "rst-selector-parser@npm:^2.2.3": version: 2.2.3 resolution: "rst-selector-parser@npm:2.2.3" @@ -29442,7 +29441,7 @@ __metadata: version: 0.0.0-use.local resolution: "sb@workspace:lib/cli-sb" dependencies: - "@storybook/cli": 7.0.0-beta.1 + "@storybook/cli": 7.0.0-beta.3 typescript: ~4.9.3 bin: sb: ./index.js @@ -30551,7 +30550,7 @@ __metadata: version: 0.0.0-use.local resolution: "storybook@workspace:lib/cli-storybook" dependencies: - "@storybook/cli": 7.0.0-beta.1 + "@storybook/cli": 7.0.0-beta.3 typescript: ~4.9.3 bin: sb: ./index.js @@ -33179,15 +33178,15 @@ __metadata: languageName: node linkType: hard -"vite@npm:^3.1.0, vite@npm:^3.1.3, vite@npm:^3.1.7": - version: 3.2.4 - resolution: "vite@npm:3.2.4" +"vite@npm:^4.0.0-beta.2": + version: 4.0.0-beta.2 + resolution: "vite@npm:4.0.0-beta.2" dependencies: - esbuild: ^0.15.9 + esbuild: ^0.15.18 fsevents: ~2.3.2 - postcss: ^8.4.18 + postcss: ^8.4.19 resolve: ^1.22.1 - rollup: ^2.79.1 + rollup: ^3.6.0 peerDependencies: "@types/node": ">= 14" less: "*" @@ -33213,7 +33212,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: c3b6a1643e6436e4628db1fe183a3eb7db970bf8cf20104540079b9e97b6f5ce1ea33c498373f130ddee7259a96cc3f9ce96d5e43a8b23f7484e35ac8634bcc7 + checksum: 8b23b39b9d4475fdb73d8a849ea3ebac79dd3d8853904bb8a7aee70704da3e2443915a43504668526ff90a6e67dd1b5abf508c6a2a7ffa3baef675ddc77a1fa0 languageName: node linkType: hard diff --git a/docs/integrations/integration-catalog.md b/docs/addons/integration-catalog.md similarity index 100% rename from docs/integrations/integration-catalog.md rename to docs/addons/integration-catalog.md diff --git a/docs/addons/writing-addons.md b/docs/addons/writing-addons.md index edc1592f6d5..842dbad749c 100644 --- a/docs/addons/writing-addons.md +++ b/docs/addons/writing-addons.md @@ -246,7 +246,7 @@ Now that you've seen how to create a bare-bones addon let's see how to share it Reference the [storybook-addon-outline](https://www.npmjs.com/package/storybook-addon-outline) to see a project that meets these requirements. -Learn how to [add to the addon catalog](../integrations/integration-catalog.md#addons). +Learn how to [add to the addon catalog](../addons/integration-catalog.md#addons). ### More guides and tutorials diff --git a/docs/frameworks.js b/docs/frameworks.js index 8d2e1156f7b..ce957e01d08 100644 --- a/docs/frameworks.js +++ b/docs/frameworks.js @@ -88,7 +88,7 @@ module.exports = { { name: 'Storyshots', unsupported: ['ember'], - path: 'workflows/unit-testing', + path: 'writing-tests/snapshot-testing', }, { name: 'storysource', diff --git a/docs/get-started/installation-problems/angular.mdx b/docs/get-started/installation-problems/angular.mdx index af6939fe2e9..b2a0a78ba37 100644 --- a/docs/get-started/installation-problems/angular.mdx +++ b/docs/get-started/installation-problems/angular.mdx @@ -42,4 +42,4 @@ | `"styles"` | Provide the location of the [application's styles](../configure/styling-and-css.md#importing-css-files) to be used with Storybook.
`"styles": ["src/styles.css", "src/styles.scss"]`
| | `"stylePreprocessorOptions"` | Provides further customization for style preprocessors resolved to the workspace root.
`"stylePreprocessorOptions": { "includePaths": ["src/styles"] }` | -- For other installation issues, check the [Angular README](../../app/angular/README.md) for additional instructions. +- For other installation issues, check the [Angular README](https://github.com/storybookjs/storybook/tree/next/code/frameworks/angular) for additional instructions. diff --git a/docs/get-started/installation-problems/ember.mdx b/docs/get-started/installation-problems/ember.mdx index f1d494f0586..b477a3f3e62 100644 --- a/docs/get-started/installation-problems/ember.mdx +++ b/docs/get-started/installation-problems/ember.mdx @@ -20,4 +20,4 @@ Update the [`@storybook/ember-cli-storybook`](https://www.npmjs.com/package/@sto npx storybook init --package-manager=npm ``` -- For other installation issues, check the [Ember README](../../app/ember/README.md) for additional instructions. +- For other installation issues, check the [Ember README](https://github.com/storybookjs/storybook/tree/next/code/frameworks/ember) for additional instructions. diff --git a/docs/get-started/installation-problems/html.mdx b/docs/get-started/installation-problems/html.mdx index 8bd4eae77ab..709dcf82436 100644 --- a/docs/get-started/installation-problems/html.mdx +++ b/docs/get-started/installation-problems/html.mdx @@ -4,4 +4,6 @@ npx storybook init --type html ``` -- For other installation issues, check the [Html README](../../app/html/README.md) for additional instructions. \ No newline at end of file +- For other installation issues, check the React README files for additional instructions: + - [HTML with Webpack]( https://github.com/storybookjs/storybook/tree/next/code/frameworks/html-webpack5) + - [HTML with Vite](https://github.com/storybookjs/storybook/tree/next/code/frameworks/html-vite) diff --git a/docs/get-started/installation-problems/preact.mdx b/docs/get-started/installation-problems/preact.mdx index 10db561f96c..ab781154c1e 100644 --- a/docs/get-started/installation-problems/preact.mdx +++ b/docs/get-started/installation-problems/preact.mdx @@ -10,4 +10,4 @@ npx storybook init --package-manager=npm ``` -- For other installation issues, check the [Preact README](../../app/preact/README.md) for additional instructions. +- For other installation issues, check the [Preact README](https://github.com/storybookjs/storybook/tree/next/code/frameworks/preact-webpack5) for additional instructions. diff --git a/docs/get-started/installation-problems/react.mdx b/docs/get-started/installation-problems/react.mdx index 7993718555b..6829da4d213 100644 --- a/docs/get-started/installation-problems/react.mdx +++ b/docs/get-started/installation-problems/react.mdx @@ -16,6 +16,8 @@ npx storybook@next automigrate ``` - Check the [Migration Guide](https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#cra5-upgrade) for more information on how to set up Webpack 5. +Check the [Migration Guide](https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#cra5-upgrade) for more information on how to set up Webpack 5. -- For other installation issues, check the [React README](../../app/react/README.md) for additional instructions. +- For other installation issues, check the React README files for additional instructions: + - [React with Webpack](https://github.com/storybookjs/storybook/tree/next/code/frameworks/react-webpack5) + - [React with Vite](https://github.com/storybookjs/storybook/tree/next/code/frameworks/react-vite) diff --git a/docs/get-started/installation-problems/svelte.mdx b/docs/get-started/installation-problems/svelte.mdx index fc13ced5eea..28c60ce77dd 100644 --- a/docs/get-started/installation-problems/svelte.mdx +++ b/docs/get-started/installation-problems/svelte.mdx @@ -10,5 +10,16 @@ npx storybook init --package-manager=npm ``` +### Svelte Native + +To enable support for Svelte Native story format you'll need to make the following changes your Storybook configuration: +- Add the [`@storybook/addon-svelte-csf`](https://storybook.js.org/addons/@storybook/addon-svelte-csf/) addon as development dependency. +- Enable the addon in your Storybook configuration file (e.g., `.storybook/main.js`). +- Disable on demand story loading configuration property (e.g., `storyStoreV7`) in your Storybook configuration file. - For issues with Svelte Native Story Format, check the [Svelte Story Format addon repository](https://github.com/storybookjs/addon-svelte-csf) for instructions. -- For other installation issues, check the [Svelte README](../../app/svelte/README.md) for additional instructions. + + +- For other installation issues, check the Svelte README files for additional instructions: + - [Svelte with Webpack](https://github.com/storybookjs/storybook/tree/next/code/frameworks/svelte-webpack5) + - [Svelte with Vite](https://github.com/storybookjs/storybook/tree/next/code/frameworks/svelte-vite) + - [SvelteKit](https://github.com/storybookjs/storybook/tree/next/code/frameworks/sveltekit) diff --git a/docs/get-started/installation-problems/vue.mdx b/docs/get-started/installation-problems/vue.mdx index cfd752e0f8b..ec6d98d4bbb 100644 --- a/docs/get-started/installation-problems/vue.mdx +++ b/docs/get-started/installation-problems/vue.mdx @@ -14,5 +14,8 @@ npx storybook init --package-manager=npm ``` -- For other installation issues, check the [Vue 2 README](../../app/vue/README.md), or the [Vue 3 README](../../app/vue3/README.md) for additional instructions. -- Vue 3 support is under active development, and we encourage feedback and improvements. Check the [contribution guidelines to help us improve it](../../CONTRIBUTING.md). +- For other installation issues, check the Vue README files for additional instructions: + - [Vue 2 with Webpack](https://github.com/storybookjs/storybook/tree/next/code/frameworks/vue-webpack5) + - [Vue 2 with Vite](https://github.com/storybookjs/storybook/tree/next/code/frameworks/vue-vite) + - [Vue 3 with Webpack](https://github.com/storybookjs/storybook/tree/next/code/frameworks/vue3-webpack5) + - [Vue 3 with Vite](https://github.com/storybookjs/storybook/tree/next/code/frameworks/vue3-vite) diff --git a/docs/get-started/installation-problems/web-components.mdx b/docs/get-started/installation-problems/web-components.mdx index 09841ea1934..4a212340616 100644 --- a/docs/get-started/installation-problems/web-components.mdx +++ b/docs/get-started/installation-problems/web-components.mdx @@ -4,4 +4,6 @@ npx storybook init --type web_components ``` -- For other installation issues, check the [Web Components README](../../app/web-components/README.md) for additional instructions. \ No newline at end of file +- For other installation issues, check the Web Components README files for additional instructions: + - [Web Components with Webpack](https://github.com/storybookjs/storybook/tree/next/code/frameworks/web-components-webpack5) + - [Web Components with Vite](https://github.com/storybookjs/storybook/tree/next/code/frameworks/web-components-vite) diff --git a/docs/snippets/html/checkbox-story.mdx.mdx b/docs/snippets/html/checkbox-story.mdx.mdx new file mode 100644 index 00000000000..e81434c6884 --- /dev/null +++ b/docs/snippets/html/checkbox-story.mdx.mdx @@ -0,0 +1,45 @@ +```md + + +import { Canvas, Meta, Story } from '@storybook/addon-docs'; + +export const Checkbox = (args) => ``; + + + +# Checkbox + +With `MDX`, we can define a story for `Checkbox` right in the middle of our +Markdown documentation. + + + + + + +``` diff --git a/docs/snippets/react/storybook-testing-addon-optional-config.js.mdx b/docs/snippets/react/storybook-testing-addon-optional-config.js.mdx index 9bc7bbd7a6b..628e3400455 100644 --- a/docs/snippets/react/storybook-testing-addon-optional-config.js.mdx +++ b/docs/snippets/react/storybook-testing-addon-optional-config.js.mdx @@ -6,5 +6,6 @@ import { setGlobalConfig } from '@storybook/testing-react'; // Storybook's preview file location import * as globalStorybookConfig from './.storybook/preview'; +// Replace with setProjectAnnotations if you are using the new pre-release version the addon setGlobalConfig(globalStorybookConfig); ``` diff --git a/docs/toc.js b/docs/toc.js index fb5a8f0c946..4f773c123af 100644 --- a/docs/toc.js +++ b/docs/toc.js @@ -331,7 +331,7 @@ module.exports = { type: 'link', }, { - pathSegment: 'addon-catalog', + pathSegment: 'integration-catalog', title: 'Add to catalog', type: 'link', }, diff --git a/docs/versions/next.json b/docs/versions/next.json index fd69fd14a8d..11408d27490 100644 --- a/docs/versions/next.json +++ b/docs/versions/next.json @@ -1 +1 @@ -{"version":"7.0.0-beta.1","info":{"plain":"#### Bug Fixes\n\n- Revert \"Telemetry: Add precedingUpgrade data to dev/build/error events\" [#20168](https://github.com/storybooks/storybook/pull/20168)\n- Controls: Fix file controls not resetting [#19998](https://github.com/storybooks/storybook/pull/19998)\n\n#### Dependency Upgrades\n\n- Upgrade express to fix security warning [#20152](https://github.com/storybooks/storybook/pull/20152)"}} \ No newline at end of file +{"version":"7.0.0-beta.3","info":{"plain":"#### Bug Fixes\n\n- CLI: Fix sb migrate codemods [#20191](https://github.com/storybooks/storybook/pull/20191)\n- Measure: Fix measure not working on disabled elements [#19985](https://github.com/storybooks/storybook/pull/19985)\n\n#### Maintenance\n\n- SvelteKit: Automigration [#20094](https://github.com/storybooks/storybook/pull/20094)\n- Tech: change `package.json` engines fields, set to minimal node16 and up [#20170](https://github.com/storybooks/storybook/pull/20170)"}} \ No newline at end of file diff --git a/scripts/package.json b/scripts/package.json index c6f702dd3b2..9c8a5f58305 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -185,7 +185,6 @@ }, "packageManager": "yarn@3.3.0", "engines": { - "node": ">=10.13.0", - "yarn": ">=1.3.2" + "node": ">=16.0.0" } } diff --git a/scripts/tasks/sandbox-parts.ts b/scripts/tasks/sandbox-parts.ts index 31a397445b5..d5725757837 100644 --- a/scripts/tasks/sandbox-parts.ts +++ b/scripts/tasks/sandbox-parts.ts @@ -143,7 +143,7 @@ function addEsbuildLoaderToStories(mainConfig: ConfigFile) { (config) => ({ ...config, module: { - ...config.modules, + ...config.module, rules: [ // Ensure esbuild-loader applies to all files in ./template-stories {