mirror of https://github.com/vuejs/core.git
fix(compiler-sfc): skip circular tsconfig project reference (#11680)
Co-authored-by: cluezhang <cluezhang@futurefab.ai> close #11382
This commit is contained in:
parent
ac9e7e8bfa
commit
9c4c2e51b0
|
@ -1185,6 +1185,49 @@ describe('resolveType', () => {
|
||||||
expect(deps && [...deps]).toStrictEqual(['/user.ts'])
|
expect(deps && [...deps]).toStrictEqual(['/user.ts'])
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// #11382
|
||||||
|
test('ts module resolve circular project reference', () => {
|
||||||
|
const files = {
|
||||||
|
'/tsconfig.json': JSON.stringify({
|
||||||
|
exclude: ['**/*.ts', '**/*.vue'],
|
||||||
|
references: [
|
||||||
|
{
|
||||||
|
path: './tsconfig.web.json',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}),
|
||||||
|
'/tsconfig.web.json': JSON.stringify({
|
||||||
|
include: ['**/*.ts', '**/*.vue'],
|
||||||
|
compilerOptions: {
|
||||||
|
composite: true,
|
||||||
|
paths: {
|
||||||
|
user: ['./user.ts'],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
references: [
|
||||||
|
{
|
||||||
|
// circular reference
|
||||||
|
path: './tsconfig.json',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}),
|
||||||
|
'/user.ts': 'export type User = { bar: string }',
|
||||||
|
}
|
||||||
|
|
||||||
|
const { props, deps } = resolve(
|
||||||
|
`
|
||||||
|
import { User } from 'user'
|
||||||
|
defineProps<User>()
|
||||||
|
`,
|
||||||
|
files,
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(props).toStrictEqual({
|
||||||
|
bar: ['String'],
|
||||||
|
})
|
||||||
|
expect(deps && [...deps]).toStrictEqual(['/user.ts'])
|
||||||
|
})
|
||||||
|
|
||||||
test('ts module resolve w/ path aliased vue file', () => {
|
test('ts module resolve w/ path aliased vue file', () => {
|
||||||
const files = {
|
const files = {
|
||||||
'/tsconfig.json': JSON.stringify({
|
'/tsconfig.json': JSON.stringify({
|
||||||
|
|
|
@ -1070,6 +1070,7 @@ function loadTSConfig(
|
||||||
configPath: string,
|
configPath: string,
|
||||||
ts: typeof TS,
|
ts: typeof TS,
|
||||||
fs: FS,
|
fs: FS,
|
||||||
|
visited = new Set<string>(),
|
||||||
): TS.ParsedCommandLine[] {
|
): TS.ParsedCommandLine[] {
|
||||||
// The only case where `fs` is NOT `ts.sys` is during tests.
|
// The only case where `fs` is NOT `ts.sys` is during tests.
|
||||||
// parse config host requires an extra `readDirectory` method
|
// parse config host requires an extra `readDirectory` method
|
||||||
|
@ -1089,14 +1090,15 @@ function loadTSConfig(
|
||||||
configPath,
|
configPath,
|
||||||
)
|
)
|
||||||
const res = [config]
|
const res = [config]
|
||||||
|
visited.add(configPath)
|
||||||
if (config.projectReferences) {
|
if (config.projectReferences) {
|
||||||
for (const ref of config.projectReferences) {
|
for (const ref of config.projectReferences) {
|
||||||
const refPath = ts.resolveProjectReferencePath(ref)
|
const refPath = ts.resolveProjectReferencePath(ref)
|
||||||
if (!fs.fileExists(refPath)) {
|
if (visited.has(refPath) || !fs.fileExists(refPath)) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
tsConfigRefMap.set(refPath, configPath)
|
tsConfigRefMap.set(refPath, configPath)
|
||||||
res.unshift(...loadTSConfig(refPath, ts, fs))
|
res.unshift(...loadTSConfig(refPath, ts, fs, visited))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return res
|
return res
|
||||||
|
|
Loading…
Reference in New Issue