Merge pull request #1044 from storybooks/restructure-storyshots

ndelangen · web-flow · commit cf4f080b57dc · 2017-05-17T17:49:08.000+02:00
MOVE &amp; RENAME and storyshots &amp;&amp; CHANGE “React Storybook” &gt; “Storybook”
diff --git a/.bithoundrc b/.bithoundrc
@@ -1,17 +1,7 @@
 {
   "ignore": [
-    "addons/links/.storybook/stories.js",
-    "addons/info/.storybook/config.js",
-    "lib/cli/generators/METEOR/template/.stories/Welcome.js",
-    "lib/storyshots/.storybook/config.js",
-    "addons/actions/.storybook/stories.js",
-    "addons/graphql/.storybook/stories.js",
-    "addons/info/.storybook/user/modify_webpack_config.js",
-    "addons/info/.storybook/webpack.config.js",
-    "addons/knobs/.storybook/user/modify_webpack_config.js",
-    "addons/options/.storybook/stories.js",
-    "lib/cli/generators/METEOR/template/.stories/Button.js",
-    "lib/cli/generators/METEOR/template/.stories/index.js",
+    "addons/**/.storybook/**/*.js",
+    "lib/cli/generators/**/.stories/**.js",
     "*.ts"
   ],
   "critics": {
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/addons/storyshots/.babelrc b/addons/storyshots/.babelrc
diff --git a/addons/storyshots/.npmignore b/addons/storyshots/.npmignore
diff --git a/addons/storyshots/.storybook/config.js b/addons/storyshots/.storybook/config.js
diff --git a/addons/storyshots/CHANGELOG.md b/addons/storyshots/CHANGELOG.md
diff --git a/addons/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/addons/storyshots/docs/storyshots-fail.png b/addons/storyshots/docs/storyshots-fail.png
diff --git a/addons/storyshots/docs/storyshots.png b/addons/storyshots/docs/storyshots.png
diff --git a/addons/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/addons/storyshots/src/index.js b/addons/storyshots/src/index.js
@@ -41,9 +41,7 @@ export default function testStorySnapshots(options = {}) {
     configPath = path.resolve(options.configPath || 'storybook');
     require.requireActual(configPath);
   } else {
-    throw new Error(
-      'storyshots is intended only to be used with react storybook or react native storybook',
-    );
+    throw new Error('storyshots is intended only to be used with storybook');
   }
 
   if (typeof describe !== 'function') {
diff --git a/addons/storyshots/src/require_context.js b/addons/storyshots/src/require_context.js
diff --git a/addons/storyshots/src/storybook-channel-mock.js b/addons/storyshots/src/storybook-channel-mock.js
diff --git a/addons/storyshots/stories/directly_required/Button.js b/addons/storyshots/stories/directly_required/Button.js
diff --git a/addons/storyshots/stories/directly_required/index.js b/addons/storyshots/stories/directly_required/index.js
diff --git a/addons/storyshots/stories/required_with_context/Button.js b/addons/storyshots/stories/required_with_context/Button.js
diff --git a/addons/storyshots/stories/required_with_context/Button.stories.js b/addons/storyshots/stories/required_with_context/Button.stories.js
diff --git a/addons/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
           {' '}
           <a style={styles.link} href="https://github.com/storybooks/storybook" target="_blank">
-            React Storybook
+            Storybook for React
           </a>
           {' '}
           repo for more information.
diff --git a/addons/storyshots/stories/required_with_context/Welcome.stories.js b/addons/storyshots/stories/required_with_context/Welcome.stories.js
diff --git 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
@@ -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
@@ -7,7 +7,7 @@ export default function(publicPath, options) {
       <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <title>React Storybook</title>
+        <title>Storybook for React</title>
         <style>
           /*
             When resizing panels, the drag event breaks if the cursor
diff --git a/app/react/CHANGELOG.md b/app/react/CHANGELOG.md
@@ -396,7 +396,7 @@ This will fix issues like [#347](https://github.com/storybooks/react-storybook/i
 Add support for the addon API. See [PR346](https://github.com/storybooks/react-storybook/pull/346).
 
 Here after we are using most of the features including actions,links as plugins.
-So, this introduced a huge area to add customizations to React Storybook.
+So, this introduced a huge area to add customizations to Storybook.
 
 Unfortunately, as of this version, there are no docs for this feature. But, you can have a look at these addons:
 
@@ -408,7 +408,7 @@ Have a look at [here](https://github.com/storybooks/react-storybook/blob/master/
 ### v2.0.0
 01-August-2016
 
-This is the starting of the next major version of React Storybook. This version is almost compatible with `v1.x.x` but defaults have been changes as discussed below. That's why we are starting out a new version.
+This is the starting of the next major version of Storybook. This version is almost compatible with `v1.x.x` but defaults have been changes as discussed below. That's why we are starting out a new version.
 
 * Update defaults to match create-react-app. [PR342](https://github.com/storybooks/react-storybook/pull/342). Here are the notable changes:
   * Add postcss based CSS loader.
@@ -482,7 +482,7 @@ This is the starting of the next major version of React Storybook. This version
 
 ### v1.33.0
 
-* Introduce an [extension API](https://github.com/storybooks/react-storybook/blob/master/docs/extensions.md) for React Storybook. See: [PR258](https://github.com/storybooks/react-storybook/pull/258)
+* Introduce an [extension API](https://github.com/storybooks/react-storybook/blob/master/docs/extensions.md) for Storybook. See: [PR258](https://github.com/storybooks/react-storybook/pull/258)
 
 ### v1.32.1
 
@@ -621,7 +621,7 @@ This is the starting of the next major version of React Storybook. This version
 ### v1.18.0
 26-April-2016
 
-* Link React Storybook menu to the repo. See: [PR137](https://github.com/storybooks/react-storybook/pull/137)
+* Link Storybook menu to the repo. See: [PR137](https://github.com/storybooks/react-storybook/pull/137)
 * Implement keyboard shortcuts and fuzzy search. See: [PR141](https://github.com/storybooks/react-storybook/pull/141)
 
 ### v1.17.2
diff --git a/app/react/README.md b/app/react/README.md
@@ -9,7 +9,7 @@
 Storybook for React is a UI development environment for your React components.
 With it, you can visualize different states of your UI components and develop them interactively.
 
-![React Storybook Screenshot](docs/demo.gif)
+![Storybook Screenshot](docs/demo.gif)
 
 Storybook runs outside of your app.
 So you can develop UI components in isolation without worrying about app specific dependencies and requirements.
diff --git a/app/react/ROADMAP.md b/app/react/ROADMAP.md
@@ -3,7 +3,7 @@
 ### Short Term
 
 * Addon API and addons
-* A clear guide to hack React Storybook
+* A clear guide to hack Storybook
 * React Native Support
 
 ### Long Term
diff --git a/app/react/package.json b/app/react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@storybook/react",
   "version": "2.35.3",
-  "description": "React Storybook: Isolate React Component Development with Hot Reloading.",
+  "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.",
   "license": "MIT",
   "main": "dist/client/index.js",
   "typings": "./config/storybook.d.ts",
diff --git a/app/react/src/server/config.js b/app/react/src/server/config.js
@@ -6,7 +6,7 @@ import loadBabelConfig from './babel_config';
 const logger = console;
 
 // `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, configDir) {
   const config = baseConfig;
diff --git a/app/react/src/server/iframe.html.js b/app/react/src/server/iframe.html.js
@@ -48,7 +48,7 @@ export default function(data) {
             window.__REACT_DEVTOOLS_GLOBAL_HOOK__ = window.parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
           }
         </script>
-        <title>React Storybook</title>
+        <title>Storybook</title>
         ${headHtml}
         ${previewCssTag}
       </head>
diff --git a/app/react/src/server/index.html.js b/app/react/src/server/index.html.js
@@ -40,7 +40,7 @@ export default function(data) {
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="storybook-version" content="${version}">
         <meta content="IE=edge" http-equiv="X-UA-Compatible" />
-        <title>React Storybook</title>
+        <title>Storybook</title>
         <style>
           /*
             When resizing panels, the drag event breaks if the cursor
diff --git a/app/react/src/server/index.js b/app/react/src/server/index.js
@@ -144,6 +144,6 @@ server.listen(...listenAddr, error => {
     throw error;
   } else {
     const address = `http://${program.host || 'localhost'}:${program.port}/`;
-    logger.info(`\nReact Storybook started on => ${chalk.cyan(address)}\n`);
+    logger.info(`\Storybook started on => ${chalk.cyan(address)}\n`);
   }
 });
diff --git a/lib/cli/generators/METEOR/template/.stories/Welcome.js b/lib/cli/generators/METEOR/template/.stories/Welcome.js
@@ -64,7 +64,7 @@ export default class Welcome extends React.Component {
         <p>
           This is just one thing you can do with Storybook.
           <br/>
-          Have a look at the <a style={styles.link} href="https://github.com/storybooks/storybook" target="_blank">React Storybook</a> repo for more information.
+          Have a look at the <a style={styles.link} href="https://github.com/storybooks/storybook" target="_blank">Storybook</a> repo for more information.
         </p>
       </div>
     );
diff --git a/lib/cli/generators/REACT/template/stories/Welcome.js b/lib/cli/generators/REACT/template/stories/Welcome.js
@@ -78,7 +78,7 @@ export default class Welcome extends React.Component {
           Have a look at the
           {' '}
           <a style={styles.link} href="https://github.com/storybooks/storybook" target="_blank">
-            React Storybook
+            Storybook
           </a>
           {' '}
           repo for more information.
diff --git a/lib/cli/generators/WEBPACK_REACT/template/stories/Welcome.js b/lib/cli/generators/WEBPACK_REACT/template/stories/Welcome.js
@@ -82,7 +82,7 @@ export default class Welcome extends React.Component {
           Have a look at the
           {' '}
           <a style={styles.link} href="https://github.com/storybooks/storybook" target="_blank">
-            React Storybook
+            Storybook
           </a>
           {' '}
           repo for more information.
diff --git a/lib/ui/src/modules/api/index.js b/lib/ui/src/modules/api/index.js
@@ -5,8 +5,8 @@ export default {
   actions,
   defaultState: {
     uiOptions: {
-      name: 'REACT STORYBOOK',
-      url: 'https://github.com/storybooks/react-storybook',
+      name: 'STORYBOOK',
+      url: 'https://github.com/storybooks/storybook',
       sortStoriesByKind: false,
     },
   },

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Contributing to React Storybook`
	`1`	`+# Contributing to Storybook`
`2`	`2`
`3`	`3`	`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.`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@storybook/addon-centered",`
`3`	`3`	`"version": "1.1.2",`
`4`		`- "description": "React Storybook decorator to center components",`
	`4`	`+ "description": "Storybook decorator to center components",`
`5`	`5`	`"main": "build/index.js",`
`6`	`6`	`"scripts": {`
`7`	`7`	`"prepublish": "babel src --out-dir build"`
Original file line number	Diff line number	Diff line change
`@@ -82,4 +82,4 @@ See: [#12](https://github.com/kadirahq/react-storybook-addon-info/issues/12)`
`82`	`82`
`83`	`83`	`### v3.0.0`
`84`	`84`
`85`		`-* Add the version which works as an React Storybook addon.`
	`85`	`+* Add the version which works as an Storybook addon.`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@storybook/addon-info",`
`3`	`3`	`"version": "3.4.0",`
`4`		`- "description": "A React Storybook addon to show additional information for your stories.",`
	`4`	`+ "description": "A Storybook addon to show additional information for your stories.",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`
`7`	`7`	`"url": "git+https://github.com/storybooks/storybook.git"`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@storybook/addon-knobs",`
`3`	`3`	`"version": "1.7.1",`
`4`		`- "description": "React Storybook Addon Prop Editor Component",`
	`4`	`+ "description": "Storybook Addon Prop Editor Component",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`
`7`	`7`	`"url": "git+https://github.com/storybooks/storybook.git"`