Merge branch 'master' into release/3.3

# Conflicts: # addons/comments/package.json # addons/knobs/package.json # addons/knobs/src/components/types/Array.js # examples/cra-kitchen-sink/package.json # package.json # yarn.lock
storybookjs · Nov 7, 2017 · cf054ad · cf054ad
2 parents 1a6082a + c06a289
commit cf054ad
Show file tree

Hide file tree

Showing 37 changed files with 589 additions and 873 deletions.
diff --git a/MIGRATION.md b/MIGRATION.md
@@ -126,7 +126,6 @@ The new package names are:
 | `@kadira/storybook-addon-links`              | `@storybook/addon-links`         |
 | `@kadira/storybook-addon-info`               | `@storybook/addon-info`          |
 | `@kadira/storybook-addon-knobs`              | `@storybook/addon-knobs`         |
-| `@kadira/storybook-addon-comments`           | `@storybook/addon-comments`      |
 | `@kadira/storybook-addon-notes`              | `@storybook/addon-notes`         |
 | `@kadira/storybook-addon-options`            | `@storybook/addon-options`       |
 | `@kadira/storybook-addon-graphql`            | `@storybook/addon-graphql`       |

diff --git a/ROADMAP.md b/ROADMAP.md
@@ -2,25 +2,23 @@
 
 ## Table of contents
 
--   [New features](#new-features)
-    -   [Responsive + multi-device viewports preview.](#responsive--multi-device-viewports-preview)
-    -   [Automatic story detection](#automatic-story-detection)
-    -   [Theme ability and override core UI components](#theme-ability-and-override-core-ui-components)
-    -   [Add a playground addon](#add-a-playground-addon)
-    -   [See multiple (or all) stories in 1 preview.](#see-multiple-or-all-stories-in-1-preview)
-    -   [Deeper level hierarchy](#deeper-level-hierarchy)
--   [Supporting other frameworks and libraries](#supporting-other-frameworks-and-libraries)
-    -   [Vue](#vue)
-    -   [Angular](#angular)
-    -   [Webcomponents](#webcomponents)
-    -   [Polymer](#polymer)
-    -   [Aurelia](#aurelia)
--   [Breaking changes](#breaking-changes)
-    -   [Addon API](#addon-api)
-    -   [API for adding stories](#api-for-adding-stories)
--   [Documentation](#documentation)
-    -   [Better design](#better-design)
-    -   [Record videos and write blog post on how to use, tweak & develop storybook](#record-videos-and-write-blog-post-on-how-to-use-tweak--develop-storybook)
+  * [New features](#new-features)
+    + [Responsive + multi-device viewports preview.](#responsive--multi-device-viewports-preview)
+    + [Automatic story detection](#automatic-story-detection)
+    + [Theme ability and override core UI components](#theme-ability-and-override-core-ui-components)
+    + [Add a playground addon](#add-a-playground-addon)
+    + [See multiple (or all) stories in 1 preview.](#see-multiple--or-all--stories-in-1-preview)
+  * [Supporting other frameworks and libraries](#supporting-other-frameworks-and-libraries)
+    + [Angular](#angular)
+    + [Polymer & Webcomponents](#polymer---webcomponents)
+    + [Aurelia](#aurelia)
+    + [Ember](#ember)
+  * [Breaking changes](#breaking-changes)
+    + [Addon API](#addon-api)
+    + [API for adding stories](#api-for-adding-stories)
+  * [Documentation](#documentation)
+    + [Better design](#better-design)
+    + [Record videos and write blog post on how to use, tweak & develop storybook](#record-videos-and-write-blog-post-on-how-to-use--tweak---develop-storybook)
 
 ## New features
 
@@ -56,13 +54,6 @@ It's quite common to see users write a single story, with a wrapper components a
 We plan to add a second mode to storybook that will allow you to see all stories in 1 preview.
 That way you can write your stories how they are best, and preview them how you like.
 
-### Deeper level hierarchy
-
-A very long standing issue is about "what about larger styleguides?". Some styleguides have lots and lots of components.
-At some point is becomes unmaintainable if you do not group them somehow.
-Storybook's UI is not exactly setup for very large styleguides, right now.
-But we are going to add a way of defining groups! And develop a UI that allows you to quickly navigate to other groups / stories.
-
 ## Supporting other frameworks and libraries
 
 We believe in the power of react, and think it's the right choice for a lot of projects.
@@ -71,25 +62,21 @@ Unfortunately if you choose anything other then React or React-Native you can no
 
 We want you to be able to use storybook with the framework / library of your choice.
 
-### Vue
-
-Storybook for Vue is currently in alpha release, it won't be long now!
-
 ### Angular
 
-Storybook for Angular is in development.
+Storybook for Angular is in alpha and will be included in the 3.3.0 release.
 
-### Webcomponents
+### Polymer & Webcomponents
 
-Interested in supporting.
+Storybook for Polymer is currently in development, and will support custom elements.
 
-### Polymer
+### Aurelia
 
-Interested in supporting, once bower and html-imports are gone.
+We're reaching out to the Aurelia maintainers to cooperate on this.
 
-### Aurelia
+### Ember
 
-Please contact us if you want this.
+We're reaching out to the Ember maintainers to cooperate on this.
 
 ## Breaking changes
 

diff --git a/addons/events/package.json b/addons/events/package.json
@@ -24,7 +24,7 @@
     "babel-runtime": "^6.26.0",
     "format-json": "^1.0.3",
     "prop-types": "^15.6.0",
-    "react-textarea-autosize": "^4.3.0",
+    "react-textarea-autosize": "^5.1.0",
     "uuid": "^3.1.0"
   },
   "devDependencies": {

diff --git a/addons/events/src/components/Event.js b/addons/events/src/components/Event.js
@@ -149,9 +149,6 @@ export default class Item extends Component {
         </button>
         <Textarea
           id={`addon-event-${name}`}
-          ref={ref => {
-            this.input = ref;
-          }}
           style={{ ...styles.textArea, ...extraStyle }}
           value={this.state.payloadString}
           onChange={this.onChange}

diff --git a/addons/knobs/package.json b/addons/knobs/package.json
@@ -19,21 +19,21 @@
     "babel-runtime": "^6.26.0",
     "deep-equal": "^1.0.1",
     "global": "^4.3.2",
-    "insert-css": "^1.0.0",
+    "insert-css": "^2.0.0",
     "lodash.debounce": "^4.0.8",
     "moment": "^2.19.1",
     "prop-types": "^15.6.0",
     "react-color": "^2.11.4",
     "react-datetime": "^2.10.3",
-    "react-textarea-autosize": "^4.3.0",
+    "react-textarea-autosize": "^5.1.0",
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {
     "raw-loader": "^0.5.1",
     "react": "^16.0.0",
     "react-dom": "^16.0.0",
     "style-loader": "^0.19.0",
-    "vue": "^2.5.2"
+    "vue": "^2.5.3"
   },
   "peerDependencies": {
     "react": "*",

diff --git a/addons/knobs/src/components/types/Array.js b/addons/knobs/src/components/types/Array.js
@@ -16,29 +16,14 @@ const styles = {
   color: '#555',
 };
 
-function formatArray(value, separator) {
-  if (value === '') {
-    return [];
-  }
-  return value.split(separator);
-}
-
-class ArrayType extends React.Component {
-  render() {
-    const { knob, onChange } = this.props;
-    return (
-      <Textarea
-        id={knob.name}
-        ref={c => {
-          this.input = c;
-        }}
-        style={styles}
-        value={knob.value.join(knob.separator)}
-        onChange={e => onChange(formatArray(e.target.value, knob.separator))}
-      />
-    );
-  }
-}
+const ArrayType = ({ knob, onChange }) => (
+  <Textarea
+    id={knob.name}
+    style={styles}
+    value={knob.value.join(knob.separator)}
+    onChange={e => onChange(e.target.value.split(knob.separator))}
+  />
+);
 
 ArrayType.defaultProps = {
   knob: {},

diff --git a/addons/knobs/src/components/types/Object.js b/addons/knobs/src/components/types/Object.js
@@ -69,9 +69,6 @@ class ObjectType extends React.Component {
     return (
       <Textarea
         id={knob.name}
-        ref={c => {
-          this.input = c;
-        }}
         style={{ ...styles, ...extraStyle }}
         value={jsonString}
         onChange={e => this.handleChange(e)}

diff --git a/addons/knobs/src/components/types/Text.js b/addons/knobs/src/components/types/Text.js
@@ -16,23 +16,14 @@ const styles = {
   color: '#555',
 };
 
-class TextType extends React.Component {
-  render() {
-    const { knob, onChange } = this.props;
-
-    return (
-      <Textarea
-        id={knob.name}
-        ref={c => {
-          this.input = c;
-        }}
-        style={styles}
-        value={knob.value}
-        onChange={e => onChange(e.target.value)}
-      />
-    );
-  }
-}
+const TextType = ({ knob, onChange }) => (
+  <Textarea
+    id={knob.name}
+    style={styles}
+    value={knob.value}
+    onChange={e => onChange(e.target.value)}
+  />
+);
 
 TextType.defaultProps = {
   knob: {},

diff --git a/addons/notes/package.json b/addons/notes/package.json
@@ -33,6 +33,6 @@
     "react": "*"
   },
   "optionalDependencies": {
-    "@types/react": "^15.0.24"
+    "@types/react": "^16.0.20"
   }
 }
diff --git a/addons/storyshots/package.json b/addons/storyshots/package.json
@@ -20,7 +20,7 @@
     "global": "^4.3.2",
     "jest-specific-snapshot": "^0.2.0",
     "prop-types": "^15.6.0",
-    "read-pkg-up": "^2.0.0"
+    "read-pkg-up": "^3.0.0"
   },
   "devDependencies": {
     "@storybook/addons": "^3.3.0-alpha.3",

diff --git a/app/react-native/package.json b/app/react-native/package.json
@@ -50,7 +50,7 @@
     "css-loader": "^0.28.7",
     "events": "^1.1.1",
     "express": "^4.16.2",
-    "file-loader": "^0.11.2",
+    "file-loader": "^1.1.5",
     "find-cache-dir": "^1.0.0",
     "global": "^4.3.2",
     "html-webpack-plugin": "^2.30.1",
@@ -68,13 +68,13 @@
     "webpack": "^3.8.1",
     "webpack-dev-middleware": "^1.12.0",
     "webpack-hot-middleware": "^2.20.0",
-    "ws": "^3.0.0"
+    "ws": "^3.3.0"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",
     "react": "^16.0.0",
     "react-dom": "^16.0.0",
-    "react-native": "^0.49.3"
+    "react-native": "^0.50.1"
   },
   "peerDependencies": {
     "react": "*",

diff --git a/app/react/package.json b/app/react/package.json
@@ -18,7 +18,7 @@
     "url": "https://github.com/storybooks/storybook.git"
   },
   "scripts": {
-    "dev": "DEV_BUILD=1 nodemon --watch ./src --exec 'yarn prepare'",
+    "dev": "cross-env DEV_BUILD=1 nodemon --watch ./src --exec \"yarn prepare\"",
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
@@ -48,7 +48,7 @@
     "core-js": "^2.5.1",
     "css-loader": "^0.28.7",
     "express": "^4.16.2",
-    "file-loader": "^0.11.2",
+    "file-loader": "^1.1.5",
     "find-cache-dir": "^1.0.0",
     "glamor": "^2.20.40",
     "glamorous": "^4.11.0",
@@ -63,7 +63,6 @@
     "postcss-loader": "^2.0.8",
     "prop-types": "^15.6.0",
     "qs": "^6.5.1",
-    "react-modal": "^2.4.1",
     "redux": "^3.7.2",
     "request": "^2.83.0",
     "serve-favicon": "^2.4.5",

diff --git a/app/vue/package.json b/app/vue/package.json
@@ -18,7 +18,7 @@
     "url": "https://github.com/storybooks/storybook.git"
   },
   "scripts": {
-    "dev": "DEV_BUILD=1 nodemon --watch ./src --exec 'yarn prepare'",
+    "dev": "cross-env DEV_BUILD=1 nodemon --watch ./src --exec \"yarn prepare\"",
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
@@ -48,7 +48,7 @@
     "core-js": "^2.5.1",
     "css-loader": "^0.28.7",
     "express": "^4.16.2",
-    "file-loader": "^0.11.2",
+    "file-loader": "^1.1.5",
     "find-cache-dir": "^1.0.0",
     "global": "^4.3.2",
     "html-webpack-plugin": "^2.30.1",
@@ -62,7 +62,6 @@
     "qs": "^6.5.1",
     "react": "^16.0.0",
     "react-dom": "^16.0.0",
-    "react-modal": "^2.4.1",
     "redux": "^3.7.2",
     "request": "^2.83.0",
     "serve-favicon": "^2.4.5",
@@ -80,9 +79,9 @@
   "devDependencies": {
     "babel-cli": "^6.26.0",
     "nodemon": "^1.12.1",
-    "vue": "^2.5.2",
-    "vue-loader": "^13.3.0",
-    "vue-template-compiler": "^2.5.2"
+    "vue": "^2.5.3",
+    "vue-loader": "^13.4.0",
+    "vue-template-compiler": "^2.5.3"
   },
   "peerDependencies": {
     "vue": "*",

diff --git a/dependencies.yml b/dependencies.yml
@@ -29,7 +29,7 @@ collectors:
     bootstrap_command: yarn
   actors:
   # pull requests for updates to our major version
-  - type: js-lerna:0.9.0-beta
+  - type: js-lerna
     versions: "L.Y.Y"
     settings:
       batch_mode: true
@@ -54,6 +54,7 @@ collectors:
   - type: js-npm
     versions: "L.Y.Y"
     settings:
+      batch_mode: true
       github_labels:
       - dependencies:update
       github_assignees:

diff --git a/examples/angular-cli/package.json b/examples/angular-cli/package.json
@@ -31,11 +31,11 @@
     "@angular/cli": "1.3.0",
     "@angular/compiler-cli": "^5.0.0-beta.7",
     "@angular/language-service": "^5.0.0-beta.7",
-    "@storybook/addon-actions": "^3.3.0-alpha.2",
-    "@storybook/addon-links": "^3.3.0-alpha.2",
-    "@storybook/addon-notes": "^3.3.0-alpha.2",
-    "@storybook/addons": "^3.3.0-alpha.2",
-    "@storybook/angular": "3.3.0-alpha.0",
+    "@storybook/addon-actions": "^3.3.0-alpha.3",
+    "@storybook/addon-links": "^3.3.0-alpha.3",
+    "@storybook/addon-notes": "^3.3.0-alpha.3",
+    "@storybook/addons": "^3.3.0-alpha.3",
+    "@storybook/angular": "3.3.0-alpha.3",
     "@types/jasmine": "~2.5.53",
     "@types/node": "~6.0.60",
     "codelyzer": "^3.1.2",

diff --git a/examples/cra-kitchen-sink/package.json b/examples/cra-kitchen-sink/package.json
@@ -21,21 +21,21 @@
     "uuid": "^3.1.0"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "3.3.0-alpha.2",
-    "@storybook/addon-backgrounds": "^3.2.14",
-    "@storybook/addon-centered": "3.3.0-alpha.2",
-    "@storybook/addon-events": "3.3.0-alpha.2",
-    "@storybook/addon-info": "3.3.0-alpha.2",
-    "@storybook/addon-knobs": "3.3.0-alpha.2",
-    "@storybook/addon-links": "3.3.0-alpha.2",
-    "@storybook/addon-notes": "3.3.0-alpha.2",
-    "@storybook/addon-options": "3.3.0-alpha.2",
-    "@storybook/addon-storyshots": "3.3.0-alpha.2",
-    "@storybook/addon-viewport": "3.3.0-alpha.2",
-    "@storybook/addons": "3.3.0-alpha.2",
-    "@storybook/components": "3.3.0-alpha.2",
-    "@storybook/react": "3.3.0-alpha.2",
-    "react-scripts": "1.0.14"
+    "@storybook/addon-actions": "3.3.0-alpha.3",
+    "@storybook/addon-backgrounds": "^3.3.0-alpha.3",
+    "@storybook/addon-centered": "3.3.0-alpha.3",
+    "@storybook/addon-events": "3.3.0-alpha.3",
+    "@storybook/addon-info": "3.3.0-alpha.3",
+    "@storybook/addon-knobs": "3.3.0-alpha.3",
+    "@storybook/addon-links": "3.3.0-alpha.3",
+    "@storybook/addon-notes": "3.3.0-alpha.3",
+    "@storybook/addon-options": "3.3.0-alpha.3",
+    "@storybook/addon-storyshots": "3.3.0-alpha.3",
+    "@storybook/addon-viewport": "3.3.0-alpha.3",
+    "@storybook/addons": "3.3.0-alpha.3",
+    "@storybook/components": "3.3.0-alpha.3",
+    "@storybook/react": "3.3.0-alpha.3",
+    "react-scripts": "1.0.17"
   },
   "private": true
 }