chore: reinstate env passing, defer main window creation

Author: goosewobbler

e2e/wdio.tauri.conf.ts

@@ -145,6 +145,7 @@ type TauriCapability = {
   'wdio:tauriServiceOptions': {
     appBinaryPath: string;
     appArgs: string[];
+    env?: Record<string, string>;
     captureBackendLogs?: boolean;
     captureFrontendLogs?: boolean;
     backendLogLevel?: 'trace' | 'debug' | 'info' | 'warn' | 'error';
@@ -187,6 +188,7 @@ if (envContext.isMultiremote) {
         'wdio:tauriServiceOptions': {
           appBinaryPath: appBinaryPath,
           appArgs: ['--browser=A'],
+          env: baseEnv,
           // Enable log capture for logging tests
           captureBackendLogs: true,
           captureFrontendLogs: true,
@@ -208,6 +210,7 @@ if (envContext.isMultiremote) {
         'wdio:tauriServiceOptions': {
           appBinaryPath: appBinaryPath,
           appArgs: ['--browser=B'],
+          env: baseEnv,
           // Enable log capture for logging tests
           captureBackendLogs: true,
           captureFrontendLogs: true,
@@ -220,6 +223,11 @@ if (envContext.isMultiremote) {
     },
   };
 } else {
+  const baseEnv: Record<string, string> = {};
+  if (envContext.isSplashEnabled) {
+    baseEnv.ENABLE_SPLASH_WINDOW = 'true';
+  }
+
   capabilities = [
     {
       browserName: 'tauri',
@@ -231,6 +239,7 @@ if (envContext.isMultiremote) {
       'wdio:tauriServiceOptions': {
         appBinaryPath: appBinaryPath,
         appArgs: ['foo', 'bar=baz'],
+        env: baseEnv,
         // Enable log capture for logging tests
         captureBackendLogs: true,
         captureFrontendLogs: true,

fixtures/e2e-apps/tauri/src-tauri/src/main.rs

@@ -242,6 +242,8 @@ fn main() {
                 .transparent(true)
                 .build()
                 .expect("Failed to create splash window");
+            } else {
+                create_main_window(app.handle());
             }
             Ok::<(), Box<dyn std::error::Error>>(())
         })

fixtures/e2e-apps/tauri/src-tauri/tauri.conf.json

@@ -20,16 +20,7 @@
       "capabilities": ["default"]
     },
     "withGlobalTauri": true,
-    "windows": [
-      {
-        "label": "main",
-        "title": "Tauri E2E App",
-        "width": 800,
-        "height": 600,
-        "resizable": true,
-        "fullscreen": false
-      }
-    ]
+    "windows": []
   },
   "plugins": {
     "tauri-driver": {

packages/tauri-service/src/launcher.ts

@@ -700,9 +700,12 @@ export default class TauriLaunchService {
     const dataDir = process.env.XDG_DATA_HOME || process.env.TAURI_DATA_DIR || '';
 
     await new Promise<void>((resolve, reject) => {
+      const spawnEnv = workerOptions.env ? { ...process.env, ...workerOptions.env } : undefined;
+
       const proc = spawn(tauriDriverPath, args, {
         stdio: ['ignore', 'pipe', 'pipe'],
         detached: false,
+        ...(spawnEnv ? { env: spawnEnv } : {}),
       });
 
       log.info(`[worker-${workerId}] Spawned process with PID: ${proc.pid ?? 'unknown'}`);
@@ -864,9 +867,12 @@ export default class TauriLaunchService {
         log.info(`Starting tauri-driver (DISPLAY from environment: ${process.env.DISPLAY || 'not set'})`);
       }
 
+      const spawnEnv = options.env ? { ...process.env, ...options.env } : undefined;
+
       this.tauriDriverProcess = spawn(tauriDriverPath, args, {
         stdio: ['ignore', 'pipe', 'pipe'],
         detached: false,
+        ...(spawnEnv ? { env: spawnEnv } : {}),
       });
 
       // Use readline for line-buffered log handling (fixes Windows chunking issues)

packages/tauri-service/src/types.ts

@@ -14,6 +14,11 @@ export type TauriResult<T = unknown> = BaseTauriResult<T>;
  * - logDir: Custom log directory for standalone mode
  */
 export interface TauriServiceOptions extends BaseTauriServiceOptions {
+  /**
+   * Environment variables to pass to the spawned tauri-driver process
+   * These are merged with process.env when spawning the driver
+   */
+  env?: Record<string, string>;
   /**
    * Automatically install tauri-driver if not found
    * Requires Rust toolchain (cargo) to be installed