fix

Author: OrKoN

package.json

@@ -19,11 +19,7 @@
     "test:node20": "node --import ./build/tests/setup.js --test-reporter spec --test-force-exit --test build/tests",
     "test:no-build": "node --import ./build/tests/setup.js --no-warnings=ExperimentalWarning --experimental-print-required-tla --test-reporter spec --test-force-exit --test \"build/tests/**/*.test.js\"",
     "test": "npm run build && npm run test:no-build",
-<<<<<<< HEAD
-    "test:only": "npm run build && node --import ./build/tests/setup.js --no-warnings=ExperimentalWarning --test-reporter spec --test-force-exit --test --test-only \"build/tests/**/*.test.js\"",
-=======
     "test:only": "npm run build && npm run test:only:no-build",
->>>>>>> 8e5e779 (build: bundle devtools frontend (#656))
     "test:only:no-build": "node --import ./build/tests/setup.js --no-warnings=ExperimentalWarning --test-reporter spec --test-force-exit --test --test-only \"build/tests/**/*.test.js\"",
     "test:update-snapshots": "npm run build && node --import ./build/tests/setup.js --no-warnings=ExperimentalWarning --test-force-exit --test --test-update-snapshots \"build/tests/**/*.test.js\"",
     "prepare": "node --experimental-strip-types scripts/prepare.ts",

src/DevToolsConnectionAdapter.ts

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-<<<<<<< HEAD
-import type {CDPConnection as devtools} from './third_party/index.js';
-=======
->>>>>>> 8e5e779 (build: bundle devtools frontend (#656))
 import type * as puppeteer from './third_party/index.js';
 import type {DevTools} from './third_party/index.js';
 import {CDPSessionEvent} from './third_party/index.js';

src/DevtoolsUtils.ts

@@ -8,24 +8,7 @@ import {PuppeteerDevToolsConnection} from './DevToolsConnectionAdapter.js';
 import {ISSUE_UTILS} from './issue-descriptions.js';
 import {logger} from './logger.js';
 import {Mutex} from './Mutex.js';
-<<<<<<< HEAD
-import {
-  type Issue,
-  type AggregatedIssue,
-  type IssuesManagerEventTypes,
-  type SDKTarget as Target,
-  DebuggerModel,
-  Foundation,
-  TargetManager,
-  MarkdownIssueDescription,
-  Marked,
-  ProtocolClient,
-  Common,
-  I18n,
-} from './third_party/index.js';
-=======
 import {DevTools} from './third_party/index.js';
->>>>>>> 8e5e779 (build: bundle devtools frontend (#656))
 import type {
   Browser,
   Page,

src/McpContext.ts

@@ -11,7 +11,6 @@ import path from 'node:path';
 import {extractUrlLikeFromDevToolsTitle, urlsEqual} from './DevtoolsUtils.js';
 import type {ListenerMap} from './PageCollector.js';
 import {NetworkCollector, ConsoleCollector} from './PageCollector.js';
-import {type AggregatedIssue} from './third_party/index.js';
 import {Locator} from './third_party/index.js';
 import type {DevTools} from './third_party/index.js';
 import type {

src/McpResponse.ts

@@ -19,11 +19,7 @@ import {
 } from './formatters/networkFormatter.js';
 import {formatSnapshotNode} from './formatters/snapshotFormatter.js';
 import type {McpContext} from './McpContext.js';
-<<<<<<< HEAD
-import {AggregatedIssue} from './third_party/index.js';
-=======
 import {DevTools} from './third_party/index.js';
->>>>>>> 8e5e779 (build: bundle devtools frontend (#656))
 import type {
   ConsoleMessage,
   ImageContent,

src/PageCollector.ts

@@ -7,18 +7,10 @@
 import {FakeIssuesManager} from './DevtoolsUtils.js';
 import {logger} from './logger.js';
 import type {
+  Target,
   CDPSession,
   ConsoleMessage,
   Protocol,
-  Target,
-  Common,
-} from './third_party/index.js';
-import {
-  type AggregatedIssue,
-  IssueAggregatorEvents,
-  IssuesManagerEvents,
-  createIssuesFromProtocolIssue,
-  IssueAggregator,
 } from './third_party/index.js';
 import {DevTools} from './third_party/index.js';
 import {

src/formatters/consoleFormatter.ts

@@ -5,11 +5,7 @@
  */
 
 import type {McpContext} from '../McpContext.js';
-<<<<<<< HEAD
-import {type AggregatedIssue} from '../third_party/index.js';
-=======
 import type {DevTools} from '../third_party/index.js';
->>>>>>> 8e5e779 (build: bundle devtools frontend (#656))
 
 export interface ConsoleMessageData {
   consoleMessageStableId: number;

src/third_party/index.ts

@@ -36,30 +36,4 @@ export {
   type ChromeReleaseChannel as BrowsersChromeReleaseChannel,
 } from '@puppeteer/browsers';
 
-<<<<<<< HEAD
-export {
-  AgentFocus,
-  TraceEngine,
-  PerformanceTraceFormatter,
-  PerformanceInsightFormatter,
-  AggregatedIssue,
-  type Issue,
-  type IssuesManagerEventTypes,
-  type Target as SDKTarget,
-  type CDPConnection,
-  DebuggerModel,
-  Foundation,
-  TargetManager,
-  MarkdownIssueDescription,
-  Marked,
-  ProtocolClient,
-  Common,
-  I18n,
-  IssueAggregatorEvents,
-  IssuesManagerEvents,
-  createIssuesFromProtocolIssue,
-  IssueAggregator,
-} from '../../node_modules/chrome-devtools-frontend/mcp/mcp.js';
-=======
 export * as DevTools from './devtools.js';
->>>>>>> 8e5e779 (build: bundle devtools frontend (#656))

src/trace-processing/parse.ts

@@ -5,16 +5,7 @@
  */
 
 import {logger} from '../logger.js';
-<<<<<<< HEAD
-import {
-  AgentFocus,
-  TraceEngine,
-  PerformanceTraceFormatter,
-  PerformanceInsightFormatter,
-} from '../third_party/index.js';
-=======
 import {DevTools} from '../third_party/index.js';
->>>>>>> 8e5e779 (build: bundle devtools frontend (#656))
 
 const engine = DevTools.TraceEngine.TraceModel.Model.createWithAllHandlers();
 

tests/DevtoolsUtils.test.ts

@@ -16,11 +16,7 @@ import {
   UniverseManager,
 } from '../src/DevtoolsUtils.js';
 import {ISSUE_UTILS} from '../src/issue-descriptions.js';
-<<<<<<< HEAD
-import {AggregatedIssue, DebuggerModel} from '../src/third_party/index.js';
-=======
 import {DevTools} from '../src/third_party/index.js';
->>>>>>> 8e5e779 (build: bundle devtools frontend (#656))
 import type {Browser, Target} from '../src/third_party/index.js';
 
 import {