Skip to content

Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.

chore: merge server/isomorphic into utils/isomorphic (#35480)

Yury Semikhatskyf9d9c5c51287
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 9c958dcff4..841ad483bb 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -370,7 +370,6 @@ export default [
{
files: [
"packages/playwright-core/src/server/injected/**/*.ts",
- "packages/playwright-core/src/server/isomorphic/**/*.ts",
"packages/playwright-core/src/utils/isomorphic/**/*.ts",
"packages/playwright-core/src/server/pageBinding.ts",
"packages/playwright-core/src/server/storageScript.ts",
diff --git a/packages/playwright-core/src/cli/DEPS.list b/packages/playwright-core/src/cli/DEPS.list
index 06a2e3baae..f828f97330 100644
--- a/packages/playwright-core/src/cli/DEPS.list
+++ b/packages/playwright-core/src/cli/DEPS.list
@@ -1,9 +1,7 @@
[*]
../../
-../debug/injected
../generated/
../server/
-../server/injected/
../server/trace
../server/utils
../utils
@@ -12,7 +10,6 @@
[program.ts]
../server/trace/viewer/traceViewer.ts
../server/
-../containers/
[driver.ts]
../**
diff --git a/packages/playwright-core/src/server/browserContext.ts b/packages/playwright-core/src/server/browserContext.ts
index 143f25cf8c..14afdb74db 100644
--- a/packages/playwright-core/src/server/browserContext.ts
+++ b/packages/playwright-core/src/server/browserContext.ts
@@ -28,8 +28,8 @@ import { mkdirIfNeeded } from './utils/fileUtils';
import { HarRecorder } from './har/harRecorder';
import { helper } from './helper';
import { SdkObject, serverSideCallMetadata } from './instrumentation';
-import { ensureBuiltins } from './isomorphic/builtins';
-import * as utilityScriptSerializers from './isomorphic/utilityScriptSerializers';
+import { ensureBuiltins } from '../utils/isomorphic/builtins';
+import * as utilityScriptSerializers from '../utils/isomorphic/utilityScriptSerializers';
import * as network from './network';
import { InitScript } from './page';
import { Page, PageBinding } from './page';
diff --git a/packages/playwright-core/src/server/injected/ariaSnapshot.ts b/packages/playwright-core/src/server/injected/ariaSnapshot.ts
index 3259434c82..8e80809512 100644
--- a/packages/playwright-core/src/server/injected/ariaSnapshot.ts
+++ b/packages/playwright-core/src/server/injected/ariaSnapshot.ts
@@ -21,7 +21,7 @@ import * as roleUtils from './roleUtils';
import { yamlEscapeKeyIfNeeded, yamlEscapeValueIfNeeded } from './yaml';
import type { AriaProps, AriaRegex, AriaRole, AriaTemplateNode, AriaTemplateRoleNode, AriaTemplateTextNode } from '@isomorphic/ariaSnapshot';
-import type { Builtins } from '../isomorphic/builtins';
+import type { Builtins } from '../../utils/isomorphic/builtins';
export type AriaNode = AriaProps & {
role: AriaRole | 'fragment' | 'iframe';
diff --git a/packages/playwright-core/src/server/injected/clock.ts b/packages/playwright-core/src/server/injected/clock.ts
index f2c8613b5b..0ea788015f 100644
--- a/packages/playwright-core/src/server/injected/clock.ts
+++ b/packages/playwright-core/src/server/injected/clock.ts
@@ -10,9 +10,9 @@
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import { ensureBuiltins } from '../isomorphic/builtins';
+import { ensureBuiltins } from '../../utils/isomorphic/builtins';
-import type { Builtins } from '../isomorphic/builtins';
+import type { Builtins } from '../../utils/isomorphic/builtins';
export type ClockMethods = {
Date: DateConstructor;
diff --git a/packages/playwright-core/src/server/injected/injectedScript.ts b/packages/playwright-core/src/server/injected/injectedScript.ts
index b9e1da06e6..be52d43afa 100644
--- a/packages/playwright-core/src/server/injected/injectedScript.ts
+++ b/packages/playwright-core/src/server/injected/injectedScript.ts
@@ -16,7 +16,7 @@
import { parseAriaSnapshot } from '@isomorphic/ariaSnapshot';
-import { ensureBuiltins } from '../isomorphic/builtins';
+import { ensureBuiltins } from '../../utils/isomorphic/builtins';
import { generateAriaTree, getAllByAria, matchesAriaTree, renderAriaTree } from './ariaSnapshot';
import { enclosingShadowRootOrDocument, isElementVisible, isInsideScope, parentElementOrShadowHost, setBrowserName } from './domUtils';
import { Highlight } from './highlight';
@@ -35,7 +35,7 @@ import { parseSelector, stringifySelector, visitAllSelectorParts } from '../../u
import { cacheNormalizedWhitespaces, normalizeWhiteSpace, trimStringWithEllipsis } from '../../utils/isomorphic/stringUtils';
import type { AriaSnapshot } from './ariaSnapshot';
-import type { Builtins } from '../isomorphic/builtins';
+import type { Builtins } from '../../utils/isomorphic/builtins';
import type { LayoutSelectorName } from './layoutSelectorUtils';
import type { SelectorEngine, SelectorRoot } from './selectorEngine';
import type { GenerateSelectorOptions } from './selectorGenerator';
diff --git a/packages/playwright-core/src/server/injected/reactSelectorEngine.ts b/packages/playwright-core/src/server/injected/reactSelectorEngine.ts
index c7ae904061..1a868921df 100644
--- a/packages/playwright-core/src/server/injected/reactSelectorEngine.ts
+++ b/packages/playwright-core/src/server/injected/reactSelectorEngine.ts
@@ -19,7 +19,7 @@ import { matchesComponentAttribute } from './selectorUtils';
import { parseAttributeSelector } from '../../utils/isomorphic/selectorParser';
import type { SelectorEngine, SelectorRoot } from './selectorEngine';
-import type { Builtins } from '../isomorphic/builtins';
+import type { Builtins } from '../../utils/isomorphic/builtins';
type ComponentNode = {
key?: any,
diff --git a/packages/playwright-core/src/server/injected/recorder/recorder.ts b/packages/playwright-core/src/server/injected/recorder/recorder.ts
index 81612f26aa..eff1c997ef 100644
--- a/packages/playwright-core/src/server/injected/recorder/recorder.ts
+++ b/packages/playwright-core/src/server/injected/recorder/recorder.ts
@@ -23,7 +23,7 @@ import type { ElementText } from '../selectorUtils';
import type * as actions from '@recorder/actions';
import type { ElementInfo, Mode, OverlayState, UIState } from '@recorder/recorderTypes';
import type { Language } from '@isomorphic/locatorGenerators';
-import type { Builtins } from '../../isomorphic/builtins';
+import type { Builtins } from '../../../utils/isomorphic/builtins';
const HighlightColors = {
multiple: '#f6b26b7f',
diff --git a/packages/playwright-core/src/server/injected/roleSelectorEngine.ts b/packages/playwright-core/src/server/injected/roleSelectorEngine.ts
index a4c04afed0..bbcde562f4 100644
--- a/packages/playwright-core/src/server/injected/roleSelectorEngine.ts
+++ b/packages/playwright-core/src/server/injected/roleSelectorEngine.ts
@@ -19,7 +19,7 @@ import { matchesAttributePart } from './selectorUtils';
import { parseAttributeSelector } from '../../utils/isomorphic/selectorParser';
import { normalizeWhiteSpace } from '../../utils/isomorphic/stringUtils';
-import type { Builtins } from '../isomorphic/builtins';
+import type { Builtins } from '../../utils/isomorphic/builtins';
import type { SelectorEngine, SelectorRoot } from './selectorEngine';
import type { AttributeSelectorOperator, AttributeSelectorPart } from '../../utils/isomorphic/selectorParser';
diff --git a/packages/playwright-core/src/server/injected/roleUtils.ts b/packages/playwright-core/src/server/injected/roleUtils.ts
index 0f22d07a8f..1da1e522c7 100644
--- a/packages/playwright-core/src/server/injected/roleUtils.ts
+++ b/packages/playwright-core/src/server/injected/roleUtils.ts
@@ -17,7 +17,7 @@
import { closestCrossShadow, elementSafeTagName, enclosingShadowRootOrDocument, getElementComputedStyle, isElementStyleVisibilityVisible, isVisibleTextNode, parentElementOrShadowHost } from './domUtils';
import type { AriaRole } from '@isomorphic/ariaSnapshot';
-import type { Builtins } from '../isomorphic/builtins';
+import type { Builtins } from '../../utils/isomorphic/builtins';
function hasExplicitAccessibleName(e: Element) {
return e.hasAttribute('aria-label') || e.hasAttribute('aria-labelledby');
diff --git a/packages/playwright-core/src/server/injected/selectorEvaluator.ts b/packages/playwright-core/src/server/injected/selectorEvaluator.ts
index 8147c08fc8..b470128a93 100644
--- a/packages/playwright-core/src/server/injected/selectorEvaluator.ts
+++ b/packages/playwright-core/src/server/injected/selectorEvaluator.ts
@@ -23,7 +23,7 @@ import { normalizeWhiteSpace } from '../../utils/isomorphic/stringUtils';
import type { LayoutSelectorName } from './layoutSelectorUtils';
import type { ElementText } from './selectorUtils';
import type { CSSComplexSelector, CSSComplexSelectorList, CSSFunctionArgument, CSSSimpleSelector } from '../../utils/isomorphic/cssParser';
-import type { Builtins } from '../isomorphic/builtins';
+import type { Builtins } from '../../utils/isomorphic/builtins';
type QueryContext = {
scope: Element | Document;
diff --git a/packages/playwright-core/src/server/injected/selectorGenerator.ts b/packages/playwright-core/src/server/injected/selectorGenerator.ts
index ed3c083b8b..9d46cf2331 100644
--- a/packages/playwright-core/src/server/injected/selectorGenerator.ts
+++ b/packages/playwright-core/src/server/injected/selectorGenerator.ts
@@ -20,7 +20,7 @@ import { elementText, getElementLabels } from './selectorUtils';
import { cssEscape, escapeForAttributeSelector, escapeForTextSelector, escapeRegExp, quoteCSSAttributeValue } from '../../utils/isomorphic/stringUtils';
import type { InjectedScript } from './injectedScript';
-import type { Builtins } from '../isomorphic/builtins';
+import type { Builtins } from '../../utils/isomorphic/builtins';
type SelectorToken = {
engine: string;
diff --git a/packages/playwright-core/src/server/injected/selectorUtils.ts b/packages/playwright-core/src/server/injected/selectorUtils.ts
index 422da2cb19..1410b81413 100644
--- a/packages/playwright-core/src/server/injected/selectorUtils.ts
+++ b/packages/playwright-core/src/server/injected/selectorUtils.ts
@@ -18,7 +18,7 @@ import { getAriaLabelledByElements } from './roleUtils';
import { normalizeWhiteSpace } from '../../utils/isomorphic/stringUtils';
import type { AttributeSelectorPart } from '../../utils/isomorphic/selectorParser';
-import type { Builtins } from '../isomorphic/builtins';
+import type { Builtins } from '../../utils/isomorphic/builtins';
export function matchesComponentAttribute(obj: any, attr: AttributeSelectorPart) {
for (const token of attr.jsonPath) {
diff --git a/packages/playwright-core/src/server/injected/utilityScript.ts b/packages/playwright-core/src/server/injected/utilityScript.ts
index c64150d292..a66d9ded8b 100644
--- a/packages/playwright-core/src/server/injected/utilityScript.ts
+++ b/packages/playwright-core/src/server/injected/utilityScript.ts
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-import { ensureBuiltins } from '../isomorphic/builtins';
-import { source } from '../isomorphic/utilityScriptSerializers';
+import { ensureBuiltins } from '../../utils/isomorphic/builtins';
+import { source } from '../../utils/isomorphic/utilityScriptSerializers';
-import type { Builtins } from '../isomorphic/builtins';
+import type { Builtins } from '../../utils/isomorphic/builtins';
export class UtilityScript {
constructor(isUnderTest: boolean) {
diff --git a/packages/playwright-core/src/server/injected/vueSelectorEngine.ts b/packages/playwright-core/src/server/injected/vueSelectorEngine.ts
index 7ff282e479..af928b43a3 100644
--- a/packages/playwright-core/src/server/injected/vueSelectorEngine.ts
+++ b/packages/playwright-core/src/server/injected/vueSelectorEngine.ts
@@ -19,7 +19,7 @@ import { matchesComponentAttribute } from './selectorUtils';
import { parseAttributeSelector } from '../../utils/isomorphic/selectorParser';
import type { SelectorEngine, SelectorRoot } from './selectorEngine';
-import type { Builtins } from '../isomorphic/builtins';
+import type { Builtins } from '../../utils/isomorphic/builtins';
type ComponentNode = {
name: string,
diff --git a/packages/playwright-core/src/server/injected/webSocketMock.ts b/packages/playwright-core/src/server/injected/webSocketMock.ts
index 92a2ace471..67bac5e236 100644
--- a/packages/playwright-core/src/server/injected/webSocketMock.ts
+++ b/packages/playwright-core/src/server/injected/webSocketMock.ts
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import { ensureBuiltins } from '../isomorphic/builtins';
+import { ensureBuiltins } from '../../utils/isomorphic/builtins';
export type WebSocketMessage = string | ArrayBufferLike | Blob | ArrayBufferView;
export type WSData = { data: string, isBase64: boolean };
diff --git a/packages/playwright-core/src/server/isomorphic/DEPS.list b/packages/playwright-core/src/server/isomorphic/DEPS.list
deleted file mode 100644
index 813c7f12f0..0000000000
--- a/packages/playwright-core/src/server/isomorphic/DEPS.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# Files in this folder are used both in Node.js and injected environments, they are isomorphic and can't have dependencies.
-[*]
-../../utils/isomorphic
\ No newline at end of file
diff --git a/packages/playwright-core/src/server/javascript.ts b/packages/playwright-core/src/server/javascript.ts
index 8617cd32b1..b6cea5d6af 100644
--- a/packages/playwright-core/src/server/javascript.ts
+++ b/packages/playwright-core/src/server/javascript.ts
@@ -17,8 +17,8 @@
import { SdkObject } from './instrumentation';
import * as utilityScriptSource from '../generated/utilityScriptSource';
import { isUnderTest } from '../utils';
-import { ensureBuiltins } from './isomorphic/builtins';
-import { source } from './isomorphic/utilityScriptSerializers';
+import { ensureBuiltins } from '../utils/isomorphic/builtins';
+import { source } from '../utils/isomorphic/utilityScriptSerializers';
import { LongStandingScope } from '../utils/isomorphic/manualPromise';
import type * as dom from './dom';
diff --git a/packages/playwright-core/src/server/page.ts b/packages/playwright-core/src/server/page.ts
index 24e22f4f9f..0169c3f922 100644
--- a/packages/playwright-core/src/server/page.ts
+++ b/packages/playwright-core/src/server/page.ts
@@ -24,7 +24,7 @@ import * as frames from './frames';
import { helper } from './helper';
import * as input from './input';
import { SdkObject } from './instrumentation';
-import { ensureBuiltins } from './isomorphic/builtins';
+import { ensureBuiltins } from '../utils/isomorphic/builtins';
import { createPageBindingScript, deliverBindingResult, takeBindingHandle } from './pageBinding';
import * as js from './javascript';
import { ProgressController } from './progress';
diff --git a/packages/playwright-core/src/server/pageBinding.ts b/packages/playwright-core/src/server/pageBinding.ts
index d0840562b9..77c5013d67 100644
--- a/packages/playwright-core/src/server/pageBinding.ts
+++ b/packages/playwright-core/src/server/pageBinding.ts
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-import { ensureBuiltins } from './isomorphic/builtins';
-import { source } from './isomorphic/utilityScriptSerializers';
+import { ensureBuiltins } from '../utils/isomorphic/builtins';
+import { source } from '../utils/isomorphic/utilityScriptSerializers';
-import type { Builtins } from './isomorphic/builtins';
-import type { SerializedValue } from './isomorphic/utilityScriptSerializers';
+import type { Builtins } from '../utils/isomorphic/builtins';
+import type { SerializedValue } from '../utils/isomorphic/utilityScriptSerializers';
export type BindingPayload = {
name: string;
diff --git a/packages/playwright-core/src/server/storageScript.ts b/packages/playwright-core/src/server/storageScript.ts
index a90f7b0f0b..a653e77b64 100644
--- a/packages/playwright-core/src/server/storageScript.ts
+++ b/packages/playwright-core/src/server/storageScript.ts
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-import type { Builtins } from './isomorphic/builtins';
-import type { source } from './isomorphic/utilityScriptSerializers';
+import type { Builtins } from '../utils/isomorphic/builtins';
+import type { source } from '../utils/isomorphic/utilityScriptSerializers';
import type * as channels from '@protocol/channels';
export type Storage = Omit<channels.OriginStorage, 'origin'>;
diff --git a/packages/playwright-core/src/server/isomorphic/builtins.ts b/packages/playwright-core/src/utils/isomorphic/builtins.ts
similarity index 100%
rename from packages/playwright-core/src/server/isomorphic/builtins.ts
rename to packages/playwright-core/src/utils/isomorphic/builtins.ts
diff --git a/packages/playwright-core/src/server/isomorphic/utilityScriptSerializers.ts b/packages/playwright-core/src/utils/isomorphic/utilityScriptSerializers.ts
similarity index 100%
rename from packages/playwright-core/src/server/isomorphic/utilityScriptSerializers.ts
rename to packages/playwright-core/src/utils/isomorphic/utilityScriptSerializers.ts
diff --git a/tests/config/baseTest.ts b/tests/config/baseTest.ts
index 0729b05e24..f75cf2d024 100644
--- a/tests/config/baseTest.ts
+++ b/tests/config/baseTest.ts
@@ -22,7 +22,7 @@ import type { ServerFixtures, ServerWorkerOptions } from './serverFixtures';
import { serverFixtures } from './serverFixtures';
import { platformTest } from './platformFixtures';
import { testModeTest } from './testModeFixtures';
-import type { Builtins } from '../../packages/playwright-core/src/server/isomorphic/builtins';
+import type { Builtins } from '../../packages/playwright-core/src/utils/isomorphic/builtins';
export const base = test;