Merge pull request RocketChat#257 from WideChat/develop_pwa

Develop pwa catchup
shubhsherl · May 5, 2020 · 01c6389 · 01c6389
2 parents 23fb7d9 + 8cae71e
commit 01c6389
Show file tree

Hide file tree

Showing 677 changed files with 31,151 additions and 8,483 deletions.
diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.1.0-develop
+ENV RC_VERSION 3.2.0-develop
 
 MAINTAINER [email protected]
 

diff --git a/.eslintrc b/.eslintrc
@@ -24,12 +24,21 @@
     "react/jsx-fragments": [
       "error",
       "syntax"
-    ],
+    ]
   },
   "settings": {
-    "react": {
-      "version": "detect",
+    "import/resolver": {
+      "node": {
+        "extensions": [
+          ".js",
+          ".ts",
+          ".tsx"
+        ]
+      }
     },
+    "react": {
+      "version": "detect"
+    }
   },
   "overrides": [
     {
@@ -38,9 +47,9 @@
         "**/*.tsx"
       ],
       "extends": [
-        "@rocket.chat/eslint-config",
         "plugin:@typescript-eslint/recommended",
-        "plugin:@typescript-eslint/eslint-recommended"
+        "plugin:@typescript-eslint/eslint-recommended",
+        "@rocket.chat/eslint-config"
       ],
       "globals": {
         "Atomics": "readonly",
@@ -73,6 +82,10 @@
           "syntax"
         ],
         "@typescript-eslint/ban-ts-ignore": "off",
+        "@typescript-eslint/indent": [
+          "error",
+          "tab"
+        ],
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/interface-name-prefix": [
           "error",