Skip to content

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

chore: move codegen and device descriptors into @isomorphic (#41594)

Dmitry Gozmandd6342af46fe
diff --git a/packages/injected/src/recorder/pollingRecorder.ts b/packages/injected/src/recorder/pollingRecorder.ts
index 55dd2f0ea4..5649dd852b 100644
--- a/packages/injected/src/recorder/pollingRecorder.ts
+++ b/packages/injected/src/recorder/pollingRecorder.ts
@@ -18,7 +18,7 @@ import { Recorder } from './recorder';
import type { InjectedScript } from '../injectedScript';
import type { RecorderDelegate } from './recorder';
-import type * as actions from '@recorder/actions';
+import type * as actions from '@isomorphic/codegen/actions';
import type { ElementInfo, Mode, OverlayState, UIState } from '@recorder/recorderTypes';
interface Embedder {
diff --git a/packages/injected/src/recorder/recorder.ts b/packages/injected/src/recorder/recorder.ts
index fd51d5ca05..9005d70bc4 100644
--- a/packages/injected/src/recorder/recorder.ts
+++ b/packages/injected/src/recorder/recorder.ts
@@ -23,7 +23,7 @@ import type { AriaSnapshot } from '../ariaSnapshot';
import type { Highlight, HighlightEntry } from '../highlight';
import type { InjectedScript } from '../injectedScript';
import type { ElementText } from '../selectorUtils';
-import type * as actions from '@recorder/actions';
+import type * as actions from '@isomorphic/codegen/actions';
import type { ElementInfo, Mode, OverlayState, UIState } from '@recorder/recorderTypes';
import type { Language } from '@isomorphic/locatorGenerators';
diff --git a/packages/isomorphic/codegen/DEPS.list b/packages/isomorphic/codegen/DEPS.list
new file mode 100644
index 0000000000..e43dcb5d9f
--- /dev/null
+++ b/packages/isomorphic/codegen/DEPS.list
@@ -0,0 +1 @@
+[*]
diff --git a/packages/recorder/src/actions.d.ts b/packages/isomorphic/codegen/actions.d.ts
similarity index 100%
rename from packages/recorder/src/actions.d.ts
rename to packages/isomorphic/codegen/actions.d.ts
diff --git a/packages/playwright-core/src/server/codegen/csharp.ts b/packages/isomorphic/codegen/csharp.ts
similarity index 98%
rename from packages/playwright-core/src/server/codegen/csharp.ts
rename to packages/isomorphic/codegen/csharp.ts
index 078cf2dd48..af9bb4ff2f 100644
--- a/packages/playwright-core/src/server/codegen/csharp.ts
+++ b/packages/isomorphic/codegen/csharp.ts
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-import { asLocator } from '@isomorphic/locatorGenerators';
-import { escapeWithQuotes } from '@isomorphic/stringUtils';
+import { asLocator } from '../locatorGenerators';
+import { escapeWithQuotes } from '../stringUtils';
import { sanitizeDeviceOptions, toClickOptionsForSourceCode, toKeyboardModifiers, toSignalMap } from './language';
import { deviceDescriptors } from '../deviceDescriptors';
import type { Language, LanguageGenerator, LanguageGeneratorOptions } from './types';
-import type { BrowserContextOptions } from '../../..';
-import type * as actions from '@recorder/actions';
+import type { BrowserContextOptions } from 'playwright-core';
+import type * as actions from './actions';
type CSharpLanguageMode = 'library' | 'mstest' | 'nunit' | 'xunit';
diff --git a/packages/playwright-core/src/server/codegen/java.ts b/packages/isomorphic/codegen/java.ts
similarity index 97%
rename from packages/playwright-core/src/server/codegen/java.ts
rename to packages/isomorphic/codegen/java.ts
index 7aa8c3ce48..cbaa0cfebc 100644
--- a/packages/playwright-core/src/server/codegen/java.ts
+++ b/packages/isomorphic/codegen/java.ts
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-import { asLocator } from '@isomorphic/locatorGenerators';
-import { escapeWithQuotes } from '@isomorphic/stringUtils';
+import { asLocator } from '../locatorGenerators';
+import { escapeWithQuotes } from '../stringUtils';
import { toClickOptionsForSourceCode, toKeyboardModifiers, toSignalMap } from './language';
import { deviceDescriptors } from '../deviceDescriptors';
import { JavaScriptFormatter } from './javascript';
-import type { BrowserContextOptions } from '../../..';
-import type * as types from '../types';
+import type { BrowserContextOptions } from 'playwright-core';
+import type * as types from './types';
import type { Language, LanguageGenerator, LanguageGeneratorOptions } from './types';
-import type * as actions from '@recorder/actions';
+import type * as actions from './actions';
type JavaLanguageMode = 'library' | 'junit';
diff --git a/packages/playwright-core/src/server/codegen/javascript.ts b/packages/isomorphic/codegen/javascript.ts
similarity index 98%
rename from packages/playwright-core/src/server/codegen/javascript.ts
rename to packages/isomorphic/codegen/javascript.ts
index 202dd6797a..8972143a67 100644
--- a/packages/playwright-core/src/server/codegen/javascript.ts
+++ b/packages/isomorphic/codegen/javascript.ts
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-import { asLocator } from '@isomorphic/locatorGenerators';
-import { escapeWithQuotes, formatObject, formatObjectOrVoid } from '@isomorphic/stringUtils';
+import { asLocator } from '../locatorGenerators';
+import { escapeWithQuotes, formatObject, formatObjectOrVoid } from '../stringUtils';
import { sanitizeDeviceOptions, toClickOptionsForSourceCode, toKeyboardModifiers, toSignalMap } from './language';
import { deviceDescriptors } from '../deviceDescriptors';
import type { Language, LanguageGenerator, LanguageGeneratorOptions } from './types';
-import type { BrowserContextOptions } from '../../..';
-import type * as actions from '@recorder/actions';
+import type { BrowserContextOptions } from 'playwright-core';
+import type * as actions from './actions';
export class JavaScriptLanguageGenerator implements LanguageGenerator {
id: string;
diff --git a/packages/playwright-core/src/server/codegen/jsonl.ts b/packages/isomorphic/codegen/jsonl.ts
similarity index 92%
rename from packages/playwright-core/src/server/codegen/jsonl.ts
rename to packages/isomorphic/codegen/jsonl.ts
index 29591b6b38..c6c44ccad5 100644
--- a/packages/playwright-core/src/server/codegen/jsonl.ts
+++ b/packages/isomorphic/codegen/jsonl.ts
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-import { asLocator } from '@isomorphic/locatorGenerators';
+import { asLocator } from '../locatorGenerators';
import type { Language, LanguageGenerator, LanguageGeneratorOptions } from './types';
-import type * as actions from '@recorder/actions';
+import type * as actions from './actions';
export class JsonlLanguageGenerator implements LanguageGenerator {
id = 'jsonl';
diff --git a/packages/playwright-core/src/server/codegen/language.ts b/packages/isomorphic/codegen/language.ts
similarity index 96%
rename from packages/playwright-core/src/server/codegen/language.ts
rename to packages/isomorphic/codegen/language.ts
index 1da8a91561..413ee9f086 100644
--- a/packages/playwright-core/src/server/codegen/language.ts
+++ b/packages/isomorphic/codegen/language.ts
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-import type { BrowserContextOptions } from '../../..';
-import type * as types from '../types';
+import type { BrowserContextOptions } from 'playwright-core';
+import type * as types from './types';
import type { LanguageGenerator, LanguageGeneratorOptions } from './types';
-import type * as actions from '@recorder/actions';
+import type * as actions from './actions';
export function generateCode(actions: actions.ActionInContext[], languageGenerator: LanguageGenerator, options: LanguageGeneratorOptions) {
const header = languageGenerator.generateHeader(options);
diff --git a/packages/playwright-core/src/server/codegen/languages.ts b/packages/isomorphic/codegen/languages.ts
similarity index 100%
rename from packages/playwright-core/src/server/codegen/languages.ts
rename to packages/isomorphic/codegen/languages.ts
diff --git a/packages/playwright-core/src/server/codegen/python.ts b/packages/isomorphic/codegen/python.ts
similarity index 97%
rename from packages/playwright-core/src/server/codegen/python.ts
rename to packages/isomorphic/codegen/python.ts
index e9f9caf40a..833bdbda08 100644
--- a/packages/playwright-core/src/server/codegen/python.ts
+++ b/packages/isomorphic/codegen/python.ts
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-import { asLocator } from '@isomorphic/locatorGenerators';
-import { escapeWithQuotes, toSnakeCase } from '@isomorphic/stringUtils';
+import { asLocator } from '../locatorGenerators';
+import { escapeWithQuotes, toSnakeCase } from '../stringUtils';
import { sanitizeDeviceOptions, toClickOptionsForSourceCode, toKeyboardModifiers, toSignalMap } from './language';
import { deviceDescriptors } from '../deviceDescriptors';
import type { Language, LanguageGenerator, LanguageGeneratorOptions } from './types';
-import type { BrowserContextOptions } from '../../..';
-import type * as actions from '@recorder/actions';
+import type { BrowserContextOptions } from 'playwright-core';
+import type * as actions from './actions';
export class PythonLanguageGenerator implements LanguageGenerator {
id: string;
diff --git a/packages/playwright-core/src/server/codegen/types.ts b/packages/isomorphic/codegen/types.ts
similarity index 70%
rename from packages/playwright-core/src/server/codegen/types.ts
rename to packages/isomorphic/codegen/types.ts
index ef905649f5..105590eac7 100644
--- a/packages/playwright-core/src/server/codegen/types.ts
+++ b/packages/isomorphic/codegen/types.ts
@@ -14,11 +14,22 @@
* limitations under the License.
*/
-import type { BrowserContextOptions, LaunchOptions } from '../../..';
-import type * as actions from '@recorder/actions';
-import type { Language } from '@isomorphic/locatorGenerators';
+import type { BrowserContextOptions, LaunchOptions } from 'playwright-core';
+import type * as actions from './actions';
+import type { Language } from '../locatorGenerators';
+import type { Point } from '../types';
export type { Language };
+export type SmartKeyboardModifier = 'Alt' | 'Control' | 'Meta' | 'Shift' | 'ControlOrMeta';
+
+export type MouseClickOptions = {
+ modifiers?: SmartKeyboardModifier[];
+ position?: Point;
+ delay?: number;
+ button?: 'left' | 'right' | 'middle';
+ clickCount?: number;
+};
+
export type LanguageGeneratorOptions = {
browserName: string;
launchOptions: LaunchOptions;
diff --git a/packages/playwright-core/src/server/deviceDescriptors.ts b/packages/isomorphic/deviceDescriptors.ts
similarity index 100%
rename from packages/playwright-core/src/server/deviceDescriptors.ts
rename to packages/isomorphic/deviceDescriptors.ts
diff --git a/packages/playwright-core/src/server/deviceDescriptorsSource.json b/packages/isomorphic/deviceDescriptorsSource.json
similarity index 100%
rename from packages/playwright-core/src/server/deviceDescriptorsSource.json
rename to packages/isomorphic/deviceDescriptorsSource.json
diff --git a/packages/isomorphic/types.ts b/packages/isomorphic/types.ts
index 8bf7df0614..a3370e0b22 100644
--- a/packages/isomorphic/types.ts
+++ b/packages/isomorphic/types.ts
@@ -20,3 +20,13 @@ export type Rect = Size & Point;
export type Quad = [ Point, Point, Point, Point ];
export type NameValue = { name: string, value: string };
export type HeadersArray = NameValue[];
+
+export type DeviceDescriptor = {
+ userAgent: string,
+ viewport: Size,
+ deviceScaleFactor: number,
+ isMobile: boolean,
+ hasTouch: boolean,
+ defaultBrowserType: 'chromium' | 'firefox' | 'webkit'
+};
+export type Devices = { [name: string]: DeviceDescriptor };
diff --git a/packages/playwright-core/src/client/browserContext.ts b/packages/playwright-core/src/client/browserContext.ts
index 2052cbfeda..a914b800db 100644
--- a/packages/playwright-core/src/client/browserContext.ts
+++ b/packages/playwright-core/src/client/browserContext.ts
@@ -51,7 +51,7 @@ import type * as structs from '../../types/structs';
import type * as api from '../../types/types';
import type { URLMatch } from '@isomorphic/urlMatch';
import type * as channels from './channels';
-import type * as actions from '@recorder/actions';
+import type * as actions from '@isomorphic/codegen/actions';
interface RecorderEventSink {
actionAdded?(page: Page, actionInContext: actions.ActionInContext, code: string): void;
diff --git a/packages/playwright-core/src/server/DEPS.list b/packages/playwright-core/src/server/DEPS.list
index f9cf05a0b3..d074147741 100644
--- a/packages/playwright-core/src/server/DEPS.list
+++ b/packages/playwright-core/src/server/DEPS.list
@@ -5,7 +5,6 @@
../package.ts
../protocol/
./
-./codegen/
./har/
./recorder/
./registry/
diff --git a/packages/playwright-core/src/server/codegen/DEPS.list b/packages/playwright-core/src/server/codegen/DEPS.list
deleted file mode 100644
index 2258dc1a04..0000000000
--- a/packages/playwright-core/src/server/codegen/DEPS.list
+++ /dev/null
@@ -1,3 +0,0 @@
-[*]
-@isomorphic/**
-../deviceDescriptors.ts
diff --git a/packages/playwright-core/src/server/debugController.ts b/packages/playwright-core/src/server/debugController.ts
index a733dd2379..ff755bfdd2 100644
--- a/packages/playwright-core/src/server/debugController.ts
+++ b/packages/playwright-core/src/server/debugController.ts
@@ -19,11 +19,11 @@ import { parseAriaSnapshotUnsafe } from '@isomorphic/ariaSnapshot';
import { unsafeLocatorOrSelectorAsSelector } from '@isomorphic/locatorParser';
import { gracefullyProcessExitDoNotHang } from '@utils/processLauncher';
import { asLocator } from '@isomorphic/locatorGenerators';
+import { generateCode } from '@isomorphic/codegen/language';
+import { JavaScriptLanguageGenerator } from '@isomorphic/codegen/javascript';
import { SdkObject, createInstrumentation } from './instrumentation';
import { Recorder, RecorderEvent } from './recorder';
-import { generateCode } from './codegen/language';
import { collapseActions } from './recorder/recorderUtils';
-import { JavaScriptLanguageGenerator } from './codegen/javascript';
import type { Language } from '@isomorphic/locatorGenerators';
import type { BrowserContext } from './browserContext';
@@ -31,7 +31,7 @@ import type { InstrumentationListener } from './instrumentation';
import type { Playwright } from './playwright';
import type { ElementInfo, Mode } from '@recorder/recorderTypes';
import type { Progress } from './progress';
-import type * as actions from '@recorder/actions';
+import type * as actions from '@isomorphic/codegen/actions';
export class DebugController extends SdkObject {
static Events = {
diff --git a/packages/playwright-core/src/server/dispatchers/localUtilsDispatcher.ts b/packages/playwright-core/src/server/dispatchers/localUtilsDispatcher.ts
index eb44eed454..536d92e6fd 100644
--- a/packages/playwright-core/src/server/dispatchers/localUtilsDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/localUtilsDispatcher.ts
@@ -16,12 +16,12 @@
import net from 'net';
import { resolveGlobToRegexPattern } from '@isomorphic/urlMatch';
+import { deviceDescriptors as descriptors } from '@isomorphic/deviceDescriptors';
import { fetchData } from '../utils';
import { getUserAgent } from '../userAgent';
import { Dispatcher } from './dispatcher';
import { SdkObject } from '../instrumentation';
import * as localUtils from '../localUtils';
-import { deviceDescriptors as descriptors } from '../deviceDescriptors';
import { JsonPipeDispatcher } from '../dispatchers/jsonPipeDispatcher';
import { PipeTransport } from '../pipeTransport';
import { Progress } from '../progress';
diff --git a/packages/playwright-core/src/server/index.ts b/packages/playwright-core/src/server/index.ts
index 0dad0c0e6f..f98b5cfc2e 100644
--- a/packages/playwright-core/src/server/index.ts
+++ b/packages/playwright-core/src/server/index.ts
@@ -17,7 +17,7 @@
export { Browser } from './browser';
export { BrowserContext } from './browserContext';
export { findRepeatedSubsequencesForTest } from './callLog';
-export { deviceDescriptors } from './deviceDescriptors';
+export { deviceDescriptors } from '@isomorphic/deviceDescriptors';
export { DispatcherConnection, RootDispatcher, setMaxDispatchersForTest } from './dispatchers/dispatcher';
export { RequestDispatcher, ResponseDispatcher } from './dispatchers/networkDispatchers';
export { PlaywrightDispatcher } from './dispatchers/playwrightDispatcher';
diff --git a/packages/playwright-core/src/server/recorder.ts b/packages/playwright-core/src/server/recorder.ts
index 360431911b..ede46cd5b9 100644
--- a/packages/playwright-core/src/server/recorder.ts
+++ b/packages/playwright-core/src/server/recorder.ts
@@ -34,13 +34,13 @@ import { Frame } from './frames';
import { Page } from './page';
import { performAction } from './recorder/recorderRunner';
-import type { Language } from './codegen/types';
+import type { Language } from '@isomorphic/codegen/types';
import type { CallMetadata, InstrumentationListener, SdkObject } from './instrumentation';
import type { Point } from '@isomorphic/types';
import type { AriaTemplateNode } from '@isomorphic/ariaSnapshot';
import type { Progress } from './progress';
import type * as channels from './channels';
-import type * as actions from '@recorder/actions';
+import type * as actions from '@isomorphic/codegen/actions';
import type { CallLog, CallLogStatus, ElementInfo, Mode, OverlayState, Source, UIState } from '@recorder/recorderTypes';
import type { RegisteredListener } from '@utils/eventsHelper';
diff --git a/packages/playwright-core/src/server/recorder/DEPS.list b/packages/playwright-core/src/server/recorder/DEPS.list
index a2d3fe744f..fa2415126a 100644
--- a/packages/playwright-core/src/server/recorder/DEPS.list
+++ b/packages/playwright-core/src/server/recorder/DEPS.list
@@ -2,7 +2,5 @@
@isomorphic/**
@utils/**
../
-../codegen/language.ts
-../codegen/languages.ts
../../package.ts
node_modules/mime
diff --git a/packages/playwright-core/src/server/recorder/recorderApp.ts b/packages/playwright-core/src/server/recorder/recorderApp.ts
index 9e6b37e7c5..c692d1cc36 100644
--- a/packages/playwright-core/src/server/recorder/recorderApp.ts
+++ b/packages/playwright-core/src/server/recorder/recorderApp.ts
@@ -19,21 +19,21 @@ import path from 'path';
import mime from 'mime';
import { isUnderTest } from '@utils/debug';
+import { languageSet } from '@isomorphic/codegen/languages';
+import { generateCode } from '@isomorphic/codegen/language';
import { libPath } from '../../package';
import { syncLocalStorageWithSettings } from '../launchApp';
import { launchApp } from '../launchApp';
import { nullProgress, ProgressController } from '../progress';
import { ThrottledFile } from './throttledFile';
-import { languageSet } from '../codegen/languages';
import { collapseActions, shouldMergeAction } from './recorderUtils';
-import { generateCode } from '../codegen/language';
import { Recorder, RecorderEvent } from '../recorder';
import { BrowserContext } from '../browserContext';
import type { Page } from '../page';
-import type * as actions from '@recorder/actions';
+import type * as actions from '@isomorphic/codegen/actions';
import type { CallLog, ElementInfo, Mode, RecorderBackend, RecorderFrontend, Source } from '@recorder/recorderTypes';
-import type { Language, LanguageGeneratorOptions } from '../codegen/types';
+import type { Language, LanguageGeneratorOptions } from '@isomorphic/codegen/types';
import type * as channels from '../channels';
import type { Progress } from '../progress';
import type { AriaTemplateNode } from '@isomorphic/ariaSnapshot';
diff --git a/packages/playwright-core/src/server/recorder/recorderRunner.ts b/packages/playwright-core/src/server/recorder/recorderRunner.ts
index 125e748396..dc0dc804a9 100644
--- a/packages/playwright-core/src/server/recorder/recorderRunner.ts
+++ b/packages/playwright-core/src/server/recorder/recorderRunner.ts
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-import { toKeyboardModifiers } from '../codegen/language';
+import { toKeyboardModifiers } from '@isomorphic/codegen/language';
import { buildFullSelector, mainFrameForAction } from './recorderUtils';
import { Progress } from '../progress';
import type { Page } from '../page';
import type * as types from '../types';
-import type * as actions from '@recorder/actions';
+import type * as actions from '@isomorphic/codegen/actions';
import type { Frame } from '../frames';
export async function performAction(progress: Progress, pageAliases: Map<Page, string>, actionInContext: actions.ActionInContext) {
diff --git a/packages/playwright-core/src/server/recorder/recorderSignalProcessor.ts b/packages/playwright-core/src/server/recorder/recorderSignalProcessor.ts
index ce8e0349d2..634b65b206 100644
--- a/packages/playwright-core/src/server/recorder/recorderSignalProcessor.ts
+++ b/packages/playwright-core/src/server/recorder/recorderSignalProcessor.ts
@@ -19,9 +19,9 @@ import { isUnderTest } from '@utils/debug';
import { generateFrameSelector } from './recorderUtils';
import { nullProgress } from '../progress';
-import type { Signal } from '../../../../recorder/src/actions';
+import type { Signal } from '@isomorphic/codegen/actions';
import type { Frame } from '../frames';
-import type * as actions from '@recorder/actions';
+import type * as actions from '@isomorphic/codegen/actions';
export interface ProcessorDelegate {
addAction(actionInContext: actions.ActionInContext): void;
diff --git a/packages/playwright-core/src/server/recorder/recorderUtils.ts b/packages/playwright-core/src/server/recorder/recorderUtils.ts
index fcbf6c835f..67349e5856 100644
--- a/packages/playwright-core/src/server/recorder/recorderUtils.ts
+++ b/packages/playwright-core/src/server/recorder/recorderUtils.ts
@@ -22,7 +22,7 @@ import { Frame } from '../frames';
import type { CallMetadata } from '../instrumentation';
import type { Page } from '../page';
-import type * as actions from '@recorder/actions';
+import type * as actions from '@isomorphic/codegen/actions';
import type { CallLog, CallLogStatus } from '@recorder/recorderTypes';
import type { Progress } from '../progress';
diff --git a/packages/playwright-core/src/server/types.ts b/packages/playwright-core/src/server/types.ts
index 4c3fb2cf22..a834844c09 100644
--- a/packages/playwright-core/src/server/types.ts
+++ b/packages/playwright-core/src/server/types.ts
@@ -16,7 +16,7 @@
*/
import type { HeadersArray, Point, Size } from '@isomorphic/types';
-export type { HeadersArray, Point, Quad, Rect, Size } from '@isomorphic/types';
+export type { HeadersArray, Point, Quad, Rect, Size, DeviceDescriptor, Devices } from '@isomorphic/types';
import type * as channels from './channels';
import type { ProxySettings } from '@utils/network';
@@ -94,15 +94,6 @@ export type ForcedColors = 'active' | 'none' | 'no-override';
export type Contrast = 'no-preference' | 'more' | 'no-override';
-export type DeviceDescriptor = {
- userAgent: string,
- viewport: Size,
- deviceScaleFactor: number,
- isMobile: boolean,
- hasTouch: boolean,
- defaultBrowserType: 'chromium' | 'firefox' | 'webkit'
-};
-export type Devices = { [name: string]: DeviceDescriptor };
export type { ProxySettings } from '@utils/network';
export type KeyboardModifier = 'Alt' | 'Control' | 'Meta' | 'Shift';
diff --git a/tests/library/inspector/recorder-api.spec.ts b/tests/library/inspector/recorder-api.spec.ts
index f59d24a7e7..568c09df57 100644
--- a/tests/library/inspector/recorder-api.spec.ts
+++ b/tests/library/inspector/recorder-api.spec.ts
@@ -17,7 +17,7 @@
import { test, expect } from './inspectorTest';
import type { Page } from '@playwright/test';
-import type * as actions from '@recorder/actions';
+import type * as actions from '@isomorphic/codegen/actions';
class RecorderLog {
actions: (actions.ActionInContext & { code: string })[] = [];
diff --git a/utils/build/build.js b/utils/build/build.js
index 59e147d405..2c0fbf6502 100644
--- a/utils/build/build.js
+++ b/utils/build/build.js
@@ -985,7 +985,7 @@ onChanges.push({
'packages/playwright-core/src/server/chromium/protocol.d.ts',
],
mustExist: [
- 'packages/playwright-core/lib/server/deviceDescriptorsSource.json',
+ 'packages/isomorphic/deviceDescriptorsSource.json',
],
script: 'utils/generate_types/index.js',
});
diff --git a/utils/doclint/cli.js b/utils/doclint/cli.js
index 79c4ff7363..3dc1146727 100755
--- a/utils/doclint/cli.js
+++ b/utils/doclint/cli.js
@@ -90,7 +90,7 @@ async function run() {
// Update device descriptors
{
- const devicesDescriptorsSourceFile = path.join(PROJECT_DIR, 'packages', 'playwright-core', 'src', 'server', 'deviceDescriptorsSource.json')
+ const devicesDescriptorsSourceFile = path.join(PROJECT_DIR, 'packages', 'isomorphic', 'deviceDescriptorsSource.json')
const devicesDescriptors = require(devicesDescriptorsSourceFile)
for (const deviceName of Object.keys(devicesDescriptors)) {
switch (devicesDescriptors[deviceName].defaultBrowserType) {
diff --git a/utils/generate_types/index.js b/utils/generate_types/index.js
index c0cf8c46b9..a2b61decfc 100644
--- a/utils/generate_types/index.js
+++ b/utils/generate_types/index.js
@@ -16,7 +16,7 @@
// @ts-check
const path = require('path');
-const devices = require('../../packages/playwright-core/lib/server/deviceDescriptorsSource.json');
+const devices = require('../../packages/isomorphic/deviceDescriptorsSource.json');
const md = require('../markdown');
const docs = require('../doclint/documentation');
const PROJECT_DIR = path.join(__dirname, '..', '..');