Skip to content

Commit 12e7691

Browse files
typescript-bottypescript-bot
committed
Merge remote-tracking branch 'origin/master' into release-4.2
2 parents fd95fe9 + 5280ba4 commit 12e7691

File tree

847 files changed

+15340
-9496
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

847 files changed

+15340
-9496
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎Gulpfile.js‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ const log = require("fancy-log");
55
const newer = require("gulp-newer");
66
const sourcemaps = require("gulp-sourcemaps");
77
const del = require("del");
8-
const fold = require("travis-fold");
98
const rename = require("gulp-rename");
109
const concat = require("gulp-concat");
1110
const merge2 = require("merge2");
@@ -346,9 +345,6 @@ const runEslintRulesTests = () => runConsoleTests("scripts/eslint/built/tests",
346345
task("run-eslint-rules-tests", series(buildEslintRules, runEslintRulesTests));
347346
task("run-eslint-rules-tests").description = "Runs the eslint rule tests";
348347

349-
const lintFoldStart = async () => { if (fold.isTravis()) console.log(fold.start("lint")); };
350-
const lintFoldEnd = async () => { if (fold.isTravis()) console.log(fold.end("lint")); };
351-
352348
/** @type { (folder: string) => { (): Promise<any>; displayName?: string } } */
353349
const eslint = (folder) => async () => {
354350

@@ -374,20 +370,20 @@ const eslint = (folder) => async () => {
374370

375371
const lintScripts = eslint("scripts");
376372
lintScripts.displayName = "lint-scripts";
377-
task("lint-scripts", series([buildEslintRules, lintFoldStart, lintScripts, lintFoldEnd]));
373+
task("lint-scripts", series([buildEslintRules, lintScripts]));
378374
task("lint-scripts").description = "Runs eslint on the scripts sources.";
379375

380376
const lintCompiler = eslint("src");
381377
lintCompiler.displayName = "lint-compiler";
382-
task("lint-compiler", series([buildEslintRules, lintFoldStart, lintCompiler, lintFoldEnd]));
378+
task("lint-compiler", series([buildEslintRules, lintCompiler]));
383379
task("lint-compiler").description = "Runs eslint on the compiler sources.";
384380
task("lint-compiler").flags = {
385381
" --ci": "Runs eslint additional rules",
386382
};
387383

388-
const lint = series([buildEslintRules, lintFoldStart, lintScripts, lintCompiler, lintFoldEnd]);
384+
const lint = series([buildEslintRules, lintScripts, lintCompiler]);
389385
lint.displayName = "lint";
390-
task("lint", series([buildEslintRules, lintFoldStart, lint, lintFoldEnd]));
386+
task("lint", series([buildEslintRules, lint]));
391387
task("lint").description = "Runs eslint on the compiler and scripts sources.";
392388
task("lint").flags = {
393389
" --ci": "Runs eslint additional rules",
@@ -429,9 +425,7 @@ const buildOtherOutputs = parallel(buildCancellationToken, buildTypingsInstaller
429425
task("other-outputs", series(preBuild, buildOtherOutputs));
430426
task("other-outputs").description = "Builds miscelaneous scripts and documents distributed with the LKG";
431427

432-
const buildFoldStart = async () => { if (fold.isTravis()) console.log(fold.start("build")); };
433-
const buildFoldEnd = async () => { if (fold.isTravis()) console.log(fold.end("build")); };
434-
task("local", series(buildFoldStart, preBuild, parallel(localize, buildTsc, buildServer, buildServices, buildLssl, buildOtherOutputs), buildFoldEnd));
428+
task("local", series(preBuild, parallel(localize, buildTsc, buildServer, buildServices, buildLssl, buildOtherOutputs)));
435429
task("local").description = "Builds the full compiler and services";
436430
task("local").flags = {
437431
" --built": "Compile using the built version of the compiler."

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# TypeScript
33

4-
[![Build Status](https://travis-ci.org/microsoft/TypeScript.svg?branch=master)](https://travis-ci.org/microsoft/TypeScript)
4+
[![GitHub Actions CI](https://github.com/microsoft/TypeScript/workflows/CI/badge.svg)](https://github.com/microsoft/TypeScript/actions?query=workflow%3ACI)
55
[![Devops Build Status](https://dev.azure.com/typescript/TypeScript/_apis/build/status/Typescript/node10)](https://dev.azure.com/typescript/TypeScript/_build?definitionId=7)
66
[![npm version](https://badge.fury.io/js/typescript.svg)](https://www.npmjs.com/package/typescript)
77
[![Downloads](https://img.shields.io/npm/dm/typescript.svg)](https://www.npmjs.com/package/typescript)

‎lib/tsserver.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106281,7 +106281,7 @@ var ts;
106281106281
var oldSourceFile = oldSourceFiles_1[_i];
106282106282
var newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
106283106283
if (shouldCreateNewSourceFile || !newFile ||
106284-
// old file wasnt redirect but new file is
106284+
// old file wasn't redirect but new file is
106285106285
(oldSourceFile.resolvedPath === oldSourceFile.path && newFile.resolvedPath !== oldSourceFile.path)) {
106286106286
host.onReleaseOldSourceFile(oldSourceFile, oldProgram.getCompilerOptions(), !!getSourceFileByPath(oldSourceFile.path));
106287106287
}
@@ -109397,7 +109397,7 @@ var ts;
109397109397
var newReferences;
109398109398
// if not using old state, every file is changed
109399109399
if (!useOldState ||
109400-
// File wasnt present in old state
109400+
// File wasn't present in old state
109401109401
!(oldInfo = oldState.fileInfos.get(sourceFilePath)) ||
109402109402
// versions dont match
109403109403
oldInfo.version !== info.version ||
@@ -110549,7 +110549,7 @@ var ts;
110549110549
var resolvedModules = [];
110550110550
var compilerOptions = resolutionHost.getCompilationSettings();
110551110551
var hasInvalidatedNonRelativeUnresolvedImport = logChanges && isFileWithInvalidatedNonRelativeUnresolvedImports(path);
110552-
// All the resolutions in this file are invalidated if this file wasnt resolved using same redirect
110552+
// All the resolutions in this file are invalidated if this file wasn't resolved using same redirect
110553110553
var program = resolutionHost.getCurrentProgram();
110554110554
var oldRedirect = program && program.getResolvedProjectReferenceToRedirect(containingFile);
110555110555
var unmatchedRedirects = oldRedirect ?

‎lib/tsserverlibrary.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106475,7 +106475,7 @@ var ts;
106475106475
var oldSourceFile = oldSourceFiles_1[_i];
106476106476
var newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
106477106477
if (shouldCreateNewSourceFile || !newFile ||
106478-
// old file wasnt redirect but new file is
106478+
// old file wasn't redirect but new file is
106479106479
(oldSourceFile.resolvedPath === oldSourceFile.path && newFile.resolvedPath !== oldSourceFile.path)) {
106480106480
host.onReleaseOldSourceFile(oldSourceFile, oldProgram.getCompilerOptions(), !!getSourceFileByPath(oldSourceFile.path));
106481106481
}
@@ -109591,7 +109591,7 @@ var ts;
109591109591
var newReferences;
109592109592
// if not using old state, every file is changed
109593109593
if (!useOldState ||
109594-
// File wasnt present in old state
109594+
// File wasn't present in old state
109595109595
!(oldInfo = oldState.fileInfos.get(sourceFilePath)) ||
109596109596
// versions dont match
109597109597
oldInfo.version !== info.version ||
@@ -110743,7 +110743,7 @@ var ts;
110743110743
var resolvedModules = [];
110744110744
var compilerOptions = resolutionHost.getCompilationSettings();
110745110745
var hasInvalidatedNonRelativeUnresolvedImport = logChanges && isFileWithInvalidatedNonRelativeUnresolvedImports(path);
110746-
// All the resolutions in this file are invalidated if this file wasnt resolved using same redirect
110746+
// All the resolutions in this file are invalidated if this file wasn't resolved using same redirect
110747110747
var program = resolutionHost.getCurrentProgram();
110748110748
var oldRedirect = program && program.getResolvedProjectReferenceToRedirect(containingFile);
110749110749
var unmatchedRedirects = oldRedirect ?

‎lib/typescript.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106475,7 +106475,7 @@ var ts;
106475106475
var oldSourceFile = oldSourceFiles_1[_i];
106476106476
var newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
106477106477
if (shouldCreateNewSourceFile || !newFile ||
106478-
// old file wasnt redirect but new file is
106478+
// old file wasn't redirect but new file is
106479106479
(oldSourceFile.resolvedPath === oldSourceFile.path && newFile.resolvedPath !== oldSourceFile.path)) {
106480106480
host.onReleaseOldSourceFile(oldSourceFile, oldProgram.getCompilerOptions(), !!getSourceFileByPath(oldSourceFile.path));
106481106481
}
@@ -109591,7 +109591,7 @@ var ts;
109591109591
var newReferences;
109592109592
// if not using old state, every file is changed
109593109593
if (!useOldState ||
109594-
// File wasnt present in old state
109594+
// File wasn't present in old state
109595109595
!(oldInfo = oldState.fileInfos.get(sourceFilePath)) ||
109596109596
// versions dont match
109597109597
oldInfo.version !== info.version ||
@@ -110743,7 +110743,7 @@ var ts;
110743110743
var resolvedModules = [];
110744110744
var compilerOptions = resolutionHost.getCompilationSettings();
110745110745
var hasInvalidatedNonRelativeUnresolvedImport = logChanges && isFileWithInvalidatedNonRelativeUnresolvedImports(path);
110746-
// All the resolutions in this file are invalidated if this file wasnt resolved using same redirect
110746+
// All the resolutions in this file are invalidated if this file wasn't resolved using same redirect
110747110747
var program = resolutionHost.getCurrentProgram();
110748110748
var oldRedirect = program && program.getResolvedProjectReferenceToRedirect(containingFile);
110749110749
var unmatchedRedirects = oldRedirect ?

‎lib/typescriptServices.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106475,7 +106475,7 @@ var ts;
106475106475
var oldSourceFile = oldSourceFiles_1[_i];
106476106476
var newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
106477106477
if (shouldCreateNewSourceFile || !newFile ||
106478-
// old file wasnt redirect but new file is
106478+
// old file wasn't redirect but new file is
106479106479
(oldSourceFile.resolvedPath === oldSourceFile.path && newFile.resolvedPath !== oldSourceFile.path)) {
106480106480
host.onReleaseOldSourceFile(oldSourceFile, oldProgram.getCompilerOptions(), !!getSourceFileByPath(oldSourceFile.path));
106481106481
}
@@ -109591,7 +109591,7 @@ var ts;
109591109591
var newReferences;
109592109592
// if not using old state, every file is changed
109593109593
if (!useOldState ||
109594-
// File wasnt present in old state
109594+
// File wasn't present in old state
109595109595
!(oldInfo = oldState.fileInfos.get(sourceFilePath)) ||
109596109596
// versions dont match
109597109597
oldInfo.version !== info.version ||
@@ -110743,7 +110743,7 @@ var ts;
110743110743
var resolvedModules = [];
110744110744
var compilerOptions = resolutionHost.getCompilationSettings();
110745110745
var hasInvalidatedNonRelativeUnresolvedImport = logChanges && isFileWithInvalidatedNonRelativeUnresolvedImports(path);
110746-
// All the resolutions in this file are invalidated if this file wasnt resolved using same redirect
110746+
// All the resolutions in this file are invalidated if this file wasn't resolved using same redirect
110747110747
var program = resolutionHost.getCurrentProgram();
110748110748
var oldRedirect = program && program.getResolvedProjectReferenceToRedirect(containingFile);
110749110749
var unmatchedRedirects = oldRedirect ?

‎lib/typingsInstaller.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106270,7 +106270,7 @@ var ts;
106270106270
var oldSourceFile = oldSourceFiles_1[_i];
106271106271
var newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
106272106272
if (shouldCreateNewSourceFile || !newFile ||
106273-
// old file wasnt redirect but new file is
106273+
// old file wasn't redirect but new file is
106274106274
(oldSourceFile.resolvedPath === oldSourceFile.path && newFile.resolvedPath !== oldSourceFile.path)) {
106275106275
host.onReleaseOldSourceFile(oldSourceFile, oldProgram.getCompilerOptions(), !!getSourceFileByPath(oldSourceFile.path));
106276106276
}
@@ -109386,7 +109386,7 @@ var ts;
109386109386
var newReferences;
109387109387
// if not using old state, every file is changed
109388109388
if (!useOldState ||
109389-
// File wasnt present in old state
109389+
// File wasn't present in old state
109390109390
!(oldInfo = oldState.fileInfos.get(sourceFilePath)) ||
109391109391
// versions dont match
109392109392
oldInfo.version !== info.version ||
@@ -110538,7 +110538,7 @@ var ts;
110538110538
var resolvedModules = [];
110539110539
var compilerOptions = resolutionHost.getCompilationSettings();
110540110540
var hasInvalidatedNonRelativeUnresolvedImport = logChanges && isFileWithInvalidatedNonRelativeUnresolvedImports(path);
110541-
// All the resolutions in this file are invalidated if this file wasnt resolved using same redirect
110541+
// All the resolutions in this file are invalidated if this file wasn't resolved using same redirect
110542110542
var program = resolutionHost.getCurrentProgram();
110543110543
var oldRedirect = program && program.getResolvedProjectReferenceToRedirect(containingFile);
110544110544
var unmatchedRedirects = oldRedirect ?

0 commit comments

Comments
 (0)