Merge remote-tracking branch 'origin/master' into migrate_RF_desktop_phase1

Author: yasserfaraazkhan

e2e/global-setup.ts

@@ -6,6 +6,7 @@ import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
 
+import {ensureElectronBinary} from './helpers/config';
 import {clearAllRegistryFiles} from './helpers/electronApp';
 
 const MACOS_DEFAULTS_SNAPSHOT = path.join(os.tmpdir(), 'mattermost-desktop-e2e-macos-defaults-snapshot.json');
@@ -19,6 +20,8 @@ function readMacOsDefault(domain: string, key: string): string | null {
 }
 
 export default async function globalSetup() {
+    ensureElectronBinary();
+
     // Clear stale per-worker PID shards (and any legacy shared file) from a
     // prior crashed run. We only delete files here, never signal pids, because
     // pids may have been reused by unrelated processes since that run.

e2e/helpers/config.ts

@@ -2,17 +2,34 @@
 // See LICENSE.txt for license information.
 
 import * as fs from 'fs';
+import {createRequire} from 'module';
 import * as path from 'path';
 
+const require = createRequire(__filename);
+
 export const sourceRootDir = path.join(__dirname, '../..');
 
-// The Electron binary from the npm package
-export const electronBinaryPath = (() => {
+function getElectronBinaryPath(): string {
     if (process.platform === 'darwin') {
         return path.join(sourceRootDir, 'node_modules/electron/dist/Electron.app/Contents/MacOS/Electron');
     }
     const ext = process.platform === 'win32' ? '.exe' : '';
     return path.join(sourceRootDir, `node_modules/electron/dist/electron${ext}`);
+}
+
+// Electron 42+ no longer downloads its binary during npm install. Playwright
+// launches via executablePath, so trigger the lazy download before tests run.
+export function ensureElectronBinary(): void {
+    const binaryPath = getElectronBinaryPath();
+    if (!fs.existsSync(binaryPath)) {
+        require(path.join(sourceRootDir, 'node_modules/electron'));
+    }
+}
+
+// The Electron binary from the npm package
+export const electronBinaryPath = (() => {
+    ensureElectronBinary();
+    return getElectronBinaryPath();
 })();
 
 // Test build app directory — built by `npm run build-test` (NODE_ENV=test)

package-lock.json

@@ -130,7 +130,7 @@
     "copy-webpack-plugin": "10.2.4",
     "cross-env": "7.0.3",
     "css-loader": "6.7.1",
-    "electron": "41.2.0",
+    "electron": "43.0.0",
     "electron-builder": "26.6.0",
     "eslint": "8.57.0",
     "eslint-import-resolver-webpack": "0.13.8",