Merge remote-tracking branch 'origin/main' into release-4.5

Author: DanielRosenwasser

package-lock.json

@@ -0,0 +1,21 @@
+const { join, resolve, dirname } = require("path");
+const { existsSync } = require("fs");
+
+// search directories upward to avoid hard-wired paths based on the
+// build tree (same as src/harness/findUpDir.ts)
+
+function findUpFile(name) {
+    let dir = __dirname;
+    while (true) {
+        const fullPath = join(dir, name);
+        if (existsSync(fullPath)) return fullPath;
+        const up = resolve(dir, "..");
+        if (up === dir) return name; // it'll fail anyway
+        dir = up;
+    }
+}
+exports.findUpFile = findUpFile;
+
+const findUpRoot = () =>
+    findUpRoot.cached || (findUpRoot.cached = dirname(findUpFile("Gulpfile.js")));
+exports.findUpRoot = findUpRoot;

scripts/build/findUpDir.js

@@ -1,5 +1,7 @@
 // @ts-check
 const { exec, Debouncer } = require("./utils");
+const { resolve } = require("path");
+const { findUpRoot } = require("./findUpDir");
 
 class ProjectQueue {
     /**
@@ -33,7 +35,13 @@ class ProjectQueue {
     }
 }
 
-const projectBuilder = new ProjectQueue((projects, lkg, force) => exec(process.execPath, [lkg ? "./lib/tsc" : "./built/local/tsc", "-b", ...(force ? ["--force"] : []), ...projects], { hidePrompt: true }));
+const execTsc = (lkg, ...args) =>
+    exec(process.execPath,
+         [resolve(findUpRoot(), lkg ? "./lib/tsc" : "./built/local/tsc"),
+          "-b", ...args],
+         { hidePrompt: true })
+
+const projectBuilder = new ProjectQueue((projects, lkg, force) => execTsc(lkg, ...(force ? ["--force"] : []), ...projects));
 
 /**
  * @param {string} project
@@ -43,14 +51,14 @@ const projectBuilder = new ProjectQueue((projects, lkg, force) => exec(process.e
  */
 exports.buildProject = (project, { lkg, force } = {}) => projectBuilder.enqueue(project, { lkg, force });
 
-const projectCleaner = new ProjectQueue((projects, lkg) => exec(process.execPath, [lkg ? "./lib/tsc" : "./built/local/tsc", "-b", "--clean", ...projects], { hidePrompt: true }));
+const projectCleaner = new ProjectQueue((projects, lkg) => execTsc(lkg, "--clean", ...projects));
 
 /**
  * @param {string} project
  */
 exports.cleanProject = (project) => projectCleaner.enqueue(project);
 
-const projectWatcher = new ProjectQueue((projects) => exec(process.execPath, ["./lib/tsc", "-b", "--watch", ...projects], { hidePrompt: true }));
+const projectWatcher = new ProjectQueue((projects) => execTsc(true, "--watch", ...projects));
 
 /**
  * @param {string} project

scripts/build/projects.js

@@ -9,6 +9,7 @@ const log = require("fancy-log");
 const cmdLineOptions = require("./options");
 const { CancellationToken } = require("prex");
 const { exec } = require("./utils");
+const { findUpFile } = require("./findUpDir");
 
 const mochaJs = require.resolve("mocha/bin/_mocha");
 exports.localBaseline = "tests/baselines/local/";
@@ -73,11 +74,11 @@ async function runConsoleTests(runJs, defaultReporter, runInParallel, watchMode,
     /** @type {string[]} */
     let args = [];
 
-    // timeout normally isn"t necessary but Travis-CI has been timing out on compiler baselines occasionally
+    // timeout normally isn't necessary but Travis-CI has been timing out on compiler baselines occasionally
     // default timeout is 2sec which really should be enough, but maybe we just need a small amount longer
     if (!runInParallel) {
         args.push(mochaJs);
-        args.push("-R", "scripts/failed-tests");
+        args.push("-R", findUpFile("scripts/failed-tests.js"));
         args.push("-O", '"reporter=' + reporter + (keepFailed ? ",keepFailed=true" : "") + '"');
         if (tests) {
             args.push("-g", `"${tests}"`);

scripts/build/tests.js

@@ -9,12 +9,11 @@ const del = require("del");
 const File = require("vinyl");
 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");
 
-const isWindows = /^win/.test(process.platform);
-
 /**
  * Executes the provided command once with the supplied arguments.
  * @param {string} cmd
@@ -32,12 +31,8 @@ function exec(cmd, args, options = {}) {
         const { ignoreExitCode, cancelToken = CancellationToken.none, waitForExit = true } = options;
         cancelToken.throwIfCancellationRequested();
 
-        // TODO (weswig): Update child_process types to add windowsVerbatimArguments to the type definition
-        const subshellFlag = isWindows ? "/c" : "-c";
-        const command = isWindows ? [possiblyQuote(cmd), ...args] : [`${cmd} ${args.join(" ")}`];
-
         if (!options.hidePrompt) log(`> ${chalk.green(cmd)} ${args.join(" ")}`);
-        const proc = spawn(isWindows ? "cmd" : "/bin/sh", [subshellFlag, ...command], { stdio: waitForExit ? "inherit" : "ignore", windowsVerbatimArguments: true });
+        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");
@@ -68,13 +63,6 @@ function exec(cmd, args, options = {}) {
 }
 exports.exec = exec;
 
-/**
- * @param {string} cmd
- */
-function possiblyQuote(cmd) {
-    return cmd.indexOf(" ") >= 0 ? `"${cmd}"` : cmd;
-}
-
 /**
  * @param {ts.Diagnostic[]} diagnostics
  * @param {{ cwd?: string, pretty?: boolean }} [options]
@@ -440,4 +428,4 @@ class Debouncer {
         }
     }
 }
-exports.Debouncer = Debouncer;
+exports.Debouncer = Debouncer;

scripts/build/utils.js

@@ -2947,6 +2947,7 @@ namespace ts {
                 case SyntaxKind.MethodDeclaration:
                 case SyntaxKind.GetAccessor:
                 case SyntaxKind.SetAccessor:
+                case SyntaxKind.ClassStaticBlockDeclaration:
                     // this.foo assignment in a JavaScript class
                     // Bind this property to the containing class
                     const containingClass = thisContainer.parent;