From 0e09b295c1d0c815d118c28af3c99ac472bcc98a Mon Sep 17 00:00:00 2001
From: hypnos <Filipp.Riabchun@jetbrains.com>
Date: Tue, 26 Dec 2017 21:16:17 +0300
Subject: [PATCH 01/14] Update CLI snapshots as a postpublish step

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 36061d6fbb0..099ef30b7f6 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
     "lint:js": "cross-env NODE_ENV=production eslint --cache --cache-location=.cache/eslint --ext .js,.jsx,.json",
     "lint:md": "remark",
     "publish": "lerna publish",
+    "postpublish": "yarn test --cli --update",
     "repo-dirty-check": "node ./scripts/repo-dirty-check",
     "start": "npm --prefix examples/cra-kitchen-sink run storybook",
     "test": "node ./scripts/test.js",

From 5635385711b0efb62bd63b4451b606d1fd68b22e Mon Sep 17 00:00:00 2001
From: jason <azimut.nt@gmail.com>
Date: Tue, 26 Dec 2017 23:09:09 +0300
Subject: [PATCH 02/14] fixed dependency injection for components

---
 .../src/client/preview/angular/utils.ts       | 121 +++++++++++++++++-
 1 file changed, 119 insertions(+), 2 deletions(-)

diff --git a/app/angular/src/client/preview/angular/utils.ts b/app/angular/src/client/preview/angular/utils.ts
index 1ec935cd6e9..845d97e31f9 100644
--- a/app/angular/src/client/preview/angular/utils.ts
+++ b/app/angular/src/client/preview/angular/utils.ts
@@ -1,3 +1,5 @@
+import {Type} from '@angular/core';
+
 function getMeta(component: any, [name1, name2]: any, defaultValue: any) {
   if (!name2) {
     name2 = name1;
@@ -24,5 +26,120 @@ export function getPropMetadata(component: any) {
 }
 
 export function getParameters(component: any) {
-  return getMeta(component, ['parameters'], []);
-}
\ No newline at end of file
+  return parameters(component);
+}
+
+/**
+ * @TODO refactor that
+ * That code is copied from: angular/core/src/reflection/reflection_capabilities.ts
+ */
+const PARAMETERS = '__paramaters__';
+function convertTsickleDecoratorIntoMetadata(decoratorInvocations: any[]): any[] {
+  if (!decoratorInvocations) {
+    return [];
+  }
+  return decoratorInvocations.map(decoratorInvocation => {
+    const decoratorType = decoratorInvocation.type;
+    const annotationCls = decoratorType.annotationCls;
+    const annotationArgs = decoratorInvocation.args ? decoratorInvocation.args : [];
+    return new annotationCls(...annotationArgs);
+  });
+}
+
+function getParentCtor(ctor: Function): Type<any> {
+  const parentProto = Object.getPrototypeOf(ctor.prototype);
+  const parentCtor = parentProto ? parentProto.constructor : null;
+  // Note: We always use `Object` as the null value
+  // to simplify checking later on.
+  return parentCtor || Object;
+}
+
+function parameters(type: Type<any>): any {
+  // Note: only report metadata if we have at least one class decorator
+  // to stay in sync with the static reflector.
+  if (typeof type !== 'function') {
+    return [];
+  }
+  
+  
+  const parentCtor = getParentCtor(type);
+  let parameters = getOwnParameters(type, parentCtor);
+  if (!parameters && parentCtor !== Object && parameters !== null) {
+    parameters = (<any>parameters)(parentCtor);
+  }
+  return parameters || [];
+}
+
+function _zipTypesAndAnnotations(paramTypes: any[], paramAnnotations: any[]): any[][] {
+  let result: any[][];
+  
+  if (typeof paramTypes === 'undefined') {
+    result = new Array(paramAnnotations.length);
+  } else {
+    result = new Array(paramTypes.length);
+  }
+  
+  for (let i = 0; i < result.length; i++) {
+    // TS outputs Object for parameters without types, while Traceur omits
+    // the annotations. For now we preserve the Traceur behavior to aid
+    // migration, but this can be revisited.
+    if (typeof paramTypes === 'undefined') {
+      result[i] = [];
+    } else if (paramTypes[i] != Object) {
+      result[i] = [paramTypes[i]];
+    } else {
+      result[i] = [];
+    }
+    if (paramAnnotations && paramAnnotations[i] != null) {
+      result[i] = result[i].concat(paramAnnotations[i]);
+    }
+  }
+  return result;
+}
+
+const DELEGATE_CTOR = /^function\s+\S+\(\)\s*{[\s\S]+\.apply\(this,\s*arguments\)/;
+function getOwnParameters(type: Type<any>, parentCtor: any): any[][] {
+  // If we have no decorators, we only have function.length as metadata.
+  // In that case, to detect whether a child class declared an own constructor or not,
+  // we need to look inside of that constructor to check whether it is
+  // just calling the parent.
+  // This also helps to work around for https://github.com/Microsoft/TypeScript/issues/12439
+  // that sets 'design:paramtypes' to []
+  // if a class inherits from another class but has no ctor declared itself.
+  if (DELEGATE_CTOR.exec(type.toString())) {
+    return null;
+  }
+  
+  // Prefer the direct API.
+  if ((<any>type).parameters && (<any>type).parameters !== parentCtor.parameters) {
+    return (<any>type).parameters;
+  }
+  
+  // API of tsickle for lowering decorators to properties on the class.
+  const tsickleCtorParams = (<any>type).ctorParameters;
+  if (tsickleCtorParams && tsickleCtorParams !== parentCtor.ctorParameters) {
+    // Newer tsickle uses a function closure
+    // Retain the non-function case for compatibility with older tsickle
+    const ctorParameters =
+      typeof tsickleCtorParams === 'function' ? tsickleCtorParams() : tsickleCtorParams;
+    const paramTypes = ctorParameters.map((ctorParam: any) => ctorParam && ctorParam.type);
+    const paramAnnotations = ctorParameters.map(
+      (ctorParam: any) =>
+        ctorParam && convertTsickleDecoratorIntoMetadata(ctorParam.decorators));
+    return _zipTypesAndAnnotations(paramTypes, paramAnnotations);
+  }
+  
+  // API for metadata created by invoking the decorators.
+  const paramAnnotations = type.hasOwnProperty(PARAMETERS) && (type as any)[PARAMETERS];
+  const paramTypes = (<any>window)['Reflect'] && (<any>window)['Reflect'].getOwnMetadata &&
+    (<any>window)['Reflect'].getOwnMetadata('design:paramtypes', type);
+  if (paramTypes || paramAnnotations) {
+    return _zipTypesAndAnnotations(paramTypes, paramAnnotations);
+  }
+  
+  // If a class has no decorators, at least create metadata
+  // based on function.length.
+  // Note: We know that this is a real constructor as we checked
+  // the content of the constructor above.
+  return new Array((<any>type.length)).fill(undefined);
+}

From 6d272f889cd3873a3fb77ef62963d55a0cd517ac Mon Sep 17 00:00:00 2001
From: jason <azimut.nt@gmail.com>
Date: Wed, 27 Dec 2017 00:01:55 +0300
Subject: [PATCH 03/14] minor fix

---
 app/angular/src/client/preview/angular/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/angular/src/client/preview/angular/utils.ts b/app/angular/src/client/preview/angular/utils.ts
index 845d97e31f9..19f109b26fc 100644
--- a/app/angular/src/client/preview/angular/utils.ts
+++ b/app/angular/src/client/preview/angular/utils.ts
@@ -42,7 +42,7 @@ function convertTsickleDecoratorIntoMetadata(decoratorInvocations: any[]): any[]
     const decoratorType = decoratorInvocation.type;
     const annotationCls = decoratorType.annotationCls;
     const annotationArgs = decoratorInvocation.args ? decoratorInvocation.args : [];
-    return new annotationCls(...annotationArgs);
+    return new (Function.prototype.bind.apply(annotationCls, [null].concat(annotationArgs)))();
   });
 }
 

From 32234ab45c30cef780b6e7d01e2b4f71b2d5d888 Mon Sep 17 00:00:00 2001
From: jason <azimut.nt@gmail.com>
Date: Wed, 27 Dec 2017 00:11:30 +0300
Subject: [PATCH 04/14] fixed linter errors

---
 .../src/client/preview/angular/utils.ts       | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/angular/src/client/preview/angular/utils.ts b/app/angular/src/client/preview/angular/utils.ts
index 19f109b26fc..336fd785875 100644
--- a/app/angular/src/client/preview/angular/utils.ts
+++ b/app/angular/src/client/preview/angular/utils.ts
@@ -60,32 +60,32 @@ function parameters(type: Type<any>): any {
   if (typeof type !== 'function') {
     return [];
   }
-  
-  
+
+
   const parentCtor = getParentCtor(type);
-  let parameters = getOwnParameters(type, parentCtor);
-  if (!parameters && parentCtor !== Object && parameters !== null) {
-    parameters = (<any>parameters)(parentCtor);
+  let _parameters = getOwnParameters(type, parentCtor);
+  if (!_parameters && parentCtor !== Object && _parameters !== null) {
+    _parameters = (<any>_parameters)(parentCtor);
   }
-  return parameters || [];
+  return _parameters || [];
 }
 
 function _zipTypesAndAnnotations(paramTypes: any[], paramAnnotations: any[]): any[][] {
   let result: any[][];
-  
+
   if (typeof paramTypes === 'undefined') {
     result = new Array(paramAnnotations.length);
   } else {
     result = new Array(paramTypes.length);
   }
-  
+
   for (let i = 0; i < result.length; i++) {
     // TS outputs Object for parameters without types, while Traceur omits
     // the annotations. For now we preserve the Traceur behavior to aid
     // migration, but this can be revisited.
     if (typeof paramTypes === 'undefined') {
       result[i] = [];
-    } else if (paramTypes[i] != Object) {
+    } else if (paramTypes[i] !== Object) {
       result[i] = [paramTypes[i]];
     } else {
       result[i] = [];
@@ -109,12 +109,12 @@ function getOwnParameters(type: Type<any>, parentCtor: any): any[][] {
   if (DELEGATE_CTOR.exec(type.toString())) {
     return null;
   }
-  
+
   // Prefer the direct API.
   if ((<any>type).parameters && (<any>type).parameters !== parentCtor.parameters) {
     return (<any>type).parameters;
   }
-  
+
   // API of tsickle for lowering decorators to properties on the class.
   const tsickleCtorParams = (<any>type).ctorParameters;
   if (tsickleCtorParams && tsickleCtorParams !== parentCtor.ctorParameters) {
@@ -128,15 +128,15 @@ function getOwnParameters(type: Type<any>, parentCtor: any): any[][] {
         ctorParam && convertTsickleDecoratorIntoMetadata(ctorParam.decorators));
     return _zipTypesAndAnnotations(paramTypes, paramAnnotations);
   }
-  
+
   // API for metadata created by invoking the decorators.
-  const paramAnnotations = type.hasOwnProperty(PARAMETERS) && (type as any)[PARAMETERS];
-  const paramTypes = (<any>window)['Reflect'] && (<any>window)['Reflect'].getOwnMetadata &&
+  const _paramAnnotations = type.hasOwnProperty(PARAMETERS) && (type as any)[PARAMETERS];
+  const _paramTypes = (<any>window)['Reflect'] && (<any>window)['Reflect'].getOwnMetadata &&
     (<any>window)['Reflect'].getOwnMetadata('design:paramtypes', type);
-  if (paramTypes || paramAnnotations) {
-    return _zipTypesAndAnnotations(paramTypes, paramAnnotations);
+  if (_paramTypes || _paramAnnotations) {
+    return _zipTypesAndAnnotations(_paramTypes, _paramAnnotations);
   }
-  
+
   // If a class has no decorators, at least create metadata
   // based on function.length.
   // Note: We know that this is a real constructor as we checked

From 8c30131d73e728fcce6f8196bb32956b5e31cb64 Mon Sep 17 00:00:00 2001
From: jason <azimut.nt@gmail.com>
Date: Wed, 27 Dec 2017 01:29:19 +0300
Subject: [PATCH 05/14] fixed unresolved dependency error

---
 app/angular/src/client/preview/angular/utils.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/angular/src/client/preview/angular/utils.ts b/app/angular/src/client/preview/angular/utils.ts
index 336fd785875..948bf224715 100644
--- a/app/angular/src/client/preview/angular/utils.ts
+++ b/app/angular/src/client/preview/angular/utils.ts
@@ -115,6 +115,10 @@ function getOwnParameters(type: Type<any>, parentCtor: any): any[][] {
     return (<any>type).parameters;
   }
 
+  if ((<any>type)['__parameters__']) {
+    return getMeta(type, ['__parameters__'], {});
+  }
+
   // API of tsickle for lowering decorators to properties on the class.
   const tsickleCtorParams = (<any>type).ctorParameters;
   if (tsickleCtorParams && tsickleCtorParams !== parentCtor.ctorParameters) {

From 46699f6a26d59b37045c7f58606b125938340ff3 Mon Sep 17 00:00:00 2001
From: jason <azimut.nt@gmail.com>
Date: Wed, 27 Dec 2017 12:43:51 +0300
Subject: [PATCH 06/14] added dependency injection usecase story to examples

---
 .../component-with-di/di.component.html       |  3 +++
 .../component-with-di/di.component.stories.ts | 10 ++++++++
 .../stories/component-with-di/di.component.ts | 24 +++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 examples/angular-cli/src/stories/component-with-di/di.component.html
 create mode 100644 examples/angular-cli/src/stories/component-with-di/di.component.stories.ts
 create mode 100644 examples/angular-cli/src/stories/component-with-di/di.component.ts

diff --git a/examples/angular-cli/src/stories/component-with-di/di.component.html b/examples/angular-cli/src/stories/component-with-di/di.component.html
new file mode 100644
index 00000000000..e6832d0e418
--- /dev/null
+++ b/examples/angular-cli/src/stories/component-with-di/di.component.html
@@ -0,0 +1,3 @@
+<div>
+    <div>All dependencies are defined: {{isAllDeps()}}</div>
+</div>
\ No newline at end of file
diff --git a/examples/angular-cli/src/stories/component-with-di/di.component.stories.ts b/examples/angular-cli/src/stories/component-with-di/di.component.stories.ts
new file mode 100644
index 00000000000..fde5151aa46
--- /dev/null
+++ b/examples/angular-cli/src/stories/component-with-di/di.component.stories.ts
@@ -0,0 +1,10 @@
+import {storiesOf} from '@storybook/angular';
+import {DiComponent} from './di.component';
+
+storiesOf('Component dependencies', module)
+  .add('inputs and inject dependencies', () => ({
+    component: DiComponent,
+    props: {
+      title: 'Component dependencies'
+    }
+  }));
diff --git a/examples/angular-cli/src/stories/component-with-di/di.component.ts b/examples/angular-cli/src/stories/component-with-di/di.component.ts
new file mode 100644
index 00000000000..b39f76204c1
--- /dev/null
+++ b/examples/angular-cli/src/stories/component-with-di/di.component.ts
@@ -0,0 +1,24 @@
+import { Component, Input, InjectionToken, Injector, ElementRef, Inject } from '@angular/core';
+
+export const TEST_TOKEN = new InjectionToken<string>('test');
+
+@Component({
+  selector: 'di-component',
+  templateUrl: './di.component.html',
+  providers: [
+    { provide: TEST_TOKEN, useValue: 123}
+  ]
+})
+export class DiComponent {
+  @Input() title: string;
+  
+  constructor(
+    protected injector: Injector,
+    protected elRef: ElementRef,
+    @Inject(TEST_TOKEN) protected testToken: number
+  ) {}
+  
+  isAllDeps(): boolean {
+    return Boolean(this.testToken && this.elRef && this.injector && this.title);
+  }
+}

From f017e929c44b2a21db5fd4765898006ce16f4576 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Thu, 28 Dec 2017 11:33:41 +1100
Subject: [PATCH 07/14] Use store revisions to ensure that stories re-render on
 HMR.

For #2587
---
 app/react/src/client/preview/client_api.js  |  1 +
 app/react/src/client/preview/render.js      | 11 ++++++++++-
 app/react/src/client/preview/story_store.js | 12 ++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/react/src/client/preview/client_api.js b/app/react/src/client/preview/client_api.js
index e9834495173..9ffd4ee36ad 100644
--- a/app/react/src/client/preview/client_api.js
+++ b/app/react/src/client/preview/client_api.js
@@ -41,6 +41,7 @@ export default class ClientApi {
     if (m && m.hot) {
       m.hot.dispose(() => {
         this._storyStore.removeStoryKind(kind);
+        this._storyStore.incrementRevision();
       });
     }
 
diff --git a/app/react/src/client/preview/render.js b/app/react/src/client/preview/render.js
index 1e16b7b1068..6ee916ac793 100644
--- a/app/react/src/client/preview/render.js
+++ b/app/react/src/client/preview/render.js
@@ -13,6 +13,7 @@ const isBrowser = typeof window !== 'undefined';
 let rootEl = null;
 let previousKind = '';
 let previousStory = '';
+let previousRevision = -1;
 
 if (isBrowser) {
   rootEl = document.getElementById('root');
@@ -45,6 +46,7 @@ export function renderMain(data, storyStore) {
   const noPreview = <NoPreview />;
   const { selectedKind, selectedStory } = data;
 
+  const revision = storyStore.getRevision();
   const story = storyStore.getStory(selectedKind, selectedStory);
   if (!story) {
     ReactDOM.render(noPreview, rootEl);
@@ -55,7 +57,13 @@ export function renderMain(data, storyStore) {
   // renderMain() gets executed after each action. Actions will cause the whole
   // story to re-render without this check.
   //    https://github.com/storybooks/react-storybook/issues/116
-  if (selectedKind === previousKind && previousStory === selectedStory) {
+  // However, we do want the story to re-render if the store itself has changed
+  // (which happens at the moment when HMR occurs)
+  if (
+    revision === previousRevision &&
+    selectedKind === previousKind &&
+    previousStory === selectedStory
+  ) {
     return null;
   }
 
@@ -63,6 +71,7 @@ export function renderMain(data, storyStore) {
   // Otherwise, React may not recrease instances for every story run.
   // This could leads to issues like below:
   //    https://github.com/storybooks/react-storybook/issues/81
+  previousRevision = revision;
   previousKind = selectedKind;
   previousStory = selectedStory;
   ReactDOM.unmountComponentAtNode(rootEl);
diff --git a/app/react/src/client/preview/story_store.js b/app/react/src/client/preview/story_store.js
index a82bba34d24..677fefd1a6d 100644
--- a/app/react/src/client/preview/story_store.js
+++ b/app/react/src/client/preview/story_store.js
@@ -10,6 +10,18 @@ function getId() {
 export default class StoryStore {
   constructor() {
     this._data = {};
+    // This number is incremented on every HMR.
+    // In theory it could also be incremented if stories were dynamically
+    // changed in the store
+    this._revision = 0;
+  }
+
+  getRevision() {
+    return this._revision;
+  }
+
+  incrementRevision() {
+    this._revision += 1;
   }
 
   addStory(kind, name, fn, fileName) {

From 7c4f87b68c2e59ecb51b4f9dd85e7aae3cb51c99 Mon Sep 17 00:00:00 2001
From: hypnos <Filipp.Riabchun@jetbrains.com>
Date: Thu, 28 Dec 2017 04:38:46 +0300
Subject: [PATCH 08/14] Add more `imports` eslint rules

---
 .eslintrc.js                                               | 4 ++++
 addons/a11y/package.json                                   | 1 +
 addons/actions/package.json                                | 1 +
 addons/background/package.json                             | 1 +
 addons/centered/package.json                               | 1 +
 addons/events/package.json                                 | 1 +
 addons/graphql/package.json                                | 1 +
 addons/info/package.json                                   | 1 +
 addons/info/src/components/markdown/index.js               | 2 +-
 addons/jest/package.json                                   | 1 +
 addons/knobs/package.json                                  | 1 +
 addons/links/package.json                                  | 1 +
 addons/notes/package.json                                  | 1 +
 addons/storyshots/package.json                             | 1 +
 addons/viewport/package.json                               | 2 +-
 addons/viewport/src/index.js                               | 1 -
 app/angular/package.json                                   | 1 +
 app/react-native/package.json                              | 1 +
 app/react/package.json                                     | 1 +
 app/vue/package.json                                       | 1 +
 docs/src/stories/index.js                                  | 2 ++
 examples/cra-kitchen-sink/src/stories/index.stories.js     | 1 +
 examples/official-storybook/stories/addon-notes.stories.js | 1 +
 lib/addons/package.json                                    | 1 +
 lib/channel-postmessage/package.json                       | 1 +
 lib/channel-websocket/package.json                         | 1 +
 lib/channels/package.json                                  | 1 +
 lib/client-logger/package.json                             | 1 +
 lib/codemod/package.json                                   | 1 +
 lib/components/package.json                                | 1 +
 lib/node-logger/package.json                               | 1 +
 lib/ui/package.json                                        | 1 +
 32 files changed, 35 insertions(+), 3 deletions(-)
 delete mode 100644 addons/viewport/src/index.js

diff --git a/.eslintrc.js b/.eslintrc.js
index 4fa3bf4ddff..ec55d7a4630 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -17,6 +17,7 @@ module.exports = {
   },
   settings: {
     'import/core-modules': ['enzyme'],
+    'import/ignore': ['node_modules\\/(?!@storybook)'],
   },
   rules: {
     strict: [error, 'never'],
@@ -60,6 +61,9 @@ module.exports = {
       },
     ],
     'import/prefer-default-export': ignore,
+    'import/default': error,
+    'import/named': error,
+    'import/namespace': error,
     'react/jsx-wrap-multilines': ignore,
     'react/jsx-indent': ignore,
     'react/jsx-indent-props': ignore,
diff --git a/addons/a11y/package.json b/addons/a11y/package.json
index 2658ccf8a03..afdd8fea5db 100644
--- a/addons/a11y/package.json
+++ b/addons/a11y/package.json
@@ -16,6 +16,7 @@
   },
   "license": "MIT",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/storybooks/storybook.git"
diff --git a/addons/actions/package.json b/addons/actions/package.json
index 12a3e6879d5..19fdac634d5 100644
--- a/addons/actions/package.json
+++ b/addons/actions/package.json
@@ -11,6 +11,7 @@
   },
   "license": "MIT",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/storybooks/storybook.git"
diff --git a/addons/background/package.json b/addons/background/package.json
index 96b3e2ee0ff..ef985c2043a 100644
--- a/addons/background/package.json
+++ b/addons/background/package.json
@@ -15,6 +15,7 @@
   "license": "MIT",
   "author": "jbaxleyiii",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/storybooks/storybook.git"
diff --git a/addons/centered/package.json b/addons/centered/package.json
index ff8901e9e47..a920ed93e4e 100644
--- a/addons/centered/package.json
+++ b/addons/centered/package.json
@@ -5,6 +5,7 @@
   "license": "MIT",
   "author": "Muhammed Thanish <mnmtanish@gmail.com>",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "scripts": {
     "prepare": "node ../../scripts/prepare.js"
   },
diff --git a/addons/events/package.json b/addons/events/package.json
index d367af74369..989f0b05af1 100644
--- a/addons/events/package.json
+++ b/addons/events/package.json
@@ -10,6 +10,7 @@
   ],
   "license": "MIT",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "repository": {
     "type": "git",
     "url": "git@github.com:storybooks/storybook.git"
diff --git a/addons/graphql/package.json b/addons/graphql/package.json
index ca16705375e..1bcadb51801 100644
--- a/addons/graphql/package.json
+++ b/addons/graphql/package.json
@@ -11,6 +11,7 @@
   },
   "license": "MIT",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/storybooks/storybook.git"
diff --git a/addons/info/package.json b/addons/info/package.json
index 1d80fa218df..b4c9f5f099b 100644
--- a/addons/info/package.json
+++ b/addons/info/package.json
@@ -4,6 +4,7 @@
   "description": "A Storybook addon to show additional information for your stories.",
   "license": "MIT",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/storybooks/storybook.git"
diff --git a/addons/info/src/components/markdown/index.js b/addons/info/src/components/markdown/index.js
index e3a39005f78..2c9ff6ea306 100644
--- a/addons/info/src/components/markdown/index.js
+++ b/addons/info/src/components/markdown/index.js
@@ -1,3 +1,3 @@
 export { H1, H2, H3, H4, H5, H6 } from './htags';
 export { Code, Pre } from './code';
-export { P, Small, A, LI, UL } from './text';
+export { P, A, LI, UL } from './text';
diff --git a/addons/jest/package.json b/addons/jest/package.json
index 148a6653ada..27f029fba13 100644
--- a/addons/jest/package.json
+++ b/addons/jest/package.json
@@ -16,6 +16,7 @@
   "license": "MIT",
   "author": "Renaud Tertrais <renaud.tertrais@gmail.com> (https://github.com/renaudtertrais)",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/storybooks/storybook"
diff --git a/addons/knobs/package.json b/addons/knobs/package.json
index 776ab9a9c2a..a0be8f759a3 100644
--- a/addons/knobs/package.json
+++ b/addons/knobs/package.json
@@ -4,6 +4,7 @@
   "description": "Storybook Addon Prop Editor Component",
   "license": "MIT",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/storybooks/storybook.git"
diff --git a/addons/links/package.json b/addons/links/package.json
index f631c0c789c..3a37030dcba 100644
--- a/addons/links/package.json
+++ b/addons/links/package.json
@@ -11,6 +11,7 @@
   },
   "license": "MIT",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/storybooks/storybook.git"
diff --git a/addons/notes/package.json b/addons/notes/package.json
index 09aa14b27d7..bd782f186d5 100644
--- a/addons/notes/package.json
+++ b/addons/notes/package.json
@@ -9,6 +9,7 @@
   ],
   "license": "MIT",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/storybooks/storybook.git"
diff --git a/addons/storyshots/package.json b/addons/storyshots/package.json
index c6364f6bbcc..c57f71f3b3e 100644
--- a/addons/storyshots/package.json
+++ b/addons/storyshots/package.json
@@ -4,6 +4,7 @@
   "description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.",
   "license": "MIT",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/storybooks/storybook.git"
diff --git a/addons/viewport/package.json b/addons/viewport/package.json
index 90c89fd9a89..8ee87d43d31 100644
--- a/addons/viewport/package.json
+++ b/addons/viewport/package.json
@@ -2,7 +2,7 @@
   "name": "@storybook/addon-viewport",
   "version": "3.3.1",
   "description": "Storybook addon to change the viewport size to mobile",
-  "main": "dist/index.js",
+  "main": "register.js",
   "keywords": [
     "storybook"
   ],
diff --git a/addons/viewport/src/index.js b/addons/viewport/src/index.js
deleted file mode 100644
index d3da40ad919..00000000000
--- a/addons/viewport/src/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { register } from './manager';
diff --git a/app/angular/package.json b/app/angular/package.json
index 49437b06e77..60450f16b49 100644
--- a/app/angular/package.json
+++ b/app/angular/package.json
@@ -8,6 +8,7 @@
   },
   "license": "MIT",
   "main": "dist/client/index.js",
+  "jsnext:main": "src/client/index.js",
   "bin": {
     "build-storybook": "./bin/build.js",
     "start-storybook": "./bin/index.js",
diff --git a/app/react-native/package.json b/app/react-native/package.json
index 39e7b6180b8..c49ee295cc9 100644
--- a/app/react-native/package.json
+++ b/app/react-native/package.json
@@ -13,6 +13,7 @@
   },
   "license": "MIT",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "bin": {
     "storybook": "dist/bin/storybook.js"
   },
diff --git a/app/react/package.json b/app/react/package.json
index 7cbe9736388..f7317b1989a 100644
--- a/app/react/package.json
+++ b/app/react/package.json
@@ -8,6 +8,7 @@
   },
   "license": "MIT",
   "main": "dist/client/index.js",
+  "jsnext:main": "src/client/index.js",
   "bin": {
     "build-storybook": "./bin/build.js",
     "start-storybook": "./bin/index.js",
diff --git a/app/vue/package.json b/app/vue/package.json
index 313f3a1a18f..e93da1df433 100644
--- a/app/vue/package.json
+++ b/app/vue/package.json
@@ -8,6 +8,7 @@
   },
   "license": "MIT",
   "main": "dist/client/index.js",
+  "jsnext:main": "src/client/index.js",
   "bin": {
     "build-storybook": "./bin/build.js",
     "start-storybook": "./bin/index.js",
diff --git a/docs/src/stories/index.js b/docs/src/stories/index.js
index 66d0b46edde..f9d8240f38a 100644
--- a/docs/src/stories/index.js
+++ b/docs/src/stories/index.js
@@ -1,3 +1,5 @@
+// TODO reenable when @storybook/react with jsnext:main is published
+// eslint-disable-next-line import/named
 import { storiesOf } from '@storybook/react';
 import implementations from './implementations';
 
diff --git a/examples/cra-kitchen-sink/src/stories/index.stories.js b/examples/cra-kitchen-sink/src/stories/index.stories.js
index 075f25bb704..cebb63b19ae 100644
--- a/examples/cra-kitchen-sink/src/stories/index.stories.js
+++ b/examples/cra-kitchen-sink/src/stories/index.stories.js
@@ -3,6 +3,7 @@ import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { setOptions } from '@storybook/addon-options';
 import { action } from '@storybook/addon-actions';
+// eslint-disable-next-line import/named
 import { withNotes, WithNotes } from '@storybook/addon-notes';
 import centered from '@storybook/addon-centered';
 import { withInfo } from '@storybook/addon-info';
diff --git a/examples/official-storybook/stories/addon-notes.stories.js b/examples/official-storybook/stories/addon-notes.stories.js
index f6c850dddfe..b4b67686fd3 100644
--- a/examples/official-storybook/stories/addon-notes.stories.js
+++ b/examples/official-storybook/stories/addon-notes.stories.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
 
+// eslint-disable-next-line import/named
 import { withNotes, WithNotes } from '@storybook/addon-notes';
 import { action } from '@storybook/addon-actions';
 import BaseButton from '../components/BaseButton';
diff --git a/lib/addons/package.json b/lib/addons/package.json
index 0f623bfda44..6e6b9a95ab1 100644
--- a/lib/addons/package.json
+++ b/lib/addons/package.json
@@ -11,6 +11,7 @@
   },
   "license": "MIT",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/storybooks/storybook.git"
diff --git a/lib/channel-postmessage/package.json b/lib/channel-postmessage/package.json
index e20e4316e45..e33263a9199 100644
--- a/lib/channel-postmessage/package.json
+++ b/lib/channel-postmessage/package.json
@@ -4,6 +4,7 @@
   "description": "",
   "license": "MIT",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "scripts": {
     "prepare": "node ../../scripts/prepare.js"
   },
diff --git a/lib/channel-websocket/package.json b/lib/channel-websocket/package.json
index b48a9132ba1..82ce1aae401 100644
--- a/lib/channel-websocket/package.json
+++ b/lib/channel-websocket/package.json
@@ -4,6 +4,7 @@
   "description": "",
   "license": "MIT",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "scripts": {
     "prepare": "node ../../scripts/prepare.js"
   },
diff --git a/lib/channels/package.json b/lib/channels/package.json
index b51a6d5c33b..eaf7b69ceb3 100644
--- a/lib/channels/package.json
+++ b/lib/channels/package.json
@@ -4,6 +4,7 @@
   "description": "",
   "license": "MIT",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "scripts": {
     "prepare": "node ../../scripts/prepare.js"
   }
diff --git a/lib/client-logger/package.json b/lib/client-logger/package.json
index 827a45d3497..6e649dbc8e0 100644
--- a/lib/client-logger/package.json
+++ b/lib/client-logger/package.json
@@ -4,6 +4,7 @@
   "description": "",
   "license": "MIT",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "scripts": {
     "prepare": "node ../../scripts/prepare.js"
   }
diff --git a/lib/codemod/package.json b/lib/codemod/package.json
index 9fca264145c..1b97c73ea20 100644
--- a/lib/codemod/package.json
+++ b/lib/codemod/package.json
@@ -4,6 +4,7 @@
   "description": "A collection of codemod scripts written with JSCodeshift",
   "license": "MIT",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/storybooks/storybook.git"
diff --git a/lib/components/package.json b/lib/components/package.json
index 54ef66ab318..0797046557f 100644
--- a/lib/components/package.json
+++ b/lib/components/package.json
@@ -4,6 +4,7 @@
   "description": "Core Storybook Components",
   "license": "MIT",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/storybooks/storybook.git"
diff --git a/lib/node-logger/package.json b/lib/node-logger/package.json
index a6b379dff7d..edfc7200088 100644
--- a/lib/node-logger/package.json
+++ b/lib/node-logger/package.json
@@ -4,6 +4,7 @@
   "description": "",
   "license": "MIT",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "scripts": {
     "prepare": "node ../../scripts/prepare.js"
   },
diff --git a/lib/ui/package.json b/lib/ui/package.json
index fcca24c6ee8..9daa5256fd8 100644
--- a/lib/ui/package.json
+++ b/lib/ui/package.json
@@ -4,6 +4,7 @@
   "description": "Core Storybook UI",
   "license": "MIT",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/storybooks/storybook.git"

From 874f818dae0aa1880914f75dc0ddb74a42c75c52 Mon Sep 17 00:00:00 2001
From: Michael Shilman <shilman@lab80.co>
Date: Thu, 28 Dec 2017 12:04:54 +0900
Subject: [PATCH 09/14] 3.3.2 changelog

---
 CHANGELOG.md | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d06adb45d12..b8f708103cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,37 @@
+# 3.3.2
+
+2017-December-28
+
+#### Bug Fixes
+
+-   Use store revisions to ensure that stories re-render on HMR. [#2588](https://github.com/storybooks/storybook/pull/2588)
+-   Fix @storybook/client-logger import [#2576](https://github.com/storybooks/storybook/pull/2576)
+-   Fixed react peer dependency [#2584](https://github.com/storybooks/storybook/pull/2584)
+
+#### Documentation
+
+-   Docs: fix logos display & add babelrc [#2585](https://github.com/storybooks/storybook/pull/2585)
+-   add guide for Angular [#2574](https://github.com/storybooks/storybook/pull/2574)
+-   Update custom webpack config docs [#2578](https://github.com/storybooks/storybook/pull/2578)
+-   Attempt to make propTablesExclude usage clearer [#2568](https://github.com/storybooks/storybook/pull/2568)
+
+#### Maintenance
+
+-   Add chromatic visual tests [#2505](https://github.com/storybooks/storybook/pull/2505)
+-   Update snapshots to fix tests [#2579](https://github.com/storybooks/storybook/pull/2579)
+
+#### Dependency Upgrades
+
+-   Upgraded `make-error` in `addons/actions` from "1.3.0" to "1.3.2" [#2586](https://github.com/storybooks/storybook/pull/2586)
+-   Upgraded `zone.js` in `app/angular` from "0.8.18" to "0.8.19" [#2586](https://github.com/storybooks/storybook/pull/2586)
+-   Upgraded `zone.js` in `examples/angular-cli` from "0.8.18" to "0.8.19" [#2586](https://github.com/storybooks/storybook/pull/2586)
+-   Upgraded `@angular/cli` in `examples/angular-cli` from "1.6.2" to "1.6.3" [#2586](https://github.com/storybooks/storybook/pull/2586)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/react` from "1.1.4" to "1.1.5" [#2581](https://github.com/storybooks/storybook/pull/2581)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/angular` from "1.1.4" to "1.1.5" [#2581](https://github.com/storybooks/storybook/pull/2581)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/react-native` from "1.1.4" to "1.1.5" [#2581](https://github.com/storybooks/storybook/pull/2581)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/vue` from "1.1.4" to "1.1.5" [#2581](https://github.com/storybooks/storybook/pull/2581)
+-   Upgraded `karma-coverage-istanbul-reporter` in `examples/angular-cli` from "1.3.1" to "1.3.3" [#2581](https://github.com/storybooks/storybook/pull/2581)
+
 # 3.3.1
 
 2017-December-26

From fbe50ffb46b59020c2f4fa7e46868d0f87b6b39d Mon Sep 17 00:00:00 2001
From: Michael Shilman <shilman@lab80.co>
Date: Thu, 28 Dec 2017 12:10:49 +0900
Subject: [PATCH 10/14] v3.3.2

---
 addons/a11y/package.json                 |  4 +--
 addons/actions/package.json              |  2 +-
 addons/background/package.json           |  2 +-
 addons/centered/package.json             |  2 +-
 addons/events/package.json               |  2 +-
 addons/graphql/package.json              |  2 +-
 addons/info/package.json                 |  6 ++--
 addons/jest/package.json                 |  4 +--
 addons/knobs/package.json                |  2 +-
 addons/links/package.json                |  4 +--
 addons/notes/package.json                |  2 +-
 addons/options/package.json              |  2 +-
 addons/storyshots/package.json           | 10 +++---
 addons/viewport/package.json             |  4 +--
 app/angular/package.json                 | 12 +++----
 app/react-native/package.json            | 12 +++----
 app/react/package.json                   | 16 +++++-----
 app/vue/package.json                     | 12 +++----
 examples/angular-cli/package.json        | 12 +++----
 examples/cra-kitchen-sink/package.json   | 36 ++++++++++-----------
 examples/official-storybook/package.json | 37 +++++++++++-----------
 examples/vue-kitchen-sink/package.json   | 18 +++++------
 lerna.json                               |  2 +-
 lib/addons/package.json                  |  2 +-
 lib/channel-postmessage/package.json     |  4 +--
 lib/channel-websocket/package.json       |  4 +--
 lib/channels/package.json                |  2 +-
 lib/cli/package.json                     | 40 ++++++++++++------------
 lib/client-logger/package.json           |  2 +-
 lib/codemod/package.json                 |  2 +-
 lib/components/package.json              |  8 ++---
 lib/node-logger/package.json             |  2 +-
 lib/ui/package.json                      |  8 ++---
 33 files changed, 139 insertions(+), 140 deletions(-)

diff --git a/addons/a11y/package.json b/addons/a11y/package.json
index 2658ccf8a03..4e9a739bec9 100644
--- a/addons/a11y/package.json
+++ b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -24,7 +24,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/components": "^3.3.1",
+    "@storybook/components": "^3.3.2",
     "axe-core": "^2.6.0",
     "prop-types": "^15.6.0"
   },
diff --git a/addons/actions/package.json b/addons/actions/package.json
index b669a48bc3e..5f95710f37d 100644
--- a/addons/actions/package.json
+++ b/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"
diff --git a/addons/background/package.json b/addons/background/package.json
index 96b3e2ee0ff..29c59ae5b72 100644
--- a/addons/background/package.json
+++ b/addons/background/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "A storybook addon to show different backgrounds for your preview",
   "keywords": [
     "addon",
diff --git a/addons/centered/package.json b/addons/centered/package.json
index ff8901e9e47..afe3feefad9 100644
--- a/addons/centered/package.json
+++ b/addons/centered/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-centered",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Storybook decorator to center components",
   "license": "MIT",
   "author": "Muhammed Thanish <mnmtanish@gmail.com>",
diff --git a/addons/events/package.json b/addons/events/package.json
index d367af74369..5327d88f343 100644
--- a/addons/events/package.json
+++ b/addons/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-events",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Add events to your Storybook stories.",
   "keywords": [
     "addon",
diff --git a/addons/graphql/package.json b/addons/graphql/package.json
index ca16705375e..fbe2ad72b0d 100644
--- a/addons/graphql/package.json
+++ b/addons/graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-graphql",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Storybook addon to display the GraphiQL IDE",
   "keywords": [
     "storybook"
diff --git a/addons/info/package.json b/addons/info/package.json
index 1d80fa218df..5a7ce0c4844 100644
--- a/addons/info/package.json
+++ b/addons/info/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-info",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "A Storybook addon to show additional information for your stories.",
   "license": "MIT",
   "main": "dist/index.js",
@@ -14,8 +14,8 @@
     "storybook": "start-storybook -p 9010"
   },
   "dependencies": {
-    "@storybook/client-logger": "^3.3.1",
-    "@storybook/components": "^3.3.1",
+    "@storybook/client-logger": "^3.3.2",
+    "@storybook/components": "^3.3.2",
     "babel-runtime": "^6.26.0",
     "global": "^4.3.2",
     "marksy": "^6.0.1",
diff --git a/addons/jest/package.json b/addons/jest/package.json
index 148a6653ada..34345ea91f6 100644
--- a/addons/jest/package.json
+++ b/addons/jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-jest",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "React storybook addon that show component jest report",
   "keywords": [
     "addon",
@@ -24,7 +24,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/components": "^3.3.1",
+    "@storybook/components": "^3.3.2",
     "glamor": "^2.20.40",
     "glamorous": "^4.11.2",
     "global": "^4.3.2",
diff --git a/addons/knobs/package.json b/addons/knobs/package.json
index 776ab9a9c2a..4bee8876c7a 100644
--- a/addons/knobs/package.json
+++ b/addons/knobs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-knobs",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Storybook Addon Prop Editor Component",
   "license": "MIT",
   "main": "dist/index.js",
diff --git a/addons/links/package.json b/addons/links/package.json
index f631c0c789c..8131cf2b97e 100644
--- a/addons/links/package.json
+++ b/addons/links/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-links",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Story Links addon for storybook",
   "keywords": [
     "storybook"
@@ -21,7 +21,7 @@
     "storybook": "start-storybook -p 9001"
   },
   "dependencies": {
-    "@storybook/components": "^3.3.1",
+    "@storybook/components": "^3.3.2",
     "global": "^4.3.2",
     "prop-types": "^15.5.10"
   },
diff --git a/addons/notes/package.json b/addons/notes/package.json
index 09aa14b27d7..54e122d707c 100644
--- a/addons/notes/package.json
+++ b/addons/notes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-notes",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Write notes for your Storybook stories.",
   "keywords": [
     "addon",
diff --git a/addons/options/package.json b/addons/options/package.json
index 4307bc6755b..8f80ddeb525 100644
--- a/addons/options/package.json
+++ b/addons/options/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-options",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Options addon for storybook",
   "keywords": [
     "storybook"
diff --git a/addons/storyshots/package.json b/addons/storyshots/package.json
index c6364f6bbcc..ff2698fa0eb 100644
--- a/addons/storyshots/package.json
+++ b/addons/storyshots/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storyshots",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.",
   "license": "MIT",
   "main": "dist/index.js",
@@ -15,7 +15,7 @@
     "example": "jest storyshot.test"
   },
   "dependencies": {
-    "@storybook/channels": "^3.3.1",
+    "@storybook/channels": "^3.3.2",
     "babel-runtime": "^6.26.0",
     "glob": "^7.1.2",
     "global": "^4.3.2",
@@ -24,8 +24,8 @@
     "read-pkg-up": "^3.0.0"
   },
   "devDependencies": {
-    "@storybook/addons": "^3.3.1",
-    "@storybook/react": "^3.3.1",
+    "@storybook/addons": "^3.3.2",
+    "@storybook/react": "^3.3.2",
     "babel-cli": "^6.26.0",
     "babel-jest": "^20.0.3",
     "babel-plugin-transform-runtime": "^6.23.0",
@@ -39,7 +39,7 @@
     "react-dom": "^16.1.0"
   },
   "peerDependencies": {
-    "@storybook/addons": "^3.3.1",
+    "@storybook/addons": "^3.3.2",
     "babel-core": "^6.26.0 | ^7.0.0-0",
     "react": "*",
     "react-test-renderer": "*"
diff --git a/addons/viewport/package.json b/addons/viewport/package.json
index 90c89fd9a89..ba15d0f04d0 100644
--- a/addons/viewport/package.json
+++ b/addons/viewport/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-viewport",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Storybook addon to change the viewport size to mobile",
   "main": "dist/index.js",
   "keywords": [
@@ -11,7 +11,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@storybook/components": "^3.3.1",
+    "@storybook/components": "^3.3.2",
     "global": "^4.3.2",
     "prop-types": "^15.5.10"
   },
diff --git a/app/angular/package.json b/app/angular/package.json
index ff0d3ace8b5..a1fb1ac2e95 100644
--- a/app/angular/package.json
+++ b/app/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/angular",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Storybook for Anglar: Develop Angular Components in isolation with Hot Reloading.",
   "homepage": "https://github.com/storybooks/storybook/tree/master/apps/angular",
   "bugs": {
@@ -22,11 +22,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addon-actions": "^3.3.1",
-    "@storybook/addon-links": "^3.3.1",
-    "@storybook/addons": "^3.3.1",
-    "@storybook/channel-postmessage": "^3.3.1",
-    "@storybook/ui": "^3.3.1",
+    "@storybook/addon-actions": "^3.3.2",
+    "@storybook/addon-links": "^3.3.2",
+    "@storybook/addons": "^3.3.2",
+    "@storybook/channel-postmessage": "^3.3.2",
+    "@storybook/ui": "^3.3.2",
     "airbnb-js-shims": "^1.1.1",
     "angular2-template-loader": "^0.6.2",
     "autoprefixer": "^7.1.1",
diff --git a/app/react-native/package.json b/app/react-native/package.json
index 39e7b6180b8..0be998f5f07 100644
--- a/app/react-native/package.json
+++ b/app/react-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react-native",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "A better way to develop React Native Components for your app",
   "keywords": [
     "react",
@@ -24,11 +24,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addon-actions": "^3.3.1",
-    "@storybook/addon-links": "^3.3.1",
-    "@storybook/addons": "^3.3.1",
-    "@storybook/channel-websocket": "^3.3.1",
-    "@storybook/ui": "^3.3.1",
+    "@storybook/addon-actions": "^3.3.2",
+    "@storybook/addon-links": "^3.3.2",
+    "@storybook/addons": "^3.3.2",
+    "@storybook/channel-websocket": "^3.3.2",
+    "@storybook/ui": "^3.3.2",
     "autoprefixer": "^7.2.3",
     "babel-loader": "^7.1.2",
     "babel-plugin-syntax-async-functions": "^6.13.0",
diff --git a/app/react/package.json b/app/react/package.json
index 7cbe9736388..742d5ea0940 100644
--- a/app/react/package.json
+++ b/app/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.",
   "homepage": "https://github.com/storybooks/storybook/tree/master/app/react",
   "bugs": {
@@ -22,13 +22,13 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addon-actions": "^3.3.1",
-    "@storybook/addon-links": "^3.3.1",
-    "@storybook/addons": "^3.3.1",
-    "@storybook/channel-postmessage": "^3.3.1",
-    "@storybook/client-logger": "^3.3.1",
-    "@storybook/node-logger": "^3.3.1",
-    "@storybook/ui": "^3.3.1",
+    "@storybook/addon-actions": "^3.3.2",
+    "@storybook/addon-links": "^3.3.2",
+    "@storybook/addons": "^3.3.2",
+    "@storybook/channel-postmessage": "^3.3.2",
+    "@storybook/client-logger": "^3.3.2",
+    "@storybook/node-logger": "^3.3.2",
+    "@storybook/ui": "^3.3.2",
     "airbnb-js-shims": "^1.4.0",
     "autoprefixer": "^7.2.3",
     "babel-loader": "^7.1.2",
diff --git a/app/vue/package.json b/app/vue/package.json
index 313f3a1a18f..0137c54ca98 100644
--- a/app/vue/package.json
+++ b/app/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/vue",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.",
   "homepage": "https://github.com/storybooks/storybook/tree/master/apps/vue",
   "bugs": {
@@ -22,11 +22,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addon-actions": "^3.3.1",
-    "@storybook/addon-links": "^3.3.1",
-    "@storybook/addons": "^3.3.1",
-    "@storybook/channel-postmessage": "^3.3.1",
-    "@storybook/ui": "^3.3.1",
+    "@storybook/addon-actions": "^3.3.2",
+    "@storybook/addon-links": "^3.3.2",
+    "@storybook/addons": "^3.3.2",
+    "@storybook/channel-postmessage": "^3.3.2",
+    "@storybook/ui": "^3.3.2",
     "airbnb-js-shims": "^1.4.0",
     "autoprefixer": "^7.2.3",
     "babel-loader": "^7.1.2",
diff --git a/examples/angular-cli/package.json b/examples/angular-cli/package.json
index 4a01cd71024..f2fddc02995 100644
--- a/examples/angular-cli/package.json
+++ b/examples/angular-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-cli",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "license": "MIT",
   "scripts": {
     "ng": "ng",
@@ -31,11 +31,11 @@
     "@angular/cli": "1.6.3",
     "@angular/compiler-cli": "^5.0.0-beta.7",
     "@angular/language-service": "^5.0.0-beta.7",
-    "@storybook/addon-actions": "^3.3.1",
-    "@storybook/addon-links": "^3.3.1",
-    "@storybook/addon-notes": "^3.3.1",
-    "@storybook/addons": "^3.3.1",
-    "@storybook/angular": "^3.3.1",
+    "@storybook/addon-actions": "^3.3.2",
+    "@storybook/addon-links": "^3.3.2",
+    "@storybook/addon-notes": "^3.3.2",
+    "@storybook/addons": "^3.3.2",
+    "@storybook/angular": "^3.3.2",
     "@types/jasmine": "~2.8.2",
     "@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
index e99cc24ce68..9fb266b7d0a 100644
--- a/examples/cra-kitchen-sink/package.json
+++ b/examples/cra-kitchen-sink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cra-kitchen-sink",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "scripts": {
     "build": "react-scripts build",
     "build-storybook": "build-storybook -s public",
@@ -19,23 +19,23 @@
     "react-dom": "^16.2.0"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "^3.3.1",
-    "@storybook/addon-actions": "^3.3.1",
-    "@storybook/addon-backgrounds": "^3.3.1",
-    "@storybook/addon-centered": "^3.3.1",
-    "@storybook/addon-events": "^3.3.1",
-    "@storybook/addon-info": "^3.3.1",
-    "@storybook/addon-jest": "^3.3.1",
-    "@storybook/addon-knobs": "^3.3.1",
-    "@storybook/addon-links": "^3.3.1",
-    "@storybook/addon-notes": "^3.3.1",
-    "@storybook/addon-options": "^3.3.1",
-    "@storybook/addon-storyshots": "^3.3.1",
-    "@storybook/addon-viewport": "^3.3.1",
-    "@storybook/addons": "^3.3.1",
-    "@storybook/client-logger": "^3.3.1",
-    "@storybook/components": "^3.3.1",
-    "@storybook/react": "^3.3.1",
+    "@storybook/addon-a11y": "^3.3.2",
+    "@storybook/addon-actions": "^3.3.2",
+    "@storybook/addon-backgrounds": "^3.3.2",
+    "@storybook/addon-centered": "^3.3.2",
+    "@storybook/addon-events": "^3.3.2",
+    "@storybook/addon-info": "^3.3.2",
+    "@storybook/addon-jest": "^3.3.2",
+    "@storybook/addon-knobs": "^3.3.2",
+    "@storybook/addon-links": "^3.3.2",
+    "@storybook/addon-notes": "^3.3.2",
+    "@storybook/addon-options": "^3.3.2",
+    "@storybook/addon-storyshots": "^3.3.2",
+    "@storybook/addon-viewport": "^3.3.2",
+    "@storybook/addons": "^3.3.2",
+    "@storybook/client-logger": "^3.3.2",
+    "@storybook/components": "^3.3.2",
+    "@storybook/react": "^3.3.2",
     "babel-jest": "^22.0.4",
     "enzyme": "^3.2.0",
     "enzyme-adapter-react-16": "^1.1.0",
diff --git a/examples/official-storybook/package.json b/examples/official-storybook/package.json
index 3891ad5c5e8..b2919cc61f5 100644
--- a/examples/official-storybook/package.json
+++ b/examples/official-storybook/package.json
@@ -1,29 +1,28 @@
 {
   "name": "official-storybook",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "scripts": {
     "build-storybook": "build-storybook -c ./",
     "storybook": "start-storybook -p 9010 -c ./",
-    "chromatic":
-      "chromatic test --storybook-addon --exit-zero-on-changes --app-code $CHROMATIC_APP_CODE"
+    "chromatic": "chromatic test --storybook-addon --exit-zero-on-changes --app-code $CHROMATIC_APP_CODE"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "^3.3.1",
-    "@storybook/addon-actions": "^3.3.1",
-    "@storybook/addon-backgrounds": "^3.3.1",
-    "@storybook/addon-centered": "^3.3.1",
-    "@storybook/addon-events": "^3.3.1",
-    "@storybook/addon-info": "^3.3.1",
-    "@storybook/addon-jest": "^3.3.1",
-    "@storybook/addon-knobs": "^3.3.1",
-    "@storybook/addon-links": "^3.3.1",
-    "@storybook/addon-notes": "^3.3.1",
-    "@storybook/addon-options": "^3.3.1",
-    "@storybook/addon-storyshots": "^3.3.1",
-    "@storybook/addon-viewport": "^3.3.1",
-    "@storybook/addons": "^3.3.1",
-    "@storybook/components": "^3.3.1",
-    "@storybook/react": "^3.3.1",
+    "@storybook/addon-a11y": "^3.3.2",
+    "@storybook/addon-actions": "^3.3.2",
+    "@storybook/addon-backgrounds": "^3.3.2",
+    "@storybook/addon-centered": "^3.3.2",
+    "@storybook/addon-events": "^3.3.2",
+    "@storybook/addon-info": "^3.3.2",
+    "@storybook/addon-jest": "^3.3.2",
+    "@storybook/addon-knobs": "^3.3.2",
+    "@storybook/addon-links": "^3.3.2",
+    "@storybook/addon-notes": "^3.3.2",
+    "@storybook/addon-options": "^3.3.2",
+    "@storybook/addon-storyshots": "^3.3.2",
+    "@storybook/addon-viewport": "^3.3.2",
+    "@storybook/addons": "^3.3.2",
+    "@storybook/components": "^3.3.2",
+    "@storybook/react": "^3.3.2",
     "babel-jest": "^21.2.0",
     "enzyme": "^3.2.0",
     "enzyme-adapter-react-16": "^1.1.0",
diff --git a/examples/vue-kitchen-sink/package.json b/examples/vue-kitchen-sink/package.json
index 7347f7c7119..b3f0e8c34a8 100644
--- a/examples/vue-kitchen-sink/package.json
+++ b/examples/vue-kitchen-sink/package.json
@@ -1,16 +1,16 @@
 {
   "name": "vue-example",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "private": true,
   "devDependencies": {
-    "@storybook/addon-actions": "^3.3.1",
-    "@storybook/addon-centered": "^3.3.1",
-    "@storybook/addon-knobs": "^3.3.1",
-    "@storybook/addon-links": "^3.3.1",
-    "@storybook/addon-notes": "^3.3.1",
-    "@storybook/addon-viewport": "^3.3.1",
-    "@storybook/addons": "^3.3.1",
-    "@storybook/vue": "^3.3.1",
+    "@storybook/addon-actions": "^3.3.2",
+    "@storybook/addon-centered": "^3.3.2",
+    "@storybook/addon-knobs": "^3.3.2",
+    "@storybook/addon-links": "^3.3.2",
+    "@storybook/addon-notes": "^3.3.2",
+    "@storybook/addon-viewport": "^3.3.2",
+    "@storybook/addons": "^3.3.2",
+    "@storybook/vue": "^3.3.2",
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.2",
     "babel-preset-env": "^1.6.0",
diff --git a/lerna.json b/lerna.json
index 7cc94e017b0..13da7c38a70 100644
--- a/lerna.json
+++ b/lerna.json
@@ -8,5 +8,5 @@
     }
   },
   "concurrency": 1,
-  "version": "3.3.1"
+  "version": "3.3.2"
 }
diff --git a/lib/addons/package.json b/lib/addons/package.json
index 0f623bfda44..5941e0d470a 100644
--- a/lib/addons/package.json
+++ b/lib/addons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addons",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Storybook addons store",
   "keywords": [
     "storybook"
diff --git a/lib/channel-postmessage/package.json b/lib/channel-postmessage/package.json
index e20e4316e45..9e8d9e7f8f6 100644
--- a/lib/channel-postmessage/package.json
+++ b/lib/channel-postmessage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/channel-postmessage",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "",
   "license": "MIT",
   "main": "dist/index.js",
@@ -8,7 +8,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/channels": "^3.3.1",
+    "@storybook/channels": "^3.3.2",
     "global": "^4.3.2",
     "json-stringify-safe": "^5.0.1"
   }
diff --git a/lib/channel-websocket/package.json b/lib/channel-websocket/package.json
index b48a9132ba1..0a5aa3c5b2a 100644
--- a/lib/channel-websocket/package.json
+++ b/lib/channel-websocket/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/channel-websocket",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "",
   "license": "MIT",
   "main": "dist/index.js",
@@ -8,7 +8,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/channels": "^3.3.1",
+    "@storybook/channels": "^3.3.2",
     "global": "^4.3.2"
   }
 }
diff --git a/lib/channels/package.json b/lib/channels/package.json
index b51a6d5c33b..2b657cf5277 100644
--- a/lib/channels/package.json
+++ b/lib/channels/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/channels",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "",
   "license": "MIT",
   "main": "dist/index.js",
diff --git a/lib/cli/package.json b/lib/cli/package.json
index b5e8e8e6fa4..9cab1f9e33e 100644
--- a/lib/cli/package.json
+++ b/lib/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/cli",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Storybook's CLI - easiest method of adding storybook to your projects",
   "keywords": [
     "cli",
@@ -25,7 +25,7 @@
     "test": "cd test && ./run_tests.sh"
   },
   "dependencies": {
-    "@storybook/codemod": "^3.3.1",
+    "@storybook/codemod": "^3.3.2",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-env": "^1.6.0",
     "babel-register": "^6.26.0",
@@ -43,24 +43,24 @@
     "update-notifier": "^2.3.0"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "^3.3.1",
-    "@storybook/addon-centered": "^3.3.1",
-    "@storybook/addon-graphql": "^3.3.1",
-    "@storybook/addon-info": "^3.3.1",
-    "@storybook/addon-knobs": "^3.3.1",
-    "@storybook/addon-links": "^3.3.1",
-    "@storybook/addon-notes": "^3.3.1",
-    "@storybook/addon-options": "^3.3.1",
-    "@storybook/addon-storyshots": "^3.3.1",
-    "@storybook/addons": "^3.3.1",
-    "@storybook/angular": "^3.3.1",
-    "@storybook/channel-postmessage": "^3.3.1",
-    "@storybook/channel-websocket": "^3.3.1",
-    "@storybook/channels": "^3.3.1",
-    "@storybook/react": "^3.3.1",
-    "@storybook/react-native": "^3.3.1",
-    "@storybook/ui": "^3.3.1",
-    "@storybook/vue": "^3.3.1",
+    "@storybook/addon-actions": "^3.3.2",
+    "@storybook/addon-centered": "^3.3.2",
+    "@storybook/addon-graphql": "^3.3.2",
+    "@storybook/addon-info": "^3.3.2",
+    "@storybook/addon-knobs": "^3.3.2",
+    "@storybook/addon-links": "^3.3.2",
+    "@storybook/addon-notes": "^3.3.2",
+    "@storybook/addon-options": "^3.3.2",
+    "@storybook/addon-storyshots": "^3.3.2",
+    "@storybook/addons": "^3.3.2",
+    "@storybook/angular": "^3.3.2",
+    "@storybook/channel-postmessage": "^3.3.2",
+    "@storybook/channel-websocket": "^3.3.2",
+    "@storybook/channels": "^3.3.2",
+    "@storybook/react": "^3.3.2",
+    "@storybook/react-native": "^3.3.2",
+    "@storybook/ui": "^3.3.2",
+    "@storybook/vue": "^3.3.2",
     "check-node-version": "2.1.0",
     "npx": "9.7.1"
   }
diff --git a/lib/client-logger/package.json b/lib/client-logger/package.json
index 827a45d3497..b44e20d53a6 100644
--- a/lib/client-logger/package.json
+++ b/lib/client-logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/client-logger",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "",
   "license": "MIT",
   "main": "dist/index.js",
diff --git a/lib/codemod/package.json b/lib/codemod/package.json
index 9fca264145c..b06a5621ca9 100644
--- a/lib/codemod/package.json
+++ b/lib/codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/codemod",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "A collection of codemod scripts written with JSCodeshift",
   "license": "MIT",
   "main": "dist/index.js",
diff --git a/lib/components/package.json b/lib/components/package.json
index 54ef66ab318..b8276db9901 100644
--- a/lib/components/package.json
+++ b/lib/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/components",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Core Storybook Components",
   "license": "MIT",
   "main": "dist/index.js",
@@ -23,8 +23,8 @@
     "react-dom": "*"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "^3.3.1",
-    "@storybook/addon-knobs": "^3.3.1",
-    "@storybook/react": "^3.3.1"
+    "@storybook/addon-actions": "^3.3.2",
+    "@storybook/addon-knobs": "^3.3.2",
+    "@storybook/react": "^3.3.2"
   }
 }
diff --git a/lib/node-logger/package.json b/lib/node-logger/package.json
index a6b379dff7d..63bf75d52fe 100644
--- a/lib/node-logger/package.json
+++ b/lib/node-logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/node-logger",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "",
   "license": "MIT",
   "main": "dist/index.js",
diff --git a/lib/ui/package.json b/lib/ui/package.json
index fcca24c6ee8..a0ba088c3a6 100644
--- a/lib/ui/package.json
+++ b/lib/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/ui",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Core Storybook UI",
   "license": "MIT",
   "main": "dist/index.js",
@@ -14,7 +14,7 @@
     "storybook": "start-storybook -p 9010"
   },
   "dependencies": {
-    "@storybook/components": "^3.3.1",
+    "@storybook/components": "^3.3.2",
     "@storybook/mantra-core": "^1.7.2",
     "@storybook/react-komposer": "^2.0.3",
     "babel-runtime": "^6.26.0",
@@ -41,7 +41,7 @@
     "react-dom": "*"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "^3.3.1",
-    "@storybook/react": "^3.3.1"
+    "@storybook/addon-actions": "^3.3.2",
+    "@storybook/react": "^3.3.2"
   }
 }

From 3e2e915e1099f7477239ca818a38a7e7ff045f9b Mon Sep 17 00:00:00 2001
From: Igor <igor-dv@users.noreply.github.com>
Date: Thu, 28 Dec 2017 08:47:51 +0200
Subject: [PATCH 11/14] Revert "Move everything from lodash to lodash-es"

---
 addons/knobs/package.json                     |  2 +-
 addons/knobs/src/components/Panel.js          |  2 +-
 app/angular/package.json                      |  3 +--
 .../angular/components/app.component.ts       | 17 ++-----------
 .../src/client/preview/angular/helpers.ts     | 25 ++++++++++++++++---
 app/react/package.json                        |  2 +-
 app/react/src/client/preview/element_check.js |  2 +-
 dangerfile.js                                 |  2 +-
 jest.config.js                                |  1 -
 lib/ui/package.json                           |  4 ++-
 lib/ui/src/modules/api/actions/api.js         |  2 +-
 .../modules/shortcuts/actions/shortcuts.js    |  2 +-
 .../ui/components/stories_panel/index.js      |  2 +-
 .../components/stories_panel/text_filter.js   |  2 +-
 .../stories_panel/text_filter.test.js         |  2 +-
 lib/ui/src/modules/ui/containers/layout.js    |  2 +-
 lib/ui/src/modules/ui/libs/filters.js         |  2 +-
 package.json                                  |  3 ++-
 yarn.lock                                     | 14 +++++------
 19 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/addons/knobs/package.json b/addons/knobs/package.json
index 4bee8876c7a..d8bd8a9aa79 100644
--- a/addons/knobs/package.json
+++ b/addons/knobs/package.json
@@ -18,7 +18,7 @@
     "deep-equal": "^1.0.1",
     "global": "^4.3.2",
     "insert-css": "^2.0.0",
-    "lodash-es": "^4.17.4",
+    "lodash.debounce": "^4.0.8",
     "moment": "^2.20.1",
     "prop-types": "^15.6.0",
     "react-color": "^2.11.4",
diff --git a/addons/knobs/src/components/Panel.js b/addons/knobs/src/components/Panel.js
index 141fc4e3374..062f660c23a 100644
--- a/addons/knobs/src/components/Panel.js
+++ b/addons/knobs/src/components/Panel.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import debounce from 'lodash-es/debounce';
+import debounce from 'lodash.debounce';
 
 import PropForm from './PropForm';
 import Types from './types';
diff --git a/app/angular/package.json b/app/angular/package.json
index a1fb1ac2e95..9f396291570 100644
--- a/app/angular/package.json
+++ b/app/angular/package.json
@@ -54,7 +54,7 @@
     "json-loader": "^0.5.4",
     "json-stringify-safe": "^5.0.1",
     "json5": "^0.5.1",
-    "lodash-es": "^4.17.4",
+    "lodash.pick": "^4.4.0",
     "postcss-flexbugs-fixes": "^3.0.0",
     "postcss-loader": "^2.0.5",
     "prop-types": "^15.5.10",
@@ -80,7 +80,6 @@
     "zone.js": "^0.8.19"
   },
   "devDependencies": {
-    "@types/lodash-es": "^4.17.0",
     "babel-cli": "^6.26.0",
     "babel-plugin-transform-decorators": "^6.24.1",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
diff --git a/app/angular/src/client/preview/angular/components/app.component.ts b/app/angular/src/client/preview/angular/components/app.component.ts
index f8a6f636f2f..5f9dffe3534 100644
--- a/app/angular/src/client/preview/angular/components/app.component.ts
+++ b/app/angular/src/client/preview/angular/components/app.component.ts
@@ -2,16 +2,7 @@
 // to provide @Inputs and subscribe to @Outputs, see
 // https://github.com/angular/angular/issues/15360
 // For the time being, the ViewContainerRef approach works pretty well.
-
-import has from 'lodash-es/has';
-import get from 'lodash-es/get';
-import set from 'lodash-es/set';
-import isFunction from 'lodash-es/isFunction';
-import isUndefined from 'lodash-es/isUndefined';
-import isEmpty from 'lodash-es/isEmpty';
-import forEach from 'lodash-es/forEach';
-import invoke from 'lodash-es/invoke';
-
+import * as _ from 'lodash';
 import {
   Component,
   Inject,
@@ -24,12 +15,9 @@ import {
   SimpleChanges,
   SimpleChange
 } from '@angular/core';
-
 import { STORY } from '../app.token';
 import { NgStory, ICollection } from '../types';
 
-const _ = { has, get, set, isFunction, isUndefined, isEmpty , forEach, invoke };
-
 @Component({
   selector: 'app-root',
   template: '<ng-template #target></ng-template>'
@@ -37,7 +25,6 @@ const _ = { has, get, set, isFunction, isUndefined, isEmpty , forEach, invoke };
 export class AppComponent implements AfterViewInit, OnDestroy {
   @ViewChild('target', { read: ViewContainerRef })
   target: ViewContainerRef;
-
   constructor(
     private cfr: ComponentFactoryResolver,
     @Inject(STORY) private data: NgStory
@@ -103,7 +90,7 @@ export class AppComponent implements AfterViewInit, OnDestroy {
     }
 
     if (_.isFunction(props.ngModelChange)) {
-      _.invoke(instance, 'registerOnChange', props.ngModelChange);
+        _.invoke(instance, 'registerOnChange', props.ngModelChange);
     }
   }
 }
diff --git a/app/angular/src/client/preview/angular/helpers.ts b/app/angular/src/client/preview/angular/helpers.ts
index 1c10dbbc98b..4870f525ff1 100644
--- a/app/angular/src/client/preview/angular/helpers.ts
+++ b/app/angular/src/client/preview/angular/helpers.ts
@@ -7,8 +7,6 @@ import {
 } from '@angular/core';
 import {FormsModule} from '@angular/forms'
 
-import _debounce from 'lodash-es/debounce';
-
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { BrowserModule } from '@angular/platform-browser';
 import { AppComponent } from './components/app.component';
@@ -33,7 +31,28 @@ interface IComponent extends Type<any> {
   propsMetadata: any[]
 }
 
-const debounce = (func: IRenderStoryFn | IRenderErrorFn) => _debounce(func, 100);
+// Taken from https://davidwalsh.name/javascript-debounce-function
+// We don't want to pull underscore
+const debounce = (func: IRenderStoryFn | IRenderErrorFn,
+                  wait: number = 100,
+                  immediate: boolean = false): () => void => {
+  let timeout: any;
+  return function () {
+    const context = this, args = arguments;
+    const later = function () {
+      timeout = null;
+      if (!immediate) {
+        func.apply(context, args);
+      }
+    };
+    const callNow = immediate && !timeout;
+    clearTimeout(timeout);
+    timeout = setTimeout(later, wait);
+    if (callNow) {
+      func.apply(context, args);
+    }
+  };
+};
 
 const getComponentMetadata = (
   { component, props = {}, propsMeta = {}, moduleMetadata = {
diff --git a/app/react/package.json b/app/react/package.json
index 742d5ea0940..0213b984eeb 100644
--- a/app/react/package.json
+++ b/app/react/package.json
@@ -60,7 +60,7 @@
     "json-loader": "^0.5.7",
     "json-stringify-safe": "^5.0.1",
     "json5": "^0.5.1",
-    "lodash-es": "^4.17.4",
+    "lodash.flattendeep": "^4.4.0",
     "markdown-loader": "^2.0.1",
     "npmlog": "^4.1.2",
     "postcss-flexbugs-fixes": "^3.2.0",
diff --git a/app/react/src/client/preview/element_check.js b/app/react/src/client/preview/element_check.js
index fdfa3168ab9..cbcb2f518da 100644
--- a/app/react/src/client/preview/element_check.js
+++ b/app/react/src/client/preview/element_check.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import flattenDeep from 'lodash-es/flattenDeep';
+import flattenDeep from 'lodash.flattendeep';
 
 // return true if the element is renderable with react fiber
 export const isValidFiberElement = element =>
diff --git a/dangerfile.js b/dangerfile.js
index 39f30cd6fd3..6b8c437802c 100644
--- a/dangerfile.js
+++ b/dangerfile.js
@@ -1,5 +1,5 @@
 import { fail, danger } from 'danger';
-import { flatten, intersection, isEmpty, includes } from 'lodash-es';
+import { flatten, intersection, isEmpty, includes } from 'lodash';
 
 const pkg = require('./package.json'); // eslint-disable-line import/newline-after-import
 const prLogConfig = pkg['pr-log'];
diff --git a/jest.config.js b/jest.config.js
index 62bfa9a4eff..5cbca1678f6 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -14,7 +14,6 @@ module.exports = {
     '<rootDir>/examples/cra-kitchen-sink',
     '<rootDir>/examples/official-storybook',
   ],
-  transformIgnorePatterns: ['/node_modules/(?!lodash-es/.*)'],
   testPathIgnorePatterns: ['/node_modules/', 'addon-jest.test.js', '/cli/test/'],
   collectCoverage: false,
   collectCoverageFrom: [
diff --git a/lib/ui/package.json b/lib/ui/package.json
index a0ba088c3a6..932540e8d5b 100644
--- a/lib/ui/package.json
+++ b/lib/ui/package.json
@@ -24,7 +24,9 @@
     "global": "^4.3.2",
     "json-stringify-safe": "^5.0.1",
     "keycode": "^2.1.9",
-    "lodash-es": "^4.17.4",
+    "lodash.debounce": "^4.0.8",
+    "lodash.pick": "^4.4.0",
+    "lodash.sortby": "^4.7.0",
     "podda": "^1.2.2",
     "prop-types": "^15.6.0",
     "qs": "^6.5.1",
diff --git a/lib/ui/src/modules/api/actions/api.js b/lib/ui/src/modules/api/actions/api.js
index 0a36f30bc4a..d871a3d9bcf 100755
--- a/lib/ui/src/modules/api/actions/api.js
+++ b/lib/ui/src/modules/api/actions/api.js
@@ -1,4 +1,4 @@
-import pick from 'lodash-es/pick';
+import pick from 'lodash.pick';
 
 export function jumpToStory(storyKinds, selectedKind, selectedStory, direction) {
   const flatteredStories = [];
diff --git a/lib/ui/src/modules/shortcuts/actions/shortcuts.js b/lib/ui/src/modules/shortcuts/actions/shortcuts.js
index cc7e130bce5..1920b154e01 100755
--- a/lib/ui/src/modules/shortcuts/actions/shortcuts.js
+++ b/lib/ui/src/modules/shortcuts/actions/shortcuts.js
@@ -1,4 +1,4 @@
-import pick from 'lodash-es/pick';
+import pick from 'lodash.pick';
 import { features } from '../../../libs/key_events';
 import apiActions from '../../api/actions';
 
diff --git a/lib/ui/src/modules/ui/components/stories_panel/index.js b/lib/ui/src/modules/ui/components/stories_panel/index.js
index 6e1bc12615a..e8282889dd5 100755
--- a/lib/ui/src/modules/ui/components/stories_panel/index.js
+++ b/lib/ui/src/modules/ui/components/stories_panel/index.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import pick from 'lodash-es/pick';
+import pick from 'lodash.pick';
 import Header from './header';
 import Stories from './stories_tree';
 import TextFilter from './text_filter';
diff --git a/lib/ui/src/modules/ui/components/stories_panel/text_filter.js b/lib/ui/src/modules/ui/components/stories_panel/text_filter.js
index d30aa58c2c3..0e88d0ffdc3 100755
--- a/lib/ui/src/modules/ui/components/stories_panel/text_filter.js
+++ b/lib/ui/src/modules/ui/components/stories_panel/text_filter.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import debounce from 'lodash-es/debounce';
+import debounce from 'lodash.debounce';
 import { baseFonts } from '@storybook/components';
 
 const defaultTextValue = '';
diff --git a/lib/ui/src/modules/ui/components/stories_panel/text_filter.test.js b/lib/ui/src/modules/ui/components/stories_panel/text_filter.test.js
index bbb564fe131..aa03026f0c8 100755
--- a/lib/ui/src/modules/ui/components/stories_panel/text_filter.test.js
+++ b/lib/ui/src/modules/ui/components/stories_panel/text_filter.test.js
@@ -2,7 +2,7 @@ import { shallow, mount } from 'enzyme';
 import React from 'react';
 import TextFilter from './text_filter';
 
-jest.mock('lodash-es/debounce', () => jest.fn(fn => fn));
+jest.mock('lodash.debounce', () => jest.fn(fn => fn));
 
 describe('manager.ui.components.stories_panel.test_filter', () => {
   describe('render', () => {
diff --git a/lib/ui/src/modules/ui/containers/layout.js b/lib/ui/src/modules/ui/containers/layout.js
index 4c65c72479d..cb89879735e 100755
--- a/lib/ui/src/modules/ui/containers/layout.js
+++ b/lib/ui/src/modules/ui/containers/layout.js
@@ -1,4 +1,4 @@
-import pick from 'lodash-es/pick';
+import pick from 'lodash.pick';
 import Layout from '../components/layout';
 import genPoddaLoader from '../libs/gen_podda_loader';
 import compose from '../../../compose';
diff --git a/lib/ui/src/modules/ui/libs/filters.js b/lib/ui/src/modules/ui/libs/filters.js
index 947f67f5d9a..358b2a3f645 100755
--- a/lib/ui/src/modules/ui/libs/filters.js
+++ b/lib/ui/src/modules/ui/libs/filters.js
@@ -1,5 +1,5 @@
 import Fuse from 'fuse.js';
-import sortBy from 'lodash-es/sortBy';
+import sortBy from 'lodash.sortby';
 
 const searchOptions = {
   shouldSort: false,
diff --git a/package.json b/package.json
index 358d59a195e..a4db48c3267 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
     "chromatic": "npm --prefix examples/official-storybook run chromatic"
   },
   "devDependencies": {
+    "@types/lodash": "^4.14.91",
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
     "babel-eslint": "^8.1.2",
@@ -72,7 +73,7 @@
     "jest-jasmine2": "^22.0.4",
     "lerna": "^2.5.1",
     "lint-staged": "^6.0.0",
-    "lodash-es": "^4.17.4",
+    "lodash": "^4.17.4",
     "nodemon": "^1.14.3",
     "npmlog": "^4.1.2",
     "prettier": "^1.9.2",
diff --git a/yarn.lock b/yarn.lock
index 3f5ca04b7bc..d73951260eb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -287,13 +287,7 @@
   version "2.8.2"
   resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.2.tgz#6ae4d8740c0da5d5a627df725b4eed71b8e36668"
 
-"@types/lodash-es@^4.17.0":
-  version "4.17.0"
-  resolved "https://registry.yarnpkg.com/@types/lodash-es/-/lodash-es-4.17.0.tgz#ed9044d62ee36a93e0650b112701986b1c74c766"
-  dependencies:
-    "@types/lodash" "*"
-
-"@types/lodash@*":
+"@types/lodash@^4.14.91":
   version "4.14.91"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.91.tgz#794611b28056d16b5436059c6d800b39d573cd3a"
 
@@ -8438,7 +8432,7 @@ lockfile@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.3.tgz#2638fc39a0331e9cac1a04b71799931c9c50df79"
 
-lodash-es@^4.17.4, lodash-es@^4.2.1:
+lodash-es@^4.2.1:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7"
 
@@ -8517,6 +8511,10 @@ lodash.cond@^4.3.0:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5"
 
+lodash.debounce@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+
 lodash.defaults@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"

From b02206a93f69848efab096631cdc2618bc4cb506 Mon Sep 17 00:00:00 2001
From: igor <davydkin.igor@gmail.com>
Date: Thu, 28 Dec 2017 09:01:03 +0200
Subject: [PATCH 12/14] Remove a note about lodash-es from readme

---
 MIGRATION.md | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/MIGRATION.md b/MIGRATION.md
index 531ceec06b9..e331a988902 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -34,16 +34,6 @@ In the case of Vue: `import { ... } from '@storybook/addon-knobs/vue';`
 
 In the case of Angular: `import { ... } from '@storybook/addon-knobs/angular';`
 
-### Storyshots Jest configuration
-
-Storyshots users will need to add a line to their `jest.config.js`:
-
-```js
-  transformIgnorePatterns: ['/node_modules/(?!lodash-es/.*)'],
-```
-
-We are working to resolve the issue that requires this: https://github.com/storybooks/storybook/issues/2570
-
 ## From version 3.1.x to 3.2.x
 
 **NOTE:** technically this is a breaking change, but only if you use TypeScript. Sorry people!

From b3792ef52183924ecbc36487ee680dd0444833d4 Mon Sep 17 00:00:00 2001
From: igor <davydkin.igor@gmail.com>
Date: Thu, 28 Dec 2017 10:31:57 +0200
Subject: [PATCH 13/14] =?UTF-8?q?Use=20=C9=B5ReflectionCapabilities=20+=20?=
 =?UTF-8?q?knobs=20example?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/knobs/src/angular/utils.js             |  12 +-
 .../src/client/preview/angular/utils.ts       | 127 ++----------------
 .../component-with-di/di.component.html       |   8 +-
 .../component-with-di/di.component.stories.ts |  13 +-
 .../stories/component-with-di/di.component.ts |   8 +-
 5 files changed, 42 insertions(+), 126 deletions(-)

diff --git a/addons/knobs/src/angular/utils.js b/addons/knobs/src/angular/utils.js
index 03a810a8d7e..0d463b4ce0f 100644
--- a/addons/knobs/src/angular/utils.js
+++ b/addons/knobs/src/angular/utils.js
@@ -1,5 +1,9 @@
 /* eslint-disable no-param-reassign */
 /* globals window */
+import { ɵReflectionCapabilities } from '@angular/core';
+
+// eslint-disable-next-line new-cap
+const reflectionCapabilities = new ɵReflectionCapabilities();
 
 function getMeta(component, [name1, name2], defaultValue) {
   if (!name2) {
@@ -27,5 +31,11 @@ export function getPropMetadata(component) {
 }
 
 export function getParameters(component) {
-  return getMeta(component, ['parameters'], []);
+  const params = reflectionCapabilities.parameters(component);
+
+  if (!params || !params[0]) {
+    return getMeta(component, ['parameters'], []);
+  }
+
+  return params;
 }
diff --git a/app/angular/src/client/preview/angular/utils.ts b/app/angular/src/client/preview/angular/utils.ts
index 948bf224715..fe83324fa0d 100644
--- a/app/angular/src/client/preview/angular/utils.ts
+++ b/app/angular/src/client/preview/angular/utils.ts
@@ -1,4 +1,6 @@
-import {Type} from '@angular/core';
+import { ɵReflectionCapabilities } from '@angular/core';
+
+const reflectionCapabilities = new ɵReflectionCapabilities();
 
 function getMeta(component: any, [name1, name2]: any, defaultValue: any) {
   if (!name2) {
@@ -26,124 +28,11 @@ export function getPropMetadata(component: any) {
 }
 
 export function getParameters(component: any) {
-  return parameters(component);
-}
+  const params = reflectionCapabilities.parameters(component);
 
-/**
- * @TODO refactor that
- * That code is copied from: angular/core/src/reflection/reflection_capabilities.ts
- */
-const PARAMETERS = '__paramaters__';
-function convertTsickleDecoratorIntoMetadata(decoratorInvocations: any[]): any[] {
-  if (!decoratorInvocations) {
-    return [];
-  }
-  return decoratorInvocations.map(decoratorInvocation => {
-    const decoratorType = decoratorInvocation.type;
-    const annotationCls = decoratorType.annotationCls;
-    const annotationArgs = decoratorInvocation.args ? decoratorInvocation.args : [];
-    return new (Function.prototype.bind.apply(annotationCls, [null].concat(annotationArgs)))();
-  });
-}
-
-function getParentCtor(ctor: Function): Type<any> {
-  const parentProto = Object.getPrototypeOf(ctor.prototype);
-  const parentCtor = parentProto ? parentProto.constructor : null;
-  // Note: We always use `Object` as the null value
-  // to simplify checking later on.
-  return parentCtor || Object;
-}
-
-function parameters(type: Type<any>): any {
-  // Note: only report metadata if we have at least one class decorator
-  // to stay in sync with the static reflector.
-  if (typeof type !== 'function') {
-    return [];
+  if (!params || !params[0]) {
+    return getMeta(component, ['parameters'], []);
   }
 
-
-  const parentCtor = getParentCtor(type);
-  let _parameters = getOwnParameters(type, parentCtor);
-  if (!_parameters && parentCtor !== Object && _parameters !== null) {
-    _parameters = (<any>_parameters)(parentCtor);
-  }
-  return _parameters || [];
-}
-
-function _zipTypesAndAnnotations(paramTypes: any[], paramAnnotations: any[]): any[][] {
-  let result: any[][];
-
-  if (typeof paramTypes === 'undefined') {
-    result = new Array(paramAnnotations.length);
-  } else {
-    result = new Array(paramTypes.length);
-  }
-
-  for (let i = 0; i < result.length; i++) {
-    // TS outputs Object for parameters without types, while Traceur omits
-    // the annotations. For now we preserve the Traceur behavior to aid
-    // migration, but this can be revisited.
-    if (typeof paramTypes === 'undefined') {
-      result[i] = [];
-    } else if (paramTypes[i] !== Object) {
-      result[i] = [paramTypes[i]];
-    } else {
-      result[i] = [];
-    }
-    if (paramAnnotations && paramAnnotations[i] != null) {
-      result[i] = result[i].concat(paramAnnotations[i]);
-    }
-  }
-  return result;
-}
-
-const DELEGATE_CTOR = /^function\s+\S+\(\)\s*{[\s\S]+\.apply\(this,\s*arguments\)/;
-function getOwnParameters(type: Type<any>, parentCtor: any): any[][] {
-  // If we have no decorators, we only have function.length as metadata.
-  // In that case, to detect whether a child class declared an own constructor or not,
-  // we need to look inside of that constructor to check whether it is
-  // just calling the parent.
-  // This also helps to work around for https://github.com/Microsoft/TypeScript/issues/12439
-  // that sets 'design:paramtypes' to []
-  // if a class inherits from another class but has no ctor declared itself.
-  if (DELEGATE_CTOR.exec(type.toString())) {
-    return null;
-  }
-
-  // Prefer the direct API.
-  if ((<any>type).parameters && (<any>type).parameters !== parentCtor.parameters) {
-    return (<any>type).parameters;
-  }
-
-  if ((<any>type)['__parameters__']) {
-    return getMeta(type, ['__parameters__'], {});
-  }
-
-  // API of tsickle for lowering decorators to properties on the class.
-  const tsickleCtorParams = (<any>type).ctorParameters;
-  if (tsickleCtorParams && tsickleCtorParams !== parentCtor.ctorParameters) {
-    // Newer tsickle uses a function closure
-    // Retain the non-function case for compatibility with older tsickle
-    const ctorParameters =
-      typeof tsickleCtorParams === 'function' ? tsickleCtorParams() : tsickleCtorParams;
-    const paramTypes = ctorParameters.map((ctorParam: any) => ctorParam && ctorParam.type);
-    const paramAnnotations = ctorParameters.map(
-      (ctorParam: any) =>
-        ctorParam && convertTsickleDecoratorIntoMetadata(ctorParam.decorators));
-    return _zipTypesAndAnnotations(paramTypes, paramAnnotations);
-  }
-
-  // API for metadata created by invoking the decorators.
-  const _paramAnnotations = type.hasOwnProperty(PARAMETERS) && (type as any)[PARAMETERS];
-  const _paramTypes = (<any>window)['Reflect'] && (<any>window)['Reflect'].getOwnMetadata &&
-    (<any>window)['Reflect'].getOwnMetadata('design:paramtypes', type);
-  if (_paramTypes || _paramAnnotations) {
-    return _zipTypesAndAnnotations(_paramTypes, _paramAnnotations);
-  }
-
-  // If a class has no decorators, at least create metadata
-  // based on function.length.
-  // Note: We know that this is a real constructor as we checked
-  // the content of the constructor above.
-  return new Array((<any>type.length)).fill(undefined);
-}
+  return params;
+}
\ No newline at end of file
diff --git a/examples/angular-cli/src/stories/component-with-di/di.component.html b/examples/angular-cli/src/stories/component-with-di/di.component.html
index e6832d0e418..fc6c74c42ea 100644
--- a/examples/angular-cli/src/stories/component-with-di/di.component.html
+++ b/examples/angular-cli/src/stories/component-with-di/di.component.html
@@ -1,3 +1,7 @@
 <div>
-    <div>All dependencies are defined: {{isAllDeps()}}</div>
-</div>
\ No newline at end of file
+  <div>All dependencies are defined: {{isAllDeps()}}</div>
+  <div>Title: {{title}}</div>
+  <div>Injector: {{injector.constructor.toString()}}</div>
+  <div>ElementRef: {{elRefStr()}}</div>
+  <div>TestToken: {{testToken}}</div>
+</div>
diff --git a/examples/angular-cli/src/stories/component-with-di/di.component.stories.ts b/examples/angular-cli/src/stories/component-with-di/di.component.stories.ts
index fde5151aa46..e3bb1396b8a 100644
--- a/examples/angular-cli/src/stories/component-with-di/di.component.stories.ts
+++ b/examples/angular-cli/src/stories/component-with-di/di.component.stories.ts
@@ -1,5 +1,6 @@
-import {storiesOf} from '@storybook/angular';
-import {DiComponent} from './di.component';
+import { storiesOf } from '@storybook/angular';
+import { withKnobs, text } from '@storybook/addon-knobs/angular';
+import { DiComponent } from './di.component';
 
 storiesOf('Component dependencies', module)
   .add('inputs and inject dependencies', () => ({
@@ -7,4 +8,12 @@ storiesOf('Component dependencies', module)
     props: {
       title: 'Component dependencies'
     }
+  }))
+  .addDecorator(withKnobs)
+  .add('inputs and inject dependencies with knobs', () => ({
+    component: DiComponent,
+    props: {
+      title: text('title', 'Component dependencies')
+    }
   }));
+
diff --git a/examples/angular-cli/src/stories/component-with-di/di.component.ts b/examples/angular-cli/src/stories/component-with-di/di.component.ts
index b39f76204c1..e3bb5df5dec 100644
--- a/examples/angular-cli/src/stories/component-with-di/di.component.ts
+++ b/examples/angular-cli/src/stories/component-with-di/di.component.ts
@@ -11,14 +11,18 @@ export const TEST_TOKEN = new InjectionToken<string>('test');
 })
 export class DiComponent {
   @Input() title: string;
-  
+
   constructor(
     protected injector: Injector,
     protected elRef: ElementRef,
     @Inject(TEST_TOKEN) protected testToken: number
   ) {}
-  
+
   isAllDeps(): boolean {
     return Boolean(this.testToken && this.elRef && this.injector && this.title);
   }
+
+  elRefStr(): string {
+    return JSON.stringify(this.elRef);
+  }
 }

From b3db732fde70a4946d5cb9c4b0293f3ff4e5c3ff Mon Sep 17 00:00:00 2001
From: hypnos <Filipp.Riabchun@jetbrains.com>
Date: Thu, 28 Dec 2017 14:33:42 +0300
Subject: [PATCH 14/14] Run `yarn postpublish`

---
 lib/cli/test/snapshots/angular-cli/package.json           | 8 ++++----
 lib/cli/test/snapshots/meteor/package.json                | 6 +++---
 lib/cli/test/snapshots/react/package.json                 | 6 +++---
 lib/cli/test/snapshots/react_native/package.json          | 6 +++---
 lib/cli/test/snapshots/react_native_scripts/package.json  | 6 +++---
 lib/cli/test/snapshots/react_project/package.json         | 6 +++---
 lib/cli/test/snapshots/react_scripts/package.json         | 6 +++---
 lib/cli/test/snapshots/sfc_vue/package.json               | 6 +++---
 .../snapshots/update_package_organisations/package.json   | 2 +-
 lib/cli/test/snapshots/vue/package.json                   | 6 +++---
 lib/cli/test/snapshots/webpack_react/package.json         | 6 +++---
 11 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lib/cli/test/snapshots/angular-cli/package.json b/lib/cli/test/snapshots/angular-cli/package.json
index 786b15ddcb0..b9637133840 100644
--- a/lib/cli/test/snapshots/angular-cli/package.json
+++ b/lib/cli/test/snapshots/angular-cli/package.json
@@ -44,10 +44,10 @@
     "ts-node": "1.2.1",
     "tslint": "^4.3.0",
     "typescript": "~2.4.0",
-    "@storybook/angular": "^3.3.1",
-    "@storybook/addon-notes": "^3.3.1",
-    "@storybook/addon-actions": "^3.3.1",
-    "@storybook/addon-links": "^3.3.1",
+    "@storybook/angular": "^3.3.2",
+    "@storybook/addon-notes": "^3.3.2",
+    "@storybook/addon-actions": "^3.3.2",
+    "@storybook/addon-links": "^3.3.2",
     "@types/lodash-es": "^4.17.0"
   }
 }
diff --git a/lib/cli/test/snapshots/meteor/package.json b/lib/cli/test/snapshots/meteor/package.json
index c882804a44e..cf7110e91b7 100644
--- a/lib/cli/test/snapshots/meteor/package.json
+++ b/lib/cli/test/snapshots/meteor/package.json
@@ -18,8 +18,8 @@
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-1": "^6.24.1",
     "babel-root-slash-import": "^1.1.0",
-    "@storybook/react": "^3.3.1",
-    "@storybook/addon-actions": "^3.3.1",
-    "@storybook/addon-links": "^3.3.1"
+    "@storybook/react": "^3.3.2",
+    "@storybook/addon-actions": "^3.3.2",
+    "@storybook/addon-links": "^3.3.2"
   }
 }
diff --git a/lib/cli/test/snapshots/react/package.json b/lib/cli/test/snapshots/react/package.json
index 0201f6e4498..e02419d7ee2 100644
--- a/lib/cli/test/snapshots/react/package.json
+++ b/lib/cli/test/snapshots/react/package.json
@@ -20,8 +20,8 @@
     "rollup-plugin-commonjs": "^8.2.0",
     "rollup-plugin-node-resolve": "^3.0.0",
     "rollup-plugin-replace": "^1.1.1",
-    "@storybook/react": "^3.3.1",
-    "@storybook/addon-actions": "^3.3.1",
-    "@storybook/addon-links": "^3.3.1"
+    "@storybook/react": "^3.3.2",
+    "@storybook/addon-actions": "^3.3.2",
+    "@storybook/addon-links": "^3.3.2"
   }
 }
diff --git a/lib/cli/test/snapshots/react_native/package.json b/lib/cli/test/snapshots/react_native/package.json
index 3481aa26689..5c03396a03c 100644
--- a/lib/cli/test/snapshots/react_native/package.json
+++ b/lib/cli/test/snapshots/react_native/package.json
@@ -16,9 +16,9 @@
     "babel-preset-react-native": "3.0.1",
     "jest": "20.0.4",
     "react-test-renderer": "16.0.0-alpha.12",
-    "@storybook/react-native": "^3.3.1",
-    "@storybook/addon-actions": "^3.3.1",
-    "@storybook/addon-links": "^3.3.1",
+    "@storybook/react-native": "^3.3.2",
+    "@storybook/addon-actions": "^3.3.2",
+    "@storybook/addon-links": "^3.3.2",
     "react-dom": "16.0.0-alpha.12",
     "prop-types": "^15.6.0"
   },
diff --git a/lib/cli/test/snapshots/react_native_scripts/package.json b/lib/cli/test/snapshots/react_native_scripts/package.json
index 60906b12344..26f95edc6f4 100644
--- a/lib/cli/test/snapshots/react_native_scripts/package.json
+++ b/lib/cli/test/snapshots/react_native_scripts/package.json
@@ -6,9 +6,9 @@
     "react-native-scripts": "1.3.1",
     "jest-expo": "~20.0.0",
     "react-test-renderer": "16.0.0-alpha.12",
-    "@storybook/react-native": "^3.3.1",
-    "@storybook/addon-actions": "^3.3.1",
-    "@storybook/addon-links": "^3.3.1",
+    "@storybook/react-native": "^3.3.2",
+    "@storybook/addon-actions": "^3.3.2",
+    "@storybook/addon-links": "^3.3.2",
     "react-dom": "16.0.0-alpha.12",
     "prop-types": "^15.6.0"
   },
diff --git a/lib/cli/test/snapshots/react_project/package.json b/lib/cli/test/snapshots/react_project/package.json
index 52a18a81d4d..d7d25e77f7c 100644
--- a/lib/cli/test/snapshots/react_project/package.json
+++ b/lib/cli/test/snapshots/react_project/package.json
@@ -13,9 +13,9 @@
     "babel-preset-react": "^6.24.1",
     "react": "^15.6.1",
     "react-dom": "^15.6.1",
-    "@storybook/react": "^3.3.1",
-    "@storybook/addon-actions": "^3.3.1",
-    "@storybook/addon-links": "^3.3.1"
+    "@storybook/react": "^3.3.2",
+    "@storybook/addon-actions": "^3.3.2",
+    "@storybook/addon-links": "^3.3.2"
   },
   "peerDependencies": {
     "react": "*",
diff --git a/lib/cli/test/snapshots/react_scripts/package.json b/lib/cli/test/snapshots/react_scripts/package.json
index 46ecf7798fc..38fe333c681 100644
--- a/lib/cli/test/snapshots/react_scripts/package.json
+++ b/lib/cli/test/snapshots/react_scripts/package.json
@@ -16,8 +16,8 @@
     "build-storybook": "build-storybook -s public"
   },
   "devDependencies": {
-    "@storybook/react": "^3.3.1",
-    "@storybook/addon-actions": "^3.3.1",
-    "@storybook/addon-links": "^3.3.1"
+    "@storybook/react": "^3.3.2",
+    "@storybook/addon-actions": "^3.3.2",
+    "@storybook/addon-links": "^3.3.2"
   }
 }
diff --git a/lib/cli/test/snapshots/sfc_vue/package.json b/lib/cli/test/snapshots/sfc_vue/package.json
index 8065219ea38..ef83a9354cb 100644
--- a/lib/cli/test/snapshots/sfc_vue/package.json
+++ b/lib/cli/test/snapshots/sfc_vue/package.json
@@ -49,9 +49,9 @@
     "webpack-dev-middleware": "^1.10.0",
     "webpack-hot-middleware": "^2.18.0",
     "webpack-merge": "^4.1.0",
-    "@storybook/vue": "^3.3.1",
-    "@storybook/addon-actions": "^3.3.1",
-    "@storybook/addon-links": "^3.3.1",
+    "@storybook/vue": "^3.3.2",
+    "@storybook/addon-actions": "^3.3.2",
+    "@storybook/addon-links": "^3.3.2",
     "babel-preset-vue": "^2.0.0"
   },
   "engines": {
diff --git a/lib/cli/test/snapshots/update_package_organisations/package.json b/lib/cli/test/snapshots/update_package_organisations/package.json
index 541d861ce8a..8820999a136 100644
--- a/lib/cli/test/snapshots/update_package_organisations/package.json
+++ b/lib/cli/test/snapshots/update_package_organisations/package.json
@@ -8,7 +8,7 @@
     "react-scripts": "0.9.x"
   },
   "devDependencies": {
-    "@storybook/react": "^3.3.1"
+    "@storybook/react": "^3.3.2"
   },
   "scripts": {
     "start": "react-scripts start",
diff --git a/lib/cli/test/snapshots/vue/package.json b/lib/cli/test/snapshots/vue/package.json
index a7bc9a57a43..c7c4b903a5f 100644
--- a/lib/cli/test/snapshots/vue/package.json
+++ b/lib/cli/test/snapshots/vue/package.json
@@ -34,9 +34,9 @@
     "rollup-plugin-serve": "^0.4.0",
     "rollup-plugin-vue": "^2.4.0",
     "rollup-watch": "^4.0.0",
-    "@storybook/vue": "^3.3.1",
-    "@storybook/addon-actions": "^3.3.1",
-    "@storybook/addon-links": "^3.3.1",
+    "@storybook/vue": "^3.3.2",
+    "@storybook/addon-actions": "^3.3.2",
+    "@storybook/addon-links": "^3.3.2",
     "babel-preset-vue": "^2.0.0"
   }
 }
diff --git a/lib/cli/test/snapshots/webpack_react/package.json b/lib/cli/test/snapshots/webpack_react/package.json
index ef47ab91d1c..33bf7d1385d 100644
--- a/lib/cli/test/snapshots/webpack_react/package.json
+++ b/lib/cli/test/snapshots/webpack_react/package.json
@@ -17,8 +17,8 @@
     "babel-loader": "^7.1.2",
     "babel-preset-react": "^6.24.1",
     "webpack": "^3.5.5",
-    "@storybook/react": "^3.3.1",
-    "@storybook/addon-actions": "^3.3.1",
-    "@storybook/addon-links": "^3.3.1"
+    "@storybook/react": "^3.3.2",
+    "@storybook/addon-actions": "^3.3.2",
+    "@storybook/addon-links": "^3.3.2"
   }
 }