Update dependencies (quran#288)

* Update dependencies

* forgot dep

* brower polyfill

* unneeded deps

* karma mistake

* should no more

* bump travis

* dep register

* forgot dep

* forgot dep

* forgot dep

* babel-polyfill

Author: mmahalwy

.babelrc

@@ -0,0 +1,28 @@
+{
+  "presets": ["react", "es2015", "stage-0"],
+  "plugins": [
+    "transform-runtime",
+    "add-module-exports",
+    "transform-decorators-legacy",
+    "transform-react-display-name"
+  ],
+  "env": {
+    "test": {
+      "plugins": [
+        "rewire"
+      ]
+    },
+    "development": {
+      "plugins": [
+        "typecheck",
+        ["react-transform", {
+            "transforms": [{
+                "transform": "react-transform-catch-errors",
+                "imports": ["react", "redbox-react"]
+              }
+            ]
+        }]
+      ]
+    }
+  }
+}

.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 language: node_js
 env: TEST_SUITE=unit
 node_js:
-  - "0.12"
+  - "5.6.0"
 cache:
   directories:
     - node_modules

README.md

@@ -9,6 +9,7 @@ Reactjs + Redux + Expressjs + Webpack. It is isomorphic (javascript shared
 between both the server and the client) for SEO reasons.
 
 [![Dependency Status](https://david-dm.org/quran/quran.com-frontend.svg)](https://david-dm.org/quran/quran.com-frontend)
+[![Code Climate](https://codeclimate.com/github/quran/quran.com-frontend.png)](https://codeclimate.com/github/quran/quran.com-frontend)
 
 #### Getting started
 Simply clone this repo, then run `npm install` to install all the required node_modules.

client.js

@@ -1,5 +1,5 @@
 /*global document, window, $ */
-require('babel/polyfill');
+require('babel-polyfill');
 
 import React from 'react';
 import ReactDOM from 'react-dom';

karma.conf.js

@@ -22,7 +22,6 @@ module.exports = function(config) {
 
     // list of files / patterns to load in the browser
     files: [
-      'node_modules/babel-core/browser-polyfill.js',
       './node_modules/phantomjs-polyfill/bind-polyfill.js',
       './tests/polyfill/Event.js',
       {pattern: "static/images/*", watched: false, included: false, served: true},
@@ -69,11 +68,7 @@ module.exports = function(config) {
           {
             test: /\.(js|jsx)$/,
             exclude: [/server/, /node_modules/, /tests/],
-            loader: 'babel',
-            query: {
-              stage: 0,
-              plugins: []
-            }
+            loader: 'babel'
           },
           { test: /\.json$/, loader: 'json-loader'},
           { test: /\.scss$/, loader: 'style!css?modules&importLoaders=2&sourceMap&localIdentName=[local]___[hash:base64:5]!autoprefixer?browsers=last 2 version!sass?outputStyle=expanded&sourceMap' },

nightwatch.js

@@ -2,10 +2,7 @@ require('dotenv').config({path: (process.env.NODE_ENV || 'development') + '.env'
 require('app-module-path').addPath(__dirname);
 require('app-module-path').addPath('./src/scripts');
 
-require("babel/register")({
-	stage: 0,
-	plugins: ["typecheck"]
-});
+require("babel-register");
 
 global.__CLIENT__ = false;
 global.__SERVER__ = true;

package.json

@@ -24,9 +24,18 @@
   "dependencies": {
     "app-module-path": "^1.0.2",
     "autoprefixer-loader": "^3.1.0",
-    "babel": "^5.8.23",
-    "babel-loader": "5.3.2",
-    "babel-plugin-typecheck": "1.2.0",
+    "babel": "^6.5.2",
+    "babel-loader": "^6.2.4",
+    "babel-plugin-add-module-exports": "^0.1.4",
+    "babel-plugin-transform-decorators-legacy": "^1.3.4",
+    "babel-plugin-transform-react-display-name": "^6.5.0",
+    "babel-plugin-transform-runtime": "^6.7.5",
+    "babel-plugin-typecheck": "^3.8.0",
+    "babel-polyfill": "^6.7.4",
+    "babel-preset-es2015": "^6.6.0",
+    "babel-preset-stage-0": "^6.5.0",
+    "babel-register": "^6.7.2",
+    "babel-runtime": "^6.6.1",
     "body-parser": "^1.14.1",
     "bootstrap-sass": "~3.3.1",
     "bootstrap-sass-loader": "^1.0.9",
@@ -51,7 +60,6 @@
     "html-webpack-plugin": "^1.4.0",
     "http-proxy": "^1.13.2",
     "humps": "^1.0.0",
-    "immutable": "^3.7.4",
     "imports-loader": "^0.6.3",
     "jquery": "^2.1.4",
     "json-loader": "~0.5.1",
@@ -65,14 +73,11 @@
     "proxy-middleware": "^0.14.0",
     "qs": "^6.1.0",
     "raw-loader": "^0.5.1",
-    "react": "^0.14.2",
+    "react": "^0.14.7",
     "react-bootstrap": "^0.28.4",
     "react-cookie": "^0.3.4",
     "react-dom": "^0.14.0",
-    "react-google-analytics": "^0.2.0",
     "react-helmet": "^2.3.1",
-    "react-i13n": "^1.0.0",
-    "react-i13n-ga": "^0.1.3",
     "react-metrics": "^1.1.0",
     "react-paginate": "^0.4.0",
     "react-redux": "^4.4.1",
@@ -89,29 +94,24 @@
     "sitemap": "^1.5.0",
     "style-loader": "^0.13.1",
     "superagent": "^1.2.0",
-    "superagent-promise": "^1.0.3",
     "url": "^0.11.0",
     "url-loader": "~0.5.5",
     "webpack": "^1.10.3",
     "webpack-isomorphic-tools": "^2.2.41",
     "winston": "^1.1.2"
   },
   "devDependencies": {
-    "babel-core": "^5.8.24",
-    "babel-eslint": "^4.1.1",
-    "babel-plugin-react-transform": "^1.1.1",
-    "babel-runtime": "^5.8.24",
+    "babel-core": "^6.7.7",
+    "babel-eslint": "^6.0.4",
+    "babel-plugin-react-transform": "^2.0.2",
+    "babel-preset-react": "^6.5.0",
     "chai": "^3.0.0",
     "chromedriver": "^2.19.0",
-    "clean-webpack-plugin": "^0.1.3",
     "del": "^2.0.2",
     "enzyme": "^2.2.0",
     "eslint": "^1.4.1",
     "eslint-loader": "^1.0.0",
     "eslint-plugin-react": "^3.3.2",
-    "gulp": "^3.8.11",
-    "gulp-nodemon": "^2.0.2",
-    "gulp-util": "^3.0.4",
     "jscs": "^2.1.1",
     "karma": "^0.13.9",
     "karma-chai": "^0.1.0",

start.js

@@ -2,10 +2,7 @@ require('dotenv').config({path: (process.env.NODE_ENV || 'development') + '.env'
 require('app-module-path').addPath(__dirname);
 require('app-module-path').addPath('./src/scripts');
 
-require("babel/register")({
-	stage: 0,
-	plugins: ["typecheck"]
-});
+require('babel-register');
 
 global.__CLIENT__ = false;
 global.__SERVER__ = true;

tests.webpack.js

@@ -1,2 +1,3 @@
+require('babel-polyfill');
 var testContext = require.context('./src', true, /(\.spec|spec)\.js$/);
 testContext.keys().forEach(testContext);

webpack.config.js

@@ -1,11 +1,62 @@
 require('dotenv').config({path: (process.env.NODE_ENV || 'development') + '.env'});
+var fs = require('fs');
+var path = require('path');
 var webpack = require('webpack');
 var path = require('path');
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
 var IsomorphicPlugin = require('webpack-isomorphic-tools/plugin');
 var webpackIsomorphicToolsPlugin = new IsomorphicPlugin(require('./webpack-isomorphic-tools-configuration'));
 
-var webpackConfig = {
+var babelrc = fs.readFileSync('./.babelrc');
+var babelrcObject = {};
+
+try {
+  babelrcObject = JSON.parse(babelrc);
+} catch (err) {
+  console.error('==>     ERROR: Error parsing your .babelrc.');
+  console.error(err);
+}
+
+var babelrcObjectDevelopment = babelrcObject.env && babelrcObject.env.development || {};
+
+// merge global and dev-only plugins
+var combinedPlugins = babelrcObject.plugins || [];
+combinedPlugins = combinedPlugins.concat(babelrcObjectDevelopment.plugins);
+
+var babelLoaderQuery = Object.assign({}, babelrcObjectDevelopment, babelrcObject, {plugins: combinedPlugins});
+delete babelLoaderQuery.env;
+
+// Since we use .babelrc for client and server, and we don't want HMR enabled on the server, we have to add
+// the babel plugin react-transform-hmr manually here.
+
+// make sure react-transform is enabled
+babelLoaderQuery.plugins = babelLoaderQuery.plugins || [];
+var reactTransform = null;
+for (var i = 0; i < babelLoaderQuery.plugins.length; ++i) {
+  var plugin = babelLoaderQuery.plugins[i];
+  if (Array.isArray(plugin) && plugin[0] === 'react-transform') {
+    reactTransform = plugin;
+  }
+}
+
+if (!reactTransform) {
+  reactTransform = ['react-transform', {transforms: []}];
+  babelLoaderQuery.plugins.push(reactTransform);
+}
+
+if (!reactTransform[1] || !reactTransform[1].transforms) {
+  reactTransform[1] = Object.assign({}, reactTransform[1], {transforms: []});
+}
+
+// make sure react-transform-hmr is enabled
+reactTransform[1].transforms.push({
+  transform: 'react-transform-hmr',
+  imports: ['react'],
+  locals: ['module']
+});
+babelLoaderQuery.cacheDirectory = true;
+
+module.exports = {
   context: path.join(process.env.PWD, './'),
   resolve: {
     extensions: ['', '.js'],
@@ -36,11 +87,7 @@ var webpackConfig = {
       {
         test: /\.(js|jsx)$/,
         exclude: [/server/, /node_modules/, /tests/],
-        loader: 'babel',
-        query: {
-          stage: 0,
-          plugins: []
-        }
+        loader: 'babel?' + JSON.stringify(babelLoaderQuery)
       },
       { test: /\.json$/, loader: 'json-loader'},
       { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&mimetype=application/font-woff" },
@@ -92,21 +139,3 @@ var webpackConfig = {
     tls: 'empty'
   }
 };
-// The reason this is here and NOT in .babelrc like it should is because our
-// nodejs server picks up babel too and isn't happy with this!
-webpackConfig.module.loaders[0].query.plugins.push('react-transform');
-webpackConfig.module.loaders[0].query.extra = {
-  'react-transform': {
-    transforms: [{
-      transform: 'react-transform-hmr',
-      imports: ['react'],
-      locals: ['module']
-    },
-    {
-      "transform": "react-transform-catch-errors",
-      "imports": ["react", "redbox-react"]
-    }]
-  }
-};
-
-module.exports = webpackConfig;

webpack.prod.config.js

@@ -47,11 +47,7 @@ module.exports = {
       {
         test: /\.(js|jsx)$/,
         exclude: [/server/, /node_modules/, /tests/],
-        loader: 'babel',
-        query: {
-          stage: 0,
-          plugins: []
-        }
+        loader: 'babel'
       },
       { test: /\.json$/, loader: 'json-loader'},
       { test: /\.scss$/, loader: ExtractTextPlugin.extract('style', 'css?modules&importLoaders=2&sourceMap!autoprefixer?browsers=last 2 version!sass?outputStyle=expanded&sourceMap=true&sourceMapContents=true') },