Skip to content

Commit 4c0b3ce

Browse files
blackjackkentblackjackkent
authored
Merge pull request #142 from blackjackkent/development
Production deploy
2 parents 05e8fdd + 55a17e9 commit 4c0b3ce

495 files changed

Lines changed: 15994 additions & 14759 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintrc‎

Lines changed: 55 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "airbnb",
2+
"extends": ["airbnb", "plugin:prettier/recommended"],
33
"env": {
44
"browser": true,
55
"jest": true
@@ -11,87 +11,73 @@
1111
"browser": true
1212
},
1313
"rules": {
14-
"comma-dangle": [
15-
"error",
16-
"never"
17-
],
18-
"linebreak-style": [
19-
"error",
20-
"unix"
21-
],
22-
"indent": [
23-
"error",
24-
"tab",
25-
{
26-
"SwitchCase": 1
27-
}
28-
],
29-
"no-tabs": "off",
30-
"react/jsx-indent": [
31-
"error",
32-
"tab"
33-
],
34-
"react/destructuring-assignment": [
35-
"error",
36-
"always",
37-
{
38-
"ignoreClassFields": true
39-
}
40-
],
14+
// "comma-dangle": ["error", "never"],
15+
// "linebreak-style": ["error", "unix"],
16+
// "indent": [
17+
// "error",
18+
// "tab",
19+
// {
20+
// "SwitchCase": 1
21+
// }
22+
// ],
23+
// "no-tabs": "off",
24+
"react/jsx-indent": ["error", "tab"],
25+
// "react/destructuring-assignment": [
26+
// "error",
27+
// "always",
28+
// {
29+
// "ignoreClassFields": true
30+
// }
31+
// ],
4132
"react/jsx-filename-extension": "off",
4233
"react/jsx-one-expression-per-line": "off",
4334
"react/sort-comp": [
4435
"error",
4536
{
46-
"order": [
47-
"lifecycle",
48-
"static-methods",
49-
"everything-else",
50-
"render"
51-
]
37+
"order": ["lifecycle", "static-methods", "everything-else", "render"]
5238
}
5339
],
5440
"class-methods-use-this": "off",
5541
"no-plusplus": "off",
56-
"react/jsx-indent-props": [
57-
"error",
58-
"tab"
59-
],
60-
"arrow-body-style": [
61-
"error",
62-
"as-needed"
63-
],
64-
"no-confusing-arrow": [
65-
"error",
66-
{
67-
"allowParens": true
68-
}
69-
],
70-
"import/no-extraneous-dependencies": [
42+
"react/jsx-indent-props": ["error", "tab"],
43+
// "arrow-body-style": ["error", "as-needed"],
44+
// "no-confusing-arrow": [
45+
// "error",
46+
// {
47+
// "allowParens": true
48+
// }
49+
// ],
50+
// "import/no-extraneous-dependencies": [
51+
// "error",
52+
// {
53+
// "devDependencies": ["**/*.test.js", "**/*.spec.js", "**/config/**", "**/*webpack*"]
54+
// }
55+
// ],
56+
"react/jsx-wrap-multilines": [
7157
"error",
7258
{
73-
"devDependencies": [
74-
"**/*.test.js",
75-
"**/*.spec.js",
76-
"**/config/**",
77-
"**/*webpack*"
78-
]
59+
"prop": "ignore"
7960
}
8061
],
81-
"require-yield": "off",
82-
"jsx-a11y/label-has-for": [
83-
"error",
84-
{
85-
"components": [
86-
"Label"
87-
],
88-
"required": {
89-
"every": [
90-
"id"
91-
]
92-
},
93-
"allowChildren": false
62+
"require-yield": "off"
63+
// "jsx-a11y/label-has-for": [
64+
// "error",
65+
// {
66+
// "components": ["Label"],
67+
// "required": {
68+
// "every": ["id"]
69+
// },
70+
// "allowChildren": false
71+
// }
72+
// ],
73+
// "object-curly-newline": "off",
74+
// "arrow-parens": ["error", "always"]
75+
},
76+
"settings": {
77+
"import/resolver": {
78+
"webpack": {
79+
"config": "webpack.common.js"
9480
}
95-
]
81+
}
9682
}
9783
}

‎.gitattributes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* text=auto
1+
* text=auto eol=lf

‎.prettierrc‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"trailingComma": "none",
3+
"tabWidth": 4,
4+
"semi": true,
5+
"singleQuote": true,
6+
"useTabs": true,
7+
"arrowParens": "always",
8+
"printWidth": 100
9+
}

‎config/tests/jest.config.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"rootDir": "../..",
33
"moduleNameMapper": {
4-
"\\.(css|scss)$": "<rootDir>/config/tests/styleMock.js"
4+
"\\.(css|scss)$": "<rootDir>/config/tests/styleMock.js",
5+
"^~/(.*)": "<rootDir>/src/$1"
56
},
67
"setupFilesAfterEnv": [
78
"<rootDir>/node_modules/jest-enzyme/lib/index.js"
@@ -22,7 +23,8 @@
2223
"/src/infrastructure/initSagas",
2324
"/src/infrastructure/network",
2425
"/src/utility/getQuery",
25-
"/src/utility/history"
26+
"/src/utility/history",
27+
"/src/testhelpers/"
2628
],
2729
"collectCoverage": true,
2830
"collectCoverageFrom": [

‎jsconfig.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"compilerOptions": {
3+
"baseUrl": ".",
4+
"paths": {
5+
"~/*": ["src/*"]
6+
}
7+
}
8+
}

0 commit comments

Comments
 (0)