From e5bdadf339b646fe6423fd37fb8224d9420c2196 Mon Sep 17 00:00:00 2001 From: David Moore Date: Mon, 6 Jan 2025 14:47:48 +1100 Subject: [PATCH 1/3] skip puppeteer download chrome --- .puppeteerrc.cjs | 12 ++++++++++++ puppeteer.config.json | 9 --------- 2 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 .puppeteerrc.cjs delete mode 100644 puppeteer.config.json diff --git a/.puppeteerrc.cjs b/.puppeteerrc.cjs new file mode 100644 index 000000000..e6da5f9bb --- /dev/null +++ b/.puppeteerrc.cjs @@ -0,0 +1,12 @@ +/** + * @type {import("puppeteer").Configuration} + */ +module.exports = { + cacheDirectory: '/vercel/.cache/puppeteer', + executablePath: + '/vercel/.cache/puppeteer/chrome/linux-131.0.6778.204/chrome-linux64/chrome', + chrome: { + skipDownload: true, + }, + args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-dev-shm-usage'], +} diff --git a/puppeteer.config.json b/puppeteer.config.json deleted file mode 100644 index af94e5cc0..000000000 --- a/puppeteer.config.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "cacheDirectory": "/vercel/.cache/puppeteer", - "executablePath": "/vercel/.cache/puppeteer/chrome/linux-131.0.6778.204/chrome-linux64/chrome", - "args": [ - "--no-sandbox", - "--disable-setuid-sandbox", - "--disable-dev-shm-usage" - ] -} From fd164982fe31b685f965efe0fac869acd6cce177 Mon Sep 17 00:00:00 2001 From: David Moore Date: Mon, 6 Jan 2025 14:50:24 +1100 Subject: [PATCH 2/3] rearrange install order --- vercel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index 270f873dd..7e96b34fa 100644 --- a/vercel.json +++ b/vercel.json @@ -1,5 +1,5 @@ { "buildCommand": "yarn build", - "installCommand": "dnf install -y $(cat chrome-dependencies.txt) && npx browsers install chrome@131.0.6778.204 --path /vercel/.cache/puppeteer && yarn install", + "installCommand": "dnf install -y $(cat chrome-dependencies.txt) && yarn install && npx browsers install chrome@131.0.6778.204 --path /vercel/.cache/puppeteer", "framework": "nextjs" } From 5be76b804e4048510a02a7fe62068639c7d67eb7 Mon Sep 17 00:00:00 2001 From: David Moore Date: Mon, 6 Jan 2025 15:10:35 +1100 Subject: [PATCH 3/3] skip download only in vercel ci --- .puppeteerrc.cjs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.puppeteerrc.cjs b/.puppeteerrc.cjs index e6da5f9bb..66d077a44 100644 --- a/.puppeteerrc.cjs +++ b/.puppeteerrc.cjs @@ -1,3 +1,5 @@ +const isCI = !!process.env.VERCEL_ENV + /** * @type {import("puppeteer").Configuration} */ @@ -6,7 +8,7 @@ module.exports = { executablePath: '/vercel/.cache/puppeteer/chrome/linux-131.0.6778.204/chrome-linux64/chrome', chrome: { - skipDownload: true, + skipDownload: isCI, }, args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-dev-shm-usage'], }