Merge main into branch

Author: weswigham

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

.github/pr_owners.txt

@@ -1,16 +1,14 @@
 sandersn
-elibarzilay
 weswigham
 andrewbranch
 RyanCavanaugh
 sheetalkamat
-orta
 rbuckton
 ahejlsberg
 amcasey
-jessetrinity
 minestarks
 armanio123
 gabritto
 jakebailey
 DanielRosenwasser
+navya9singh

.github/workflows/ci.yml

@@ -31,10 +31,6 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
         check-latest: true
-    - name: Remove existing TypeScript
-      run: |
-        npm uninstall typescript --no-save
-        npm uninstall tslint --no-save
     - run:  npm ci
 
     # Re: https://github.com/actions/setup-node/pull/125

.github/workflows/release-branch-artifact.yaml

@@ -12,10 +12,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v3
-    - name: Remove existing TypeScript
-      run: |
-        npm uninstall typescript --no-save
-        npm uninstall tslint --no-save
     - name: npm install and test
       run: |
         npm ci

.github/workflows/update-package-lock.yaml

@@ -16,13 +16,14 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v3
       with:
-        node-version: 14
+        node-version: 16
 
     - name: Configure git and update package-lock.json
       run: |
         git config user.email "[email protected]"
         git config user.name "TypeScript Bot"
-        npm install --package-lock-only --ignore-scripts
+        rm package-lock.json
+        npm install --package-lock-only --ignore-scripts # This is a no-op if package-lock.json is present.
         git add -f package-lock.json
         if git commit -m "Update package-lock.json"; then
           git push

.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

@@ -92,18 +92,12 @@ const localize = async () => {
     }
 };
 
-const buildShims = () => buildProject("src/shims");
-const cleanShims = () => cleanProject("src/shims");
-cleanTasks.push(cleanShims);
-
 const buildDebugTools = () => buildProject("src/debug");
 const cleanDebugTools = () => cleanProject("src/debug");
 cleanTasks.push(cleanDebugTools);
 
-const buildShimsAndTools = parallel(buildShims, buildDebugTools);
-
 // Pre-build steps when targeting the LKG compiler
-const lkgPreBuild = parallel(generateLibs, series(buildScripts, generateDiagnostics, buildShimsAndTools));
+const lkgPreBuild = parallel(generateLibs, series(buildScripts, generateDiagnostics, buildDebugTools));
 
 const buildTsc = () => buildProject("src/tsc");
 task("tsc", series(lkgPreBuild, buildTsc));
@@ -119,7 +113,7 @@ task("watch-tsc", series(lkgPreBuild, parallel(watchLib, watchDiagnostics, watch
 task("watch-tsc").description = "Watch for changes and rebuild the command-line compiler only.";
 
 // Pre-build steps when targeting the built/local compiler.
-const localPreBuild = parallel(generateLibs, series(buildScripts, generateDiagnostics, buildShimsAndTools, buildTsc));
+const localPreBuild = parallel(generateLibs, series(buildScripts, generateDiagnostics, buildDebugTools, buildTsc));
 
 // Pre-build steps to use based on supplied options.
 const preBuild = cmdLineOptions.lkg ? lkgPreBuild : localPreBuild;
@@ -356,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) {
@@ -377,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",