Merge branch 'main' into microsoft-19577

Author: nicolas377

.devcontainer/Dockerfile

@@ -4,4 +4,4 @@
 ARG VARIANT="14-buster"
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
 
-RUN sudo -u node npm install -g gulp-cli
+RUN sudo -u node npm install -g hereby

.dockerignore

@@ -17,21 +17,8 @@ build.json
 *.config
 scripts/debug.bat
 scripts/run.bat
-scripts/word2md.js
-scripts/buildProtocol.js
-scripts/ior.js
-scripts/authors.js
-scripts/configurePrerelease.js
-scripts/open-user-pr.js
-scripts/open-cherry-pick-pr.js
-scripts/processDiagnosticMessages.d.ts
-scripts/processDiagnosticMessages.js
-scripts/produceLKG.js
-scripts/importDefinitelyTypedTests/importDefinitelyTypedTests.js
-scripts/generateLocalizedDiagnosticMessages.js
-scripts/configureLanguageServiceBuild.js
-scripts/*.js.map
-scripts/typings/
+scripts/**/*.js
+scripts/**/*.js.map
 coverage/
 internal/
 **/.DS_Store

.eslintignore

@@ -1,4 +1,23 @@
-/built/local/**
+**/node_modules/**
+/built/**
 /tests/**
 /lib/**
 /src/lib/*.generated.d.ts
+# Ignore all compiled script outputs
+/scripts/**/*.js
+/scripts/**/*.d.*
+# But, not the ones that are hand-written.
+# TODO: remove once scripts are pure JS
+!/scripts/browserIntegrationTest.js
+!/scripts/createPlaygroundBuild.js
+!/scripts/failed-tests.js
+!/scripts/find-unused-diagnostic-messages.js
+!/scripts/lint-hooks.js
+!/scripts/perf-result-post.js
+!/scripts/post-vsts-artifact-comment.js
+!/scripts/regenerate-unicode-identifier-parts.js
+!/scripts/run-sequence.js
+!/scripts/update-experimental-branches.js
+/scripts/eslint/built/**
+/internal/**
+/coverage/**

.eslintplugin.js

@@ -0,0 +1,12 @@
+const fs = require("fs");
+const path = require("path");
+
+const rulesDir = path.join(__dirname, "scripts", "eslint", "rules");
+const ext = ".cjs";
+const ruleFiles = fs.readdirSync(rulesDir).filter((p) => p.endsWith(ext));
+
+module.exports = {
+    rules: Object.fromEntries(ruleFiles.map((p) => {
+        return [p.slice(0, -ext.length), require(path.join(rulesDir, p))];
+    })),
+}

.eslintrc.json

@@ -2,7 +2,6 @@
     "parser": "@typescript-eslint/parser",
     "parserOptions": {
         "warnOnUnsupportedTypeScriptVersion": false,
-        "ecmaVersion": 6,
         "sourceType": "module"
     },
     "env": {
@@ -11,11 +10,18 @@
         "es6": true
     },
     "plugins": [
-        "@typescript-eslint", "jsdoc", "no-null", "import"
+        "@typescript-eslint", "no-null", "import", "eslint-plugin-local"
     ],
     "rules": {
+        "sort-imports": ["error", {
+            "ignoreCase": true,
+            "ignoreDeclarationSort": true,
+            "allowSeparatedGroups": true
+        }],
+
         "@typescript-eslint/adjacent-overload-signatures": "error",
         "@typescript-eslint/array-type": "error",
+        "@typescript-eslint/no-array-constructor": "error",
 
         "brace-style": "off",
         "@typescript-eslint/brace-style": ["error", "stroustrup", { "allowSingleLine": true }],
@@ -51,12 +57,14 @@
         "@typescript-eslint/prefer-for-of": "error",
         "@typescript-eslint/prefer-function-type": "error",
         "@typescript-eslint/prefer-namespace-keyword": "error",
+        "@typescript-eslint/prefer-as-const": "error",
 
         "quotes": "off",
         "@typescript-eslint/quotes": ["error", "double", { "avoidEscape": true, "allowTemplateLiterals": true }],
 
         "semi": "off",
         "@typescript-eslint/semi": "error",
+        "@typescript-eslint/no-extra-semi": "error",
 
         "space-before-function-paren": "off",
         "@typescript-eslint/space-before-function-paren": ["error", {
@@ -69,31 +77,30 @@
         "@typescript-eslint/type-annotation-spacing": "error",
         "@typescript-eslint/unified-signatures": "error",
 
+        "@typescript-eslint/no-extra-non-null-assertion": "error",
+
         // scripts/eslint/rules
-        "object-literal-surrounding-space": "error",
-        "no-type-assertion-whitespace": "error",
-        "type-operator-spacing": "error",
-        "only-arrow-functions": ["error", {
+        "local/object-literal-surrounding-space": "error",
+        "local/no-type-assertion-whitespace": "error",
+        "local/type-operator-spacing": "error",
+        "local/only-arrow-functions": ["error", {
             "allowNamedFunctions": true ,
             "allowDeclarations": true
         }],
-        "no-double-space": "error",
-        "boolean-trivia": "error",
-        "no-in-operator": "error",
-        "simple-indent": "error",
-        "debug-assert": "error",
-        "no-keywords": "error",
-        "one-namespace-per-file": "error",
+        "local/no-double-space": "error",
+        "local/boolean-trivia": "error",
+        "local/no-in-operator": "error",
+        "local/simple-indent": "error",
+        "local/debug-assert": "error",
+        "local/no-keywords": "error",
+        "local/jsdoc-format": "error",
 
         // eslint-plugin-import
         "import/no-extraneous-dependencies": ["error", { "optionalDependencies": false }],
 
         // eslint-plugin-no-null
         "no-null/no-null": "error",
 
-        // eslint-plugin-jsdoc
-        "jsdoc/check-alignment": "error",
-
         // eslint
         "constructor-super": "error",
         "curly": ["error", "multi-line"],
@@ -132,6 +139,35 @@
         "quote-props": ["error", "consistent-as-needed"],
         "space-in-parens": "error",
         "unicode-bom": ["error", "never"],
-        "use-isnan": "error"
-    }
+        "use-isnan": "error",
+        "no-prototype-builtins": "error",
+        "no-self-assign": "error",
+        "no-dupe-else-if": "error"
+    },
+    "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.
+        //
+        // The same applies to mjs files; ESLint appears to not scan those either.
+        { "files": ["*.ts", "*.mts", "*.cts", "*.mjs", "*.cjs"] },
+        {
+            "files": ["*.mjs", "*.mts"],
+            "rules": {
+                // These globals don't exist outside of CJS files.
+                "no-restricted-globals": ["error",
+                    { "name": "__filename" },
+                    { "name": "__dirname" },
+                    { "name": "require" },
+                    { "name": "module" },
+                    { "name": "exports" }
+                ]
+            }
+        }
+    ]
 }

.git-blame-ignore-revs

@@ -0,0 +1,8 @@
+# Generated module conversion step - inlineImports
+07758c08ab72481885e662c98d67a0e3a071b032
+# Generated module conversion step - stripNamespaces
+b6c053882696af8ddd94a600429f30584d303d7f
+# Generated module conversion step - explicitify
+9a0b85ce2a3f85f498ab2c05474b4c0b96b111c9
+# Generated module conversion step - unindent
+94724a8c2e68a4c7e267072ca79971f317c45e4a

.github/codeql/codeql-configuration.yml

@@ -1,4 +1,34 @@
 name : CodeQL Configuration
 
 paths:
-  - './src' 
+  - src
+  - scripts
+  - Gulpfile.mjs
+paths-ignore:
+  - src/lib
+
+# These queries appear to time out after the module conversion.
+# https://github.com/github/codeql/issues/10937
+query-filters:
+  - exclude:
+      id: js/path-injection # TaintedPath.ql
+  - exclude:
+      id: js/command-line-injection # CommandInjection.ql
+  - exclude:
+      id: js/code-injection # CodeInjection.ql
+  - exclude:
+      id: js/bad-code-sanitization # ImproperCodeSanitization.ql
+  - exclude:
+      id: js/unsafe-dynamic-method-access # UnsafeDynamicMethodAccess.ql
+  - exclude:
+      id: js/clear-text-logging # CleartextLogging.ql
+  - exclude:
+      id: js/regex-injection # RegExpInjection.ql
+  - exclude:
+      id: js/unvalidated-dynamic-method-call # UnvalidatedDynamicMethodCall.ql
+  - exclude:
+      id: js/insecure-download # InsecureDownload.ql
+  - exclude:
+      id: js/prototype-polluting-assignment # PrototypePollutingAssignment.ql
+  - exclude:
+      id: js/request-forgery # RequestForgery.ql

.github/pull_request_template.md

@@ -4,7 +4,7 @@ Thank you for submitting a pull request!
 Please verify that:
 * [ ] There is an associated issue in the `Backlog` milestone (**required**)
 * [ ] Code is up-to-date with the `main` branch
-* [ ] You've successfully run `gulp runtests` locally
+* [ ] You've successfully run `hereby runtests` locally
 * [ ] There are new or updated unit tests validating the change
 
 Refer to CONTRIBUTING.MD for more details.

.github/tsc.json

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: actions/setup-node@v3
 
     - name: Configure Git, Run Tests, Update Baselines, Apply Fixes
@@ -17,8 +17,8 @@ jobs:
         git config user.name "TypeScript Bot"
         npm install
         git rm -r --quiet tests/baselines/reference :^tests/baselines/reference/docker :^tests/baselines/reference/user
-        gulp runtests-parallel --ci --fix || true
-        gulp baseline-accept
+        npx hereby runtests-parallel --ci --fix || true
+        npx hereby baseline-accept
         git add ./src
         git add ./tests/baselines/reference
         git diff --cached