Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

allow incremental type checking to use caching #24992

Merged
merged 2 commits into from
May 11, 2021
Merged

allow incremental type checking to use caching #24992

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba122c2
emit must be called on build program to leverage caching
sokra May 11, 2021
36913a1
Merge branch 'canary' into bugfix/typescript-cache
kodiakhq[bot] May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions packages/next/lib/typescript/runTypeCheck.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,20 @@ export async function runTypeCheck(
noEmit: true,
}

let program: import('typescript').Program
let program:
| import('typescript').Program
| import('typescript').BuilderProgram
let incremental = false
if (options.incremental && cacheDir) {
incremental = true
const builderProgram = ts.createIncrementalProgram({
program = ts.createIncrementalProgram({
rootNames: effectiveConfiguration.fileNames,
options: {
...options,
incremental: true,
tsBuildInfoFile: path.join(cacheDir, '.tsbuildinfo'),
},
})
program = builderProgram.getProgram()
} else {
program = ts.createProgram(effectiveConfiguration.fileNames, options)
}
Expand All @@ -73,7 +74,7 @@ export async function runTypeCheck(
//
const regexIgnoredFile = /[\\/]__(?:tests|mocks)__[\\/]|(?<=[\\/.])(?:spec|test)\.[^\\/]+$/
const allDiagnostics = ts
.getPreEmitDiagnostics(program)
.getPreEmitDiagnostics(program as import('typescript').Program)
.concat(result.diagnostics)
.filter((d) => !(d.file && regexIgnoredFile.test(d.file.fileName)))

Expand Down