@percy/core 1.28.1-alpha.3 → 1.28.1-alpha.4

package/dist/config.js

@@ -252,10 +252,6 @@ export const configSchema = {
         type: 'integer',
         minimum: 1
       },
-      retry: {
-        type: 'boolean',
-        default: false
-      },
       launchOptions: {
         type: 'object',
         additionalProperties: false,

package/dist/discovery.js

@@ -1,6 +1,6 @@
 import logger from '@percy/logger';
 import Queue from './queue.js';
-import { normalizeURL, hostnameMatches, createResource, createRootResource, createPercyCSSResource, createLogResource, yieldAll, snapshotLogName, withRetries } from './utils.js';
+import { normalizeURL, hostnameMatches, createResource, createRootResource, createPercyCSSResource, createLogResource, yieldAll, snapshotLogName } from './utils.js';
 
 // Logs verbose debug logs detailing various snapshot options.
 function debugSnapshotOptions(snapshot) {
@@ -279,8 +279,7 @@ export const RESOURCE_CACHE_KEY = Symbol('resource-cache');
 // snapshot which is used to intercept and capture snapshot resource requests.
 export function createDiscoveryQueue(percy) {
   let {
-    concurrency,
-    retry
+    concurrency
   } = percy.config.discovery;
   let queue = new Queue('discovery');
   let cache;
@@ -319,48 +318,39 @@ export function createDiscoveryQueue(percy) {
     /* istanbul ignore next: tested, but coverage is stripped */
     let assetDiscoveryPageEnableJS = snapshot.cliEnableJavaScript && !snapshot.domSnapshot || (snapshot.enableJavaScript ?? !snapshot.domSnapshot);
     percy.log.debug(`Asset discovery Browser Page enable JS: ${assetDiscoveryPageEnableJS}`);
-    await withRetries(async function* () {
-      // create a new browser page
-      let page = yield percy.browser.page({
-        enableJavaScript: assetDiscoveryPageEnableJS,
-        networkIdleTimeout: snapshot.discovery.networkIdleTimeout,
-        requestHeaders: snapshot.discovery.requestHeaders,
-        authorization: snapshot.discovery.authorization,
-        userAgent: snapshot.discovery.userAgent,
-        captureMockedServiceWorker: snapshot.discovery.captureMockedServiceWorker,
-        meta: snapshot.meta,
-        // enable network inteception
-        intercept: {
-          enableJavaScript: snapshot.enableJavaScript,
-          disableCache: snapshot.discovery.disableCache,
-          allowedHostnames: snapshot.discovery.allowedHostnames,
-          disallowedHostnames: snapshot.discovery.disallowedHostnames,
-          getResource: u => snapshot.resources.get(u) || cache.get(u),
-          saveResource: r => {
-            snapshot.resources.set(r.url, r);
-            if (!r.root) {
-              cache.set(r.url, r);
-            }
+    // create a new browser page
+    let page = yield percy.browser.page({
+      enableJavaScript: assetDiscoveryPageEnableJS,
+      networkIdleTimeout: snapshot.discovery.networkIdleTimeout,
+      requestHeaders: snapshot.discovery.requestHeaders,
+      authorization: snapshot.discovery.authorization,
+      userAgent: snapshot.discovery.userAgent,
+      captureMockedServiceWorker: snapshot.discovery.captureMockedServiceWorker,
+      meta: snapshot.meta,
+      // enable network inteception
+      intercept: {
+        enableJavaScript: snapshot.enableJavaScript,
+        disableCache: snapshot.discovery.disableCache,
+        allowedHostnames: snapshot.discovery.allowedHostnames,
+        disallowedHostnames: snapshot.discovery.disallowedHostnames,
+        getResource: u => snapshot.resources.get(u) || cache.get(u),
+        saveResource: r => {
+          snapshot.resources.set(r.url, r);
+          if (!r.root) {
+            cache.set(r.url, r);
           }
         }
-      });
-      try {
-        yield* captureSnapshotResources(page, snapshot, {
-          captureWidths: !snapshot.domSnapshot && percy.deferUploads,
-          capture: callback
-        });
-      } finally {
-        // always close the page when done
-        await page.close();
       }
-    }, {
-      count: retry ? 3 : 1,
-      onRetry: () => {
-        percy.log.info(`Retrying snapshot: ${snapshotLogName(snapshot.name, snapshot.meta)}`, snapshot.meta);
-      },
-      signal: snapshot._ctrl.signal,
-      throwOn: ['AbortError']
     });
+    try {
+      yield* captureSnapshotResources(page, snapshot, {
+        captureWidths: !snapshot.domSnapshot && percy.deferUploads,
+        capture: callback
+      });
+    } finally {
+      // always close the page when done
+      await page.close();
+    }
   }).handle('error', ({
     name,
     meta

package/dist/network.js

@@ -28,7 +28,6 @@ export class Network {
   #requests = new Map();
   #authentications = new Set();
   #aborted = new Set();
-  #finishedUrls = new Set();
   constructor(page, options) {
     this.page = page;
     this.timeout = options.networkIdleTimeout ?? 100;
@@ -79,12 +78,6 @@ export class Network {
         throw new Error(`Network error: ${this.page.session.closedReason}`);
       }
       requests = Array.from(this.#requests.values()).filter(filter);
-      // remove requests which are finished at least once
-      // this happens when same request is made multiple times by browser in parallel and one of
-      // them gets stuck in pending state in browser [ need to debug why ]. So we dont receive
-      // loadingFinished event, causing it to show up in Active requests, but we can only store one
-      // response per url so as long as we have captured one, we dont care about other such requests
-      requests = requests.filter(req => !this.#finishedUrls.has(req.url));
       return requests.length === 0;
     }, {
       timeout: Network.TIMEOUT,
@@ -127,12 +120,10 @@ export class Network {
   // Called when a request should be removed from various trackers
   _forgetRequest({
     requestId,
-    interceptId,
-    url
+    interceptId
   }, keepPending) {
     this.#requests.delete(requestId);
     this.#authentications.delete(interceptId);
-    this.#finishedUrls.add(url);
     if (!keepPending) {
       this.#pending.delete(requestId);
     }

package/dist/queue.js

@@ -122,15 +122,9 @@ export class Queue {
 
     // call or set up other handlers
     let exists = this.cancel(item);
-    task.ctrl = new AbortController();
-    // duplicate abortion controller on task, so it can can be used in further
-    // generators and can be cancelled internally
-    // TODO fix this for non object item usecase
-    if (typeof item === 'object' && !Array.isArray(item) && item !== null) {
-      item._ctrl = task.ctrl;
-    }
     task.item = item = _classPrivateFieldGet(this, _handlers).push ? _classPrivateFieldGet(this, _handlers).push(item, exists) : item;
     task.handler = () => _classPrivateFieldGet(this, _handlers).task ? _classPrivateFieldGet(this, _handlers).task(item, ...args) : item;
+    task.ctrl = new AbortController();
 
     // queue this task & maybe dequeue the next task
     _classPrivateFieldGet(this, _queued).add(task);

package/dist/utils.js

@@ -328,29 +328,6 @@ export function serializeFunction(fn) {
   }
   return fnbody;
 }
-export async function withRetries(fn, {
-  count,
-  onRetry,
-  signal,
-  throwOn
-}) {
-  count || (count = 1); // default a single try
-  let run = 0;
-  while (true) {
-    run += 1;
-    try {
-      return await generatePromise(fn, signal);
-    } catch (e) {
-      // if this error should not be retried on, we want to skip errors
-      let throwError = throwOn === null || throwOn === void 0 ? void 0 : throwOn.includes(e.name);
-      if (!throwError && run < count) {
-        await (onRetry === null || onRetry === void 0 ? void 0 : onRetry());
-        continue;
-      }
-      throw e;
-    }
-  }
-}
 export function snapshotLogName(name, meta) {
   var _meta$snapshot;
   if (meta !== null && meta !== void 0 && (_meta$snapshot = meta.snapshot) !== null && _meta$snapshot !== void 0 && _meta$snapshot.testCase) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@percy/core",
-  "version": "1.28.1-alpha.3",
+  "version": "1.28.1-alpha.4",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -9,7 +9,7 @@
   },
   "publishConfig": {
     "access": "public",
-    "tag": "alpha"
+    "tag": "beta"
   },
   "engines": {
     "node": ">=14"
@@ -43,11 +43,11 @@
     "test:types": "tsd"
   },
   "dependencies": {
-    "@percy/client": "1.28.1-alpha.3",
-    "@percy/config": "1.28.1-alpha.3",
-    "@percy/dom": "1.28.1-alpha.3",
-    "@percy/logger": "1.28.1-alpha.3",
-    "@percy/webdriver-utils": "1.28.1-alpha.3",
+    "@percy/client": "1.28.1-alpha.4",
+    "@percy/config": "1.28.1-alpha.4",
+    "@percy/dom": "1.28.1-alpha.4",
+    "@percy/logger": "1.28.1-alpha.4",
+    "@percy/webdriver-utils": "1.28.1-alpha.4",
     "content-disposition": "^0.5.4",
     "cross-spawn": "^7.0.3",
     "extract-zip": "^2.0.1",
@@ -58,5 +58,5 @@
     "rimraf": "^3.0.2",
     "ws": "^8.0.0"
   },
-  "gitHead": "46d1e874e1092fee45899d70cd97cf793db17de5"
+  "gitHead": "90d1c1135441a631d5fdbbce0a7e2efbe8ab4e21"
 }