Merge pull request #142 from blackjackkent/development

Production deploy

Author: blackjackkent

.eslintrc

@@ -1,5 +1,5 @@
 {
-	"extends": "airbnb",
+	"extends": ["airbnb", "plugin:prettier/recommended"],
 	"env": {
 		"browser": true,
 		"jest": true
@@ -11,87 +11,73 @@
 		"browser": true
 	},
 	"rules": {
-		"comma-dangle": [
-			"error",
-			"never"
-		],
-		"linebreak-style": [
-			"error",
-			"unix"
-		],
-		"indent": [
-			"error",
-			"tab",
-			{
-				"SwitchCase": 1
-			}
-		],
-		"no-tabs": "off",
-		"react/jsx-indent": [
-			"error",
-			"tab"
-		],
-		"react/destructuring-assignment": [
-			"error",
-			"always",
-			{
-				"ignoreClassFields": true
-			}
-		],
+		// "comma-dangle": ["error", "never"],
+		// "linebreak-style": ["error", "unix"],
+		// "indent": [
+		// 	"error",
+		// 	"tab",
+		// 	{
+		// 		"SwitchCase": 1
+		// 	}
+		// ],
+		// "no-tabs": "off",
+		"react/jsx-indent": ["error", "tab"],
+		// "react/destructuring-assignment": [
+		// 	"error",
+		// 	"always",
+		// 	{
+		// 		"ignoreClassFields": true
+		// 	}
+		// ],
 		"react/jsx-filename-extension": "off",
 		"react/jsx-one-expression-per-line": "off",
 		"react/sort-comp": [
 			"error",
 			{
-				"order": [
-					"lifecycle",
-					"static-methods",
-					"everything-else",
-					"render"
-				]
+				"order": ["lifecycle", "static-methods", "everything-else", "render"]
 			}
 		],
 		"class-methods-use-this": "off",
 		"no-plusplus": "off",
-		"react/jsx-indent-props": [
-			"error",
-			"tab"
-		],
-		"arrow-body-style": [
-			"error",
-			"as-needed"
-		],
-		"no-confusing-arrow": [
-			"error",
-			{
-				"allowParens": true
-			}
-		],
-		"import/no-extraneous-dependencies": [
+		"react/jsx-indent-props": ["error", "tab"],
+		// "arrow-body-style": ["error", "as-needed"],
+		// "no-confusing-arrow": [
+		// 	"error",
+		// 	{
+		// 		"allowParens": true
+		// 	}
+		// ],
+		// "import/no-extraneous-dependencies": [
+		// 	"error",
+		// 	{
+		// 		"devDependencies": ["**/*.test.js", "**/*.spec.js", "**/config/**", "**/*webpack*"]
+		// 	}
+		// ],
+		"react/jsx-wrap-multilines": [
 			"error",
 			{
-				"devDependencies": [
-					"**/*.test.js",
-					"**/*.spec.js",
-					"**/config/**",
-					"**/*webpack*"
-				]
+				"prop": "ignore"
 			}
 		],
-		"require-yield": "off",
-		"jsx-a11y/label-has-for": [
-			"error",
-			{
-				"components": [
-					"Label"
-				],
-				"required": {
-					"every": [
-						"id"
-					]
-				},
-				"allowChildren": false
+		"require-yield": "off"
+		// "jsx-a11y/label-has-for": [
+		// 	"error",
+		// 	{
+		// 		"components": ["Label"],
+		// 		"required": {
+		// 			"every": ["id"]
+		// 		},
+		// 		"allowChildren": false
+		// 	}
+		// ],
+		// "object-curly-newline": "off",
+		// "arrow-parens": ["error", "always"]
+	},
+	"settings": {
+		"import/resolver": {
+			"webpack": {
+				"config": "webpack.common.js"
 			}
-		]
+		}
 	}
 }

.gitattributes

@@ -1 +1 @@
-* text=auto
+* text=auto eol=lf

.prettierrc

@@ -0,0 +1,9 @@
+{
+	"trailingComma": "none",
+	"tabWidth": 4,
+	"semi": true,
+	"singleQuote": true,
+	"useTabs": true,
+	"arrowParens": "always",
+	"printWidth": 100
+}

config/tests/jest.config.json

@@ -1,7 +1,8 @@
 {
 	"rootDir": "../..",
 	"moduleNameMapper": {
-		"\\.(css|scss)$": "<rootDir>/config/tests/styleMock.js"
+		"\\.(css|scss)$": "<rootDir>/config/tests/styleMock.js",
+		"^~/(.*)": "<rootDir>/src/$1"
 	},
 	"setupFilesAfterEnv": [
 		"<rootDir>/node_modules/jest-enzyme/lib/index.js"
@@ -22,7 +23,8 @@
 		"/src/infrastructure/initSagas",
 		"/src/infrastructure/network",
 		"/src/utility/getQuery",
-		"/src/utility/history"
+		"/src/utility/history",
+		"/src/testhelpers/"
 	],
 	"collectCoverage": true,
 	"collectCoverageFrom": [

jsconfig.json

@@ -0,0 +1,8 @@
+{
+    "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+            "~/*": ["src/*"]
+        }
+    }
+}