refactor: bundle all dependencies together

package.json

@@ -37,11 +37,6 @@
   },
   "homepage": "https://github.com/ChromeDevTools/chrome-devtools-mcp#readme",
   "mcpName": "io.github.ChromeDevTools/chrome-devtools-mcp",
-  "dependencies": {
-    "core-js": "3.46.0",
-    "debug": "4.4.3",
-    "yargs": "18.0.0"
-  },
   "devDependencies": {
     "@eslint/js": "^9.35.0",
     "@modelcontextprotocol/sdk": "1.20.1",
@@ -57,6 +52,8 @@
     "@typescript-eslint/eslint-plugin": "^8.43.0",
     "@typescript-eslint/parser": "^8.43.0",
     "chrome-devtools-frontend": "1.0.1524741",
+    "core-js": "3.46.0",
+    "debug": "4.4.3",
     "eslint": "^9.35.0",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-import": "^2.32.0",
@@ -68,7 +65,8 @@
     "rollup-plugin-license": "^3.6.0",
     "sinon": "^21.0.0",
     "typescript": "^5.9.2",
-    "typescript-eslint": "^8.43.0"
+    "typescript-eslint": "^8.43.0",
+    "yargs": "18.0.0"
   },
   "engines": {
     "node": "^20.19.0 || ^22.12.0 || >=23"

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,26 @@ const bundleDependency = (
 });
 
 export default [
-  bundleDependency('./build/src/third_party/modelcontextprotocol-sdk/index.js'),
   bundleDependency(
-    './build/src/third_party/puppeteer-core/index.js',
+    './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

@@ -7,21 +7,20 @@ import fs from 'node:fs/promises';
 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 {Locator} from './third_party/puppeteer-core/index.js';
+import {Locator} from './third_party/index.js';
 import type {
   Browser,
   ConsoleMessage,
+  Debugger,
   Dialog,
   ElementHandle,
   HTTPRequest,
   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

@@ -17,14 +17,12 @@ import {
 } from './formatters/networkFormatter.js';
 import {formatA11ySnapshot} from './formatters/snapshotFormatter.js';
 import type {McpContext} from './McpContext.js';
-import type {
-  ImageContent,
-  TextContent,
-} from './third_party/modelcontextprotocol-sdk/index.js';
 import type {
   ConsoleMessage,
+  ImageContent,
   ResourceType,
-} from './third_party/puppeteer-core/index.js';
+  TextContent,
+} 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

@@ -3,10 +3,8 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import type {CdpPage} from 'puppeteer-core/internal/cdp/Page.js';
-
 import {logger} from './logger.js';
-import type {Page, Protocol} 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/cli.ts

@@ -4,9 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {Options as YargsOptions} from 'yargs';
-import yargs from 'yargs';
-import {hideBin} from 'yargs/helpers';
+import type {YargsOptions} from './third_party/index.js';
+import {yargs, hideBin} from './third_party/index.js';
 
 export const cliOptions = {
   browserUrl: {

src/formatters/networkFormatter.ts

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

src/logger.ts

@@ -5,7 +5,7 @@
  */
 import fs from 'node:fs';
 
-import debug from 'debug';
+import {debug} from './third_party/index.js';
 
 const mcpDebugNamespace = 'mcp:log';
 

src/main.ts

@@ -18,7 +18,7 @@ import {
   StdioServerTransport,
   type CallToolResult,
   SetLevelRequestSchema,
-} from './third_party/modelcontextprotocol-sdk/index.js';
+} from './third_party/index.js';
 import * as consoleTools from './tools/console.js';
 import * as emulationTools from './tools/emulation.js';
 import * as inputTools from './tools/input.js';

src/polyfill.ts

@@ -4,5 +4,5 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import 'core-js/modules/es.promise.with-resolvers.js';
-import 'core-js/proposals/iterator-helpers.js';
+// polyfills are now bundled with all other dependencies
+import './third_party/index.js';

src/third_party/index.ts

@@ -0,0 +1,26 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import 'core-js/modules/es.promise.with-resolvers.js';
+import 'core-js/proposals/iterator-helpers.js';
+
+export type {Options as YargsOptions} from 'yargs';
+export {default as yargs} from 'yargs';
+export {hideBin} from 'yargs/helpers';
+export {debug} from 'debug';
+export type {Debugger} from 'debug';
+export {McpServer} from '@modelcontextprotocol/sdk/server/mcp.js';
+export {StdioServerTransport} from '@modelcontextprotocol/sdk/server/stdio.js';
+export {
+  type CallToolResult,
+  SetLevelRequestSchema,
+  type ImageContent,
+  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';