From 2f251688c88c3bcf890d1535bbbd79365ba9fe70 Mon Sep 17 00:00:00 2001 From: Yuki Hattori Date: Sat, 2 Feb 2019 11:39:00 +0900 Subject: [PATCH] Revert deletion of @types/puppeteer in 302d5f6 Puppeteer v1.12.0 had added the official type definition, but updated v1.12.1 has removed it because of low quality. See: https://github.com/GoogleChrome/puppeteer/issues/3878 --- package.json | 1 + src/converter.ts | 2 +- src/typings.d.ts | 5 +++++ yarn.lock | 7 +++++++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 90681031..51c56fb0 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ "@types/jest-plugin-context": "^2.9.0", "@types/node": "^10.12.21", "@types/pug": "^2.0.4", + "@types/puppeteer": "^1.11.2", "@types/supertest": "^2.0.7", "@types/ws": "^6.0.1", "@types/yargs": "^12.0.8", diff --git a/src/converter.ts b/src/converter.ts index ab43896f..50122f3c 100644 --- a/src/converter.ts +++ b/src/converter.ts @@ -185,7 +185,7 @@ export class Converter { type: 'png' | 'jpeg' } ) { - file.buffer = await this.usePuppeteer(file, async (page, uri) => { + file.buffer = await this.usePuppeteer(file, async (page, uri) => { await page.setViewport({ ...opts.size }) await page.goto(uri, { waitUntil: ['domcontentloaded', 'networkidle0'] }) await page.emulateMedia('print') diff --git a/src/typings.d.ts b/src/typings.d.ts index 8a76e7a3..8fc20311 100644 --- a/src/typings.d.ts +++ b/src/typings.d.ts @@ -14,3 +14,8 @@ declare module '*.scss' { const scss: string export default scss } + +declare module 'puppeteer-core' { + import * as puppeteer from 'puppeteer' + export = puppeteer +} diff --git a/yarn.lock b/yarn.lock index eb51ab02..5dbb6b5d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -326,6 +326,13 @@ resolved "https://registry.yarnpkg.com/@types/pug/-/pug-2.0.4.tgz#8772fcd0418e3cd2cc171555d73007415051f4b2" integrity sha1-h3L80EGOPNLMFxVV1zAHQVBR9LI= +"@types/puppeteer@^1.11.2": + version "1.12.0" + resolved "https://registry.yarnpkg.com/@types/puppeteer/-/puppeteer-1.12.0.tgz#0bd11f1aae4130b164d1759e69b8376a75d034fa" + integrity sha512-chymwff4/kbiHWkG/ZqkyLboFWMmbO5gz9AozDKqdv6T9ca1ScI1jsK5A7vM5hp2qoxfADN/UEOpMDXaA/L0VA== + dependencies: + "@types/node" "*" + "@types/q@^1.5.1": version "1.5.1" resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.1.tgz#48fd98c1561fe718b61733daed46ff115b496e18"