diff --git a/package-lock.json b/package-lock.json index 0c4d97edad..a94cedd724 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1507,6 +1507,10 @@ "resolved": "packages/playwright-test", "link": true }, + "node_modules/@playwright/trace": { + "resolved": "packages/trace", + "link": true + }, "node_modules/@rollup/rollup-android-arm-eabi": { "version": "4.22.4", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz", @@ -7963,6 +7967,9 @@ "yaml": "^2.6.0" } }, + "packages/trace": { + "name": "@playwright/trace" + }, "packages/trace-viewer": { "version": "0.0.0" }, diff --git a/packages/playwright-core/src/server/dispatchers/localUtilsDispatcher.ts b/packages/playwright-core/src/server/dispatchers/localUtilsDispatcher.ts index b6f8fe80ac..9fee70b10d 100644 --- a/packages/playwright-core/src/server/dispatchers/localUtilsDispatcher.ts +++ b/packages/playwright-core/src/server/dispatchers/localUtilsDispatcher.ts @@ -25,7 +25,7 @@ import type { RootDispatcher } from './dispatcher'; import { Dispatcher } from './dispatcher'; import { yazl, yauzl } from '../../zipBundle'; import { ZipFile } from '../../utils/zipFile'; -import type * as har from '@trace/har'; +import type * as har from '@playwright/trace/src/har'; import type { HeadersArray } from '../types'; import { JsonPipeDispatcher } from '../dispatchers/jsonPipeDispatcher'; import { WebSocketTransport } from '../transport'; diff --git a/packages/playwright-core/src/server/fetch.ts b/packages/playwright-core/src/server/fetch.ts index f231c907c0..afa4cca37f 100644 --- a/packages/playwright-core/src/server/fetch.ts +++ b/packages/playwright-core/src/server/fetch.ts @@ -39,7 +39,7 @@ import { Tracing } from './trace/recorder/tracing'; import type * as types from './types'; import type { HeadersArray, ProxySettings } from './types'; import { getMatchingTLSOptionsForOrigin, rewriteOpenSSLErrorIfNeeded } from './socksClientCertificatesInterceptor'; -import type * as har from '@trace/har'; +import type * as har from '@playwright/trace/src/har'; import { TLSSocket } from 'tls'; type FetchRequestOptions = { diff --git a/packages/playwright-core/src/server/har/harRecorder.ts b/packages/playwright-core/src/server/har/harRecorder.ts index e623587e57..b57f953486 100644 --- a/packages/playwright-core/src/server/har/harRecorder.ts +++ b/packages/playwright-core/src/server/har/harRecorder.ts @@ -18,7 +18,7 @@ import fs from 'fs'; import path from 'path'; import { Artifact } from '../artifact'; import type { BrowserContext } from '../browserContext'; -import type * as har from '@trace/har'; +import type * as har from '@playwright/trace/src/har'; import { HarTracer } from './harTracer'; import type { HarTracerDelegate } from './harTracer'; import type * as channels from '@protocol/channels'; diff --git a/packages/playwright-core/src/server/har/harTracer.ts b/packages/playwright-core/src/server/har/harTracer.ts index ba0e8b46c2..d72e9f91a7 100644 --- a/packages/playwright-core/src/server/har/harTracer.ts +++ b/packages/playwright-core/src/server/har/harTracer.ts @@ -21,7 +21,7 @@ import { helper } from '../helper'; import * as network from '../network'; import type { Worker } from '../page'; import type { Page } from '../page'; -import type * as har from '@trace/har'; +import type * as har from '@playwright/trace/src/har'; import { assert, calculateSha1, monotonicTime } from '../../utils'; import type { RegisteredListener } from '../../utils/eventsHelper'; import { eventsHelper } from '../../utils/eventsHelper'; diff --git a/packages/playwright-core/src/server/trace/recorder/snapshotter.ts b/packages/playwright-core/src/server/trace/recorder/snapshotter.ts index 115cd3dd94..3b21186949 100644 --- a/packages/playwright-core/src/server/trace/recorder/snapshotter.ts +++ b/packages/playwright-core/src/server/trace/recorder/snapshotter.ts @@ -23,7 +23,7 @@ import type { Frame } from '../../frames'; import type { SnapshotData } from './snapshotterInjected'; import { frameSnapshotStreamer } from './snapshotterInjected'; import { calculateSha1, createGuid, monotonicTime } from '../../../utils'; -import type { FrameSnapshot } from '@trace/snapshot'; +import type { FrameSnapshot } from '@playwright/trace/src/snapshot'; import { mime } from '../../../utilsBundle'; export type SnapshotterBlob = { diff --git a/packages/playwright-core/src/server/trace/recorder/snapshotterInjected.ts b/packages/playwright-core/src/server/trace/recorder/snapshotterInjected.ts index 4730c3e5dd..0f72a0a89f 100644 --- a/packages/playwright-core/src/server/trace/recorder/snapshotterInjected.ts +++ b/packages/playwright-core/src/server/trace/recorder/snapshotterInjected.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import type { NodeSnapshot } from '@trace/snapshot'; +import type { NodeSnapshot } from '@playwright/trace/src/snapshot'; export type SnapshotData = { doctype?: string, diff --git a/packages/playwright-core/src/server/trace/recorder/tracing.ts b/packages/playwright-core/src/server/trace/recorder/tracing.ts index c19c0a33d9..dc7401e49c 100644 --- a/packages/playwright-core/src/server/trace/recorder/tracing.ts +++ b/packages/playwright-core/src/server/trace/recorder/tracing.ts @@ -27,11 +27,11 @@ import type { APIRequestContext } from '../../fetch'; import type { CallMetadata, InstrumentationListener } from '../../instrumentation'; import { SdkObject } from '../../instrumentation'; import { Page } from '../../page'; -import type * as har from '@trace/har'; +import type * as har from '@playwright/trace/src/har'; import type { HarTracerDelegate } from '../../har/harTracer'; import { HarTracer } from '../../har/harTracer'; -import type { FrameSnapshot } from '@trace/snapshot'; -import type * as trace from '@trace/trace'; +import type { FrameSnapshot } from '@playwright/trace/src/snapshot'; +import type * as trace from '@playwright/trace/src/trace'; import type { SnapshotterBlob, SnapshotterDelegate } from './snapshotter'; import { Snapshotter } from './snapshotter'; import type { ConsoleMessage } from '../../console'; diff --git a/packages/playwright-core/src/server/trace/test/inMemorySnapshotter.ts b/packages/playwright-core/src/server/trace/test/inMemorySnapshotter.ts index 8de07c2aad..d44276cda2 100644 --- a/packages/playwright-core/src/server/trace/test/inMemorySnapshotter.ts +++ b/packages/playwright-core/src/server/trace/test/inMemorySnapshotter.ts @@ -16,14 +16,14 @@ import type { BrowserContext } from '../../browserContext'; import type { Page } from '../../page'; -import type { FrameSnapshot } from '@trace/snapshot'; +import type { FrameSnapshot } from '@playwright/trace/src/snapshot'; import type { SnapshotRenderer } from '../../../../../trace-viewer/src/sw/snapshotRenderer'; import { SnapshotStorage } from '../../../../../trace-viewer/src/sw/snapshotStorage'; import type { SnapshotterBlob, SnapshotterDelegate } from '../recorder/snapshotter'; import { Snapshotter } from '../recorder/snapshotter'; import type { HarTracerDelegate } from '../../har/harTracer'; import { HarTracer } from '../../har/harTracer'; -import type * as har from '@trace/har'; +import type * as har from '@playwright/trace/src/har'; import { ManualPromise } from '../../../utils'; export class InMemorySnapshotter implements SnapshotterDelegate, HarTracerDelegate { diff --git a/packages/playwright/src/worker/testTracing.ts b/packages/playwright/src/worker/testTracing.ts index eb0ce9d807..f209fa70d8 100644 --- a/packages/playwright/src/worker/testTracing.ts +++ b/packages/playwright/src/worker/testTracing.ts @@ -15,7 +15,7 @@ */ import type { SerializedError, StackFrame } from '@protocol/channels'; -import type * as trace from '@trace/trace'; +import type * as trace from '@playwright/trace/src/trace'; import type EventEmitter from 'events'; import fs from 'fs'; import path from 'path'; diff --git a/packages/trace-viewer/src/DEPS.list b/packages/trace-viewer/src/DEPS.list index 3d486b5452..80615458f9 100644 --- a/packages/trace-viewer/src/DEPS.list +++ b/packages/trace-viewer/src/DEPS.list @@ -1,6 +1,5 @@ [*] @isomorphic/** -@trace/** @web/** ui/ diff --git a/packages/trace-viewer/src/sw/snapshotRenderer.ts b/packages/trace-viewer/src/sw/snapshotRenderer.ts index 41c23ffa9c..088d1d3f3b 100644 --- a/packages/trace-viewer/src/sw/snapshotRenderer.ts +++ b/packages/trace-viewer/src/sw/snapshotRenderer.ts @@ -15,7 +15,7 @@ */ import { escapeHTMLAttribute, escapeHTML } from '@isomorphic/stringUtils'; -import type { FrameSnapshot, NodeNameAttributesChildNodesSnapshot, NodeSnapshot, RenderedFrameSnapshot, ResourceSnapshot, SubtreeReferenceSnapshot } from '@trace/snapshot'; +import type { FrameSnapshot, NodeNameAttributesChildNodesSnapshot, NodeSnapshot, RenderedFrameSnapshot, ResourceSnapshot, SubtreeReferenceSnapshot } from '@playwright/trace/src/snapshot'; import type { PageEntry } from '../types/entries'; import type { LRUCache } from './lruCache'; diff --git a/packages/trace-viewer/src/sw/snapshotServer.ts b/packages/trace-viewer/src/sw/snapshotServer.ts index e1978c79b6..ba71bddea2 100644 --- a/packages/trace-viewer/src/sw/snapshotServer.ts +++ b/packages/trace-viewer/src/sw/snapshotServer.ts @@ -17,7 +17,7 @@ import type { URLSearchParams } from 'url'; import type { SnapshotRenderer } from './snapshotRenderer'; import type { SnapshotStorage } from './snapshotStorage'; -import type { ResourceSnapshot } from '@trace/snapshot'; +import type { ResourceSnapshot } from '@playwright/trace/src/snapshot'; type Point = { x: number, y: number }; diff --git a/packages/trace-viewer/src/sw/snapshotStorage.ts b/packages/trace-viewer/src/sw/snapshotStorage.ts index d15bfc4f41..9f2b05c661 100644 --- a/packages/trace-viewer/src/sw/snapshotStorage.ts +++ b/packages/trace-viewer/src/sw/snapshotStorage.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import type { FrameSnapshot, ResourceSnapshot } from '@trace/snapshot'; +import type { FrameSnapshot, ResourceSnapshot } from '@playwright/trace/src/snapshot'; import { rewriteURLForCustomProtocol, SnapshotRenderer } from './snapshotRenderer'; import type { PageEntry } from '../types/entries'; import { LRUCache } from './lruCache'; diff --git a/packages/trace-viewer/src/sw/traceModernizer.ts b/packages/trace-viewer/src/sw/traceModernizer.ts index 80f98762db..24cc8954a9 100644 --- a/packages/trace-viewer/src/sw/traceModernizer.ts +++ b/packages/trace-viewer/src/sw/traceModernizer.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import type * as trace from '@trace/trace'; +import type * as trace from '@playwright/trace/src/trace'; import type * as traceV3 from './versions/traceV3'; import type * as traceV4 from './versions/traceV4'; import type * as traceV5 from './versions/traceV5'; diff --git a/packages/trace-viewer/src/sw/versions/traceV3.ts b/packages/trace-viewer/src/sw/versions/traceV3.ts index a9cb7d7704..58e9b413ef 100644 --- a/packages/trace-viewer/src/sw/versions/traceV3.ts +++ b/packages/trace-viewer/src/sw/versions/traceV3.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import type { Entry as ResourceSnapshot } from '@trace/har'; +import type { Entry as ResourceSnapshot } from '@playwright/trace/src/har'; type SerializedValue = { n?: number, diff --git a/packages/trace-viewer/src/sw/versions/traceV4.ts b/packages/trace-viewer/src/sw/versions/traceV4.ts index 722604f0ad..f3d338753d 100644 --- a/packages/trace-viewer/src/sw/versions/traceV4.ts +++ b/packages/trace-viewer/src/sw/versions/traceV4.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import type { Entry as ResourceSnapshot } from '@trace/har'; +import type { Entry as ResourceSnapshot } from '@playwright/trace/src/har'; type Language = 'javascript' | 'python' | 'java' | 'csharp' | 'jsonl'; type Point = { x: number, y: number }; diff --git a/packages/trace-viewer/src/sw/versions/traceV5.ts b/packages/trace-viewer/src/sw/versions/traceV5.ts index 54d54459ce..1616bcff25 100644 --- a/packages/trace-viewer/src/sw/versions/traceV5.ts +++ b/packages/trace-viewer/src/sw/versions/traceV5.ts @@ -15,7 +15,7 @@ */ -import type { Entry as ResourceSnapshot } from '@trace/har'; +import type { Entry as ResourceSnapshot } from '@playwright/trace/src/har'; type Language = 'javascript' | 'python' | 'java' | 'csharp' | 'jsonl'; type Point = { x: number, y: number }; diff --git a/packages/trace-viewer/src/sw/versions/traceV6.ts b/packages/trace-viewer/src/sw/versions/traceV6.ts index 1b069a20b2..bbf9e24d67 100644 --- a/packages/trace-viewer/src/sw/versions/traceV6.ts +++ b/packages/trace-viewer/src/sw/versions/traceV6.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import type { Entry as ResourceSnapshot } from '@trace/har'; +import type { Entry as ResourceSnapshot } from '@playwright/trace/src/har'; type Language = 'javascript' | 'python' | 'java' | 'csharp' | 'jsonl'; type Point = { x: number, y: number }; diff --git a/packages/trace-viewer/src/third_party/devtools.ts b/packages/trace-viewer/src/third_party/devtools.ts index 27c520cbce..6b4c69782b 100644 --- a/packages/trace-viewer/src/third_party/devtools.ts +++ b/packages/trace-viewer/src/third_party/devtools.ts @@ -57,7 +57,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import type { Entry } from '@trace/har'; +import type { Entry } from '@playwright/trace/src/har'; // The following function is derived from Chromium's source code // https://github.com/ChromeDevTools/devtools-frontend/blob/83cbe41b4107e188a1f66fdf6ea3a9cca42587c6/front_end/panels/network/NetworkLogView.ts#L2363 diff --git a/packages/trace-viewer/src/types/entries.ts b/packages/trace-viewer/src/types/entries.ts index e7b7a0b977..4436b75e08 100644 --- a/packages/trace-viewer/src/types/entries.ts +++ b/packages/trace-viewer/src/types/entries.ts @@ -15,8 +15,8 @@ */ import type { Language } from 'playwright-core/src/utils/isomorphic/locatorGenerators'; -import type { ResourceSnapshot } from '@trace/snapshot'; -import type * as trace from '@trace/trace'; +import type { ResourceSnapshot } from '@playwright/trace/src/snapshot'; +import type * as trace from '@playwright/trace/src/trace'; // *Entry structures are used to pass the trace between the sw and the page. diff --git a/packages/trace-viewer/src/ui/DEPS.list b/packages/trace-viewer/src/ui/DEPS.list index 0056375c05..61e5dc2c64 100644 --- a/packages/trace-viewer/src/ui/DEPS.list +++ b/packages/trace-viewer/src/ui/DEPS.list @@ -1,7 +1,6 @@ [*] @injected/** @isomorphic/** -@trace/** @web/** ../entries.ts ../geometry.ts diff --git a/packages/trace-viewer/src/ui/actionList.tsx b/packages/trace-viewer/src/ui/actionList.tsx index 101c532aea..805cab2514 100644 --- a/packages/trace-viewer/src/ui/actionList.tsx +++ b/packages/trace-viewer/src/ui/actionList.tsx @@ -14,7 +14,7 @@ limitations under the License. */ -import type { ActionTraceEvent, AfterActionTraceEventAttachment } from '@trace/trace'; +import type { ActionTraceEvent, AfterActionTraceEventAttachment } from '@playwright/trace/src/trace'; import { msToString } from '@web/uiUtils'; import * as React from 'react'; import './actionList.css'; diff --git a/packages/trace-viewer/src/ui/attachmentsTab.tsx b/packages/trace-viewer/src/ui/attachmentsTab.tsx index cf9ed2e681..c699510800 100644 --- a/packages/trace-viewer/src/ui/attachmentsTab.tsx +++ b/packages/trace-viewer/src/ui/attachmentsTab.tsx @@ -19,7 +19,7 @@ import './attachmentsTab.css'; import { ImageDiffView } from '@web/shared/imageDiffView'; import type { ActionTraceEventInContext, MultiTraceModel } from './modelUtil'; import { PlaceholderPanel } from './placeholderPanel'; -import type { AfterActionTraceEventAttachment } from '@trace/trace'; +import type { AfterActionTraceEventAttachment } from '@playwright/trace/src/trace'; import { CodeMirrorWrapper, lineHeight } from '@web/components/codeMirrorWrapper'; import { isTextualMimeType } from '@isomorphic/mimeType'; import { Expandable } from '@web/components/expandable'; diff --git a/packages/trace-viewer/src/ui/callTab.tsx b/packages/trace-viewer/src/ui/callTab.tsx index 1ab3b5b46f..151f91a110 100644 --- a/packages/trace-viewer/src/ui/callTab.tsx +++ b/packages/trace-viewer/src/ui/callTab.tsx @@ -15,7 +15,7 @@ */ import type { SerializedValue } from '@protocol/channels'; -import type { ActionTraceEvent } from '@trace/trace'; +import type { ActionTraceEvent } from '@playwright/trace/src/trace'; import { clsx, msToString } from '@web/uiUtils'; import * as React from 'react'; import './callTab.css'; diff --git a/packages/trace-viewer/src/ui/codegen.ts b/packages/trace-viewer/src/ui/codegen.ts index 2d77177a0a..3816306494 100644 --- a/packages/trace-viewer/src/ui/codegen.ts +++ b/packages/trace-viewer/src/ui/codegen.ts @@ -15,7 +15,7 @@ */ import type { Language } from '@isomorphic/locatorGenerators'; -import type * as har from '@trace/har'; +import type * as har from '@playwright/trace/src/har'; interface APIRequestCodegen { generatePlaywrightRequestCall(request: har.Request, body: string | undefined): string; diff --git a/packages/trace-viewer/src/ui/modelUtil.ts b/packages/trace-viewer/src/ui/modelUtil.ts index 8badcbd87e..8626a9d759 100644 --- a/packages/trace-viewer/src/ui/modelUtil.ts +++ b/packages/trace-viewer/src/ui/modelUtil.ts @@ -15,9 +15,9 @@ */ import type { Language } from '@isomorphic/locatorGenerators'; -import type { ResourceSnapshot } from '@trace/snapshot'; -import type * as trace from '@trace/trace'; -import type { ActionTraceEvent } from '@trace/trace'; +import type { ResourceSnapshot } from '@playwright/trace/src/snapshot'; +import type * as trace from '@playwright/trace/src/trace'; +import type { ActionTraceEvent } from '@playwright/trace/src/trace'; import type { ActionEntry, ContextEntry, PageEntry } from '../types/entries'; import type { StackFrame } from '@protocol/channels'; diff --git a/packages/trace-viewer/src/ui/networkResourceDetails.tsx b/packages/trace-viewer/src/ui/networkResourceDetails.tsx index 0c4af4e969..2feadb3760 100644 --- a/packages/trace-viewer/src/ui/networkResourceDetails.tsx +++ b/packages/trace-viewer/src/ui/networkResourceDetails.tsx @@ -14,7 +14,7 @@ * limitations under the License. */ -import type { ResourceSnapshot } from '@trace/snapshot'; +import type { ResourceSnapshot } from '@playwright/trace/src/snapshot'; import * as React from 'react'; import './networkResourceDetails.css'; import { TabbedPane } from '@web/components/tabbedPane'; diff --git a/packages/trace-viewer/src/ui/networkTab.tsx b/packages/trace-viewer/src/ui/networkTab.tsx index 56cf9325b4..6dfa960bca 100644 --- a/packages/trace-viewer/src/ui/networkTab.tsx +++ b/packages/trace-viewer/src/ui/networkTab.tsx @@ -14,7 +14,7 @@ * limitations under the License. */ -import type { Entry } from '@trace/har'; +import type { Entry } from '@playwright/trace/src/har'; import * as React from 'react'; import type { Boundaries } from './geometry'; import './networkTab.css'; diff --git a/packages/trace-viewer/src/ui/recorder/DEPS.list b/packages/trace-viewer/src/ui/recorder/DEPS.list index a504a7dba1..c7470e2b19 100644 --- a/packages/trace-viewer/src/ui/recorder/DEPS.list +++ b/packages/trace-viewer/src/ui/recorder/DEPS.list @@ -1,5 +1,4 @@ [*] @isomorphic/** -@trace/** @web/** ../** diff --git a/packages/trace-viewer/src/ui/snapshotTab.tsx b/packages/trace-viewer/src/ui/snapshotTab.tsx index 995e2d173f..2b7ed4b05b 100644 --- a/packages/trace-viewer/src/ui/snapshotTab.tsx +++ b/packages/trace-viewer/src/ui/snapshotTab.tsx @@ -16,7 +16,7 @@ import './snapshotTab.css'; import * as React from 'react'; -import type { ActionTraceEvent } from '@trace/trace'; +import type { ActionTraceEvent } from '@playwright/trace/src/trace'; import { context, type MultiTraceModel, prevInList } from './modelUtil'; import { Toolbar } from '@web/components/toolbar'; import { ToolbarButton } from '@web/components/toolbarButton'; diff --git a/packages/trace-viewer/src/ui/timeline.tsx b/packages/trace-viewer/src/ui/timeline.tsx index e2dbfed8c1..1961b7d5af 100644 --- a/packages/trace-viewer/src/ui/timeline.tsx +++ b/packages/trace-viewer/src/ui/timeline.tsx @@ -23,7 +23,7 @@ import type { FilmStripPreviewPoint } from './filmStrip'; import type { ActionTraceEventInContext, MultiTraceModel } from './modelUtil'; import './timeline.css'; import type { Language } from '@isomorphic/locatorGenerators'; -import type { Entry } from '@trace/har'; +import type { Entry } from '@playwright/trace/src/har'; import type { ConsoleEntry } from './consoleTab'; type TimelineBar = { diff --git a/packages/trace-viewer/src/ui/workbench.tsx b/packages/trace-viewer/src/ui/workbench.tsx index ad8a099ea4..e438815366 100644 --- a/packages/trace-viewer/src/ui/workbench.tsx +++ b/packages/trace-viewer/src/ui/workbench.tsx @@ -37,11 +37,11 @@ import type { Boundaries } from './geometry'; import { InspectorTab } from './inspectorTab'; import { ToolbarButton } from '@web/components/toolbarButton'; import { useSetting, msToString, clsx } from '@web/uiUtils'; -import type { Entry } from '@trace/har'; +import type { Entry } from '@playwright/trace/src/har'; import './workbench.css'; import { testStatusIcon, testStatusText } from './testUtils'; import type { UITestStatus } from './testUtils'; -import type { AfterActionTraceEventAttachment } from '@trace/trace'; +import type { AfterActionTraceEventAttachment } from '@playwright/trace/src/trace'; export const Workbench: React.FunctionComponent<{ model?: modelUtil.MultiTraceModel, diff --git a/packages/trace-viewer/tsconfig.json b/packages/trace-viewer/tsconfig.json index 41b2ed3948..fb238ad1d0 100644 --- a/packages/trace-viewer/tsconfig.json +++ b/packages/trace-viewer/tsconfig.json @@ -21,7 +21,6 @@ "@protocol/*": ["../protocol/src/*"], "@recorder/*": ["../recorder/src/*"], "@testIsomorphic/*": ["../playwright/src/isomorphic/*"], - "@trace/*": ["../trace/src/*"], "@web/*": ["../web/src/*"], // Resolving type dependencies will start processing types in @playwright/test // which in turn will start parsing the files and hence stumble upon the core diff --git a/packages/trace-viewer/vite.config.ts b/packages/trace-viewer/vite.config.ts index c26e020fde..28cb477545 100644 --- a/packages/trace-viewer/vite.config.ts +++ b/packages/trace-viewer/vite.config.ts @@ -35,7 +35,6 @@ export default defineConfig({ '@isomorphic': path.resolve(__dirname, '../playwright-core/src/utils/isomorphic'), '@protocol': path.resolve(__dirname, '../protocol/src'), '@testIsomorphic': path.resolve(__dirname, '../playwright/src/isomorphic'), - '@trace': path.resolve(__dirname, '../trace/src'), '@web': path.resolve(__dirname, '../web/src'), }, }, diff --git a/packages/trace-viewer/vite.sw.config.ts b/packages/trace-viewer/vite.sw.config.ts index 60e90b96ac..18a104619c 100644 --- a/packages/trace-viewer/vite.sw.config.ts +++ b/packages/trace-viewer/vite.sw.config.ts @@ -31,7 +31,6 @@ export default defineConfig({ '@isomorphic': path.resolve(__dirname, '../playwright-core/src/utils/isomorphic'), '@protocol': path.resolve(__dirname, '../protocol/src'), '@testIsomorphic': path.resolve(__dirname, '../playwright-core/src/utils/testIsomorphic'), - '@trace': path.resolve(__dirname, '../trace/src'), '@web': path.resolve(__dirname, '../web/src'), }, }, diff --git a/packages/trace/package.json b/packages/trace/package.json new file mode 100644 index 0000000000..8b4c9665fe --- /dev/null +++ b/packages/trace/package.json @@ -0,0 +1,3 @@ +{ + "name": "@playwright/trace" +} \ No newline at end of file diff --git a/tests/config/utils.ts b/tests/config/utils.ts index 3743e97d80..918450a572 100644 --- a/tests/config/utils.ts +++ b/tests/config/utils.ts @@ -22,7 +22,7 @@ import { parseClientSideCallMetadata } from '../../packages/playwright-core/lib/ import { TraceModel } from '../../packages/trace-viewer/src/sw/traceModel'; import type { ActionTreeItem } from '../../packages/trace-viewer/src/ui/modelUtil'; import { buildActionTree, MultiTraceModel } from '../../packages/trace-viewer/src/ui/modelUtil'; -import type { ActionTraceEvent, ConsoleMessageTraceEvent, EventTraceEvent, TraceEvent } from '@trace/trace'; +import type { ActionTraceEvent, ConsoleMessageTraceEvent, EventTraceEvent, TraceEvent } from '@playwright/trace/src/trace'; import style from 'ansi-styles'; export async function attachFrame(page: Page, frameId: string, url: string): Promise { diff --git a/tests/tsconfig.json b/tests/tsconfig.json index 1a1e3d7527..2f62913851 100644 --- a/tests/tsconfig.json +++ b/tests/tsconfig.json @@ -14,7 +14,6 @@ "@isomorphic/*": ["packages/playwright-core/src/utils/isomorphic/*"], "@protocol/*": ["packages/protocol/src/*"], "@recorder/*": ["packages/recorder/src/*"], - "@trace/*": ["packages/trace/src/*"], "@web/*": ["packages/web/src/*"], }, }, diff --git a/tsconfig.json b/tsconfig.json index acb0e0d63d..a8fa0cb44c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,7 +16,6 @@ "@protocol/*": ["./packages/protocol/src/*"], "@recorder/*": ["./packages/recorder/src/*"], "@testIsomorphic/*": ["./packages/playwright/src/isomorphic/*"], - "@trace/*": ["./packages/trace/src/*"], "@web/*": ["./packages/web/src/*"], "playwright-core/lib/*": ["./packages/playwright-core/src/*"], "playwright/lib/*": ["./packages/playwright/src/*"],