Skip to content

Commit b564e15

Browse files
authored
Merge pull request #29783 from Microsoft/jakeUseLkg
Modifies the jakefile to use the LKG by default
2 parents 8e5dcfb + fb1b7a2 commit b564e15

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

Jakefile.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ else if (process.env.PATH !== undefined) {
2323
const host = process.env.TYPESCRIPT_HOST || process.env.host || "node";
2424

2525
const defaultTestTimeout = 40000;
26+
const useBuilt =
27+
process.env.USE_BUILT === "true" ? true :
28+
process.env.LKG === "true" ? false :
29+
false;
2630

2731
let useDebugMode = true;
2832

@@ -296,7 +300,7 @@ task(TaskNames.buildFoldEnd, [], function () {
296300

297301
desc("Compiles tslint rules to js");
298302
task(TaskNames.buildRules, [], function () {
299-
tsbuild(ConfigFileFor.lint, false, () => complete());
303+
tsbuild(ConfigFileFor.lint, !useBuilt, () => complete());
300304
}, { async: true });
301305

302306
desc("Cleans the compiler output, declare files, and tests");
@@ -368,7 +372,7 @@ file(ConfigFileFor.tsserverLibrary, [], function () {
368372
// tsserverlibrary.js
369373
// tsserverlibrary.d.ts
370374
file(Paths.tsserverLibraryFile, [TaskNames.coreBuild, ConfigFileFor.tsserverLibrary], function() {
371-
tsbuild(ConfigFileFor.tsserverLibrary, false, () => {
375+
tsbuild(ConfigFileFor.tsserverLibrary, !useBuilt, () => {
372376
if (needsUpdate([Paths.tsserverLibraryOutFile, Paths.tsserverLibraryDefinitionOutFile], [Paths.tsserverLibraryFile, Paths.tsserverLibraryDefinitionFile])) {
373377
const copyright = readFileSync(Paths.copyright);
374378

@@ -427,7 +431,7 @@ file(ConfigFileFor.typescriptServices, [], function () {
427431
// typescriptServices.js
428432
// typescriptServices.d.ts
429433
file(Paths.servicesFile, [TaskNames.coreBuild, ConfigFileFor.typescriptServices], function() {
430-
tsbuild(ConfigFileFor.typescriptServices, false, () => {
434+
tsbuild(ConfigFileFor.typescriptServices, !useBuilt, () => {
431435
if (needsUpdate([Paths.servicesOutFile, Paths.servicesDefinitionOutFile], [Paths.servicesFile, Paths.servicesDefinitionFile])) {
432436
const copyright = readFileSync(Paths.copyright);
433437

tests/baselines/reference/api/tsserverlibrary.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8346,7 +8346,7 @@ declare namespace ts.server {
83468346
excludedFiles: ReadonlyArray<NormalizedPath>;
83478347
private typeAcquisition;
83488348
updateGraph(): boolean;
8349-
getExcludedFiles(): readonly NormalizedPath[];
8349+
getExcludedFiles(): ReadonlyArray<NormalizedPath>;
83508350
getTypeAcquisition(): TypeAcquisition;
83518351
setTypeAcquisition(newTypeAcquisition: TypeAcquisition): void;
83528352
}

0 commit comments

Comments
 (0)