Merge branch 'lts-support-announcement' into develop

.github/workflows/build-release.yml

@@ -25,10 +25,10 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Setup Node 16
+      - name: Setup Node 14.21.3
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '14.21.3'
       - name: Setup node_modules cache
         uses: actions/cache@v3
         with:

.github/workflows/validate-pr.yml

@@ -20,17 +20,17 @@ jobs:
         run: git config --global core.autocrlf false
       - name: Checkout code
         uses: actions/checkout@v3
-      - name: Setup Node 16
+      - name: Setup Node 14.21.3
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '14.21.3'
       - name: Setup node_modules cache
         uses: actions/cache@v3
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
       - name: Install package dependencies
-        run: yarn install --check-files
+        run: yarn install
       - name: Lint
         run: yarn lint
       - name: Test

.gitignore

@@ -7,4 +7,14 @@ Thumbs.db
 
 /app
 /dist
-/Development.provisionprofile
+/Development.provisionprofile
+
+# yarn
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+supportedVersions.jwt

.yarnrc.yml

@@ -0,0 +1,13 @@
+defaultSemverRangePrefix: "~"
+
+nodeLinker: node-modules
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+    spec: "@yarnpkg/plugin-workspace-tools"
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+    spec: "@yarnpkg/plugin-interactive-tools"
+  - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
+    spec: "@yarnpkg/plugin-typescript"
+
+yarnPath: .yarn/releases/yarn-3.2.2.cjs

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2022 Rocket.Chat Technologies Corp.
+Copyright (c) 2015-2023 Rocket.Chat Technologies Corp.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

babel.config.js

@@ -10,6 +10,7 @@ module.exports = {
       },
     ],
     '@babel/preset-react',
+    '@babel/preset-typescript',
   ],
   plugins: [
     '@babel/plugin-proposal-function-bind',

build/notarize.js

@@ -23,6 +23,7 @@ exports.default = function notarizing(context) {
       appleId: process.env.APPLEID,
       appleIdPassword: process.env.APPLEIDPASS,
       ascProvider: 'S6UPZG7ZR3',
+      teamId: 'S6UPZG7ZR3',
     })
       .then(() => {
         clearTimeout(timer);

electron-builder.json

@@ -17,16 +17,14 @@
   "mac": {
     "category": "public.app-category.productivity",
     "target": [
-      "dmg",
-      "pkg",
-      "zip",
-      "mas"
+      "zip"
     ],
     "icon": "build/icon.icns",
-    "bundleVersion": "113",
+    "bundleVersion": "118",
     "helperBundleId": "chat.rocket.electron.helper",
     "type": "distribution",
     "artifactName": "rocketchat-${version}-${os}.${ext}",
+    "mergeASARs": false,
     "extendInfo": {
       "NSMicrophoneUsageDescription": "I need access to your microphone to record the audio you want to send.",
       "NSCameraUsageDescription": "I need access to your camera to record the video you want to send.",