Merge branch 'main' into fix44572

# Conflicts:
#	src/compiler/checker.ts

.devcontainer/devcontainer.json

@@ -7,7 +7,13 @@
         }
     },
     "settings": {
-        "terminal.integrated.shell.linux": "/bin/bash"
+        "terminal.integrated.defaultProfile.linux": "bash",
+        "terminal.integrated.profiles.linux": {
+            "bash": {
+                "path": "/bin/bash",
+                "icon": "terminal-bash",
+            },
+        },
     },
     "extensions": [
         "dbaeumer.vscode-eslint"

.github/pr_owners.txt

@@ -10,4 +10,7 @@ ahejlsberg
 amcasey
 jessetrinity
 minestarks
-uniqueiniquity
+armanio123
+gabritto
+jakebailey
+DanielRosenwasser

.github/pull_request_template.md

@@ -9,6 +9,13 @@ Please verify that:
 
 Refer to CONTRIBUTING.MD for more details.
   https://github.com/Microsoft/TypeScript/blob/main/CONTRIBUTING.md
+
+** Please don't send typo fixes! **
+Please don't send a PR solely for the purpose of fixing a typo, unless that
+typo truly hurts understanding of the text. Each PR represents work for the
+maintainers, and that work should provide commensurate value.
+
+If you're interested in sending a PR, the issue tracker has many issues marked `help wanted`.
 -->
 
 Fixes #

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

@@ -20,6 +20,7 @@ jobs:
         git config user.email "typescriptbot@microsoft.com"
         git config user.name "TypeScript Bot"
         npm install
+        git rm -r --quiet tests/baselines/reference :^tests/baselines/reference/docker :^tests/baselines/reference/user
         gulp runtests-parallel --ci --fix || true
         gulp baseline-accept
         git add ./src

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x]
+        node-version: [12.x, 14.x, 16.x]
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/ensure-related-repos-run-crons.yml

@@ -0,0 +1,46 @@
+# Ensures that repos which are related to TypeScript but may not have regular commits
+# have their GitHub Actions scheduled jobs still active due to the 6 week timeout
+# on OSS repos. This has already triggered a few times with microsoft/TypeScript-Make-Monaco-Builds
+# so, better to automate keeping on top of it.
+
+name: Related Repo Commit Bumps
+
+on:
+    schedule:
+        # Monthly, https://crontab.guru/#0_0_*_1-12_*
+        - cron: '0 0 1 * *'
+    workflow_dispatch: {}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Configure git
+      run: |
+        git config --global user.email "typescriptbot@microsoft.com"
+        git config --global user.name "TypeScript Bot"
+
+    - uses: actions/checkout@v2
+      with: 
+        repository: 'microsoft/TypeScript-Website'
+        path: 'ts-site'
+
+    - name: Push Commit to TS Website
+      run:  |
+        cd ts-site
+        git commit --allow-empty -m "Monthly Bump"
+        git config --unset-all http.https://github.com/.extraheader
+        git push https://${{ secrets.TS_BOT_GITHUB_TOKEN }}@github.com/microsoft/TypeScript-Website.git
+
+    - uses: actions/checkout@v2
+      with: 
+        repository: 'microsoft/TypeScript-Make-Monaco-Builds'
+        path: 'monaco-builds'
+
+    - name: Push Commit to TS Make Monaco Builds
+      run:  |
+        cd monaco-builds
+        git commit --allow-empty -m "Monthly Bump"
+        git config --unset-all http.https://github.com/.extraheader
+        git push https://${{ secrets.TS_BOT_GITHUB_TOKEN }}@github.com/microsoft/TypeScript-Make-Monaco-Builds.git

.vscode/launch.template.json

@@ -48,23 +48,15 @@
       "outFiles": [
         "${workspaceRoot}/built/local/run.js"
       ],
-
-      // NOTE: To use this, you must switch the "type" above to "pwa-node". You may also need to follow the instructions
-      // here: https://github.com/microsoft/vscode-js-debug#nightly-extension to use the js-debug nightly until
-      // this feature is shipping in insiders or to a release:
-      // "customDescriptionGenerator": "'__tsDebuggerDisplay' in this ? this.__tsDebuggerDisplay(defaultValue) : defaultValue"
+      "customDescriptionGenerator": "'__tsDebuggerDisplay' in this ? this.__tsDebuggerDisplay(defaultValue) : defaultValue",
     },
     {
       // See: https://github.com/microsoft/TypeScript/wiki/Debugging-Language-Service-in-VS-Code
       "type": "node",
       "request": "attach",
       "name": "Attach to VS Code TS Server via Port",
       "processId": "${command:PickProcess}",
-
-      // NOTE: To use this, you must switch the "type" above to "pwa-node". You may also need to follow the instructions
-      // here: https://github.com/microsoft/vscode-js-debug#nightly-extension to use the js-debug nightly until
-      // this feature is shipping in insiders or to a release:
-      // "customDescriptionGenerator": "'__tsDebuggerDisplay' in this ? this.__tsDebuggerDisplay(defaultValue) : defaultValue"
+      "customDescriptionGenerator": "'__tsDebuggerDisplay' in this ? this.__tsDebuggerDisplay(defaultValue) : defaultValue",
     }
   ]
 }

.vscode/settings.template.json

@@ -2,10 +2,7 @@
 // contents into your existing settings.
 {
     "eslint.validate": [
-        {
-            "language": "typescript",
-            "autoFix": true
-        }
+        "typescript"
     ],
     "eslint.options": {
         "rulePaths": ["./scripts/eslint/built/rules/"],
@@ -16,4 +13,4 @@
 
     // To use the locally built compiler, after 'npm run build':
     // "typescript.tsdk": "built/local"
-}
+}

CONTRIBUTING.md

@@ -20,7 +20,7 @@ Some search tips:
 ## 3. Do you have a question?
 
 The issue tracker is for **issues**, in other words, bugs and suggestions.
-If you have a *question*, please use [Stack Overflow](http://stackoverflow.com/questions/tagged/typescript), [Gitter](https://gitter.im/Microsoft/TypeScript), your favorite search engine, or other resources.
+If you have a *question*, please use [Stack Overflow](https://stackoverflow.com/questions/tagged/typescript), [Gitter](https://gitter.im/Microsoft/TypeScript), your favorite search engine, or other resources.
 Due to increased traffic, we can no longer answer questions in the issue tracker.
 
 ## 4. Did you find a bug?

lib/zh-cn/diagnosticMessages.generated.json

@@ -130,7 +130,7 @@
   "Add_await_to_initializer_for_0_95084": "将 \"await\" 添加到 \"{0}\" 的初始值设定项",
   "Add_await_to_initializers_95089": "将 \"await\" 添加到初始值设定项",
   "Add_braces_to_arrow_function_95059": "向箭头函数添加大括号",
-  "Add_class_tag_95102": "添加“@类”标记",
+  "Add_class_tag_95102": "添加“@class”标记",
   "Add_const_to_all_unresolved_variables_95082": "将 \"const\" 添加到所有未解析变量",
   "Add_const_to_unresolved_variable_95081": "将 \"const\" 添加到未解析的变量",
   "Add_default_import_0_to_existing_import_declaration_from_1_90033": "将默认导入 \"{0}\" 从 \"{1}\" 添加到现有导入声明。",
@@ -154,7 +154,7 @@
   "Add_parameter_name_90034": "添加参数名称",
   "Add_qualifier_to_all_unresolved_variables_matching_a_member_name_95037": "将限定符添加到匹配成员名称的所有未解析变量",
   "Add_this_parameter_95104": "添加“此”参数。",
-  "Add_this_tag_95103": "添加“@此”标记",
+  "Add_this_tag_95103": "添加“@this”标记",
   "Add_to_all_uncalled_decorators_95044": "将 \"()\" 添加到所有未调用的修饰器",
   "Add_ts_ignore_to_all_error_messages_95042": "将 \"@ts-ignore\" 添加到所有错误消息",
   "Add_undefined_to_a_type_when_accessed_using_an_index_6674": "使用索引访问时，将 “undefined” 添加到类型。",
@@ -1784,4 +1784,4 @@
   "with_statements_are_not_allowed_in_strict_mode_1101": "严格模式下不允许使用 \"with\" 语句。",
   "yield_expression_implicitly_results_in_an_any_type_because_its_containing_generator_lacks_a_return_t_7057": "\"yield\" 表达式隐式导致 \"any\" 类型，因为它的包含生成器缺少返回类型批注。",
   "yield_expressions_cannot_be_used_in_a_parameter_initializer_2523": "不能在参数初始化表达式中使用 \"yield\" 表达式。"
-}
+}