Merge branch 'main' into cacheModuleResolution

Author: sheetalkamat

.eslintignore

@@ -1,4 +1,9 @@
+**/node_modules/**
 /built/local/**
 /tests/**
 /lib/**
 /src/lib/*.generated.d.ts
+/scripts/*.js
+/scripts/eslint/built/**
+/internal/**
+/coverage/**

.eslintrc.json

@@ -13,6 +13,17 @@
     "plugins": [
         "@typescript-eslint", "jsdoc", "no-null", "import"
     ],
+    "overrides": [
+        // By default, the ESLint CLI only looks at .js files. But, it will also look at
+        // any files which are referenced in an override config. Most users of typescript-eslint
+        // get this behavior by default by extending a recommended typescript-eslint config, which 
+        // just so happens to override some core ESLint rules. We don't extend from any config, so
+        // explicitly reference TS files here so the CLI picks them up.
+        //
+        // ESLint in VS Code will lint any opened file (so long as it's not eslintignore'd), so
+        // that will work regardless of the below.
+        { "files": ["*.ts"] }
+    ],
     "rules": {
         "@typescript-eslint/adjacent-overload-signatures": "error",
         "@typescript-eslint/array-type": "error",

.gitignore

@@ -54,6 +54,7 @@ scripts/produceLKG.js
 scripts/importDefinitelyTypedTests/importDefinitelyTypedTests.js
 scripts/generateLocalizedDiagnosticMessages.js
 scripts/request-pr-review.js
+scripts/errorCheck.js
 scripts/*.js.map
 scripts/typings/
 coverage/

.vscode/settings.template.json

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

Gulpfile.js

@@ -350,15 +350,13 @@ task("run-eslint-rules-tests").description = "Runs the eslint rule tests";
 
 /** @type { (folder: string) => { (): Promise<any>; displayName?: string } } */
 const eslint = (folder) => async () => {
-
     const formatter = cmdLineOptions.ci ? "stylish" : "autolinkable-stylish";
     const args = [
         "node_modules/eslint/bin/eslint",
         "--cache",
         "--cache-location", `${folder}/.eslintcache`,
         "--format", formatter,
         "--rulesdir", "scripts/eslint/built/rules",
-        "--ext", ".ts",
     ];
 
     if (cmdLineOptions.fix) {
@@ -371,22 +369,12 @@ const eslint = (folder) => async () => {
     return exec(process.execPath, args);
 };
 
-const lintScripts = eslint("scripts");
-lintScripts.displayName = "lint-scripts";
-task("lint-scripts", series([buildEslintRules, lintScripts]));
-task("lint-scripts").description = "Runs eslint on the scripts sources.";
-
-const lintCompiler = eslint("src");
-lintCompiler.displayName = "lint-compiler";
-task("lint-compiler", series([buildEslintRules, lintCompiler]));
-task("lint-compiler").description = "Runs eslint on the compiler sources.";
-task("lint-compiler").flags = {
-    "   --ci": "Runs eslint additional rules",
-};
+const lintRoot = eslint(".");
+lintRoot.displayName = "lint";
 
-const lint = series([buildEslintRules, lintScripts, lintCompiler]);
+const lint = series([buildEslintRules, lintRoot]);
 lint.displayName = "lint";
-task("lint", series([buildEslintRules, lint]));
+task("lint", lint);
 task("lint").description = "Runs eslint on the compiler and scripts sources.";
 task("lint").flags = {
     "   --ci": "Runs eslint additional rules",

package-lock.json

@@ -30,6 +30,7 @@
     },
     "devDependencies": {
         "@octokit/rest": "latest",
+        "@types/async": "latest",
         "@types/chai": "latest",
         "@types/convert-source-map": "latest",
         "@types/fs-extra": "^9.0.13",
@@ -88,6 +89,7 @@
         "typescript": "^4.5.5",
         "vinyl": "latest",
         "vinyl-sourcemaps-apply": "latest",
+        "which": "^2.0.2",
         "xml2js": "^0.4.23"
     },
     "overrides": {
@@ -106,8 +108,6 @@
         "gulp": "gulp",
         "lint": "gulp lint",
         "lint:ci": "gulp lint --ci",
-        "lint:compiler": "gulp lint-compiler",
-        "lint:scripts": "gulp lint-scripts",
         "setup-hooks": "node scripts/link-hooks.js"
     },
     "browser": {

package.json

@@ -1,6 +1,6 @@
-import fs = require("fs");
-import path = require("path");
-import childProcess = require("child_process");
+import * as fs from "fs";
+import * as path from "path";
+import * as childProcess from "child_process";
 
 interface Author {
     displayNames: string[];
@@ -120,10 +120,10 @@ namespace Commands {
         const authors: { name: string, email: string, knownAuthor?: Author }[] = [];
         const {output: [error, stdout, stderr]} = childProcess.spawnSync(`git`, ["shortlog", "-se", ...specs], { cwd: path.resolve(__dirname, "../") });
         if (error) {
-            console.log(stderr.toString());
+            console.log(stderr!.toString());
         }
         else {
-            const output = stdout.toString();
+            const output = stdout!.toString();
             const lines = output.split("\n");
             lines.forEach(line => {
                 if (line) {

scripts/authors.ts

@@ -7,6 +7,7 @@ module.exports = minimist(process.argv.slice(2), {
     boolean: ["dirty", "light", "colors", "lint", "lkg", "soft", "fix", "failed", "keepFailed", "force", "built"],
     string: ["browser", "tests", "break", "host", "reporter", "stackTraceLimit", "timeout", "shards", "shardId"],
     alias: {
+        /* eslint-disable quote-props */
         "b": "browser",
         "i": ["inspect", "inspect-brk", "break", "debug", "debug-brk"],
         "t": ["tests", "test"],
@@ -16,6 +17,7 @@ module.exports = minimist(process.argv.slice(2), {
         "skippercent": "skipPercent",
         "w": "workers",
         "f": "fix"
+        /* eslint-enable quote-props */
     },
     default: {
         soft: false,

scripts/build/options.js

@@ -1,6 +1,5 @@
 // @ts-check
 const stream = require("stream");
-const Vinyl = require("vinyl");
 const ts = require("../../lib/typescript");
 const fs = require("fs");
 const { base64VLQFormatEncode } = require("./sourcemaps");
@@ -43,13 +42,14 @@ function prepend(data) {
                         sourcesContent: input.sourcesContent
                     };
                 }
+                // eslint-disable-next-line boolean-trivia, no-null/no-null
                 return cb(null, output);
             }
             catch (e) {
                 return cb(e);
             }
         }
-    })
+    });
 }
 exports.prepend = prepend;
 
@@ -59,6 +59,6 @@ exports.prepend = prepend;
 function prependFile(file) {
     const data = typeof file === "string" ? fs.readFileSync(file, "utf8") :
         vinyl => fs.readFileSync(file(vinyl), "utf8");
-    return prepend(data)
+    return prepend(data);
 }
-exports.prependFile = prependFile;
+exports.prependFile = prependFile;