Merge pull request #668 from assistify/release/2.4.7-0.9.15

Release/2.4.7 0.9.15

.circleci/config.yml

@@ -44,7 +44,7 @@ test-save-npm-cache: &test-save-npm-cache
     - ./node_modules
 
 test-docker-image: &test-docker-image
-  circleci/node:8.15-stretch-browsers
+  circleci/node:8.16-stretch-browsers
 
 test-with-oplog: &test-with-oplog
   <<: *defaults
@@ -69,7 +69,7 @@ jobs:
   build: &build
     <<: *defaults
     docker:
-      - image: circleci/node:8.15-stretch
+      - image: circleci/node:8.16-stretch
       - image: mongo:3.4
 
     steps:
@@ -147,7 +147,7 @@ jobs:
       - run:
           name: Build Rocket.Chat
           environment:
-            TOOL_NODE_FLAGS: --max_old_space_size=3072
+            TOOL_NODE_FLAGS: --max_old_space_size=4096
           command: |
             if [[ $CIRCLE_TAG ]] || [[ $CIRCLE_BRANCH == 'develop' ]]; then
               meteor reset;
@@ -220,7 +220,7 @@ jobs:
   deploy:
     <<: *defaults
     docker:
-      - image: circleci/node:8.15-stretch
+      - image: circleci/node:8.16-stretch
 
     steps:
       - attach_workspace:
@@ -268,7 +268,7 @@ jobs:
 
             export CIRCLE_TAG=${CIRCLE_TAG:=}
 
-            cp ~/repo/.docker/Dockerfile.local ./Dockerfile
+            cp ~/repo/.docker/Dockerfile .
             docker login -u $DOCKER_USER -p $DOCKER_PASS
 
             if [[ $CIRCLE_TAG ]]; then
@@ -314,7 +314,16 @@ workflows:
   version: 2
   build-and-test:
     jobs:
+      - hold-all:
+        type: approval
+        filters:
+          branches:
+            only: develop
+          tags:
+            only: /^[0-9]+\.[0-9]+\.[0-9]+(?:-(?:rc|beta)\.[0-9]+)?$/
       - build:
+          requires:
+            - hold-all
           filters:
             tags:
               only: /^v[0-9]+\.[0-9]+\.[0-9]-[0-9]+\.[0-9]+\.[0-9]+$/

.circleci/snap.sh

@@ -3,7 +3,9 @@ set -euvo pipefail
 IFS=$'\n\t'
 
 # Add launchpad to known hosts
-ssh-keyscan -t rsa -H git.launchpad.net > ~/.ssh/known_hosts
+
+mkdir -p $HOME/.ssh
+ssh-keyscan -t rsa -H git.launchpad.net >> $HOME/.ssh/known_hosts
 
 echo "Preparing to trigger a snap release for $SNAP_CHANNEL channel"
 

.docker/Dockerfile

@@ -1,15 +1,10 @@
-FROM rocketchat/base:8
+FROM rocketchat/base:8.17.0
 
-ENV RC_VERSION 2.1.2
-MAINTAINER [email protected]
+ADD . /app
+
+LABEL maintainer="[email protected]"
 
 RUN set -x \
- && curl -SLf "https://releases.rocket.chat/${RC_VERSION}/download/" -o rocket.chat.tgz \
- && curl -SLf "https://releases.rocket.chat/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
- && gpg --verify rocket.chat.tgz.asc \
- && mkdir -p /app \
- && tar -zxf rocket.chat.tgz -C /app \
- && rm rocket.chat.tgz rocket.chat.tgz.asc \
  && cd /app/bundle/programs/server \
  && npm install \
  && npm cache clear --force \

.docker/Dockerfile.rhel

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 2.3.2
+ENV RC_VERSION 2.4.7
 
 MAINTAINER [email protected]
 

.eslintignore

@@ -19,3 +19,4 @@ public/livechat/
 !.scripts
 public/pdf.worker.min.js
 imports/client/
+!/.storybook/

.eslintrc

@@ -1,23 +1,104 @@
 {
-	"extends": ["@rocket.chat/eslint-config"],
-	"parser": "babel-eslint",
-	"globals": {
-		"__meteor_bootstrap__"        : false,
-		"__meteor_runtime_config__"   : false,
-		"Assets"                      : false,
-		"chrome"                      : false
+  "extends": [
+    "@rocket.chat/eslint-config"
+  ],
+  "parser": "babel-eslint",
+  "globals": {
+    "__meteor_bootstrap__": false,
+    "__meteor_runtime_config__": false,
+    "Assets": false,
+    "chrome": false,
+    "jscolor": false
   },
-  "plugins": ["react"],
-	"rules": {
-    "jsx-quotes": ["error", "prefer-single"],
+  "plugins": [
+    "react"
+  ],
+  "rules": {
+    "jsx-quotes": [
+      "error",
+      "prefer-single"
+    ],
     "react/jsx-uses-react": "error",
     "react/jsx-uses-vars": "error",
     "react/jsx-no-undef": "error",
-    "react/jsx-fragments": ["error", "syntax"],
+    "react/jsx-fragments": [
+      "error",
+      "syntax"
+    ],
   },
   "settings": {
     "react": {
       "version": "detect",
     },
   },
+  "overrides": [
+    {
+      "files": [
+        "**/*.ts",
+        "**/*.tsx"
+      ],
+      "extends": [
+        "@rocket.chat/eslint-config",
+        "plugin:@typescript-eslint/recommended",
+        "plugin:@typescript-eslint/eslint-recommended"
+      ],
+      "globals": {
+        "Atomics": "readonly",
+        "SharedArrayBuffer": "readonly"
+      },
+      "parser": "@typescript-eslint/parser",
+      "parserOptions": {
+        "sourceType": "module",
+        "ecmaVersion": 2018,
+        "warnOnUnsupportedTypeScriptVersion": false,
+        "ecmaFeatures": {
+          "experimentalObjectRestSpread": true,
+          "legacyDecorators": true
+        }
+      },
+      "plugins": [
+        "react",
+        "@typescript-eslint"
+      ],
+      "rules": {
+        "jsx-quotes": [
+          "error",
+          "prefer-single"
+        ],
+        "react/jsx-uses-react": "error",
+        "react/jsx-uses-vars": "error",
+        "react/jsx-no-undef": "error",
+        "react/jsx-fragments": [
+          "error",
+          "syntax"
+        ],
+        "@typescript-eslint/ban-ts-ignore": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/interface-name-prefix": [
+          "error",
+          "always"
+        ]
+      },
+      "env": {
+        "browser": true,
+        "commonjs": true,
+        "es6": true,
+        "node": true
+      },
+      "settings": {
+        "import/resolver": {
+          "node": {
+            "extensions": [
+              ".js",
+              ".ts",
+              ".tsx"
+            ]
+          }
+        },
+        "react": {
+          "version": "detect"
+        }
+      }
+    }
+  ]
 }