Merge branch 'main' into fix21732

# Conflicts:
#	src/compiler/checker.ts

Author: ahejlsberg

.eslintignore

@@ -3,7 +3,20 @@
 /tests/**
 /lib/**
 /src/lib/*.generated.d.ts
+# Ignore all compiled script outputs
 /scripts/*.js
+# 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/**

.eslintrc.json

@@ -22,7 +22,7 @@
         //
         // 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"] }
+        { "files": ["*.ts", "*.mts", "*.cts", "*.mjs", "*.cjs"] }
     ],
     "rules": {
         "@typescript-eslint/adjacent-overload-signatures": "error",

.github/workflows/ci.yml

@@ -46,7 +46,7 @@ jobs:
     - run:  npm ci
 
     - name: Linter
-      run:  npm run lint:ci
+      run:  npm run lint
 
   browser-integration:
     runs-on: ubuntu-latest

Gulpfile.js

@@ -372,9 +372,6 @@ const lint = eslint(".");
 lint.displayName = "lint";
 task("lint", lint);
 task("lint").description = "Runs eslint on the compiler and scripts sources.";
-task("lint").flags = {
-    "   --ci": "Runs eslint additional rules",
-};
 
 const buildCancellationToken = () => buildProject("src/cancellationToken");
 const cleanCancellationToken = () => cleanProject("src/cancellationToken");

package-lock.json

@@ -90,7 +90,6 @@
         "mocha-fivemat-progress-reporter": "latest",
         "ms": "^2.1.3",
         "node-fetch": "^2.6.7",
-        "prex": "^0.4.7",
         "source-map-support": "latest",
         "typescript": "^4.8.2",
         "vinyl": "latest",
@@ -110,7 +109,6 @@
         "clean": "gulp clean",
         "gulp": "gulp",
         "lint": "gulp lint",
-        "lint:ci": "gulp lint --ci",
         "setup-hooks": "node scripts/link-hooks.js"
     },
     "browser": {

package.json

@@ -2,9 +2,11 @@
 const minimist = require("minimist");
 const os = require("os");
 
+const ci = ["1", "true"].includes(process.env.CI);
+
 /** @type {CommandLineOptions} */
 module.exports = minimist(process.argv.slice(2), {
-    boolean: ["dirty", "light", "colors", "lint", "lkg", "soft", "fix", "failed", "keepFailed", "force", "built"],
+    boolean: ["dirty", "light", "colors", "lint", "lkg", "soft", "fix", "failed", "keepFailed", "force", "built", "ci"],
     string: ["browser", "tests", "break", "host", "reporter", "stackTraceLimit", "timeout", "shards", "shardId"],
     alias: {
         /* eslint-disable quote-props */
@@ -33,12 +35,13 @@ module.exports = minimist(process.argv.slice(2), {
         reporter: process.env.reporter || process.env.r,
         lint: process.env.lint || true,
         fix: process.env.fix || process.env.f,
-        workers: process.env.workerCount || ((os.cpus().length - (process.env.CI ? 0 : 1)) || 1),
+        workers: process.env.workerCount || ((os.cpus().length - (ci ? 0 : 1)) || 1),
         failed: false,
         keepFailed: false,
         lkg: true,
         dirty: false,
-        built: false
+        built: false,
+        ci,
     }
 });
 
@@ -67,6 +70,7 @@ if (module.exports.built) {
  * @property {string|number} timeout
  * @property {boolean} failed
  * @property {boolean} keepFailed
+ * @property {boolean} ci
  *
  * @typedef {import("minimist").ParsedArgs & TypedOptions} CommandLineOptions
  */

scripts/build/options.js

@@ -6,7 +6,6 @@ const path = require("path");
 const mkdirP = require("mkdirp");
 const log = require("fancy-log");
 const cmdLineOptions = require("./options");
-const { CancellationToken } = require("prex");
 const { exec } = require("./utils");
 const { findUpFile } = require("./findUpDir");
 
@@ -22,9 +21,8 @@ exports.localTest262Baseline = "internal/baselines/test262/local";
  * @param {string} defaultReporter
  * @param {boolean} runInParallel
  * @param {boolean} watchMode
- * @param {import("prex").CancellationToken} [cancelToken]
  */
-async function runConsoleTests(runJs, defaultReporter, runInParallel, watchMode, cancelToken = CancellationToken.none) {
+async function runConsoleTests(runJs, defaultReporter, runInParallel, watchMode) {
     let testTimeout = cmdLineOptions.timeout;
     const tests = cmdLineOptions.tests;
     const inspect = cmdLineOptions.break || cmdLineOptions.inspect;
@@ -38,7 +36,6 @@ async function runConsoleTests(runJs, defaultReporter, runInParallel, watchMode,
     const shardId = +cmdLineOptions.shardId || undefined;
     if (!cmdLineOptions.dirty) {
         await cleanTestDirs();
-        cancelToken.throwIfCancellationRequested();
     }
 
     if (fs.existsSync(testConfigFile)) {
@@ -121,19 +118,17 @@ async function runConsoleTests(runJs, defaultReporter, runInParallel, watchMode,
 
     try {
         setNodeEnvToDevelopment();
-        const { exitCode } = await exec(process.execPath, args, {
-            cancelToken,
-        });
+        const { exitCode } = await exec(process.execPath, args);
         if (exitCode !== 0) {
             errorStatus = exitCode;
             error = new Error(`Process exited with status code ${errorStatus}.`);
         }
-        else if (process.env.CI === "true") {
+        else if (cmdLineOptions.ci) {
             // finally, do a sanity check and build the compiler with the built version of itself
             log.info("Starting sanity check build...");
             // Cleanup everything except lint rules (we'll need those later and would rather not waste time rebuilding them)
-            await exec("gulp", ["clean-tsc", "clean-services", "clean-tsserver", "clean-lssl", "clean-tests"], { cancelToken });
-            const { exitCode } = await exec("gulp", ["local", "--lkg=false"], { cancelToken });
+            await exec("gulp", ["clean-tsc", "clean-services", "clean-tsserver", "clean-lssl", "clean-tests"]);
+            const { exitCode } = await exec("gulp", ["local", "--lkg=false"]);
             if (exitCode !== 0) {
                 errorStatus = exitCode;
                 error = new Error(`Sanity check build process exited with status code ${errorStatus}.`);

scripts/build/tests.js

@@ -14,7 +14,6 @@ const ts = require("../../lib/typescript");
 const chalk = require("chalk");
 const which = require("which");
 const { spawn } = require("child_process");
-const { CancellationToken, CancelError, Deferred } = require("prex");
 const { Readable, Duplex } = require("stream");
 
 /**
@@ -25,26 +24,17 @@ const { Readable, Duplex } = require("stream");
  *
  * @typedef ExecOptions
  * @property {boolean} [ignoreExitCode]
- * @property {import("prex").CancellationToken} [cancelToken]
  * @property {boolean} [hidePrompt]
  * @property {boolean} [waitForExit=true]
  */
 async function exec(cmd, args, options = {}) {
     return /**@type {Promise<{exitCode: number}>}*/(new Promise((resolve, reject) => {
-        const { ignoreExitCode, cancelToken = CancellationToken.none, waitForExit = true } = options;
-        cancelToken.throwIfCancellationRequested();
+        const { ignoreExitCode, waitForExit = true } = options;
 
         if (!options.hidePrompt) log(`> ${chalk.green(cmd)} ${args.join(" ")}`);
         const proc = spawn(which.sync(cmd), args, { stdio: waitForExit ? "inherit" : "ignore" });
-        const registration = cancelToken.register(() => {
-            log(`${chalk.red("killing")} '${chalk.green(cmd)} ${args.join(" ")}'...`);
-            proc.kill("SIGINT");
-            proc.kill("SIGTERM");
-            reject(new CancelError());
-        });
         if (waitForExit) {
             proc.on("exit", exitCode => {
-                registration.unregister();
                 if (exitCode === 0 || ignoreExitCode) {
                     resolve({ exitCode });
                 }
@@ -53,7 +43,6 @@ async function exec(cmd, args, options = {}) {
                 }
             });
             proc.on("error", error => {
-                registration.unregister();
                 reject(error);
             });
         }
@@ -395,6 +384,15 @@ function rm(dest, opts) {
 }
 exports.rm = rm;
 
+class Deferred {
+    constructor() {
+        this.promise = new Promise((resolve, reject) => {
+            this.resolve = resolve;
+            this.reject = reject;
+        });
+    }
+}
+
 class Debouncer {
     /**
      * @param {number} timeout

scripts/build/utils.js

@@ -45,7 +45,7 @@ class FailedTestsReporter extends Mocha.reporters.Base {
                 }
             }
 
-            const newOptions = Object.assign({}, options, { reporterOptions: reporterOptions.reporterOptions || {} });
+            const newOptions = { ...options, reporterOptions: reporterOptions.reporterOptions || {} };
             if (reporterOptions.reporter === "xunit") {
                 newOptions.reporterOptions.output = "TEST-results.xml";
             }
@@ -142,4 +142,4 @@ class FailedTestsReporter extends Mocha.reporters.Base {
     }
 }
 
-module.exports = FailedTestsReporter;
+module.exports = FailedTestsReporter;