@wdio/utils 8.16.14 → 8.16.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/build/driver/utils.d.ts.map +1 -1
  2. package/build/driver/utils.js +27 -7
  3. package/package.json +3 -3
package/build/driver/utils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/driver/utils.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAOxD,wBAAgB,WAAW,CAAC,MAAM,EAAE,oBAAoB,YAYvD;AAED,wBAAgB,sBAAsB,CAAC,UAAU,CAAC,EAAE,MAAM,sBAqBzD;AAED,wBAAsB,uBAAuB,CAAC,WAAW,CAAC,EAAE,MAAM,+BAiBjE;AAGD,eAAO,MAAM,wBAAwB,aAAc,MAAM,mBAAmB,MAAM,cAAc,MAAM,SAOrG,CAAA;AAED,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,YAAY;;;;;;GAwE5F;AAED,wBAAgB,gBAAgB,CAAE,IAAI,EAAE,YAAY,CAAC,YAAY,oGAShE;AAED,wBAAgB,WAAW,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,YAAY,UAGzG;AAED,wBAAsB,iBAAiB,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM;;GA8DhF;AAED,wBAAgB,gBAAgB,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,mBAEzE;AAED,wBAAgB,eAAe,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,mBAExE;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK,GAAG,UAAU,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,CAAC,WAQ/H;AAED,wBAAgB,QAAQ,CAAE,WAAW,CAAC,EAAE,MAAM,WAE7C;AACD,wBAAgB,QAAQ,CAAE,WAAW,CAAC,EAAE,MAAM,WAE7C;AACD,wBAAgB,SAAS,CAAE,WAAW,CAAC,EAAE,MAAM,WAE9C;AACD,wBAAgB,MAAM,CAAE,WAAW,CAAC,EAAE,MAAM,WAE3C"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/driver/utils.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAOxD,wBAAgB,WAAW,CAAC,MAAM,EAAE,oBAAoB,YAYvD;AAED,wBAAgB,sBAAsB,CAAC,UAAU,CAAC,EAAE,MAAM,sBAqBzD;AAED,wBAAsB,uBAAuB,CAAC,WAAW,CAAC,EAAE,MAAM,+BAiBjE;AAGD,eAAO,MAAM,wBAAwB,aAAc,MAAM,mBAAmB,MAAM,cAAc,MAAM,SAOrG,CAAA;AAoBD,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,YAAY;;;;;;GA6E5F;AAED,wBAAgB,gBAAgB,CAAE,IAAI,EAAE,YAAY,CAAC,YAAY,oGAShE;AAED,wBAAgB,WAAW,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,YAAY,UAGzG;AAED,wBAAsB,iBAAiB,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM;;GAgEhF;AAED,wBAAgB,gBAAgB,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,mBAEzE;AAED,wBAAgB,eAAe,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,mBAExE;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK,GAAG,UAAU,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,CAAC,WAQ/H;AAED,wBAAgB,QAAQ,CAAE,WAAW,CAAC,EAAE,MAAM,WAE7C;AACD,wBAAgB,QAAQ,CAAE,WAAW,CAAC,EAAE,MAAM,WAE7C;AACD,wBAAgB,SAAS,CAAE,WAAW,CAAC,EAAE,MAAM,WAE9C;AACD,wBAAgB,MAAM,CAAE,WAAW,CAAC,EAAE,MAAM,WAE3C"}
package/build/driver/utils.js CHANGED
@@ -67,9 +67,26 @@ export const downloadProgressCallback = (artifact, downloadedBytes, totalBytes)
67
67
  return;
68
68
  }
69
69
  const percentage = ((downloadedBytes / totalBytes) * 100).toFixed(2);
70
- log.info(`Downloading ${artifact} ${percentage}%`);
70
+ log.progress(`Downloading ${artifact} ${percentage}%`);
71
71
  lastTimeCalled = Date.now();
72
72
  };
73
+ /**
74
+ * Installs a package using the provided installation options and clears the progress log afterward.
75
+ *
76
+ * @description
77
+ * When installing a package, progress updates are logged using `log.progress`.
78
+ * To ensure the formatting of subsequent logs is not disrupted, it's essential to clear the progress log after the installation is complete.
79
+ * This method combines the installation step and the clearing of the progress log.
80
+ *
81
+ * @see {@link https://github.com/webdriverio/webdriverio/blob/main/packages/wdio-logger/README.md#custom-log-levels} for more information.
82
+ *
83
+ * @param {InstallOptions & { unpack?: true | undefined }} args - An object containing installation options and an optional `unpack` flag.
84
+ * @returns {Promise<void>} A Promise that resolves once the package is installed and clear the progress log.
85
+ */
86
+ const _install = async (args) => {
87
+ await install(args);
88
+ log.progress('');
89
+ };
73
90
  export async function setupPuppeteerBrowser(cacheDir, caps) {
74
91
  caps.browserName = caps.browserName?.toLowerCase();
75
92
  const browserName = caps.browserName === Browser.FIREFOX ? Browser.FIREFOX : Browser.CHROME;
@@ -86,9 +103,10 @@ export async function setupPuppeteerBrowser(cacheDir, caps) {
86
103
  if (typeof browserOptions.binary === 'string') {
87
104
  return {
88
105
  executablePath: browserOptions.binary,
89
- browserVersion: browserName === Browser.CHROME
90
- ? getBuildIdByChromePath(browserOptions.binary)
91
- : await getBuildIdByFirefoxPath(browserOptions.binary)
106
+ browserVersion: (caps.browserVersion ||
107
+ (browserName === Browser.CHROME
108
+ ? getBuildIdByChromePath(browserOptions.binary)
109
+ : await getBuildIdByFirefoxPath(browserOptions.binary)))
92
110
  };
93
111
  }
94
112
  const platform = detectBrowserPlatform();
@@ -132,7 +150,7 @@ export async function setupPuppeteerBrowser(cacheDir, caps) {
132
150
  throw new Error(`Couldn't find a matching ${browserName} browser for tag "${buildId}" on platform "${platform}"`);
133
151
  }
134
152
  log.info(`Setting up ${browserName} v${buildId}`);
135
- await install(installOptions);
153
+ await _install(installOptions);
136
154
  const executablePath = computeExecutablePath(installOptions);
137
155
  return { executablePath, browserVersion: buildId };
138
156
  }
@@ -174,7 +192,8 @@ export async function setupChromedriver(cacheDir, driverVersion) {
174
192
  downloadProgressCallback: (downloadedBytes, totalBytes) => downloadProgressCallback('Chromedriver', downloadedBytes, totalBytes)
175
193
  };
176
194
  try {
177
- await install({ ...chromedriverInstallOpts, buildId });
195
+ await _install({ ...chromedriverInstallOpts, buildId });
196
+ log.info(`Download of Chromedriver v${buildId} was successful`);
178
197
  }
179
198
  catch (err) {
180
199
  /**
@@ -196,7 +215,8 @@ export async function setupChromedriver(cacheDir, driverVersion) {
196
215
  knownGoodVersion = await resolveBuildId(Browser.CHROMEDRIVER, platform, buildId);
197
216
  }
198
217
  loggedBuildId = knownGoodVersion;
199
- await install({ ...chromedriverInstallOpts, buildId: loggedBuildId });
218
+ await _install({ ...chromedriverInstallOpts, buildId: loggedBuildId });
219
+ log.info(`Download of Chromedriver v${loggedBuildId} was successful`);
200
220
  executablePath = computeExecutablePath({
201
221
  browser: Browser.CHROMEDRIVER,
202
222
  buildId: loggedBuildId,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@wdio/utils",
3
- "version": "8.16.14",
3
+ "version": "8.16.17",
4
4
  "description": "A WDIO helper utility to provide several utility functions used across the project.",
5
5
  "author": "Christian Bromann <mail@bromann.dev>",
6
6
  "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-utils",
@@ -31,7 +31,7 @@
31
31
  },
32
32
  "dependencies": {
33
33
  "@puppeteer/browsers": "^1.6.0",
34
- "@wdio/logger": "8.11.0",
34
+ "@wdio/logger": "8.16.17",
35
35
  "@wdio/types": "8.16.12",
36
36
  "decamelize": "^6.0.0",
37
37
  "deepmerge-ts": "^5.1.0",
@@ -48,5 +48,5 @@
48
48
  "publishConfig": {
49
49
  "access": "public"
50
50
  },
51
- "gitHead": "b74f21bcf2a05efbf3c23a67e20bcb63db2620b6"
51
+ "gitHead": "5bb4539c96e11a7ece83630b30c0a54903b55c0e"
52
52
  }