Set X11 environment variable at top of bundle

Author: jwbonner

rollup.config.mjs

@@ -21,7 +21,7 @@ const isLite = process.env.ASCOPE_DISTRIBUTION === "LITE";
 const licenseHeader =
   "// Copyright (c) 2021-2026 Littleton Robotics\n// http://github.com/Mechanical-Advantage\n//\n// Use of this source code is governed by a BSD\n// license that can be found in the LICENSE file\n// at the resources directory of this application.\n";
 
-function bundle(input, output, isMain, isXRClient, external = []) {
+function bundle(input, output, isMain, isXRClient, external = [], intro = "") {
   const packageJson = JSON.parse(
     fs.readFileSync("package.json", {
       encoding: "utf-8"
@@ -32,7 +32,8 @@ function bundle(input, output, isMain, isXRClient, external = []) {
     output: {
       file: (isLite ? "lite/static/" : "") + "bundles/" + output,
       format: isMain ? "cjs" : "es",
-      banner: licenseHeader
+      banner: licenseHeader,
+      intro: intro
     },
     context: "this",
     external: external,
@@ -111,23 +112,34 @@ function bundle(input, output, isMain, isXRClient, external = []) {
 const mainBundles = isLite
   ? [bundle("main/lite/main.ts", "main.js", false, false)]
   : [
-      bundle("main/electron/main.ts", "main.js", true, false, [
-        "electron",
-        "electron-fetch",
-        "fs",
-        "jsonfile",
-        "net",
-        "os",
-        "ws",
-        "http",
-        "path",
-        "basic-ftp",
-        "download",
-        "youtube-dl-exec",
-        "tesseract.js",
-        "lzma-native",
-        "@rev-robotics/revlog-converter"
-      ]),
+      bundle(
+        "main/electron/main.ts",
+        "main.js",
+        true,
+        false,
+        [
+          "electron",
+          "electron-fetch",
+          "fs",
+          "jsonfile",
+          "net",
+          "os",
+          "ws",
+          "http",
+          "path",
+          "basic-ftp",
+          "download",
+          "youtube-dl-exec",
+          "tesseract.js",
+          "lzma-native",
+          "@rev-robotics/revlog-converter"
+        ],
+        `
+if (process.platform === "linux") {
+  process.env.XDG_SESSION_TYPE = "x11";
+}
+      `
+      ),
       bundle("preload.ts", "preload.js", true, false, ["electron"])
     ];
 const largeRendererBundles = [

src/main/electron/main.ts

@@ -94,12 +94,6 @@ try {
   lzma = require("lzma-native");
 } catch (e) {}
 
-// Force X11 on Linux
-if (process.platform === "linux") {
-  app.commandLine.appendSwitch("ozone-platform", "x11");
-  process.env.XDG_SESSION_TYPE = "x11";
-}
-
 // Global variables
 let hubWindows: BrowserWindow[] = []; // Ordered by last focus time (recent first)
 let downloadWindow: BrowserWindow | null = null;