Skip to content

Commit

Permalink
Merge branch 'next' into ts-migration/channel-websocket
Browse files Browse the repository at this point in the history
  • Loading branch information
kroeder committed Dec 27, 2018
2 parents a9bbbe6 + 87c6d93 commit 56f4adb
Show file tree
Hide file tree
Showing 132 changed files with 3,956 additions and 4,319 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ lib/cli/test
*.bundle.js
*.js.map
*.ts
*.tsx

!.remarkrc.js
!.babelrc.js
Expand Down
90 changes: 90 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,93 @@

## 4.1.4 (December 25, 2018)

### Bug Fixes

* Core: Load Symbol polyfill before any other code ([#5082](https://github.com/storybooks/storybook/pull/5082))
* React: Fix error with new CRA Webpack config ([#5074](https://github.com/storybooks/storybook/pull/5074))

## 4.2.0-alpha.7 (December 25, 2018)

### Bug Fixes

* React: Fix error with new CRA Webpack config ([#5074](https://github.com/storybooks/storybook/pull/5074))
* Core: Load Symbol polyfill before any other code ([#5082](https://github.com/storybooks/storybook/pull/5082))

### Dependency Upgrades

* Bump eslint-plugin-jest from 21.27.2 to 22.1.2 ([#5089](https://github.com/storybooks/storybook/pull/5089))
* Bump react-color from 2.14.1 to 2.17.0 ([#5083](https://github.com/storybooks/storybook/pull/5083))
* Bump @angular-devkit/build-angular from 0.10.7 to 0.11.4 ([#5084](https://github.com/storybooks/storybook/pull/5084))
* Bump ts-loader from 5.3.1 to 5.3.2 ([#5085](https://github.com/storybooks/storybook/pull/5085))
* Bump loader-utils from 1.1.0 to 1.2.0 ([#5086](https://github.com/storybooks/storybook/pull/5086))
* Bump protractor from 5.4.1 to 5.4.2 ([#5087](https://github.com/storybooks/storybook/pull/5087))
* Bump ember-cli from 3.5.1 to 3.6.0 ([#5088](https://github.com/storybooks/storybook/pull/5088))
* Bump tslint from 5.11.0 to 5.12.0 ([#5090](https://github.com/storybooks/storybook/pull/5090))
* Bump react-dom from 16.6.3 to 16.7.0 ([#5071](https://github.com/storybooks/storybook/pull/5071))

## 4.1.3 (December 20, 2018)

### Bug Fixes

* React: remove unnecessary dependencies, fix aliasing ([#5047](https://github.com/storybooks/storybook/pull/5047))
* React: alias to react & react-dom ([#5016](https://github.com/storybooks/storybook/pull/5016))
* Addon-knobs: Fix color picker display ([#5010](https://github.com/storybooks/storybook/pull/5010))

## 4.2.0-alpha.6 (December 20, 2018)

### Features

* React-Native: Change on-device layout to absolute position ([#4962](https://github.com/storybooks/storybook/pull/4962))
* Addon-Info: add css classes for style overrides ([#4589](https://github.com/storybooks/storybook/pull/4589))

### Bug Fixes

* Addon-Info: Display description when story name matches component ([#4863](https://github.com/storybooks/storybook/pull/4863))
* React-Native: Disable warning if story is not set in async storage ([#5068](https://github.com/storybooks/storybook/pull/5068))
* React-Native: Fixed isUIHidden param ([#5067](https://github.com/storybooks/storybook/pull/5067))
* Vue: Fix reloading and story decoration ([#5057](https://github.com/storybooks/storybook/pull/5057))

### Maintenance

* TypeScript: migrate @storybook/channels to typescript ([#4977](https://github.com/storybooks/storybook/pull/4977))

### Dependency Upgrades

* Bump babel-plugin-macros from 2.4.2 to 2.4.3 ([#5060](https://github.com/storybooks/storybook/pull/5060))
* Bump @babel/core from 7.2.0 to 7.2.2 ([#5059](https://github.com/storybooks/storybook/pull/5059))
* Bump ember-cli-htmlbars-inline-precompile from 1.0.5 to 2.1.0 ([#5064](https://github.com/storybooks/storybook/pull/5064))
* Bump react-test-renderer from 16.6.3 to 16.7.0 ([#5063](https://github.com/storybooks/storybook/pull/5063))
* Bump autoprefixer from 9.4.2 to 9.4.3 ([#5061](https://github.com/storybooks/storybook/pull/5061))

## 4.2.0-alpha.5 (December 19, 2018)

### Bug Fixes

* React: Remove unnecessary dependencies, fix aliasing ([#5047](https://github.com/storybooks/storybook/pull/5047))

### Dependency Upgrades

* Bump @types/node from 10.12.14 to 10.12.17 ([#5045](https://github.com/storybooks/storybook/pull/5045))
* Bump ember-source from 3.5.1 to 3.6.1 ([#5044](https://github.com/storybooks/storybook/pull/5044))

## 4.2.0-alpha.4 (December 18, 2018)

### Bug Fixes

* React: fix alias for react(-dom) to resolve to the user's version ([#5042](https://github.com/storybooks/storybook/pull/5042))

### Dependency Upgrades

* Bump husky from 1.2.0 to 1.3.0 ([#5038](https://github.com/storybooks/storybook/pull/5038))
* Bump fork-ts-checker-webpack-plugin from 0.4.15 to 0.5.2 ([#5037](https://github.com/storybooks/storybook/pull/5037))

## 4.2.0-alpha.3 (December 18, 2018)

### Bug Fixes

* React: add alias to react & react-dom ([#5016](https://github.com/storybooks/storybook/pull/5016))
* Addon-knobs: fix color picker display ([#5010](https://github.com/storybooks/storybook/pull/5010))

## 4.2.0-alpha.2 (December 16, 2018)

### Features
Expand Down
10 changes: 5 additions & 5 deletions addons/a11y/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-a11y",
"version": "4.2.0-alpha.2",
"version": "4.2.0-alpha.7",
"description": "a11y addon for storybook",
"keywords": [
"a11y",
Expand All @@ -26,10 +26,10 @@
},
"dependencies": {
"@emotion/styled": "^0.10.6",
"@storybook/addons": "4.2.0-alpha.2",
"@storybook/client-logger": "4.2.0-alpha.2",
"@storybook/components": "4.2.0-alpha.2",
"@storybook/core-events": "4.2.0-alpha.2",
"@storybook/addons": "4.2.0-alpha.7",
"@storybook/client-logger": "4.2.0-alpha.7",
"@storybook/components": "4.2.0-alpha.7",
"@storybook/core-events": "4.2.0-alpha.7",
"axe-core": "^3.1.2",
"core-js": "^2.5.7",
"global": "^4.3.2",
Expand Down
8 changes: 4 additions & 4 deletions addons/actions/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-actions",
"version": "4.2.0-alpha.2",
"version": "4.2.0-alpha.7",
"description": "Action Logger addon for storybook",
"keywords": [
"storybook"
Expand All @@ -23,9 +23,9 @@
"@emotion/core": "^0.13.1",
"@emotion/provider": "^0.11.2",
"@emotion/styled": "^0.10.6",
"@storybook/addons": "4.2.0-alpha.2",
"@storybook/components": "4.2.0-alpha.2",
"@storybook/core-events": "4.2.0-alpha.2",
"@storybook/addons": "4.2.0-alpha.7",
"@storybook/components": "4.2.0-alpha.7",
"@storybook/core-events": "4.2.0-alpha.7",
"core-js": "^2.5.7",
"deep-equal": "^1.0.1",
"global": "^4.3.2",
Expand Down
6 changes: 3 additions & 3 deletions addons/backgrounds/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-backgrounds",
"version": "4.2.0-alpha.2",
"version": "4.2.0-alpha.7",
"description": "A storybook addon to show different backgrounds for your preview",
"keywords": [
"addon",
Expand All @@ -25,8 +25,8 @@
},
"dependencies": {
"@emotion/styled": "^0.10.6",
"@storybook/addons": "4.2.0-alpha.2",
"@storybook/core-events": "4.2.0-alpha.2",
"@storybook/addons": "4.2.0-alpha.7",
"@storybook/core-events": "4.2.0-alpha.7",
"core-js": "^2.5.7",
"eventemitter3": "^3.1.0",
"global": "^4.3.2",
Expand Down
2 changes: 1 addition & 1 deletion addons/backgrounds/src/__tests__/BackgroundPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ describe('Background Panel', () => {
mount(<BackgroundPanel channel={SpiedChannel} api={mockedApi} active />);
SpiedChannel.emit(Events.SET, backgrounds);

expect(mockedApi.getQueryParam).toBeCalledWith('background');
expect(mockedApi.getQueryParam).toHaveBeenCalledWith('background');
});

it('should not unset the query string', () => {
Expand Down
2 changes: 1 addition & 1 deletion addons/backgrounds/src/__tests__/Swatch.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ describe('Swatch', () => {
const swatch = mount(<Swatch value="#e6e6e6" name="Gray" setBackground={spy} />);
swatch.simulate('click');

expect(spy).toBeCalledWith('#e6e6e6');
expect(spy).toHaveBeenCalledWith('#e6e6e6');
});
});
2 changes: 1 addition & 1 deletion addons/centered/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-centered",
"version": "4.2.0-alpha.2",
"version": "4.2.0-alpha.7",
"description": "Storybook decorator to center components",
"keywords": [
"addon",
Expand Down
8 changes: 4 additions & 4 deletions addons/cssresources/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-cssresources",
"version": "4.2.0-alpha.2",
"version": "4.2.0-alpha.7",
"description": "A storybook addon to switch between css resources at runtime for your story",
"keywords": [
"addon",
Expand All @@ -25,9 +25,9 @@
},
"dependencies": {
"@emotion/styled": "0.10.6",
"@storybook/addons": "4.2.0-alpha.2",
"@storybook/components": "4.2.0-alpha.2",
"@storybook/core-events": "4.2.0-alpha.2",
"@storybook/addons": "4.2.0-alpha.7",
"@storybook/components": "4.2.0-alpha.7",
"@storybook/core-events": "4.2.0-alpha.7",
"core-js": "^2.5.7",
"global": "^4.3.2",
"prop-types": "^15.6.2",
Expand Down
6 changes: 3 additions & 3 deletions addons/events/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-events",
"version": "4.2.0-alpha.2",
"version": "4.2.0-alpha.7",
"description": "Add events to your Storybook stories.",
"keywords": [
"addon",
Expand All @@ -24,8 +24,8 @@
},
"dependencies": {
"@emotion/styled": "^0.10.6",
"@storybook/addons": "4.2.0-alpha.2",
"@storybook/core-events": "4.2.0-alpha.2",
"@storybook/addons": "4.2.0-alpha.7",
"@storybook/core-events": "4.2.0-alpha.7",
"core-js": "^2.5.7",
"format-json": "^1.0.3",
"prop-types": "^15.6.2",
Expand Down
4 changes: 2 additions & 2 deletions addons/google-analytics/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-google-analytics",
"version": "4.2.0-alpha.2",
"version": "4.2.0-alpha.7",
"description": "Storybook addon for google analytics",
"keywords": [
"addon",
Expand All @@ -21,7 +21,7 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "4.2.0-alpha.2",
"@storybook/addons": "4.2.0-alpha.7",
"core-js": "^2.5.7",
"global": "^4.3.2",
"react-ga": "^2.5.3"
Expand Down
2 changes: 1 addition & 1 deletion addons/graphql/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-graphql",
"version": "4.2.0-alpha.2",
"version": "4.2.0-alpha.7",
"description": "Storybook addon to display the GraphiQL IDE",
"keywords": [
"addon",
Expand Down
10 changes: 5 additions & 5 deletions addons/info/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-info",
"version": "4.2.0-alpha.2",
"version": "4.2.0-alpha.7",
"description": "A Storybook addon to show additional information for your stories.",
"keywords": [
"addon",
Expand All @@ -22,9 +22,9 @@
},
"dependencies": {
"@emotion/styled": "^0.10.6",
"@storybook/addons": "4.2.0-alpha.2",
"@storybook/client-logger": "4.2.0-alpha.2",
"@storybook/components": "4.2.0-alpha.2",
"@storybook/addons": "4.2.0-alpha.7",
"@storybook/client-logger": "4.2.0-alpha.7",
"@storybook/components": "4.2.0-alpha.7",
"core-js": "^2.5.7",
"global": "^4.3.2",
"marksy": "^6.1.0",
Expand All @@ -36,7 +36,7 @@
"util-deprecate": "^1.0.2"
},
"devDependencies": {
"react-test-renderer": "^16.6.0"
"react-test-renderer": "^16.7.0"
},
"peerDependencies": {
"react": "*"
Expand Down
Loading

0 comments on commit 56f4adb

Please sign in to comment.