Merge pull request #15350 from RocketChat/release-2.0.0

Release 2.0.0
RocketChat · Sep 12, 2019 · 92c00dc · 92c00dc
2 parents 2289486 + 370d4a6
commit 92c00dc
Show file tree

Hide file tree

Showing 842 changed files with 18,907 additions and 26,467 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -69,7 +69,7 @@ jobs:
     <<: *defaults
     docker:
       - image: circleci/node:8.11-stretch
-      - image: mongo:3.2
+      - image: mongo:3.4
 
     steps:
       - checkout
@@ -133,14 +133,6 @@ jobs:
           keys:
             - meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/versions" }}
 
-      - restore_cache:
-          keys:
-            - livechat-meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/.app/.meteor/versions" }}
-
-      - restore_cache:
-          keys:
-            - livechat-node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/.app/package.json" }}
-
       - run:
           name: Build Rocket.Chat
           environment:
@@ -177,16 +169,6 @@ jobs:
           paths:
             - ./.meteor/local
 
-      - save_cache:
-          key: livechat-node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/.app/package.json" }}
-          paths:
-            - ./packages/rocketchat-livechat/app/node_modules
-
-      - save_cache:
-          key: livechat-meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/.app/.meteor/versions" }}
-          paths:
-            - ./packages/rocketchat-livechat/app/.meteor/local
-
       - save_cache:
           key: meteor-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/release" }}
           paths:
@@ -202,13 +184,6 @@ jobs:
           path: /tmp/build
 
 
-  test-with-oplog-mongo-3-2:
-    <<: *test-with-oplog
-    docker:
-      - image: *test-docker-image
-      - image: mongo:3.2
-        command: [mongod, --noprealloc, --smallfiles, --replSet=rs0]
-
   test-with-oplog-mongo-3-4:
     <<: *test-with-oplog
     docker:
@@ -261,6 +236,8 @@ jobs:
             export PATH=~/.local/bin:$PATH
             export CIRCLE_TAG=${CIRCLE_TAG:=}
 
+            aws s3 cp s3://rocketchat/sign.key.gpg .circleci/sign.key.gpg
+
             source .circleci/setartname.sh
             source .circleci/setdeploydir.sh
             bash .circleci/setupsig.sh
@@ -342,6 +319,79 @@ jobs:
               exit 0
             fi;
 
+  pr-build:
+    <<: *defaults
+    docker:
+      - image: circleci/node:8.11-stretch
+
+    steps:
+      - checkout
+
+      - restore_cache:
+          keys:
+            - node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "package.json" }}
+
+      - restore_cache:
+          keys:
+            - meteor-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/release" }}
+
+      - run:
+          name: Install Meteor
+          command: |
+            # Restore bin from cache
+            set +e
+            METEOR_SYMLINK_TARGET=$(readlink ~/.meteor/meteor)
+            METEOR_TOOL_DIRECTORY=$(dirname "$METEOR_SYMLINK_TARGET")
+            set -e
+            LAUNCHER=$HOME/.meteor/$METEOR_TOOL_DIRECTORY/scripts/admin/launch-meteor
+            if [ -e $LAUNCHER ]
+            then
+              echo "Cached Meteor bin found, restoring it"
+              sudo cp "$LAUNCHER" "/usr/local/bin/meteor"
+            else
+              echo "No cached Meteor bin found."
+            fi
+
+            # only install meteor if bin isn't found
+            command -v meteor >/dev/null 2>&1 || curl https://install.meteor.com | sed s/--progress-bar/-sL/g | /bin/sh
+
+      - run:
+          name: Versions
+          command: |
+            npm --versions
+            node -v
+            meteor --version
+            meteor npm --versions
+            meteor node -v
+            git version
+
+      - run:
+          name: Meteor npm install
+          command: |
+            # rm -rf node_modules
+            # rm -f package-lock.json
+            meteor npm install
+
+      - restore_cache:
+          keys:
+            - meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/versions" }
+
+      - run:
+          name: Build Rocket.Chat
+          environment:
+            TOOL_NODE_FLAGS: --max_old_space_size=3072
+          command: |
+            meteor build --server-only /tmp/build-pr
+
+
+      - persist_to_workspace:
+          root: /tmp/
+          paths:
+            - build-pr
+
+      - store_artifacts:
+          path: /tmp/build-pr
+
   pr-image-build:
     <<: *defaults
 
@@ -364,9 +414,9 @@ jobs:
               exit 0
             fi;
 
-            cd /tmp/build
-            tar xzf Rocket.Chat.tar.gz
-            rm Rocket.Chat.tar.gz
+            cd /tmp/build-pr
+            tar xzf repo.tar.gz
+            rm repo.tar.gz
 
             docker login -u $DOCKER_USER -p $DOCKER_PASS
 
@@ -375,11 +425,11 @@ jobs:
             docker build -t rocketchat/rocket.chat:pr-$CIRCLE_PR_NUMBER .
             docker push rocketchat/rocket.chat:pr-$CIRCLE_PR_NUMBER
 
-            echo "Build preview Docker image"
-            cp ~/repo/.docker-mongo/Dockerfile .
-            cp ~/repo/.docker-mongo/entrypoint.sh .
-            docker build -t rocketchat/rocket.chat.preview:pr-$CIRCLE_PR_NUMBER .
-            docker push rocketchat/rocket.chat.preview:pr-$CIRCLE_PR_NUMBER
+            #echo "Build preview Docker image"
+            #cp ~/repo/.docker-mongo/Dockerfile .
+            #cp ~/repo/.docker-mongo/entrypoint.sh .
+            #docker build -t rocketchat/rocket.chat.preview:pr-$CIRCLE_PR_NUMBER .
+            #docker push rocketchat/rocket.chat.preview:pr-$CIRCLE_PR_NUMBER
 
 workflows:
   version: 2
@@ -389,25 +439,23 @@ workflows:
           filters:
             tags:
               only: /^[0-9]+\.[0-9]+\.[0-9]+(?:-(?:rc|beta)\.[0-9]+)?$/
-      - test-with-oplog-mongo-3-2: &test-mongo
+      - test-with-oplog-mongo-3-4: &test-mongo
           requires:
             - build
           filters:
             tags:
               only: /^[0-9]+\.[0-9]+\.[0-9]+(?:-(?:rc|beta)\.[0-9]+)?$/
-      - test-with-oplog-mongo-3-4: &test-mongo-no-pr
+      - test-with-oplog-mongo-3-6: &test-mongo-no-pr
           requires:
             - build
           filters:
             branches:
               only: develop
             tags:
               only: /^[0-9]+\.[0-9]+\.[0-9]+(?:-(?:rc|beta)\.[0-9]+)?$/
-      - test-with-oplog-mongo-3-6: *test-mongo-no-pr
       - test-with-oplog-mongo-4-0: *test-mongo
       - deploy:
           requires:
-            - test-with-oplog-mongo-3-2
             - test-with-oplog-mongo-3-4
             - test-with-oplog-mongo-3-6
             - test-with-oplog-mongo-4-0
@@ -433,12 +481,19 @@ workflows:
               ignore: develop
             tags:
               only: /^[0-9]+\.[0-9]+\.[0-9]+(?:-(?:rc|beta)\.[0-9]+)?$/
-      - pr-image-build:
+      - pr-build:
           requires:
             - hold
           filters:
             branches:
               ignore: develop
             tags:
               only: /^[0-9]+\.[0-9]+\.[0-9]+(?:-(?:rc|beta)\.[0-9]+)?$/
-
+      - pr-image-build:
+          requires:
+            - pr-build
+          filters:
+            branches:
+              ignore: develop
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+(?:-(?:rc|beta)\.[0-9]+)?$/
diff --git a/.circleci/sign.key.gpg b/.circleci/sign.key.gpg
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 1.3.2
+ENV RC_VERSION 2.0.0
 
 MAINTAINER buildmaster@rocket.chat
 

diff --git a/.eslintignore b/.eslintignore
@@ -5,8 +5,6 @@ packages/meteor-timesync/
 app/emoji-emojione/generateEmojiIndex.js
 app/favico/favico.js
 app/katex/client/katex/katex.min.js
-packages/rocketchat-livechat/.app/node_modules
-packages/rocketchat-livechat/.app/.meteor
 packages/rocketchat-livechat/assets/rocketchat-livechat.min.js
 packages/rocketchat-livechat/assets/rocket-livechat.js
 app/theme/client/minicolors/jquery.minicolors.js
@@ -20,6 +18,5 @@ packages/tap-i18n/lib/tap_i18next/tap_i18next-1.7.3.js
 private/moment-locales/
 public/livechat/
 !.scripts
-!packages/rocketchat-livechat/.app
 public/pdf.worker.min.js
 imports/client/
diff --git a/.eslintrc b/.eslintrc
@@ -7,5 +7,18 @@
 		"Assets"                      : false,
 		"chrome"                      : false,
 		"jscolor"                     : false
-	}
+  },
+  "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"],
+  },
+  "settings": {
+    "react": {
+      "version": "detect",
+    },
+  },
 }
diff --git a/.github/bot-config.yml b/.github/bot-config.yml
@@ -2,6 +2,7 @@ bot:
   name: "@rocket-cat"
 whitelist:
   users:
+    - wreiske
     - TwizzyDizzy
     - theorenck
     - JSzaszvari