Merge branch 'master' into Lift-Template-Literal-Restriction

Author: sandersn

.eslintrc.json

@@ -26,6 +26,10 @@
         "@typescript-eslint/no-inferrable-types": "error",
         "@typescript-eslint/no-misused-new": "error",
         "@typescript-eslint/no-this-alias": "error",
+
+        "no-unused-expressions": "off",
+        "@typescript-eslint/no-unused-expressions": ["error", { "allowTernary": true }],
+
         "@typescript-eslint/prefer-for-of": "error",
         "@typescript-eslint/prefer-function-type": "error",
         "@typescript-eslint/prefer-namespace-keyword": "error",
@@ -36,6 +40,13 @@
         "semi": "off",
         "@typescript-eslint/semi": "error",
 
+        "space-before-function-paren": "off",
+        "@typescript-eslint/space-before-function-paren": ["error", {
+            "asyncArrow": "always",
+            "anonymous": "always",
+            "named": "never"
+        }],
+
         "@typescript-eslint/triple-slash-reference": "error",
         "@typescript-eslint/type-annotation-spacing": "error",
         "@typescript-eslint/unified-signatures": "error",
@@ -97,7 +108,6 @@
         "no-trailing-spaces": "error",
         "no-undef-init": "error",
         "no-unsafe-finally": "error",
-        "no-unused-expressions": ["error", { "allowTernary": true }],
         "no-unused-labels": "error",
         "no-var": "error",
         "object-shorthand": "error",

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +1,19 @@
+--- 
 blank_issues_enabled: false
-contact_links:
-  - name: Question
-    url: https://stackoverflow.com/questions/tagged/typescript
-    about: Please ask and answer questions here.
-  - name: TypeScript FAQ
-    url: https://github.com/microsoft/TypeScript/wiki/FAQ
-    about: Please check the FAQ before filing new issues
-- name: Website
-    url: https://github.com/microsoft/TypeScript-Website/issues/new
-    about: Please raise issues about the site on it's own repo.
+contact_links: 
+  - 
+    about: "Please ask and answer usage questions on Stack Overflow."
+    name: Question
+    url: "https://stackoverflow.com/questions/tagged/typescript"
+  - 
+    about: "Alternatively, you can use the TypeScript Community Discord."
+    name: Chat
+    url: "https://discord.gg/typescript"
+  - 
+    about: "Please check the FAQ before filing new issues"
+    name: "TypeScript FAQ"
+    url: "https://github.com/microsoft/TypeScript/wiki/FAQ"
+  - 
+    about: "Please raise issues about the site on it's own repo."
+    name: Website
+    url: "https://github.com/microsoft/TypeScript-Website/issues/new"

.github/pr_owners.txt

@@ -0,0 +1,8 @@
+sandersn
+elibarzilay
+weswigham
+andrewbranch
+RyanCavanaugh
+sheetalkamat
+orta
+rbuckton

.vscode/extensions.json

@@ -1,6 +1,7 @@
 {
     "recommendations": [
-        "dbaeumer.vscode-eslint"
+        "dbaeumer.vscode-eslint",
+        "rbuckton.tsserver-live-reload"
     ],
 
     "unwantedRecommendations": [

Gulpfile.js

@@ -346,8 +346,6 @@ const lintFoldEnd = async () => { if (fold.isTravis()) console.log(fold.end("lin
 
 /** @type { (folder: string) => { (): Promise<any>; displayName?: string } } */
 const eslint = (folder) => async () => {
-    const ESLINTRC_CI = ".eslintrc.ci.json";
-    const isCIEnv = cmdLineOptions.ci || process.env.CI === "true";
 
     const args = [
         "node_modules/eslint/bin/eslint",
@@ -358,13 +356,6 @@ const eslint = (folder) => async () => {
         "--ext", ".ts",
     ];
 
-    if (
-        isCIEnv &&
-        fs.existsSync(path.resolve(folder, ESLINTRC_CI))
-    ) {
-        args.push("--config", path.resolve(folder, ESLINTRC_CI));
-    }
-
     if (cmdLineOptions.fix) {
         args.push("--fix");
     }

lib/cancellationToken.js

@@ -454,7 +454,7 @@
   "Generic_type_0_requires_1_type_argument_s_2314": "ジェネリック型 '{0}' には {1} 個の型引数が必要です。",
   "Generic_type_0_requires_between_1_and_2_type_arguments_2707": "ジェネリック型 '{0}' には、{1} 個から {2} 個までの型引数が必要です。",
   "Generic_type_instantiation_is_excessively_deep_and_possibly_infinite_2550": "ジェネリック型のインスタンス化は非常に深く、無限である可能性があります。",
-  "Getter_and_setter_accessors_do_not_agree_in_visibility_2379": "ゲッターおよびセッターで表示が許可されていません。",
+  "Getter_and_setter_accessors_do_not_agree_in_visibility_2379": "ゲッターおよびセッターでの表示が許可されていません。",
   "Global_module_exports_may_only_appear_at_top_level_1316": "グローバル モジュールのエクスポートは最上位レベルにのみ出現可能です。",
   "Global_module_exports_may_only_appear_in_declaration_files_1315": "グローバル モジュールのエクスポートは宣言ファイルにのみ出現可能です。",
   "Global_module_exports_may_only_appear_in_module_files_1314": "グローバル モジュールのエクスポートはモジュール ファイルにのみ出現可能です。",