Merge pull request #2 from glennreyes/master

Node package updates, passing tests

Author: bvaughn

.babelrc

@@ -1,20 +1,8 @@
 {
-  "stage": 0,
+  "presets": ["es2015", "react", "stage-0"],
   "env": {
     "development": {
-      "plugins": ["react-transform"],
-      "extra": {
-        "react-transform": {
-          "transforms": [{
-            "transform": "react-transform-hmr",
-            "imports": ["react"],
-            "locals": ["module"]
-          }, {
-            "transform": "react-transform-catch-errors",
-            "imports": ["react", "redbox-react"]
-          }]
-        }
-      }
+      "presets": ["react-hmre"]
     }
   }
 }

dist/main.js

@@ -4,7 +4,7 @@
   "main": "dist/main.js",
   "author": "Brian Vaughn",
   "user": "bvaughn",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "scripts": {
     "build": "npm run build:website && npm run build:dist",
     "build:website": "npm run clean:website && NODE_ENV=production webpack --config webpack.config.website.js -p --bail",
@@ -56,44 +56,50 @@
     ]
   },
   "devDependencies": {
-    "babel": "^5.8.34",
-    "babel-core": "^5.8.34",
-    "babel-eslint": "^4.1.6",
-    "babel-loader": "^5.4.0",
-    "babel-plugin-react-transform": "^1.1.1",
-    "css-loader": "^0.23.0",
+    "babel": "^6.5.2",
+    "babel-core": "^6.8.0",
+    "babel-eslint": "^6.0.4",
+    "babel-loader": "^6.2.4",
+    "babel-plugin-react-transform": "^2.0.2",
+    "babel-polyfill": "^6.8.0",
+    "babel-preset-es2015": "^6.6.0",
+    "babel-preset-react": "^6.5.0",
+    "babel-preset-react-hmre": "^1.1.1",
+    "babel-preset-stage-0": "^6.5.0",
+    "classnames": "^2.2.5",
+    "css-loader": "^0.23.1",
     "cssnext": "^1.8.4",
     "cssnext-loader": "^1.0.1",
     "expect.js": "^0.3.1",
-    "gh-pages": "^0.8.0",
-    "html-webpack-plugin": "^1.7.0",
-    "karma": "^0.13.15",
-    "karma-junit-reporter": "^0.3.8",
-    "karma-mocha": "^0.2.1",
-    "karma-phantomjs2-launcher": "^0.3.2",
-    "karma-sourcemap-loader": "^0.3.6",
-    "karma-spec-reporter": "0.0.23",
+    "gh-pages": "^0.11.0",
+    "html-webpack-plugin": "^2.16.1",
+    "karma": "^0.13.22",
+    "karma-junit-reporter": "^1.0.0",
+    "karma-mocha": "^1.0.1",
+    "karma-phantomjs2-launcher": "^0.5.0",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.26",
     "karma-webpack": "^1.7.0",
-    "mocha": "^2.3.4",
-    "phantomjs2": "^2.0.2",
-    "react": "^0.14.3",
-    "react-dom": "^0.14.3",
-    "react-transform-catch-errors": "^1.0.0",
-    "react-transform-hmr": "^1.0.1",
-    "redbox-react": "^1.0.1",
-    "rimraf": "^2.4.4",
-    "standard": "^5.4.1",
-    "style-loader": "^0.13.0",
-    "watch": "^0.16.0",
-    "webpack": "^1.12.9",
-    "webpack-dev-server": "^1.14.0",
+    "mocha": "^2.4.5",
+    "phantomjs2": "^2.2.0",
+    "react": "^15.0.2",
+    "react-dom": "^15.0.2",
+    "react-transform-catch-errors": "^1.0.2",
+    "react-transform-hmr": "^1.0.4",
+    "redbox-react": "^1.2.4",
+    "rimraf": "^2.5.2",
+    "standard": "^7.0.1",
+    "style-loader": "^0.13.1",
+    "watch": "^0.18.0",
+    "webpack": "^1.13.0",
+    "webpack-dev-server": "^1.14.1",
     "worker-loader": "^0.7.0"
   },
   "dependencies": {
     "highlight.js": "^8.9.1"
   },
   "peerDependencies": {
-    "react": "^0.14.0",
-    "react-dom": "^0.14.3"
+    "react": "^15.0.2",
+    "react-dom": "^15.0.2"
   }
 }

dist/main.js.map

@@ -43,7 +43,7 @@ export default class HighlightDemoDemo extends Component {
             type='text'
             name='language'
             defaultValue={language}
-            onChange={event => this._debouncedSetState('language', event.target.value)}/>
+            onChange={event => this._debouncedSetState('language', event.target.value)} />
         </div>
         <div className='form-group'>
           <label>Enter text to be formatted</label>
@@ -52,7 +52,7 @@ export default class HighlightDemoDemo extends Component {
             type='text'
             name='content'
             defaultValue={content}
-            onChange={event => this._debouncedSetState('content', event.target.value)}/>
+            onChange={event => this._debouncedSetState('content', event.target.value)} />
         </div>
         <label>Output</label>
         <Highlight language={language}>

package.json

@@ -1,7 +1,7 @@
 // Reference: https://babeljs.io/docs/usage/polyfill/
 // Reference: https://github.com/zloirock/core-js
 // Polyfill a full ES6 environment
-import 'babel/polyfill'
+import 'babel-polyfill'
 
 // Reference: https://github.com/webpack/karma-webpack#alternative-usage
 const tests = require.context('.', true, /\.test\.js$/)

src/Highlight.example.js

@@ -5,7 +5,7 @@ const webpack = require('webpack')
 module.exports = {
   devtool: 'eval',
   entry: [
-    'babel/polyfill',
+    'babel-polyfill',
     './website/index.js'
   ],
   output: {

src/tests.js

@@ -5,7 +5,7 @@ const webpack = require('webpack')
 module.exports = {
   devtool: 'source-map',
   entry: [
-    'babel/polyfill',
+    'babel-polyfill',
     './website/index.js'
   ],
   output: {

webpack.config.dev.js

@@ -25,7 +25,7 @@ export default class Application extends React.Component {
         </Highlight>
         <p>Choose a highlight.js theme and make sure it's included in your index file.</p>
         <Highlight language='html'>
-          {`<link rel='stylesheet' href='https://highlightjs.org/static/demo/styles/railscasts.css'/>`}
+          <link rel='stylesheet' href='https://highlightjs.org/static/demo/styles/railscasts.css' />
         </Highlight>
         <p>And then use react-highlight.js to display your text like so:</p>
         <Highlight language='html'>