From 33197654ad9e4fa1dfa247fb9b7cf4d28f0559b1 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 17 May 2017 09:04:22 +0200 Subject: [PATCH 1/4] =?UTF-8?q?MOVE=20&=20RENAME=20and=20storyshots=20&&?= =?UTF-8?q?=20CHANGE=20=E2=80=9CReact=20Storybook=E2=80=9D=20>=20=E2=80=9C?= =?UTF-8?q?Storybook=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CONTRIBUTING.md | 2 +- README.md | 2 +- addons/centered/package.json | 2 +- addons/info/CHANGELOG.md | 2 +- addons/info/package.json | 2 +- addons/knobs/package.json | 2 +- {lib => addons}/storyshots/.babelrc | 0 {lib => addons}/storyshots/.npmignore | 0 {lib => addons}/storyshots/.storybook/config.js | 0 {lib => addons}/storyshots/CHANGELOG.md | 0 {lib => addons}/storyshots/README.md | 2 +- {lib => addons}/storyshots/docs/storyshots-fail.png | Bin {lib => addons}/storyshots/docs/storyshots.png | Bin {lib => addons}/storyshots/package.json | 6 +++--- {lib => addons}/storyshots/src/index.js | 2 +- {lib => addons}/storyshots/src/require_context.js | 0 .../storyshots/src/storybook-channel-mock.js | 0 .../storyshots/stories/directly_required/Button.js | 0 .../storyshots/stories/directly_required/index.js | 0 .../stories/required_with_context/Button.js | 0 .../stories/required_with_context/Button.stories.js | 0 .../stories/required_with_context/Welcome.js | 2 +- .../required_with_context/Welcome.stories.js | 0 app/react-native/readme.md | 2 +- app/react-native/src/server/config.js | 2 +- app/react-native/src/server/index.html.js | 2 +- app/react/CHANGELOG.md | 8 ++++---- app/react/README.md | 2 +- app/react/ROADMAP.md | 2 +- app/react/package.json | 2 +- app/react/src/server/config.js | 2 +- app/react/src/server/iframe.html.js | 2 +- app/react/src/server/index.html.js | 2 +- app/react/src/server/index.js | 2 +- .../generators/METEOR/template/.stories/Welcome.js | 2 +- .../generators/REACT/template/stories/Welcome.js | 2 +- .../WEBPACK_REACT/template/stories/Welcome.js | 2 +- lib/ui/src/modules/api/index.js | 4 ++-- 38 files changed, 31 insertions(+), 31 deletions(-) rename {lib => addons}/storyshots/.babelrc (100%) rename {lib => addons}/storyshots/.npmignore (100%) rename {lib => addons}/storyshots/.storybook/config.js (100%) rename {lib => addons}/storyshots/CHANGELOG.md (100%) rename {lib => addons}/storyshots/README.md (98%) rename {lib => addons}/storyshots/docs/storyshots-fail.png (100%) rename {lib => addons}/storyshots/docs/storyshots.png (100%) rename {lib => addons}/storyshots/package.json (82%) rename {lib => addons}/storyshots/src/index.js (96%) rename {lib => addons}/storyshots/src/require_context.js (100%) rename {lib => addons}/storyshots/src/storybook-channel-mock.js (100%) rename {lib => addons}/storyshots/stories/directly_required/Button.js (100%) rename {lib => addons}/storyshots/stories/directly_required/index.js (100%) rename {lib => addons}/storyshots/stories/required_with_context/Button.js (100%) rename {lib => addons}/storyshots/stories/required_with_context/Button.stories.js (100%) rename {lib => addons}/storyshots/stories/required_with_context/Welcome.js (98%) rename {lib => addons}/storyshots/stories/required_with_context/Welcome.stories.js (100%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 47ebff1ef50a..1949590b8326 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -# Contributing to React Storybook +# Contributing to Storybook Thanks for your interest in improving Storybook! We are a community-driven project and welcome contributions of all kinds: from discussion to documentation to bugfixes to feature improvements. diff --git a/README.md b/README.md index 76c3627ccca5..8d94819c0b7e 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ It allows you to browse a component library, view the different states of each c ## Intro -![React Storybook Screenshot](app/react/docs/demo.gif) +![Storybook Screenshot](app/react/docs/demo.gif) Storybook runs outside of your app. This allows you to develop UI components in isolation, which can improve component reuse, testability, and development speed. You can build quickly without having to worry about application-specific dependencies. diff --git a/addons/centered/package.json b/addons/centered/package.json index c714ff17de59..ce6ce90b75b4 100644 --- a/addons/centered/package.json +++ b/addons/centered/package.json @@ -1,7 +1,7 @@ { "name": "@storybook/addon-centered", "version": "1.1.2", - "description": "React Storybook decorator to center components", + "description": "Storybook decorator to center components", "main": "build/index.js", "scripts": { "prepublish": "babel src --out-dir build" diff --git a/addons/info/CHANGELOG.md b/addons/info/CHANGELOG.md index 7bdecffe849d..1c8a9c22cb06 100644 --- a/addons/info/CHANGELOG.md +++ b/addons/info/CHANGELOG.md @@ -82,4 +82,4 @@ See: [#12](https://github.com/kadirahq/react-storybook-addon-info/issues/12) ### v3.0.0 -* Add the version which works as an React Storybook addon. +* Add the version which works as an Storybook addon. diff --git a/addons/info/package.json b/addons/info/package.json index 691308343fdd..20b1785d83cf 100644 --- a/addons/info/package.json +++ b/addons/info/package.json @@ -1,7 +1,7 @@ { "name": "@storybook/addon-info", "version": "3.4.0", - "description": "A React Storybook addon to show additional information for your stories.", + "description": "A Storybook addon to show additional information for your stories.", "repository": { "type": "git", "url": "git+https://github.com/storybooks/storybook.git" diff --git a/addons/knobs/package.json b/addons/knobs/package.json index e849a79787cc..fe14dafebb75 100644 --- a/addons/knobs/package.json +++ b/addons/knobs/package.json @@ -1,7 +1,7 @@ { "name": "@storybook/addon-knobs", "version": "1.7.1", - "description": "React Storybook Addon Prop Editor Component", + "description": "Storybook Addon Prop Editor Component", "repository": { "type": "git", "url": "git+https://github.com/storybooks/storybook.git" diff --git a/lib/storyshots/.babelrc b/addons/storyshots/.babelrc similarity index 100% rename from lib/storyshots/.babelrc rename to addons/storyshots/.babelrc diff --git a/lib/storyshots/.npmignore b/addons/storyshots/.npmignore similarity index 100% rename from lib/storyshots/.npmignore rename to addons/storyshots/.npmignore diff --git a/lib/storyshots/.storybook/config.js b/addons/storyshots/.storybook/config.js similarity index 100% rename from lib/storyshots/.storybook/config.js rename to addons/storyshots/.storybook/config.js diff --git a/lib/storyshots/CHANGELOG.md b/addons/storyshots/CHANGELOG.md similarity index 100% rename from lib/storyshots/CHANGELOG.md rename to addons/storyshots/CHANGELOG.md diff --git a/lib/storyshots/README.md b/addons/storyshots/README.md similarity index 98% rename from lib/storyshots/README.md rename to addons/storyshots/README.md index cfdb99bfecd2..c6badbcd11d9 100644 --- a/lib/storyshots/README.md +++ b/addons/storyshots/README.md @@ -21,7 +21,7 @@ To use StoryShots, you must use your existing Storybook stories as the input for Add the following module into your app. ```sh -npm install -save-dev storyshots +npm install -save-dev @storybook/addon-storyshots ``` ## Configure your app for Jest diff --git a/lib/storyshots/docs/storyshots-fail.png b/addons/storyshots/docs/storyshots-fail.png similarity index 100% rename from lib/storyshots/docs/storyshots-fail.png rename to addons/storyshots/docs/storyshots-fail.png diff --git a/lib/storyshots/docs/storyshots.png b/addons/storyshots/docs/storyshots.png similarity index 100% rename from lib/storyshots/docs/storyshots.png rename to addons/storyshots/docs/storyshots.png diff --git a/lib/storyshots/package.json b/addons/storyshots/package.json similarity index 82% rename from lib/storyshots/package.json rename to addons/storyshots/package.json index a26063301d18..829001616bc5 100644 --- a/lib/storyshots/package.json +++ b/addons/storyshots/package.json @@ -1,10 +1,10 @@ { - "name": "storyshots", + "name": "@storybook/addon-storyshots", "version": "3.2.2", - "description": "StoryShots - Jest Snapshot Testing for React Storybook.", + "description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.", "repository": { "type": "git", - "url": "https://github.com/storybooks/storyshots.git" + "url": "https://github.com/storybooks/storybook.git" }, "license": "MIT", "main": "dist/index.js", diff --git a/lib/storyshots/src/index.js b/addons/storyshots/src/index.js similarity index 96% rename from lib/storyshots/src/index.js rename to addons/storyshots/src/index.js index a676d02e1e0e..fc01064d71a2 100644 --- a/lib/storyshots/src/index.js +++ b/addons/storyshots/src/index.js @@ -42,7 +42,7 @@ export default function testStorySnapshots(options = {}) { require.requireActual(configPath); } else { throw new Error( - 'storyshots is intended only to be used with react storybook or react native storybook', + 'storyshots is intended only to be used with storybook', ); } diff --git a/lib/storyshots/src/require_context.js b/addons/storyshots/src/require_context.js similarity index 100% rename from lib/storyshots/src/require_context.js rename to addons/storyshots/src/require_context.js diff --git a/lib/storyshots/src/storybook-channel-mock.js b/addons/storyshots/src/storybook-channel-mock.js similarity index 100% rename from lib/storyshots/src/storybook-channel-mock.js rename to addons/storyshots/src/storybook-channel-mock.js diff --git a/lib/storyshots/stories/directly_required/Button.js b/addons/storyshots/stories/directly_required/Button.js similarity index 100% rename from lib/storyshots/stories/directly_required/Button.js rename to addons/storyshots/stories/directly_required/Button.js diff --git a/lib/storyshots/stories/directly_required/index.js b/addons/storyshots/stories/directly_required/index.js similarity index 100% rename from lib/storyshots/stories/directly_required/index.js rename to addons/storyshots/stories/directly_required/index.js diff --git a/lib/storyshots/stories/required_with_context/Button.js b/addons/storyshots/stories/required_with_context/Button.js similarity index 100% rename from lib/storyshots/stories/required_with_context/Button.js rename to addons/storyshots/stories/required_with_context/Button.js diff --git a/lib/storyshots/stories/required_with_context/Button.stories.js b/addons/storyshots/stories/required_with_context/Button.stories.js similarity index 100% rename from lib/storyshots/stories/required_with_context/Button.stories.js rename to addons/storyshots/stories/required_with_context/Button.stories.js diff --git a/lib/storyshots/stories/required_with_context/Welcome.js b/addons/storyshots/stories/required_with_context/Welcome.js similarity index 98% rename from lib/storyshots/stories/required_with_context/Welcome.js rename to addons/storyshots/stories/required_with_context/Welcome.js index c732bf4d1a8f..f252aba4efc8 100644 --- a/lib/storyshots/stories/required_with_context/Welcome.js +++ b/addons/storyshots/stories/required_with_context/Welcome.js @@ -78,7 +78,7 @@ export default class Welcome extends React.Component { Have a look at the {' '} - React Storybook + Storybook for React {' '} repo for more information. diff --git a/lib/storyshots/stories/required_with_context/Welcome.stories.js b/addons/storyshots/stories/required_with_context/Welcome.stories.js similarity index 100% rename from lib/storyshots/stories/required_with_context/Welcome.stories.js rename to addons/storyshots/stories/required_with_context/Welcome.stories.js diff --git a/app/react-native/readme.md b/app/react-native/readme.md index bf371a1cb3a7..5a0bda54c8c1 100644 --- a/app/react-native/readme.md +++ b/app/react-native/readme.md @@ -8,7 +8,7 @@ With Storybook for React Native you can design and develop individual React Native components without running your app. -![React Storybook Screenshot](docs/assets/readme/screenshot.png) +![Storybook Screenshot](docs/assets/readme/screenshot.png) For more information visit: [storybooks.js.org](https://storybooks.js.org) diff --git a/app/react-native/src/server/config.js b/app/react-native/src/server/config.js index d715cff14b43..20a1aa3e5d15 100644 --- a/app/react-native/src/server/config.js +++ b/app/react-native/src/server/config.js @@ -45,7 +45,7 @@ function loadBabelConfig(babelConfigPath) { } // `baseConfig` is a webpack configuration bundled with storybook. -// React Storybook will look in the `configDir` directory +// Storybook will look in the `configDir` directory // (inside working directory) if a config path is not provided. export default function(configType, baseConfig, projectDir, configDir) { const config = baseConfig; diff --git a/app/react-native/src/server/index.html.js b/app/react-native/src/server/index.html.js index 554ee3ec41c0..1ab3ca5d59ba 100644 --- a/app/react-native/src/server/index.html.js +++ b/app/react-native/src/server/index.html.js @@ -7,7 +7,7 @@ export default function(publicPath, options) { - React Storybook + Storybook for React