Skip to content

Commit

Permalink
Merge branch 'next' into pr/17022
Browse files Browse the repository at this point in the history
  • Loading branch information
shilman committed Jan 3, 2022
2 parents 8c1c10f + 239687e commit 62ecebb
Show file tree
Hide file tree
Showing 147 changed files with 2,222 additions and 1,940 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Expand Up @@ -250,7 +250,7 @@ jobs:
cd ..
npx create-react-app cra-bench
cd cra-bench
npx @storybook/bench 'npx sb init' --label cra --extra-flags "--modern"
npx @storybook/bench@latest 'npx sb init' --label cra --extra-flags "--modern"
e2e-tests-pnp:
executor:
class: medium
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/tests-unit.yml
Expand Up @@ -10,10 +10,7 @@ on:
jobs:
build:
name: Core Unit Tests node-${{ matrix.node_version }}, ${{ matrix.os }}
if: |
${{ github.event.label.name == 'ci:matrix' ||
contains(github.event.pull_request.labels.*.name, 'ci:matrix') ||
github.event.type == 'push'}}
if: ${{ github.event.label.name == 'ci:matrix' || github.event.type == 'push' }}
strategy:
fail-fast: false
matrix:
Expand Down
24 changes: 23 additions & 1 deletion CHANGELOG.md
@@ -1,8 +1,30 @@
## 6.5.0-alpha.5 (December 23, 2021)

### Dependency Upgrades

- Update react-refresh@0.11.0 & react-refresh-webpack-plugin@0.5.3 same as cra5 ([#17056](https://github.com/storybookjs/storybook/pull/17056))

## 6.5.0-alpha.4 (December 18, 2021)

### Bug Fixes

- Angular: Fix for renamed method in angular 13.1 ([#17032](https://github.com/storybookjs/storybook/pull/17032))
- Source-loader: Fix node.declaration edge case ([#17027](https://github.com/storybookjs/storybook/pull/17027))
- Core: Fix debug output on webpack failures ([#16988](https://github.com/storybookjs/storybook/pull/16988))

### Maintenance

- Build: Run unit tests on more node versions, mac, and windows ([#16744](https://github.com/storybookjs/storybook/pull/16744))

### Dependency Upgrades

- Avoid referencing internal Emotion packages in built types ([#16905](https://github.com/storybookjs/storybook/pull/16905))

## 6.5.0-alpha.3 (December 9, 2021)

### Bug Fixes

* Core: Support custom PREVIEW URL for block story iframe ([#16773](https://github.com/storybookjs/storybook/pull/16773))
- Core: Support custom PREVIEW URL for block story iframe ([#16773](https://github.com/storybookjs/storybook/pull/16773))

## 6.5.0-alpha.2 (December 9, 2021)

Expand Down
2 changes: 1 addition & 1 deletion MIGRATION.md
Expand Up @@ -270,7 +270,7 @@ export default {
title: 'Components/Atoms/Button',
};

// ✅ undefined 6.3 KO / 7.0 OK
// ✅ undefined 6.3 OK / 7.0 OK
export default {
component: Button,
};
Expand Down
18 changes: 9 additions & 9 deletions addons/a11y/package.json
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-a11y",
"version": "6.5.0-alpha.3",
"version": "6.5.0-alpha.5",
"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.3",
"@storybook/api": "6.5.0-alpha.3",
"@storybook/channels": "6.5.0-alpha.3",
"@storybook/client-logger": "6.5.0-alpha.3",
"@storybook/components": "6.5.0-alpha.3",
"@storybook/core-events": "6.5.0-alpha.3",
"@storybook/addons": "6.5.0-alpha.5",
"@storybook/api": "6.5.0-alpha.5",
"@storybook/channels": "6.5.0-alpha.5",
"@storybook/client-logger": "6.5.0-alpha.5",
"@storybook/components": "6.5.0-alpha.5",
"@storybook/core-events": "6.5.0-alpha.5",
"@storybook/csf": "0.0.2--canary.87bc651.0",
"@storybook/theming": "6.5.0-alpha.3",
"@storybook/theming": "6.5.0-alpha.5",
"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": "4d971f7d493ecb388017a150a9943e87c7770d98",
"gitHead": "df18f2ad3794d61c59c6458f66f73635502b8963",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Accessibility",
Expand Down
14 changes: 7 additions & 7 deletions addons/actions/package.json
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-actions",
"version": "6.5.0-alpha.3",
"version": "6.5.0-alpha.5",
"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.3",
"@storybook/api": "6.5.0-alpha.3",
"@storybook/components": "6.5.0-alpha.3",
"@storybook/core-events": "6.5.0-alpha.3",
"@storybook/addons": "6.5.0-alpha.5",
"@storybook/api": "6.5.0-alpha.5",
"@storybook/components": "6.5.0-alpha.5",
"@storybook/core-events": "6.5.0-alpha.5",
"@storybook/csf": "0.0.2--canary.87bc651.0",
"@storybook/theming": "6.5.0-alpha.3",
"@storybook/theming": "6.5.0-alpha.5",
"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": "4d971f7d493ecb388017a150a9943e87c7770d98",
"gitHead": "df18f2ad3794d61c59c6458f66f73635502b8963",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Actions",
Expand Down
16 changes: 8 additions & 8 deletions addons/backgrounds/package.json
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-backgrounds",
"version": "6.5.0-alpha.3",
"version": "6.5.0-alpha.5",
"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.3",
"@storybook/api": "6.5.0-alpha.3",
"@storybook/client-logger": "6.5.0-alpha.3",
"@storybook/components": "6.5.0-alpha.3",
"@storybook/core-events": "6.5.0-alpha.3",
"@storybook/addons": "6.5.0-alpha.5",
"@storybook/api": "6.5.0-alpha.5",
"@storybook/client-logger": "6.5.0-alpha.5",
"@storybook/components": "6.5.0-alpha.5",
"@storybook/core-events": "6.5.0-alpha.5",
"@storybook/csf": "0.0.2--canary.87bc651.0",
"@storybook/theming": "6.5.0-alpha.3",
"@storybook/theming": "6.5.0-alpha.5",
"core-js": "^3.8.2",
"global": "^4.4.0",
"memoizerific": "^1.11.3",
Expand All @@ -77,7 +77,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "4d971f7d493ecb388017a150a9943e87c7770d98",
"gitHead": "df18f2ad3794d61c59c6458f66f73635502b8963",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Backgrounds",
Expand Down
20 changes: 10 additions & 10 deletions addons/controls/package.json
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-controls",
"version": "6.5.0-alpha.3",
"version": "6.5.0-alpha.5",
"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.3",
"@storybook/api": "6.5.0-alpha.3",
"@storybook/client-logger": "6.5.0-alpha.3",
"@storybook/components": "6.5.0-alpha.3",
"@storybook/core-common": "6.5.0-alpha.3",
"@storybook/addons": "6.5.0-alpha.5",
"@storybook/api": "6.5.0-alpha.5",
"@storybook/client-logger": "6.5.0-alpha.5",
"@storybook/components": "6.5.0-alpha.5",
"@storybook/core-common": "6.5.0-alpha.5",
"@storybook/csf": "0.0.2--canary.87bc651.0",
"@storybook/node-logger": "6.5.0-alpha.3",
"@storybook/store": "6.5.0-alpha.3",
"@storybook/theming": "6.5.0-alpha.3",
"@storybook/node-logger": "6.5.0-alpha.5",
"@storybook/store": "6.5.0-alpha.5",
"@storybook/theming": "6.5.0-alpha.5",
"core-js": "^3.8.2",
"lodash": "^4.17.21",
"ts-dedent": "^2.0.0"
Expand All @@ -73,7 +73,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "4d971f7d493ecb388017a150a9943e87c7770d98",
"gitHead": "df18f2ad3794d61c59c6458f66f73635502b8963",
"sbmodern": "dist/modern/register.js",
"storybook": {
"displayName": "Controls",
Expand Down
54 changes: 27 additions & 27 deletions addons/docs/package.json
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-docs",
"version": "6.5.0-alpha.3",
"version": "6.5.0-alpha.5",
"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.3",
"@storybook/api": "6.5.0-alpha.3",
"@storybook/builder-webpack4": "6.5.0-alpha.3",
"@storybook/client-logger": "6.5.0-alpha.3",
"@storybook/components": "6.5.0-alpha.3",
"@storybook/core": "6.5.0-alpha.3",
"@storybook/core-events": "6.5.0-alpha.3",
"@storybook/addons": "6.5.0-alpha.5",
"@storybook/api": "6.5.0-alpha.5",
"@storybook/builder-webpack4": "6.5.0-alpha.5",
"@storybook/client-logger": "6.5.0-alpha.5",
"@storybook/components": "6.5.0-alpha.5",
"@storybook/core": "6.5.0-alpha.5",
"@storybook/core-events": "6.5.0-alpha.5",
"@storybook/csf": "0.0.2--canary.87bc651.0",
"@storybook/csf-tools": "6.5.0-alpha.3",
"@storybook/node-logger": "6.5.0-alpha.3",
"@storybook/postinstall": "6.5.0-alpha.3",
"@storybook/preview-web": "6.5.0-alpha.3",
"@storybook/source-loader": "6.5.0-alpha.3",
"@storybook/store": "6.5.0-alpha.3",
"@storybook/theming": "6.5.0-alpha.3",
"@storybook/csf-tools": "6.5.0-alpha.5",
"@storybook/node-logger": "6.5.0-alpha.5",
"@storybook/postinstall": "6.5.0-alpha.5",
"@storybook/preview-web": "6.5.0-alpha.5",
"@storybook/source-loader": "6.5.0-alpha.5",
"@storybook/store": "6.5.0-alpha.5",
"@storybook/theming": "6.5.0-alpha.5",
"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.3",
"@storybook/html": "6.5.0-alpha.3",
"@storybook/react": "6.5.0-alpha.3",
"@storybook/vue": "6.5.0-alpha.3",
"@storybook/web-components": "6.5.0-alpha.3",
"@storybook/angular": "6.5.0-alpha.5",
"@storybook/html": "6.5.0-alpha.5",
"@storybook/react": "6.5.0-alpha.5",
"@storybook/vue": "6.5.0-alpha.5",
"@storybook/web-components": "6.5.0-alpha.5",
"@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.3",
"@storybook/html": "6.5.0-alpha.3",
"@storybook/react": "6.5.0-alpha.3",
"@storybook/vue": "6.5.0-alpha.3",
"@storybook/vue3": "6.5.0-alpha.3",
"@storybook/web-components": "6.5.0-alpha.3",
"@storybook/angular": "6.5.0-alpha.5",
"@storybook/html": "6.5.0-alpha.5",
"@storybook/react": "6.5.0-alpha.5",
"@storybook/vue": "6.5.0-alpha.5",
"@storybook/vue3": "6.5.0-alpha.5",
"@storybook/web-components": "6.5.0-alpha.5",
"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": "4d971f7d493ecb388017a150a9943e87c7770d98",
"gitHead": "df18f2ad3794d61c59c6458f66f73635502b8963",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Docs",
Expand Down
32 changes: 16 additions & 16 deletions addons/essentials/package.json
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-essentials",
"version": "6.5.0-alpha.3",
"version": "6.5.0-alpha.5",
"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.3",
"@storybook/addon-backgrounds": "6.5.0-alpha.3",
"@storybook/addon-controls": "6.5.0-alpha.3",
"@storybook/addon-docs": "6.5.0-alpha.3",
"@storybook/addon-measure": "6.5.0-alpha.3",
"@storybook/addon-outline": "6.5.0-alpha.3",
"@storybook/addon-toolbars": "6.5.0-alpha.3",
"@storybook/addon-viewport": "6.5.0-alpha.3",
"@storybook/addons": "6.5.0-alpha.3",
"@storybook/api": "6.5.0-alpha.3",
"@storybook/node-logger": "6.5.0-alpha.3",
"@storybook/addon-actions": "6.5.0-alpha.5",
"@storybook/addon-backgrounds": "6.5.0-alpha.5",
"@storybook/addon-controls": "6.5.0-alpha.5",
"@storybook/addon-docs": "6.5.0-alpha.5",
"@storybook/addon-measure": "6.5.0-alpha.5",
"@storybook/addon-outline": "6.5.0-alpha.5",
"@storybook/addon-toolbars": "6.5.0-alpha.5",
"@storybook/addon-viewport": "6.5.0-alpha.5",
"@storybook/addons": "6.5.0-alpha.5",
"@storybook/api": "6.5.0-alpha.5",
"@storybook/node-logger": "6.5.0-alpha.5",
"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.3",
"@storybook/vue": "6.5.0-alpha.5",
"@types/jest": "^26.0.16",
"@types/webpack-env": "^1.16.0"
},
"peerDependencies": {
"@babel/core": "^7.9.6",
"@storybook/vue": "6.5.0-alpha.3",
"@storybook/web-components": "6.5.0-alpha.3",
"@storybook/vue": "6.5.0-alpha.5",
"@storybook/web-components": "6.5.0-alpha.5",
"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": "4d971f7d493ecb388017a150a9943e87c7770d98",
"gitHead": "df18f2ad3794d61c59c6458f66f73635502b8963",
"sbmodern": "dist/modern/index.js"
}

0 comments on commit 62ecebb

Please sign in to comment.