WIP

Author: DudaGod

src/runner/browser-env/index.ts

@@ -14,6 +14,7 @@ import { plugin as mockPlugin } from "./plugins/mock";
 import { ManualMock } from "./manual-mock";
 import { Config } from "../../../config";
 import { VITE_DEFAULT_CONFIG_ENV } from "./constants";
+import defaults from "../../../config/defaults";
 
 import type { ViteDevServer, UserConfig, InlineConfig } from "vite";
 import type { BrowserTestRunEnvOptions } from "./types";
@@ -77,6 +78,8 @@ export class ViteServer {
         await this._server.listen();
 
         logger.log(chalk.green(`Vite server started on ${this.baseUrl}`));
+
+        this._useBaseUrlFromVite();
     }
 
     async close(): Promise<void> {
@@ -115,4 +118,19 @@ export class ViteServer {
     get baseUrl(): string | undefined {
         return this._server?.resolvedUrls!.local[0];
     }
+
+    private _useBaseUrlFromVite(): void {
+        const viteBaseUrl = this.baseUrl!;
+        const defaultBaseUrl = defaults.baseUrl;
+
+        if (this._testplaneConfig.baseUrl === defaultBaseUrl) {
+            this._testplaneConfig.baseUrl = viteBaseUrl;
+        }
+
+        for (const broConfig of Object.values(this._testplaneConfig.browsers)) {
+            if (broConfig.baseUrl === defaultBaseUrl) {
+                broConfig.baseUrl = viteBaseUrl;
+            }
+        }
+    }
 }

src/runner/browser-env/vite/server.ts

@@ -3,8 +3,7 @@ import _ from "lodash";
 import fs from "fs-extra";
 import { Stats as RunnerStats } from "./stats";
 import { BaseTestplane } from "./base-testplane";
-import type { MainRunner as NodejsEnvRunner } from "./runner";
-import type { MainRunner as BrowserEnvRunner } from "./runner/browser-env";
+import type { MainRunner } from "./runner";
 import RuntimeConfig from "./config/runtime-config";
 import { MasterAsyncEvents, MasterEvents, MasterSyncEvents } from "./events";
 import eventsUtils from "./events/utils";
@@ -19,6 +18,7 @@ import { initDevServer } from "./dev-server";
 import { ConfigInput } from "./config/types";
 import { MasterEventHandler, Test, TestResult } from "./types";
 import { preloadWebdriverIO } from "./utils/preload-utils";
+import { ViteServer } from "./runner/browser-env/vite/server";
 
 interface RunOpts {
     browsers: string[];
@@ -70,14 +70,16 @@ export interface Testplane {
 export class Testplane extends BaseTestplane {
     protected failed: boolean;
     protected failedList: FailedListItem[];
-    protected runner: NodejsEnvRunner | BrowserEnvRunner | null;
+    protected runner: MainRunner | null;
+    protected viteServer: ViteServer | null;
 
     constructor(config?: string | ConfigInput) {
         super(config);
 
         this.failed = false;
         this.failedList = [];
         this.runner = null;
+        this.viteServer = null;
     }
 
     extendCli(parser: Command): void {
@@ -91,6 +93,16 @@ export class Testplane extends BaseTestplane {
             configPath: this._config.configPath,
         });
 
+        if (!isRunInNodeJsEnv(this._config)) {
+            try {
+                this.viteServer = ViteServer.create(this._config);
+                await this.viteServer.start();
+                RuntimeConfig.getInstance().extend({ viteBaseUrl: this.viteServer.baseUrl });
+            } catch (err) {
+                throw new Error(`Vite server failed to start: ${(err as Error).message}`);
+            }
+        }
+
         return super._init();
     }
 
@@ -126,9 +138,7 @@ export class Testplane extends BaseTestplane {
             this._config.system.mochaOpts.timeout = 0;
         }
 
-        const RunnerClass = isRunInNodeJsEnv(this._config)
-            ? await import("./runner").then(m => m.MainRunner)
-            : await import("./runner/browser-env").then(m => m.MainRunner);
+        const RunnerClass = await import("./runner").then(m => m.MainRunner);
 
         const runner = RunnerClass.create(this._config, this._interceptors);
         this.runner = runner;

src/testplane.ts

@@ -1,6 +1,5 @@
 import type { Events } from "../events";
-import type { MainRunner as NodejsEnvRunner } from "../runner";
-import type { MainRunner as BrowserEnvRunner } from "../runner/browser-env/index";
+import type { MainRunner } from "../runner";
 import type { TestCollection } from "../test-collection";
 import type { Test } from "../test-reader/test-object/test";
 import type { Suite } from "../test-reader/test-object/suite";
@@ -219,7 +218,7 @@ export interface SnapshotsData {
 
 export type MasterEventHandler<T extends BaseTestplane> = {
     (event: Events["INIT"], callback: () => Promise<void> | void): T;
-    (event: Events["RUNNER_START"], callback: (runner: NodejsEnvRunner | BrowserEnvRunner) => Promise<void> | void): T;
+    (event: Events["RUNNER_START"], callback: (runner: MainRunner) => Promise<void> | void): T;
     (event: Events["RUNNER_END"], callback: (result: StatsResult) => Promise<void> | void): T;
     (event: Events["SESSION_START"], callback: AsyncSessionEventCallback): T;
     (event: Events["SESSION_END"], callback: AsyncSessionEventCallback): T;