Merge branch 'main' into tagged-template-inference

microsoft · Jun 17, 2022 · e079811 · e079811
2 parents 95b896b + 9f1983d
commit e079811
Show file tree

Hide file tree

Showing 184 changed files with 5,289 additions and 2,547 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -27,8 +27,8 @@
             { "selector": "variable", "format": ["camelCase", "PascalCase", "UPPER_CASE"], "leadingUnderscore": "allow", "filter": { "regex": "^(_{1,2}filename|_{1,2}dirname|_+|[A-Za-z]+_[A-Za-z]+)$", "match": false } },
             { "selector": "function", "format": ["camelCase", "PascalCase"], "leadingUnderscore": "allow", "filter": { "regex": "^[A-Za-z]+_[A-Za-z]+$", "match": false } },
             { "selector": "parameter", "format": ["camelCase"], "leadingUnderscore": "allow", "filter": { "regex": "^(_+|[A-Za-z]+_[A-Z][a-z]+)$", "match": false } },
-            { "selector": "method", "format": ["camelCase", "PascalCase"], "leadingUnderscore": "allow", "filter": { "regex": "^[A-Za-z]+_[A-Za-z]+$", "match": false } },
-            { "selector": "memberLike", "format": ["camelCase"], "leadingUnderscore": "allow", "filter": { "regex": "^[A-Za-z]+_[A-Za-z]+$", "match": false } },
+            { "selector": "method", "format": ["camelCase", "PascalCase"], "leadingUnderscore": "allow", "filter": { "regex": "^([0-9]+|[A-Za-z]+_[A-Za-z]+)$", "match": false } },
+            { "selector": "memberLike", "format": ["camelCase"], "leadingUnderscore": "allow", "filter": { "regex": "^([0-9]+|[A-Za-z]+_[A-Za-z]+)$", "match": false } },
             { "selector": "enumMember", "format": ["camelCase", "PascalCase"], "leadingUnderscore": "allow", "filter": { "regex": "^[A-Za-z]+_[A-Za-z]+$", "match": false } },
             { "selector": "property", "format": null }
         ],

diff --git a/.vscode/settings.template.json b/.vscode/settings.template.json
@@ -6,7 +6,7 @@
     ],
     "eslint.options": {
         "rulePaths": ["./scripts/eslint/built/rules/"],
-        "ext": [".ts"]
+        "extensions": [".ts"]
     },
     // To use the last-known-good (LKG) compiler version:
     // "typescript.tsdk": "lib"

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,12 +33,13 @@
         "@octokit/rest": "latest",
         "@types/chai": "latest",
         "@types/convert-source-map": "latest",
+        "@types/fs-extra": "^9.0.13",
         "@types/glob": "latest",
         "@types/gulp": "^4.0.9",
         "@types/gulp-concat": "latest",
         "@types/gulp-newer": "latest",
-        "@types/gulp-rename": "0.0.33",
-        "@types/gulp-sourcemaps": "0.0.32",
+        "@types/gulp-rename": "latest",
+        "@types/gulp-sourcemaps": "latest",
         "@types/merge2": "latest",
         "@types/microsoft__typescript-etw": "latest",
         "@types/minimatch": "latest",
@@ -47,29 +48,29 @@
         "@types/mocha": "latest",
         "@types/ms": "latest",
         "@types/node": "latest",
-        "@types/node-fetch": "^2.3.4",
+        "@types/node-fetch": "^2.6.2",
         "@types/q": "latest",
         "@types/source-map-support": "latest",
-        "@types/xml2js": "^0.4.0",
-        "@typescript-eslint/eslint-plugin": "^4.28.0",
-        "@typescript-eslint/experimental-utils": "^4.28.0",
-        "@typescript-eslint/parser": "^4.28.0",
+        "@types/xml2js": "^0.4.11",
+        "@typescript-eslint/eslint-plugin": "^5.28.0",
+        "@typescript-eslint/parser": "^5.28.0",
+        "@typescript-eslint/utils": "^5.28.0",
         "async": "latest",
-        "azure-devops-node-api": "^11.0.1",
+        "azure-devops-node-api": "^11.1.1",
         "chai": "latest",
         "chalk": "^4.1.2",
         "convert-source-map": "latest",
-        "del": "5.1.0",
-        "diff": "^4.0.2",
-        "eslint": "7.12.1",
-        "eslint-formatter-autolinkable-stylish": "1.1.4",
-        "eslint-plugin-import": "2.22.1",
-        "eslint-plugin-jsdoc": "30.7.6",
+        "del": "6.1.1",
+        "diff": "^5.1.0",
+        "eslint": "8.17.0",
+        "eslint-formatter-autolinkable-stylish": "1.2.0",
+        "eslint-plugin-import": "2.26.0",
+        "eslint-plugin-jsdoc": "39.3.2",
         "eslint-plugin-no-null": "1.0.2",
         "fancy-log": "latest",
-        "fs-extra": "^9.0.0",
+        "fs-extra": "^9.1.0",
         "glob": "latest",
-        "gulp": "^4.0.0",
+        "gulp": "^4.0.2",
         "gulp-concat": "latest",
         "gulp-insert": "latest",
         "gulp-newer": "latest",
@@ -81,14 +82,14 @@
         "mocha": "latest",
         "mocha-fivemat-progress-reporter": "latest",
         "ms": "^2.1.3",
-        "node-fetch": "^2.6.1",
-        "prex": "^0.4.3",
+        "node-fetch": "^2.6.7",
+        "prex": "^0.4.7",
         "q": "latest",
         "source-map-support": "latest",
         "typescript": "^4.5.5",
         "vinyl": "latest",
         "vinyl-sourcemaps-apply": "latest",
-        "xml2js": "^0.4.19"
+        "xml2js": "^0.4.23"
     },
     "scripts": {
         "prepare": "gulp build-eslint-rules",

diff --git a/scripts/buildProtocol.ts b/scripts/buildProtocol.ts
@@ -159,7 +159,7 @@ function writeProtocolFile(outputFile: string, protocolTs: string, typeScriptSer
             if (fileName === protocolFileName) {
                 return ts.createSourceFile(fileName, protocolDts, options.target);
             }
-            return originalGetSourceFile.apply(host, [fileName]);
+            return originalGetSourceFile.apply(host, [fileName, ts.ScriptTarget.Latest]);
         };
         const rootFiles = includeTypeScriptServices ? [protocolFileName, typeScriptServicesDts] : [protocolFileName];
         return ts.createProgram(rootFiles, options, host);

diff --git a/scripts/eslint/rules/boolean-trivia.ts b/scripts/eslint/rules/boolean-trivia.ts
@@ -1,12 +1,11 @@
-import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/experimental-utils";
+import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/utils";
 import { createRule } from "./utils";
 
 export = createRule({
     name: "boolean-trivia",
     meta: {
         docs: {
             description: ``,
-            category: "Best Practices",
             recommended: "error",
         },
         messages: {

diff --git a/scripts/eslint/rules/debug-assert.ts b/scripts/eslint/rules/debug-assert.ts
@@ -1,12 +1,11 @@
-import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/experimental-utils";
+import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/utils";
 import { createRule } from "./utils";
 
 export = createRule({
     name: "debug-assert",
     meta: {
         docs: {
             description: ``,
-            category: "Possible Errors",
             recommended: "error",
         },
         messages: {

diff --git a/scripts/eslint/rules/no-double-space.ts b/scripts/eslint/rules/no-double-space.ts
@@ -1,12 +1,11 @@
-import { TSESTree, AST_NODE_TYPES } from "@typescript-eslint/experimental-utils";
+import { TSESTree, AST_NODE_TYPES } from "@typescript-eslint/utils";
 import { createRule } from "./utils";
 
 export = createRule({
     name: "no-double-space",
     meta: {
         docs: {
             description: ``,
-            category: "Stylistic Issues",
             recommended: "error",
         },
         messages: {

diff --git a/scripts/eslint/rules/no-in-operator.ts b/scripts/eslint/rules/no-in-operator.ts
@@ -1,12 +1,11 @@
-import { TSESTree } from "@typescript-eslint/experimental-utils";
+import { TSESTree } from "@typescript-eslint/utils";
 import { createRule } from "./utils";
 
 export = createRule({
     name: "no-in-operator",
     meta: {
         docs: {
             description: ``,
-            category: "Best Practices",
             recommended: "error",
         },
         messages: {

diff --git a/scripts/eslint/rules/no-keywords.ts b/scripts/eslint/rules/no-keywords.ts
@@ -1,12 +1,11 @@
-import { TSESTree, AST_NODE_TYPES } from "@typescript-eslint/experimental-utils";
+import { TSESTree, AST_NODE_TYPES } from "@typescript-eslint/utils";
 import { createRule } from "./utils";
 
 export = createRule({
     name: "no-keywords",
     meta: {
         docs: {
             description: `disallows the use of certain TypeScript keywords as variable or parameter names`,
-            category: "Stylistic Issues",
             recommended: "error",
         },
         messages: {

diff --git a/scripts/eslint/rules/no-type-assertion-whitespace.ts b/scripts/eslint/rules/no-type-assertion-whitespace.ts
@@ -1,12 +1,11 @@
-import { TSESTree } from "@typescript-eslint/experimental-utils";
+import { TSESTree } from "@typescript-eslint/utils";
 import { createRule } from "./utils";
 
 export = createRule({
     name: "no-type-assertion-whitespace",
     meta: {
         docs: {
             description: ``,
-            category: "Stylistic Issues",
             recommended: "error",
         },
         messages: {

diff --git a/scripts/eslint/rules/object-literal-surrounding-space.ts b/scripts/eslint/rules/object-literal-surrounding-space.ts
@@ -1,12 +1,11 @@
-import { TSESTree } from "@typescript-eslint/experimental-utils";
+import { TSESTree } from "@typescript-eslint/utils";
 import { createRule } from "./utils";
 
 export = createRule({
     name: "object-literal-surrounding-space",
     meta: {
         docs: {
             description: ``,
-            category: "Stylistic Issues",
             recommended: "error",
         },
         messages: {

diff --git a/scripts/eslint/rules/one-namespace-per-file.ts b/scripts/eslint/rules/one-namespace-per-file.ts
@@ -1,12 +1,11 @@
-import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/experimental-utils";
+import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/utils";
 import { createRule } from "./utils";
 
 export = createRule({
     name: "one-namespace-per-file",
     meta: {
         docs: {
             description: `Limits each file to having at most one top-level namespace declaration`,
-            category: "Possible Errors",
             recommended: "error",
         },
         messages: {

diff --git a/scripts/eslint/rules/only-arrow-functions.ts b/scripts/eslint/rules/only-arrow-functions.ts
@@ -1,4 +1,4 @@
-import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/experimental-utils";
+import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/utils";
 import { createRule } from "./utils";
 
 type MessageId = "onlyArrowFunctionsError";
@@ -12,7 +12,6 @@ export = createRule<Options, MessageId>({
     meta: {
         docs: {
             description: `Disallows traditional (non-arrow) function expressions.`,
-            category: "Best Practices",
             recommended: "error",
         },
         messages: {

diff --git a/scripts/eslint/rules/simple-indent.ts b/scripts/eslint/rules/simple-indent.ts
@@ -1,12 +1,11 @@
-import { TSESTree } from "@typescript-eslint/experimental-utils";
+import { TSESTree } from "@typescript-eslint/utils";
 import { createRule } from "./utils";
 
 export = createRule({
     name: "simple-indent",
     meta: {
         docs: {
             description: "Enforce consistent indentation",
-            category: "Stylistic Issues",
             recommended: "error",
         },
         messages: {

diff --git a/scripts/eslint/rules/type-operator-spacing.ts b/scripts/eslint/rules/type-operator-spacing.ts
@@ -1,12 +1,11 @@
-import { TSESTree, AST_TOKEN_TYPES } from "@typescript-eslint/experimental-utils";
+import { TSESTree, AST_TOKEN_TYPES } from "@typescript-eslint/utils";
 import { createRule } from "./utils";
 
 export = createRule({
     name: "type-operator-spacing",
     meta: {
         docs: {
             description: ``,
-            category: "Stylistic Issues",
             recommended: "error",
         },
         messages: {

diff --git a/scripts/eslint/rules/utils.ts b/scripts/eslint/rules/utils.ts
@@ -1,2 +1,2 @@
-import { ESLintUtils } from "@typescript-eslint/experimental-utils";
+import { ESLintUtils } from "@typescript-eslint/utils";
 export const createRule = ESLintUtils.RuleCreator(() => "");
diff --git a/scripts/eslint/tests/support/RuleTester.ts b/scripts/eslint/tests/support/RuleTester.ts
@@ -1,5 +1,5 @@
 import * as path from "path";
-import { TSESLint } from "@typescript-eslint/experimental-utils";
+import { TSESLint } from "@typescript-eslint/utils";
 
 export const ROOT_DIR = path.join(process.cwd(), "scripts", "eslint", "tests", "fixtures");
 export const FILENAME = path.join(ROOT_DIR, "file.ts");

diff --git a/scripts/tsconfig.json b/scripts/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "strictNullChecks": true,
+        "strict": true,
         "removeComments": false,
         "declaration": false,
         "sourceMap": true,