Merge pull request #165 from chentsulin/upgrade-deps

Upgrade dependencies

.eslintrc

@@ -7,14 +7,11 @@
     "node": true
   },
   "rules": {
-    "react/jsx-uses-react": 2,
-    "react/jsx-uses-vars": 2,
-    "react/react-in-jsx-scope": 2,
+    "react/jsx-no-bind": 0,
 
-    "no-var": 0,
-    "vars-on-top": 0,
     "comma-dangle": 0,
-    "no-use-before-define": 0
+    "no-use-before-define": 0,
+    "consistent-return": 0
   },
   "plugins": [
     "react"

package.js

@@ -42,7 +42,7 @@ if (version) {
   // use the same version as the currently-installed electron-prebuilt
   exec('npm list electron-prebuilt', (err, stdout) => {
     if (err) {
-      DEFAULT_OPTS.version = '0.36.2';
+      DEFAULT_OPTS.version = '0.36.9';
     } else {
       DEFAULT_OPTS.version = stdout.split('electron-prebuilt@')[1].replace(/\s/g, '');
     }

package.json

@@ -45,54 +45,56 @@
   ],
   "homepage": "https://github.com/chentsulin/electron-react-boilerplate#readme",
   "devDependencies": {
-    "asar": "^0.9.0",
-    "babel-core": "^6.3.26",
+    "asar": "^0.10.0",
+    "babel-core": "^6.6.0",
     "babel-eslint": "^5.0.0",
-    "babel-loader": "^6.2.0",
+    "babel-loader": "^6.2.4",
     "babel-plugin-add-module-exports": "^0.1.2",
-    "babel-plugin-webpack-loaders": "^0.2.1",
-    "babel-polyfill": "^6.3.14",
-    "babel-preset-es2015": "^6.3.13",
+    "babel-plugin-webpack-loaders": "^0.3.7",
+    "babel-polyfill": "^6.6.1",
+    "babel-preset-es2015": "^6.6.0",
     "babel-preset-react": "^6.3.13",
     "babel-preset-react-hmre": "^1.0.1",
     "babel-preset-stage-0": "^6.3.13",
     "chai": "^3.3.0",
     "chromedriver": "^2.19.0",
     "co-mocha": "^1.1.2",
+    "concurrently": "^2.0.0",
     "cross-env": "^1.0.7",
     "css-loader": "^0.23.1",
     "del": "^2.0.1",
     "electron-packager": "^5.2.0",
-    "electron-prebuilt": "^0.36.2",
+    "electron-prebuilt": "^0.36.9",
     "electron-rebuild": "^1.0.0",
-    "eslint": "^1.3.1",
-    "eslint-config-airbnb": "^2.1.1",
-    "eslint-plugin-react": "^3.13.1",
+    "eslint": "^2.2.0",
+    "eslint-config-airbnb": "^6.0.2",
+    "eslint-plugin-react": "^4.1.0",
     "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^0.9.1",
+    "extract-text-webpack-plugin": "^1.0.1",
     "fbjs-scripts": "^0.5.0",
     "jsdom": "^7.2.2",
     "json-loader": "^0.5.4",
     "minimist": "^1.2.0",
     "mocha": "^2.3.0",
-    "node-libs-browser": ">= 0.4.0 <=0.6.0",
+    "node-libs-browser": "^1.0.0",
     "react-addons-test-utils": "^0.14.2",
     "redux-devtools": "^3.0.1",
     "redux-devtools-dock-monitor": "^1.0.1",
-    "redux-devtools-log-monitor": "^1.0.1",
-    "redux-logger": "^2.3.1",
+    "redux-devtools-log-monitor": "^1.0.5",
+    "redux-logger": "^2.6.1",
     "selenium-webdriver": "^2.48.2",
     "sinon": "^1.17.2",
     "style-loader": "^0.13.0",
-    "webpack": "^1.12.1",
+    "webpack": "^1.12.14",
     "webpack-dev-middleware": "^1.2.0",
-    "webpack-hot-middleware": "^2.4.1",
-    "webpack-target-electron-renderer": "^0.3.0",
-    "concurrently": "^2.0.0"
+    "webpack-hot-middleware": "^2.9.0",
+    "webpack-target-electron-renderer": "^0.4.0"
   },
   "dependencies": {
-    "electron-debug": "^0.5.1",
+    "css-modules-require-hook": "^3.0.0",
+    "electron-debug": "^0.5.2",
     "font-awesome": "^4.4.0",
+    "postcss": "^5.0.18",
     "react": "^0.14.2",
     "react-dom": "^0.14.2",
     "react-redux": "^4.0.5",

test/components/Counter.spec.js

@@ -22,9 +22,7 @@ function setup() {
   return {
     component,
     actions,
-    buttons: scryRenderedDOMComponentsWithTag(component, 'button').map(button => {
-      return button;
-    }),
+    buttons: scryRenderedDOMComponentsWithTag(component, 'button').map(button => button),
     p: findRenderedDOMComponentWithClass(component, 'counter')
   };
 }

test/containers/CounterPage.spec.js

@@ -20,9 +20,7 @@ function setup(initialState) {
   );
   return {
     app,
-    buttons: scryRenderedDOMComponentsWithTag(app, 'button').map(button => {
-      return button;
-    }),
+    buttons: scryRenderedDOMComponentsWithTag(app, 'button').map(button => button),
     p: findRenderedDOMComponentWithClass(app, 'counter')
   };
 }

test/e2e.js

@@ -21,7 +21,7 @@ describe('main window', function spec() {
       .withCapabilities({
         chromeOptions: {
           binary: electronPath,
-          args: ['app=' + path.resolve()]
+          args: [`app=${path.resolve()}`]
         }
       })
       .forBrowser('electron')
@@ -32,13 +32,9 @@ describe('main window', function spec() {
     await this.driver.quit();
   });
 
-  const findCounter = () => {
-    return this.driver.findElement(webdriver.By.className(counterStyles.counter));
-  };
+  const findCounter = () => this.driver.findElement(webdriver.By.className(counterStyles.counter));
 
-  const findButtons = () => {
-    return this.driver.findElements(webdriver.By.className(counterStyles.btn));
-  };
+  const findButtons = () => this.driver.findElements(webdriver.By.className(counterStyles.btn));
 
   it('should open window', async () => {
     const title = await this.driver.getTitle();
@@ -101,7 +97,9 @@ describe('main window', function spec() {
   });
 
   it('should back to home if back button clicked', async () => {
-    const link = await this.driver.findElement(webdriver.By.css(`.${counterStyles.backButton} > a`));
+    const link = await this.driver.findElement(
+      webdriver.By.css(`.${counterStyles.backButton} > a`)
+    );
     link.click();
 
     await this.driver.findElement(webdriver.By.className(homeStyles.container));

webpack.config.base.js

@@ -27,6 +27,7 @@ module.exports = {
 
   ],
   externals: [
-    // put your node 3rd party libraries which can't be built with webpack here (mysql, mongodb, and so on..)
+    // put your node 3rd party libraries which can't be built with webpack here
+    // (mysql, mongodb, and so on..)
   ]
 };

webpack.config.development.js

@@ -38,9 +38,9 @@ config.plugins.push(
   new webpack.HotModuleReplacementPlugin(),
   new webpack.NoErrorsPlugin(),
   new webpack.DefinePlugin({
-    '__DEV__': true,
+    __DEV__: true,
     'process.env': {
-      'NODE_ENV': JSON.stringify('development')
+      NODE_ENV: JSON.stringify('development')
     }
   })
 );

webpack.config.production.js

@@ -32,9 +32,9 @@ config.module.loaders.push({
 config.plugins.push(
   new webpack.optimize.OccurenceOrderPlugin(),
   new webpack.DefinePlugin({
-    '__DEV__': false,
+    __DEV__: false,
     'process.env': {
-      'NODE_ENV': JSON.stringify('production')
+      NODE_ENV: JSON.stringify('production')
     }
   }),
   new webpack.optimize.UglifyJsPlugin({