Merge branch 'develop' into system-messages

.babelrc

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

.docker-mongo/Dockerfile

@@ -1,4 +1,4 @@
-FROM rocketchat/base:8
+FROM rocketchat/base:12.14.0
 
 ADD . /app
 ADD entrypoint.sh /app/bundle/

.docker/Dockerfile

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

.github/workflows/build_and_test.yml

@@ -29,35 +29,43 @@ jobs:
         echo "github.event_name: ${{ github.event_name }}"
         cat $GITHUB_EVENT_PATH
 
-    - name: Use Node.js 8.17.0
+    - name: Use Node.js 12.14.0
       uses: actions/setup-node@v1
       with:
-        node-version: "8.17.0"
+        node-version: "12.14.0"
 
     - uses: actions/checkout@v1
 
     - name: check package-lock
       run: |
         npx package-lock-check
 
+    - name: Cache cypress
+      id: cache-cypress
+      uses: actions/cache@v1
+      with:
+        path: /home/runner/.cache/Cypress
+        key: ${{ runner.OS }}-cache-cypress-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}
+
     - name: Cache node modules
+      if: steps.cache-cypress.outputs.cache-hit == 'true'
       id: cache-nodemodules
       uses: actions/cache@v1
       with:
         path: node_modules
-        key: ${{ runner.OS }}-node_modules-${{ hashFiles('**/package-lock.json') }}
+        key: ${{ runner.OS }}-node_modules-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}
 
     - name: Cache meteor local
       uses: actions/cache@v1
       with:
         path: ./.meteor/local
-        key: ${{ runner.OS }}-meteor_cache-${{ hashFiles('.meteor/versions') }}
+        key: ${{ runner.OS }}-meteor_cache-${{ hashFiles('.meteor/versions') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}
 
     - name: Cache meteor
       uses: actions/cache@v1
       with:
         path: ~/.meteor
-        key: ${{ runner.OS }}-meteor-${{ hashFiles('.meteor/release') }}
+        key: ${{ runner.OS }}-meteor-${{ hashFiles('.meteor/release') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}
 
     - name: Install Meteor
       run: |
@@ -88,7 +96,7 @@ jobs:
         git version
 
     - name: npm install
-      if: steps.cache-nodemodules.outputs.cache-hit != 'true'
+      if: steps.cache-nodemodules.outputs.cache-hit != 'true' || steps.cache-cypress.outputs.cache-hit != 'true'
       run: |
         meteor npm install
 
@@ -152,7 +160,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: ["8.17.0"]
+        node-version: ["12.14.0"]
         mongodb-version: ["3.4", "3.6", "4.0"]
 
     steps:
@@ -189,15 +197,23 @@ jobs:
 
     - uses: actions/checkout@v1
 
+    - name: Cache cypress
+      id: cache-cypress
+      uses: actions/cache@v1
+      with:
+        path: /home/runner/.cache/Cypress
+        key: ${{ runner.OS }}-cache-cypress-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}
+
     - name: Cache node modules
+      if: steps.cache-cypress.outputs.cache-hit == 'true'
       id: cache-nodemodules
       uses: actions/cache@v1
       with:
         path: node_modules
-        key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }}
+        key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}
 
     - name: NPM install
-      if: steps.cache-nodemodules.outputs.cache-hit != 'true'
+      if: steps.cache-nodemodules.outputs.cache-hit != 'true' || steps.cache-cypress.outputs.cache-hit != 'true'
       run: |
         npm install
 
@@ -235,24 +251,24 @@ jobs:
       uses: actions/cache@v1
       with:
         path: node_modules
-        key: ${{ runner.OS }}-node_modules-${{ hashFiles('**/package-lock.json') }}
+        key: ${{ runner.OS }}-node_modules-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}
 
     - name: Cache meteor local
       uses: actions/cache@v1
       with:
         path: ./.meteor/local
-        key: ${{ runner.OS }}-meteor_cache-${{ hashFiles('.meteor/versions') }}
+        key: ${{ runner.OS }}-meteor_cache-${{ hashFiles('.meteor/versions') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}
 
     - name: Cache meteor
       uses: actions/cache@v1
       with:
         path: ~/.meteor
-        key: ${{ runner.OS }}-meteor-${{ hashFiles('.meteor/release') }}
+        key: ${{ runner.OS }}-meteor-${{ hashFiles('.meteor/release') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}
 
-    - name: Use Node.js 8.17.0
+    - name: Use Node.js 12.14.0
       uses: actions/setup-node@v1
       with:
-        node-version: "8.17.0"
+        node-version: "12.14.0"
 
     - name: Install Meteor
       run: |

.gitignore

@@ -79,3 +79,4 @@ tests/end-to-end/temporary_staged_test
 .screenshots
 /private/livechat
 /storybook-static
+/tests/cypress/screenshots

.meteor/packages

@@ -16,17 +16,17 @@ check@1.3.1
 ddp-rate-limiter@1.0.7
 ddp-common@1.4.0
 dynamic-import@0.5.1
-ecmascript@0.13.2
-typescript@3.7.1
-ejson@1.1.0
+ecmascript@0.14.0
+typescript@3.7.2
+ejson@1.1.1
 email@1.2.3
 fastclick@1.0.13
 http@1.4.2
 jquery@1.11.10
 logging@1.1.20
 meteor-base@1.4.0
 mobile-experience@1.0.5
-mongo@1.7.0
+mongo@1.8.0
 random@1.1.0
 rate-limit@1.0.9
 reactive-dict@1.3.0
@@ -36,7 +36,7 @@ service-configuration@1.0.11
 session@1.2.0
 shell-server@0.4.0
 spacebars
-standard-minifier-js@2.5.2
+standard-minifier-js@2.6.0
 tracker@1.2.0
 
 #rocketchat:google-natural-language
@@ -77,10 +77,10 @@ littledata:synced-cron
 
 edgee:slingshot
 jalik:ufs-local@0.2.5
-accounts-base@1.4.5
+accounts-base@1.5.0
 accounts-oauth@1.1.16
 autoupdate@1.6.0
-babel-compiler@7.4.2
+babel-compiler@7.5.0
 google-oauth@1.2.6
 htmljs
 less
@@ -92,7 +92,7 @@ raix:eventemitter
 routepolicy@1.1.0
 sha@1.0.9
 templating
-webapp@1.7.5
+webapp@1.8.0
 webapp-hashing@1.0.9
 rocketchat:oauth2-server
 rocketchat:i18n

.meteor/release

@@ -1 +1 @@
-METEOR@1.8.3
+METEOR@1.9

.meteor/versions

@@ -1,16 +1,16 @@
-accounts-base@1.4.5
+accounts-base@1.5.0
 accounts-facebook@1.3.2
 accounts-github@1.4.2
 accounts-google@1.3.3
 accounts-meteor-developer@1.4.2
 accounts-oauth@1.1.16
-accounts-password@1.5.2
+accounts-password@1.5.3
 accounts-twitter@1.4.2
 aldeed:simple-schema@1.5.4
 allow-deny@1.1.0
 autoupdate@1.6.0
-babel-compiler@7.4.2
-babel-runtime@1.4.0
+babel-compiler@7.5.0
+babel-runtime@1.5.0
 base64@1.0.12
 binary-heap@1.0.11
 blaze@2.3.4
@@ -19,7 +19,7 @@ blaze-tools@1.0.10
 boilerplate-generator@1.6.0
 caching-compiler@1.2.1
 caching-html-compiler@1.1.3
-callback-hook@1.2.0
+callback-hook@1.3.0
 cfs:http-methods@0.0.32
 check@1.3.1
 coffeescript@1.0.17
@@ -34,10 +34,10 @@ deps@1.0.12
 diff-sequence@1.1.1
 dispatch:run-as-user@1.1.1
 dynamic-import@0.5.1
-ecmascript@0.13.2
+ecmascript@0.14.0
 ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.9.0
-ecmascript-runtime-server@0.8.0
+ecmascript-runtime-client@0.10.0
+ecmascript-runtime-server@0.9.0
 edgee:slingshot@0.7.1
 ejson@1.1.1
 email@1.2.3
@@ -83,16 +83,16 @@ meteor-base@1.4.0
 meteor-developer-oauth@1.2.1
 meteorhacks:inject-initial@1.0.4
 meteorspark:util@0.2.0
-minifier-css@1.4.3
-minifier-js@2.5.1
+minifier-css@1.5.0
+minifier-js@2.6.0
 minimongo@1.4.5
 mizzao:timesync@0.3.4
 mobile-experience@1.0.5
 mobile-status-bar@1.0.14
-modern-browsers@0.1.4
-modules@0.14.0
-modules-runtime@0.11.0
-mongo@1.7.0
+modern-browsers@0.1.5
+modules@0.15.0
+modules-runtime@0.12.0
+mongo@1.8.0
 mongo-decimal@0.1.1
 mongo-dev-server@1.1.0
 mongo-id@1.0.7
@@ -102,7 +102,7 @@ mystor:device-detection@0.2.0
 nimble:restivus@0.8.12
 nooitaf:colors@1.1.2_1
 npm-bcrypt@0.9.3
-npm-mongo@3.2.0
+npm-mongo@3.3.0
 oauth@1.2.8
 oauth1@1.2.2
 oauth2@1.2.1
@@ -140,7 +140,7 @@ socket-stream-client@0.2.2
 spacebars@1.0.15
 spacebars-compiler@1.1.3
 srp@1.0.12
-standard-minifier-js@2.5.2
+standard-minifier-js@2.6.0
 templating@1.3.2
 templating-compiler@1.3.3
 templating-runtime@1.3.2
@@ -149,9 +149,9 @@ tmeasday:check-npm-versions@0.3.2
 todda00:friendly-slugs@0.6.0
 tracker@1.2.0
 twitter-oauth@1.2.0
-typescript@3.7.1
+typescript@3.7.2
 ui@1.0.13
 underscore@1.0.10
 url@1.2.0
-webapp@1.7.5
+webapp@1.8.0
 webapp-hashing@1.0.9

.scripts/start.js

@@ -112,7 +112,7 @@ function startChimp() {
 	startProcess({
 		name: 'Chimp',
 		command: 'npm',
-		params: ['run', 'chimp-test'],
+		params: ['run', 'testci'],
 		// command: 'exit',
 		// params: ['2'],
 		options: {

.snapcraft/resources/preparenode

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-node_version="v8.15.1"
+node_version="v12.14.0"
 
 unamem="$(uname -m)"
 if [[ $unamem == *aarch64* ]]; then

.storybook/.babelrc

@@ -6,7 +6,7 @@
         "shippedProposals": true,
         "useBuiltIns": "usage",
         "corejs": "3",
-        "modules": "commonjs",
+        "modules": "commonjs"
       }
     ],
     "@babel/preset-react",

app/apps/client/admin/appLogs.html

@@ -31,6 +31,10 @@ <h2>
 									</div>
 								</div>
 								<div class="section-content">
+									{{#if log.instanceId}}
+										<span>Instance: {{log.instanceId}}</span>
+									{{/if}}
+									<span></span>
 									{{#each entry in log.entries}}
 										<div>{{ entry.severity }}: {{ entry.timestamp }} (Caller: {{ entry.caller }})</div>
 										<div>

app/apps/server/storage/logs-storage.js

@@ -1,5 +1,6 @@
 import { AppConsole } from '@rocket.chat/apps-engine/server/logging';
 import { AppLogStorage } from '@rocket.chat/apps-engine/server/storage';
+import { InstanceStatus } from 'meteor/konecty:multiple-instances-status';
 
 export class AppRealLogsStorage extends AppLogStorage {
 	constructor(model) {
@@ -25,6 +26,8 @@ export class AppRealLogsStorage extends AppLogStorage {
 		return new Promise((resolve, reject) => {
 			const item = AppConsole.toStorageEntry(appId, logger);
 
+			item.instanceId = InstanceStatus.id();
+
 			try {
 				const id = this.db.insert(item);