From 48c237b3cf12775d631f1da4d25e324709c61c31 Mon Sep 17 00:00:00 2001 From: Pavel Feldman Date: Tue, 23 Feb 2021 22:08:14 -0800 Subject: [PATCH] chore: move trace to server (#5565) --- package-lock.json | 2 +- src/cli/traceViewer/snapshotServer.ts | 2 +- src/cli/traceViewer/traceModel.ts | 4 ++-- src/cli/traceViewer/traceViewer.ts | 2 +- src/server/playwright.ts | 2 +- src/{ => server}/trace/snapshotter.ts | 14 +++++++------- src/{ => server}/trace/snapshotterInjected.ts | 0 src/{ => server}/trace/traceTypes.ts | 2 +- src/{ => server}/trace/tracer.ts | 14 +++++++------- src/web/traceViewer/ui/networkResourceDetails.tsx | 2 +- test/trace.spec.ts | 2 +- utils/check_deps.js | 9 ++++----- 12 files changed, 27 insertions(+), 28 deletions(-) rename src/{ => server}/trace/snapshotter.ts (94%) rename src/{ => server}/trace/snapshotterInjected.ts (100%) rename src/{ => server}/trace/traceTypes.ts (98%) rename src/{ => server}/trace/tracer.ts (97%) diff --git a/package-lock.json b/package-lock.json index ef65114638..9852420a75 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "playwright-internal", - "version": "1.9.0-next", + "version": "1.10.0-next", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/cli/traceViewer/snapshotServer.ts b/src/cli/traceViewer/snapshotServer.ts index 74dc8d0955..dd9456036c 100644 --- a/src/cli/traceViewer/snapshotServer.ts +++ b/src/cli/traceViewer/snapshotServer.ts @@ -19,7 +19,7 @@ import fs from 'fs'; import path from 'path'; import type { TraceModel, trace, ContextEntry } from './traceModel'; import { TraceServer } from './traceServer'; -import { NodeSnapshot } from '../../trace/traceTypes'; +import { NodeSnapshot } from '../../server/trace/traceTypes'; export class SnapshotServer { private _resourcesDir: string | undefined; diff --git a/src/cli/traceViewer/traceModel.ts b/src/cli/traceViewer/traceModel.ts index 0cb4eb59f8..7cbe223a44 100644 --- a/src/cli/traceViewer/traceModel.ts +++ b/src/cli/traceViewer/traceModel.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import * as trace from '../../trace/traceTypes'; -export * as trace from '../../trace/traceTypes'; +import * as trace from '../../server/trace/traceTypes'; +export * as trace from '../../server/trace/traceTypes'; export type TraceModel = { contexts: ContextEntry[]; diff --git a/src/cli/traceViewer/traceViewer.ts b/src/cli/traceViewer/traceViewer.ts index dbd62d0ff5..6f9ecd448b 100644 --- a/src/cli/traceViewer/traceViewer.ts +++ b/src/cli/traceViewer/traceViewer.ts @@ -20,7 +20,7 @@ import * as playwright from '../../..'; import * as util from 'util'; import { ScreenshotGenerator } from './screenshotGenerator'; import { readTraceFile, TraceModel } from './traceModel'; -import type { TraceEvent } from '../../trace/traceTypes'; +import type { TraceEvent } from '../../server/trace/traceTypes'; import { SnapshotServer } from './snapshotServer'; import { ServerRouteHandler, TraceServer } from './traceServer'; diff --git a/src/server/playwright.ts b/src/server/playwright.ts index e8909527af..b22a13618e 100644 --- a/src/server/playwright.ts +++ b/src/server/playwright.ts @@ -15,7 +15,7 @@ */ import path from 'path'; -import { Tracer } from '../trace/tracer'; +import { Tracer } from './trace/tracer'; import { Android } from './android/android'; import { AdbBackend } from './android/backendAdb'; import { PlaywrightOptions } from './browser'; diff --git a/src/trace/snapshotter.ts b/src/server/trace/snapshotter.ts similarity index 94% rename from src/trace/snapshotter.ts rename to src/server/trace/snapshotter.ts index 53e78bb8bf..945d60e095 100644 --- a/src/trace/snapshotter.ts +++ b/src/server/trace/snapshotter.ts @@ -14,14 +14,14 @@ * limitations under the License. */ -import { BrowserContext } from '../server/browserContext'; -import { Page } from '../server/page'; -import * as network from '../server/network'; -import { helper, RegisteredListener } from '../server/helper'; -import { debugLogger } from '../utils/debugLogger'; -import { Frame } from '../server/frames'; +import { BrowserContext } from '../browserContext'; +import { Page } from '../page'; +import * as network from '../network'; +import { helper, RegisteredListener } from '../helper'; +import { debugLogger } from '../../utils/debugLogger'; +import { Frame } from '../frames'; import { SnapshotData, frameSnapshotStreamer, kSnapshotBinding, kSnapshotStreamer } from './snapshotterInjected'; -import { calculateSha1 } from '../utils/utils'; +import { calculateSha1 } from '../../utils/utils'; import { FrameSnapshot } from './traceTypes'; export type SnapshotterResource = { diff --git a/src/trace/snapshotterInjected.ts b/src/server/trace/snapshotterInjected.ts similarity index 100% rename from src/trace/snapshotterInjected.ts rename to src/server/trace/snapshotterInjected.ts diff --git a/src/trace/traceTypes.ts b/src/server/trace/traceTypes.ts similarity index 98% rename from src/trace/traceTypes.ts rename to src/server/trace/traceTypes.ts index 916c4d826e..aadbbb7912 100644 --- a/src/trace/traceTypes.ts +++ b/src/server/trace/traceTypes.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { StackFrame } from '../common/types'; +import { StackFrame } from '../../common/types'; import { NodeSnapshot } from './snapshotterInjected'; export { NodeSnapshot } from './snapshotterInjected'; diff --git a/src/trace/tracer.ts b/src/server/trace/tracer.ts similarity index 97% rename from src/trace/tracer.ts rename to src/server/trace/tracer.ts index 081029506b..cbc4af0880 100644 --- a/src/trace/tracer.ts +++ b/src/server/trace/tracer.ts @@ -14,20 +14,20 @@ * limitations under the License. */ -import { BrowserContext, Video } from '../server/browserContext'; +import { BrowserContext, Video } from '../browserContext'; import type { SnapshotterResource as SnapshotterResource, SnapshotterBlob, SnapshotterDelegate } from './snapshotter'; import * as trace from './traceTypes'; import path from 'path'; import * as util from 'util'; import fs from 'fs'; -import { createGuid, getFromENV, mkdirIfNeeded, monotonicTime } from '../utils/utils'; -import { Page } from '../server/page'; +import { createGuid, getFromENV, mkdirIfNeeded, monotonicTime } from '../../utils/utils'; +import { Page } from '../page'; import { Snapshotter } from './snapshotter'; -import { helper, RegisteredListener } from '../server/helper'; -import { Dialog } from '../server/dialog'; -import { Frame, NavigationEvent } from '../server/frames'; +import { helper, RegisteredListener } from '../helper'; +import { Dialog } from '../dialog'; +import { Frame, NavigationEvent } from '../frames'; import { snapshotScript } from './snapshotterInjected'; -import { CallMetadata, InstrumentationListener, SdkObject } from '../server/instrumentation'; +import { CallMetadata, InstrumentationListener, SdkObject } from '../instrumentation'; const fsWriteFileAsync = util.promisify(fs.writeFile.bind(fs)); const fsAppendFileAsync = util.promisify(fs.appendFile.bind(fs)); diff --git a/src/web/traceViewer/ui/networkResourceDetails.tsx b/src/web/traceViewer/ui/networkResourceDetails.tsx index b8614efb7b..2b5c7f4774 100644 --- a/src/web/traceViewer/ui/networkResourceDetails.tsx +++ b/src/web/traceViewer/ui/networkResourceDetails.tsx @@ -17,7 +17,7 @@ import './networkResourceDetails.css'; import * as React from 'react'; import { Expandable } from './helpers'; -import { NetworkResourceTraceEvent } from '../../../trace/traceTypes'; +import { NetworkResourceTraceEvent } from '../../../server/trace/traceTypes'; const utf8Encoder = new TextDecoder('utf-8'); diff --git a/test/trace.spec.ts b/test/trace.spec.ts index 2eb6e08323..4084afd56e 100644 --- a/test/trace.spec.ts +++ b/test/trace.spec.ts @@ -15,7 +15,7 @@ */ import { it, expect } from './fixtures'; -import type * as trace from '../src/trace/traceTypes'; +import type * as trace from '../src/server/trace/traceTypes'; import path from 'path'; import fs from 'fs'; diff --git a/utils/check_deps.js b/utils/check_deps.js index 6fb041d49e..8d9b33bc09 100644 --- a/utils/check_deps.js +++ b/utils/check_deps.js @@ -140,20 +140,19 @@ DEPS['src/server/injected/'] = ['src/server/common/']; DEPS['src/server/android/'] = [...DEPS['src/server/'], 'src/server/chromium/', 'src/protocol/']; DEPS['src/server/electron/'] = [...DEPS['src/server/'], 'src/server/chromium/']; -DEPS['src/server/playwright.ts'] = [...DEPS['src/server/'], 'src/trace/', 'src/server/chromium/', 'src/server/webkit/', 'src/server/firefox/', 'src/server/android/', 'src/server/electron/']; +DEPS['src/server/playwright.ts'] = [...DEPS['src/server/'], 'src/server/trace/', 'src/server/chromium/', 'src/server/webkit/', 'src/server/firefox/', 'src/server/android/', 'src/server/electron/']; DEPS['src/cli/driver.ts'] = DEPS['src/inprocess.ts'] = DEPS['src/browserServerImpl.ts'] = ['src/**']; // Tracing is a client/server plugin, nothing should depend on it. -DEPS['src/trace/'] = ['src/common/', 'src/utils/', 'src/client/**', 'src/server/**']; DEPS['src/web/recorder/'] = ['src/common/', 'src/web/', 'src/web/components/', 'src/server/supplements/recorder/recorderTypes.ts']; DEPS['src/web/traceViewer/'] = ['src/common/', 'src/web/', 'src/cli/traceViewer/']; -DEPS['src/web/traceViewer/ui/'] = ['src/common/', 'src/web/traceViewer/', 'src/web/', 'src/cli/traceViewer/', 'src/trace/']; +DEPS['src/web/traceViewer/ui/'] = ['src/common/', 'src/web/traceViewer/', 'src/web/', 'src/cli/traceViewer/', 'src/server/trace/']; // The service is a cross-cutting feature, and so it depends on a bunch of things. -DEPS['src/remote/'] = ['src/client/', 'src/debug/', 'src/dispatchers/', 'src/server/', 'src/server/supplements/', 'src/server/electron/', 'src/trace/']; +DEPS['src/remote/'] = ['src/client/', 'src/debug/', 'src/dispatchers/', 'src/server/', 'src/server/supplements/', 'src/server/electron/', 'src/server/trace/']; DEPS['src/service.ts'] = ['src/remote/']; // CLI should only use client-side features. -DEPS['src/cli/'] = ['src/cli/**', 'src/client/**', 'src/install/**', 'src/generated/', 'src/server/injected/', 'src/debug/injected/', 'src/trace/**', 'src/utils/**']; +DEPS['src/cli/'] = ['src/cli/**', 'src/client/**', 'src/install/**', 'src/generated/', 'src/server/injected/', 'src/debug/injected/', 'src/server/trace/**', 'src/utils/**']; DEPS['src/server/supplements/recorder/recorderApp.ts'] = ['src/common/', 'src/utils/', 'src/server/', 'src/server/chromium/']; DEPS['src/utils/'] = ['src/common/'];