Merge branch 'master' of https://github.com/Microsoft/TypeScript into feature/36048

Author: a-tarasyuk

.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"

.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/lib.es2015.symbol.wellknown.d.ts

@@ -1,14 +1,14 @@
 /*! *****************************************************************************
-Copyright (c) Microsoft Corporation. All rights reserved. 
+Copyright (c) Microsoft Corporation. All rights reserved.
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use
 this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0  
- 
+License at http://www.apache.org/licenses/LICENSE-2.0
+
 THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
-MERCHANTABLITY OR NON-INFRINGEMENT. 
- 
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
 See the Apache Version 2.0 License for specific language governing permissions
 and limitations under the License.
 ***************************************************************************** */
@@ -91,7 +91,7 @@ interface Array<T> {
      * Returns an object whose properties have the value 'true'
      * when they will be absent when used in a 'with' statement.
      */
-    [Symbol.unscopables](): {
+    [Symbol.unscopables]: {
         copyWithin: boolean;
         entries: boolean;
         fill: boolean;

package.json

@@ -54,9 +54,9 @@
         "@types/through2": "latest",
         "@types/travis-fold": "latest",
         "@types/xml2js": "^0.4.0",
-        "@typescript-eslint/eslint-plugin": "2.3.2",
-        "@typescript-eslint/experimental-utils": "2.3.2",
-        "@typescript-eslint/parser": "2.3.2",
+        "@typescript-eslint/eslint-plugin": "2.18.0",
+        "@typescript-eslint/experimental-utils": "2.18.0",
+        "@typescript-eslint/parser": "2.18.0",
         "async": "latest",
         "azure-devops-node-api": "^8.0.0",
         "browser-resolve": "^1.11.2",
@@ -65,10 +65,10 @@
         "chalk": "latest",
         "convert-source-map": "latest",
         "del": "5.1.0",
-        "eslint": "6.5.1",
-        "eslint-formatter-autolinkable-stylish": "1.0.3",
-        "eslint-plugin-import": "2.18.2",
-        "eslint-plugin-jsdoc": "15.9.9",
+        "eslint": "6.8.0",
+        "eslint-formatter-autolinkable-stylish": "1.1.1",
+        "eslint-plugin-import": "2.20.0",
+        "eslint-plugin-jsdoc": "21.0.0",
         "eslint-plugin-no-null": "1.0.2",
         "fancy-log": "latest",
         "fs-extra": "^6.0.1",

scripts/configurePrerelease.ts

@@ -60,7 +60,7 @@ function updateTsFile(tsFilePath: string, tsFileContents: string, majorMinor: st
     const parsedMajorMinor = majorMinorMatch![1];
     assert(parsedMajorMinor === majorMinor, `versionMajorMinor does not match. ${tsFilePath}: '${parsedMajorMinor}'; package.json: '${majorMinor}'`);
 
-    const versionRgx = /export const version = `\$\{versionMajorMinor\}\.(\d)(-dev)?`;/;
+    const versionRgx = /export const version = `\$\{versionMajorMinor\}\.(\d)(-\w+)?`;/;
     const patchMatch = versionRgx.exec(tsFileContents);
     assert(patchMatch !== null, `The file '${tsFilePath}' seems to no longer have a string matching '${versionRgx.toString()}'.`);
     const parsedPatch = patchMatch![1];

scripts/eslint/rules/one-namespace-per-file.ts

@@ -10,7 +10,7 @@ export = createRule({
             recommended: "error",
         },
         messages: {
-            excessNamespaceError: `All but one of these namespaces should be moved into seperate files.`,
+            excessNamespaceError: `All but one of these namespaces should be moved into separate files.`,
         },
         schema: [],
         type: "problem",

scripts/open-cherry-pick-pr.ts

@@ -2,7 +2,7 @@
 // Must reference esnext.asynciterable lib, since octokit uses AsyncIterable internally
 /// <reference types="node" />
 
-import Octokit = require("@octokit/rest");
+import { Octokit } from "@octokit/rest";
 const {runSequence} = require("./run-sequence");
 import fs = require("fs");
 import path = require("path");
@@ -26,18 +26,34 @@ async function main() {
     const currentAuthor = runSequence([
         ["git", ["log", "-1", `--pretty="%aN <%aE>"`]]
     ]);
+
+    const gh = new Octokit();
+    gh.authenticate({
+        type: "token",
+        token: process.argv[2]
+    });
+
+    const inputPR = (await gh.pulls.get({ pull_number: +process.env.SOURCE_ISSUE, owner: "microsoft", repo: "TypeScript" })).data;
+    let remoteName = "origin";
+    if (inputPR.base.repo.git_url !== `git:github.com/microsoft/TypeScript`) {
+        runSequence([
+            ["git", ["remote", "add", "nonlocal", inputPR.base.repo.git_url]]
+        ]);
+        remoteName = "nonlocal";
+    }
+    const baseBranchName = inputPR.base.ref;
     runSequence([
-        ["git", ["fetch", "origin", "master"]]
+        ["git", ["fetch", remoteName, baseBranchName]]
     ]);
     let logText = runSequence([
-        ["git", ["log", `origin/master..${currentSha.trim()}`, `--pretty="%h %s%n%b"`, "--reverse"]]
+        ["git", ["log", `${remoteName}/${baseBranchName}..${currentSha.trim()}`, `--pretty="%h %s%n%b"`, "--reverse"]]
     ]);
     logText = `Cherry-pick PR #${process.env.SOURCE_ISSUE} into ${process.env.TARGET_BRANCH}
 
 Component commits:
 ${logText.trim()}`;
     const logpath = path.join(__dirname, "../", "logmessage.txt");
-    const mergebase = runSequence([["git", ["merge-base", "origin/master", currentSha]]]).trim();
+    const mergebase = runSequence([["git", ["merge-base", `${remoteName}/${baseBranchName}`, currentSha]]]).trim();
     runSequence([
         ["git", ["checkout", "-b", "temp-branch"]],
         ["git", ["reset", mergebase, "--soft"]]
@@ -67,11 +83,6 @@ ${logText.trim()}`;
         ["git", ["push", "--set-upstream", "fork", branchName, "-f"]] // push the branch
     ]);
 
-    const gh = new Octokit();
-    gh.authenticate({
-        type: "token",
-        token: process.argv[2]
-    });
     const r = await gh.pulls.create({
         owner: "Microsoft",
         repo: "TypeScript",

src/.eslintrc.ci.json

@@ -1,5 +1,13 @@
 {
     "extends": "../.eslintrc.json",
+    "parserOptions": {
+        "tsconfigRootDir": "src",
+        "project": "./tsconfig-base.json"
+    },
+    "rules": {
+        "@typescript-eslint/no-unnecessary-qualifier": "error",
+        "@typescript-eslint/no-unnecessary-type-assertion": "error"
+    },
     "overrides": [
         {
             "files": ["lib/*.d.ts"],