Skip to content

Commit

Permalink
Merge branch 'next' into upgrades
Browse files Browse the repository at this point in the history
# Conflicts:
#	app/react-native-server/package.json
#	lib/cli/package.json
#	lib/components/package.json
  • Loading branch information
ndelangen committed Nov 15, 2019
2 parents 5b2ee37 + 6341a0f commit 4f0c2f6
Show file tree
Hide file tree
Showing 91 changed files with 620 additions and 608 deletions.
42 changes: 19 additions & 23 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
const ignore = 0;
// const warn = 1;
const error = 2;

module.exports = {
root: true,
extends: ['@storybook/eslint-config-storybook'],
rules: {
'import/extensions': [
error,
'error',
'never',
{ ignorePackages: true, md: 'always', svg: 'always', json: 'always', tag: 'always' },
],
'import/no-unresolved': [error, { ignore: ['@storybook'] }],
'react/state-in-constructor': ignore,
'react/static-property-placement': ignore,
'react/jsx-props-no-spreading': ignore,
'react/jsx-fragments': ignore,
'@typescript-eslint/ban-ts-ignore': ignore,
'@typescript-eslint/no-object-literal-type-assertion': ignore,
'import/no-unresolved': ['error', { ignore: ['@storybook'] }],
'react/state-in-constructor': 'off',
'react/static-property-placement': 'off',
'react/jsx-props-no-spreading': 'off',
'react/jsx-fragments': 'off',
'@typescript-eslint/ban-ts-ignore': 'off',
'@typescript-eslint/no-object-literal-type-assertion': 'off',
'react/sort-comp': [
error,
'error',
{
order: [
'staticLifecycle',
Expand All @@ -38,7 +34,7 @@ module.exports = {
},
},
],
'max-classes-per-file': ignore,
'max-classes-per-file': 'off',
},
overrides: [
{
Expand All @@ -51,30 +47,30 @@ module.exports = {
'docs/src/stories/**',
],
rules: {
'@typescript-eslint/no-empty-function': ignore,
'import/no-extraneous-dependencies': ignore,
'@typescript-eslint/no-empty-function': 'off',
'import/no-extraneous-dependencies': 'off',
},
},
{ files: '**/.storybook/config.js', rules: { 'global-require': ignore } },
{ files: '**/.storybook/config.js', rules: { 'global-require': 'off' } },
{
files: ['**/*.stories.*'],
rules: {
'no-console': ignore,
'no-console': 'off',
},
},
{
files: ['**/*.tsx', '**/*.ts'],
rules: {
'react/prop-types': ignore, // we should use types
'no-dupe-class-members': ignore, // this is called overloads in typescript
'react/prop-types': 'off', // we should use types
'no-dupe-class-members': 'off', // this is called overloads in typescript
},
},
{
files: ['**/*.d.ts'],
rules: {
'vars-on-top': ignore,
'no-var': ignore, // this is how typescript works
'spaced-comment': ignore,
'vars-on-top': 'off',
'no-var': 'off', // this is how typescript works
'spaced-comment': 'off',
},
},
],
Expand Down
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
## 5.3.0-alpha.46 (November 16, 2019)

### Features

* Core: allow uppercase path names in url query param ([#8516](https://github.com/storybookjs/storybook/pull/8516))

### Bug Fixes

* Core: Fix null version check bug ([#8806](https://github.com/storybookjs/storybook/pull/8806))
* Addon-notes: Fix anchor links ([#8132](https://github.com/storybookjs/storybook/pull/8132))

### Maintenance

* Refactor: remove useless variables from eslint config ([#8843](https://github.com/storybookjs/storybook/pull/8843))

### Dependency Upgrades

* Addon-docs: Replace `storybook-addon-vue-info` with `vue-docgen-loader` ([#8831](https://github.com/storybookjs/storybook/pull/8831))

## 5.3.0-alpha.45 (November 14, 2019)

### Breaking Changes
Expand Down
14 changes: 7 additions & 7 deletions addons/a11y/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-a11y",
"version": "5.3.0-alpha.45",
"version": "5.3.0-alpha.46",
"description": "a11y addon for storybook",
"keywords": [
"a11y",
Expand Down Expand Up @@ -33,12 +33,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-alpha.45",
"@storybook/api": "5.3.0-alpha.45",
"@storybook/client-logger": "5.3.0-alpha.45",
"@storybook/components": "5.3.0-alpha.45",
"@storybook/core-events": "5.3.0-alpha.45",
"@storybook/theming": "5.3.0-alpha.45",
"@storybook/addons": "5.3.0-alpha.46",
"@storybook/api": "5.3.0-alpha.46",
"@storybook/client-logger": "5.3.0-alpha.46",
"@storybook/components": "5.3.0-alpha.46",
"@storybook/core-events": "5.3.0-alpha.46",
"@storybook/theming": "5.3.0-alpha.46",
"axe-core": "^3.3.2",
"core-js": "^3.0.1",
"global": "^4.3.2",
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": "5.3.0-alpha.45",
"version": "5.3.0-alpha.46",
"description": "Action Logger addon for storybook",
"keywords": [
"storybook"
Expand Down Expand Up @@ -28,12 +28,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-alpha.45",
"@storybook/api": "5.3.0-alpha.45",
"@storybook/client-api": "5.3.0-alpha.45",
"@storybook/components": "5.3.0-alpha.45",
"@storybook/core-events": "5.3.0-alpha.45",
"@storybook/theming": "5.3.0-alpha.45",
"@storybook/addons": "5.3.0-alpha.46",
"@storybook/api": "5.3.0-alpha.46",
"@storybook/client-api": "5.3.0-alpha.46",
"@storybook/components": "5.3.0-alpha.46",
"@storybook/core-events": "5.3.0-alpha.46",
"@storybook/theming": "5.3.0-alpha.46",
"core-js": "^3.0.1",
"fast-deep-equal": "^2.0.1",
"global": "^4.3.2",
Expand Down
14 changes: 7 additions & 7 deletions addons/backgrounds/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-backgrounds",
"version": "5.3.0-alpha.45",
"version": "5.3.0-alpha.46",
"description": "A storybook addon to show different backgrounds for your preview",
"keywords": [
"addon",
Expand Down Expand Up @@ -32,12 +32,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-alpha.45",
"@storybook/api": "5.3.0-alpha.45",
"@storybook/client-logger": "5.3.0-alpha.45",
"@storybook/components": "5.3.0-alpha.45",
"@storybook/core-events": "5.3.0-alpha.45",
"@storybook/theming": "5.3.0-alpha.45",
"@storybook/addons": "5.3.0-alpha.46",
"@storybook/api": "5.3.0-alpha.46",
"@storybook/client-logger": "5.3.0-alpha.46",
"@storybook/components": "5.3.0-alpha.46",
"@storybook/core-events": "5.3.0-alpha.46",
"@storybook/theming": "5.3.0-alpha.46",
"core-js": "^3.0.1",
"memoizerific": "^1.11.3",
"react": "^16.8.3",
Expand Down
4 changes: 2 additions & 2 deletions addons/centered/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-centered",
"version": "5.3.0-alpha.45",
"version": "5.3.0-alpha.46",
"description": "Storybook decorator to center components",
"keywords": [
"addon",
Expand Down Expand Up @@ -29,7 +29,7 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-alpha.45",
"@storybook/addons": "5.3.0-alpha.46",
"core-js": "^3.0.1",
"global": "^4.3.2",
"util-deprecate": "^1.0.2"
Expand Down
10 changes: 5 additions & 5 deletions addons/contexts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-contexts",
"version": "5.3.0-alpha.45",
"version": "5.3.0-alpha.46",
"description": "Storybook Addon Contexts",
"keywords": [
"preact",
Expand All @@ -27,10 +27,10 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-alpha.45",
"@storybook/api": "5.3.0-alpha.45",
"@storybook/components": "5.3.0-alpha.45",
"@storybook/core-events": "5.3.0-alpha.45",
"@storybook/addons": "5.3.0-alpha.46",
"@storybook/api": "5.3.0-alpha.46",
"@storybook/components": "5.3.0-alpha.46",
"@storybook/core-events": "5.3.0-alpha.46",
"core-js": "^3.0.1",
"global": "^4.3.2",
"qs": "^6.6.0"
Expand Down
10 changes: 5 additions & 5 deletions addons/cssresources/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-cssresources",
"version": "5.3.0-alpha.45",
"version": "5.3.0-alpha.46",
"description": "A storybook addon to switch between css resources at runtime for your story",
"keywords": [
"addon",
Expand Down Expand Up @@ -32,10 +32,10 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-alpha.45",
"@storybook/api": "5.3.0-alpha.45",
"@storybook/components": "5.3.0-alpha.45",
"@storybook/core-events": "5.3.0-alpha.45",
"@storybook/addons": "5.3.0-alpha.46",
"@storybook/api": "5.3.0-alpha.46",
"@storybook/components": "5.3.0-alpha.46",
"@storybook/core-events": "5.3.0-alpha.46",
"core-js": "^3.0.1",
"global": "^4.3.2",
"react": "^16.8.3"
Expand Down
14 changes: 7 additions & 7 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": "5.3.0-alpha.45",
"version": "5.3.0-alpha.46",
"description": "Design asset preview for storybook",
"keywords": [
"addon",
Expand Down Expand Up @@ -34,12 +34,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-alpha.45",
"@storybook/api": "5.3.0-alpha.45",
"@storybook/client-logger": "5.3.0-alpha.45",
"@storybook/components": "5.3.0-alpha.45",
"@storybook/core-events": "5.3.0-alpha.45",
"@storybook/theming": "5.3.0-alpha.45",
"@storybook/addons": "5.3.0-alpha.46",
"@storybook/api": "5.3.0-alpha.46",
"@storybook/client-logger": "5.3.0-alpha.46",
"@storybook/components": "5.3.0-alpha.46",
"@storybook/core-events": "5.3.0-alpha.46",
"@storybook/theming": "5.3.0-alpha.46",
"core-js": "^3.0.1",
"global": "^4.3.2",
"react": "^16.8.3",
Expand Down
16 changes: 8 additions & 8 deletions addons/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-docs",
"version": "5.3.0-alpha.45",
"version": "5.3.0-alpha.46",
"description": "Superior documentation for your components",
"keywords": [
"addon",
Expand Down Expand Up @@ -45,13 +45,13 @@
"@mdx-js/loader": "^1.1.0",
"@mdx-js/mdx": "^1.1.0",
"@mdx-js/react": "^1.0.27",
"@storybook/addons": "5.3.0-alpha.45",
"@storybook/api": "5.3.0-alpha.45",
"@storybook/components": "5.3.0-alpha.45",
"@storybook/postinstall": "5.3.0-alpha.45",
"@storybook/router": "5.3.0-alpha.45",
"@storybook/source-loader": "5.3.0-alpha.45",
"@storybook/theming": "5.3.0-alpha.45",
"@storybook/addons": "5.3.0-alpha.46",
"@storybook/api": "5.3.0-alpha.46",
"@storybook/components": "5.3.0-alpha.46",
"@storybook/postinstall": "5.3.0-alpha.46",
"@storybook/router": "5.3.0-alpha.46",
"@storybook/source-loader": "5.3.0-alpha.46",
"@storybook/theming": "5.3.0-alpha.46",
"acorn": "^7.1.0",
"acorn-jsx": "^5.1.0",
"acorn-walk": "^7.0.0",
Expand Down
12 changes: 6 additions & 6 deletions addons/events/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-events",
"version": "5.3.0-alpha.45",
"version": "5.3.0-alpha.46",
"description": "Add events to your Storybook stories.",
"keywords": [
"addon",
Expand Down Expand Up @@ -31,11 +31,11 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-alpha.45",
"@storybook/api": "5.3.0-alpha.45",
"@storybook/client-api": "5.3.0-alpha.45",
"@storybook/core-events": "5.3.0-alpha.45",
"@storybook/theming": "5.3.0-alpha.45",
"@storybook/addons": "5.3.0-alpha.46",
"@storybook/api": "5.3.0-alpha.46",
"@storybook/client-api": "5.3.0-alpha.46",
"@storybook/core-events": "5.3.0-alpha.46",
"@storybook/theming": "5.3.0-alpha.46",
"core-js": "^3.0.1",
"format-json": "^1.0.3",
"lodash": "^4.17.15",
Expand Down
6 changes: 3 additions & 3 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": "5.3.0-alpha.45",
"version": "5.3.0-alpha.46",
"description": "Storybook addon for google analytics",
"keywords": [
"addon",
Expand All @@ -20,8 +20,8 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-alpha.45",
"@storybook/core-events": "5.3.0-alpha.45",
"@storybook/addons": "5.3.0-alpha.46",
"@storybook/core-events": "5.3.0-alpha.46",
"core-js": "^3.0.1",
"global": "^4.3.2",
"react-ga": "^2.5.7"
Expand Down
6 changes: 3 additions & 3 deletions addons/graphql/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-graphql",
"version": "5.3.0-alpha.45",
"version": "5.3.0-alpha.46",
"description": "Storybook addon to display the GraphiQL IDE",
"keywords": [
"addon",
Expand Down Expand Up @@ -29,8 +29,8 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-alpha.45",
"@storybook/api": "5.3.0-alpha.45",
"@storybook/addons": "5.3.0-alpha.46",
"@storybook/api": "5.3.0-alpha.46",
"core-js": "^3.0.1",
"global": "^4.3.2",
"graphiql": "^0.16.0",
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": "5.3.0-alpha.45",
"version": "5.3.0-alpha.46",
"description": "A Storybook addon to show additional information for your stories.",
"keywords": [
"addon",
Expand Down Expand Up @@ -28,10 +28,10 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-alpha.45",
"@storybook/client-logger": "5.3.0-alpha.45",
"@storybook/components": "5.3.0-alpha.45",
"@storybook/theming": "5.3.0-alpha.45",
"@storybook/addons": "5.3.0-alpha.46",
"@storybook/client-logger": "5.3.0-alpha.46",
"@storybook/components": "5.3.0-alpha.46",
"@storybook/theming": "5.3.0-alpha.46",
"core-js": "^3.0.1",
"global": "^4.3.2",
"marksy": "^7.0.0",
Expand Down
Loading

0 comments on commit 4f0c2f6

Please sign in to comment.