Merge branch 'master' into angular-cli-stories-separation

storybookjs · Dec 28, 2017 · 469ecb1 · 469ecb1
2 parents 7d422a8 + ce993cc
commit 469ecb1
Show file tree

Hide file tree

Showing 58 changed files with 337 additions and 261 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,24 @@
+# 3.3.3
+
+2017-December-29
+
+#### Bug Fixes
+
+-   [app:angular] Fixed dependency injection for components [#2566](https://github.com/storybooks/storybook/pull/2566)
+-   Revert "Move everything from lodash to lodash-es" [#2591](https://github.com/storybooks/storybook/pull/2591)
+
+#### Maintenance
+
+-   Update CLI snapshots as a postpublish step [#2565](https://github.com/storybooks/storybook/pull/2565)
+-   Add more `imports` eslint rules [#2589](https://github.com/storybooks/storybook/pull/2589)
+
+#### Dependency Upgrades
+
+-   Upgraded `@storybook/addon-actions` in `/docs` from "3.2.18" to "3.3.1" [#2580](https://github.com/storybooks/storybook/pull/2580)
+-   Upgraded `@storybook/addon-links` in `/docs` from "3.2.18" to "3.3.1" [#2580](https://github.com/storybooks/storybook/pull/2580)
+-   Upgraded `@storybook/addons` in `/docs` from "3.2.18" to "3.3.1" [#2580](https://github.com/storybooks/storybook/pull/2580)
+-   Upgraded `@storybook/react` in `/docs` from "3.2.18" to "3.3.1" [#2580](https://github.com/storybooks/storybook/pull/2580)
+
 # 3.3.2
 
 2017-December-28

diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -25,8 +25,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/components": "^3.3.2",
-    "axe-core": "^2.6.0",
+    "@storybook/components": "^3.3.3",
+    "axe-core": "^2.6.1",
     "prop-types": "^15.6.0"
   },
   "peerDependencies": {

diff --git a/addons/actions/package.json b/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"

diff --git a/addons/background/package.json b/addons/background/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "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
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-centered",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "Storybook decorator to center components",
   "license": "MIT",
   "author": "Muhammed Thanish <[email protected]>",

diff --git a/addons/events/package.json b/addons/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-events",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "Add events to your Storybook stories.",
   "keywords": [
     "addon",

diff --git a/addons/graphql/package.json b/addons/graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-graphql",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "Storybook addon to display the GraphiQL IDE",
   "keywords": [
     "storybook"

diff --git a/addons/info/package.json b/addons/info/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-info",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "A Storybook addon to show additional information for your stories.",
   "license": "MIT",
   "main": "dist/index.js",
@@ -15,8 +15,8 @@
     "storybook": "start-storybook -p 9010"
   },
   "dependencies": {
-    "@storybook/client-logger": "^3.3.2",
-    "@storybook/components": "^3.3.2",
+    "@storybook/client-logger": "^3.3.3",
+    "@storybook/components": "^3.3.3",
     "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
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-jest",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "React storybook addon that show component jest report",
   "keywords": [
     "addon",
@@ -25,7 +25,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/components": "^3.3.2",
+    "@storybook/components": "^3.3.3",
     "glamor": "^2.20.40",
     "glamorous": "^4.11.2",
     "global": "^4.3.2",

diff --git a/addons/knobs/package.json b/addons/knobs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-knobs",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "Storybook Addon Prop Editor Component",
   "license": "MIT",
   "main": "dist/index.js",

diff --git a/addons/links/package.json b/addons/links/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-links",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "Story Links addon for storybook",
   "keywords": [
     "storybook"
@@ -22,7 +22,7 @@
     "storybook": "start-storybook -p 9001"
   },
   "dependencies": {
-    "@storybook/components": "^3.3.2",
+    "@storybook/components": "^3.3.3",
     "global": "^4.3.2",
     "prop-types": "^15.5.10"
   },

diff --git a/addons/notes/package.json b/addons/notes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-notes",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "Write notes for your Storybook stories.",
   "keywords": [
     "addon",

diff --git a/addons/options/package.json b/addons/options/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-options",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "Options addon for storybook",
   "keywords": [
     "storybook"

diff --git a/addons/storyshots/package.json b/addons/storyshots/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storyshots",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.",
   "license": "MIT",
   "main": "dist/index.js",
@@ -16,7 +16,7 @@
     "example": "jest storyshot.test"
   },
   "dependencies": {
-    "@storybook/channels": "^3.3.2",
+    "@storybook/channels": "^3.3.3",
     "babel-runtime": "^6.26.0",
     "glob": "^7.1.2",
     "global": "^4.3.2",
@@ -25,8 +25,8 @@
     "read-pkg-up": "^3.0.0"
   },
   "devDependencies": {
-    "@storybook/addons": "^3.3.2",
-    "@storybook/react": "^3.3.2",
+    "@storybook/addons": "^3.3.3",
+    "@storybook/react": "^3.3.3",
     "babel-cli": "^6.26.0",
     "babel-jest": "^20.0.3",
     "babel-plugin-transform-runtime": "^6.23.0",
@@ -40,8 +40,8 @@
     "react-dom": "^16.1.0"
   },
   "peerDependencies": {
-    "@storybook/addons": "^3.3.2",
-    "babel-core": "^6.26.0 | ^7.0.0-0",
+    "@storybook/addons": "^3.3.3",
+    "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
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-viewport",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "Storybook addon to change the viewport size to mobile",
   "main": "register.js",
   "keywords": [
@@ -11,7 +11,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@storybook/components": "^3.3.2",
+    "@storybook/components": "^3.3.3",
     "global": "^4.3.2",
     "prop-types": "^15.5.10"
   },

diff --git a/app/angular/package.json b/app/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/angular",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "Storybook for Anglar: Develop Angular Components in isolation with Hot Reloading.",
   "homepage": "https://github.com/storybooks/storybook/tree/master/apps/angular",
   "bugs": {
@@ -23,11 +23,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@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",
+    "@storybook/addon-actions": "^3.3.3",
+    "@storybook/addon-links": "^3.3.3",
+    "@storybook/addons": "^3.3.3",
+    "@storybook/channel-postmessage": "^3.3.3",
+    "@storybook/ui": "^3.3.3",
     "airbnb-js-shims": "^1.1.1",
     "angular2-template-loader": "^0.6.2",
     "autoprefixer": "^7.1.1",

diff --git a/app/angular/src/client/preview/index.js b/app/angular/src/client/preview/index.js
@@ -53,3 +53,5 @@ const renderUI = () => {
 };
 
 reduxStore.subscribe(renderUI);
+
+export const forceReRender = () => render(context, true);
diff --git a/app/angular/src/client/preview/render.js b/app/angular/src/client/preview/render.js
@@ -22,7 +22,7 @@ export function renderException(error) {
   logger.error(error.stack);
 }
 
-export function renderMain(data, storyStore) {
+export function renderMain(data, storyStore, forceRender) {
   if (storyStore.size() === 0) return null;
 
   const { selectedKind, selectedStory } = data;
@@ -39,7 +39,7 @@ export function renderMain(data, storyStore) {
   //    https://github.com/storybooks/react-storybook/issues/116
 
   const reRender = selectedKind !== previousKind || previousStory !== selectedStory;
-  if (reRender) {
+  if (reRender || forceRender) {
     // We need to unmount the existing set of components in the DOM node.
     // Otherwise, React may not recrease instances for every story run.
     // This could leads to issues like below:
@@ -54,14 +54,14 @@ export function renderMain(data, storyStore) {
   return renderNgApp(story, context, reRender);
 }
 
-export default function renderPreview({ reduxStore, storyStore }) {
+export default function renderPreview({ reduxStore, storyStore }, forceRender = false) {
   const state = reduxStore.getState();
   if (state.error) {
     return renderException(state.error);
   }
 
   try {
-    return renderMain(state, storyStore);
+    return renderMain(state, storyStore, forceRender);
   } catch (ex) {
     return renderException(ex);
   }

diff --git a/app/react-native/package.json b/app/react-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react-native",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "A better way to develop React Native Components for your app",
   "keywords": [
     "react",
@@ -25,11 +25,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@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",
+    "@storybook/addon-actions": "^3.3.3",
+    "@storybook/addon-links": "^3.3.3",
+    "@storybook/addons": "^3.3.3",
+    "@storybook/channel-websocket": "^3.3.3",
+    "@storybook/ui": "^3.3.3",
     "autoprefixer": "^7.2.3",
     "babel-loader": "^7.1.2",
     "babel-plugin-syntax-async-functions": "^6.13.0",
@@ -76,7 +76,7 @@
     "react-native": "^0.51.0"
   },
   "peerDependencies": {
-    "babel-core": "^6.26.0 | ^7.0.0-0",
+    "babel-core": "^6.26.0 || ^7.0.0-0",
     "react": "*",
     "react-native": ">=0.27.0"
   }

diff --git a/app/react/package.json b/app/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.",
   "homepage": "https://github.com/storybooks/storybook/tree/master/app/react",
   "bugs": {
@@ -23,13 +23,13 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@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",
+    "@storybook/addon-actions": "^3.3.3",
+    "@storybook/addon-links": "^3.3.3",
+    "@storybook/addons": "^3.3.3",
+    "@storybook/channel-postmessage": "^3.3.3",
+    "@storybook/client-logger": "^3.3.3",
+    "@storybook/node-logger": "^3.3.3",
+    "@storybook/ui": "^3.3.3",
     "airbnb-js-shims": "^1.4.0",
     "autoprefixer": "^7.2.3",
     "babel-loader": "^7.1.2",

diff --git a/app/react/src/client/index.js b/app/react/src/client/index.js
@@ -4,7 +4,14 @@ import deprecate from 'util-deprecate';
 import { action as deprecatedAction } from '@storybook/addon-actions';
 import { linkTo as deprecatedLinkTo } from '@storybook/addon-links';
 
-export { storiesOf, setAddon, addDecorator, configure, getStorybook } from './preview';
+export {
+  storiesOf,
+  setAddon,
+  addDecorator,
+  configure,
+  getStorybook,
+  forceReRender,
+} from './preview';
 
 export const action = deprecate(
   deprecatedAction,

diff --git a/app/react/src/client/preview/index.js b/app/react/src/client/preview/index.js
@@ -21,7 +21,9 @@ const isBrowser =
   !(navigator.userAgent.indexOf('jsdom') > -1);
 
 const storyStore = new StoryStore();
+/* eslint-disable no-underscore-dangle */
 const reduxStore = createStore(reducer);
+/* eslint-enable */
 const context = { storyStore, reduxStore };
 
 if (isBrowser) {
@@ -54,3 +56,5 @@ const renderUI = () => {
 };
 
 reduxStore.subscribe(renderUI);
+
+export const forceReRender = () => render(context, true);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -53,3 +53,5 @@ const renderUI = () => {
		};

		reduxStore.subscribe(renderUI);

		export const forceReRender = () => render(context, true);