Move puppeteer-core into the main bundle.

Author: Piotr Paulski

rollup.config.mjs

@@ -42,7 +42,7 @@ const allowedLicenses = [
 /**
  * @param {string} wrapperIndexPath
  * @param {import('rollup').OutputOptions} [extraOutputOptions={}]
- * @param {string[]} [external=[]]
+ * @param {import('rollup').ExternalOption} [external=[]]
  * @returns {import('rollup').RollupOptions}
  */
 const bundleDependency = (
@@ -110,12 +110,21 @@ const bundleDependency = (
 });
 
 export default [
-  bundleDependency('./build/src/third_party/index.js'),
-  bundleDependency(
-    './build/src/third_party/puppeteer-core/index.js',
+  bundleDependency('./build/src/third_party/index.js',
     {
       inlineDynamicImports: true,
     },
-    ['./bidi.js', '../bidi/bidi.js'],
+    (source, importer, _isResolved) => {
+      if (source === 'yargs' && importer && importer.includes('puppeteer-core')) {
+        return true;
+      }
+
+      const existingExternals = ['./bidi.js', '../bidi/bidi.js'];
+      if (existingExternals.includes(source)) {
+        return true;
+      }
+      
+      return false;
+    },
   ),
 ];

src/DevToolsConnectionAdapter.ts

@@ -6,7 +6,7 @@
 
 import {Connection} from '../node_modules/chrome-devtools-frontend/front_end/core/protocol_client/InspectorBackend.js';
 
-import {type ConnectionTransport} from './third_party/puppeteer-core/index.js';
+import {type ConnectionTransport} from './third_party/index.js';
 
 /**
  * Allows a puppeteer {@link ConnectionTransport} to act like a DevTools {@link Connection}.

src/McpContext.ts

@@ -10,7 +10,7 @@ import path from 'node:path';
 import type {ListenerMap} from './PageCollector.js';
 import {NetworkCollector, PageCollector} from './PageCollector.js';
 import type {Debugger} from './third_party/index.js';
-import {Locator} from './third_party/puppeteer-core/index.js';
+import {Locator} from './third_party/index.js';
 import type {
   Browser,
   ConsoleMessage,
@@ -20,7 +20,7 @@ import type {
   Page,
   SerializedAXNode,
   PredefinedNetworkConditions,
-} from './third_party/puppeteer-core/index.js';
+} from './third_party/index.js';
 import {listPages} from './tools/pages.js';
 import {takeSnapshot} from './tools/snapshot.js';
 import {CLOSE_PAGE_ERROR} from './tools/ToolDefinition.js';

src/McpResponse.ts

@@ -24,7 +24,7 @@ import type {
 import type {
   ConsoleMessage,
   ResourceType,
-} from './third_party/puppeteer-core/index.js';
+} from './third_party/index.js';
 import {handleDialog} from './tools/pages.js';
 import type {ImageContentData, Response} from './tools/ToolDefinition.js';
 import {paginate} from './utils/pagination.js';

src/PageCollector.ts

@@ -11,7 +11,7 @@ import {
   type HTTPRequest,
   type Page,
   type PageEvents,
-} from './third_party/puppeteer-core/index.js';
+} from './third_party/index.js';
 
 export type ListenerMap<EventMap extends PageEvents = PageEvents> = {
   [K in keyof EventMap]?: (event: EventMap[K]) => void;

src/WaitForHelper.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import {logger} from './logger.js';
-import type {Page, Protocol, CdpPage} from './third_party/puppeteer-core/index.js';
+import type {Page, Protocol, CdpPage} from './third_party/index.js';
 
 export class WaitForHelper {
   #abortController = new AbortController();

src/browser.ts

@@ -13,8 +13,8 @@ import type {
   ChromeReleaseChannel,
   LaunchOptions,
   Target,
-} from './third_party/puppeteer-core/index.js';
-import {puppeteer} from './third_party/puppeteer-core/index.js';
+} from './third_party/index.js';
+import {puppeteer} from './third_party/index.js';
 
 let browser: Browser | undefined;
 

src/formatters/networkFormatter.ts

@@ -9,7 +9,7 @@ import {isUtf8} from 'node:buffer';
 import type {
   HTTPRequest,
   HTTPResponse,
-} from '../third_party/puppeteer-core/index.js';
+} from '../third_party/index.js';
 
 const BODY_CONTEXT_SIZE_LIMIT = 10000;
 

src/third_party/index.ts

@@ -20,3 +20,7 @@ export {
   type TextContent,
 } from '@modelcontextprotocol/sdk/types.js';
 export {z as zod} from 'zod';
+export {Locator, PredefinedNetworkConditions} from 'puppeteer-core';
+export {default as puppeteer} from 'puppeteer-core';
+export type * from 'puppeteer-core';
+export type {CdpPage} from 'puppeteer-core/internal/cdp/Page.js';