Skip to content

Commit dec350b

Browse files
authored
feat: add PUPPETEER_DOWNLOAD_BASE_URL for puppeteer@20 (#47)
> Add PUPPETEER_DOWNLOAD_BASE_URL environment variable for compatibility with puppeteer@20 ref puppeteer/puppeteer#10131 * 🆕 Added env config * 🤖 Update mockAgent in test case ------ > 新增 PUPPETEER_DOWNLOAD_BASE_URL 环境变量,用以适配 puppeteer@20 ref puppeteer/puppeteer#10131 * 🆕 增加 env 配置 * 🤖 修改测试用例 mock 方法
1 parent cba7f8e commit dec350b

File tree

2 files changed

+19
-4
lines changed

2 files changed

+19
-4
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@
5858
"SASS_BINARY_SITE": "https://cdn.npmmirror.com/binaries/node-sass",
5959
"SWC_BINARY_SITE": "https://cdn.npmmirror.com/binaries/node-swc",
6060
"NWJS_URLBASE": "https://cdn.npmmirror.com/binaries/nwjs/v",
61-
"PUPPETEER_DOWNLOAD_HOST": "https://cdn.npmmirror.com/binaries",
61+
"PUPPETEER_DOWNLOAD_HOST": "https://cdn.npmmirror.com/binaries/chrome-for-testing",
62+
"PUPPETEER_DOWNLOAD_BASE_URL": "https://cdn.npmmirror.com/binaries/chrome-for-testing",
6263
"PLAYWRIGHT_DOWNLOAD_HOST": "https://cdn.npmmirror.com/binaries/playwright",
6364
"SENTRYCLI_CDNURL": "https://cdn.npmmirror.com/binaries/sentry-cli",
6465
"SAUCECTL_INSTALL_BINARY_MIRROR": "https://cdn.npmmirror.com/binaries/saucectl",

test/index.test.js

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ const { MockAgent, getGlobalDispatcher, setGlobalDispatcher } = require('urllib'
33
const fs = require('fs').promises;
44
const os = require('os');
55
const path = require('path');
6+
const pkgJSON = require('../package.json');
67
const { MirrorConfig, mirrors } = require('..');
78

89
const fixtures = path.join(__dirname, './fixtures');
@@ -114,6 +115,13 @@ describe('test/index.test.js', () => {
114115
fs.mkdir(root, {
115116
recursive: true,
116117
});
118+
mockAgent
119+
.get('https://registry.npmmirror.com')
120+
.intercept({
121+
path: '/binary-mirror-config/latest',
122+
method: 'GET',
123+
})
124+
.reply(200, pkgJSON);
117125
});
118126

119127
afterEach(async () => {
@@ -146,6 +154,7 @@ describe('test/index.test.js', () => {
146154
assert.deepStrictEqual(options, {
147155
env: {
148156
NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
157+
COREPACK_NPM_REGISTRY: 'https://registry.npmmirror.com',
149158
NVM_NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
150159
PHANTOMJS_CDNURL: 'https://cdn.npmmirror.com/binaries/phantomjs',
151160
CHROMEDRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/chromedriver',
@@ -156,7 +165,8 @@ describe('test/index.test.js', () => {
156165
SASS_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-sass',
157166
SWC_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-swc',
158167
NWJS_URLBASE: 'https://cdn.npmmirror.com/binaries/nwjs/v',
159-
PUPPETEER_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries',
168+
PUPPETEER_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
169+
PUPPETEER_DOWNLOAD_BASE_URL: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
160170
SENTRYCLI_CDNURL: 'https://cdn.npmmirror.com/binaries/sentry-cli',
161171
SAUCECTL_INSTALL_BINARY_MIRROR: 'https://cdn.npmmirror.com/binaries/saucectl',
162172
PLAYWRIGHT_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/playwright',
@@ -216,6 +226,7 @@ describe('test/index.test.js', () => {
216226
env: {
217227
NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
218228
NVM_NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
229+
COREPACK_NPM_REGISTRY: 'https://registry.npmmirror.com',
219230
PHANTOMJS_CDNURL: 'https://cdn.npmmirror.com/binaries/phantomjs',
220231
CHROMEDRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/chromedriver',
221232
CYPRESS_DOWNLOAD_PATH_TEMPLATE: 'https://cdn.npmmirror.com/binaries/cypress/${version}/${platform}-${arch}/cypress.zip',
@@ -226,7 +237,8 @@ describe('test/index.test.js', () => {
226237
PLAYWRIGHT_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/playwright',
227238
SWC_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-swc',
228239
NWJS_URLBASE: 'https://cdn.npmmirror.com/binaries/nwjs/v',
229-
PUPPETEER_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries',
240+
PUPPETEER_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
241+
PUPPETEER_DOWNLOAD_BASE_URL: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
230242
SENTRYCLI_CDNURL: 'https://cdn.npmmirror.com/binaries/sentry-cli',
231243
SAUCECTL_INSTALL_BINARY_MIRROR: 'https://cdn.npmmirror.com/binaries/saucectl',
232244
RE2_DOWNLOAD_MIRROR: 'https://cdn.npmmirror.com/binaries/node-re2',
@@ -289,6 +301,7 @@ describe('test/index.test.js', () => {
289301
mirrorConfig.setEnvs(options);
290302
assert.deepStrictEqual(options.env, {
291303
NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
304+
COREPACK_NPM_REGISTRY: 'https://registry.npmmirror.com',
292305
NVM_NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
293306
PHANTOMJS_CDNURL: 'https://cdn.npmmirror.com/binaries/phantomjs',
294307
CHROMEDRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/chromedriver',
@@ -300,7 +313,8 @@ describe('test/index.test.js', () => {
300313
PLAYWRIGHT_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/playwright',
301314
SWC_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-swc',
302315
NWJS_URLBASE: 'https://cdn.npmmirror.com/binaries/nwjs/v',
303-
PUPPETEER_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries',
316+
PUPPETEER_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
317+
PUPPETEER_DOWNLOAD_BASE_URL: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
304318
SENTRYCLI_CDNURL: 'https://cdn.npmmirror.com/binaries/sentry-cli',
305319
SAUCECTL_INSTALL_BINARY_MIRROR: 'https://cdn.npmmirror.com/binaries/saucectl',
306320
RE2_DOWNLOAD_MIRROR: 'https://cdn.npmmirror.com/binaries/node-re2',

0 commit comments

Comments
 (0)