diff --git a/packages/playwright-core/src/server/bidi/bidiBrowser.ts b/packages/playwright-core/src/server/bidi/bidiBrowser.ts index 45c12bc347..5c1cb400d1 100644 --- a/packages/playwright-core/src/server/bidi/bidiBrowser.ts +++ b/packages/playwright-core/src/server/bidi/bidiBrowser.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { eventsHelper } from '../../utils/eventsHelper'; +import { eventsHelper } from '../utils/eventsHelper'; import { Browser } from '../browser'; import { BrowserContext, assertBrowserContextIsNotOwned } from '../browserContext'; import * as network from '../network'; @@ -23,7 +23,7 @@ import { bidiBytesValueToString } from './bidiNetworkManager'; import { BidiPage } from './bidiPage'; import * as bidi from './third_party/bidiProtocol'; -import type { RegisteredListener } from '../../utils/eventsHelper'; +import type { RegisteredListener } from '../utils/eventsHelper'; import type { BrowserOptions } from '../browser'; import type { SdkObject } from '../instrumentation'; import type { InitScript, Page } from '../page'; diff --git a/packages/playwright-core/src/server/bidi/bidiNetworkManager.ts b/packages/playwright-core/src/server/bidi/bidiNetworkManager.ts index 185eee86a0..5da061fcdf 100644 --- a/packages/playwright-core/src/server/bidi/bidiNetworkManager.ts +++ b/packages/playwright-core/src/server/bidi/bidiNetworkManager.ts @@ -14,12 +14,12 @@ * limitations under the License. */ -import { eventsHelper } from '../../utils/eventsHelper'; +import { eventsHelper } from '../utils/eventsHelper'; import { parseRawCookie } from '../cookieStore'; import * as network from '../network'; import * as bidi from './third_party/bidiProtocol'; -import type { RegisteredListener } from '../../utils/eventsHelper'; +import type { RegisteredListener } from '../utils/eventsHelper'; import type * as frames from '../frames'; import type { Page } from '../page'; import type * as types from '../types'; diff --git a/packages/playwright-core/src/server/bidi/bidiPage.ts b/packages/playwright-core/src/server/bidi/bidiPage.ts index 8cf9e38946..0ee5822f93 100644 --- a/packages/playwright-core/src/server/bidi/bidiPage.ts +++ b/packages/playwright-core/src/server/bidi/bidiPage.ts @@ -15,7 +15,7 @@ */ import { assert } from '../../utils'; -import { eventsHelper } from '../../utils/eventsHelper'; +import { eventsHelper } from '../utils/eventsHelper'; import { BrowserContext } from '../browserContext'; import * as dialog from '../dialog'; import * as dom from '../dom'; @@ -26,7 +26,7 @@ import { BidiNetworkManager } from './bidiNetworkManager'; import { BidiPDF } from './bidiPdf'; import * as bidi from './third_party/bidiProtocol'; -import type { RegisteredListener } from '../../utils/eventsHelper'; +import type { RegisteredListener } from '../utils/eventsHelper'; import type * as accessibility from '../accessibility'; import type * as frames from '../frames'; import type { InitScript, PageDelegate } from '../page'; diff --git a/packages/playwright-core/src/server/chromium/crCoverage.ts b/packages/playwright-core/src/server/chromium/crCoverage.ts index 81dd2c0f4c..0b4984211a 100644 --- a/packages/playwright-core/src/server/chromium/crCoverage.ts +++ b/packages/playwright-core/src/server/chromium/crCoverage.ts @@ -16,11 +16,11 @@ */ import { assert } from '../../utils'; -import { eventsHelper } from '../../utils/eventsHelper'; +import { eventsHelper } from '../utils/eventsHelper'; import type { CRSession } from './crConnection'; import type { Protocol } from './protocol'; -import type { RegisteredListener } from '../../utils/eventsHelper'; +import type { RegisteredListener } from '../utils/eventsHelper'; import type * as channels from '@protocol/channels'; diff --git a/packages/playwright-core/src/server/chromium/crNetworkManager.ts b/packages/playwright-core/src/server/chromium/crNetworkManager.ts index b9a5447189..812f62dfac 100644 --- a/packages/playwright-core/src/server/chromium/crNetworkManager.ts +++ b/packages/playwright-core/src/server/chromium/crNetworkManager.ts @@ -16,14 +16,14 @@ */ import { assert, headersArrayToObject, headersObjectToArray } from '../../utils'; -import { eventsHelper } from '../../utils/eventsHelper'; +import { eventsHelper } from '../utils/eventsHelper'; import { helper } from '../helper'; import * as network from '../network'; import { isProtocolError, isSessionClosedError } from '../protocolError'; import type { CRSession } from './crConnection'; import type { Protocol } from './protocol'; -import type { RegisteredListener } from '../../utils/eventsHelper'; +import type { RegisteredListener } from '../utils/eventsHelper'; import type * as contexts from '../browserContext'; import type * as frames from '../frames'; import type { Page } from '../page'; diff --git a/packages/playwright-core/src/server/chromium/crPage.ts b/packages/playwright-core/src/server/chromium/crPage.ts index 943dd32f27..0a12f9fcd8 100644 --- a/packages/playwright-core/src/server/chromium/crPage.ts +++ b/packages/playwright-core/src/server/chromium/crPage.ts @@ -19,7 +19,7 @@ import * as path from 'path'; import { assert } from '../../utils/debug'; import { createGuid } from '../utils/crypto'; -import { eventsHelper } from '../../utils/eventsHelper'; +import { eventsHelper } from '../utils/eventsHelper'; import { rewriteErrorMessage } from '../../utils/stackTrace'; import * as dialog from '../dialog'; import * as dom from '../dom'; @@ -46,7 +46,7 @@ import { isSessionClosedError } from '../protocolError'; import type { CRSession } from './crConnection'; import type { Protocol } from './protocol'; -import type { RegisteredListener } from '../../utils/eventsHelper'; +import type { RegisteredListener } from '../utils/eventsHelper'; import type { InitScript, PageDelegate } from '../page'; import type { Progress } from '../progress'; import type * as types from '../types'; diff --git a/packages/playwright-core/src/server/dispatchers/debugControllerDispatcher.ts b/packages/playwright-core/src/server/dispatchers/debugControllerDispatcher.ts index a3acb24bd1..1636d9f778 100644 --- a/packages/playwright-core/src/server/dispatchers/debugControllerDispatcher.ts +++ b/packages/playwright-core/src/server/dispatchers/debugControllerDispatcher.ts @@ -19,7 +19,7 @@ import { DebugController } from '../debugController'; import { Dispatcher } from './dispatcher'; import type { DispatcherConnection, RootDispatcher } from './dispatcher'; -import type { RegisteredListener } from '../../utils/eventsHelper'; +import type { RegisteredListener } from '../utils/eventsHelper'; import type * as channels from '@protocol/channels'; diff --git a/packages/playwright-core/src/server/dispatchers/dispatcher.ts b/packages/playwright-core/src/server/dispatchers/dispatcher.ts index 34f2614e08..9912de9849 100644 --- a/packages/playwright-core/src/server/dispatchers/dispatcher.ts +++ b/packages/playwright-core/src/server/dispatchers/dispatcher.ts @@ -16,7 +16,7 @@ import { EventEmitter } from 'events'; -import { eventsHelper } from '../..//utils/eventsHelper'; +import { eventsHelper } from '../utils/eventsHelper'; import { ValidationError, createMetadataValidator, findValidator } from '../../protocol/validator'; import { LongStandingScope, assert, compressCallLog, isUnderTest, monotonicTime, rewriteErrorMessage } from '../../utils'; import { TargetClosedError, isTargetClosedError, serializeError } from '../errors'; @@ -25,7 +25,7 @@ import { isProtocolError } from '../protocolError'; import type { CallMetadata } from '../instrumentation'; import type { PlaywrightDispatcher } from './playwrightDispatcher'; -import type { RegisteredListener } from '../..//utils/eventsHelper'; +import type { RegisteredListener } from '../utils/eventsHelper'; import type { ValidatorContext } from '../../protocol/validator'; import type * as channels from '@protocol/channels'; diff --git a/packages/playwright-core/src/server/dispatchers/playwrightDispatcher.ts b/packages/playwright-core/src/server/dispatchers/playwrightDispatcher.ts index 8581273c0f..6735e9c284 100644 --- a/packages/playwright-core/src/server/dispatchers/playwrightDispatcher.ts +++ b/packages/playwright-core/src/server/dispatchers/playwrightDispatcher.ts @@ -26,11 +26,11 @@ import { LocalUtilsDispatcher } from './localUtilsDispatcher'; import { APIRequestContextDispatcher } from './networkDispatchers'; import { SelectorsDispatcher } from './selectorsDispatcher'; import { createGuid } from '../utils/crypto'; -import { eventsHelper } from '../../utils/eventsHelper'; +import { eventsHelper } from '../utils/eventsHelper'; import type { RootDispatcher } from './dispatcher'; import type { SocksSocketClosedPayload, SocksSocketDataPayload, SocksSocketRequestedPayload } from '../utils/socksProxy'; -import type { RegisteredListener } from '../../utils/eventsHelper'; +import type { RegisteredListener } from '../utils/eventsHelper'; import type { AndroidDevice } from '../android/android'; import type { Browser } from '../browser'; import type { Playwright } from '../playwright'; diff --git a/packages/playwright-core/src/server/dispatchers/webSocketRouteDispatcher.ts b/packages/playwright-core/src/server/dispatchers/webSocketRouteDispatcher.ts index cc1e5f9477..f31bf7659d 100644 --- a/packages/playwright-core/src/server/dispatchers/webSocketRouteDispatcher.ts +++ b/packages/playwright-core/src/server/dispatchers/webSocketRouteDispatcher.ts @@ -20,7 +20,7 @@ import { PageDispatcher } from './pageDispatcher'; import * as webSocketMockSource from '../../generated/webSocketMockSource'; import { createGuid } from '../utils/crypto'; import { urlMatches } from '../../utils/isomorphic/urlMatch'; -import { eventsHelper } from '../../utils/eventsHelper'; +import { eventsHelper } from '../utils/eventsHelper'; import type { BrowserContextDispatcher } from './browserContextDispatcher'; import type { BrowserContext } from '../browserContext'; diff --git a/packages/playwright-core/src/server/electron/electron.ts b/packages/playwright-core/src/server/electron/electron.ts index ce4480b428..1728a317a8 100644 --- a/packages/playwright-core/src/server/electron/electron.ts +++ b/packages/playwright-core/src/server/electron/electron.ts @@ -23,7 +23,7 @@ import { TimeoutSettings } from '../../common/timeoutSettings'; import { ManualPromise } from '../../utils'; import { wrapInASCIIBox } from '../utils/ascii'; import { RecentLogsCollector } from '../../utils/debugLogger'; -import { eventsHelper } from '../../utils/eventsHelper'; +import { eventsHelper } from '../utils/eventsHelper'; import { validateBrowserContextOptions } from '../browserContext'; import { CRBrowser } from '../chromium/crBrowser'; import { CRConnection } from '../chromium/crConnection'; diff --git a/packages/playwright-core/src/server/firefox/ffNetworkManager.ts b/packages/playwright-core/src/server/firefox/ffNetworkManager.ts index 95df0643d0..fbd7330739 100644 --- a/packages/playwright-core/src/server/firefox/ffNetworkManager.ts +++ b/packages/playwright-core/src/server/firefox/ffNetworkManager.ts @@ -15,12 +15,12 @@ * limitations under the License. */ -import { eventsHelper } from '../../utils/eventsHelper'; +import { eventsHelper } from '../utils/eventsHelper'; import * as network from '../network'; import type { FFSession } from './ffConnection'; import type { HeadersArray } from '../../server/types'; -import type { RegisteredListener } from '../../utils/eventsHelper'; +import type { RegisteredListener } from '../utils/eventsHelper'; import type * as frames from '../frames'; import type { Page } from '../page'; import type * as types from '../types'; diff --git a/packages/playwright-core/src/server/firefox/ffPage.ts b/packages/playwright-core/src/server/firefox/ffPage.ts index 0e1755a2da..305a9638cb 100644 --- a/packages/playwright-core/src/server/firefox/ffPage.ts +++ b/packages/playwright-core/src/server/firefox/ffPage.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { eventsHelper } from '../../utils/eventsHelper'; +import { eventsHelper } from '../utils/eventsHelper'; import * as dialog from '../dialog'; import * as dom from '../dom'; import { InitScript } from '../page'; @@ -33,7 +33,7 @@ import { TargetClosedError } from '../errors'; import type { Progress } from '../progress'; import type { FFBrowserContext } from './ffBrowser'; import type { Protocol } from './protocol'; -import type { RegisteredListener } from '../../utils/eventsHelper'; +import type { RegisteredListener } from '../utils/eventsHelper'; import type * as frames from '../frames'; import type { PageDelegate } from '../page'; import type * as types from '../types'; diff --git a/packages/playwright-core/src/server/frames.ts b/packages/playwright-core/src/server/frames.ts index 8be38f885f..87bd4f9623 100644 --- a/packages/playwright-core/src/server/frames.ts +++ b/packages/playwright-core/src/server/frames.ts @@ -30,7 +30,7 @@ import * as types from './types'; import { LongStandingScope, asLocator, assert, compressCallLog, constructURLBasedOnBaseURL, makeWaitForNextTask, monotonicTime } from '../utils'; import { isSessionClosedError } from './protocolError'; import { debugLogger } from '../utils/debugLogger'; -import { eventsHelper } from '../utils/eventsHelper'; +import { eventsHelper } from './utils/eventsHelper'; import { isInvalidSelectorError } from '../utils/isomorphic/selectorParser'; import { ManualPromise } from '../utils/isomorphic/manualPromise'; @@ -40,7 +40,7 @@ import type { ElementStateWithoutStable, FrameExpectParams, InjectedScript } fro import type { CallMetadata } from './instrumentation'; import type { Progress } from './progress'; import type { ScreenshotOptions } from './screenshotter'; -import type { RegisteredListener } from '../utils/eventsHelper'; +import type { RegisteredListener } from './utils/eventsHelper'; import type { ParsedSelector } from '../utils/isomorphic/selectorParser'; 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 d046962199..b1ff48b73d 100644 --- a/packages/playwright-core/src/server/har/harTracer.ts +++ b/packages/playwright-core/src/server/har/harTracer.ts @@ -16,7 +16,7 @@ import { assert, calculateSha1, monotonicTime } from '../../utils'; import { getPlaywrightVersion, isTextualMimeType, urlMatches } from '../../utils'; -import { eventsHelper } from '../../utils/eventsHelper'; +import { eventsHelper } from '../utils/eventsHelper'; import { ManualPromise } from '../../utils/isomorphic/manualPromise'; import { mime } from '../../utilsBundle'; import { BrowserContext } from '../browserContext'; @@ -25,7 +25,7 @@ import { Frame } from '../frames'; import { helper } from '../helper'; import * as network from '../network'; -import type { RegisteredListener } from '../../utils/eventsHelper'; +import type { RegisteredListener } from '../utils/eventsHelper'; import type { APIRequestEvent, APIRequestFinishedEvent } from '../fetch'; import type { Page } from '../page'; import type { Worker } from '../page'; diff --git a/packages/playwright-core/src/server/helper.ts b/packages/playwright-core/src/server/helper.ts index ccf9af12b0..da049e2be6 100644 --- a/packages/playwright-core/src/server/helper.ts +++ b/packages/playwright-core/src/server/helper.ts @@ -16,11 +16,11 @@ */ import { debugLogger } from '../utils/debugLogger'; -import { eventsHelper } from '../utils/eventsHelper'; +import { eventsHelper } from './utils/eventsHelper'; import type { Progress } from './progress'; import type * as types from './types'; -import type { RegisteredListener } from '../utils/eventsHelper'; +import type { RegisteredListener } from './utils/eventsHelper'; import type { EventEmitter } from 'events'; diff --git a/packages/playwright-core/src/server/trace/recorder/snapshotter.ts b/packages/playwright-core/src/server/trace/recorder/snapshotter.ts index 10cd322b4d..9a914e1ad4 100644 --- a/packages/playwright-core/src/server/trace/recorder/snapshotter.ts +++ b/packages/playwright-core/src/server/trace/recorder/snapshotter.ts @@ -18,13 +18,13 @@ import { frameSnapshotStreamer } from './snapshotterInjected'; import { monotonicTime } from '../../../utils/isomorphic/time'; import { calculateSha1, createGuid } from '../../utils/crypto'; import { debugLogger } from '../../../utils/debugLogger'; -import { eventsHelper } from '../../../utils/eventsHelper'; +import { eventsHelper } from '../../utils/eventsHelper'; import { mime } from '../../../utilsBundle'; import { BrowserContext } from '../../browserContext'; import { Page } from '../../page'; import type { SnapshotData } from './snapshotterInjected'; -import type { RegisteredListener } from '../../../utils/eventsHelper'; +import type { RegisteredListener } from '../../utils/eventsHelper'; import type { Frame } from '../../frames'; import type { FrameSnapshot } from '@trace/snapshot'; diff --git a/packages/playwright-core/src/server/trace/recorder/tracing.ts b/packages/playwright-core/src/server/trace/recorder/tracing.ts index 367797c754..26e3075a29 100644 --- a/packages/playwright-core/src/server/trace/recorder/tracing.ts +++ b/packages/playwright-core/src/server/trace/recorder/tracing.ts @@ -22,7 +22,7 @@ import { Snapshotter } from './snapshotter'; import { commandsWithTracingSnapshots } from '../../../protocol/debug'; import { assert } from '../../../utils/debug'; import { monotonicTime } from '../../../utils/isomorphic/time'; -import { eventsHelper } from '../../../utils/eventsHelper'; +import { eventsHelper } from '../../utils/eventsHelper'; import { createGuid } from '../../utils/crypto'; import { Artifact } from '../../artifact'; import { BrowserContext } from '../../browserContext'; diff --git a/packages/playwright-core/src/utils/eventsHelper.ts b/packages/playwright-core/src/server/utils/eventsHelper.ts similarity index 100% rename from packages/playwright-core/src/utils/eventsHelper.ts rename to packages/playwright-core/src/server/utils/eventsHelper.ts diff --git a/packages/playwright-core/src/utils/expectUtils.ts b/packages/playwright-core/src/server/utils/expectUtils.ts similarity index 94% rename from packages/playwright-core/src/utils/expectUtils.ts rename to packages/playwright-core/src/server/utils/expectUtils.ts index ebbdf8e867..6d7a2a1e3d 100644 --- a/packages/playwright-core/src/utils/expectUtils.ts +++ b/packages/playwright-core/src/server/utils/expectUtils.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { isRegExp, isString } from './isomorphic/rtti'; +import { isRegExp, isString } from '../../utils/isomorphic/rtti'; import type { ExpectedTextValue } from '@protocol/channels'; diff --git a/packages/playwright-core/src/server/webkit/wkPage.ts b/packages/playwright-core/src/server/webkit/wkPage.ts index d89b97905b..323e12e553 100644 --- a/packages/playwright-core/src/server/webkit/wkPage.ts +++ b/packages/playwright-core/src/server/webkit/wkPage.ts @@ -20,7 +20,7 @@ import * as path from 'path'; import { assert, debugAssert } from '../../utils'; import { headersArrayToObject } from '../../utils/isomorphic/headers'; import { createGuid } from '../utils/crypto'; -import { eventsHelper } from '../../utils/eventsHelper'; +import { eventsHelper } from '../utils/eventsHelper'; import { hostPlatform } from '../../utils/hostPlatform'; import { splitErrorMessage } from '../../utils/stackTrace'; import { PNG, jpegjs } from '../../utilsBundle'; @@ -43,7 +43,7 @@ import { debugLogger } from '../../utils/debugLogger'; import type { Protocol } from './protocol'; import type { WKBrowserContext } from './wkBrowser'; -import type { RegisteredListener } from '../../utils/eventsHelper'; +import type { RegisteredListener } from '../utils/eventsHelper'; import type * as accessibility from '../accessibility'; import type * as frames from '../frames'; import type { JSHandle } from '../javascript'; diff --git a/packages/playwright-core/src/server/webkit/wkProvisionalPage.ts b/packages/playwright-core/src/server/webkit/wkProvisionalPage.ts index 2958f4597c..63d4cc6f0a 100644 --- a/packages/playwright-core/src/server/webkit/wkProvisionalPage.ts +++ b/packages/playwright-core/src/server/webkit/wkProvisionalPage.ts @@ -15,12 +15,12 @@ */ import { assert } from '../../utils'; -import { eventsHelper } from '../../utils/eventsHelper'; +import { eventsHelper } from '../utils/eventsHelper'; import type { Protocol } from './protocol'; import type { WKSession } from './wkConnection'; import type { WKPage } from './wkPage'; -import type { RegisteredListener } from '../../utils/eventsHelper'; +import type { RegisteredListener } from '../utils/eventsHelper'; import type * as network from '../network'; export class WKProvisionalPage { diff --git a/packages/playwright-core/src/server/webkit/wkWorkers.ts b/packages/playwright-core/src/server/webkit/wkWorkers.ts index 644c64a27f..719d8df6be 100644 --- a/packages/playwright-core/src/server/webkit/wkWorkers.ts +++ b/packages/playwright-core/src/server/webkit/wkWorkers.ts @@ -14,13 +14,13 @@ * limitations under the License. */ -import { eventsHelper } from '../../utils/eventsHelper'; +import { eventsHelper } from '../utils/eventsHelper'; import { Worker } from '../page'; import { WKSession } from './wkConnection'; import { WKExecutionContext } from './wkExecutionContext'; import type { Protocol } from './protocol'; -import type { RegisteredListener } from '../../utils/eventsHelper'; +import type { RegisteredListener } from '../utils/eventsHelper'; import type { Page } from '../page'; import type * as types from '../types'; diff --git a/packages/playwright-core/src/utils.ts b/packages/playwright-core/src/utils.ts index f77a878e70..752d376899 100644 --- a/packages/playwright-core/src/utils.ts +++ b/packages/playwright-core/src/utils.ts @@ -27,8 +27,6 @@ export * from './utils/isomorphic/urlMatch'; export * from './utils/debug'; export * from './utils/debugLogger'; export * from './utils/env'; -export * from './utils/eventsHelper'; -export * from './utils/expectUtils'; export * from './utils/hostPlatform'; export * from './utils/isomorphic/headers'; export * from './utils/isomorphic/semaphore'; @@ -42,6 +40,8 @@ export * from './utils/zones'; export * from './server/utils/ascii'; export * from './server/utils/comparators'; export * from './server/utils/crypto'; +export * from './server/utils/eventsHelper'; +export * from './server/utils/expectUtils'; export * from './server/utils/fileUtils'; export * from './server/utils/httpServer'; export * from './server/utils/network';