From e8f2171fb0ccc19c64748f183c258d11c470756c Mon Sep 17 00:00:00 2001 From: Jarrod Overson Date: Tue, 4 Aug 2020 00:57:48 -0400 Subject: [PATCH] updated puppeteer, fixed types again --- package-lock.json | 32 +++++------ package.json | 74 +++++++++++++------------- src/cli.ts | 2 +- src/cmds/init/templates/script.js | 2 +- src/hackium/hackium-browser-context.ts | 4 +- src/hackium/hackium-browser.ts | 10 ++-- src/hackium/hackium-input.ts | 10 ++-- src/hackium/hackium-page.ts | 14 ++--- src/hackium/hackium-target.ts | 8 +-- src/hackium/hackium.ts | 8 +-- src/puppeteer.ts | 4 +- src/util/types.ts | 2 +- 12 files changed, 82 insertions(+), 88 deletions(-) diff --git a/package-lock.json b/package-lock.json index c9fa395..a7a411a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1027,11 +1027,6 @@ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true }, - "mitt": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mitt/-/mitt-2.1.0.tgz", - "integrity": "sha512-ILj2TpLiysu2wkBbWjAmww7TkZb65aiQO+DkVdUTBpBXq+MHYiETENkKFMtsJZX1Lf4pe4QOrTSjIfUwN5lRdg==" - }, "mkdirp": { "version": "0.5.5", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", @@ -1554,16 +1549,15 @@ "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" }, "puppeteer": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-5.1.0.tgz", - "integrity": "sha512-IZBFG8XcA+oHxYo5rEpJI/HQignUis2XPijPoFpNxla2O+WufonGsUsSqrhRXgBKOME5zNfhRdUY2LvxAiKlhw==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-5.2.1.tgz", + "integrity": "sha512-PZoZG7u+T6N1GFWBQmGVG162Ak5MAy8nYSVpeeQrwJK2oYUlDWpHEJPcd/zopyuEMTv7DiztS1blgny1txR2qw==", "requires": { "debug": "^4.1.0", - "devtools-protocol": "0.0.767361", + "devtools-protocol": "0.0.781568", "extract-zip": "^2.0.0", "https-proxy-agent": "^4.0.0", "mime": "^2.0.3", - "mitt": "^2.0.1", "pkg-dir": "^4.2.0", "progress": "^2.0.1", "proxy-from-env": "^1.0.0", @@ -1574,16 +1568,16 @@ }, "dependencies": { "devtools-protocol": { - "version": "0.0.767361", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.767361.tgz", - "integrity": "sha512-ziRTdhEVQ9jEwedaUaXZ7kl9w9TF/7A3SXQ0XuqrJB+hMS62POHZUWTbumDN2ehRTfvWqTPc2Jw4gUl/jggmHA==" + "version": "0.0.781568", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.781568.tgz", + "integrity": "sha512-9Uqnzy6m6zEStluH9iyJ3iHyaQziFnMnLeC8vK0eN6smiJmIx7+yB64d67C2lH/LZra+5cGscJAJsNXO+MdPMg==" } } }, "puppeteer-extensionbridge": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/puppeteer-extensionbridge/-/puppeteer-extensionbridge-1.0.0.tgz", - "integrity": "sha512-kITUV+NXmiQacFKzfaK6Y7+7RedNrqVBzRE5/AyO4wl7rDtgUapt6ZWyNIcPeDDexO9m6FkTXUnMSGS4nmRB0A==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/puppeteer-extensionbridge/-/puppeteer-extensionbridge-1.1.0.tgz", + "integrity": "sha512-TZm6vvuV4BeqC9xQWrulgGx9v+v8PfUEIC1SWai3y23E77W7y1Pt723PPFQFo3ncnhMYwDeVvdOM/45W/59Kaw==", "requires": { "@jsoverson/test-server": "^1.1.1", "debug": "^4.1.1", @@ -1591,9 +1585,9 @@ } }, "puppeteer-interceptor": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/puppeteer-interceptor/-/puppeteer-interceptor-2.0.1.tgz", - "integrity": "sha512-8MzRrjznpzAmmfo7R+eHLGJ72EKYSdxQUkfaLoYABDbkthIZv/xxXqk+vi87G6LRITg5HLcwt6Yc/8fdsXNujQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/puppeteer-interceptor/-/puppeteer-interceptor-2.1.0.tgz", + "integrity": "sha512-wrRIdsR90kuryyRRwk9aYCwcTdgx3p7zusiOP8qcf6zMkNxaMzYCa2KO64Hh8p2uE+9vx3n3VehSsXOiHhH6eA==", "requires": { "atob": "^2.1.2", "btoa": "^1.2.1", diff --git a/package.json b/package.json index 2f0f736..a4031e5 100644 --- a/package.json +++ b/package.json @@ -53,45 +53,45 @@ "author": "Jarrod Overson ", "license": "ISC", "dependencies": { - "chalk": "^4.0.0", - "chokidar": "^3.4.0", - "d3-ease": "^1.0.6", - "debug": "^4.1.1", + "chalk": "4.0.0", + "chokidar": "3.4.0", + "d3-ease": "1.0.6", + "debug": "4.1.1", "devtools-protocol": "0.0.777489", - "find-root": "^1.1.0", - "import-fresh": "^3.2.1", - "inquirer": "^7.2.0", - "puppeteer": "^5.1.0", - "puppeteer-extensionbridge": "^1.0.0", - "puppeteer-interceptor": "^2.0.1", - "seedrandom": "^3.0.5", - "shift-parser": "^7.0.3", - "shift-printer": "^1.0.1", - "supports-color": "^7.1.0", - "yargs": "^15.3.1" + "find-root": "1.1.0", + "import-fresh": "3.2.1", + "inquirer": "7.2.0", + "puppeteer": "5.2.1", + "puppeteer-extensionbridge": "1.1.0", + "puppeteer-interceptor": "2.1.0", + "seedrandom": "3.0.5", + "shift-parser": "7.0.3", + "shift-printer": "1.0.1", + "supports-color": "7.1.0", + "yargs": "15.3.1" }, "devDependencies": { - "@jsoverson/test-server": "^1.2.0", - "@types/chai": "^4.2.11", - "@types/chokidar": "^2.1.3", - "@types/d3-ease": "^1.0.9", - "@types/debug": "^4.1.5", - "@types/find-root": "^1.1.1", - "@types/inquirer": "^6.5.0", - "@types/mocha": "^7.0.2", - "@types/node": "^13.13.2", - "@types/rimraf": "^3.0.0", - "@types/seedrandom": "^2.4.28", - "@types/serve-handler": "^6.1.0", - "@types/tween.js": "^18.5.1", - "@types/yargs": "^15.0.4", - "chai": "^4.2.0", - "copyfiles": "^2.3.0", - "mocha": "^7.1.1", - "mock-stdin": "^1.0.0", - "prettier": "^2.0.5", - "rimraf": "^3.0.2", - "ts-node": "^8.9.0", - "typescript": "^3.8.3" + "@jsoverson/test-server": "1.2.0", + "@types/chai": "4.2.11", + "@types/chokidar": "2.1.3", + "@types/d3-ease": "1.0.9", + "@types/debug": "4.1.5", + "@types/find-root": "1.1.1", + "@types/inquirer": "6.5.0", + "@types/mocha": "7.0.2", + "@types/node": "13.13.2", + "@types/rimraf": "3.0.0", + "@types/seedrandom": "2.4.28", + "@types/serve-handler": "6.1.0", + "@types/tween.js": "18.5.1", + "@types/yargs": "15.0.4", + "chai": "4.2.0", + "copyfiles": "2.3.0", + "mocha": "7.1.1", + "mock-stdin": "1.0.0", + "prettier": "2.0.5", + "rimraf": "3.0.2", + "ts-node": "8.9.0", + "typescript": "3.8.3" } } diff --git a/src/cli.ts b/src/cli.ts index 3eb6c86..b9f1085 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -1,6 +1,6 @@ import origFs from 'fs'; import path from 'path'; -import { Page } from 'puppeteer/lib/cjs/common/Page'; +import { Page } from 'puppeteer/lib/cjs/puppeteer/common/Page'; import repl from 'repl'; import { Readable, Writable } from 'stream'; import { promisify } from 'util'; diff --git a/src/cmds/init/templates/script.js b/src/cmds/init/templates/script.js index e204ecf..aa3497b 100644 --- a/src/cmds/init/templates/script.js +++ b/src/cmds/init/templates/script.js @@ -1,4 +1,4 @@ -const { Browser } = require('puppeteer/lib/cjs/common/Browser'); +const { Browser } = require('puppeteer/lib/cjs/puppeteer/common/Browser'); await page.goto('https://example.com'); diff --git a/src/hackium/hackium-browser-context.ts b/src/hackium/hackium-browser-context.ts index 86aeda1..3cc5948 100644 --- a/src/hackium/hackium-browser-context.ts +++ b/src/hackium/hackium-browser-context.ts @@ -1,5 +1,5 @@ -import { BrowserContext } from 'puppeteer/lib/cjs/common/Browser'; -import { Connection } from 'puppeteer/lib/cjs/common/Connection'; +import { BrowserContext } from 'puppeteer/lib/cjs/puppeteer/common/Browser'; +import { Connection } from 'puppeteer/lib/cjs/puppeteer/common/Connection'; import Logger from '../util/logger'; import { HackiumBrowser } from './hackium-browser'; import { HackiumPage } from './hackium-page'; diff --git a/src/hackium/hackium-browser.ts b/src/hackium/hackium-browser.ts index abd7da6..c92b32c 100644 --- a/src/hackium/hackium-browser.ts +++ b/src/hackium/hackium-browser.ts @@ -4,11 +4,11 @@ import Protocol from 'devtools-protocol'; import findRoot from 'find-root'; import path from 'path'; import { decorateBrowser, ExtensionBridge, NullExtensionBridge } from 'puppeteer-extensionbridge'; -import { Browser } from 'puppeteer/lib/cjs/common/Browser'; -import { Connection } from 'puppeteer/lib/cjs/common/Connection'; -import { Events } from 'puppeteer/lib/cjs/common/Events'; -import { Viewport } from 'puppeteer/lib/cjs/common/PuppeteerViewport'; -import { Target } from 'puppeteer/lib/cjs/common/Target'; +import { Browser } from 'puppeteer/lib/cjs/puppeteer/common/Browser'; +import { Connection } from 'puppeteer/lib/cjs/puppeteer/common/Connection'; +import { Events } from 'puppeteer/lib/cjs/puppeteer/common/Events'; +import { Viewport } from 'puppeteer/lib/cjs/puppeteer/common/PuppeteerViewport'; +import { Target } from 'puppeteer/lib/cjs/puppeteer/common/Target'; import Logger from '../util/logger'; import { HackiumBrowserContext } from './hackium-browser-context'; import { HackiumPage } from './hackium-page'; diff --git a/src/hackium/hackium-input.ts b/src/hackium/hackium-input.ts index ff4b883..1ec57e4 100644 --- a/src/hackium/hackium-input.ts +++ b/src/hackium/hackium-input.ts @@ -1,13 +1,13 @@ -import { Keyboard, Mouse, MouseButton, MouseWheelOptions } from 'puppeteer/lib/cjs/common/Input'; -import { ElementHandle } from 'puppeteer/lib/cjs/common/JSHandle'; -import { Viewport } from 'puppeteer/lib/cjs/common/PuppeteerViewport'; -import { keyDefinitions, KeyInput } from 'puppeteer/lib/cjs/common/USKeyboardLayout.js'; +import { Keyboard, Mouse, MouseButton, MouseWheelOptions } from 'puppeteer/lib/cjs/puppeteer/common/Input'; +import { ElementHandle } from 'puppeteer/lib/cjs/puppeteer/common/JSHandle'; +import { Viewport } from 'puppeteer/lib/cjs/puppeteer/common/PuppeteerViewport'; +import { keyDefinitions, KeyInput } from 'puppeteer/lib/cjs/puppeteer/common/USKeyboardLayout.js'; import Logger from '../util/logger'; import { SimulatedMovement, Vector } from '../util/movement'; import { waterfallMap } from '../util/promises'; import { Random } from '../util/random'; import { HackiumPage } from './hackium-page'; -import { CDPSession } from 'puppeteer/lib/cjs/common/Connection'; +import { CDPSession } from 'puppeteer/lib/cjs/puppeteer/common/Connection'; export interface Point { x: number; diff --git a/src/hackium/hackium-page.ts b/src/hackium/hackium-page.ts index 9789a6f..631ae7e 100644 --- a/src/hackium/hackium-page.ts +++ b/src/hackium/hackium-page.ts @@ -4,12 +4,12 @@ import findRoot from 'find-root'; import importFresh from 'import-fresh'; import path from 'path'; import { intercept, InterceptionHandler, Interceptor } from 'puppeteer-interceptor'; -import { CDPSession } from 'puppeteer/lib/cjs/common/Connection'; -import { HTTPResponse } from 'puppeteer/lib/cjs/common/HTTPResponse'; -import { PuppeteerLifeCycleEvent } from 'puppeteer/lib/cjs/common/LifecycleWatcher'; -import { Page } from 'puppeteer/lib/cjs/common/Page'; -import { Viewport } from 'puppeteer/lib/cjs/common/PuppeteerViewport'; -import { Target } from 'puppeteer/lib/cjs/common/Target'; +import { CDPSession } from 'puppeteer/lib/cjs/puppeteer/common/Connection'; +import { HTTPResponse } from 'puppeteer/lib/cjs/puppeteer/common/HTTPResponse'; +import { PuppeteerLifeCycleEvent } from 'puppeteer/lib/cjs/puppeteer/common/LifecycleWatcher'; +import { Page } from 'puppeteer/lib/cjs/puppeteer/common/Page'; +import { Viewport } from 'puppeteer/lib/cjs/puppeteer/common/PuppeteerViewport'; +import { Target } from 'puppeteer/lib/cjs/puppeteer/common/Target'; import { HackiumClientEvent } from '../events'; import { strings } from '../strings'; import { read, resolve, watch } from '../util/file'; @@ -19,7 +19,7 @@ import { renderTemplate } from '../util/template'; import { HackiumBrowser } from './hackium-browser'; import { HackiumBrowserContext } from './hackium-browser-context'; import { HackiumKeyboard, HackiumMouse } from './hackium-input'; -import { EvaluateFn, SerializableOrJSHandle } from 'puppeteer/lib/cjs/common/EvalTypes'; +import { EvaluateFn, SerializableOrJSHandle } from 'puppeteer/lib/cjs/puppeteer/common/EvalTypes'; interface WaitForOptions { timeout?: number; diff --git a/src/hackium/hackium-target.ts b/src/hackium/hackium-target.ts index 88e5343..71bb4a8 100644 --- a/src/hackium/hackium-target.ts +++ b/src/hackium/hackium-target.ts @@ -1,8 +1,8 @@ import Protocol from 'devtools-protocol'; -import { CDPSession } from 'puppeteer/lib/cjs/common/Connection'; -import { EventEmitter } from 'puppeteer/lib/cjs/common/EventEmitter'; -import { Viewport } from 'puppeteer/lib/cjs/common/PuppeteerViewport'; -import { Target } from 'puppeteer/lib/cjs/common/Target'; +import { CDPSession } from 'puppeteer/lib/cjs/puppeteer/common/Connection'; +import { EventEmitter } from 'puppeteer/lib/cjs/puppeteer/common/EventEmitter'; +import { Viewport } from 'puppeteer/lib/cjs/puppeteer/common/PuppeteerViewport'; +import { Target } from 'puppeteer/lib/cjs/puppeteer/common/Target'; import Logger from '../util/logger'; import { mixin } from '../util/mixin'; import { HackiumBrowserContext } from './hackium-browser-context'; diff --git a/src/hackium/hackium.ts b/src/hackium/hackium.ts index a712a78..3f8c1f2 100644 --- a/src/hackium/hackium.ts +++ b/src/hackium/hackium.ts @@ -4,10 +4,10 @@ import findRoot from 'find-root'; import { createRequire } from 'module'; import path from 'path'; import { mergeLaunchOptions } from 'puppeteer-extensionbridge'; -import { Browser } from 'puppeteer/lib/cjs/common/Browser'; -import { Connection } from 'puppeteer/lib/cjs/common/Connection'; -import { Viewport } from 'puppeteer/lib/cjs/common/PuppeteerViewport'; -import { LaunchOptions } from 'puppeteer/lib/cjs/node/LaunchOptions'; +import { Browser } from 'puppeteer/lib/cjs/puppeteer/common/Browser'; +import { Connection } from 'puppeteer/lib/cjs/puppeteer/common/Connection'; +import { Viewport } from 'puppeteer/lib/cjs/puppeteer/common/PuppeteerViewport'; +import { LaunchOptions } from 'puppeteer/lib/cjs/puppeteer/node/LaunchOptions'; import vm from 'vm'; import { Arguments, ArgumentsWithDefaults, defaultArguments } from '../arguments'; import puppeteer from '../puppeteer'; diff --git a/src/puppeteer.ts b/src/puppeteer.ts index ac0d423..197e581 100644 --- a/src/puppeteer.ts +++ b/src/puppeteer.ts @@ -1,5 +1,5 @@ -import { Puppeteer } from 'puppeteer/lib/cjs/common/Puppeteer'; -import { initializePuppeteer } from 'puppeteer/lib/cjs/initialize'; +import { Puppeteer } from 'puppeteer/lib/cjs/puppeteer/common/Puppeteer'; +import { initializePuppeteer } from 'puppeteer/lib/cjs/puppeteer/initialize'; const puppeteer = initializePuppeteer('puppeteer'); diff --git a/src/util/types.ts b/src/util/types.ts index f4188a0..0345418 100644 --- a/src/util/types.ts +++ b/src/util/types.ts @@ -1,7 +1,7 @@ import { Hackium } from '..'; import { Arguments, ArgumentsWithDefaults } from '../arguments'; import { HackiumBrowser } from '../hackium/hackium-browser'; -import { LaunchOptions, ChromeArgOptions, BrowserOptions } from 'puppeteer/lib/cjs/node/LaunchOptions'; +import { LaunchOptions, ChromeArgOptions, BrowserOptions } from 'puppeteer/lib/cjs/puppeteer/node/LaunchOptions'; export interface Constructor { new (...args: any): T;