Skip to content

Commit

Permalink
Update dependencies (except puppeteer: puppeteer/puppeteer#8882), cha…
Browse files Browse the repository at this point in the history
…nge puppeteer imports to `import type` to make sure we use TRCs puppeteer version for actual calls
  • Loading branch information
stevenwdv committed Sep 1, 2022
1 parent 8905263 commit be428e1
Show file tree
Hide file tree
Showing 9 changed files with 457 additions and 291 deletions.
2 changes: 1 addition & 1 deletion inject/package.json
Expand Up @@ -14,7 +14,7 @@
"devDependencies": {
"@types/query-selector-shadow-dom": "^1.0.0",
"ts-loader": "^9.3.1",
"typescript": "^4.7.4",
"typescript": "^4.8.2",
"webpack": "^5.74.0",
"webpack-cli": "^4.10.0"
}
Expand Down
713 changes: 439 additions & 274 deletions package-lock.json

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions package.json
Expand Up @@ -20,7 +20,7 @@
"inject"
],
"dependencies": {
"@puppeteer/replay": "^1.0.0",
"@puppeteer/replay": "^1.1.1",
"async": "^3.2.4",
"chalk": "^4.1.2",
"js-yaml": "^4.1.0",
Expand All @@ -29,7 +29,7 @@
"puppeteer": "^16.2.0",
"ramda": "^0.28.0",
"sanitize-filename": "^1.6.3",
"tldts": "^5.7.89",
"tldts": "^5.7.90",
"tracker-radar-collector": "github:stevenwdv/tracker-radar-collector#3250877e",
"value-searcher": "file:value-searcher",
"yargs": "^17.5.1"
Expand All @@ -38,21 +38,21 @@
"@types/async": "^3.2.15",
"@types/http-server": "^0.12.1",
"@types/js-yaml": "^4.0.5",
"@types/node": "^18.7.3",
"@types/node": "^18.7.14",
"@types/progress": "^2.0.5",
"@types/ramda": "^0.28.15",
"@types/tap": "^15.0.7",
"@types/yargs": "^17.0.11",
"@typescript-eslint/eslint-plugin": "^5.33.0",
"@typescript-eslint/parser": "^5.33.0",
"@types/yargs": "^17.0.12",
"@typescript-eslint/eslint-plugin": "^5.36.1",
"@typescript-eslint/parser": "^5.36.1",
"eslint": "^8.22.0",
"eslint-plugin-deprecation": "^1.3.2",
"eslint-plugin-eslint-comments": "^3.2.0",
"http-server": "^14.1.1",
"tap": "^16.3.0",
"ts-essentials": "^9.2.0",
"ts-essentials": "^9.3.0",
"ts-node": "^10.9.1",
"typescript": "^4.7.4",
"typescript": "^4.8.2",
"typescript-json-schema": "^0.54.0"
}
}
5 changes: 2 additions & 3 deletions src/FieldsCollector.ts
Expand Up @@ -4,7 +4,7 @@ import fsp from 'node:fs/promises';
import path from 'node:path';

import {createRunner, PuppeteerRunnerExtension, UserFlow} from '@puppeteer/replay';
import {BrowserContext, ElementHandle, Frame, Page} from 'puppeteer';
import type {BrowserContext, ElementHandle, Frame, Page} from 'puppeteer';
import {groupBy} from 'ramda';
import * as tldts from 'tldts';
import {BaseCollector, puppeteer, TargetCollector} from 'tracker-radar-collector';
Expand Down Expand Up @@ -40,8 +40,8 @@ import {
} from './pageUtils';
import {getLoginLinks} from './loginLinks';
import {exposeFunction, getFrameStack, getPageFromHandle, unwrapHandle} from './puppeteerUtils';
import TimeoutError = puppeteer.TimeoutError;
import ErrnoException = NodeJS.ErrnoException;
import TimeoutError = puppeteer.TimeoutError;

export class FieldsCollector extends BaseCollector {
/** Page function to inject leak-detect-inject */
Expand Down Expand Up @@ -649,7 +649,6 @@ export class FieldsCollector extends BaseCollector {
for (const field of fields.filter(f => !f.attrs.filled)) {
this.#events.push(new FillEvent(field.attrs.selectorChain));
this.#setDirty(field.handle.executionContext().frame()!.page());
await this.#injectPasswordLeakDetection(field.handle.executionContext().frame()!);
try {
switch (field.attrs.fieldType) {
case 'email':
Expand Down
2 changes: 1 addition & 1 deletion src/formInteraction.ts
@@ -1,6 +1,6 @@
import {setTimeout} from 'node:timers/promises';

import {ElementHandle} from 'puppeteer';
import type {ElementHandle} from 'puppeteer';

import {getPageFromHandle} from './puppeteerUtils';

Expand Down
3 changes: 2 additions & 1 deletion src/loginLinks.ts
@@ -1,4 +1,5 @@
import {ElementHandle, Frame} from 'puppeteer';
import type {ElementHandle, Frame} from 'puppeteer';

import {filterUniqBy} from './utils';
import {ElementInfo, getElementAttrs, LinkElementAttrs, LinkMatchType, selectorStr} from './pageUtils';
import {unwrapHandle} from './puppeteerUtils';
Expand Down
2 changes: 1 addition & 1 deletion src/pageUtils.ts
@@ -1,5 +1,5 @@
import {SelectorChain} from 'leak-detect-inject';
import {BoundingBox, BrowserContext, ElementHandle, Frame, Page} from 'puppeteer';
import type {BoundingBox, BrowserContext, ElementHandle, Frame, Page} from 'puppeteer';

import {stripHash} from './utils';
import {PageVars} from './FieldsCollector';
Expand Down
3 changes: 2 additions & 1 deletion src/puppeteerUtils.ts
@@ -1,5 +1,6 @@
import {ElementHandle, Frame, JSHandle, Page} from 'puppeteer';
import type {ElementHandle, Frame, JSHandle, Page} from 'puppeteer';
import {IsTuple} from 'ts-essentials';

import TypedArray = NodeJS.TypedArray;

export function getPageFromHandle(handle: JSHandle): Page | null {
Expand Down
2 changes: 1 addition & 1 deletion value-searcher

0 comments on commit be428e1

Please sign in to comment.