Merge branch 'master' into mappedtype-inference-seperate-symbols

Author: weswigham

.github/pr_owners.txt

@@ -6,3 +6,8 @@ RyanCavanaugh
 sheetalkamat
 orta
 rbuckton
+ahejlsberg
+amcasey
+jessetrinity
+minestarks
+uniqueiniquity

.github/workflows/accept-baselines-fix-lints.yaml

@@ -0,0 +1,29 @@
+name: Accept Baselines and Fix Lints
+
+on:
+  workflow_dispatch: {}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use node version 12
+      uses: actions/setup-node@v1
+      with:
+        node-version: 12
+        registry-url: https://registry.npmjs.org/
+
+    - name: Configure Git, Run Tests, Update Baselines, Apply Fixes
+      run: |
+        git config user.email "[email protected]"
+        git config user.name "TypeScript Bot"
+        npm install
+        gulp runtests-parallel --ci --fix || true
+        gulp baseline-accept
+        git add ./src
+        git add ./tests/baselines/reference
+        git diff --cached
+        git commit -m "Update Baselines and/or Applied Lint Fixes"
+        git push

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

@@ -25,6 +25,8 @@ jobs:
         npm test
       env:
         CI: true
+    - name: Adding playwright
+      run: npm install --no-save --no-package-lock playwright    
     - name: Validate the browser can import TypeScript
       run: gulp test-browser-integration
     - name: LKG, clean, and pack

Gulpfile.js

@@ -590,6 +590,7 @@ task("LKG").description = "Makes a new LKG out of the built js files";
 task("LKG").flags = {
     "   --built": "Compile using the built version of the compiler.",
 };
+task("lkg", series("LKG"));
 
 const generateSpec = () => exec("cscript", ["//nologo", "scripts/word2md.js", path.resolve("doc/TypeScript Language Specification - ARCHIVED.docx"), path.resolve("doc/spec-ARCHIVED.md")]);
 task("generate-spec", series(buildScripts, generateSpec));

doc/handbook/README.md

@@ -1,4 +1,5 @@
 # The TypeScript Handbook
 
-The contents of the TypeScript Handbook can be read from [its GitHub repository](https://github.com/Microsoft/TypeScript-Handbook).
-Issues and pull requests should be directed there.
+The contents of the TypeScript Handbook can be found in the
+[TypeScript website repository](https://github.com/microsoft/TypeScript-Website/tree/v2/packages/documentation).
+Issues and pull requests should be directed there.

package-lock.json

@@ -178,15 +178,14 @@ namespace ts {
     };
 
     export function bindSourceFile(file: SourceFile, options: CompilerOptions) {
-        const tracingData: tracing.EventData = [tracing.Phase.Bind, "bindSourceFile", { path: file.path }];
-        tracing.begin(...tracingData);
+        tracing.push(tracing.Phase.Bind, "bindSourceFile", { path: file.path }, /*separateBeginAndEnd*/ true);
         performance.mark("beforeBind");
         perfLogger.logStartBindFile("" + file.fileName);
         binder(file, options);
         perfLogger.logStopBindFile();
         performance.mark("afterBind");
         performance.measure("Bind", "beforeBind", "afterBind");
-        tracing.end(...tracingData);
+        tracing.pop();
     }
 
     function createBinder(): (file: SourceFile, options: CompilerOptions) => void {
@@ -674,7 +673,7 @@ namespace ts {
                 }
                 // We create a return control flow graph for IIFEs and constructors. For constructors
                 // we use the return control flow graph in strict property initialization checks.
-                currentReturnTarget = isIIFE || node.kind === SyntaxKind.Constructor || (isInJSFile && (node.kind === SyntaxKind.FunctionDeclaration || node.kind === SyntaxKind.FunctionExpression)) ? createBranchLabel() : undefined;
+                currentReturnTarget = isIIFE || node.kind === SyntaxKind.Constructor || (isInJSFile(node) && (node.kind === SyntaxKind.FunctionDeclaration || node.kind === SyntaxKind.FunctionExpression)) ? createBranchLabel() : undefined;
                 currentExceptionTarget = undefined;
                 currentBreakTarget = undefined;
                 currentContinueTarget = undefined;
@@ -695,7 +694,7 @@ namespace ts {
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
                     currentFlow = finishFlowLabel(currentReturnTarget);
-                    if (node.kind === SyntaxKind.Constructor || (isInJSFile && (node.kind === SyntaxKind.FunctionDeclaration || node.kind === SyntaxKind.FunctionExpression))) {
+                    if (node.kind === SyntaxKind.Constructor || (isInJSFile(node) && (node.kind === SyntaxKind.FunctionDeclaration || node.kind === SyntaxKind.FunctionExpression))) {
                         (<FunctionLikeDeclaration>node).returnFlowNode = currentFlow;
                     }
                 }