mirror of
https://github.com/microsoft/playwright.git
synced 2025-06-26 21:40:17 +00:00
fix(tsconfig): handle tsconfig paths without a baseUrl (#27846)
This commit is contained in:
parent
bc1b59042c
commit
c59483c5fb
@ -58,11 +58,14 @@ export function transformConfig(): TransformConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function validateTsConfig(tsconfig: TsConfigLoaderResult): ParsedTsConfigData | undefined {
|
function validateTsConfig(tsconfig: TsConfigLoaderResult): ParsedTsConfigData | undefined {
|
||||||
if (!tsconfig.tsConfigPath || !tsconfig.baseUrl)
|
if (!tsconfig.tsConfigPath)
|
||||||
return;
|
return;
|
||||||
// Make 'baseUrl' absolute, because it is relative to the tsconfig.json, not to cwd.
|
// Make 'baseUrl' absolute, because it is relative to the tsconfig.json, not to cwd.
|
||||||
const absoluteBaseUrl = path.resolve(path.dirname(tsconfig.tsConfigPath), tsconfig.baseUrl);
|
// When no explicit baseUrl is set, resolve paths relative to the tsconfig file.
|
||||||
const pathsFallback = [{ key: '*', values: ['*'] }];
|
// 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 {
|
return {
|
||||||
allowJs: tsconfig.allowJs,
|
allowJs: tsconfig.allowJs,
|
||||||
absoluteBaseUrl,
|
absoluteBaseUrl,
|
||||||
|
|||||||
@ -201,6 +201,34 @@ test('should fallback to *:* when baseurl and paths are specified', async ({ run
|
|||||||
expect(result.output).not.toContain(`Could not`);
|
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 }) => {
|
test('should respect complex path resolver', async ({ runInlineTest }) => {
|
||||||
const result = await runInlineTest({
|
const result = await runInlineTest({
|
||||||
'playwright.config.ts': `
|
'playwright.config.ts': `
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user