diff --git a/packages/playwright-core/src/server/deviceDescriptors.js b/packages/playwright-core/src/server/deviceDescriptors.ts similarity index 81% rename from packages/playwright-core/src/server/deviceDescriptors.js rename to packages/playwright-core/src/server/deviceDescriptors.ts index 628064098b..543081f38a 100644 --- a/packages/playwright-core/src/server/deviceDescriptors.js +++ b/packages/playwright-core/src/server/deviceDescriptors.ts @@ -15,7 +15,8 @@ * limitations under the License. */ -/** - * @type {import('./types').Devices} - */ -module.exports = require("./deviceDescriptorsSource.json") +import type { Devices } from './types'; + +import deviceDescriptors from './deviceDescriptorsSource.json'; + +export default deviceDescriptors as Devices; diff --git a/packages/playwright-core/src/server/dispatchers/localUtilsDispatcher.ts b/packages/playwright-core/src/server/dispatchers/localUtilsDispatcher.ts index 732e135e14..c4f32d180f 100644 --- a/packages/playwright-core/src/server/dispatchers/localUtilsDispatcher.ts +++ b/packages/playwright-core/src/server/dispatchers/localUtilsDispatcher.ts @@ -26,7 +26,7 @@ import { Dispatcher } from './dispatcher'; import { yazl, yauzl } from '../../zipBundle'; import { ZipFile } from '../../utils/zipFile'; import type * as har from '@trace/har'; -import type { HeadersArray, Devices } from '../types'; +import type { HeadersArray } from '../types'; import { JsonPipeDispatcher } from '../dispatchers/jsonPipeDispatcher'; import { WebSocketTransport } from '../transport'; import { SocksInterceptor } from '../socksInterceptor'; @@ -40,6 +40,7 @@ import type http from 'http'; import type { Playwright } from '../playwright'; import { SdkObject } from '../../server/instrumentation'; import { serializeClientSideCallMetadata } from '../../utils'; +import descriptors from '../deviceDescriptors'; export class LocalUtilsDispatcher extends Dispatcher<{ guid: string }, channels.LocalUtilsChannel, RootDispatcher> implements channels.LocalUtilsChannel { _type_LocalUtils: boolean; @@ -53,7 +54,6 @@ export class LocalUtilsDispatcher extends Dispatcher<{ guid: string }, channels. constructor(scope: RootDispatcher, playwright: Playwright) { const localUtils = new SdkObject(playwright, 'localUtils', 'localUtils'); - const descriptors = require('../deviceDescriptors') as Devices; const deviceDescriptors = Object.entries(descriptors) .map(([name, descriptor]) => ({ name, descriptor })); super(scope, localUtils, 'LocalUtils', { diff --git a/packages/playwright-core/src/server/recorder/csharp.ts b/packages/playwright-core/src/server/recorder/csharp.ts index 46fadc244a..15f97a9382 100644 --- a/packages/playwright-core/src/server/recorder/csharp.ts +++ b/packages/playwright-core/src/server/recorder/csharp.ts @@ -22,7 +22,7 @@ import type { Action } from './recorderActions'; import type { MouseClickOptions } from './utils'; import { toModifiers } from './utils'; import { escapeWithQuotes } from '../../utils/isomorphic/stringUtils'; -const deviceDescriptors = require('../deviceDescriptorsSource.json'); +import deviceDescriptors from '../deviceDescriptors'; import { asLocator } from '../../utils/isomorphic/locatorGenerators'; type CSharpLanguageMode = 'library' | 'mstest' | 'nunit'; diff --git a/packages/playwright-core/src/server/recorder/java.ts b/packages/playwright-core/src/server/recorder/java.ts index d4ebfdeea4..5b270b6c41 100644 --- a/packages/playwright-core/src/server/recorder/java.ts +++ b/packages/playwright-core/src/server/recorder/java.ts @@ -21,7 +21,7 @@ import type { ActionInContext } from './codeGenerator'; import type { Action } from './recorderActions'; import type { MouseClickOptions } from './utils'; import { toModifiers } from './utils'; -const deviceDescriptors = require('../deviceDescriptorsSource.json'); +import deviceDescriptors from '../deviceDescriptors'; import { JavaScriptFormatter } from './javascript'; import { escapeWithQuotes } from '../../utils/isomorphic/stringUtils'; import { asLocator } from '../../utils/isomorphic/locatorGenerators'; diff --git a/packages/playwright-core/src/server/recorder/javascript.ts b/packages/playwright-core/src/server/recorder/javascript.ts index 548e0f6071..1ab97f4fcb 100644 --- a/packages/playwright-core/src/server/recorder/javascript.ts +++ b/packages/playwright-core/src/server/recorder/javascript.ts @@ -21,7 +21,7 @@ import type { ActionInContext } from './codeGenerator'; import type { Action } from './recorderActions'; import type { MouseClickOptions } from './utils'; import { toModifiers } from './utils'; -const deviceDescriptors = require('../deviceDescriptorsSource.json'); +import deviceDescriptors from '../deviceDescriptors'; import { escapeWithQuotes } from '../../utils/isomorphic/stringUtils'; import { asLocator } from '../../utils/isomorphic/locatorGenerators'; diff --git a/packages/playwright-core/src/server/recorder/python.ts b/packages/playwright-core/src/server/recorder/python.ts index 3be02684bd..dfac3a9256 100644 --- a/packages/playwright-core/src/server/recorder/python.ts +++ b/packages/playwright-core/src/server/recorder/python.ts @@ -22,7 +22,7 @@ import type { Action } from './recorderActions'; import type { MouseClickOptions } from './utils'; import { toModifiers } from './utils'; import { escapeWithQuotes, toSnakeCase } from '../../utils/isomorphic/stringUtils'; -const deviceDescriptors = require('../deviceDescriptorsSource.json'); +import deviceDescriptors from '../deviceDescriptors'; import { asLocator } from '../../utils/isomorphic/locatorGenerators'; export class PythonLanguageGenerator implements LanguageGenerator { diff --git a/utils/generate_types/index.js b/utils/generate_types/index.js index 24966b1704..a2db3c7408 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/deviceDescriptors'); +const devices = require('../../packages/playwright-core/lib/server/deviceDescriptorsSource.json'); const md = require('../markdown'); const docs = require('../doclint/documentation'); const PROJECT_DIR = path.join(__dirname, '..', '..');