Merge branch 'master' into feat/17227

.devcontainer/Dockerfile

@@ -0,0 +1,7 @@
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.154.0/containers/javascript-node/.devcontainer/base.Dockerfile
+
+# [Choice] Node.js version: 14, 12, 10
+ARG VARIANT="14-buster"
+FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
+
+RUN sudo -u node npm install -g gulp-cli

.devcontainer/devcontainer.json

@@ -0,0 +1,16 @@
+{
+    "name": "Node.js",
+    "build": {
+        "dockerfile": "Dockerfile",
+        "args": {
+            "VARIANT": "14"
+        }
+    },
+    "settings": {
+        "terminal.integrated.shell.linux": "/bin/bash"
+    },
+    "extensions": [
+        "dbaeumer.vscode-eslint"
+    ],
+    "remoteUser": "node"
+}

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -29,7 +29,7 @@ If possible, please try testing the nightly version of TS to see if it's already
 For npm: `typescript@next`
 This is also the 'Nightly' version in the playground: http://www.typescriptlang.org/play/?ts=Nightly
 
-Note: The TypeScript Playground can be used to try older verions of TypeScript.
+Note: The TypeScript Playground can be used to try older versions of TypeScript.
 
 Please keep and fill in the line that best applies:
 -->

.github/workflows/new-release-branch.yaml

@@ -22,7 +22,7 @@ jobs:
         sed -i -e 's/const versionMajorMinor = ".*"/const versionMajorMinor = "${{ github.event.client_payload.core_major_minor }}"/g' src/compiler/corePublic.ts
         sed -i -e 's/const versionMajorMinor = ".*"/const versionMajorMinor = "${{ github.event.client_payload.core_major_minor }}"/g' tests/baselines/reference/api/typescript.d.ts
         sed -i -e 's/const versionMajorMinor = ".*"/const versionMajorMinor = "${{ github.event.client_payload.core_major_minor }}"/g' tests/baselines/reference/api/tsserverlibrary.d.ts
-        sed -i -e 's/const version = `${versionMajorMinor}.0-.*`/const version = `${versionMajorMinor}.0-${{ github.event.client_payload.core_tag || 'dev' }}`/g' src/compiler/corePublic.ts
+        sed -i -e 's/const version\(: string\)\{0,1\} = `${versionMajorMinor}.0-.*`/const version = `${versionMajorMinor}.0-${{ github.event.client_payload.core_tag || 'dev' }}`/g' src/compiler/corePublic.ts
         npm ci
         gulp LKG
         npm test

.github/workflows/set-version.yaml

@@ -28,7 +28,7 @@ jobs:
         sed -i -e 's/const versionMajorMinor = ".*"/const versionMajorMinor = "${{ github.event.client_payload.core_major_minor }}"/g' src/compiler/corePublic.ts
         sed -i -e 's/const versionMajorMinor = ".*"/const versionMajorMinor = "${{ github.event.client_payload.core_major_minor }}"/g' tests/baselines/reference/api/typescript.d.ts
         sed -i -e 's/const versionMajorMinor = ".*"/const versionMajorMinor = "${{ github.event.client_payload.core_major_minor }}"/g' tests/baselines/reference/api/tsserverlibrary.d.ts
-        sed -i -e 's/const version = .*;/const version = "${{ github.event.client_payload.package_version }}" as string;/g' src/compiler/corePublic.ts
+        sed -i -e 's/const version\(: string\)\{0,1\} = .*;/const version = "${{ github.event.client_payload.package_version }}" as string;/g' src/compiler/corePublic.ts
         npm ci
         gulp LKG
         npm test

.gitignore

@@ -85,6 +85,7 @@ tests/baselines/reference/dt
 .failed-tests
 TEST-results.xml
 package-lock.json
+tests/cases/user/npm/npm
 tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter
 tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
 tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter

.npmignore

@@ -10,6 +10,7 @@ scripts
 src
 tests
 Jakefile.js
+.devcontainer
 .eslintrc
 .eslintignore
 .editorconfig

CONTRIBUTING.md

@@ -70,6 +70,13 @@ In general, things we find useful when reviewing suggestions are:
 
 ## Tips
 
+### Using a development container
+
+This repository includes a [development container](https://code.visualstudio.com/docs/remote/containers) that you can use to quickly create an isolated development environment with all the tools you need to start working on TypeScript. To get started with a dev container and VS Code, either:
+
+- Clone the TypeScript repository locally and use the `Open Folder in Container` command.
+- Use the `Clone Repository in Container Volume` command to clone the TypeScript repository into a new container.
+
 ### Faster clones
 
 The TypeScript repository is relatively large. To save some time, you might want to clone it without the repo's full history using `git clone --depth=1`.
@@ -153,17 +160,17 @@ gulp runtests --tests=2dArrays
 
 ## Debugging the tests
 
-You can debug with VS Code or Node instead with `gulp runtests --inspect`:
+You can debug with VS Code or Node instead with `gulp runtests -i`:
 
 ```Shell
-gulp runtests --tests=2dArrays --inspect
+gulp runtests --tests=2dArrays -i
 ```
 
 You can also use the [provided VS Code launch configuration](./.vscode/launch.template.json) to launch a debug session for an open test file. Rename the file 'launch.json', open the test file of interest, and launch the debugger from the debug panel (or press F5).
 
 ## Adding a Test
 
-To add a new test case, add a `.ts` file in `tests\cases\compiler` with code that shows the your bug is now fixed, or your new feature now works.
+To add a new test case, add a `.ts` file in `tests\cases\compiler` with code that shows the bug is now fixed, or your new feature now works.
 
 These files support metadata tags in the format  `// @metaDataName: value`.
 The supported names and values are the same as those supported in the compiler itself, with the addition of the `fileName` flag.
@@ -189,16 +196,25 @@ import { f as g } from "file1";
 var x = g();
 ```
 
-## Managing the Baselines
+## Managing the baselines
 
-Compiler tests generate baselines: one file each for the emitted `.js`, the errors produced by the compiler, the type of each expression, and symbol for each identifier. Additionally, some tests generate baselines for the source map output.
+Most tests generate "baselines" to find differences in output.
+As an example, compiler tests usually emit one file each for
+
+- the `.js` and `.d.ts` output (all in the same `.js` output file),
+- the errors produced by the compiler (in an `.errors.txt` file),
+- the types of each expression (in a `.types` file),
+- the symbols for each identifier (in a `.symbols` file), and
+- the source map outputs for files if a test opts into them (in a `.js.map` file).
 
 When a change in the baselines is detected, the test will fail. To inspect changes vs the expected baselines, use
 
 ```Shell
-gulp diff
+git diff --diff-filter=AM --no-index ./tests/baselines/reference ./tests/baselines/local
 ```
 
+Alternatively, you can set the `DIFF` environment variable and run `gulp diff`, or manually run your favorite folder diffing tool between `tests/baselines/reference` and `tests/baselines/local`. Our team largely uses Beyond Compare and WinMerge.
+
 After verifying that the changes in the baselines are correct, run
 
 ```Shell

Gulpfile.js

@@ -5,7 +5,6 @@ const log = require("fancy-log");
 const newer = require("gulp-newer");
 const sourcemaps = require("gulp-sourcemaps");
 const del = require("del");
-const fold = require("travis-fold");
 const rename = require("gulp-rename");
 const concat = require("gulp-concat");
 const merge2 = require("merge2");
@@ -346,9 +345,6 @@ const runEslintRulesTests = () => runConsoleTests("scripts/eslint/built/tests",
 task("run-eslint-rules-tests", series(buildEslintRules, runEslintRulesTests));
 task("run-eslint-rules-tests").description = "Runs the eslint rule tests";
 
-const lintFoldStart = async () => { if (fold.isTravis()) console.log(fold.start("lint")); };
-const lintFoldEnd = async () => { if (fold.isTravis()) console.log(fold.end("lint")); };
-
 /** @type { (folder: string) => { (): Promise<any>; displayName?: string } } */
 const eslint = (folder) => async () => {
 
@@ -374,20 +370,20 @@ const eslint = (folder) => async () => {
 
 const lintScripts = eslint("scripts");
 lintScripts.displayName = "lint-scripts";
-task("lint-scripts", series([buildEslintRules, lintFoldStart, lintScripts, lintFoldEnd]));
+task("lint-scripts", series([buildEslintRules, lintScripts]));
 task("lint-scripts").description = "Runs eslint on the scripts sources.";
 
 const lintCompiler = eslint("src");
 lintCompiler.displayName = "lint-compiler";
-task("lint-compiler", series([buildEslintRules, lintFoldStart, lintCompiler, lintFoldEnd]));
+task("lint-compiler", series([buildEslintRules, lintCompiler]));
 task("lint-compiler").description = "Runs eslint on the compiler sources.";
 task("lint-compiler").flags = {
     "   --ci": "Runs eslint additional rules",
 };
 
-const lint = series([buildEslintRules, lintFoldStart, lintScripts, lintCompiler, lintFoldEnd]);
+const lint = series([buildEslintRules, lintScripts, lintCompiler]);
 lint.displayName = "lint";
-task("lint", series([buildEslintRules, lintFoldStart, lint, lintFoldEnd]));
+task("lint", series([buildEslintRules, lint]));
 task("lint").description = "Runs eslint on the compiler and scripts sources.";
 task("lint").flags = {
     "   --ci": "Runs eslint additional rules",
@@ -429,9 +425,7 @@ const buildOtherOutputs = parallel(buildCancellationToken, buildTypingsInstaller
 task("other-outputs", series(preBuild, buildOtherOutputs));
 task("other-outputs").description = "Builds miscelaneous scripts and documents distributed with the LKG";
 
-const buildFoldStart = async () => { if (fold.isTravis()) console.log(fold.start("build")); };
-const buildFoldEnd = async () => { if (fold.isTravis()) console.log(fold.end("build")); };
-task("local", series(buildFoldStart, preBuild, parallel(localize, buildTsc, buildServer, buildServices, buildLssl, buildOtherOutputs), buildFoldEnd));
+task("local", series(preBuild, parallel(localize, buildTsc, buildServer, buildServices, buildLssl, buildOtherOutputs)));
 task("local").description = "Builds the full compiler and services";
 task("local").flags = {
     "   --built": "Compile using the built version of the compiler."
@@ -459,8 +453,7 @@ task("runtests").flags = {
     "-t --tests=<regex>": "Pattern for tests to run.",
     "   --failed": "Runs tests listed in '.failed-tests'.",
     "-r --reporter=<reporter>": "The mocha reporter to use.",
-    "-d --debug": "Runs tests in debug mode (NodeJS 6 and earlier)",
-    "-i --inspect": "Runs tests in inspector mode (NodeJS 8 and later)",
+    "-i --break": "Runs tests in inspector mode (NodeJS 8 and later)",
     "   --keepFailed": "Keep tests in .failed-tests even if they pass",
     "   --light": "Run tests in light mode (fewer verifications, but tests run faster)",
     "   --dirty": "Run tests without first cleaning test output directories",

README.md

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