Merge branch 'develop' into develop

.babelrc

@@ -0,0 +1,5 @@
+{
+	"presets": [
+		"@babel/preset-env"
+	]
+}

.docker-mongo/Dockerfile

@@ -1,24 +1,24 @@
-FROM rocketchat/base:8
+FROM rocketchat/base:12.16.1
 
-ADD . /app
-ADD entrypoint.sh /app/bundle/
-
-MAINTAINER buildmaster@rocket.chat
+LABEL maintainer="buildmaster@rocket.chat"
 
 RUN set -x \
- && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 \
+ && apt-get update \
+ && apt-get install -y wget \
+ && wget -qO - https://www.mongodb.org/static/pgp/server-4.0.asc | apt-key add - \
  && echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list \
  && apt-get update \
- && apt-get install -y --force-yes pwgen mongodb-org \
- && echo "mongodb-org hold" | dpkg --set-selections \
- && echo "mongodb-org-server hold" | dpkg --set-selections \
- && echo "mongodb-org-shell hold" | dpkg --set-selections \
- && echo "mongodb-org-mongos hold" | dpkg --set-selections \
- && echo "mongodb-org-tools hold" | dpkg --set-selections \
+ && apt-get install -y pwgen mongodb-org \
+ && apt-get clean my room
+
+ADD . /app
+ADD entrypoint.sh /app/bundle/
+
+RUN set -x \
  && cd /app/bundle/programs/server \
  && npm install \
  && npm cache clear --force \
- && rm -rf /var/lib/apt/lists/*
+ && chown -R rocketchat:rocketchat /app
 
 VOLUME /app/uploads
 
@@ -28,6 +28,7 @@ WORKDIR /app/bundle
 ENV DEPLOY_METHOD=docker-preview \
     NODE_ENV=production \
     MONGO_URL=mongodb://localhost:27017/rocketchat \
+    MONGO_OPLOG_URL=mongodb://localhost:27017/local \
     HOME=/tmp \
     PORT=3000 \
     ROOT_URL=http://localhost:3000 \

.docker-mongo/entrypoint.sh

@@ -39,11 +39,32 @@ echo """
 ╚═╝  ╚═╝ ╚═════╝  ╚═════╝╚═╝  ╚═╝╚══════╝   ╚═╝╚═╝ ╚═════╝╚═╝  ╚═╝╚═╝  ╚═╝   ╚═╝       ╚═╝     ╚═╝  ╚═╝╚══════╝  ╚═══╝  ╚═╝╚══════╝ ╚══╝╚══╝
 """
 
-mongod --smallfiles --storageEngine=mmapv1 --fork --config /etc/mongod.conf
+mongod --smallfiles --storageEngine=mmapv1 --fork --replSet rs0 --config /etc/mongod.conf
 
 until mongo --eval "db" &> /dev/null; do
 	echo "MongoDB still not ready, sleeping"
 	sleep 1
 done
 
-node main.js
+sleep 2
+
+# initiate mongo replica set
+for i in `seq 1 30`; do
+	mongo rocketchat --eval "
+	rs.initiate({
+		_id: 'rs0',
+		members: [ { _id: 0, host: 'localhost:27017' } ]})" &&
+	s=$? && break || s=$?;
+	echo "Tried $i times. Waiting 5 secs...";
+	sleep 5;
+done;
+
+sleep 2
+
+# try multiple times until replica set is ready
+for i in `seq 1 30`; do
+	node main.js &&
+	s=$? && break || s=$?;
+	echo "Tried $i times. Waiting 5 secs...";
+	sleep 5;
+done;

.docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM rocketchat/base:8.17.0
+FROM rocketchat/base:12.16.1
 
 ADD . /app
 

.docker/Dockerfile.rhel

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 2.5.0-develop
+ENV RC_VERSION 3.1.0-develop
 
 MAINTAINER buildmaster@rocket.chat
 

.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",

.github/history-manual.json

@@ -16,5 +16,10 @@
 		"title": "[BREAK] Support for Cordova (Rocket.Chat Legacy app) has reached End-of-life, support has been discontinued",
 		"userLogin": "sampaiodiego",
 		"contributors": []
+	}],
+	"3.0.0-rc.9": [{
+		"title": "[BREAK] TLS v1.0 and TLS v1.1 were disabled by due to NodeJS update to v12. You can still enable them by using flags like `--tls-min-v1.0` and `--tls-min-v1.1`",
+		"userLogin": "sampaiodiego",
+		"contributors": []
 	}]
 }