Selaa lähdekoodia

replaced puppeteer-firefox with puppeteer-core

Former-commit-id: c9ca6285492562809132ac2146e501800b8c0baf
Gildas 5 vuotta sitten
vanhempi
sitoutus
8f75d9f5de
1 muutettua tiedostoa jossa 7 lisäystä ja 2 poistoa
  1. 7 2
      cli/back-ends/puppeteer-firefox.js

+ 7 - 2
cli/back-ends/puppeteer-firefox.js

@@ -23,7 +23,7 @@
 
 /* global singlefile, require, exports */
 
-const puppeteer = require("puppeteer-firefox");
+const puppeteer = require("puppeteer-core");
 const scripts = require("./common/scripts.js");
 
 const EXECUTION_CONTEXT_DESTROYED_ERROR = "Execution context was destroyed";
@@ -63,6 +63,7 @@ function getBrowserOptions(options) {
 	if (options.browserExecutablePath) {
 		browserOptions.executablePath = options.browserExecutablePath || "firefox";
 	}
+	browserOptions.product = "firefox";
 	return browserOptions;
 }
 
@@ -74,7 +75,11 @@ async function setPageOptions(page, options) {
 		});
 	}
 	if ((options.browserBypassCSP === undefined || options.browserBypassCSP) && page.setBypassCSP) {
-		await page.setBypassCSP(true);
+		try {
+			await page.setBypassCSP(true);
+		} catch (error) {
+			// ignored
+		}
 	}
 }