initial changes

Author: Ashley Bibizadeh

.babelrc

@@ -1,9 +1,19 @@
 {
     "presets": [
-        "env",
-        "react"
+        "@babel/preset-env",
+        "@babel/preset-react"
     ],
     "plugins": [
-        "transform-class-properties"
+        "@babel/plugin-proposal-class-properties"
     ]
-}
+}
+// {
+//     "presets": [
+//         "env",
+//         // "react",
+//         "@babel/preset-react"
+//     ],
+//     "plugins": [
+//         "transform-class-properties"
+//     ]
+// }

package.json

@@ -15,64 +15,65 @@
     "test-coverage": "jest --coverage"
   },
   "dependencies": {
-    "babel-polyfill": "6.26.0",
-    "cookie-parser": "1.4.3",
-    "apollo-boost": "0.1.12",
-    "express-fileupload": "0.4.0",
-    "apollo-cache-inmemory": "1.3.0-beta.6",
-    "apollo-client": "2.3.7",
-    "apollo-link-http": "1.5.4",
-    "apollo-server": "2.0.0",
+    "apollo-boost": "0.3.1",
+    "apollo-cache-inmemory": "1.5.1",
+    "apollo-client": "2.5.1",
+    "apollo-link-http": "1.5.14",
+    "apollo-server": "2.4.8",
     "apollo-server-express": "1.3.6",
-    "copy-webpack-plugin": "4.5.2",
-    "express-graphql": "0.6.12",
-    "graphql": "14.0.2",
-    "graphql-tools": "4.0.0",
-    "isomorphic-unfetch": "2.1.1",
-    "jsonwebtoken": "8.3.0",
-    "mongoose": "5.2.6",
-    "nodemailer": "4.6.7",
-    "nodemailer-express-handlebars": "3.0.0",
-    "react": "16.4.2",
-    "react-apollo": "2.1.9",
-    "react-dom": "16.4.2",
-    "react-helmet": "5.2.0",
-    "react-router-config": "1.0.0-beta.4",
-    "react-router-dom": "4.3.1",
-    "webpack-node-externals": "1.7.2",
-    "webpack": "4.17.2",
-    "webpack-cli": "3.1.0",
-    "toastr": "2.1.4",
     "axios": "0.18.0",
+    "babel-polyfill": "7.0.0-beta.3",
     "bcrypt": "2.0.1",
     "classnames": "2.2.6",
-    "concurrently": "3.6.1",
-    "cors": "2.8.4",
-    "css-loader": "1.0.0",
-    "dotenv": "6.0.0",
+    "concurrently": "4.1.0",
+    "cookie-parser": "1.4.4",
+    "copy-webpack-plugin": "5.0.2",
+    "cors": "2.8.5",
+    "css-loader": "2.1.1",
+    "dotenv": "7.0.0",
     "es-cookie": "1.2.0",
-    "express": "4.16.3",
-    "extract-loader": "2.0.1",
-    "file-loader": "1.1.11",
-    "generate-password": "1.4.0",
-    "node-sass": "4.9.2",
-    "sass-loader": "7.1.0",
-    "nodemon": "1.18.3",
-    "npm-run-all": "4.1.3",
+    "express": "4.16.4",
+    "express-fileupload": "1.1.4",
+    "express-graphql": "0.8.0",
+    "extract-loader": "3.1.0",
+    "file-loader": "3.0.1",
+    "generate-password": "1.4.1",
+    "graphql": "14.2.1",
+    "graphql-tools": "4.0.4",
+    "isomorphic-unfetch": "3.0.0",
+    "jsonwebtoken": "8.5.1",
+    "mongoose": "5.5.2",
+    "node-sass": "4.11.0",
+    "nodemailer": "6.1.1",
+    "nodemailer-express-handlebars": "3.0.0",
+    "nodemon": "1.18.11",
+    "npm-run-all": "4.1.5",
+    "qs-middleware": "^1.0.3",
     "randomstring": "1.1.5",
-    "react-ckeditor-wrapper": "1.1.2"
+    "react": "16.8.6",
+    "react-apollo": "2.5.4",
+    "react-ckeditor-wrapper": "1.1.2",
+    "react-dom": "16.8.6",
+    "react-helmet": "5.2.0",
+    "react-router-config": "5.0.0",
+    "react-router-dom": "5.0.0",
+    "sass-loader": "7.1.0",
+    "toastr": "2.1.4",
+    "webpack": "4.30.0",
+    "webpack-cli": "3.3.0",
+    "webpack-node-externals": "1.7.2"
   },
   "devDependencies": {
-    "babel-cli": "6.26.0",
-    "babel-core": "6.26.3",
-    "babel-loader": "7.1.5",
-    "babel-preset-env": "1.7.0",
-    "babel-preset-es2015": "6.24.1",
-    "babel-preset-es2017": "6.24.1",
-    "babel-preset-react": "6.24.1",
-    "babel-preset-stage-0": "6.24.1",
-    "enzyme": "3.4.1",
-    "enzyme-adapter-react-16": "1.2.0",
-    "jest": "23.5.0"
+    "@babel/core": "7.4.3",
+    "@babel/plugin-proposal-class-properties": "7.4.0",
+    "@babel/preset-env": "7.4.3",
+    "@babel/preset-react": "7.0.0",
+    "babel-core": "7.0.0-bridge.0",
+    "babel-eslint": "10.0.1",
+    "babel-jest": "24.7.1",
+    "babel-loader": "8.0.5",
+    "enzyme": "3.9.0",
+    "enzyme-adapter-react-16": "1.12.1",
+    "jest": "24.7.1"
   }
 }

webpack.client.js

@@ -3,10 +3,10 @@ const webConfig = require('./webConfig');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 
 module.exports = {
-    
+
     // production || development
     mode: webConfig.environment,
-    
+
     // Tell webpack the root file of our
     // server application 
     entry: ['./src/client.js', './src/assets/scss/styles.scss'],
@@ -22,16 +22,11 @@ module.exports = {
     module: {
         rules: [
             {
-                test: /\.js?$/,
-                loader: 'babel-loader',
-                exclude: '/node_modules/',
-                options: {
-                    presets: [
-                        'react', 'stage-0', ['env', {
-                            target: { browsers: ['last 2 versions']}
-                        }]
-                    ]
-                } 
+                test: /\.js$/,
+                exclude: /(node_modules|bower_components)/,
+                use: {
+                    loader: 'babel-loader'
+                }
             },
             {
                 test: /\.scss$/,
@@ -47,12 +42,7 @@ module.exports = {
                         loader: 'extract-loader'
                     },
                     {
-                        loader: 'css-loader',
-                        options: {
-                            minimize: true,
-                            url: true,
-                            root: webConfig.siteURL
-                        }
+                        loader: 'css-loader'
                     },
                     {
                         loader: 'sass-loader'

webpack.server.js

@@ -6,7 +6,7 @@ module.exports = {
 
     // production || development
     mode: webConfig.environment,
-    
+
     // Inform webpack that we're building a bundle
     // for nodeJS, rather then for the browser
     target: 'node',
@@ -26,17 +26,12 @@ module.exports = {
     module: {
         rules: [
             {
-                test: /\.js?$/,
-                loader: 'babel-loader',
-                exclude: '/node_modules/',
-                options: {
-                    presets: [
-                        'react', 'stage-0', ['env', {
-                            target: { browsers: ['last 2 versions']}
-                        }]
-                    ]
-                } 
-            }
+                test: /\.js$/,
+                exclude: /(node_modules|bower_components)/,
+                use: {
+                    loader: 'babel-loader'
+                }
+            },
         ]
     },