Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

import deviceDescriptors instead of require

Browse source
This commit is contained in:
Rui Figueira 2024-04-11 02:19:19 +01:00
parent bff9f30b6f
commit 9122972570
7 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packages/playwright-core/src/server/deviceDescriptors.js → packages/playwright-core/src/server/deviceDescriptors.ts
View file

@ -15,7 +15,8 @@
* limitations under the License. * limitations under the License.
*/ */
/** import type { Devices } from './types';
* @type {import('./types').Devices}
*/ import deviceDescriptors from './deviceDescriptorsSource.json';
module.exports = require("./deviceDescriptorsSource.json")
export default deviceDescriptors as Devices;

4
packages/playwright-core/src/server/dispatchers/localUtilsDispatcher.ts
View file

@ -26,7 +26,7 @@ import { Dispatcher } from './dispatcher';
import { yazl, yauzl } from '../../zipBundle'; import { yazl, yauzl } from '../../zipBundle';
import { ZipFile } from '../../utils/zipFile'; import { ZipFile } from '../../utils/zipFile';
import type * as har from '@trace/har'; import type * as har from '@trace/har';
import type { HeadersArray, Devices } from '../types'; import type { HeadersArray } from '../types';
import { JsonPipeDispatcher } from '../dispatchers/jsonPipeDispatcher'; import { JsonPipeDispatcher } from '../dispatchers/jsonPipeDispatcher';
import { WebSocketTransport } from '../transport'; import { WebSocketTransport } from '../transport';
import { SocksInterceptor } from '../socksInterceptor'; import { SocksInterceptor } from '../socksInterceptor';
@ -40,6 +40,7 @@ import type http from 'http';
import type { Playwright } from '../playwright'; import type { Playwright } from '../playwright';
import { SdkObject } from '../../server/instrumentation'; import { SdkObject } from '../../server/instrumentation';
import { serializeClientSideCallMetadata } from '../../utils'; import { serializeClientSideCallMetadata } from '../../utils';
import descriptors from '../deviceDescriptors';
export class LocalUtilsDispatcher extends Dispatcher<{ guid: string }, channels.LocalUtilsChannel, RootDispatcher> implements channels.LocalUtilsChannel { export class LocalUtilsDispatcher extends Dispatcher<{ guid: string }, channels.LocalUtilsChannel, RootDispatcher> implements channels.LocalUtilsChannel {
_type_LocalUtils: boolean; _type_LocalUtils: boolean;
@ -53,7 +54,6 @@ export class LocalUtilsDispatcher extends Dispatcher<{ guid: string }, channels.
constructor(scope: RootDispatcher, playwright: Playwright) { constructor(scope: RootDispatcher, playwright: Playwright) {
const localUtils = new SdkObject(playwright, 'localUtils', 'localUtils'); const localUtils = new SdkObject(playwright, 'localUtils', 'localUtils');
const descriptors = require('../deviceDescriptors') as Devices;
const deviceDescriptors = Object.entries(descriptors) const deviceDescriptors = Object.entries(descriptors)
.map(([name, descriptor]) => ({ name, descriptor })); .map(([name, descriptor]) => ({ name, descriptor }));
super(scope, localUtils, 'LocalUtils', { super(scope, localUtils, 'LocalUtils', {

2
packages/playwright-core/src/server/recorder/csharp.ts
View file

@ -22,7 +22,7 @@ import type { Action } from './recorderActions';
import type { MouseClickOptions } from './utils'; import type { MouseClickOptions } from './utils';
import { toModifiers } from './utils'; import { toModifiers } from './utils';
import { escapeWithQuotes } from '../../utils/isomorphic/stringUtils'; import { escapeWithQuotes } from '../../utils/isomorphic/stringUtils';
const deviceDescriptors = require('../deviceDescriptorsSource.json'); import deviceDescriptors from '../deviceDescriptors';
import { asLocator } from '../../utils/isomorphic/locatorGenerators'; import { asLocator } from '../../utils/isomorphic/locatorGenerators';
type CSharpLanguageMode = 'library' | 'mstest' | 'nunit'; type CSharpLanguageMode = 'library' | 'mstest' | 'nunit';

2
packages/playwright-core/src/server/recorder/java.ts
View file

@ -21,7 +21,7 @@ import type { ActionInContext } from './codeGenerator';
import type { Action } from './recorderActions'; import type { Action } from './recorderActions';
import type { MouseClickOptions } from './utils'; import type { MouseClickOptions } from './utils';
import { toModifiers } from './utils'; import { toModifiers } from './utils';
const deviceDescriptors = require('../deviceDescriptorsSource.json'); import deviceDescriptors from '../deviceDescriptors';
import { JavaScriptFormatter } from './javascript'; import { JavaScriptFormatter } from './javascript';
import { escapeWithQuotes } from '../../utils/isomorphic/stringUtils'; import { escapeWithQuotes } from '../../utils/isomorphic/stringUtils';
import { asLocator } from '../../utils/isomorphic/locatorGenerators'; import { asLocator } from '../../utils/isomorphic/locatorGenerators';

2
packages/playwright-core/src/server/recorder/javascript.ts
View file

@ -21,7 +21,7 @@ import type { ActionInContext } from './codeGenerator';
import type { Action } from './recorderActions'; import type { Action } from './recorderActions';
import type { MouseClickOptions } from './utils'; import type { MouseClickOptions } from './utils';
import { toModifiers } from './utils'; import { toModifiers } from './utils';
const deviceDescriptors = require('../deviceDescriptorsSource.json'); import deviceDescriptors from '../deviceDescriptors';
import { escapeWithQuotes } from '../../utils/isomorphic/stringUtils'; import { escapeWithQuotes } from '../../utils/isomorphic/stringUtils';
import { asLocator } from '../../utils/isomorphic/locatorGenerators'; import { asLocator } from '../../utils/isomorphic/locatorGenerators';

2
packages/playwright-core/src/server/recorder/python.ts
View file

@ -22,7 +22,7 @@ import type { Action } from './recorderActions';
import type { MouseClickOptions } from './utils'; import type { MouseClickOptions } from './utils';
import { toModifiers } from './utils'; import { toModifiers } from './utils';
import { escapeWithQuotes, toSnakeCase } from '../../utils/isomorphic/stringUtils'; import { escapeWithQuotes, toSnakeCase } from '../../utils/isomorphic/stringUtils';
const deviceDescriptors = require('../deviceDescriptorsSource.json'); import deviceDescriptors from '../deviceDescriptors';
import { asLocator } from '../../utils/isomorphic/locatorGenerators'; import { asLocator } from '../../utils/isomorphic/locatorGenerators';
export class PythonLanguageGenerator implements LanguageGenerator { export class PythonLanguageGenerator implements LanguageGenerator {

2
utils/generate_types/index.js
View file

@ -16,7 +16,7 @@
// @ts-check // @ts-check
const path = require('path'); 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 md = require('../markdown');
const docs = require('../doclint/documentation'); const docs = require('../doclint/documentation');
const PROJECT_DIR = path.join(__dirname, '..', '..'); const PROJECT_DIR = path.join(__dirname, '..', '..');