Skip to content

Commit

Permalink
Merge branch 'next' into update-toolbar-button-styles
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelArestad committed Oct 28, 2021
2 parents 428bdd7 + d8ba74c commit 6705489
Show file tree
Hide file tree
Showing 132 changed files with 2,605 additions and 2,100 deletions.
16 changes: 8 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ executors:
environment:
NODE_OPTIONS: --max_old_space_size=3076
resource_class: <<parameters.class>>
sb_cypress_6_node_12:
sb_cypress_8_node_14:
parameters:
class:
description: The Resource class
Expand All @@ -37,8 +37,8 @@ executors:
working_directory: /tmp/storybook
docker:
# ⚠️ The Cypress docker image is based on Node.js one so be careful when updating it because it can also
# cause an upgrade of the Node.
- image: cypress/included:6.8.0
# cause an upgrade of Node.js version too. Cypress 8.5 image is based on Node.js 14
- image: cypress/included:8.7.0
environment:
NODE_OPTIONS: --max_old_space_size=3076
resource_class: <<parameters.class>>
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
e2e-tests-extended:
executor:
class: medium
name: sb_cypress_6_node_12
name: sb_cypress_8_node_14
parallelism: 4
steps:
- when:
Expand Down Expand Up @@ -203,7 +203,7 @@ jobs:
e2e-tests-core:
executor:
class: large
name: sb_cypress_6_node_12
name: sb_cypress_8_node_14
parallelism: 2
steps:
- git-shallow-clone/checkout_advanced:
Expand All @@ -229,7 +229,7 @@ jobs:
cra-bench:
executor:
class: medium
name: sb_cypress_6_node_12
name: sb_cypress_8_node_14
working_directory: /tmp/storybook
steps:
- git-shallow-clone/checkout_advanced:
Expand All @@ -253,7 +253,7 @@ jobs:
e2e-tests-pnp:
executor:
class: medium
name: sb_cypress_6_node_12
name: sb_cypress_8_node_14
working_directory: /tmp/storybook
steps:
- git-shallow-clone/checkout_advanced:
Expand All @@ -276,7 +276,7 @@ jobs:
e2e-tests-examples:
executor:
class: small
name: sb_cypress_6_node_12
name: sb_cypress_8_node_14
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
Expand Down
44 changes: 44 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,47 @@
## 6.4.0-beta.22 (October 28, 2021)

### Bug Fixes

- Addon-docs: Track code-level args changes in `ArgsTable` ([#16488](https://github.com/storybookjs/storybook/pull/16488))

### Maintenance

- Addon-a11y: Lazy load axe-core only when running tests ([#16484](https://github.com/storybookjs/storybook/pull/16484))
- Addon-docs: Lazy load Prettier in Vue and Angular ([#16459](https://github.com/storybookjs/storybook/pull/16459))

## 6.4.0-beta.21 (October 28, 2021)

### Features

- Core: Rerun loaders when args/globals change ([#16476](https://github.com/storybookjs/storybook/pull/16476))
- Interactions: move step debugger behind a feature flag ([#16481](https://github.com/storybookjs/storybook/pull/16481))

### Bug Fixes

- Core: Always update initial args when loading a story ([#16487](https://github.com/storybookjs/storybook/pull/16487))
- Core: Ensure we don't reset `WebPreview` if calling `start()` in v7 mode ([#16475](https://github.com/storybookjs/storybook/pull/16475))
- Core: Save and restore globals on preview init using the channel ([#16469](https://github.com/storybookjs/storybook/pull/16469))

### Maintenance

- CI: Upgrade Cypress and Node.js version used in e2e tests ([#16263](https://github.com/storybookjs/storybook/pull/16263))

### Dependency Upgrades

- Interactions: Use latest package versions ([#16464](https://github.com/storybookjs/storybook/pull/16464))

## 6.4.0-beta.20 (October 26, 2021)

### Bug Fixes

- Interactions: Do not cleanup state when loading initial story ([#16462](https://github.com/storybookjs/storybook/pull/16462))
- Addon-interactions: Add safety check on fileName parameter ([#16454](https://github.com/storybookjs/storybook/pull/16454))
- Core: Fix optional global features in PreviewWeb ([#16448](https://github.com/storybookjs/storybook/pull/16448))

### Maintenance

- UI: Migrate router to react-router ([#16440](https://github.com/storybookjs/storybook/pull/16440))

## 6.4.0-beta.19 (October 22, 2021)

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion MIGRATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -1616,7 +1616,7 @@ Solution:
```javascript
getStorybookUI({
...
asyncStorage: require('@react-native-community/async-storage').default || require('react-native').AsyncStorage || null
asyncStorage: require('@react-native-async-storage/async-storage').default || require('react-native').AsyncStorage || null
});
```

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.4.0-beta.19",
"version": "6.4.0-beta.22",
"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.4.0-beta.19",
"@storybook/api": "6.4.0-beta.19",
"@storybook/channels": "6.4.0-beta.19",
"@storybook/client-logger": "6.4.0-beta.19",
"@storybook/components": "6.4.0-beta.19",
"@storybook/core-events": "6.4.0-beta.19",
"@storybook/addons": "6.4.0-beta.22",
"@storybook/api": "6.4.0-beta.22",
"@storybook/channels": "6.4.0-beta.22",
"@storybook/client-logger": "6.4.0-beta.22",
"@storybook/components": "6.4.0-beta.22",
"@storybook/core-events": "6.4.0-beta.22",
"@storybook/csf": "0.0.2--canary.87bc651.0",
"@storybook/theming": "6.4.0-beta.19",
"@storybook/theming": "6.4.0-beta.22",
"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": "60b9bd1e5123938a66ad1ae25a8a63d03324a14d",
"gitHead": "680a207c0b7d5daee89633349c7320a3ac29b3c6",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Accessibility",
Expand Down
2 changes: 1 addition & 1 deletion addons/a11y/src/a11yRunner.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import global from 'global';
import axe from 'axe-core';
import { addons } from '@storybook/addons';
import { EVENTS } from './constants';
import { A11yParameters } from './params';
Expand Down Expand Up @@ -40,6 +39,7 @@ const run = async (storyId: string) => {
if (!active) {
active = true;
channel.emit(EVENTS.RUNNING);
const axe = await import('axe-core');

const { element = getElement(), config, options = {} } = input;
axe.reset();
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.4.0-beta.19",
"version": "6.4.0-beta.22",
"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.4.0-beta.19",
"@storybook/api": "6.4.0-beta.19",
"@storybook/components": "6.4.0-beta.19",
"@storybook/core-events": "6.4.0-beta.19",
"@storybook/addons": "6.4.0-beta.22",
"@storybook/api": "6.4.0-beta.22",
"@storybook/components": "6.4.0-beta.22",
"@storybook/core-events": "6.4.0-beta.22",
"@storybook/csf": "0.0.2--canary.87bc651.0",
"@storybook/theming": "6.4.0-beta.19",
"@storybook/theming": "6.4.0-beta.22",
"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": "60b9bd1e5123938a66ad1ae25a8a63d03324a14d",
"gitHead": "680a207c0b7d5daee89633349c7320a3ac29b3c6",
"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.4.0-beta.19",
"version": "6.4.0-beta.22",
"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.4.0-beta.19",
"@storybook/api": "6.4.0-beta.19",
"@storybook/client-logger": "6.4.0-beta.19",
"@storybook/components": "6.4.0-beta.19",
"@storybook/core-events": "6.4.0-beta.19",
"@storybook/addons": "6.4.0-beta.22",
"@storybook/api": "6.4.0-beta.22",
"@storybook/client-logger": "6.4.0-beta.22",
"@storybook/components": "6.4.0-beta.22",
"@storybook/core-events": "6.4.0-beta.22",
"@storybook/csf": "0.0.2--canary.87bc651.0",
"@storybook/theming": "6.4.0-beta.19",
"@storybook/theming": "6.4.0-beta.22",
"core-js": "^3.8.2",
"global": "^4.4.0",
"memoizerific": "^1.11.3",
Expand All @@ -77,7 +77,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "60b9bd1e5123938a66ad1ae25a8a63d03324a14d",
"gitHead": "680a207c0b7d5daee89633349c7320a3ac29b3c6",
"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.4.0-beta.19",
"version": "6.4.0-beta.22",
"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.4.0-beta.19",
"@storybook/api": "6.4.0-beta.19",
"@storybook/client-logger": "6.4.0-beta.19",
"@storybook/components": "6.4.0-beta.19",
"@storybook/core-common": "6.4.0-beta.19",
"@storybook/addons": "6.4.0-beta.22",
"@storybook/api": "6.4.0-beta.22",
"@storybook/client-logger": "6.4.0-beta.22",
"@storybook/components": "6.4.0-beta.22",
"@storybook/core-common": "6.4.0-beta.22",
"@storybook/csf": "0.0.2--canary.87bc651.0",
"@storybook/node-logger": "6.4.0-beta.19",
"@storybook/store": "6.4.0-beta.19",
"@storybook/theming": "6.4.0-beta.19",
"@storybook/node-logger": "6.4.0-beta.22",
"@storybook/store": "6.4.0-beta.22",
"@storybook/theming": "6.4.0-beta.22",
"core-js": "^3.8.2",
"lodash": "^4.17.20",
"ts-dedent": "^2.0.0"
Expand All @@ -73,7 +73,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "60b9bd1e5123938a66ad1ae25a8a63d03324a14d",
"gitHead": "680a207c0b7d5daee89633349c7320a3ac29b3c6",
"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.4.0-beta.19",
"version": "6.4.0-beta.22",
"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.4.0-beta.19",
"@storybook/api": "6.4.0-beta.19",
"@storybook/builder-webpack4": "6.4.0-beta.19",
"@storybook/client-logger": "6.4.0-beta.19",
"@storybook/components": "6.4.0-beta.19",
"@storybook/core": "6.4.0-beta.19",
"@storybook/core-events": "6.4.0-beta.19",
"@storybook/addons": "6.4.0-beta.22",
"@storybook/api": "6.4.0-beta.22",
"@storybook/builder-webpack4": "6.4.0-beta.22",
"@storybook/client-logger": "6.4.0-beta.22",
"@storybook/components": "6.4.0-beta.22",
"@storybook/core": "6.4.0-beta.22",
"@storybook/core-events": "6.4.0-beta.22",
"@storybook/csf": "0.0.2--canary.87bc651.0",
"@storybook/csf-tools": "6.4.0-beta.19",
"@storybook/node-logger": "6.4.0-beta.19",
"@storybook/postinstall": "6.4.0-beta.19",
"@storybook/preview-web": "6.4.0-beta.19",
"@storybook/source-loader": "6.4.0-beta.19",
"@storybook/store": "6.4.0-beta.19",
"@storybook/theming": "6.4.0-beta.19",
"@storybook/csf-tools": "6.4.0-beta.22",
"@storybook/node-logger": "6.4.0-beta.22",
"@storybook/postinstall": "6.4.0-beta.22",
"@storybook/preview-web": "6.4.0-beta.22",
"@storybook/source-loader": "6.4.0-beta.22",
"@storybook/store": "6.4.0-beta.22",
"@storybook/theming": "6.4.0-beta.22",
"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.1.1",
"@emotion/styled": "^10.0.27",
"@storybook/angular": "6.4.0-beta.19",
"@storybook/html": "6.4.0-beta.19",
"@storybook/react": "6.4.0-beta.19",
"@storybook/vue": "6.4.0-beta.19",
"@storybook/web-components": "6.4.0-beta.19",
"@storybook/angular": "6.4.0-beta.22",
"@storybook/html": "6.4.0-beta.22",
"@storybook/react": "6.4.0-beta.22",
"@storybook/vue": "6.4.0-beta.22",
"@storybook/web-components": "6.4.0-beta.22",
"@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.4.0-beta.19",
"@storybook/html": "6.4.0-beta.19",
"@storybook/react": "6.4.0-beta.19",
"@storybook/vue": "6.4.0-beta.19",
"@storybook/vue3": "6.4.0-beta.19",
"@storybook/web-components": "6.4.0-beta.19",
"@storybook/angular": "6.4.0-beta.22",
"@storybook/html": "6.4.0-beta.22",
"@storybook/react": "6.4.0-beta.22",
"@storybook/vue": "6.4.0-beta.22",
"@storybook/vue3": "6.4.0-beta.22",
"@storybook/web-components": "6.4.0-beta.22",
"lit": "^2.0.0-rc.1",
"lit-html": "^1.4.1 || ^2.0.0-rc.3",
"react": "^16.8.0 || ^17.0.0",
Expand Down Expand Up @@ -202,7 +202,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "60b9bd1e5123938a66ad1ae25a8a63d03324a14d",
"gitHead": "680a207c0b7d5daee89633349c7320a3ac29b3c6",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Docs",
Expand Down
Loading

0 comments on commit 6705489

Please sign in to comment.