Merge branch 'master' into mentions

nikgraf · nikgraf · commit a661be553bd6 · 2016-03-03T16:19:24.000-08:00
diff --git a/README.md b/README.md
@@ -9,6 +9,8 @@ This a playground to explore a plugin architecture on top of draft-js.
 - Linkify
 - @mentions (coming soon…)
 
+[![Build Status](https://travis-ci.org/nikgraf/draft-js-plugin-editor.svg?branch=master)](https://travis-ci.org/nikgraf/draft-js-plugin-editor)
+
 ## Live Example
 
 Checkout [the website](http://nikgraf.github.io/draft-js-plugin-editor/)!
diff --git a/package.json b/package.json
@@ -44,8 +44,8 @@
   },
   "devDependencies": {
     "alex": "^2.0.1",
-    "babel-cli": "^6.6.0",
-    "babel-core": "^6.6.0",
+    "babel-cli": "^6.6.4",
+    "babel-core": "^6.6.4",
     "babel-eslint": "^5.0.0",
     "babel-jest": "^6.0.1",
     "babel-loader": "^6.2.4",
@@ -60,9 +60,9 @@
     "eslint-config-airbnb": "6.0.2",
     "eslint-plugin-mocha": "^2.0.0",
     "eslint-plugin-react": "^4.1.0",
-    "flow-bin": "^0.22.0",
+    "flow-bin": "^0.22.1",
     "jest-cli": "^0.8.2",
-    "jscs": "^2.10.1",
+    "jscs": "^2.11.0",
     "react": "^0.14.7",
     "react-addons-test-utils": "^0.14.7",
     "react-dom": "^0.14.7",
@@ -72,7 +72,7 @@
     "style-loader": "^0.13.0",
     "webpack": "^1.12.14",
     "webpack-dev-middleware": "^1.5.1",
-    "webpack-hot-middleware": "=2.7.1"
+    "webpack-hot-middleware": "=2.9.1"
   },
   "jest": {
     "testRunner": "<rootDir>/node_modules/jest-cli/src/testRunners/jasmine/jasmine2.js",
diff --git a/site/components/CodeHighlight/index.js b/site/components/CodeHighlight/index.js
@@ -2,16 +2,18 @@ import {
   default as React,
   Component,
   PropTypes,
-} from "react";
+} from 'react';
 
 import {
   default as ReactComponentWithPureRenderMixin,
-} from "react-addons-pure-render-mixin";
+} from 'react-addons-pure-render-mixin';
+
+import Prism from 'prismjs';
 
 export default class Code extends Component {
   static propTypes = {
     className: PropTypes.string,
-    children: PropTypes.any,
+    code: PropTypes.string,
   };
 
   componentDidMount() {
@@ -29,7 +31,7 @@ export default class Code extends Component {
   }
 
   render() {
-    const className = (this.props.language ? 'language-' + this.props.language : '');
+    const className = (this.props.language ? `language-${this.props.language}` : '');
     return (
       <code
         ref="code"
diff --git a/site/components/StatePreview/index.js b/site/components/StatePreview/index.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import styles from './styles';
 
-import Code from "../CodeHighlight";
+import Code from '../CodeHighlight';
 
 export default class StatePreview extends Component {
 
diff --git a/site/index.html b/site/index.html
@@ -45,7 +45,6 @@ <h2 class="available-plugins">Available Plugins</h2>
       </span>
       on Planet Earth :)
   </footer>
-  <script src="node_modules/prismjs/prism.js"></script>
   <script src="static/bundle.js"></script>
 </body>
 </html>
diff --git a/site/package.json b/site/package.json
@@ -20,7 +20,7 @@
     "lodash": "^4.6.1"
   },
   "devDependencies": {
-    "babel-core": "^6.6.0",
+    "babel-core": "^6.6.4",
     "babel-loader": "^6.2.4",
     "eslint": "^2.2.0",
     "eslint-config-airbnb": "^6.0.2",
diff --git a/site/server.js b/site/server.js
@@ -24,6 +24,7 @@ app.get('*', (req, res) => {
     res.sendFile(path.join(__dirname, 'node_modules/prismjs/prism.js'));
     return;
   }
+
   res.sendFile(path.join(__dirname, 'index.html'));
 });
 

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ app.get('*', (req, res) => {`
`24`	`24`	`res.sendFile(path.join(__dirname, 'node_modules/prismjs/prism.js'));`
`25`	`25`	`return;`
`26`	`26`	`}`
	`27`	`+`
`27`	`28`	`res.sendFile(path.join(__dirname, 'index.html'));`
`28`	`29`	`});`
`29`	`30`