chore: Merge branch 'infra' into dev

Author: mydearxym

package-docker.json

@@ -96,7 +96,6 @@
   "devDependencies": {
     "@babel/core": "7.2.2",
     "@babel/plugin-proposal-decorators": "^7.1.0",
-    "babel-eslint": "9.0.0",
     "babel-jest": "^23.6.0",
     "babel-plugin-add-react-displayname": "^0.0.5",
     "babel-plugin-import": "1.9.1",

package.json

@@ -130,7 +130,6 @@
     "@commitlint/cli": "^7.0.0",
     "@commitlint/config-conventional": "^8.0.0",
     "@groupher/eslint-config-web": "^1.0.0",
-    "babel-eslint": "10.0.2",
     "babel-jest": "^23.6.0",
     "babel-plugin-add-react-displayname": "^0.0.5",
     "babel-plugin-import": "1.9.1",

yarn.lock

@@ -858,9 +858,10 @@
     "@f/map-obj" "^1.2.2"
 
 "@groupher/eslint-config-web@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/@groupher/eslint-config-web/-/eslint-config-web-1.0.0.tgz#4cff23ed7458fea7bf0c357e45b6bc37fc0851b1"
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/@groupher/eslint-config-web/-/eslint-config-web-1.1.0.tgz#26f2611d84a997562956d1f3412d950165f178d8"
   dependencies:
+    babel-eslint "^10.0.2"
     eslint-config-airbnb "^17.1.0"
     eslint-config-prettier "^5.0.0"
     eslint-import-resolver-babel-module "^5.1.0"
@@ -870,6 +871,7 @@
     eslint-plugin-prettier "^3.1.0"
     eslint-plugin-react "^7.13.0"
     eslint-plugin-react-hooks "^1.6.0"
+    prettier "^1.18.2"
 
 "@hapi/address@2.x.x":
   version "2.0.0"
@@ -2067,9 +2069,9 @@ babel-core@^6.0.0, babel-core@^6.26.0:
     slash "^1.0.0"
     source-map "^0.5.7"
 
-babel-eslint@10.0.2:
+babel-eslint@^10.0.2:
   version "10.0.2"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.2.tgz#182d5ac204579ff0881684b040560fdcc1558456"
+  resolved "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.2.tgz#182d5ac204579ff0881684b040560fdcc1558456"
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/parser" "^7.0.0"
@@ -8625,7 +8627,7 @@ prettier@1.18.0:
   version "1.18.0"
   resolved "https://registry.npmjs.org/prettier/-/prettier-1.18.0.tgz#d1701ca9b2941864b52f3262b35946d2c9cd88f0"
 
-prettier@^1.14.3:
+prettier@^1.14.3, prettier@^1.18.2:
   version "1.18.2"
   resolved "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
 
@@ -9882,12 +9884,18 @@ resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.2.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.8.1:
   version "1.11.0"
   resolved "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz#4014870ba296176b86343d50b60f3b50609ce232"
   dependencies:
     path-parse "^1.0.6"
 
+resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.5.0:
+  version "1.11.1"
+  resolved "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e"
+  dependencies:
+    path-parse "^1.0.6"
+
 response-time@^2.3.2:
   version "2.3.2"
   resolved "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz#ffa71bab952d62f7c1d49b7434355fbc68dffc5a"