Merge branch 'main' into release

Author: viktor44

.gitignore

@@ -46,8 +46,9 @@ dist/
 .cache/
 .tsnode-cache/
 release/
-app/theme/css
+packages/app/src/theme/css/
 /graphql.config.json
+.yarn/install-state.gz
 
 # Yalc (https://github.com/whitecolor/yalc)
 .yalc/

.yarn/install-state.gz

@@ -2,7 +2,7 @@
   "name": "station-project",
   "private": true,
   "productName": "Station",
-  "version": "3.1.0",
+  "version": "3.2.0-b3",
   "description": "Station",
   "homepage": "https://getstation.com",
   "author": {
@@ -28,7 +28,7 @@
     "electron": "./node_modules/.bin/electron"
   },
   "devDependencies": {
-    "rimraf": "^3.0.0"
+    "rimraf": "^5.0.10"
   },
   "devEngines": {
     "node": ">=18.0.0",

package.json

@@ -54,6 +54,8 @@ win:
 linux:
   target:
     - AppImage
+    - deb
+    - rpm
   category: Network
   artifactName: ${productName}-${arch}.${ext}
 

packages/app/build/icon.icns

@@ -1,7 +1,7 @@
 {
   "name": "Microsoft Teams",
   "category": "Communication & Collaboration",
-  "start_url": "https://teams.live.com",
+  "start_url": "https://teams.microsoft.com/v2/?clientexperience=t2",
   "icons": [
     {
       "src": "https://cdn.filestackcontent.com/5sZEOL6RZesRsLdCozwv",
@@ -10,6 +10,14 @@
   ],
   "theme_color": "#5559AE",
   "scope": "https://teams.live.com",
+  "extended_scopes": [
+    "https://*.live.com",
+    "https://*.office.com",
+    "https://*.msauth.net",
+    "https://*.azureedge.net",
+    "https://*.microsoft.com",
+    "https://*.microsoftonline.com"
+  ],
   "bx_legacy_service_id": "microsoft-teams",
   "recommendedPosition": "25"
 }

packages/app/build/station.svg

@@ -1,7 +1,7 @@
 {
   "name": "station-desktop-app",
   "productName": "Station",
-  "version": "3.1.0",
+  "version": "3.2.0-b3",
   "description": "Station",
   "homepage": "https://getstation.com",
   "author": {
@@ -37,7 +37,7 @@
     "1password-node": "^3.0.0",
     "@babel/plugin-proposal-decorators": "^7.4.4",
     "@babel/runtime": "^7.4.3",
-    "@electron/remote": "^2.0.9",
+    "@electron/remote": "^2.1.2",
     "@getstation/apollo-link-reactive-schema": "^1.0.0",
     "@getstation/electron-google-oauth2": "^14.0.0",
     "@getstation/fetch-favicon": "^0.0.4-rc.2",
@@ -69,9 +69,8 @@
     "electron-chrome-extension": "https://github.com/viktor44/electron-chrome-extension/releases/download/v6.0.3/release.tar.gz",
     "electron-debug": "^3.2.0",
     "electron-log": "^2.2.14",
-    "electron-process-manager": "^1.0.0",
-    "electron-process-reporter": "1.4.0",
-    "electron-updater": "^6.1.7",
+    "electron-process-manager": "https://github.com/viktor44/electron-process-manager/releases/download/v1.1.0/release.tar.gz",
+    "electron-updater": "^6.2.1",
     "electron-window-state": "5.0.3",
     "emoji-js": "^3.4.1",
     "end-of-stream": "^1.4.1",
@@ -179,7 +178,7 @@
     "transit-js": "^0.8.846",
     "ts-assert-exists": "^1.0.5",
     "ts-optchain": "^0.1.6",
-    "tslib": "^2.5.0",
+    "tslib": "^2.7.0",
     "umzug": "^3.2.1",
     "umzug-cli": "^3.1.1",
     "unused-filename": "^1.0.0",
@@ -244,7 +243,7 @@
     "@types/moment": "^2.13.0",
     "@types/mousetrap": "^1.6.11",
     "@types/ms": "^0.7.31",
-    "@types/node": "^14.18.42",
+    "@types/node": "^18.19.55",
     "@types/node-fetch": "^2.6.4",
     "@types/node-localstorage": "^1.3.0",
     "@types/pluralize": "0.0.27",
@@ -287,7 +286,7 @@
     "css-loader": "^3.2.1",
     "electron": "27.3.11",
     "electron-builder": "^24.9.1",
-    "electron-mocha": "^8.1.0",
+    "electron-mocha": "^12.1.0",
     "electron-webpack": "^2.8.2",
     "eslint": "^4.18.2",
     "eslint-config-airbnb": "^16.1.0",
@@ -306,7 +305,7 @@
     "graphql-import-loader": "^0.2.1",
     "html-webpack-plugin": "^4.5.2",
     "inquirer": "^6.2.2",
-    "jest": "^24.9.0",
+    "jest": "^26.6.3",
     "jest-svg-transformer": "^1.0.0",
     "jsdom": "^9.8.3",
     "kuler": "^2.0.0",
@@ -323,20 +322,20 @@
     "redux-saga-test-plan": "^3.7.0",
     "remote-redux-devtools": "0.5.0",
     "replace-in-file": "^4.1.3",
-    "rimraf": "^3.0.0",
+    "rimraf": "^5.0.10",
     "sass": "^1.34.1",
     "simple-git": "^1.107.0",
     "sinon": "^7.1.1",
     "style-loader": "^0.23.1",
     "terser-webpack-plugin": "^4.2.3",
     "tmp": "0.0.31",
-    "ts-jest": "^24.3.0",
+    "ts-jest": "^26.5.6",
     "ts-loader": "^6.2.1",
     "ts-node": "^8.1.0",
     "tslint": "^5.11.0",
     "tslint-config-station": "^0.6.0",
     "tslint-react": "^3.6.0",
-    "typescript": "^3.9.4",
+    "typescript": "^4.9.5",
     "webpack": "^4.46.0",
     "webpack-cli": "^3.3.12",
     "webpack-merge": "^4.2.2",

packages/app/electron-builder.yml

@@ -64,7 +64,7 @@ These applications are sensitive to the User-Agent header and have to be recheck
 - Google Calendar (18.json)
 it's better to remove bx_override_user_agent attribute from manifest before the check to be sure that it's still necessary.
 */
-const defaultUserAgent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.5735.289 Safari/537.36';
+const defaultUserAgent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36';
 
 const getUserAgentForApp = (url: string, currentUserAgent: string): string => {
 

packages/app/manifests/definitions/131.json

@@ -1 +1,3 @@
-require('electron-chrome-extension/preload');
+if (!process.env.STATION_DISABLE_ECX) {
+  require('electron-chrome-extension/preload');
+}