Skip to content

Commit

Permalink
Merge branch 'next' into feature/emberCli
Browse files Browse the repository at this point in the history
  • Loading branch information
shilman committed Apr 10, 2021
2 parents 2f9f825 + 9e3fce5 commit 4b7ec9f
Show file tree
Hide file tree
Showing 162 changed files with 1,711 additions and 1,512 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
.yarn/releases/yarn-*.js linguist-generated=true
/.yarn/** linguist-generated
8 changes: 8 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-typescript.cjs

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ nodeLinker: node-modules

npmRegistryServer: "https://registry.yarnpkg.com"

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
spec: "@yarnpkg/plugin-typescript"

unsafeHttpWhitelist:
- localhost

Expand Down
49 changes: 49 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,52 @@
## 6.3.0-alpha.4 (April 10, 2021)

### Features

- Core: Expose Server instance through the pluggable Builder API ([#14468](https://github.com/storybookjs/storybook/pull/14468))

### Maintenance

- Core: Don't shadow the window global variable ([#14472](https://github.com/storybookjs/storybook/pull/14472))

## 6.3.0-alpha.3 (April 10, 2021)

### Features

- UI: Support `*` wildcard option in storySort order array ([#14531](https://github.com/storybookjs/storybook/pull/14531))

### Bug Fixes

- UI: Add show toolbar T in menu ([#14437](https://github.com/storybookjs/storybook/pull/14437))

### Maintenance

- Refactor: Replace `lodash/range` with `Array.from` ([#14323](https://github.com/storybookjs/storybook/pull/14323))
- Maintenance: Add TypeScript plugin for Yarn ([#14534](https://github.com/storybookjs/storybook/pull/14534))

## 6.2.7 (April 9, 2021)

### Bug Fixes

- CLI: Fix prerelease upgrade ([#14529](https://github.com/storybookjs/storybook/pull/14529))

## 6.3.0-alpha.2 (April 9, 2021)

### Features

- Web-components: Add full reload listening to server-side-events ([#14445](https://github.com/storybookjs/storybook/pull/14445))
- Core: Pass watchOptions from webpack config to webpackDevMiddleware ([#14461](https://github.com/storybookjs/storybook/pull/14461))

### Bug Fixes

- CLI: Fix prerelease upgrade ([#14529](https://github.com/storybookjs/storybook/pull/14529))

## 6.2.6 (April 9, 2021)

### Bug Fixes

- Core: Allow string in object arg and support fractional numbers in URL args ([#14511](https://github.com/storybookjs/storybook/pull/14511))
- UI: Skip duplicate storyId breaking sidebar ([#14502](https://github.com/storybookjs/storybook/pull/14502))

## 6.3.0-alpha.1 (April 9, 2021)

### Features
Expand Down
20 changes: 10 additions & 10 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.3.0-alpha.1",
"version": "6.3.0-alpha.4",
"description": "Test component compliance with web accessibility standards",
"keywords": [
"a11y",
Expand Down Expand Up @@ -41,14 +41,14 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.3.0-alpha.1",
"@storybook/api": "6.3.0-alpha.1",
"@storybook/channels": "6.3.0-alpha.1",
"@storybook/client-api": "6.3.0-alpha.1",
"@storybook/client-logger": "6.3.0-alpha.1",
"@storybook/components": "6.3.0-alpha.1",
"@storybook/core-events": "6.3.0-alpha.1",
"@storybook/theming": "6.3.0-alpha.1",
"@storybook/addons": "6.3.0-alpha.4",
"@storybook/api": "6.3.0-alpha.4",
"@storybook/channels": "6.3.0-alpha.4",
"@storybook/client-api": "6.3.0-alpha.4",
"@storybook/client-logger": "6.3.0-alpha.4",
"@storybook/components": "6.3.0-alpha.4",
"@storybook/core-events": "6.3.0-alpha.4",
"@storybook/theming": "6.3.0-alpha.4",
"axe-core": "^4.1.1",
"core-js": "^3.8.2",
"global": "^4.4.0",
Expand Down Expand Up @@ -77,7 +77,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "7d99c9e0bf8b8db56b16bca470c9f27245df5a39",
"gitHead": "157857bbe17910be4c5cdf6f75a39dfe9b17becb",
"storybook": {
"displayName": "Accessibility",
"icon": "https://user-images.githubusercontent.com/263385/101991665-47042f80-3c7c-11eb-8f00-64b5a18f498a.png",
Expand Down
4 changes: 2 additions & 2 deletions addons/a11y/src/a11yRunner.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { document, window } from 'global';
import { document, window as globalWindow } from 'global';
import axe from 'axe-core';
import addons from '@storybook/addons';
import { EVENTS } from './constants';
Expand Down Expand Up @@ -66,7 +66,7 @@ const run = async (storyId: string) => {

/** Returns story parameters or default ones. */
const getParams = (storyId: string): A11yParameters => {
const { parameters } = window.__STORYBOOK_STORY_STORE__.fromId(storyId) || {};
const { parameters } = globalWindow.__STORYBOOK_STORY_STORE__.fromId(storyId) || {};
return (
parameters.a11y || {
config: {},
Expand Down
16 changes: 8 additions & 8 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.3.0-alpha.1",
"version": "6.3.0-alpha.4",
"description": "Get UI feedback when an action is performed on an interactive element",
"keywords": [
"storybook",
Expand Down Expand Up @@ -37,12 +37,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.3.0-alpha.1",
"@storybook/api": "6.3.0-alpha.1",
"@storybook/client-api": "6.3.0-alpha.1",
"@storybook/components": "6.3.0-alpha.1",
"@storybook/core-events": "6.3.0-alpha.1",
"@storybook/theming": "6.3.0-alpha.1",
"@storybook/addons": "6.3.0-alpha.4",
"@storybook/api": "6.3.0-alpha.4",
"@storybook/client-api": "6.3.0-alpha.4",
"@storybook/components": "6.3.0-alpha.4",
"@storybook/core-events": "6.3.0-alpha.4",
"@storybook/theming": "6.3.0-alpha.4",
"core-js": "^3.8.2",
"fast-deep-equal": "^3.1.3",
"global": "^4.4.0",
Expand Down Expand Up @@ -74,7 +74,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "7d99c9e0bf8b8db56b16bca470c9f27245df5a39",
"gitHead": "157857bbe17910be4c5cdf6f75a39dfe9b17becb",
"storybook": {
"displayName": "Actions",
"unsupportedFrameworks": [
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.3.0-alpha.1",
"version": "6.3.0-alpha.4",
"description": "Switch backgrounds to view components in different settings",
"keywords": [
"addon",
Expand Down Expand Up @@ -41,12 +41,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.3.0-alpha.1",
"@storybook/api": "6.3.0-alpha.1",
"@storybook/client-logger": "6.3.0-alpha.1",
"@storybook/components": "6.3.0-alpha.1",
"@storybook/core-events": "6.3.0-alpha.1",
"@storybook/theming": "6.3.0-alpha.1",
"@storybook/addons": "6.3.0-alpha.4",
"@storybook/api": "6.3.0-alpha.4",
"@storybook/client-logger": "6.3.0-alpha.4",
"@storybook/components": "6.3.0-alpha.4",
"@storybook/core-events": "6.3.0-alpha.4",
"@storybook/theming": "6.3.0-alpha.4",
"core-js": "^3.8.2",
"global": "^4.4.0",
"memoizerific": "^1.11.3",
Expand All @@ -72,7 +72,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "7d99c9e0bf8b8db56b16bca470c9f27245df5a39",
"gitHead": "157857bbe17910be4c5cdf6f75a39dfe9b17becb",
"storybook": {
"displayName": "Backgrounds",
"icon": "https://user-images.githubusercontent.com/263385/101991667-479cc600-3c7c-11eb-96d3-410e936252e7.png",
Expand Down
5 changes: 2 additions & 3 deletions addons/controls/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,14 @@ Basic.args = { label: 'hello' };
Similarly, we can also consider a story that uses knob inputs to change its behavior:

```jsx
import range from 'lodash/range';
import { number, text } from '@storybook/addon-knobs';

export const Reflow = () => {
const count = number('Count', 10, { min: 0, max: 100, range: true });
const label = text('Label', 'reflow');
return (
<>
{range(count).map((i) => (
{Array.from({ length: count }, (_, i) => (
<Button label={`button ${i}`} />
))}
</>
Expand All @@ -97,7 +96,7 @@ And again, as above, this can be rewritten using [fully custom args](https://sto

```jsx
export const Reflow = ({ count, label, ...args }) => (
<>{range(count).map((i) => <Button label={`${label} ${i}` {...args}} />)}</>
<>{Array.from({ length: count }, (_, i) => <Button label={`${label} ${i}` {...args}} />)}</>
);
Reflow.args = { count: 3, label: 'reflow' };
Reflow.argTypes = {
Expand Down
16 changes: 8 additions & 8 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.3.0-alpha.1",
"version": "6.3.0-alpha.4",
"description": "Interact with component inputs dynamically in the Storybook UI",
"keywords": [
"addon",
Expand Down Expand Up @@ -41,12 +41,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.3.0-alpha.1",
"@storybook/api": "6.3.0-alpha.1",
"@storybook/client-api": "6.3.0-alpha.1",
"@storybook/components": "6.3.0-alpha.1",
"@storybook/node-logger": "6.3.0-alpha.1",
"@storybook/theming": "6.3.0-alpha.1",
"@storybook/addons": "6.3.0-alpha.4",
"@storybook/api": "6.3.0-alpha.4",
"@storybook/client-api": "6.3.0-alpha.4",
"@storybook/components": "6.3.0-alpha.4",
"@storybook/node-logger": "6.3.0-alpha.4",
"@storybook/theming": "6.3.0-alpha.4",
"core-js": "^3.8.2",
"ts-dedent": "^2.0.0"
},
Expand All @@ -65,7 +65,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "7d99c9e0bf8b8db56b16bca470c9f27245df5a39",
"gitHead": "157857bbe17910be4c5cdf6f75a39dfe9b17becb",
"storybook": {
"displayName": "Controls",
"icon": "https://user-images.githubusercontent.com/263385/101991669-479cc600-3c7c-11eb-93d9-38b67e8371f2.png",
Expand Down
14 changes: 7 additions & 7 deletions addons/cssresources/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-cssresources",
"version": "6.3.0-alpha.1",
"version": "6.3.0-alpha.4",
"description": "A storybook addon to switch between css resources at runtime for your story",
"keywords": [
"addon",
Expand Down Expand Up @@ -40,11 +40,11 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.3.0-alpha.1",
"@storybook/api": "6.3.0-alpha.1",
"@storybook/components": "6.3.0-alpha.1",
"@storybook/core-events": "6.3.0-alpha.1",
"@storybook/theming": "6.3.0-alpha.1",
"@storybook/addons": "6.3.0-alpha.4",
"@storybook/api": "6.3.0-alpha.4",
"@storybook/components": "6.3.0-alpha.4",
"@storybook/core-events": "6.3.0-alpha.4",
"@storybook/theming": "6.3.0-alpha.4",
"core-js": "^3.8.2",
"global": "^4.4.0",
"regenerator-runtime": "^0.13.7"
Expand All @@ -67,7 +67,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "7d99c9e0bf8b8db56b16bca470c9f27245df5a39",
"gitHead": "157857bbe17910be4c5cdf6f75a39dfe9b17becb",
"storybook": {
"displayName": "CSS Resources",
"unsupportedFrameworks": [
Expand Down
16 changes: 8 additions & 8 deletions addons/design-assets/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-design-assets",
"version": "6.3.0-alpha.1",
"version": "6.3.0-alpha.4",
"description": "Design asset preview for storybook",
"keywords": [
"addon",
Expand Down Expand Up @@ -41,12 +41,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.3.0-alpha.1",
"@storybook/api": "6.3.0-alpha.1",
"@storybook/client-logger": "6.3.0-alpha.1",
"@storybook/components": "6.3.0-alpha.1",
"@storybook/core-events": "6.3.0-alpha.1",
"@storybook/theming": "6.3.0-alpha.1",
"@storybook/addons": "6.3.0-alpha.4",
"@storybook/api": "6.3.0-alpha.4",
"@storybook/client-logger": "6.3.0-alpha.4",
"@storybook/components": "6.3.0-alpha.4",
"@storybook/core-events": "6.3.0-alpha.4",
"@storybook/theming": "6.3.0-alpha.4",
"core-js": "^3.8.2",
"global": "^4.4.0",
"regenerator-runtime": "^0.13.7",
Expand All @@ -68,7 +68,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "7d99c9e0bf8b8db56b16bca470c9f27245df5a39",
"gitHead": "157857bbe17910be4c5cdf6f75a39dfe9b17becb",
"storybook": {
"displayName": "Design assets",
"unsupportedFrameworks": [
Expand Down
Loading

0 comments on commit 4b7ec9f

Please sign in to comment.