From 24dc88645ec49447323f9288d47a9a9bf1b8528f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Loughry=20=F0=9F=91=A8=E2=80=8D=F0=9F=92=BB?= Date: Wed, 7 Mar 2018 11:22:53 -0800 Subject: [PATCH 1/8] Move "@types/react" to dev dependencies --- addons/notes/package.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/notes/package.json b/addons/notes/package.json index a33ca6c5ec9..36f399b8f8a 100644 --- a/addons/notes/package.json +++ b/addons/notes/package.json @@ -26,13 +26,11 @@ "util-deprecate": "^1.0.2" }, "devDependencies": { - "@storybook/react": "^3.4.0-alpha.9" + "@storybook/react": "^3.4.0-alpha.9", + "@types/react": "^16.0.20" }, "peerDependencies": { "@storybook/addons": "^3.3.0", "react": "*" - }, - "optionalDependencies": { - "@types/react": "^16.0.20" } } From f2f4c65a99f9efe73a300e630764a2720ede500a Mon Sep 17 00:00:00 2001 From: Mohamed Shaaban <3688136+mshaaban088@users.noreply.github.com> Date: Thu, 8 Mar 2018 22:26:18 +0100 Subject: [PATCH 2/8] Fix broken storybook website link in Addon-gallery --- docs/src/pages/addons/addon-gallery/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/pages/addons/addon-gallery/index.md b/docs/src/pages/addons/addon-gallery/index.md index f4c080b86e4..0091a4407a6 100644 --- a/docs/src/pages/addons/addon-gallery/index.md +++ b/docs/src/pages/addons/addon-gallery/index.md @@ -48,7 +48,7 @@ With this addon, you can switch between background colors and background images ### [Viewport](https://github.com/storybooks/storybook/tree/master/addons/viewport) -Viewport allows your stories to be displayed in different sizes and layouts in [Storybook](https://storybookjs.org). This helps build responsive components inside of Storybook. +Viewport allows your stories to be displayed in different sizes and layouts in [Storybook](https://storybook.js.org). This helps build responsive components inside of Storybook. ## Community Addons From c07ac213596c8d04ed99a9e5bfcbcfc3f04c1e11 Mon Sep 17 00:00:00 2001 From: Mohamed Shaaban <3688136+mshaaban088@users.noreply.github.com> Date: Fri, 9 Mar 2018 00:31:48 +0100 Subject: [PATCH 3/8] Fix broken storybook website link in viewport --- addons/viewport/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/viewport/README.md b/addons/viewport/README.md index 05107e1f1da..5f8705db9c9 100644 --- a/addons/viewport/README.md +++ b/addons/viewport/README.md @@ -1,6 +1,6 @@ # Storybook Viewport Addon -Storybook Viewport Addon allows your stories to be displayed in different sizes and layouts in [Storybook](https://storybookjs.org). This helps build responsive components inside of Storybook. +Storybook Viewport Addon allows your stories to be displayed in different sizes and layouts in [Storybook](https://storybook.js.org). This helps build responsive components inside of Storybook. [Framework Support](https://github.com/storybooks/storybook/blob/master/ADDONS_SUPPORT.md) From 492d949ba4acb432219a9a2a12544c85c347ef0a Mon Sep 17 00:00:00 2001 From: Josiah Donor Date: Thu, 8 Mar 2018 16:35:12 -0800 Subject: [PATCH 4/8] Improve grammar --- docs/src/pages/basics/guide-react/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/pages/basics/guide-react/index.md b/docs/src/pages/basics/guide-react/index.md index cc6004eead3..530b46e1bcc 100644 --- a/docs/src/pages/basics/guide-react/index.md +++ b/docs/src/pages/basics/guide-react/index.md @@ -11,7 +11,7 @@ You may have tried to use our quick start guide to setup your project for Storyb Storybook has its own Webpack setup and a dev server. Webpack setup is very similar to [Create React App](https://github.com/facebookincubator/create-react-app), but allows you to configure as you want. -In this guide, we are trying to set up Storybook for your React project. +In this guide, we will set up Storybook for your React project. ## Table of contents From c88fbe2c1d5036bd91c33f08e443e5f2ed14f4dc Mon Sep 17 00:00:00 2001 From: Hypnosphi Date: Fri, 9 Mar 2018 23:25:37 +0200 Subject: [PATCH 5/8] Revert "Update enzyme-to-json from 3.3.1 to 3.3.2 in examples/official-storybook" This reverts commit 6260ac2 --- examples/official-storybook/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/official-storybook/package.json b/examples/official-storybook/package.json index 92336620c04..c91e5529a45 100644 --- a/examples/official-storybook/package.json +++ b/examples/official-storybook/package.json @@ -27,7 +27,7 @@ "@storybook/node-logger": "^3.4.0-rc.0", "@storybook/react": "^3.4.0-rc.0", "babel-runtime": "^6.26.0", - "enzyme-to-json": "^3.3.2", + "enzyme-to-json": "^3.3.1", "eventemitter3": "^3.0.1", "format-json": "^1.0.3", "global": "^4.3.2", From 11cfcade8bbfa71a6c0e18c91d2430b8bdba1856 Mon Sep 17 00:00:00 2001 From: Hypnosphi Date: Fri, 9 Mar 2018 23:25:44 +0200 Subject: [PATCH 6/8] Revert "Update enzyme-to-json from 3.3.1 to 3.3.2 in examples/cra-kitchen-sink" This reverts commit f932571 --- examples/cra-kitchen-sink/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/cra-kitchen-sink/package.json b/examples/cra-kitchen-sink/package.json index 6db25e5da20..035e4e5f592 100644 --- a/examples/cra-kitchen-sink/package.json +++ b/examples/cra-kitchen-sink/package.json @@ -35,7 +35,7 @@ "babel-runtime": "^6.26.0", "enzyme": "^3.3.0", "enzyme-adapter-react-16": "^1.1.0", - "enzyme-to-json": "^3.3.2", + "enzyme-to-json": "^3.3.1", "jest": "^20.0.4", "react-scripts": "^1.1.1", "webpack": "^3.11.0" From c4c174c25f13ca083011e28b520541c35e69ab01 Mon Sep 17 00:00:00 2001 From: Hypnosphi Date: Fri, 9 Mar 2018 23:25:51 +0200 Subject: [PATCH 7/8] Revert "Update enzyme-to-json from 3.3.1 to 3.3.2 in addons/storyshots" This reverts commit ce0754a --- addons/storyshots/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/storyshots/package.json b/addons/storyshots/package.json index 7c06daaa4ce..dba770bfb18 100644 --- a/addons/storyshots/package.json +++ b/addons/storyshots/package.json @@ -31,7 +31,7 @@ "@storybook/addon-links": "^3.4.0-rc.0", "@storybook/addons": "^3.4.0-rc.0", "@storybook/react": "^3.4.0-rc.0", - "enzyme-to-json": "^3.3.2", + "enzyme-to-json": "^3.3.1", "react": "^16.1.0", "react-dom": "^16.1.0" }, From 7b2fddee1aeb4b6e59b61cc4c467b404e158d922 Mon Sep 17 00:00:00 2001 From: Hypnosphi Date: Fri, 9 Mar 2018 23:30:10 +0200 Subject: [PATCH 8/8] Update lockfile --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 212f3e47dfb..0795a2ecc9a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5079,9 +5079,9 @@ enzyme-to-json@^3.3.0: dependencies: lodash "^4.17.4" -enzyme-to-json@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-3.3.2.tgz#5caf0b3729ffea3aa14702f12c37e93b501a9d96" +enzyme-to-json@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-3.3.1.tgz#64239dcd417e2fb552f4baa6632de4744b9b5b93" dependencies: lodash "^4.17.4"