updated puppeteer, fixed types again

package.json

@@ -53,45 +53,45 @@
   "author": "Jarrod Overson <[email protected]>",
   "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"
   }
 }

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';

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');
 

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';

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';

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;

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;

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';

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';

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');
 

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<T> {
   new (...args: any): T;