refactor: bundle puppeteer-core

Author: Piotr Paulski

rollup.config.mjs

@@ -29,11 +29,14 @@ import license from 'rollup-plugin-license';
 
 const isProduction = process.env.NODE_ENV === 'production';
 
-/** @type {import('rollup').RollupOptions} */
-const sdk = {
-  input: './build/src/third_party/modelcontextprotocol-sdk/index.js',
+const allowed_licenses = ['MIT', 'Apache 2.0', 'Apache-2.0', 'BSD-3-Clause', 'BSD-2-Clause', 'ISC', '0BSD'];
+
+/** @returns {import('rollup').RollupOptions} */
+const bundleDependency = (wrapperIndexPath, extraOutputOptions = {}) => ({
+  input: wrapperIndexPath,
   output: {
-    file: './build/src/third_party/modelcontextprotocol-sdk/index.js',
+    ...extraOutputOptions,
+    file: wrapperIndexPath,
     sourcemap: !isProduction,
     format: 'esm',
   },
@@ -48,7 +51,6 @@ const sdk = {
       thirdParty: {
         allow: {
           test: dependency => {
-            let allowed_licenses = ['MIT', 'Apache 2.0', 'BSD-2-Clause', 'ISC'];
             return allowed_licenses.includes(dependency.license);
           },
           failOnUnlicensed: true,
@@ -90,6 +92,9 @@ const sdk = {
     json(),
     nodeResolve(),
   ],
-};
+});
 
-export default [sdk];
+export default [
+  bundleDependency('./build/src/third_party/modelcontextprotocol-sdk/index.js'),
+  bundleDependency('./build/src/third_party/puppeteer-core/index.js', {inlineDynamicImports: true}),
+];

src/McpContext.ts

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

src/McpResponse.ts

@@ -3,8 +3,6 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import type {ConsoleMessage, ResourceType} from 'puppeteer-core';
-
 import {formatConsoleEvent} from './formatters/consoleFormatter.js';
 import {
   getFormattedHeaderValue,
@@ -19,6 +17,7 @@ import type {
   ImageContent,
   TextContent,
 } from './third_party/modelcontextprotocol-sdk/index.js';
+import type {ConsoleMessage, ResourceType} from './third_party/puppeteer-core';
 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 'puppeteer-core';
+} from './third_party/puppeteer-core';
 
 export type ListenerMap<EventMap extends PageEvents = PageEvents> = {
   [K in keyof EventMap]?: (event: EventMap[K]) => void;

src/WaitForHelper.ts

@@ -3,10 +3,9 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import type {Page, Protocol} from 'puppeteer-core';
-import type {CdpPage} from 'puppeteer-core/internal/cdp/Page.js';
-
 import {logger} from './logger.js';
+import type {Page, Protocol} from './third_party/puppeteer-core';
+import type {CdpPage} from './third_party/puppeteer-core';
 
 export class WaitForHelper {
   #abortController = new AbortController();

src/browser.ts

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

src/formatters/networkFormatter.ts

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

src/third_party/puppeteer-core/index.ts

@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export type {
+  Browser,
+  ChromeReleaseChannel,
+  ConsoleMessage,
+  ConsoleMessageType,
+  Dialog,
+  ElementHandle,
+  Frame,
+  Handler,
+  HTTPRequest,
+  HTTPResponse,
+  JSHandle,
+  LaunchOptions,
+  Page,
+  PageEvents,
+  Protocol,
+  ProtocolError,
+  ResourceType,
+  SerializedAXNode,
+  Target,
+} from 'puppeteer-core';
+export type {CdpPage} from 'puppeteer-core/internal/cdp/Page.js';
+export {Locator,PredefinedNetworkConditions} from 'puppeteer-core';
+export {default as puppeteer} from 'puppeteer-core';

src/tools/ToolDefinition.ts

@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {Dialog, ElementHandle, Page} from 'puppeteer-core';
 import z from 'zod';
 
 import type {TextSnapshotNode} from '../McpContext.js';
+import type {Dialog, ElementHandle, Page} from '../third_party/puppeteer-core/index.js';
 import type {TraceResult} from '../trace-processing/parse.js';
 import type {PaginationOptions} from '../utils/types.js';
 

src/tools/console.ts

@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {ConsoleMessageType} from 'puppeteer-core';
 import z from 'zod';
 
+import type {ConsoleMessageType} from '../third_party/puppeteer-core/index.js';
+
 import {ToolCategories} from './categories.js';
 import {defineTool} from './ToolDefinition.js';