Merge pull request #14 from simpletut/codeRefactoring_update_dependencies_projectArchitecture_Testing

Code Refactoring - Update dependencies, Project Architecture And Testing

Author: simpletut

.babelrc

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

.eslintrc.json

@@ -0,0 +1,43 @@
+{
+  "env": {
+    "node": true,
+    "browser": true,
+    "es6": true,
+    "jest": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:react/recommended"
+  ],
+  "globals": {
+    "Atomics": "readonly",
+    "SharedArrayBuffer": "readonly"
+  },
+  "parser": "babel-eslint",
+  "parserOptions": {
+    "ecmaFeatures": {
+      "jsx": true
+    },
+    "ecmaVersion": 2018,
+    "sourceType": "module"
+  },
+  "plugins": [
+    "react"
+  ],
+  "rules": {
+    "indent": [
+      "error",
+      2
+    ],
+    "react/jsx-filename-extension": [
+      1,
+      {
+        "extensions": [
+          ".js",
+          ".jsx"
+        ]
+      }
+    ],
+    "react/prop-types": 0
+  }
+}

Utils/testing.js

@@ -0,0 +1,3 @@
+export const findByTestAtrr = (wrapper, attr) => {
+  return wrapper.find(`[data-test='${attr}']`);  
+};

assetsTransformer.js

@@ -0,0 +1,8 @@
+
+const path = require('path');
+
+module.exports = {
+  process(src, filename, config, options) {
+    return 'module.exports = ' + JSON.stringify(path.basename(filename)) + ';';
+  },
+};

config.js

@@ -0,0 +1,19 @@
+const config = require('config');
+
+module.exports = function () {
+  if (!config.get('dbString')) {
+    throw new Error('Environment variable \'dbString\' is not defined');
+  }
+
+  if (!config.get('jwtPrivateKey')) {
+    throw new Error('Environment variable \'jwt_secret_key\' is not defined');
+  }
+
+  if (!config.get('mailServer.auth.user')) {
+    throw new Error('Environment variable \'mailServer_user\' is not defined');
+  }
+
+  if (!config.get('mailServer.auth.pass')) {
+    throw new Error('Environment variable \'mailServer_pass\' is not defined');
+  }
+}

config/custom-environment-variables.json

@@ -0,0 +1,10 @@
+{
+  "dbString": "db_connection_string",
+  "jwtPrivateKey": "jwt_secret_key",
+  "mailServer": {
+      "auth": {
+          "user": "mailServer_user",
+          "pass": "mailServer_pass"
+      }
+  }
+}

config/default.json

@@ -0,0 +1,13 @@
+{
+  "dbString": "",
+  "jwtPrivateKey": "",
+  "mailServer": {
+    "host": "-HOST-",
+    "auth": {
+      "user": "",
+      "pass": ""
+    },
+    "from": "-FROM-EMAIL-",
+    "subject": "Password Reset"
+  }
+}

config/test.json

@@ -0,0 +1,13 @@
+{
+  "dbString": "mongodb://localhost/playground_tests",
+  "jwtPrivateKey": "1234",
+  "mailServer": {
+    "host": "[email protected]",
+    "auth": {
+      "user": "test",
+      "pass": "123"
+    },
+    "from": "Test",
+    "subject": "Password Reset"
+  }
+}

package.json

@@ -11,68 +11,92 @@
     "dev:build-server": "webpack --config webpack.server.js --watch",
     "dev:build-client": "webpack --config webpack.client.js --watch",
     "dev:server": "nodemon --watch build --exec node build/bundle.js",
+    "lint": "eslint src",
     "test": "jest",
+    "test-watch": "jest --watch",
     "test-coverage": "jest --coverage"
   },
+  "jest": {
+    "moduleNameMapper": {
+      "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/assetsTransformer.js",
+      "\\.(css|less|scss)$": "<rootDir>/assetsTransformer.js"
+    },
+    "setupFilesAfterEnv": [
+      "<rootDir>/setupTests.js"
+    ]
+  },
+  "husky": {
+    "hooks": {
+      "pre-push": "eslint src && jest"
+    }
+  },
   "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",
+    "config": "3.1.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",
+    "eslint": "5.16.0",
+    "eslint-config-airbnb": "17.1.0",
+    "eslint-plugin-import": "2.17.1",
+    "eslint-plugin-jsx-a11y": "6.2.1",
+    "eslint-plugin-react": "7.12.4",
+    "husky": "1.3.1",
+    "enzyme": "3.9.0",
+    "enzyme-adapter-react-16": "1.12.1",
+    "jest": "24.7.1"
   }
 }