yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(tsconfig): handle tsconfig paths without a baseUrl (#27846)

Browse Source
This commit is contained in:
Ben Scott 2023-11-02 11:27:49 -07:00 committed by GitHub
parent bc1b59042c
commit c59483c5fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/playwright/src/transform/transform.ts
View File

@ -58,11 +58,14 @@ export function transformConfig(): TransformConfig {
}
function validateTsConfig(tsconfig: TsConfigLoaderResult): ParsedTsConfigData | undefined {
if (!tsconfig.tsConfigPath || !tsconfig.baseUrl)
if (!tsconfig.tsConfigPath)
return;
// Make 'baseUrl' absolute, because it is relative to the tsconfig.json, not to cwd.
const absoluteBaseUrl = path.resolve(path.dirname(tsconfig.tsConfigPath), tsconfig.baseUrl);
const pathsFallback = [{ key: '*', values: ['*'] }];
// When no explicit baseUrl is set, resolve paths relative to the tsconfig file.
// See https://www.typescriptlang.org/tsconfig#paths
const absoluteBaseUrl = path.resolve(path.dirname(tsconfig.tsConfigPath), tsconfig.baseUrl ?? '.');
// Only add the catch-all mapping when baseUrl is specified
const pathsFallback = tsconfig.baseUrl ? [{ key: '*', values: ['*'] }] : [];
return {
allowJs: tsconfig.allowJs,
absoluteBaseUrl,

28
tests/playwright-test/resolver.spec.ts
View File

@ -201,6 +201,34 @@ test('should fallback to *:* when baseurl and paths are specified', async ({ run
expect(result.output).not.toContain(`Could not`);
});
test('should use the location of the tsconfig as the paths root when no baseUrl is specified', async ({ runInlineTest }) => {
const result = await runInlineTest({
'foo/bar/util/b.ts': `
export const foo = 42;
`,
'dir2/tsconfig.json': `{
"compilerOptions": {
"target": "ES2019",
"module": "commonjs",
"lib": ["esnext", "dom", "DOM.Iterable"],
"paths": {"foo/*": ["../foo/*"]},
},
}`,
'dir2/inner.spec.ts': `
// This import should pick up ../foo/bar/util/b due to paths.
import { foo } from 'foo/bar/util/b';
import { test, expect } from '@playwright/test';
test('test', ({}, testInfo) => {
expect(foo).toBe(42);
});
`,
});
expect(result.exitCode).toBe(0);
expect(result.passed).toBe(1);
expect(result.output).not.toContain(`Could not`);
});
test('should respect complex path resolver', async ({ runInlineTest }) => {
const result = await runInlineTest({
'playwright.config.ts': `