Merge branch 'next' into ts-migration/channels

storybookjs · Dec 15, 2018 · 153fa26 · 153fa26
2 parents 4008a90 + 46c430f
commit 153fa26
Show file tree

Hide file tree

Showing 159 changed files with 6,374 additions and 2,059 deletions.
diff --git a/.babelrc.js b/.babelrc.js
@@ -1,6 +1,6 @@
 module.exports = {
   presets: [
-    ['@babel/preset-env', { shippedProposals: true, useBuiltIns: 'usage', modules: false }],
+    ['@babel/preset-env', { shippedProposals: true, useBuiltIns: 'usage' }],
     '@babel/preset-react',
     '@babel/preset-flow',
   ],

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -99,6 +99,11 @@ jobs:
           command: |
             cd examples/riot-kitchen-sink
             yarn build-storybook
+      - run:
+          name: Build preact kitchen-sink
+          command: |
+            cd examples/preact-kitchen-sink
+            yarn build-storybook
       - run:
           name: Build official-storybook
           command: |
@@ -166,6 +171,11 @@ jobs:
           command: |
             cd examples/riot-kitchen-sink
             yarn storybook --smoke-test --quiet
+      - run:
+          name: Run preact kitchen-sink (smoke test)
+          command: |
+            cd examples/preact-kitchen-sink
+            yarn storybook --smoke-test --quiet
   native-smoke-tests:
     <<: *defaults
     steps:

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -50,6 +50,7 @@ module.exports = {
       {
         js: 'never',
         ts: 'never',
+        mjs: 'never',
       },
     ],
     'import/no-extraneous-dependencies': [

diff --git a/.github/autolabeler.yml b/.github/autolabeler.yml
@@ -14,6 +14,7 @@
 'addon: viewport': ["addons/viewport/**"]
 'app: angular': ["app/angular/**"]
 'app: polymer ': ["app/polymer/**"]
+'app: preact': ["app/preact/**"]
 'app: react-native': ["app/react-native/**"]
 'app: react': ["app/react/**"]
 'app: vue': ["app/vue/**"]

diff --git a/.../OpenSourceProjects_Storybook/patches/buildTypes/9f9177e7-9ec9-4e2e-aabb-d304fd667711.kts b/.../OpenSourceProjects_Storybook/patches/buildTypes/9f9177e7-9ec9-4e2e-aabb-d304fd667711.kts
@@ -0,0 +1,17 @@
+package OpenSourceProjects_Storybook.patches.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2017_2.*
+import jetbrains.buildServer.configs.kotlin.v2017_2.ui.*
+
+/*
+This patch script was generated by TeamCity on settings change in UI.
+To apply the patch, change the buildType with uuid = '9f9177e7-9ec9-4e2e-aabb-d304fd667711' (id = 'OpenSourceProjects_Storybook_Test')
+accordingly, and delete the patch script.
+*/
+changeBuildType("9f9177e7-9ec9-4e2e-aabb-d304fd667711") {
+    params {
+        add {
+            param("docker.node.version", "10.13")
+        }
+    }
+}
diff --git a/ADDONS_SUPPORT.md b/ADDONS_SUPPORT.md
@@ -1,23 +1,23 @@
 ## Addon / Framework Support Table
 
-| | [React](app/react)|[React Native](app/react-native)|[Vue](app/vue)|[Angular](app/angular)| [Polymer](app/polymer)| [Mithril](app/mithril)| [HTML](app/html)| [Marko](app/marko)| [Svelte](app/svelte)| [Riot](app/riot)| [Ember](app/ember)|
-| ----------- |:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|
-|[a11y](addons/a11y)                         |+| |+|+|+|+|+|+| | |+|
-|[actions](addons/actions)                   |+|+|+|+|+|+|+|+|+|+|+|
-|[backgrounds](addons/backgrounds)           |+|*|+|+|+|+|+|+|+|+|+|
-|[centered](addons/centered)                 |+| |+|+| |+|+| |+| |+|
-|[events](addons/events)                     |+| |+|+|+|+|+|+| | |+|
-|[graphql](addons/graphql)                   |+| | | | | | | | | | |
-|[google-analytics](addons/google-analytics) |+|+|+|+|+|+|+|+|+|+|+|
-|[info](addons/info)                         |+| | | | | | | | | | |
-|[jest](addons/jest)                         |+| | |+| | |+| | | | |
-|[knobs](addons/knobs)                       |+|+*|+|+|+|+|+|+|+|+|+|
-|[links](addons/links)                       |+|+|+|+|+|+|+| |+|+|+|
-|[notes](addons/notes)                       |+|+*|+|+|+|+|+| |+|+|+|
-|[options](addons/options)                   |+|+|+|+|+|+|+| |+|+|+|
-|[cssresources](addons/cssresources)         |+| |+|+|+|+|+|+|+|+|+|
-|[storyshots](addons/storyshots)             |+|+|+|+| | |+| |+|+| |
-|[storysource](addons/storysource)           |+| |+|+|+|+|+|+|+|+|+|
-|[viewport](addons/viewport)                 |+| |+|+|+|+|+|+|+|+|+|
+| | [React](app/react)|[React Native](app/react-native)|[Vue](app/vue)|[Angular](app/angular)| [Polymer](app/polymer)| [Mithril](app/mithril)| [HTML](app/html)| [Marko](app/marko)| [Svelte](app/svelte)| [Riot](app/riot)| [Ember](app/ember)| [Preact](app/preact)|
+| ----------- |:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|
+|[a11y](addons/a11y)                         |+| |+|+|+|+|+|+| | |+|+|
+|[actions](addons/actions)                   |+|+|+|+|+|+|+|+|+|+|+|+|
+|[backgrounds](addons/backgrounds)           |+|*|+|+|+|+|+|+|+|+|+|+|
+|[centered](addons/centered)                 |+| |+|+| |+|+| |+| |+|+|
+|[events](addons/events)                     |+| |+|+|+|+|+|+| | |+|+|
+|[graphql](addons/graphql)                   |+| | | | | | | | | | | |
+|[google-analytics](addons/google-analytics) |+|+|+|+|+|+|+|+|+|+|+|+|
+|[info](addons/info)                         |+| | | | | | | | | | | |
+|[jest](addons/jest)                         |+| | |+| | |+| | | | | |
+|[knobs](addons/knobs)                       |+|+*|+|+|+|+|+|+|+|+|+|+|
+|[links](addons/links)                       |+|+|+|+|+|+|+| |+|+|+|+|
+|[notes](addons/notes)                       |+|+*|+|+|+|+|+| |+|+|+|+|
+|[options](addons/options)                   |+|+|+|+|+|+|+| |+|+|+|+|
+|[cssresources](addons/cssresources)         |+| |+|+|+|+|+|+|+|+|+|+|
+|[storyshots](addons/storyshots)             |+|+|+|+| | |+| |+|+| |+|
+|[storysource](addons/storysource)           |+| |+|+|+|+|+|+|+|+|+|+|
+|[viewport](addons/viewport)                 |+| |+|+|+|+|+|+|+|+|+|+|
 
 `*` - React Native on device addon (addons/onDevice-\<name>) 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,59 @@
+## 4.2.0-alpha.1 (December 12, 2018)
+
+Fixes 4.2.0-alpha.0
+
+### Features
+
+* Addon-info: add forwardRef support ([#4961](https://github.com/storybooks/storybook/pull/4961))
+
+### Bug Fixes
+
+* Addon-knobs: Add missing key property in Panel ([#4507](https://github.com/storybooks/storybook/pull/4507))
+
+### Maintenance
+
+* Addon-notes: Migrated to TypeScript ([#4758](https://github.com/storybooks/storybook/pull/4758))
+
+### Dependency Upgrades
+
+* Fix: Add missing peer dependencies to addon-knobs ([#4928](https://github.com/storybooks/storybook/pull/4928))
+
+## 4.2.0-alpha.0 (December 12, 2018)
+
+Bad release
+
+## 4.1.1 (December 12, 2018)
+
+### Bug Fixes
+
+* FIX react native by adding an empty array named dlls to the templateParameters ([#4985](https://github.com/storybooks/storybook/pull/4985))
+
+## 4.1.0 (December 12, 2018)
+
+Storybook 4.1 with performance and compatibility improvements! Highlights include:
+
+* Core: Performance optimizations on separate manager preview split, improved cold start, restart & rebuild ([#4834](https://github.com/storybooks/storybook/pull/4834))
+* React: add support for all versions of react ([#4808](https://github.com/storybooks/storybook/pull/4808))
+* Addon-CSSResources: new adddon to dynamically add/remove css ([#4622](https://github.com/storybooks/storybook/pull/4622))
+* React: use babel presets/plugins based on CRA. ([#4836](https://github.com/storybooks/storybook/pull/4836))
+* React-native: Add ability to filter story list ([#4806](https://github.com/storybooks/storybook/pull/4806))
+* React: Add TypeScript support for react-scripts ([#4824](https://github.com/storybooks/storybook/pull/4824))
+
+There are dozens more fixes, features, and tweaks in the 4.1 release. See changelogs for `4.1.0-*` for details.
+
+## 4.1.0-alpha.13 (December 12, 2018)
+
+### Maintenance
+
+* React-native: add core-js to addons ([#4981](https://github.com/storybooks/storybook/pull/4981))
+
+## 4.1.0-alpha.12 (December 11, 2018)
+
+### Bug Fixes
+
+* Fix storyshots by compiling JS modules ([#4967](https://github.com/storybooks/storybook/pull/4967))
+* Angular: move 'core-js/modules/es6.promise' into storyshots ([#4929](https://github.com/storybooks/storybook/pull/4929))
+
 ## 4.0.12 (December 5, 2018)
 
 ### Bug Fixes

diff --git a/README.md b/README.md
@@ -96,6 +96,7 @@ For additional help, join us [in our Discord](https://discord.gg/sMFvFsG) or [Sl
 | [Svelte](app/svelte)             | [v4.0.0](https://storybooks-svelte.netlify.com/)  | [![Svelte](https://img.shields.io/npm/dm/@storybook/svelte.svg)](app/svelte)                   |
 | [Riot](app/riot)                 | [v4.0.0](https://storybooks-riot.netlify.com/)    | [![Riot](https://img.shields.io/npm/dm/@storybook/riot.svg)](app/riot)                         |
 | [Ember](app/ember)               | [v4.0.0](https://storybooks-ember.netlify.com/)   | [![Ember](https://img.shields.io/npm/dm/@storybook/ember.svg)](app/ember)                      |
+| [Preact](app/preact)             | [v4.0.0](https://storybooks-preact.netlify.com/)  | [![Preact](https://img.shields.io/npm/dm/@storybook/preact.svg)](app/preact)                   |
 
 ### Sub Projects
 

diff --git a/__mocks__/inject-decorator.flow-stories.txt b/__mocks__/inject-decorator.flow-stories.txt
@@ -0,0 +1,35 @@
+// @flow
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { withInfo } from '@storybook/addon-info';
+
+import TableComponent from '../components/TableComponent';
+
+import type { JssClasses } from '../types';
+
+type State = {
+  value: any,
+};
+
+type Props = {
+  classes: JssClasses,
+  name: string,
+};
+
+class Table extends React.Component<Props, State> {
+  constructor(props) {
+    super(props);
+    this.state = {
+      value: undefined,
+    };
+  }
+
+  state: State;
+
+  render() {
+    return <TableComponent />;
+  }
+}
+
+const stories = storiesOf('Table', module);
+stories.add('Flow Class', withInfo('Lorum Ipsum Nem')(() => <Table />));
diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "4.1.0-alpha.11",
+  "version": "4.2.0-alpha.1",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -26,11 +26,12 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.1.0-alpha.11",
-    "@storybook/client-logger": "4.1.0-alpha.11",
-    "@storybook/components": "4.1.0-alpha.11",
-    "@storybook/core-events": "4.1.0-alpha.11",
+    "@storybook/addons": "4.2.0-alpha.1",
+    "@storybook/client-logger": "4.2.0-alpha.1",
+    "@storybook/components": "4.2.0-alpha.1",
+    "@storybook/core-events": "4.2.0-alpha.1",
     "axe-core": "^3.1.2",
+    "core-js": "^2.5.7",
     "global": "^4.3.2",
     "prop-types": "^15.6.2"
   },

diff --git a/addons/actions/package.json b/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "4.1.0-alpha.11",
+  "version": "4.2.0-alpha.1",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"
@@ -23,9 +23,10 @@
     "@emotion/core": "^0.13.1",
     "@emotion/provider": "^0.11.2",
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.1.0-alpha.11",
-    "@storybook/components": "4.1.0-alpha.11",
-    "@storybook/core-events": "4.1.0-alpha.11",
+    "@storybook/addons": "4.2.0-alpha.1",
+    "@storybook/components": "4.2.0-alpha.1",
+    "@storybook/core-events": "4.2.0-alpha.1",
+    "core-js": "^2.5.7",
     "deep-equal": "^1.0.1",
     "global": "^4.3.2",
     "lodash": "^4.17.11",

diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "4.1.0-alpha.11",
+  "version": "4.2.0-alpha.1",
   "description": "A storybook addon to show different backgrounds for your preview",
   "keywords": [
     "addon",
@@ -25,8 +25,9 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.1.0-alpha.11",
-    "@storybook/core-events": "4.1.0-alpha.11",
+    "@storybook/addons": "4.2.0-alpha.1",
+    "@storybook/core-events": "4.2.0-alpha.1",
+    "core-js": "^2.5.7",
     "eventemitter3": "^3.1.0",
     "global": "^4.3.2",
     "prop-types": "^15.6.2",

diff --git a/addons/centered/README.md b/addons/centered/README.md
@@ -47,6 +47,20 @@ storiesOf('MyComponent', module)
   }));
 ```
 
+example for Preact:
+
+```js
+import { storiesOf } from '@storybook/preact';
+import centered from '@storybook/addon-centered/preact';
+
+import MyComponent from '../Component';
+
+storiesOf('MyComponent', module)
+  .addDecorator(centered)
+  .add('without props', () => (<MyComponent />))
+  .add('with some props', () => (<MyComponent text="The Comp"/>));
+```
+
 example for Svelte:
 
 ```js

diff --git a/addons/centered/package.json b/addons/centered/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-centered",
-  "version": "4.1.0-alpha.11",
+  "version": "4.2.0-alpha.1",
   "description": "Storybook decorator to center components",
   "keywords": [
     "addon",
@@ -22,6 +22,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
+    "core-js": "^2.5.7",
     "global": "^4.3.2"
   },
   "publishConfig": {

diff --git a/addons/centered/preact.js b/addons/centered/preact.js
@@ -0,0 +1 @@
+module.exports = require('./dist/preact');
diff --git a/addons/centered/src/preact.js b/addons/centered/src/preact.js
@@ -0,0 +1,12 @@
+/** @jsx h */
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { h } from 'preact';
+import styles from './styles';
+
+export default function(storyFn) {
+  return (
+    <div style={styles.style}>
+      <div style={styles.innerStyle}>{storyFn()}</div>
+    </div>
+  );
+}
diff --git a/addons/cssresources/package.json b/addons/cssresources/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-cssresources",
-  "version": "4.1.0-alpha.11",
+  "version": "4.2.0-alpha.1",
   "description": "A storybook addon to switch between css resources at runtime for your story",
   "keywords": [
     "addon",
@@ -25,9 +25,10 @@
   },
   "dependencies": {
     "@emotion/styled": "0.10.6",
-    "@storybook/addons": "4.1.0-alpha.11",
-    "@storybook/components": "4.1.0-alpha.11",
-    "@storybook/core-events": "4.1.0-alpha.11",
+    "@storybook/addons": "4.2.0-alpha.1",
+    "@storybook/components": "4.2.0-alpha.1",
+    "@storybook/core-events": "4.2.0-alpha.1",
+    "core-js": "^2.5.7",
     "global": "^4.3.2",
     "prop-types": "^15.6.2",
     "react-syntax-highlighter": "^10.0.0",

diff --git a/addons/events/package.json b/addons/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-events",
-  "version": "4.1.0-alpha.11",
+  "version": "4.2.0-alpha.1",
   "description": "Add events to your Storybook stories.",
   "keywords": [
     "addon",
@@ -24,8 +24,9 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.1.0-alpha.11",
-    "@storybook/core-events": "4.1.0-alpha.11",
+    "@storybook/addons": "4.2.0-alpha.1",
+    "@storybook/core-events": "4.2.0-alpha.1",
+    "core-js": "^2.5.7",
     "format-json": "^1.0.3",
     "prop-types": "^15.6.2",
     "react-lifecycles-compat": "^3.0.4",

diff --git a/addons/google-analytics/package.json b/addons/google-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-google-analytics",
-  "version": "4.1.0-alpha.11",
+  "version": "4.2.0-alpha.1",
   "description": "Storybook addon for google analytics",
   "keywords": [
     "addon",
@@ -21,7 +21,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.1.0-alpha.11",
+    "@storybook/addons": "4.2.0-alpha.1",
+    "core-js": "^2.5.7",
     "global": "^4.3.2",
     "react-ga": "^2.5.3"
   },