Merge pull request #16519 from timvandermeij/puppeteer

Improve Puppeteer's `trimCache` API usage
This commit is contained in:
Tim van der Meij 2023-06-04 14:35:30 +02:00 committed by GitHub
commit 8a5af64749
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 51 deletions

85
package-lock.json generated
View File

@ -48,7 +48,7 @@
"postcss": "^8.4.23", "postcss": "^8.4.23",
"postcss-dir-pseudo-class": "^7.0.2", "postcss-dir-pseudo-class": "^7.0.2",
"prettier": "^2.8.8", "prettier": "^2.8.8",
"puppeteer": "^20.4.0", "puppeteer": "^20.5.0",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"streamqueue": "^1.1.2", "streamqueue": "^1.1.2",
"stylelint": "^15.6.2", "stylelint": "^15.6.2",
@ -2962,15 +2962,15 @@
} }
}, },
"node_modules/@puppeteer/browsers": { "node_modules/@puppeteer/browsers": {
"version": "1.4.0", "version": "1.4.1",
"resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.4.0.tgz", "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.4.1.tgz",
"integrity": "sha512-HiRpoc15NhFwoR1IjN3MkMsqeAfRQKNzbhWVV+0BfvybEhjWSyRNQMC0ohMhkFhzoGnFoS59WlrJCGLPky/89g==", "integrity": "sha512-H43VosMzywHCcYcgv0GXXopvwnV21Ud9g2aXbPlQUJj1Xcz9V0wBwHeFz6saFhx/3VKisZfI1GEKEOhQCau7Vw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"debug": "4.3.4", "debug": "4.3.4",
"extract-zip": "2.0.1", "extract-zip": "2.0.1",
"progress": "2.0.3", "progress": "2.0.3",
"proxy-agent": "6.2.0", "proxy-agent": "6.2.1",
"tar-fs": "2.1.1", "tar-fs": "2.1.1",
"unbzip2-stream": "1.4.3", "unbzip2-stream": "1.4.3",
"yargs": "17.7.1" "yargs": "17.7.1"
@ -2979,7 +2979,7 @@
"browsers": "lib/cjs/main-cli.js" "browsers": "lib/cjs/main-cli.js"
}, },
"engines": { "engines": {
"node": ">=16.0.0" "node": ">=16.3.0"
}, },
"peerDependencies": { "peerDependencies": {
"typescript": ">= 4.7.4" "typescript": ">= 4.7.4"
@ -4733,9 +4733,9 @@
} }
}, },
"node_modules/chromium-bidi": { "node_modules/chromium-bidi": {
"version": "0.4.10", "version": "0.4.11",
"resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.10.tgz", "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.11.tgz",
"integrity": "sha512-ngdRIq/f5G3nIOz1M0MtCABCTezr79MBCrJ09K2xRk+hTZQGTH8JIeFbgQmVvNPBMQblh7ROfJnSzsE07YpFfg==", "integrity": "sha512-p03ajLhlQ5gebw3cmbDBFmBc2wnJM5dnXS8Phu6mblGn/KQd76yOVL5VwE0VAisa7oazNfKGTaXlIZ8Q5Bb9OA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"mitt": "3.0.0" "mitt": "3.0.0"
@ -8577,9 +8577,9 @@
} }
}, },
"node_modules/http-proxy-agent": { "node_modules/http-proxy-agent": {
"version": "6.1.1", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-6.1.1.tgz", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
"integrity": "sha512-JRCz+4Whs6yrrIoIlrH+ZTmhrRwtMnmOHsHn8GFEn9O2sVfSE+DAZ3oyyGIKF8tjJEeSJmP89j7aTjVsSqsU0g==", "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"agent-base": "^7.1.0", "agent-base": "^7.1.0",
@ -15825,19 +15825,6 @@
} }
} }
}, },
"node_modules/pac-proxy-agent/node_modules/http-proxy-agent": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
"integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
"dev": true,
"dependencies": {
"agent-base": "^7.1.0",
"debug": "^4.3.4"
},
"engines": {
"node": ">= 14"
}
},
"node_modules/pac-proxy-agent/node_modules/https-proxy-agent": { "node_modules/pac-proxy-agent/node_modules/https-proxy-agent": {
"version": "7.0.0", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.0.tgz", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.0.tgz",
@ -16392,17 +16379,17 @@
} }
}, },
"node_modules/proxy-agent": { "node_modules/proxy-agent": {
"version": "6.2.0", "version": "6.2.1",
"resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.2.0.tgz", "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.2.1.tgz",
"integrity": "sha512-g3rBHXPhEa0Z1nxZkirj0+US1SCcA67SnjpxbdZf7BloLdULEUCzbQozsq+wFwhmMeZegeZISDZjPFN/Ct9DaQ==", "integrity": "sha512-OIbBKlRAT+ycCm6wAYIzMwPejzRtjy8F3QiDX0eKOA3e4pe3U9F/IvzcHP42bmgQxVv97juG+J8/gx+JIeCX/Q==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"agent-base": "^7.0.1", "agent-base": "^7.0.2",
"debug": "^4.3.4", "debug": "^4.3.4",
"http-proxy-agent": "^6.0.1", "http-proxy-agent": "^7.0.0",
"https-proxy-agent": "^6.1.0", "https-proxy-agent": "^7.0.0",
"lru-cache": "^7.14.1", "lru-cache": "^7.14.1",
"pac-proxy-agent": "^6.0.2", "pac-proxy-agent": "^6.0.3",
"proxy-from-env": "^1.1.0", "proxy-from-env": "^1.1.0",
"socks-proxy-agent": "^8.0.1" "socks-proxy-agent": "^8.0.1"
}, },
@ -16440,9 +16427,9 @@
} }
}, },
"node_modules/proxy-agent/node_modules/https-proxy-agent": { "node_modules/proxy-agent/node_modules/https-proxy-agent": {
"version": "6.2.1", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-6.2.1.tgz", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.0.tgz",
"integrity": "sha512-ONsE3+yfZF2caH5+bJlcddtWqNI3Gvs5A38+ngvljxaBiRXRswym2c7yf8UAeFpRFKjFNHIFEHqR/OLAWJzyiA==", "integrity": "sha512-0euwPCRyAPSgGdzD1IVN9nJYHtBhJwb6XPfbpQcYbPCwrBidX6GzxmchnaF4sfF/jPb74Ojx5g4yTg3sixlyPw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"agent-base": "^7.0.2", "agent-base": "^7.0.2",
@ -16636,32 +16623,32 @@
} }
}, },
"node_modules/puppeteer": { "node_modules/puppeteer": {
"version": "20.4.0", "version": "20.5.0",
"resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-20.4.0.tgz", "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-20.5.0.tgz",
"integrity": "sha512-0/lgDbbC2LX/vMQ6+cv/doQuguFAf4Ra52fyW5oBOpQd85SzPBtXg4yPk+VhUpgr+oaOVAIUkgvBs98E+8xhCw==", "integrity": "sha512-3j0JShJGDT5z8rfDKf+wZQq3IHxw7JaDAdP7py5H5zOIgmqNG0e8R19y4tFzJ8i2WC4H/0bC51rIrTXyDop1FA==",
"dev": true, "dev": true,
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"@puppeteer/browsers": "1.4.0", "@puppeteer/browsers": "1.4.1",
"cosmiconfig": "8.1.3", "cosmiconfig": "8.1.3",
"puppeteer-core": "20.4.0" "puppeteer-core": "20.5.0"
} }
}, },
"node_modules/puppeteer-core": { "node_modules/puppeteer-core": {
"version": "20.4.0", "version": "20.5.0",
"resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-20.4.0.tgz", "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-20.5.0.tgz",
"integrity": "sha512-fcL2fYQLFZEuIIDbMhvf6WF5rAcKXetsrjOxu6Br6FEAet7kEtJlCcrKmnz3pfqkwAIlihjuzwT5ys7jMWEx8A==", "integrity": "sha512-9ddHXUQ7jpliGei87zYTuEZYQvFj6Lzk5R8w4vT4gMmNArkEqC5CX72TnVIJiTUbiTpOXJkvMQaXIHYopjdUtQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@puppeteer/browsers": "1.4.0", "@puppeteer/browsers": "1.4.1",
"chromium-bidi": "0.4.10", "chromium-bidi": "0.4.11",
"cross-fetch": "3.1.6", "cross-fetch": "3.1.6",
"debug": "4.3.4", "debug": "4.3.4",
"devtools-protocol": "0.0.1120988", "devtools-protocol": "0.0.1120988",
"ws": "8.13.0" "ws": "8.13.0"
}, },
"engines": { "engines": {
"node": ">=16.0.0" "node": ">=16.3.0"
}, },
"peerDependencies": { "peerDependencies": {
"typescript": ">= 4.7.4" "typescript": ">= 4.7.4"
@ -19073,9 +19060,9 @@
} }
}, },
"node_modules/tslib": { "node_modules/tslib": {
"version": "2.5.2", "version": "2.5.3",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.2.tgz", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
"integrity": "sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==", "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==",
"dev": true "dev": true
}, },
"node_modules/ttest": { "node_modules/ttest": {

View File

@ -41,7 +41,7 @@
"postcss": "^8.4.23", "postcss": "^8.4.23",
"postcss-dir-pseudo-class": "^7.0.2", "postcss-dir-pseudo-class": "^7.0.2",
"prettier": "^2.8.8", "prettier": "^2.8.8",
"puppeteer": "^20.4.0", "puppeteer": "^20.5.0",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"streamqueue": "^1.1.2", "streamqueue": "^1.1.2",
"stylelint": "^15.6.2", "stylelint": "^15.6.2",

View File

@ -953,7 +953,7 @@ async function startBrowsers(initSessionCallback, makeStartUrl = null) {
// Remove old browser revisions from Puppeteer's cache. Updating Puppeteer can // Remove old browser revisions from Puppeteer's cache. Updating Puppeteer can
// cause new browser revisions to be downloaded, so trimming the cache will // cause new browser revisions to be downloaded, so trimming the cache will
// prevent the disk from filling up over time. // prevent the disk from filling up over time.
await puppeteer.default.trimCache(); await puppeteer.trimCache();
const browserNames = options.noChrome ? ["firefox"] : ["firefox", "chrome"]; const browserNames = options.noChrome ? ["firefox"] : ["firefox", "chrome"];