diff --git a/packages/content-handler/package.json b/packages/content-handler/package.json index bc6269811..832b2b4b4 100644 --- a/packages/content-handler/package.json +++ b/packages/content-handler/package.json @@ -36,7 +36,6 @@ "linkedom": "^0.14.16", "lodash": "^4.17.21", "luxon": "^3.0.4", - "puppeteer-core": "^20.9.0", "underscore": "^1.13.6", "uuid": "^9.0.0" }, diff --git a/packages/content-handler/src/content-handler.ts b/packages/content-handler/src/content-handler.ts index 9fef1ffe8..9c935b5fb 100644 --- a/packages/content-handler/src/content-handler.ts +++ b/packages/content-handler/src/content-handler.ts @@ -1,7 +1,6 @@ import addressparser from 'addressparser' import axios from 'axios' import { parseHTML } from 'linkedom' -import { Browser } from 'puppeteer-core' import { v4 as uuid } from 'uuid' interface Unsubscribe { @@ -61,7 +60,7 @@ export abstract class ContentHandler { return false } - async preHandle(url: string, browser?: Browser): Promise { + async preHandle(url: string): Promise { return Promise.resolve({ url }) } diff --git a/packages/content-handler/src/index.ts b/packages/content-handler/src/index.ts index 3dbe4c9d6..cf5ccf2ba 100644 --- a/packages/content-handler/src/index.ts +++ b/packages/content-handler/src/index.ts @@ -1,5 +1,4 @@ import { parseHTML } from 'linkedom' -import { Browser } from 'puppeteer-core' import { ContentHandler, NewsletterInput, @@ -104,8 +103,7 @@ const newsletterHandlers: ContentHandler[] = [ ] export const preHandleContent = async ( - url: string, - browser: Browser + url: string ): Promise => { // Before we run the regular handlers we check to see if we need tp // pre-resolve the URL. TODO: This should probably happen recursively, @@ -129,7 +127,7 @@ export const preHandleContent = async ( for (const handler of contentHandlers) { if (handler.shouldPreHandle(url)) { console.log('preHandleContent', handler.name, url) - return handler.preHandle(url, browser) + return handler.preHandle(url) } } return undefined diff --git a/packages/puppeteer-parse/src/index.ts b/packages/puppeteer-parse/src/index.ts index e8ea5e7d1..c742116b2 100644 --- a/packages/puppeteer-parse/src/index.ts +++ b/packages/puppeteer-parse/src/index.ts @@ -163,8 +163,7 @@ export const fetchContent = async ( // pre handle url with custom handlers try { - const browser = await getBrowserPromise - const result = await preHandleContent(url, browser) + const result = await preHandleContent(url) if (result && result.url) { validateUrlString(url) url = result.url