Merge branch 'master' into number-types

.jestrc → .jestrc.json

@@ -5,7 +5,10 @@
     "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/__mocks__/fileMock.js",
     "\\.(css|scss)$": "<rootDir>/__mocks__/styleMock.js"
   },
-  "roots": ["packages"],
+  "projects": [
+    "<rootDir>/packages/*",
+    "<rootDir>/examples/*"
+  ],
   "collectCoverage": false,
   "collectCoverageFrom": [
     "packages/**/*.{js,jsx}",

.travis.yml

@@ -14,6 +14,5 @@ script:
   - npm run lint
   - npm run test -- --coverage
   - npm run coverage
-  - npm run test-examples
 git:
   depth: 1

CONTRIBUTING.md

@@ -15,28 +15,57 @@ No software is bug free. So, if you got an issue, follow these steps:
   * Share error logs, screenshots and etc.
   * To speed up the issue fixing process, send us a sample repo with the issue you faced:
 
+### Testing against `master`
+
+To test your project against the current latest version of storybook, you can clone the repository and link it with `npm`. Try following these steps:
+
+1. Download the latest version of this project, and build it
+
+  ```
+  git clone https://github.com/storybooks/storybook.git
+  cd storybook
+  npm install
+  npm run bootstrap
+  ```
+
+2. Link `storybook` and any other required dependencies
+
+  ```
+  cd packages/react-storybook
+  npm link
+  
+  cd <your-project>
+  npm link @kadira/storybook
+  
+  # repeat with whichever other parts of the monorepo you are using.
+  ```
+
 ### Reproductions
 
-The best way to help figure out an issue you are having is to produce a minimal reproduction. A good way to do that is using Create React App:
+The best way to help figure out an issue you are having is to produce a minimal reproduction against the `master` branch. 
+
+A good way to do that is using the example `test-cra` app embedded in this repository:
 
 ```bash
-npm install --global create-react-app getstorybook
+# Download and build this repository:
+git clone https://github.com/storybooks/storybook.git
+cd storybook
+npm install
+npm run bootstrap
 
-create-react-app reproduction
-cd reproduction
-getstorybook
+cd examples/test-cra
 
 # make changes to try and reproduce the problem, such as adding components + stories
 npm start storybook
 
 # see if you can see the problem, if so, commit it:
-git init
+git checkout "branch-describing-issue"
 git add -A
 git commit -m "reproduction for issue #123"
 
-# create an new repository on github to host the reproduction, then:
-git remote add origin https://github.com/<your-username>/<repo-name>
-git push -u origin master
+# fork the storybook repo to your account, then add the resulting remote
+git remote add <your-username> https://github.com/<your-username>/storybook.git
+git push -u <your-username> master
 ```
 
 If you follow that process, you can then link to the github repository in the issue. See https://github.com/storybooks/storybook/issues/708#issuecomment-290589886 for an example.

package.json

@@ -15,10 +15,10 @@
     "eslint": "^3.19.0",
     "eslint-config-airbnb-base": "^11.1.3",
     "eslint-plugin-import": "^2.2.0",
-    "eslint-plugin-jest": "^19.0.1",
+    "eslint-plugin-jest": "^20.0.0",
     "eslint-plugin-prettier": "^2.0.1",
-    "jest": "^19.0.2",
-    "jest-enzyme": "^3.0.1",
+    "jest": "^20.0.0",
+    "jest-enzyme": "^3.1.0",
     "lerna": "2.0.0-rc.4",
     "prettier": "^1.1.0",
     "react": "^15.5.4",
@@ -29,9 +29,8 @@
   "scripts": {
     "bootstrap": "lerna bootstrap",
     "lint": "eslint .",
-    "test": "jest --config ./.jestrc",
+    "test": "jest --config ./.jestrc.json",
     "test:watch": "npm test -- --watch",
-    "test-examples": "CI=true lerna run test",
     "coverage": "codecov"
   }
 }

packages/addon-info/src/components/Node.js

@@ -70,9 +70,9 @@ function getData(element) {
     text: null,
     children: null,
   };
-  
+
   if (typeof element === 'null') {
-    return data
+    return data;
   }
 
   if (typeof element == 'string') {

packages/addon-info/src/components/PropTable.js

@@ -38,7 +38,11 @@ export default class PropTable extends React.Component {
         const typeInfo = type.propTypes[property];
         const propType = PropTypesMap.get(typeInfo) || 'other';
         const required = typeInfo.isRequired === undefined ? 'yes' : 'no';
-        const description = type.__docgenInfo && type.__docgenInfo.props && type.__docgenInfo.props[property] ? type.__docgenInfo.props[property].description : null;
+        const description = type.__docgenInfo &&
+          type.__docgenInfo.props &&
+          type.__docgenInfo.props[property]
+          ? type.__docgenInfo.props[property].description
+          : null;
         props[property] = { property, propType, required, description };
       }
     }
@@ -73,7 +77,7 @@ export default class PropTable extends React.Component {
             <th>propType</th>
             <th>required</th>
             <th>default</th>
-            <th>description></th>
+            <th>description&gt;</th>
           </tr>
         </thead>
         <tbody>

packages/addon-knobs/src/components/PropField.js

@@ -19,7 +19,6 @@ const stylesheet = {
     width: 80,
     fontSize: 10,
     color: 'rgb(68, 68, 68)',
-    textTransform: 'uppercase',
     fontWeight: 600,
   },
 };