Skip to content

Commit aec552c

Browse files
committed
fix: support older puppeteer versions
1 parent dd5f4ae commit aec552c

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

lib/extend.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,23 @@ try {
1616
if (Page.Page) Page = Page.Page
1717

1818
ElementHandle = requireOrUndefined('puppeteer/lib/ElementHandle.js') // tslint:disable-line variable-name
19+
if (ElementHandle && ElementHandle.ElementHandle) ElementHandle = ElementHandle.ElementHandle
20+
1921
if (!ElementHandle) {
2022
const ExecutionContext = requireOrUndefined('puppeteer/lib/ExecutionContext.js') // tslint:disable-line variable-name
2123
if (ExecutionContext && ExecutionContext.ElementHandle) {
2224
ElementHandle = ExecutionContext.ElementHandle
2325
}
2426
}
27+
if (ElementHandle && ElementHandle.ElementHandle) ElementHandle = ElementHandle.ElementHandle
2528

2629
if (!ElementHandle) {
2730
const JSHandle = require('puppeteer/lib/JSHandle.js') // tslint:disable-line
2831
if (JSHandle && JSHandle.ElementHandle) {
2932
ElementHandle = JSHandle.ElementHandle
3033
}
3134
}
35+
if (ElementHandle && ElementHandle.ElementHandle) ElementHandle = ElementHandle.ElementHandle
3236

3337
Page.prototype.getDocument = getDocument
3438
getQueriesForElement(ElementHandle.prototype, function(this: ElementHandle): ElementHandle {

test/extend.test.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
import * as path from 'path'
22
import * as puppeteer from 'puppeteer'
3-
import '../lib/extend'
43

54
describe('lib/extend.ts', () => {
65
let browser: puppeteer.Browser
76
let page: puppeteer.Page
87
let document: puppeteer.ElementHandle
98

9+
it('should require without error', async () => {
10+
await import('../lib/extend')
11+
})
12+
1013
it('should launch puppeteer', async () => {
1114
browser = await puppeteer.launch({args: ['--no-sandbox', '--disable-setuid-sandbox']})
1215
page = await browser.newPage()

0 commit comments

Comments
 (0)