Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/tech/overhaul-ui' into tech/over…
Browse files Browse the repository at this point in the history
…haul-ui-new-storyId
  • Loading branch information
Tom Coleman committed Dec 30, 2018
2 parents 6ac24f3 + 7f5d1e8 commit 673f015
Show file tree
Hide file tree
Showing 312 changed files with 25,212 additions and 37,684 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
14 changes: 8 additions & 6 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ module.exports = {
allowBind: true,
},
],
'jsx-a11y/accessible-emoji': ignore,
'jsx-a11y/label-has-associated-control': [
warn,
{
Expand All @@ -85,7 +86,7 @@ module.exports = {
'jsx-a11y/anchor-is-valid': [
error,
{
components: ['RoutedLink', 'LinkTo', 'Link'],
components: ['A', 'LinkTo', 'Link'],
specialLink: ['overrideParams', 'kind', 'story', 'to'],
},
],
Expand All @@ -96,15 +97,16 @@ module.exports = {
},
overrides: [
{
files: ['**/__tests__/**', '**/*.test.js/**', '**/*.stories.js'],
files: [
'**/__tests__/**',
'**/*.test.js/**',
'**/*.stories.js',
'**/storyshots/**/stories/**',
],
rules: {
'import/no-extraneous-dependencies': ignore,
},
},
{
files: ['**/react-native*/**', '**/REACT_NATIVE*/**', '**/crna*/**'],
rules: { 'jsx-a11y/accessible-emoji': ignore },
},
{ files: '**/.storybook/config.js', rules: { 'global-require': ignore } },
],
};
61 changes: 61 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,64 @@

## 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
Expand Down
8 changes: 4 additions & 4 deletions MIGRATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,8 @@ Also read on if you're using `addon-knobs`: we advise an update to your code for

This affects you if you don't use babel in your project. You may need to add `babel-core` as dev dependency:

```
npm install --save-dev babel-core
```sh
yarn add babel-core --dev
```

This was done to support different major versions of babel.
Expand Down Expand Up @@ -261,7 +261,7 @@ In the case of Angular: `import { ... } from '@storybook/addon-knobs/angular';`
TypeScript users: we've moved the rest of our addons type definitions into [DefinitelyTyped](http://definitelytyped.org/). Starting in 3.2.0 make sure to use the right addons types:

```sh
npm install @types/storybook__addon-notes @types/storybook__addon-options @types/storybook__addon-knobs @types/storybook__addon-links --save-dev
yarn add @types/storybook__addon-notes @types/storybook__addon-options @types/storybook__addon-knobs @types/storybook__addon-links --dev
```

See also [TypeScript definitions in 3.1.x](#moved-typescript-definitions).
Expand Down Expand Up @@ -294,7 +294,7 @@ It's not beautiful, but we'll be adding a more convenient/idiomatic way of using
TypeScript users: we are in the process of moving our typescript definitions into [DefinitelyTyped](http://definitelytyped.org/). If you're using TypeScript, starting in 3.1.0 you need to make sure your type definitions are installed:

```sh
npm install @types/node @types/react @types/storybook__react --save-dev
yarn add @types/node @types/react @types/storybook__react --dev
```

### Deprecated head.html
Expand Down
57 changes: 0 additions & 57 deletions WORKLOG.md

This file was deleted.

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.5",
"version": "4.2.0-alpha.7",
"description": "a11y addon for storybook",
"keywords": [
"a11y",
Expand All @@ -26,10 +26,10 @@
},
"dependencies": {
"@emotion/styled": "^10.0.2",
"@storybook/addons": "4.2.0-alpha.5",
"@storybook/client-logger": "4.2.0-alpha.5",
"@storybook/components": "4.2.0-alpha.5",
"@storybook/core-events": "4.2.0-alpha.5",
"@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",
"react": "^16.7.0-alpha.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.5",
"version": "4.2.0-alpha.7",
"description": "Action Logger addon for storybook",
"keywords": [
"storybook"
Expand All @@ -22,9 +22,9 @@
"dependencies": {
"@emotion/core": "^10.0.2",
"@emotion/styled": "^10.0.2",
"@storybook/addons": "4.2.0-alpha.5",
"@storybook/components": "4.2.0-alpha.5",
"@storybook/core-events": "4.2.0-alpha.5",
"@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",
"emotion-theming": "^10.0.2",
"fast-deep-equal": "^2.0.1",
Expand Down
Loading

0 comments on commit 673f015

Please sign in to comment.