chore: merge server/isomorphic into utils/isomorphic

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",

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]
 ../**

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';

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';

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;

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';

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,

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',

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';
 

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');

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;

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;

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) {

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) {

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,

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 };

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';

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';

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;

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'>;

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;