@wdio/browser-runner 8.5.0 → 8.5.2

package/build/browser/spy.js

@@ -21,7 +21,7 @@ export async function mock(path, factory) {
     if (!factory) {
         return;
     }
-    const mockLocalFile = path.startsWith('/') || path.startsWith('./');
+    const mockLocalFile = path.startsWith('/') || path.startsWith('./') || path.startsWith('../');
     const mockPath = mockLocalFile
         ? (new URL(resolveUrl(window.__wdioSpec__.split('/').slice(0, -1).join('/') + '/' + path))).pathname
         : path;

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/vite/constants.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAExC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAElD,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAgB1F,CAAA;AAED,eAAO,MAAM,mBAAmB,EAAE,OAAO,CAAC,YAAY,CAsBrD,CAAA"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/vite/constants.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAExC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAElD,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAgB1F,CAAA;AAED,eAAO,MAAM,mBAAmB,EAAE,OAAO,CAAC,YAAY,CAiCrD,CAAA"}

package/build/vite/constants.js

@@ -23,10 +23,21 @@ export const DEFAULT_VITE_CONFIG = {
     logLevel: 'silent',
     plugins: [topLevelAwait()],
     build: {
-        sourcemap: 'inline'
+        sourcemap: 'inline',
+        commonjsOptions: {
+            include: [/node_modules/],
+        }
     },
     optimizeDeps: {
-        include: ['expect', 'jest-matcher-utils'],
+        /**
+         * the following deps are CJS packages and need to be optimized (compiled to ESM) by Vite
+         */
+        include: [
+            'expect', 'jest-matcher-utils', 'serialize-error', 'minimatch', 'css-shorthand-properties',
+            'lodash.merge', 'lodash.zip', 'lodash.clonedeep', 'lodash.pickby', 'lodash.flattendeep',
+            'aria-query', 'grapheme-splitter', 'css-value', 'rgb2hex', 'p-iteration', 'fast-safe-stringify',
+            'deepmerge-ts'
+        ],
         esbuildOptions: {
             logLevel: 'silent',
             // Node.js global to browser globalThis

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

@@ -1 +1 @@
-{"version":3,"file":"mockHoisting.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/mockHoisting.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAM7C,wBAAgB,YAAY,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,EAAE,CA2M/D"}
+{"version":3,"file":"mockHoisting.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/mockHoisting.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAM7C,wBAAgB,YAAY,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,EAAE,CAmN/D"}

package/build/vite/plugins/mockHoisting.js

@@ -25,6 +25,7 @@ export function mockHoisting(mockHandler) {
                         return '';
                     }
                 }
+                const mocks = [...mockHandler.mocks.values()];
                 const preBundledDepName = path.basename(id).split('?')[0];
                 const mockedMod = (
                 // mocked file
@@ -32,7 +33,14 @@ export function mockHoisting(mockHandler) {
                     // mocked dependency
                     mockHandler.mocks.get(path.basename(id, path.extname(id))) ||
                     // pre-bundled deps e.g. /node_modules/.vite/deps/algoliasearch_lite.js?v=e31c24e
-                    [...mockHandler.mocks.values()].find((mock) => `${mock.path.replace('/', '_')}.js` === preBundledDepName));
+                    mocks.find((mock) => `${mock.path.replace('/', '_')}.js` === preBundledDepName) ||
+                    // relative file imports ignoring file extension, e.g. `mock('../../constants.ts', () => { ... })`
+                    mocks.find((mock) => {
+                        const mockFileExtLength = path.extname(mock.path).length;
+                        const toCompare = mockFileExtLength > 0 ? mock.path.slice(0, -mockFileExtLength) : mock.path;
+                        // compare without file extension as we don't know if users use them or not
+                        return toCompare === id.slice(0, -path.extname(id).length);
+                    }));
                 if (mockedMod) {
                     const newCode = mockedMod.namedExports.map((ne) => {
                         if (ne === 'default') {

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,CAgI9E"}
+{"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"}

package/build/vite/plugins/testrunner.js

@@ -15,6 +15,12 @@ const protocolCommandList = Object.values(commands).map((endpoint) => Object.val
 const WDIO_PACKAGES = ['webdriverio', 'expect-webdriverio'];
 const virtualModuleId = 'virtual:wdio';
 const resolvedVirtualModuleId = '\0' + virtualModuleId;
+/**
+ * these modules are used in Node.js environments only and
+ * don't need to be compiled, we just have them point to a
+ * mocked module that returns a matching interface without
+ * functionality
+ */
 const MODULES_TO_MOCK = [
     'import-meta-resolve', 'puppeteer-core', 'archiver', 'glob', 'devtools', 'ws'
 ];
@@ -22,11 +28,6 @@ const POLYFILLS = [
     ...builtinModules,
     ...builtinModules.map((m) => `node:${m}`)
 ].map((m) => m.replace('/promises', ''));
-const FETCH_FROM_ESM = [
-    'serialize-error', 'minimatch', 'css-shorthand-properties', 'lodash.merge', 'lodash.zip',
-    'lodash.clonedeep', 'lodash.pickby', 'lodash.flattendeep', 'aria-query', 'grapheme-splitter',
-    'css-value', 'rgb2hex', 'p-iteration', 'fast-safe-stringify', 'deepmerge-ts'
-];
 export function testrunner(options) {
     const automationProtocolPath = `/@fs${url.pathToFileURL(path.resolve(__dirname, '..', '..', 'browser', 'driver.js')).pathname}`;
     const mockModulePath = path.resolve(__dirname, '..', '..', 'browser', 'mock.js');
@@ -60,13 +61,6 @@ export function testrunner(options) {
                 if (MODULES_TO_MOCK.includes(id)) {
                     return mockModulePath;
                 }
-                /**
-                 * some dependencies used by WebdriverIO packages are still using CJS
-                 * so we need to pull them from esm.sh to have them run in the browser
-                 */
-                if (FETCH_FROM_ESM.includes(id)) {
-                    return `https://esm.sh/${id}`;
-                }
             },
             load(id) {
                 /**

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/vite/utils.ts"],"names":[],"mappings":";AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAE/D,wBAAsB,WAAW,CAAC,OAAO,EAAE,WAAW,CAAC,oBAAoB,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,oBAAc,mBAsFpI;AAED,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,MAAM,gBAa7E;AAED,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAY7D;AAED,wBAAsB,qBAAqB,CAAE,GAAG,EAAE,MAAM,qBAavD;AAGD,wBAAsB,cAAc,CAAC,WAAW,EAAE,MAAM,+BAgBvD;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,UAU9D"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/vite/utils.ts"],"names":[],"mappings":";AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAE/D,wBAAsB,WAAW,CAAC,OAAO,EAAE,WAAW,CAAC,oBAAoB,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,oBAAc,mBAuFpI;AAED,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,MAAM,gBAa7E;AAED,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAY7D;AAED,wBAAsB,qBAAqB,CAAE,GAAG,EAAE,MAAM,qBAqBvD;AAGD,wBAAsB,cAAc,CAAC,WAAW,EAAE,MAAM,+BAgBvD;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,UAU9D"}

package/build/vite/utils.js

@@ -38,7 +38,8 @@ export async function getTemplate(options, env, spec, processEnv = process.env)
         <head>
             <title>WebdriverIO Browser Test</title>
             <link rel="icon" type="image/x-icon" href="https://webdriver.io/img/favicon.png">
-            <link rel="stylesheet" href="${mochaCSSHref}"><script type="module" src="${mochaJSSrc}"></script>
+            <link rel="stylesheet" href="${mochaCSSHref}">
+            <script type="module" src="${mochaJSSrc}"></script>
             <script src="/@fs/${sourceMapSupportDir}/browser-source-map-support.js"></script>
             <script type="module">
                 sourceMapSupport.install()
@@ -102,6 +103,13 @@ export function normalizeId(id, base) {
         .replace(/\?$/, ''); // remove end query mark
 }
 export async function getFilesFromDirectory(dir) {
+    /**
+     * check if dir exists
+     */
+    const isExisting = await fs.access(dir).then(() => true, () => false);
+    if (!isExisting) {
+        return [];
+    }
     let files = await fs.readdir(dir);
     files = (await Promise.all(files.map(async (file) => {
         const filePath = path.join(dir, file);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/browser-runner",
-  "version": "8.5.0",
+  "version": "8.5.2",
   "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",
@@ -32,8 +32,8 @@
     "@types/istanbul-lib-source-maps": "^4.0.1",
     "@types/node": "^18.14.0",
     "@vitest/spy": "^0.29.1",
-    "@wdio/globals": "8.4.0",
-    "@wdio/local-runner": "8.4.0",
+    "@wdio/globals": "8.5.1",
+    "@wdio/local-runner": "8.5.1",
     "@wdio/logger": "8.1.0",
     "@wdio/mocha-framework": "8.4.0",
     "@wdio/protocols": "8.3.11",
@@ -56,8 +56,8 @@
     "vite": "^4.1.3",
     "vite-plugin-istanbul": "^4.0.0",
     "vite-plugin-top-level-await": "^1.2.4",
-    "webdriver": "8.4.0",
-    "webdriverio": "8.4.0",
+    "webdriver": "8.5.1",
+    "webdriverio": "8.5.1",
     "ws": "^8.12.1"
   },
   "scripts": {
@@ -68,7 +68,7 @@
   },
   "devDependencies": {
     "@types/ws": "^8.5.4",
-    "@wdio/runner": "8.4.0"
+    "@wdio/runner": "8.5.1"
   },
-  "gitHead": "7f6a6146ad7c9ec1d310e675b5e767cccd4fc3d9"
+  "gitHead": "810842bb22e18872edeacefaad713fb8fa876bf8"
 }