@wdio/browser-runner 8.5.3 → 8.5.4

package/build/browser/driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/browser/driver.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAC,OAAO,OAAO,WAAW;;IAG5B,MAAM,CAAC,UAAU,CACb,MAAM,EAAE,GAAG,EACX,QAAQ,EAAE,KAAK,EACf,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,EACjD,cAAc,EAAE,GAAG;CAmJ1B"}
+{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/browser/driver.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAC,OAAO,OAAO,WAAW;;IAG5B,MAAM,CAAC,UAAU,CACb,MAAM,EAAE,GAAG,EACX,QAAQ,EAAE,KAAK,EACf,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,EACjD,cAAc,EAAE,GAAG;CAoJ1B"}

package/build/browser/driver.js

@@ -8,7 +8,8 @@ const CONSOLE_METHODS = ['log', 'info', 'warn', 'error', 'debug'];
 export default class ProxyDriver {
     static #commandMessages = new Map();
     static newSession(params, modifier, userPrototype, commandWrapper) {
-        const [cid] = window.location.pathname.slice(1).split('/');
+        const urlParamString = new URLSearchParams(window.location.search);
+        const cid = urlParamString.get('cid');
         if (!cid) {
             throw new Error('"cid" query parameter is missing');
         }

package/build/browser/frameworks/mocha.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mocha.d.ts","sourceRoot":"","sources":["../../../src/browser/frameworks/mocha.ts"],"names":[],"mappings":"AASA,qBAAa,cAAc;;gBAKV,MAAM,EAAE,SAAS;IA+B9B,GAAG;CA+DN"}
+{"version":3,"file":"mocha.d.ts","sourceRoot":"","sources":["../../../src/browser/frameworks/mocha.ts"],"names":[],"mappings":"AASA,qBAAa,cAAc;;gBAKV,MAAM,EAAE,SAAS;IAgC9B,GAAG;CAgEN"}

package/build/browser/frameworks/mocha.js

@@ -9,7 +9,8 @@ export class MochaFramework {
     constructor(socket) {
         this.#socket = socket;
         socket.addEventListener('message', this.#handleSocketMessage.bind(this));
-        const [cid] = window.location.pathname.slice(1).split('/');
+        const urlParamString = new URLSearchParams(window.location.search);
+        const cid = urlParamString.get('cid');
         if (!cid) {
             throw new Error('"cid" query parameter is missing');
         }
@@ -74,7 +75,8 @@ export class MochaFramework {
     #getHook(name) {
         return (...args) => new Promise((resolve, reject) => {
             const id = (this.#hookResolver.size + 1).toString();
-            const [cid] = window.location.pathname.slice(1).split('/');
+            const urlParamString = new URLSearchParams(window.location.search);
+            const cid = urlParamString.get('cid');
             if (!cid) {
                 return reject(new Error('"cid" query parameter is missing'));
             }

package/build/types.d.ts

@@ -82,7 +82,7 @@ export interface BrowserRunnerOptions {
     /**
      * Vite configuration to overwrite the preset
      */
-    viteConfig?: InlineConfig;
+    viteConfig?: string | InlineConfig;
     /**
      * Run tests in headless mode
      * @default false // true in CI environment

package/build/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAEjE,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,WAAW,EAAE,WAAW,CAAA;QACxB,iBAAiB,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;KAC9C;CACJ;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,GAAG,QAAQ,GAAG,KAAK,GAAG,OAAO,CAAA;AACrF,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;AAChC,KAAK,gBAAgB,GAAG,QAAQ,GAAG,WAAW,GAAG,UAAU,GAAG,MAAM,GAAG,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,cAAc,GAAG,MAAM,CAAA;AAClL,MAAM,WAAW,eAAgB,SAAQ,IAAI,CAAC,qBAAqB,EAAE,SAAS,GAAG,WAAW,GAAG,sBAAsB,CAAC;IAClH;;;;OAIG;IACH,OAAO,EAAE,OAAO,CAAA;IAChB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC,gBAAgB,CAAC,CAAA;IACtC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAA;IACf;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IACd;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,oBAAoB;IACjC;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;OAEG;IACH,MAAM,CAAC,EAAE,eAAe,CAAA;IACxB;;OAEG;IACH,UAAU,CAAC,EAAE,YAAY,CAAA;IACzB;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;OAEG;IACH,QAAQ,CAAC,EAAE,eAAe,CAAA;IAC1B;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,MAAM,WAAW,OAAQ,SAAQ,OAAO,CAAC,gBAAgB;IACrD,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,GAAG,CAAA;IACT,GAAG,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,WAAW;IACxB,IAAI,EAAE,SAAS,CAAA;IACf,MAAM,EAAE,OAAO,CAAC,UAAU,CAAA;IAC1B,YAAY,EAAE,YAAY,CAAC,gBAAgB,CAAA;IAC3C,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,OAAO,CAAA;CACzB;AAED,MAAM,MAAM,qBAAqB,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC,GAAG,OAAO,OAAO,OAAO,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAEjE,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,WAAW,EAAE,WAAW,CAAA;QACxB,iBAAiB,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;KAC9C;CACJ;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,GAAG,QAAQ,GAAG,KAAK,GAAG,OAAO,CAAA;AACrF,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;AAChC,KAAK,gBAAgB,GAAG,QAAQ,GAAG,WAAW,GAAG,UAAU,GAAG,MAAM,GAAG,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,cAAc,GAAG,MAAM,CAAA;AAClL,MAAM,WAAW,eAAgB,SAAQ,IAAI,CAAC,qBAAqB,EAAE,SAAS,GAAG,WAAW,GAAG,sBAAsB,CAAC;IAClH;;;;OAIG;IACH,OAAO,EAAE,OAAO,CAAA;IAChB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC,gBAAgB,CAAC,CAAA;IACtC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAA;IACf;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IACd;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,oBAAoB;IACjC;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;OAEG;IACH,MAAM,CAAC,EAAE,eAAe,CAAA;IACxB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,YAAY,CAAA;IAClC;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;OAEG;IACH,QAAQ,CAAC,EAAE,eAAe,CAAA;IAC1B;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,MAAM,WAAW,OAAQ,SAAQ,OAAO,CAAC,gBAAgB;IACrD,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,GAAG,CAAA;IACT,GAAG,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,WAAW;IACxB,IAAI,EAAE,SAAS,CAAA;IACf,MAAM,EAAE,OAAO,CAAC,UAAU,CAAA;IAC1B,YAAY,EAAE,YAAY,CAAC,gBAAgB,CAAA;IAC3C,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,OAAO,CAAA;CACzB;AAED,MAAM,MAAM,qBAAqB,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC,GAAG,OAAO,OAAO,OAAO,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC"}

package/build/vite/plugins/mockHoisting.js

@@ -185,10 +185,10 @@ export function mockHoisting(mockHandler) {
             configureServer(server) {
                 return () => {
                     server.middlewares.use('/', async (req, res, next) => {
-                        if (!req.url) {
+                        if (!req.originalUrl) {
                             return next();
                         }
-                        const urlParsed = url.parse(req.url);
+                        const urlParsed = url.parse(req.originalUrl);
                         const urlParamString = new URLSearchParams(urlParsed.query || '');
                         const specParam = urlParamString.get('spec');
                         if (specParam) {

package/build/vite/plugins/testrunner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testrunner.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/testrunner.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AA0ClC,wBAAgB,UAAU,CAAC,OAAO,EAAE,WAAW,CAAC,oBAAoB,GAAG,MAAM,EAAE,CAwH9E"}
+{"version":3,"file":"testrunner.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/testrunner.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AA0ClC,wBAAgB,UAAU,CAAC,OAAO,EAAE,WAAW,CAAC,oBAAoB,GAAG,MAAM,EAAE,CAmH9E"}

package/build/vite/plugins/testrunner.js

@@ -83,18 +83,14 @@ export function testrunner(options) {
             },
             configureServer(server) {
                 return () => {
-                    server.middlewares.use('/', async (req, res, next) => {
-                        log.info(`Received request for: ${req.url}`);
-                        if (!req.url) {
-                            return next();
-                        }
-                        const urlParsed = url.parse(req.url);
-                        // if request is not html , directly return next()
-                        if (!urlParsed.pathname || !urlParsed.path || !urlParsed.pathname.endsWith('test.html')) {
+                    server.middlewares.use(async (req, res, next) => {
+                        log.info(`Received request for: ${req.originalUrl}`);
+                        if (!req.originalUrl) {
                             return next();
                         }
+                        const urlParsed = url.parse(req.originalUrl);
                         const urlParamString = new URLSearchParams(urlParsed.query || '');
-                        const [cid] = urlParsed.pathname.slice(1).split('/');
+                        const cid = urlParamString.get('cid');
                         const spec = urlParamString.get('spec');
                         if (!cid || !SESSIONS.has(cid)) {
                             log.error(`No environment found for ${cid || 'non determined environment'}`);
@@ -107,13 +103,13 @@ export function testrunner(options) {
                         const env = SESSIONS.get(cid);
                         try {
                             const template = await getTemplate(options, env, spec);
-                            log.debug(`Render template for ${req.url}`);
-                            res.end(await server.transformIndexHtml(`${req.url}`, template));
+                            log.debug(`Render template for ${req.originalUrl}`);
+                            res.end(await server.transformIndexHtml(`${req.originalUrl}`, template));
                         }
                         catch (err) {
-                            const template = getErrorTemplate(req.url, err);
+                            const template = getErrorTemplate(req.originalUrl, err);
                             log.error(`Failed to render template: ${err.message}`);
-                            res.end(await server.transformIndexHtml(`${req.url}`, template));
+                            res.end(await server.transformIndexHtml(`${req.originalUrl}`, template));
                         }
                         return next();
                     });

package/build/vite/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/vite/server.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAM1C,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAA;AAGpC,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,MAAM,CAAA;AAGvD,OAAO,KAAK,EAAY,OAAO,EAAE,MAAM,aAAa,CAAA;AAQpD,OAAO,KAAK,EACM,gBAAgB,EAEjC,MAAM,YAAY,CAAA;AAYnB,qBAAa,UAAW,SAAQ,YAAY;;IASxC,IAAI,YAAY,gCAEf;IAED,IAAI,MAAM,0BAET;gBAEY,OAAO,EAAE,WAAW,CAAC,oBAAoB,EAAE,MAAM,EAAE,OAAO,CAAC,UAAU;IAiC5E,KAAK;IAwCL,KAAK;IAkJX,OAAO,CAAC,cAAc;IAetB,WAAW,CAAE,MAAM,EAAE,gBAAgB;CAUxC"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/vite/server.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAM1C,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAA;AAGpC,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,MAAM,CAAA;AAGvD,OAAO,KAAK,EAAY,OAAO,EAAE,MAAM,aAAa,CAAA;AAQpD,OAAO,KAAK,EACM,gBAAgB,EAEjC,MAAM,YAAY,CAAA;AAYnB,qBAAa,UAAW,SAAQ,YAAY;;IAUxC,IAAI,YAAY,gCAEf;IAED,IAAI,MAAM,0BAET;gBAEY,OAAO,EAAE,WAAW,CAAC,oBAAoB,EAAE,MAAM,EAAE,OAAO,CAAC,UAAU;IAyB5E,KAAK;IAoDL,KAAK;IAkJX,OAAO,CAAC,cAAc;IAetB,WAAW,CAAE,MAAM,EAAE,gBAAgB;CAUxC"}

package/build/vite/server.js

@@ -1,3 +1,4 @@
+import path from 'node:path';
 import { EventEmitter } from 'node:events';
 import getPort from 'get-port';
 import logger from '@wdio/logger';
@@ -20,6 +21,7 @@ export class ViteServer extends EventEmitter {
     #pendingHooks = new Map();
     #connections = new Set();
     #options;
+    #config;
     #viteConfig;
     #wss;
     #server;
@@ -33,10 +35,8 @@ export class ViteServer extends EventEmitter {
     constructor(options, config) {
         super();
         this.#options = options;
+        this.#config = config;
         this.#mockHandler = new MockHandler(options, config);
-        if (options.preset && options.viteConfig) {
-            throw new Error('Invalid runner configuration: "preset" and "viteConfig" options are defined but only one of each can be used at the same time');
-        }
         this.#viteConfig = deepmerge(DEFAULT_VITE_CONFIG, {
             root: options.rootDir || process.cwd(),
             plugins: [
@@ -54,12 +54,21 @@ export class ViteServer extends EventEmitter {
                 ...options.coverage
             }));
         }
-        if (options.viteConfig) {
-            this.#viteConfig = deepmerge(this.#viteConfig, options.viteConfig);
-        }
     }
     async start() {
         const [vitePort, wssPort] = await Promise.all([getPort(), getPort()]);
+        this.#viteConfig = deepmerge(this.#viteConfig, {
+            server: {
+                host: '0.0.0.0',
+                port: vitePort,
+                proxy: {
+                    '/ws': {
+                        target: `ws://localhost:${wssPort}`,
+                        ws: true
+                    }
+                }
+            }
+        });
         /**
          * load additional Vite plugins for framework
          */
@@ -70,23 +79,20 @@ export class ViteServer extends EventEmitter {
                 this.#viteConfig.plugins.push(plugin(opts));
             }
         }
+        /**
+         * merge custom `viteConfig` last into the object
+         */
+        if (this.#options.viteConfig) {
+            const configToMerge = typeof this.#options.viteConfig === 'string'
+                ? (await import(path.resolve(this.#config.rootDir || process.cwd(), this.#options.viteConfig))).default
+                : this.#options.viteConfig;
+            this.#viteConfig = deepmerge(this.#viteConfig, configToMerge);
+        }
         /**
          * initialize Socket server on top of vite server
          */
         this.#wss = new WebSocketServer({ port: wssPort });
         this.#wss.on('connection', this.#onConnect.bind(this));
-        this.#viteConfig = deepmerge(this.#viteConfig, {
-            server: {
-                host: '0.0.0.0',
-                port: vitePort,
-                proxy: {
-                    '/ws': {
-                        target: `ws://localhost:${wssPort}`,
-                        ws: true
-                    }
-                }
-            }
-        });
         /**
          * initialize Vite
          */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/browser-runner",
-  "version": "8.5.3",
+  "version": "8.5.4",
   "description": "A WebdriverIO runner to run unit tests tests in the browser.",
   "author": "Christian Bromann <mail@bromann.dev>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-browser-runner",
@@ -33,7 +33,7 @@
     "@types/node": "^18.14.0",
     "@vitest/spy": "^0.29.1",
     "@wdio/globals": "8.5.1",
-    "@wdio/local-runner": "8.5.1",
+    "@wdio/local-runner": "8.5.4",
     "@wdio/logger": "8.1.0",
     "@wdio/mocha-framework": "8.4.0",
     "@wdio/protocols": "8.3.11",
@@ -68,7 +68,7 @@
   },
   "devDependencies": {
     "@types/ws": "^8.5.4",
-    "@wdio/runner": "8.5.1"
+    "@wdio/runner": "8.5.4"
   },
-  "gitHead": "445f1c901e9bd08b2d17d35592ad7c3258937917"
+  "gitHead": "32e80c3543f24a346cc1b8dde7fcbe8b34724c56"
 }