Merge branch 'next' into norbert/bundle-vitejs-plugin-vue

CHANGELOG.md

@@ -1,3 +1,41 @@
+## 7.0.0-beta.21 (January 9, 2023)
+
+#### Maintenance
+
+-   Ember: Build with tsc [#20524](https://github.com/storybooks/storybook/pull/20524)
+-   Storyshots: Build with tsc [#20523](https://github.com/storybooks/storybook/pull/20523)
+
+#### Dependencies
+
+-   Downgrade find-cache-dir [#20532](https://github.com/storybooks/storybook/pull/20532)
+
+#### Build
+
+-   Build: Cleanup babel prepare related code & dependencies [#20156](https://github.com/storybooks/storybook/pull/20156)
+-   Build: Create a tsc prepare script, use it for angular framework, add ESM to angular dist [#20516](https://github.com/storybooks/storybook/pull/20516)
+-   Build: Fix InternalCanvas story tests [#20521](https://github.com/storybooks/storybook/pull/20521)
+
+## 7.0.0-beta.20 (January 6, 2023)
+
+#### Bug Fixes
+
+-   Telemetry: Move 'dev'/'build' events to the end of the process [#20380](https://github.com/storybooks/storybook/pull/20380)
+-   Blocks: Export Unstyled block in index.ts [#20489](https://github.com/storybooks/storybook/pull/20489)
+-   Vite: Fix missing await in builder [#20409](https://github.com/storybooks/storybook/pull/20409)
+
+#### Maintenance
+
+-   Build: use tsup for csf-plugin [#20150](https://github.com/storybooks/storybook/pull/20150)
+-   Migration: Update autodocs migration to deal with `docs.docsPage` [#20379](https://github.com/storybooks/storybook/pull/20379)
+
+#### Build
+
+-   Blocks: Use example Button for stories [#20483](https://github.com/storybooks/storybook/pull/20483)
+-   Build: cleanup prep script where possible [#20151](https://github.com/storybooks/storybook/pull/20151)
+-   cleanup CI config [#20510](https://github.com/storybooks/storybook/pull/20510)
+-   Build: Fix CI parallelism [#20476](https://github.com/storybooks/storybook/pull/20476)
+-   Web-components: Restore missing script stories [#20477](https://github.com/storybooks/storybook/pull/20477)
+
 ## 7.0.0-beta.19 (January 1, 2023)
 
 #### Features

code/.eslintignore

@@ -10,8 +10,6 @@ scripts/storage
 scripts/repros-generator
 *.bundle.js
 *.js.map
-examples/ember-cli/.storybook/preview-head.html
-examples/official-storybook/tests/addon-jest.test.js
 ember-output
 .yarn
 !.remarkrc.js

code/.eslintrc.js

@@ -90,7 +90,7 @@ module.exports = {
         '**/__testfixtures__/**',
         '**/*.test.*',
         '**/*.stories.*',
-        '**/storyshots/**/stories/**',
+        '**/storyshots-*/**/stories/**',
       ],
       rules: {
         '@typescript-eslint/no-empty-function': 'off',

code/.gitignore

@@ -13,22 +13,16 @@ dist
 coverage/
 *.lerna_backup
 build
-packages/examples/automated-*
 /**/LICENSE
 docs/public
-packs/*.tgz
 package-lock.json
 .nvmrc
 storybook-static
-integration/__image_snapshots__/__diff_output__
 .jest-test-results.json
 lib/*.jar
-lib/**/dll
 /false
 /addons/docs/common/config-*
 built-storybooks
-cypress/videos
-cypress/screenshots
 .verdaccio-cache
 tsconfig.tsbuildinfo
 junit.xml

code/.yarnrc.yml

@@ -7,12 +7,10 @@ logFilters:
     level: discard
   - code: YN0076
     level: discard
-  - level: discard
-    pattern: '@workspace:examples'
   - level: discard
     pattern: '@storybook/root@workspace:.'
   - level: discard
-    pattern: '@workspace:addons/storyshots/'
+    pattern: '@workspace:addons/storyshots-*/'
 
 nodeLinker: node-modules
 

code/addons/a11y/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "7.0.0-beta.19",
+  "version": "7.0.0-beta.21",
   "description": "Test component compliance with web accessibility standards",
   "keywords": [
     "a11y",
@@ -63,16 +63,16 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/addon-highlight": "7.0.0-beta.19",
-    "@storybook/channels": "7.0.0-beta.19",
-    "@storybook/client-logger": "7.0.0-beta.19",
-    "@storybook/components": "7.0.0-beta.19",
-    "@storybook/core-events": "7.0.0-beta.19",
+    "@storybook/addon-highlight": "7.0.0-beta.21",
+    "@storybook/channels": "7.0.0-beta.21",
+    "@storybook/client-logger": "7.0.0-beta.21",
+    "@storybook/components": "7.0.0-beta.21",
+    "@storybook/core-events": "7.0.0-beta.21",
     "@storybook/global": "^5.0.0",
-    "@storybook/manager-api": "7.0.0-beta.19",
-    "@storybook/preview-api": "7.0.0-beta.19",
-    "@storybook/theming": "7.0.0-beta.19",
-    "@storybook/types": "7.0.0-beta.19",
+    "@storybook/manager-api": "7.0.0-beta.21",
+    "@storybook/preview-api": "7.0.0-beta.21",
+    "@storybook/theming": "7.0.0-beta.21",
+    "@storybook/types": "7.0.0-beta.21",
     "axe-core": "^4.2.0",
     "lodash": "^4.17.21",
     "react-resize-detector": "^7.1.2"
@@ -104,7 +104,7 @@
       "./src/preview.tsx"
     ]
   },
-  "gitHead": "da902f312eb354d20aa83bf0f0035b9744f93791",
+  "gitHead": "fb45d854842e10fa119a65c628333e3a5d495e77",
   "storybook": {
     "displayName": "Accessibility",
     "icon": "https://user-images.githubusercontent.com/263385/101991665-47042f80-3c7c-11eb-8f00-64b5a18f498a.png",

code/addons/actions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "7.0.0-beta.19",
+  "version": "7.0.0-beta.21",
   "description": "Get UI feedback when an action is performed on an interactive element",
   "keywords": [
     "storybook",
@@ -77,14 +77,14 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/client-logger": "7.0.0-beta.19",
-    "@storybook/components": "7.0.0-beta.19",
-    "@storybook/core-events": "7.0.0-beta.19",
+    "@storybook/client-logger": "7.0.0-beta.21",
+    "@storybook/components": "7.0.0-beta.21",
+    "@storybook/core-events": "7.0.0-beta.21",
     "@storybook/global": "^5.0.0",
-    "@storybook/manager-api": "7.0.0-beta.19",
-    "@storybook/preview-api": "7.0.0-beta.19",
-    "@storybook/theming": "7.0.0-beta.19",
-    "@storybook/types": "7.0.0-beta.19",
+    "@storybook/manager-api": "7.0.0-beta.21",
+    "@storybook/preview-api": "7.0.0-beta.21",
+    "@storybook/theming": "7.0.0-beta.21",
+    "@storybook/types": "7.0.0-beta.21",
     "dequal": "^2.0.2",
     "lodash": "^4.17.21",
     "polished": "^4.2.2",
@@ -121,7 +121,7 @@
       "./src/preview.ts"
     ]
   },
-  "gitHead": "da902f312eb354d20aa83bf0f0035b9744f93791",
+  "gitHead": "fb45d854842e10fa119a65c628333e3a5d495e77",
   "storybook": {
     "displayName": "Actions",
     "unsupportedFrameworks": [

code/addons/backgrounds/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "7.0.0-beta.19",
+  "version": "7.0.0-beta.21",
   "description": "Switch backgrounds to view components in different settings",
   "keywords": [
     "addon",
@@ -76,14 +76,14 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/client-logger": "7.0.0-beta.19",
-    "@storybook/components": "7.0.0-beta.19",
-    "@storybook/core-events": "7.0.0-beta.19",
+    "@storybook/client-logger": "7.0.0-beta.21",
+    "@storybook/components": "7.0.0-beta.21",
+    "@storybook/core-events": "7.0.0-beta.21",
     "@storybook/global": "^5.0.0",
-    "@storybook/manager-api": "7.0.0-beta.19",
-    "@storybook/preview-api": "7.0.0-beta.19",
-    "@storybook/theming": "7.0.0-beta.19",
-    "@storybook/types": "7.0.0-beta.19",
+    "@storybook/manager-api": "7.0.0-beta.21",
+    "@storybook/preview-api": "7.0.0-beta.21",
+    "@storybook/theming": "7.0.0-beta.21",
+    "@storybook/types": "7.0.0-beta.21",
     "memoizerific": "^1.11.3",
     "ts-dedent": "^2.0.0"
   },
@@ -112,7 +112,7 @@
       "./src/preview.tsx"
     ]
   },
-  "gitHead": "da902f312eb354d20aa83bf0f0035b9744f93791",
+  "gitHead": "fb45d854842e10fa119a65c628333e3a5d495e77",
   "storybook": {
     "displayName": "Backgrounds",
     "icon": "https://user-images.githubusercontent.com/263385/101991667-479cc600-3c7c-11eb-96d3-410e936252e7.png",

code/addons/controls/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-controls",
-  "version": "7.0.0-beta.19",
+  "version": "7.0.0-beta.21",
   "description": "Interact with component inputs dynamically in the Storybook UI",
   "keywords": [
     "addon",
@@ -68,15 +68,15 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/blocks": "7.0.0-beta.19",
-    "@storybook/client-logger": "7.0.0-beta.19",
-    "@storybook/components": "7.0.0-beta.19",
-    "@storybook/core-common": "7.0.0-beta.19",
-    "@storybook/manager-api": "7.0.0-beta.19",
-    "@storybook/node-logger": "7.0.0-beta.19",
+    "@storybook/blocks": "7.0.0-beta.21",
+    "@storybook/client-logger": "7.0.0-beta.21",
+    "@storybook/components": "7.0.0-beta.21",
+    "@storybook/core-common": "7.0.0-beta.21",
+    "@storybook/manager-api": "7.0.0-beta.21",
+    "@storybook/node-logger": "7.0.0-beta.21",
     "@storybook/preview-api": "7.0.0-beta.8",
-    "@storybook/theming": "7.0.0-beta.19",
-    "@storybook/types": "7.0.0-beta.19",
+    "@storybook/theming": "7.0.0-beta.21",
+    "@storybook/types": "7.0.0-beta.21",
     "lodash": "^4.17.21",
     "ts-dedent": "^2.0.0"
   },
@@ -102,7 +102,7 @@
     ],
     "platform": "browser"
   },
-  "gitHead": "da902f312eb354d20aa83bf0f0035b9744f93791",
+  "gitHead": "fb45d854842e10fa119a65c628333e3a5d495e77",
   "storybook": {
     "displayName": "Controls",
     "icon": "https://user-images.githubusercontent.com/263385/101991669-479cc600-3c7c-11eb-93d9-38b67e8371f2.png",

code/addons/docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-docs",
-  "version": "7.0.0-beta.19",
+  "version": "7.0.0-beta.21",
   "description": "Document component usage and properties in Markdown",
   "keywords": [
     "addon",
@@ -103,18 +103,18 @@
     "@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.19",
-    "@storybook/client-logger": "7.0.0-beta.19",
-    "@storybook/components": "7.0.0-beta.19",
-    "@storybook/csf-plugin": "7.0.0-beta.19",
-    "@storybook/csf-tools": "7.0.0-beta.19",
+    "@storybook/blocks": "7.0.0-beta.21",
+    "@storybook/client-logger": "7.0.0-beta.21",
+    "@storybook/components": "7.0.0-beta.21",
+    "@storybook/csf-plugin": "7.0.0-beta.21",
+    "@storybook/csf-tools": "7.0.0-beta.21",
     "@storybook/global": "^5.0.0",
     "@storybook/mdx2-csf": "next",
-    "@storybook/node-logger": "7.0.0-beta.19",
-    "@storybook/postinstall": "7.0.0-beta.19",
-    "@storybook/preview-api": "7.0.0-beta.19",
-    "@storybook/theming": "7.0.0-beta.19",
-    "@storybook/types": "7.0.0-beta.19",
+    "@storybook/node-logger": "7.0.0-beta.21",
+    "@storybook/postinstall": "7.0.0-beta.21",
+    "@storybook/preview-api": "7.0.0-beta.21",
+    "@storybook/theming": "7.0.0-beta.21",
+    "@storybook/types": "7.0.0-beta.21",
     "fs-extra": "^9.0.1",
     "remark-external-links": "^8.0.0",
     "remark-slug": "^6.0.0",
@@ -141,7 +141,7 @@
       "./src/shims/mdx-react-shim.ts"
     ]
   },
-  "gitHead": "da902f312eb354d20aa83bf0f0035b9744f93791",
+  "gitHead": "fb45d854842e10fa119a65c628333e3a5d495e77",
   "storybook": {
     "displayName": "Docs",
     "icon": "https://user-images.githubusercontent.com/263385/101991672-48355c80-3c7c-11eb-82d9-95fa12438f64.png",

code/addons/essentials/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-essentials",
-  "version": "7.0.0-beta.19",
+  "version": "7.0.0-beta.21",
   "description": "Curated addons to bring out the best of Storybook",
   "keywords": [
     "addon",
@@ -119,23 +119,23 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/addon-actions": "7.0.0-beta.19",
-    "@storybook/addon-backgrounds": "7.0.0-beta.19",
-    "@storybook/addon-controls": "7.0.0-beta.19",
-    "@storybook/addon-docs": "7.0.0-beta.19",
-    "@storybook/addon-highlight": "7.0.0-beta.19",
-    "@storybook/addon-measure": "7.0.0-beta.19",
-    "@storybook/addon-outline": "7.0.0-beta.19",
-    "@storybook/addon-toolbars": "7.0.0-beta.19",
-    "@storybook/addon-viewport": "7.0.0-beta.19",
-    "@storybook/core-common": "7.0.0-beta.19",
-    "@storybook/manager-api": "7.0.0-beta.19",
-    "@storybook/node-logger": "7.0.0-beta.19",
-    "@storybook/preview-api": "7.0.0-beta.19",
+    "@storybook/addon-actions": "7.0.0-beta.21",
+    "@storybook/addon-backgrounds": "7.0.0-beta.21",
+    "@storybook/addon-controls": "7.0.0-beta.21",
+    "@storybook/addon-docs": "7.0.0-beta.21",
+    "@storybook/addon-highlight": "7.0.0-beta.21",
+    "@storybook/addon-measure": "7.0.0-beta.21",
+    "@storybook/addon-outline": "7.0.0-beta.21",
+    "@storybook/addon-toolbars": "7.0.0-beta.21",
+    "@storybook/addon-viewport": "7.0.0-beta.21",
+    "@storybook/core-common": "7.0.0-beta.21",
+    "@storybook/manager-api": "7.0.0-beta.21",
+    "@storybook/node-logger": "7.0.0-beta.21",
+    "@storybook/preview-api": "7.0.0-beta.21",
     "ts-dedent": "^2.0.0"
   },
   "devDependencies": {
-    "@storybook/vue": "7.0.0-beta.19",
+    "@storybook/vue": "7.0.0-beta.21",
     "typescript": "^4.9.3"
   },
   "peerDependencies": {
@@ -166,5 +166,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "da902f312eb354d20aa83bf0f0035b9744f93791"
+  "gitHead": "fb45d854842e10fa119a65c628333e3a5d495e77"
 }

code/addons/highlight/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-highlight",
-  "version": "7.0.0-beta.19",
+  "version": "7.0.0-beta.21",
   "description": "Highlight DOM nodes within your stories",
   "keywords": [
     "storybook-addons",
@@ -61,9 +61,9 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/core-events": "7.0.0-beta.19",
+    "@storybook/core-events": "7.0.0-beta.21",
     "@storybook/global": "^5.0.0",
-    "@storybook/preview-api": "7.0.0-beta.19"
+    "@storybook/preview-api": "7.0.0-beta.21"
   },
   "devDependencies": {
     "@types/webpack-env": "^1.16.0",
@@ -78,7 +78,7 @@
       "./src/preview.ts"
     ]
   },
-  "gitHead": "da902f312eb354d20aa83bf0f0035b9744f93791",
+  "gitHead": "fb45d854842e10fa119a65c628333e3a5d495e77",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Highlight",

code/addons/interactions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-interactions",
-  "version": "7.0.0-beta.19",
+  "version": "7.0.0-beta.21",
   "description": "Automate, test and debug user interactions",
   "keywords": [
     "storybook-addons",
@@ -72,16 +72,16 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/client-logger": "7.0.0-beta.19",
-    "@storybook/components": "7.0.0-beta.19",
-    "@storybook/core-common": "7.0.0-beta.19",
-    "@storybook/core-events": "7.0.0-beta.19",
+    "@storybook/client-logger": "7.0.0-beta.21",
+    "@storybook/components": "7.0.0-beta.21",
+    "@storybook/core-common": "7.0.0-beta.21",
+    "@storybook/core-events": "7.0.0-beta.21",
     "@storybook/global": "^5.0.0",
-    "@storybook/instrumenter": "7.0.0-beta.19",
-    "@storybook/manager-api": "7.0.0-beta.19",
-    "@storybook/preview-api": "7.0.0-beta.19",
-    "@storybook/theming": "7.0.0-beta.19",
-    "@storybook/types": "7.0.0-beta.19",
+    "@storybook/instrumenter": "7.0.0-beta.21",
+    "@storybook/manager-api": "7.0.0-beta.21",
+    "@storybook/preview-api": "7.0.0-beta.21",
+    "@storybook/theming": "7.0.0-beta.21",
+    "@storybook/types": "7.0.0-beta.21",
     "jest-mock": "^27.0.6",
     "polished": "^4.2.2",
     "ts-dedent": "^2.2.0"
@@ -118,7 +118,7 @@
     ],
     "platform": "node"
   },
-  "gitHead": "da902f312eb354d20aa83bf0f0035b9744f93791",
+  "gitHead": "fb45d854842e10fa119a65c628333e3a5d495e77",
   "storybook": {
     "displayName": "Interactions",
     "unsupportedFrameworks": [

code/addons/jest/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-jest",
-  "version": "7.0.0-beta.19",
+  "version": "7.0.0-beta.21",
   "description": "React storybook addon that show component jest report",
   "keywords": [
     "addon",
@@ -70,13 +70,13 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/client-logger": "7.0.0-beta.19",
-    "@storybook/components": "7.0.0-beta.19",
-    "@storybook/core-events": "7.0.0-beta.19",
+    "@storybook/client-logger": "7.0.0-beta.21",
+    "@storybook/components": "7.0.0-beta.21",
+    "@storybook/core-events": "7.0.0-beta.21",
     "@storybook/global": "^5.0.0",
-    "@storybook/manager-api": "7.0.0-beta.19",
-    "@storybook/preview-api": "7.0.0-beta.19",
-    "@storybook/theming": "7.0.0-beta.19",
+    "@storybook/manager-api": "7.0.0-beta.21",
+    "@storybook/preview-api": "7.0.0-beta.21",
+    "@storybook/theming": "7.0.0-beta.21",
     "react-resize-detector": "^7.1.2",
     "upath": "^1.2.0"
   },
@@ -105,7 +105,7 @@
     ],
     "platform": "browser"
   },
-  "gitHead": "da902f312eb354d20aa83bf0f0035b9744f93791",
+  "gitHead": "fb45d854842e10fa119a65c628333e3a5d495e77",
   "storybook": {
     "displayName": "Jest",
     "icon": "https://pbs.twimg.com/profile_images/821713465245102080/mMtKIMax_400x400.jpg",

code/addons/links/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-links",
-  "version": "7.0.0-beta.19",
+  "version": "7.0.0-beta.21",
   "description": "Link stories together to build demos and prototypes with your UI components",
   "keywords": [
     "addon",
@@ -77,14 +77,14 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/client-logger": "7.0.0-beta.19",
-    "@storybook/core-events": "7.0.0-beta.19",
+    "@storybook/client-logger": "7.0.0-beta.21",
+    "@storybook/core-events": "7.0.0-beta.21",
     "@storybook/csf": "next",
     "@storybook/global": "^5.0.0",
-    "@storybook/manager-api": "7.0.0-beta.19",
-    "@storybook/preview-api": "7.0.0-beta.19",
-    "@storybook/router": "7.0.0-beta.19",
-    "@storybook/types": "7.0.0-beta.19",
+    "@storybook/manager-api": "7.0.0-beta.21",
+    "@storybook/preview-api": "7.0.0-beta.21",
+    "@storybook/router": "7.0.0-beta.21",
+    "@storybook/types": "7.0.0-beta.21",
     "prop-types": "^15.7.2",
     "ts-dedent": "^2.0.0"
   },
@@ -114,7 +114,7 @@
       "./src/react/index.ts"
     ]
   },
-  "gitHead": "da902f312eb354d20aa83bf0f0035b9744f93791",
+  "gitHead": "fb45d854842e10fa119a65c628333e3a5d495e77",
   "storybook": {
     "displayName": "Links",
     "icon": "https://user-images.githubusercontent.com/263385/101991673-48355c80-3c7c-11eb-9b6e-b627c96a75f6.png",

code/addons/measure/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-measure",
-  "version": "7.0.0-beta.19",
+  "version": "7.0.0-beta.21",
   "description": "Inspect layouts by visualizing the box model",
   "keywords": [
     "storybook-addons",
@@ -75,13 +75,13 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/client-logger": "7.0.0-beta.19",
-    "@storybook/components": "7.0.0-beta.19",
-    "@storybook/core-events": "7.0.0-beta.19",
+    "@storybook/client-logger": "7.0.0-beta.21",
+    "@storybook/components": "7.0.0-beta.21",
+    "@storybook/core-events": "7.0.0-beta.21",
     "@storybook/global": "^5.0.0",
-    "@storybook/manager-api": "7.0.0-beta.19",
-    "@storybook/preview-api": "7.0.0-beta.19",
-    "@storybook/types": "7.0.0-beta.19"
+    "@storybook/manager-api": "7.0.0-beta.21",
+    "@storybook/preview-api": "7.0.0-beta.21",
+    "@storybook/types": "7.0.0-beta.21"
   },
   "devDependencies": {
     "typescript": "~4.9.3"
@@ -108,7 +108,7 @@
       "./src/preview.tsx"
     ]
   },
-  "gitHead": "da902f312eb354d20aa83bf0f0035b9744f93791",
+  "gitHead": "fb45d854842e10fa119a65c628333e3a5d495e77",
   "storybook": {
     "displayName": "Measure",
     "unsupportedFrameworks": [

code/addons/outline/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-outline",
-  "version": "7.0.0-beta.19",
+  "version": "7.0.0-beta.21",
   "description": "Outline all elements with CSS to help with layout placement and alignment",
   "keywords": [
     "storybook-addons",
@@ -78,13 +78,13 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/client-logger": "7.0.0-beta.19",
-    "@storybook/components": "7.0.0-beta.19",
-    "@storybook/core-events": "7.0.0-beta.19",
+    "@storybook/client-logger": "7.0.0-beta.21",
+    "@storybook/components": "7.0.0-beta.21",
+    "@storybook/core-events": "7.0.0-beta.21",
     "@storybook/global": "^5.0.0",
-    "@storybook/manager-api": "7.0.0-beta.19",
-    "@storybook/preview-api": "7.0.0-beta.19",
-    "@storybook/types": "7.0.0-beta.19",
+    "@storybook/manager-api": "7.0.0-beta.21",
+    "@storybook/preview-api": "7.0.0-beta.21",
+    "@storybook/types": "7.0.0-beta.21",
     "ts-dedent": "^2.0.0"
   },
   "devDependencies": {
@@ -112,7 +112,7 @@
       "./src/preview.tsx"
     ]
   },
-  "gitHead": "da902f312eb354d20aa83bf0f0035b9744f93791",
+  "gitHead": "fb45d854842e10fa119a65c628333e3a5d495e77",
   "storybook": {
     "displayName": "Outline",
     "unsupportedFrameworks": [

code/addons/storyshots-core/package.json

@@ -1,50 +1,48 @@
 {
   "name": "@storybook/addon-storyshots",
-  "version": "7.0.0-beta.19",
+  "version": "7.0.0-beta.21",
   "description": "Take a code snapshot of every story automatically with Jest",
   "keywords": [
     "addon",
     "storybook",
     "test"
   ],
-  "homepage": "https://github.com/storybookjs/storybook/tree/main/addons/storyshots/storyshots-core",
+  "homepage": "https://github.com/storybookjs/storybook/tree/main/addons/storyshots-core",
   "bugs": {
     "url": "https://github.com/storybookjs/storybook/issues"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/storybookjs/storybook.git",
-    "directory": "addons/storyshots/storyshots-core"
+    "directory": "addons/storyshots-core"
   },
   "funding": {
     "type": "opencollective",
     "url": "https://opencollective.com/storybook"
   },
   "license": "MIT",
-  "main": "dist/types/index.js",
-  "module": "dist/types/index.js",
-  "types": "dist/types/index.d.ts",
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
   "files": [
     "dist/**/*",
     "README.md",
     "*.js",
+    "*.mjs",
     "*.d.ts"
   ],
   "scripts": {
-    "build-storybook": "sb build",
-    "example": "jest storyshot.test",
-    "prep": "node ../../../../scripts/prepare.js",
-    "storybook": "yarn sb dev -p 6006"
+    "prep": "../../../scripts/prepare/tsc.ts"
   },
   "dependencies": {
     "@jest/transform": "^29.3.1",
     "@storybook/babel-plugin-require-context-hook": "1.0.1",
-    "@storybook/client-api": "7.0.0-beta.19",
-    "@storybook/core-common": "7.0.0-beta.19",
-    "@storybook/core-webpack": "7.0.0-beta.19",
+    "@storybook/client-api": "7.0.0-beta.21",
+    "@storybook/core-common": "7.0.0-beta.21",
+    "@storybook/core-webpack": "7.0.0-beta.21",
     "@storybook/global": "^5.0.0",
-    "@storybook/preview-api": "7.0.0-beta.19",
-    "@storybook/types": "7.0.0-beta.19",
+    "@storybook/preview-api": "7.0.0-beta.21",
+    "@storybook/types": "7.0.0-beta.21",
     "@types/glob": "^7.1.3",
     "@types/jest-specific-snapshot": "^0.5.6",
     "core-js": "^3.8.2",
@@ -60,17 +58,18 @@
     "@angular/core": "^13.3.6",
     "@angular/platform-browser-dynamic": "^13.3.6",
     "@emotion/jest": "^11.8.0",
-    "@storybook/addon-docs": "7.0.0-beta.19",
-    "@storybook/angular": "7.0.0-beta.19",
-    "@storybook/react": "7.0.0-beta.19",
-    "@storybook/vue": "7.0.0-beta.19",
-    "@storybook/vue3": "7.0.0-beta.19",
+    "@storybook/addon-docs": "7.0.0-beta.21",
+    "@storybook/angular": "7.0.0-beta.21",
+    "@storybook/react": "7.0.0-beta.21",
+    "@storybook/vue": "7.0.0-beta.21",
+    "@storybook/vue3": "7.0.0-beta.21",
     "babel-loader": "^8.3.0",
     "enzyme": "^3.11.0",
     "enzyme-to-json": "^3.6.1",
     "jest-preset-angular": "^8.3.2",
     "jest-vue-preprocessor": "^1.7.1",
     "react-test-renderer": "^16",
+    "rimraf": "^3.0.2",
     "rxjs": "^6.6.3",
     "vue-jest": "^5.0.0-alpha.8"
   },
@@ -142,7 +141,8 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "da902f312eb354d20aa83bf0f0035b9744f93791",
+  "bundler": {},
+  "gitHead": "fb45d854842e10fa119a65c628333e3a5d495e77",
   "storybook": {
     "displayName": "Storyshots",
     "icon": "https://user-images.githubusercontent.com/263385/101991676-48cdf300-3c7c-11eb-8aa1-944dab6ab29b.png",

code/addons/storyshots-core/src/api/integrityTestTemplate.ts

@@ -52,6 +52,7 @@ function integrityTest(integrityOptions: any, stories2snapsConverter: any) {
       const snapshotExtension = stories2snapsConverter.getSnapshotExtension();
       const storyshots = glob.sync(`**/*${snapshotExtension}`, integrityOptions);
 
+      // @ts-expect-error (ts doesn't 'get' the extension happening on line 9)
       expect(storyshots).notToBeAbandoned(stories2snapsConverter);
     });
   });

code/addons/storyshots-core/src/frameworks/configure.test.ts

@@ -2,7 +2,7 @@ import path from 'path';
 import { getPreviewFile, getMainFile } from './configure';
 
 // eslint-disable-next-line global-require, jest/no-mocks-import
-jest.mock('fs', () => require('../../../../../__mocks__/fs'));
+jest.mock('fs', () => require('../../../../__mocks__/fs'));
 const setupFiles = (files: Record<string, string>) => {
   // eslint-disable-next-line no-underscore-dangle, global-require
   require('fs').__setMockFiles(files);

code/addons/storyshots-core/tsconfig.build.json

@@ -0,0 +1,23 @@
+{
+  "extends": "./tsconfig.json",
+  "compileOnSave": false,
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "CommonJS",
+    "lib": ["es2020", "dom"],
+    "esModuleInterop": true,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "declaration": true,
+    "outDir": "dist",
+    "types": ["node"],
+    "skipLibCheck": true,
+    "resolveJsonModule": true,
+    "allowJs": true,
+    "pretty": true,
+    "noErrorTruncation": true,
+    "listEmittedFiles": false,
+    "noUnusedLocals": false
+  },
+  "include": ["src/**/*", "src/**/*.json"]
+}

code/addons/storyshots-core/tsconfig.json

@@ -4,8 +4,7 @@
     "declaration": true,
     "jsx": "preserve",
     "skipLibCheck": true,
-    "skipDefaultLibCheck": true,
-    "types": ["jest", "testing-library__jest-dom"]
+    "skipDefaultLibCheck": true
   },
   "include": ["src/**/*.ts"]
 }

code/addons/storyshots-puppeteer/jest.config.js

@@ -0,0 +1,12 @@
+const path = require('path');
+const baseConfig = require('../../jest.config.browser');
+
+module.exports = {
+  ...baseConfig,
+  snapshotSerializers: [...baseConfig.snapshotSerializers, 'enzyme-to-json/serializer'],
+  transform: {
+    ...baseConfig.transform,
+    '^.+\\.stories\\.[jt]sx?$': '@storybook/addon-storyshots/injectFileName',
+  },
+  displayName: __dirname.split(path.sep).slice(-2).join(path.posix.sep),
+};

code/addons/storyshots-puppeteer/package.json

@@ -1,51 +1,53 @@
 {
   "name": "@storybook/addon-storyshots-puppeteer",
-  "version": "7.0.0-beta.19",
+  "version": "7.0.0-beta.21",
   "description": "Image snapshots addition to StoryShots based on puppeteer",
   "keywords": [
     "addon",
     "storybook"
   ],
-  "homepage": "https://github.com/storybookjs/storybook/tree/main/addons/storyshots/storyshots-puppeteer",
+  "homepage": "https://github.com/storybookjs/storybook/tree/main/addons/storyshots-puppeteer",
   "bugs": {
     "url": "https://github.com/storybookjs/storybook/issues"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/storybookjs/storybook.git",
-    "directory": "addons/storyshots/storyshots-puppeteer"
+    "directory": "addons/storyshots-puppeteer"
   },
   "funding": {
     "type": "opencollective",
     "url": "https://opencollective.com/storybook"
   },
   "license": "MIT",
-  "main": "dist/types/index.js",
-  "module": "dist/types/index.js",
-  "types": "dist/types/index.d.ts",
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
   "files": [
     "dist/**/*",
     "README.md",
     "*.js",
+    "*.mjs",
     "*.d.ts"
   ],
   "scripts": {
-    "prep": "node ../../../../scripts/prepare.js"
+    "prep": "../../../scripts/prepare/tsc.ts"
   },
   "dependencies": {
     "@axe-core/puppeteer": "^4.2.0",
     "@storybook/csf": "next",
-    "@storybook/node-logger": "7.0.0-beta.19",
-    "@storybook/types": "7.0.0-beta.19",
+    "@storybook/node-logger": "7.0.0-beta.21",
+    "@storybook/types": "7.0.0-beta.21",
     "@types/jest-image-snapshot": "^5.1.0",
     "jest-image-snapshot": "^6.0.0"
   },
   "devDependencies": {
     "@types/puppeteer": "^5.4.0",
-    "puppeteer": "^2.0.0 || ^3.0.0"
+    "puppeteer": "^2.0.0 || ^3.0.0",
+    "rimraf": "^3.0.2"
   },
   "peerDependencies": {
-    "@storybook/addon-storyshots": "7.0.0-beta.19",
+    "@storybook/addon-storyshots": "7.0.0-beta.21",
     "puppeteer": ">=2.0.0"
   },
   "peerDependenciesMeta": {
@@ -56,5 +58,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "da902f312eb354d20aa83bf0f0035b9744f93791"
+  "bundler": {},
+  "gitHead": "fb45d854842e10fa119a65c628333e3a5d495e77"
 }