Merge branch 'main' into fix-49293

Author: jakebailey

.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 }
         ],

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

Gulpfile.js

@@ -214,20 +214,29 @@ task("watch-services").flags = {
     "   --built": "Compile using the built version of the compiler."
 };
 
-const buildServer = () => buildProject("src/tsserver", cmdLineOptions);
+const buildDynamicImportCompat = () => buildProject("src/dynamicImportCompat", cmdLineOptions);
+task("dynamicImportCompat", buildDynamicImportCompat);
+
+const buildServerMain = () => buildProject("src/tsserver", cmdLineOptions);
+const buildServer = series(buildDynamicImportCompat, buildServerMain);
+buildServer.displayName = "buildServer";
 task("tsserver", series(preBuild, buildServer));
 task("tsserver").description = "Builds the language server";
 task("tsserver").flags = {
     "   --built": "Compile using the built version of the compiler."
 };
 
-const cleanServer = () => cleanProject("src/tsserver");
+const cleanDynamicImportCompat = () => cleanProject("src/dynamicImportCompat");
+const cleanServerMain = () => cleanProject("src/tsserver");
+const cleanServer = series(cleanDynamicImportCompat, cleanServerMain);
+cleanServer.displayName = "cleanServer";
 cleanTasks.push(cleanServer);
 task("clean-tsserver", cleanServer);
 task("clean-tsserver").description = "Cleans outputs for the language server";
 
+const watchDynamicImportCompat = () => watchProject("src/dynamicImportCompat", cmdLineOptions);
 const watchServer = () => watchProject("src/tsserver", cmdLineOptions);
-task("watch-tsserver", series(preBuild, parallel(watchLib, watchDiagnostics, watchServer)));
+task("watch-tsserver", series(preBuild, parallel(watchLib, watchDiagnostics, watchDynamicImportCompat, watchServer)));
 task("watch-tsserver").description = "Watch for changes and rebuild the language server only";
 task("watch-tsserver").flags = {
     "   --built": "Compile using the built version of the compiler."
@@ -549,6 +558,7 @@ const produceLKG = async () => {
         "built/local/typescriptServices.js",
         "built/local/typescriptServices.d.ts",
         "built/local/tsserver.js",
+        "built/local/dynamicImportCompat.js",
         "built/local/typescript.js",
         "built/local/typescript.d.ts",
         "built/local/tsserverlibrary.js",

package-lock.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",

package.json

@@ -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);

scripts/buildProtocol.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: {

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: "debug-assert",
     meta: {
         docs: {
             description: ``,
-            category: "Possible Errors",
             recommended: "error",
         },
         messages: {

scripts/eslint/rules/debug-assert.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: {

scripts/eslint/rules/no-double-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: "no-in-operator",
     meta: {
         docs: {
             description: ``,
-            category: "Best Practices",
             recommended: "error",
         },
         messages: {