Skip to content

Commit

Permalink
Merge branch 'next' into tech/prebundle-wip
Browse files Browse the repository at this point in the history
# Conflicts:
#	app/react/package.json
#	lib/theming/package.json
#	yarn.lock
  • Loading branch information
ndelangen committed Jan 18, 2022
2 parents cc4836d + b076507 commit 69a7dd1
Show file tree
Hide file tree
Showing 83 changed files with 1,167 additions and 1,153 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
## 6.5.0-alpha.21 (January 18, 2022)

### Features

* Webpack5: Switch to using `import.meta.webpackHot.accept` ([#17270](https://github.com/storybookjs/storybook/pull/17270))

## 6.5.0-alpha.20 (January 18, 2022)

### Dependency Upgrades

- Upgrade compodoc for colors.js bug ([#17266](https://github.com/storybookjs/storybook/pull/17266))
- Upgrade jscodeshift dependency for colors.js bug ([#17265](https://github.com/storybookjs/storybook/pull/17265))
- Restore prettier >= 2.2.1 to satisfy previous constraints ([#17257](https://github.com/storybookjs/storybook/pull/17257))

## 6.5.0-alpha.19 (January 17, 2022)

### Features
Expand Down
18 changes: 9 additions & 9 deletions addons/a11y/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-a11y",
"version": "6.5.0-alpha.19",
"version": "6.5.0-alpha.21",
"description": "Test component compliance with web accessibility standards",
"keywords": [
"a11y",
Expand Down Expand Up @@ -45,14 +45,14 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.5.0-alpha.19",
"@storybook/api": "6.5.0-alpha.19",
"@storybook/channels": "6.5.0-alpha.19",
"@storybook/client-logger": "6.5.0-alpha.19",
"@storybook/components": "6.5.0-alpha.19",
"@storybook/core-events": "6.5.0-alpha.19",
"@storybook/addons": "6.5.0-alpha.21",
"@storybook/api": "6.5.0-alpha.21",
"@storybook/channels": "6.5.0-alpha.21",
"@storybook/client-logger": "6.5.0-alpha.21",
"@storybook/components": "6.5.0-alpha.21",
"@storybook/core-events": "6.5.0-alpha.21",
"@storybook/csf": "0.0.2--canary.87bc651.0",
"@storybook/theming": "6.5.0-alpha.19",
"@storybook/theming": "6.5.0-alpha.21",
"axe-core": "^4.2.0",
"core-js": "^3.8.2",
"global": "^4.4.0",
Expand Down Expand Up @@ -81,7 +81,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "ce3592fc323ede3d33939b532ff7400cfdc1efa1",
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Accessibility",
Expand Down
14 changes: 7 additions & 7 deletions addons/actions/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-actions",
"version": "6.5.0-alpha.19",
"version": "6.5.0-alpha.21",
"description": "Get UI feedback when an action is performed on an interactive element",
"keywords": [
"storybook",
Expand Down Expand Up @@ -41,12 +41,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.5.0-alpha.19",
"@storybook/api": "6.5.0-alpha.19",
"@storybook/components": "6.5.0-alpha.19",
"@storybook/core-events": "6.5.0-alpha.19",
"@storybook/addons": "6.5.0-alpha.21",
"@storybook/api": "6.5.0-alpha.21",
"@storybook/components": "6.5.0-alpha.21",
"@storybook/core-events": "6.5.0-alpha.21",
"@storybook/csf": "0.0.2--canary.87bc651.0",
"@storybook/theming": "6.5.0-alpha.19",
"@storybook/theming": "6.5.0-alpha.21",
"core-js": "^3.8.2",
"fast-deep-equal": "^3.1.3",
"global": "^4.4.0",
Expand Down Expand Up @@ -79,7 +79,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "ce3592fc323ede3d33939b532ff7400cfdc1efa1",
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Actions",
Expand Down
16 changes: 8 additions & 8 deletions addons/backgrounds/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-backgrounds",
"version": "6.5.0-alpha.19",
"version": "6.5.0-alpha.21",
"description": "Switch backgrounds to view components in different settings",
"keywords": [
"addon",
Expand Down Expand Up @@ -45,13 +45,13 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.5.0-alpha.19",
"@storybook/api": "6.5.0-alpha.19",
"@storybook/client-logger": "6.5.0-alpha.19",
"@storybook/components": "6.5.0-alpha.19",
"@storybook/core-events": "6.5.0-alpha.19",
"@storybook/addons": "6.5.0-alpha.21",
"@storybook/api": "6.5.0-alpha.21",
"@storybook/client-logger": "6.5.0-alpha.21",
"@storybook/components": "6.5.0-alpha.21",
"@storybook/core-events": "6.5.0-alpha.21",
"@storybook/csf": "0.0.2--canary.87bc651.0",
"@storybook/theming": "6.5.0-alpha.19",
"@storybook/theming": "6.5.0-alpha.21",
"core-js": "^3.8.2",
"global": "^4.4.0",
"memoizerific": "^1.11.3",
Expand All @@ -77,7 +77,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "ce3592fc323ede3d33939b532ff7400cfdc1efa1",
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Backgrounds",
Expand Down
20 changes: 10 additions & 10 deletions addons/controls/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-controls",
"version": "6.5.0-alpha.19",
"version": "6.5.0-alpha.21",
"description": "Interact with component inputs dynamically in the Storybook UI",
"keywords": [
"addon",
Expand Down Expand Up @@ -45,15 +45,15 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.5.0-alpha.19",
"@storybook/api": "6.5.0-alpha.19",
"@storybook/client-logger": "6.5.0-alpha.19",
"@storybook/components": "6.5.0-alpha.19",
"@storybook/core-common": "6.5.0-alpha.19",
"@storybook/addons": "6.5.0-alpha.21",
"@storybook/api": "6.5.0-alpha.21",
"@storybook/client-logger": "6.5.0-alpha.21",
"@storybook/components": "6.5.0-alpha.21",
"@storybook/core-common": "6.5.0-alpha.21",
"@storybook/csf": "0.0.2--canary.87bc651.0",
"@storybook/node-logger": "6.5.0-alpha.19",
"@storybook/store": "6.5.0-alpha.19",
"@storybook/theming": "6.5.0-alpha.19",
"@storybook/node-logger": "6.5.0-alpha.21",
"@storybook/store": "6.5.0-alpha.21",
"@storybook/theming": "6.5.0-alpha.21",
"core-js": "^3.8.2",
"lodash": "^4.17.21",
"ts-dedent": "^2.0.0"
Expand All @@ -73,7 +73,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "ce3592fc323ede3d33939b532ff7400cfdc1efa1",
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"sbmodern": "dist/modern/register.js",
"storybook": {
"displayName": "Controls",
Expand Down
54 changes: 27 additions & 27 deletions addons/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-docs",
"version": "6.5.0-alpha.19",
"version": "6.5.0-alpha.21",
"description": "Document component usage and properties in Markdown",
"keywords": [
"addon",
Expand Down Expand Up @@ -63,21 +63,21 @@
"@mdx-js/loader": "^1.6.22",
"@mdx-js/mdx": "^1.6.22",
"@mdx-js/react": "^1.6.22",
"@storybook/addons": "6.5.0-alpha.19",
"@storybook/api": "6.5.0-alpha.19",
"@storybook/builder-webpack4": "6.5.0-alpha.19",
"@storybook/client-logger": "6.5.0-alpha.19",
"@storybook/components": "6.5.0-alpha.19",
"@storybook/core": "6.5.0-alpha.19",
"@storybook/core-events": "6.5.0-alpha.19",
"@storybook/addons": "6.5.0-alpha.21",
"@storybook/api": "6.5.0-alpha.21",
"@storybook/builder-webpack4": "6.5.0-alpha.21",
"@storybook/client-logger": "6.5.0-alpha.21",
"@storybook/components": "6.5.0-alpha.21",
"@storybook/core": "6.5.0-alpha.21",
"@storybook/core-events": "6.5.0-alpha.21",
"@storybook/csf": "0.0.2--canary.87bc651.0",
"@storybook/csf-tools": "6.5.0-alpha.19",
"@storybook/node-logger": "6.5.0-alpha.19",
"@storybook/postinstall": "6.5.0-alpha.19",
"@storybook/preview-web": "6.5.0-alpha.19",
"@storybook/source-loader": "6.5.0-alpha.19",
"@storybook/store": "6.5.0-alpha.19",
"@storybook/theming": "6.5.0-alpha.19",
"@storybook/csf-tools": "6.5.0-alpha.21",
"@storybook/node-logger": "6.5.0-alpha.21",
"@storybook/postinstall": "6.5.0-alpha.21",
"@storybook/preview-web": "6.5.0-alpha.21",
"@storybook/source-loader": "6.5.0-alpha.21",
"@storybook/store": "6.5.0-alpha.21",
"@storybook/theming": "6.5.0-alpha.21",
"acorn": "^7.4.1",
"acorn-jsx": "^5.3.1",
"acorn-walk": "^7.2.0",
Expand Down Expand Up @@ -106,11 +106,11 @@
"@babel/core": "^7.12.10",
"@emotion/core": "^10.3.1",
"@emotion/styled": "^10.0.27",
"@storybook/angular": "6.5.0-alpha.19",
"@storybook/html": "6.5.0-alpha.19",
"@storybook/react": "6.5.0-alpha.19",
"@storybook/vue": "6.5.0-alpha.19",
"@storybook/web-components": "6.5.0-alpha.19",
"@storybook/angular": "6.5.0-alpha.21",
"@storybook/html": "6.5.0-alpha.21",
"@storybook/react": "6.5.0-alpha.21",
"@storybook/vue": "6.5.0-alpha.21",
"@storybook/web-components": "6.5.0-alpha.21",
"@types/cross-spawn": "^6.0.2",
"@types/doctrine": "^0.0.3",
"@types/enzyme": "^3.10.8",
Expand Down Expand Up @@ -140,12 +140,12 @@
"zone.js": "^0.11.3"
},
"peerDependencies": {
"@storybook/angular": "6.5.0-alpha.19",
"@storybook/html": "6.5.0-alpha.19",
"@storybook/react": "6.5.0-alpha.19",
"@storybook/vue": "6.5.0-alpha.19",
"@storybook/vue3": "6.5.0-alpha.19",
"@storybook/web-components": "6.5.0-alpha.19",
"@storybook/angular": "6.5.0-alpha.21",
"@storybook/html": "6.5.0-alpha.21",
"@storybook/react": "6.5.0-alpha.21",
"@storybook/vue": "6.5.0-alpha.21",
"@storybook/vue3": "6.5.0-alpha.21",
"@storybook/web-components": "6.5.0-alpha.21",
"lit": "^2.0.0",
"lit-html": "^1.4.1 || ^2.0.0",
"react": "^16.8.0 || ^17.0.0",
Expand Down Expand Up @@ -202,7 +202,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "ce3592fc323ede3d33939b532ff7400cfdc1efa1",
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Docs",
Expand Down
32 changes: 16 additions & 16 deletions addons/essentials/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-essentials",
"version": "6.5.0-alpha.19",
"version": "6.5.0-alpha.21",
"description": "Curated addons to bring out the best of Storybook",
"keywords": [
"addon",
Expand Down Expand Up @@ -39,31 +39,31 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addon-actions": "6.5.0-alpha.19",
"@storybook/addon-backgrounds": "6.5.0-alpha.19",
"@storybook/addon-controls": "6.5.0-alpha.19",
"@storybook/addon-docs": "6.5.0-alpha.19",
"@storybook/addon-measure": "6.5.0-alpha.19",
"@storybook/addon-outline": "6.5.0-alpha.19",
"@storybook/addon-toolbars": "6.5.0-alpha.19",
"@storybook/addon-viewport": "6.5.0-alpha.19",
"@storybook/addons": "6.5.0-alpha.19",
"@storybook/api": "6.5.0-alpha.19",
"@storybook/node-logger": "6.5.0-alpha.19",
"@storybook/addon-actions": "6.5.0-alpha.21",
"@storybook/addon-backgrounds": "6.5.0-alpha.21",
"@storybook/addon-controls": "6.5.0-alpha.21",
"@storybook/addon-docs": "6.5.0-alpha.21",
"@storybook/addon-measure": "6.5.0-alpha.21",
"@storybook/addon-outline": "6.5.0-alpha.21",
"@storybook/addon-toolbars": "6.5.0-alpha.21",
"@storybook/addon-viewport": "6.5.0-alpha.21",
"@storybook/addons": "6.5.0-alpha.21",
"@storybook/api": "6.5.0-alpha.21",
"@storybook/node-logger": "6.5.0-alpha.21",
"core-js": "^3.8.2",
"regenerator-runtime": "^0.13.7",
"ts-dedent": "^2.0.0"
},
"devDependencies": {
"@babel/core": "^7.12.10",
"@storybook/vue": "6.5.0-alpha.19",
"@storybook/vue": "6.5.0-alpha.21",
"@types/jest": "^26.0.16",
"@types/webpack-env": "^1.16.0"
},
"peerDependencies": {
"@babel/core": "^7.9.6",
"@storybook/vue": "6.5.0-alpha.19",
"@storybook/web-components": "6.5.0-alpha.19",
"@storybook/vue": "6.5.0-alpha.21",
"@storybook/web-components": "6.5.0-alpha.21",
"babel-loader": "^8.0.0",
"lit-html": "^1.4.1 || ^2.0.0-rc.3",
"react": "^16.8.0 || ^17.0.0",
Expand Down Expand Up @@ -93,6 +93,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "ce3592fc323ede3d33939b532ff7400cfdc1efa1",
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"sbmodern": "dist/modern/index.js"
}
18 changes: 9 additions & 9 deletions addons/interactions/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-interactions",
"version": "6.5.0-alpha.19",
"version": "6.5.0-alpha.21",
"description": "Automate, test and debug user interactions",
"keywords": [
"storybook-addons",
Expand Down Expand Up @@ -41,14 +41,14 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.5.0-alpha.19",
"@storybook/api": "6.5.0-alpha.19",
"@storybook/components": "6.5.0-alpha.19",
"@storybook/core-common": "6.5.0-alpha.19",
"@storybook/core-events": "6.5.0-alpha.19",
"@storybook/addons": "6.5.0-alpha.21",
"@storybook/api": "6.5.0-alpha.21",
"@storybook/components": "6.5.0-alpha.21",
"@storybook/core-common": "6.5.0-alpha.21",
"@storybook/core-events": "6.5.0-alpha.21",
"@storybook/csf": "0.0.2--canary.87bc651.0",
"@storybook/instrumenter": "6.5.0-alpha.19",
"@storybook/theming": "6.5.0-alpha.19",
"@storybook/instrumenter": "6.5.0-alpha.21",
"@storybook/theming": "6.5.0-alpha.21",
"global": "^4.4.0",
"jest-mock": "^27.0.6",
"polished": "^4.0.5",
Expand All @@ -74,7 +74,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "ce3592fc323ede3d33939b532ff7400cfdc1efa1",
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Interactions",
Expand Down
14 changes: 7 additions & 7 deletions addons/jest/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-jest",
"version": "6.5.0-alpha.19",
"version": "6.5.0-alpha.21",
"description": "React storybook addon that show component jest report",
"keywords": [
"addon",
Expand Down Expand Up @@ -47,11 +47,11 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.5.0-alpha.19",
"@storybook/api": "6.5.0-alpha.19",
"@storybook/components": "6.5.0-alpha.19",
"@storybook/core-events": "6.5.0-alpha.19",
"@storybook/theming": "6.5.0-alpha.19",
"@storybook/addons": "6.5.0-alpha.21",
"@storybook/api": "6.5.0-alpha.21",
"@storybook/components": "6.5.0-alpha.21",
"@storybook/core-events": "6.5.0-alpha.21",
"@storybook/theming": "6.5.0-alpha.21",
"core-js": "^3.8.2",
"global": "^4.4.0",
"react-sizeme": "^3.0.1",
Expand All @@ -76,7 +76,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "ce3592fc323ede3d33939b532ff7400cfdc1efa1",
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Jest",
Expand Down
Loading

0 comments on commit 69a7dd1

Please sign in to comment.