Merge pull request #75 from Eeems/master

Fix build

assets/js/components/Alert.jsx

@@ -1,7 +1,8 @@
 var React = require('react');
+var reactCreateClass = require('create-react-class');
 var classNames = require('classnames');
 
-var Alert = React.createClass({
+var Alert = reactCreateClass({
 
     propTypes: {
         type: React.PropTypes.string.isRequired,

assets/js/components/MainList.jsx

@@ -1,8 +1,9 @@
 /* global browser */
 
 var React = require('react');
+var reactCreateClass = require('create-react-class');
 
-var MainList = React.createClass({
+var MainList = reactCreateClass({
 
     _openOptionsPage: function() {
         if (browser.runtime.openOptionsPage) {

assets/js/components/NavBar.jsx

@@ -1,6 +1,7 @@
 var React = require('react');
+var reactCreateClass = require('create-react-class');
 
-var NavBar = React.createClass({
+var NavBar = reactCreateClass({
 
     render: function() {
 

assets/js/components/Options.jsx

@@ -1,6 +1,7 @@
 /* global browser */
 
 var React = require('react');
+var reactCreateClass = require('create-react-class');
 var ReactCSSTransitionGroup = require('react-addons-css-transition-group');
 
 var config = require('../config');
@@ -15,7 +16,7 @@ var SitesList = require('./SitesList.jsx');
  *
  * @type {*|Function}
  */
-var Options = React.createClass({
+var Options = reactCreateClass({
 
     getInitialState: function () {
         return {

assets/js/components/SitesList.jsx

@@ -1,6 +1,7 @@
 var React = require('react');
+var reactCreateClass = require('create-react-class');
 
-var SitesList = React.createClass({
+var SitesList = reactCreateClass({
 
     getDefaultProps: function () {
         return {

assets/js/components/WakaTime.jsx

@@ -1,6 +1,7 @@
 /* global browser */
 
 var React = require("react");
+var reactCreateClass = require('create-react-class');
 var $ = require('jquery');
 
 var config = require('../config');
@@ -15,7 +16,7 @@ var WakaTimeCore = require('../core/WakaTimeCore').default;
 // Helpers
 var changeExtensionState = require('../helpers/changeExtensionState');
 
-var Wakatime = React.createClass({
+var Wakatime = reactCreateClass({
 
     getInitialState: function() {
         return {

assets/js/core/WakaTimeCore.js

@@ -284,4 +284,4 @@ class WakaTimeCore {
 
 }
 
-//export default WakaTimeCore;
+export default WakaTimeCore;

gulpfile.js

@@ -19,6 +19,10 @@ gulp.task('postinstall', function (cb) {
     del('node_modules/**/*.pem', cb);
 });
 gulp.task('webextension',function(cb){
+    if(!fs.existsSync('public/js')){
+        !fs.existsSync('public') && fs.mkdirSync('public');
+        fs.mkdirSync('public/js');
+    }
     exec('npm install',{
         cwd: 'node_modules/webextension-polyfill/'
     },function(){
@@ -48,12 +52,12 @@ elixir.extend('webextension', function(){
 elixir(function (mix) {
     mix.webextension();
     mix.copy('vendor/bower_components/bootstrap/less', 'assets/less/bootstrap');
-    /*mix.copy('vendor/bower_components/bootstrap/fonts', 'public/fonts');
+    mix.copy('vendor/bower_components/bootstrap/fonts', 'public/fonts');
     mix.copy('vendor/bower_components/font-awesome/less', 'assets/less/font-awesome');
     mix.copy('vendor/bower_components/font-awesome/fonts', 'public/fonts');
     mix.less('app.less');
     mix.browserify('app.jsx', 'public/js/app.js', 'assets/js');
     mix.browserify('events.js', 'public/js/events.js', 'assets/js');
     mix.browserify('options.jsx', 'public/js/options.js', 'assets/js');
-    mix.browserify('devtools.js', 'public/js/devtools.js', 'assets/js');*/
+    mix.browserify('devtools.js', 'public/js/devtools.js', 'assets/js');
 });

package.json

@@ -28,15 +28,18 @@
     "babel-jest": "^22.1.0",
     "bower": "^1.7.9",
     "chai": "^4.1.2",
+    "create-react-class": "^15.6.3",
     "del": "^3.0.0",
     "gulp": "^3.9.1",
     "jest-cli": "^22.1.4",
     "jshint": "^2.9.2",
     "jsxhint": "^0.15.1",
     "laravel-elixir": "^6.0.0-17",
+    "laravel-elixir-browserify-official": "^0.1.3",
     "mocha": "^5.0.0",
     "mocha-sinon": "^2.0.0",
     "mocha-traceur": "^2.1.0",
+    "popper.js": "^1.14.6",
     "precommit-hook": "^3.0.0",
     "sinon": "^4.2.2",
     "sinon-chai": "^2.8.0",