Merge branch 'main' into buildInfoSize

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/**

.eslintplugin.js

@@ -0,0 +1,12 @@
+const fs = require("fs");
+const path = require("path");
+
+const rulesDir = path.join(__dirname, "scripts", "eslint", "rules");
+const ext = ".js";
+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

@@ -11,7 +11,18 @@
         "es6": true
     },
     "plugins": [
-        "@typescript-eslint", "jsdoc", "no-null", "import"
+        "@typescript-eslint", "jsdoc", "no-null", "import", "eslint-plugin-local"
+    ],
+    "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",
@@ -70,20 +81,20 @@
         "@typescript-eslint/unified-signatures": "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/one-namespace-per-file": "error",
 
         // eslint-plugin-import
         "import/no-extraneous-dependencies": ["error", { "optionalDependencies": false }],

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ on:
       - release-*
 
 jobs:
-  build:
+  test:
     runs-on: ubuntu-latest
 
     strategy:
@@ -24,27 +24,46 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-      with:
-        fetch-depth: 5
     - name: Use node version ${{ matrix.node-version }}
       uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
         check-latest: true
     - run:  npm ci
 
-    # Re: https://github.com/actions/setup-node/pull/125
-    - name: Register Problem Matcher for TSC
-      run: echo "##[add-matcher].github/tsc.json"
-
     - name: Tests
       run:  npm test -- --no-lint
 
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
+      with:
+        node-version: "*"
+        check-latest: true
+    - run:  npm ci
+
     - name: Linter
       run:  npm run lint:ci
 
+  browser-integration:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
+      with:
+        node-version: "*"
+        check-latest: true
+    - run:  npm ci
+
     - name: Adding playwright
       run: npm install --no-save --no-package-lock playwright
 
+    - name: Build local
+      run: gulp local
+
     - name: Validate the browser can import TypeScript
       run: gulp test-browser-integration

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

.npmignore

@@ -37,3 +37,5 @@ Dockerfile
 .eslintrc.json
 .yarnrc
 tmp
+.eslintplugin.js
+.eslintcache

.vscode/settings.template.json

@@ -1,13 +1,6 @@
 // Rename this file 'settings.json' or merge its
 // contents into your existing settings.
 {
-    "eslint.validate": [
-        "typescript"
-    ],
-    "eslint.options": {
-        "rulePaths": ["./scripts/eslint/built/rules/"],
-        "extensions": [".ts"]
-    },
     // To use the last-known-good (LKG) compiler version:
     // "typescript.tsdk": "lib"
 

Gulpfile.js

@@ -8,7 +8,6 @@ const del = require("del");
 const rename = require("gulp-rename");
 const concat = require("gulp-concat");
 const merge2 = require("merge2");
-const mkdirp = require("mkdirp");
 const { src, dest, task, parallel, series, watch } = require("gulp");
 const { append, transform } = require("gulp-insert");
 const { prependFile } = require("./scripts/build/prepend");
@@ -27,9 +26,10 @@ task("scripts").description = "Builds files in the 'scripts' folder.";
 const cleanScripts = () => cleanProject("scripts");
 cleanTasks.push(cleanScripts);
 
+/** @type {{ libs: string[]; paths: Record<string, string | undefined>; }} */
 const libraries = readJson("./src/lib/libs.json");
 const libs = libraries.libs.map(lib => {
-    const relativeSources = ["header.d.ts"].concat(libraries.sources && libraries.sources[lib] || [lib + ".d.ts"]);
+    const relativeSources = ["header.d.ts", lib + ".d.ts"];
     const relativeTarget = libraries.paths && libraries.paths[lib] || ("lib." + lib + ".d.ts");
     const sources = relativeSources.map(s => path.posix.join("src/lib", s));
     const target = `built/local/${relativeTarget}`;
@@ -350,15 +350,12 @@ 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 +368,9 @@ 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 lint = series([buildEslintRules, lintScripts, lintCompiler]);
+const lint = eslint(".");
 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",
@@ -443,7 +427,7 @@ task("watch-local").flags = {
 const preTest = parallel(buildTsc, buildTests, buildServices, buildLssl);
 preTest.displayName = "preTest";
 
-const postTest = (done) => cmdLineOptions.lint ? lint(done) : done();
+const postTest = (done) => cmdLineOptions.lint ? lint() : done();
 
 const runTests = () => runConsoleTests("built/local/run.js", "mocha-fivemat-progress-reporter", /*runInParallel*/ false, /*watchMode*/ false);
 task("runtests", series(preBuild, preTest, runTests, postTest));