feat(test runner): `--tsconfig` cli option (#31932)

Introduce `--tsconfig` to specify a single config to be used for all
imported files, instead of looking up tsconfig for each file separately.

Fixes #12829.
This commit is contained in:
Dmitry Gozman 2024-08-06 06:55:15 -07:00 коммит произвёл GitHub
Родитель bff97b4810
Коммит a54ed48b42
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
13 изменённых файлов: 137 добавлений и 40 удалений

Просмотреть файл

@ -103,5 +103,6 @@ Complete set of Playwright Test options is available in the [configuration file]
| `--shard <shard>` | [Shard](./test-parallel.md#shard-tests-between-multiple-machines) tests and execute only selected shard, specified in the form `current/all`, 1-based, for example `3/5`.|
| `--timeout <number>` | Maximum timeout in milliseconds for each test, defaults to 30 seconds. Learn more about [various timeouts](./test-timeouts.md).|
| `--trace <mode>` | Force tracing mode, can be `on`, `off`, `on-first-retry`, `on-all-retries`, `retain-on-failure` |
| `--tsconfig <path>` | Path to a single tsconfig applicable to all imported files. See [tsconfig resolution](./test-typescript.md#tsconfig-resolution) for more details. |
| `--update-snapshots` or `-u` | Whether to update [snapshots](./test-snapshots.md) with actual results instead of comparing them. Use this when snapshot expectations have changed.|
| `--workers <number>` or `-j <number>`| The maximum number of concurrent worker processes that run in [parallel](./test-parallel.md). |

Просмотреть файл

@ -5,9 +5,9 @@ title: "TypeScript"
## Introduction
Playwright supports TypeScript out of the box. You just write tests in TypeScript, and Playwright will read them, transform to JavaScript and run. Note that Playwright does not check the types and will run tests even if there are non-critical TypeScript compilation errors.
Playwright supports TypeScript out of the box. You just write tests in TypeScript, and Playwright will read them, transform to JavaScript and run.
We recommend you run TypeScript compiler alongside Playwright. For example on GitHub actions:
Note that Playwright does not check the types and will run tests even if there are non-critical TypeScript compilation errors. We recommend you run TypeScript compiler alongside Playwright. For example on GitHub actions:
```yaml
jobs:
@ -28,7 +28,7 @@ npx tsc -p tsconfig.json --noEmit -w
## tsconfig.json
Playwright will pick up `tsconfig.json` for each source file it loads. Note that Playwright **only supports** the following tsconfig options: `paths` and `baseUrl`.
Playwright will pick up `tsconfig.json` for each source file it loads. Note that Playwright **only supports** the following tsconfig options: `allowJs`, `baseUrl`, `paths` and `references`.
We recommend setting up a separate `tsconfig.json` in the tests directory so that you can change some preferences specifically for the tests. Here is an example directory structure.
@ -49,12 +49,12 @@ playwright.config.ts
Playwright supports [path mapping](https://www.typescriptlang.org/docs/handbook/module-resolution.html#path-mapping) declared in the `tsconfig.json`. Make sure that `baseUrl` is also set.
Here is an example `tsconfig.json` that works with Playwright Test:
Here is an example `tsconfig.json` that works with Playwright:
```json
```json title="tsconfig.json"
{
"compilerOptions": {
"baseUrl": ".", // This must be specified if "paths" is.
"baseUrl": ".",
"paths": {
"@myhelper/*": ["packages/myhelper/*"] // This mapping is relative to "baseUrl".
}
@ -74,6 +74,22 @@ test('example', async ({ page }) => {
});
```
### tsconfig resolution
By default, Playwright will look up a closest tsconfig for each imported file by going up the directory structure and looking for `tsconfig.json` or `jsconfig.json`. This way, you can create a `tests/tsconfig.json` file that will be used only for your tests and Playwright will pick it up automatically.
```sh
# Playwright will choose tsconfig automatically
npx playwrigh test
```
Alternatively, you can specify a single tsconfig file to use in the command line, and Playwright will use it for all imported files, not only test files.
```sh
# Pass a specific tsconfig
npx playwrigh test --tsconfig=tsconfig.test.json
```
## Manually compile tests with TypeScript
Sometimes, Playwright Test will not be able to transform your TypeScript code correctly, for example when you are using experimental or very recent features of TypeScript, usually configured in `tsconfig.json`.

Просмотреть файл

@ -24,7 +24,6 @@ import { getPackageJsonPath, mergeObjects } from '../util';
import type { Matcher } from '../util';
import type { ConfigCLIOverrides } from './ipc';
import type { FullConfig, FullProject } from '../../types/testReporter';
import { setTransformConfig } from '../transform/transform';
export type ConfigLocation = {
resolvedConfigFile?: string;
@ -128,10 +127,6 @@ export class FullConfigInternal {
this.projects = projectConfigs.map(p => new FullProjectInternal(configDir, userConfig, this, p, this.configCLIOverrides, packageJsonDir));
resolveProjectDependencies(this.projects);
this._assignUniqueProjectIds(this.projects);
setTransformConfig({
babelPlugins: privateConfiguration?.babelPlugins || [],
external: userConfig.build?.external || [],
});
this.config.projects = this.projects.map(p => p.project);
}

Просмотреть файл

@ -18,13 +18,13 @@ import * as fs from 'fs';
import * as path from 'path';
import { gracefullyProcessExitDoNotHang, isRegExp } from 'playwright-core/lib/utils';
import type { ConfigCLIOverrides, SerializedConfig } from './ipc';
import { requireOrImport } from '../transform/transform';
import { requireOrImport, setSingleTSConfig, setTransformConfig } from '../transform/transform';
import type { Config, Project } from '../../types/test';
import { errorWithFile, fileIsModule } from '../util';
import type { ConfigLocation } from './config';
import { FullConfigInternal } from './config';
import { addToCompilationCache } from '../transform/compilationCache';
import { initializeEsmLoader, registerESMLoader } from './esmLoaderHost';
import { configureESMLoader, configureESMLoaderTransformConfig, registerESMLoader } from './esmLoaderHost';
import { execArgvWithExperimentalLoaderOptions, execArgvWithoutExperimentalLoaderOptions } from '../transform/esmUtils';
const kDefineConfigWasUsed = Symbol('defineConfigWasUsed');
@ -87,10 +87,7 @@ export const defineConfig = (...configs: any[]) => {
export async function deserializeConfig(data: SerializedConfig): Promise<FullConfigInternal> {
if (data.compilationCache)
addToCompilationCache(data.compilationCache);
const config = await loadConfig(data.location, data.configCLIOverrides);
await initializeEsmLoader();
return config;
return await loadConfig(data.location, data.configCLIOverrides);
}
async function loadUserConfig(location: ConfigLocation): Promise<Config> {
@ -101,6 +98,11 @@ async function loadUserConfig(location: ConfigLocation): Promise<Config> {
}
export async function loadConfig(location: ConfigLocation, overrides?: ConfigCLIOverrides, ignoreProjectDependencies = false): Promise<FullConfigInternal> {
// 1. Setup tsconfig; configure ESM loader with tsconfig and compilation cache.
setSingleTSConfig(overrides?.tsconfig);
await configureESMLoader();
// 2. Load and validate playwright config.
const userConfig = await loadUserConfig(location);
validateConfig(location.resolvedConfigFile || '<default config>', userConfig);
const fullConfig = new FullConfigInternal(location, userConfig, overrides || {});
@ -111,6 +113,15 @@ export async function loadConfig(location: ConfigLocation, overrides?: ConfigCLI
project.teardown = undefined;
}
}
// 3. Load transform options from the playwright config.
const babelPlugins = (userConfig as any)['@playwright/test']?.babelPlugins || [];
const external = userConfig.build?.external || [];
setTransformConfig({ babelPlugins, external });
// 4. Send transform options to ESM loader.
await configureESMLoaderTransformConfig();
return fullConfig;
}

Просмотреть файл

@ -16,7 +16,7 @@
import url from 'url';
import { addToCompilationCache, serializeCompilationCache } from '../transform/compilationCache';
import { transformConfig } from '../transform/transform';
import { singleTSConfig, transformConfig } from '../transform/transform';
import { PortTransport } from '../transform/portTransport';
let loaderChannel: PortTransport | undefined;
@ -67,9 +67,15 @@ export async function incorporateCompilationCache() {
addToCompilationCache(result.cache);
}
export async function initializeEsmLoader() {
export async function configureESMLoader() {
if (!loaderChannel)
return;
await loaderChannel.send('setSingleTSConfig', { tsconfig: singleTSConfig() });
await loaderChannel.send('addToCompilationCache', { cache: serializeCompilationCache() });
}
export async function configureESMLoaderTransformConfig() {
if (!loaderChannel)
return;
await loaderChannel.send('setTransformConfig', { config: transformConfig() });
await loaderChannel.send('addToCompilationCache', { cache: serializeCompilationCache() });
}

Просмотреть файл

@ -33,6 +33,7 @@ export type ConfigCLIOverrides = {
additionalReporters?: ReporterDescription[];
shard?: { current: number, total: number };
timeout?: number;
tsconfig?: string;
ignoreSnapshots?: boolean;
updateSnapshots?: 'all'|'none'|'missing';
workers?: number | string;

Просмотреть файл

@ -286,6 +286,7 @@ function overridesFromOptions(options: { [key: string]: any }): ConfigCLIOverrid
reporter: resolveReporterOption(options.reporter),
shard: shardPair ? { current: shardPair[0], total: shardPair[1] } : undefined,
timeout: options.timeout ? parseInt(options.timeout, 10) : undefined,
tsconfig: options.tsconfig ? path.resolve(process.cwd(), options.tsconfig) : undefined,
ignoreSnapshots: options.ignoreSnapshots ? !!options.ignoreSnapshots : undefined,
updateSnapshots: options.updateSnapshots ? 'all' as const : undefined,
workers: options.workers,
@ -365,6 +366,7 @@ const testOptions: [string, string][] = [
['--shard <shard>', `Shard tests and execute only the selected shard, specify in the form "current/all", 1-based, for example "3/5"`],
['--timeout <timeout>', `Specify test timeout threshold in milliseconds, zero for unlimited (default: ${defaultTimeout})`],
['--trace <mode>', `Force tracing mode, can be ${kTraceModes.map(mode => `"${mode}"`).join(', ')}`],
['--tsconfig <path>', `Path to a single tsconfig applicable to all imported files (default: look up tsconfig for each imported file separately)`],
['--ui', `Run tests in interactive UI mode`],
['--ui-host <host>', 'Host to serve UI on; specifying this option opens UI in a browser tab'],
['--ui-port <port>', 'Port to serve UI on, 0 for any free port; specifying this option opens UI in a browser tab'],

Просмотреть файл

@ -22,7 +22,7 @@ import { loadTestFile } from '../common/testLoader';
import type { FullConfigInternal } from '../common/config';
import { PoolBuilder } from '../common/poolBuilder';
import { addToCompilationCache } from '../transform/compilationCache';
import { incorporateCompilationCache, initializeEsmLoader } from '../common/esmLoaderHost';
import { incorporateCompilationCache } from '../common/esmLoaderHost';
export class InProcessLoaderHost {
private _config: FullConfigInternal;
@ -34,7 +34,6 @@ export class InProcessLoaderHost {
}
async start(errors: TestError[]) {
await initializeEsmLoader();
return true;
}

Просмотреть файл

@ -52,12 +52,8 @@ export interface LoadedTsConfig {
allowJs?: boolean;
}
export interface TsConfigLoaderParams {
cwd: string;
}
export function tsConfigLoader({ cwd, }: TsConfigLoaderParams): LoadedTsConfig[] {
const configPath = resolveConfigPath(cwd);
export function tsConfigLoader(tsconfigPathOrDirecotry: string): LoadedTsConfig[] {
const configPath = resolveConfigPath(tsconfigPathOrDirecotry);
if (!configPath)
return [];
@ -67,12 +63,12 @@ export function tsConfigLoader({ cwd, }: TsConfigLoaderParams): LoadedTsConfig[]
return [config, ...references];
}
function resolveConfigPath(cwd: string): string | undefined {
if (fs.statSync(cwd).isFile()) {
return path.resolve(cwd);
function resolveConfigPath(tsconfigPathOrDirecotry: string): string | undefined {
if (fs.statSync(tsconfigPathOrDirecotry).isFile()) {
return path.resolve(tsconfigPathOrDirecotry);
}
const configAbsolutePath = walkForTsConfig(cwd);
const configAbsolutePath = walkForTsConfig(tsconfigPathOrDirecotry);
return configAbsolutePath ? path.resolve(configAbsolutePath) : undefined;
}

Просмотреть файл

@ -17,7 +17,7 @@
import fs from 'fs';
import url from 'url';
import { addToCompilationCache, currentFileDepsCollector, serializeCompilationCache, startCollectingFileDeps, stopCollectingFileDeps } from './compilationCache';
import { transformHook, resolveHook, setTransformConfig, shouldTransform } from './transform';
import { transformHook, resolveHook, setTransformConfig, shouldTransform, setSingleTSConfig } from './transform';
import { PortTransport } from './portTransport';
import { fileIsModule } from '../util';
@ -89,6 +89,11 @@ function initialize(data: { port: MessagePort }) {
function createTransport(port: MessagePort) {
return new PortTransport(port, async (method, params) => {
if (method === 'setSingleTSConfig') {
setSingleTSConfig(params.tsconfig);
return;
}
if (method === 'setTransformConfig') {
setTransformConfig(params.config);
return;

Просмотреть файл

@ -57,6 +57,16 @@ export function transformConfig(): TransformConfig {
return _transformConfig;
}
let _singleTSConfig: string | undefined;
export function setSingleTSConfig(value: string | undefined) {
_singleTSConfig = value;
}
export function singleTSConfig(): string | undefined {
return _singleTSConfig;
}
function validateTsConfig(tsconfig: LoadedTsConfig): ParsedTsConfigData {
// When no explicit baseUrl is set, resolve paths relative to the tsconfig file.
// See https://www.typescriptlang.org/tsconfig#paths
@ -71,12 +81,12 @@ function validateTsConfig(tsconfig: LoadedTsConfig): ParsedTsConfigData {
}
function loadAndValidateTsconfigsForFile(file: string): ParsedTsConfigData[] {
const cwd = path.dirname(file);
if (!cachedTSConfigs.has(cwd)) {
const loaded = tsConfigLoader({ cwd });
cachedTSConfigs.set(cwd, loaded.map(validateTsConfig));
const tsconfigPathOrDirecotry = _singleTSConfig || path.dirname(file);
if (!cachedTSConfigs.has(tsconfigPathOrDirecotry)) {
const loaded = tsConfigLoader(tsconfigPathOrDirecotry);
cachedTSConfigs.set(tsconfigPathOrDirecotry, loaded.map(validateTsConfig));
}
return cachedTSConfigs.get(cwd)!;
return cachedTSConfigs.get(tsconfigPathOrDirecotry)!;
}
const pathSeparator = process.platform === 'win32' ? ';' : ':';

Просмотреть файл

@ -128,8 +128,10 @@ test('should respect path resolver in experimental mode', async ({ runInlineTest
const result = await runInlineTest({
'package.json': JSON.stringify({ type: 'module' }),
'playwright.config.ts': `
// Make sure that config can use the path mapping.
import { foo } from 'util/b.js';
export default {
projects: [{name: 'foo'}],
projects: [{ name: foo }],
};
`,
'tsconfig.json': `{
@ -147,7 +149,8 @@ test('should respect path resolver in experimental mode', async ({ runInlineTest
import { foo } from 'util/b.js';
import { test, expect } from '@playwright/test';
test('check project name', ({}, testInfo) => {
expect(testInfo.project.name).toBe(foo);
expect(testInfo.project.name).toBe('foo');
expect(foo).toBe('foo');
});
`,
'foo/bar/util/b.ts': `

Просмотреть файл

@ -641,3 +641,55 @@ test('should respect tsconfig project references', async ({ runInlineTest }) =>
expect(result.exitCode).toBe(0);
expect(result.passed).toBe(1);
});
test('should respect --tsconfig option', async ({ runInlineTest }) => {
const result = await runInlineTest({
'playwright.config.ts': `
import { foo } from '~/foo';
export default {
testDir: './tests' + foo,
};
`,
'tsconfig.json': `{
"compilerOptions": {
"baseUrl": ".",
"paths": {
"~/*": ["./does-not-exist/*"],
},
},
}`,
'tsconfig.special.json': `{
"compilerOptions": {
"baseUrl": ".",
"paths": {
"~/*": ["./mapped-from-root/*"],
},
},
}`,
'mapped-from-root/foo.ts': `
export const foo = 42;
`,
'tests42/tsconfig.json': `{
"compilerOptions": {
"baseUrl": ".",
"paths": {
"~/*": ["../should-be-ignored/*"],
},
},
}`,
'tests42/a.test.ts': `
import { foo } from '~/foo';
import { test, expect } from '@playwright/test';
test('test', ({}) => {
expect(foo).toBe(42);
});
`,
'should-be-ignored/foo.ts': `
export const foo = 43;
`,
}, { tsconfig: 'tsconfig.special.json' });
expect(result.passed).toBe(1);
expect(result.exitCode).toBe(0);
expect(result.output).not.toContain(`Could not`);
});