Skip to content

Commit 2c06f31

Browse files
web-padawanLarsDenBakker
web-padawan
authored and
LarsDenBakker
committed
feat: update puppeteer and puppeteer-core to 8.0.0
1 parent 96f439e commit 2c06f31

12 files changed

Lines changed: 70 additions & 36 deletions

File tree

‎.changeset/violet-adults-brake.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
'@web/test-runner-chrome': minor
3+
'@web/test-runner-puppeteer': minor
4+
'@web/test-runner-visual-regression': minor
5+
'@web/test-runner': minor
6+
'@web/browser-logs': patch
7+
'@web/dev-server': patch
8+
'@web/dev-server-hmr': patch
9+
---
10+
11+
Update puppeteer and puppeteer-core to 8.0.0

‎packages/browser-logs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@
5050
},
5151
"devDependencies": {
5252
"@esm-bundle/chai": "^4.1.5",
53-
"puppeteer": "^5.5.0"
53+
"puppeteer": "^8.0.0"
5454
}
5555
}

‎packages/dev-server-hmr/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
},
4444
"devDependencies": {
4545
"lit-html": "^1.3.0",
46-
"puppeteer": "^5.5.0"
46+
"puppeteer": "^8.0.0"
4747
}
4848
}

‎packages/dev-server-hmr/test/browser.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { expect } from 'chai';
22
import { stubMethod } from 'hanbi';
33
import { createTestServer, expectIncludes } from '@web/dev-server-core/test-helpers';
4-
import { Browser, launch as launchPuppeteer, Page } from 'puppeteer';
4+
import { Browser, HTTPResponse, launch as launchPuppeteer, Page } from 'puppeteer';
55
import { posix as pathUtil } from 'path';
66

77
import { hmrPlugin } from '../src/index';
@@ -90,7 +90,7 @@ describe('browser tests', function () {
9090

9191
files['/foo.js'] = files['/foo.js'].replace('" a "', '" b "');
9292
server.fileWatcher.emit('change', pathUtil.join(__dirname, '/foo.js'));
93-
await page.waitForResponse(r => r.url().startsWith(`${host}/foo.js`));
93+
await page.waitForResponse((r: HTTPResponse) => r.url().startsWith(`${host}/foo.js`));
9494
expectIncludes(await page.content(), '<body> a b </body>');
9595

9696
for (const error of errors) {
@@ -122,7 +122,7 @@ describe('browser tests', function () {
122122

123123
files['/bar.js'] = 'export default " b ";';
124124
server.fileWatcher.emit('change', pathUtil.join(__dirname, '/bar.js'));
125-
await page.waitForResponse(r => r.url().startsWith(`${host}/bar.js`));
125+
await page.waitForResponse((r: HTTPResponse) => r.url().startsWith(`${host}/bar.js`));
126126
await new Promise(r => setTimeout(r, 1000));
127127
expectIncludes(await page.content(), '<body> a b </body>');
128128

@@ -158,9 +158,9 @@ describe('browser tests', function () {
158158
files['/baz.js'] = 'export default " b ";';
159159
server.fileWatcher.emit('change', pathUtil.join(__dirname, '/baz.js'));
160160
await Promise.all([
161-
page.waitForResponse(r => r.url().startsWith(`${host}/foo.js`)),
162-
page.waitForResponse(r => r.url().startsWith(`${host}/bar.js`)),
163-
page.waitForResponse(r => r.url().startsWith(`${host}/baz.js`)),
161+
page.waitForResponse((r: HTTPResponse) => r.url().startsWith(`${host}/foo.js`)),
162+
page.waitForResponse((r: HTTPResponse) => r.url().startsWith(`${host}/bar.js`)),
163+
page.waitForResponse((r: HTTPResponse) => r.url().startsWith(`${host}/baz.js`)),
164164
]);
165165
await new Promise(r => setTimeout(r, 1000));
166166
expectIncludes(await page.content(), '<body> foo a bar a foo b bar b </body>');

‎packages/dev-server/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,6 @@
7474
"devDependencies": {
7575
"@types/command-line-usage": "^5.0.1",
7676
"lit-html": "^1.3.0",
77-
"puppeteer": "^5.5.0"
77+
"puppeteer": "^8.0.0"
7878
}
7979
}

‎packages/test-runner-chrome/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"@web/test-runner-core": "^0.10.8",
4949
"@web/test-runner-coverage-v8": "^0.4.5",
5050
"chrome-launcher": "^0.13.4",
51-
"puppeteer-core": "^5.5.0"
51+
"puppeteer-core": "^8.0.0"
5252
},
5353
"devDependencies": {
5454
"@types/babel__code-frame": "^7.0.2",

‎packages/test-runner-chrome/src/ChromeLauncher.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as puppeteerCore from 'puppeteer-core';
22
import {
33
Browser,
44
Page,
5-
LaunchOptions,
5+
PuppeteerNodeLaunchOptions,
66
launch as puppeteerCoreLaunch,
77
BrowserContext,
88
} from 'puppeteer-core';
@@ -31,7 +31,7 @@ export class ChromeLauncher implements BrowserLauncher {
3131
public name: string;
3232
public type = 'puppeteer';
3333
public concurrency?: number;
34-
private launchOptions: LaunchOptions;
34+
private launchOptions: PuppeteerNodeLaunchOptions;
3535
private customPuppeteer?: typeof puppeteerCore;
3636
private createBrowserContextFn: CreateBrowserContextFn;
3737
private createPageFn: CreatePageFn;
@@ -48,7 +48,7 @@ export class ChromeLauncher implements BrowserLauncher {
4848
private __startBrowserPromise?: Promise<{ browser: Browser; context: BrowserContext }>;
4949

5050
constructor(
51-
launchOptions: LaunchOptions,
51+
launchOptions: PuppeteerNodeLaunchOptions,
5252
createBrowserContextFn: CreateBrowserContextFn,
5353
createPageFn: CreatePageFn,
5454
customPuppeteer?: typeof puppeteerCore,
@@ -63,7 +63,7 @@ export class ChromeLauncher implements BrowserLauncher {
6363
if (!customPuppeteer) {
6464
// without a custom puppeteer, we use the locally installed chrome
6565
this.name = 'Chrome';
66-
} else if (!this.launchOptions.product || this.launchOptions.product === 'chrome') {
66+
} else if (!this.launchOptions?.product || this.launchOptions.product === 'chrome') {
6767
// with puppeteer we use the a packaged chromium, puppeteer calls it chrome but we
6868
// should call it chromium to avoid confusion
6969
this.name = 'Chromium';
@@ -78,7 +78,7 @@ export class ChromeLauncher implements BrowserLauncher {
7878
this.testFiles = testFiles;
7979
}
8080

81-
launchBrowser(options: LaunchOptions = {}) {
81+
launchBrowser(options: PuppeteerNodeLaunchOptions = {}) {
8282
if (this.customPuppeteer) {
8383
const mergedOptions = { ...this.launchOptions, ...options };
8484
// launch using a custom puppeteer instance
@@ -114,7 +114,7 @@ export class ChromeLauncher implements BrowserLauncher {
114114
});
115115
}
116116

117-
async startBrowser(options: LaunchOptions = {}) {
117+
async startBrowser(options: PuppeteerNodeLaunchOptions = {}) {
118118
const browser = await this.launchBrowser(options);
119119
const context = await this.createBrowserContextFn({ config: this.config!, browser });
120120
return { browser, context };
@@ -183,7 +183,7 @@ export class ChromeLauncher implements BrowserLauncher {
183183
return new ChromeLauncherPage(
184184
this.config!,
185185
this.testFiles!,
186-
this.launchOptions.product ?? 'chromium',
186+
this.launchOptions?.product ?? 'chromium',
187187
await puppeteerPagePromise,
188188
);
189189
}

‎packages/test-runner-chrome/src/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import * as puppeteerCore from 'puppeteer-core';
22
import { ChromeLauncher, CreateBrowserContextFn, CreatePageFn } from './ChromeLauncher';
3-
import { LaunchOptions, devices } from 'puppeteer-core';
3+
import { PuppeteerNodeLaunchOptions, devices } from 'puppeteer-core';
44

55
export interface ChromeLauncherArgs {
66
puppeteer?: typeof puppeteerCore;
7-
launchOptions?: LaunchOptions;
7+
launchOptions?: PuppeteerNodeLaunchOptions;
88
createBrowserContext?: CreateBrowserContextFn;
99
createPage?: CreatePageFn;
1010
concurrency?: number;

‎packages/test-runner-puppeteer/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@
4747
"dependencies": {
4848
"@web/test-runner-chrome": "^0.9.3",
4949
"@web/test-runner-core": "^0.10.8",
50-
"puppeteer": "^5.5.0"
50+
"puppeteer": "^8.0.0"
5151
},
5252
"devDependencies": {
53-
"@web/test-runner-mocha": "^0.7.2"
53+
"@web/test-runner-mocha": "^0.7.2",
54+
"puppeteer-core": "^8.0.0"
5455
}
5556
}

‎packages/test-runner-puppeteer/src/puppeteerLauncher.ts‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import * as puppeteer from 'puppeteer';
2+
import * as puppeteerCore from 'puppeteer-core';
3+
import { Browser, Page, PuppeteerNodeLaunchOptions } from 'puppeteer-core';
24
import { BrowserLauncher, TestRunnerCoreConfig } from '@web/test-runner-core';
35
import { chromeLauncher } from '@web/test-runner-chrome';
46

57
export interface PuppeteerLauncherConfig {
6-
launchOptions?: puppeteer.LaunchOptions;
7-
createPage?: (args: {
8-
config: TestRunnerCoreConfig;
9-
browser: puppeteer.Browser;
10-
}) => Promise<puppeteer.Page>;
8+
launchOptions?: PuppeteerNodeLaunchOptions;
9+
createPage?: (args: { config: TestRunnerCoreConfig; browser: Browser }) => Promise<Page>;
1110
concurrency?: number;
1211
}
1312

@@ -18,7 +17,7 @@ export function puppeteerLauncher({
1817
}: PuppeteerLauncherConfig = {}): BrowserLauncher {
1918
return chromeLauncher({
2019
launchOptions,
21-
puppeteer: (puppeteer as any).default as typeof puppeteer,
20+
puppeteer: (puppeteer as any).default as typeof puppeteerCore,
2221
createPage,
2322
concurrency,
2423
});

0 commit comments

Comments
 (0)