Merge origin/master into renovate/js-yaml-5.x

Author: firecow

.gitignore

@@ -1,5 +1,6 @@
 /.idea/
 /node_modules/
+/.bun/
 /bin/
 /ppa/
 /dist/

bun.lock

@@ -23,17 +23,33 @@
     "typecheck": "tsc --noEmit",
     "fetch-schema": "curl https://gitlab.com/gitlab-org/gitlab/-/raw/master/app/assets/javascripts/editor/schema/ci.json -sf > src/schema.json"
   },
-  "dependencies": {
+  "devDependencies": {
+    "@eslint/js": "10.x",
+    "@stylistic/eslint-plugin": "5.x",
+    "@types/base64url": "2.x.x",
+    "@types/bun": "1.x.x",
+    "@types/checksum": "0.1.x",
+    "@types/deep-extend": "0.6.x",
+    "@types/fs-extra": "11.x.x",
+    "@types/micromatch": "4.x.x",
+    "@types/pretty-hrtime": "1.x.x",
+    "@types/semver": "7.x.x",
+    "@types/split2": "4.x.x",
+    "@types/yargs": "17.x.x",
+    "@vitest/coverage-v8": "^4.0.18",
     "ajv": "8.x.x",
     "axios": "1.x.x",
+    "axios-mock-adapter": "2.x",
     "base64url": "3.x.x",
     "camelcase": "9.x.x",
-    "chalk": "5.x.x",
+    "chalk": "6.x",
     "chalk-template": "1.x.x",
     "checksum": "1.x.x",
     "deep-extend": "0.6.x",
+    "depcheck": "1.x.x",
     "dotenv": "17.x",
-    "execa": "5.x.x",
+    "eslint": "10.x",
+    "execa": "10.x",
     "fs-extra": "11.x.x",
     "globby": "16.x.x",
     "js-yaml": "5.x",
@@ -46,29 +62,10 @@
     "semver": "7.x.x",
     "split2": "4.x.x",
     "terminal-link": "5.x.x",
-    "yargs": "18.x"
-  },
-  "devDependencies": {
-    "@eslint/js": "10.x",
-    "@stylistic/eslint-plugin": "5.x",
-    "@types/base64url": "2.x.x",
-    "@types/bun": "1.x.x",
-    "@types/checksum": "0.1.x",
-    "@types/deep-extend": "0.6.x",
-    "@types/fs-extra": "11.x.x",
-    "@types/js-yaml": "4.x.x",
-    "@types/micromatch": "4.x.x",
-    "@types/pretty-hrtime": "1.x.x",
-    "@types/semver": "7.x.x",
-    "@types/split2": "4.x.x",
-    "@types/yargs": "17.x.x",
-    "@vitest/coverage-v8": "^4.0.18",
-    "axios-mock-adapter": "2.x",
-    "depcheck": "1.x.x",
-    "eslint": "10.x",
     "typescript": "6.x",
     "typescript-eslint": "8.x.x",
-    "vitest": "^4.0.18"
+    "vitest": "^4.0.18",
+    "yargs": "18.x"
   },
   "repository": {
     "type": "git",
@@ -95,5 +92,8 @@
   "files": [
     "dist/index.js",
     "dist/index.js.map"
-  ]
+  ],
+  "overrides": {
+    "chalk": "$chalk"
+  }
 }

package.json

@@ -105,7 +105,7 @@ export class Argv {
     }
 
     private constructor (argv: any, writeStreams?: WriteStreams) {
-        if (argv.noColor) {
+        if (argv.noColor || argv.color === false || (process.env.NO_COLOR ?? "") !== "") {
             chalkBase.level = 0;
         }
         this.writeStreams = writeStreams;

src/argv.ts

@@ -9,7 +9,7 @@ import {GitData} from "./git-data.js";
 import assert, {AssertionError} from "node:assert";
 import {Mutex} from "./mutex.js";
 import {Argv} from "./argv.js";
-import execa from "execa";
+import {execa} from "execa";
 import {CICDVariable} from "./variables-from-files.js";
 import {GitlabRunnerCPUsPresetValue, GitlabRunnerMemoryPresetValue, GitlabRunnerPresetValues} from "./gitlab-preset.js";
 import {handler} from "./handler.js";
@@ -932,10 +932,12 @@ If you know what you're doing and would like to suppress this warning, use one o
                 shell: "bash",
                 stdio: ["inherit", "inherit", "inherit"],
                 env: {...expanded, ...process.env},
+                reject: false,
             });
+            const interactiveChildProcess = interactiveCp.nodeChildProcess;
             return new Promise<number>((resolve, reject) => {
-                void interactiveCp.on("exit", (code) => resolve(code ?? 0));
-                void interactiveCp.on("error", (err) => reject(err));
+                interactiveChildProcess.on("exit", (code) => resolve(code ?? 0));
+                interactiveChildProcess.on("error", (err) => reject(err));
             });
         }
 
@@ -1143,7 +1145,9 @@ If you know what you're doing and would like to suppress this warning, use one o
             cwd,
             shell: "bash",
             env: imageName ? process.env : expanded,
+            reject: false,
         });
+        const childProcess = cp.nodeChildProcess;
 
         // eslint-disable-next-line no-control-regex
         const sectionRegex = /\x1b\[0Ksection_(start|end):(\d+):([^\s[]+)(?:\[[^\]]*\])?\r\x1b\[0K/;
@@ -1187,11 +1191,11 @@ If you know what you're doing and would like to suppress this warning, use one o
             }
             // Wait for "close" rather than "exit" so all stdout/stderr data events
             // have flushed to the output log file before we resolve.
-            void cp.on("close", (code) => {
+            childProcess.on("close", (code) => {
                 clearTimeout(this._longRunningSilentTimeout);
                 return resolve(code ?? 0);},
             );
-            void cp.on("error", (err) => {
+            childProcess.on("error", (err) => {
                 clearTimeout(this._longRunningSilentTimeout);
                 return reject(err);
             });

src/job.ts

@@ -6,7 +6,7 @@ import {needsComplex} from "./data-expander.js";
 import fs from "fs-extra";
 import checksum from "checksum";
 import base64url from "base64url";
-import execa, {ExecaError} from "execa";
+import {execa, execaSync, ExecaError} from "execa";
 import assert from "node:assert";
 import {createHash} from "node:crypto";
 import {CICDVariable} from "./variables-from-files.js";
@@ -30,11 +30,11 @@ type ExpandWith = {
 };
 
 export class Utils {
-    static bashMulti (scripts: string[], cwd = process.cwd()): Promise<{stdout: string; stderr: string; exitCode: number}> {
+    static bashMulti (scripts: string[], cwd = process.cwd()): Promise<{stdout: string; stderr: string; exitCode?: number}> {
         return execa(scripts.join(" && \\"), {shell: "bash", cwd});
     }
 
-    static bash (shellScript: string, cwd = process.cwd()): Promise<{stdout: string; stderr: string; exitCode: number}> {
+    static bash (shellScript: string, cwd = process.cwd()): Promise<{stdout: string; stderr: string; exitCode?: number}> {
         return execa(shellScript, {shell: "bash", cwd});
     }
 
@@ -43,7 +43,7 @@ export class Utils {
     }
 
     static syncSpawn (cmdArgs: string[], cwd = process.cwd()): {stdout: string; stderr: string} {
-        return execa.sync(cmdArgs[0], cmdArgs.slice(1), {cwd});
+        return execaSync(cmdArgs[0], cmdArgs.slice(1), {cwd});
     }
 
     static fsUrl (url: string): string {

src/utils.ts

@@ -0,0 +1,51 @@
+import "../src/global.js";
+import chalkBase, {type ColorSupportLevel} from "chalk";
+import {Argv} from "../src/argv.js";
+import {WriteStreamsMock} from "../src/write-streams.js";
+
+let writeStreams: WriteStreamsMock;
+let originalLevel: ColorSupportLevel;
+let originalNoColor: string | undefined;
+
+beforeEach(() => {
+    writeStreams = new WriteStreamsMock();
+    originalLevel = chalkBase.level;
+    originalNoColor = process.env.NO_COLOR;
+});
+
+afterEach(() => {
+    chalkBase.level = originalLevel;
+    if (originalNoColor === undefined) {
+        delete process.env.NO_COLOR;
+    } else {
+        process.env.NO_COLOR = originalNoColor;
+    }
+});
+
+test("color stays enabled by default", async () => {
+    chalkBase.level = 2;
+    delete process.env.NO_COLOR;
+    await Argv.build({}, writeStreams);
+    expect(chalkBase.level).toBe(2);
+});
+
+test("--no-color disables color", async () => {
+    chalkBase.level = 2;
+    delete process.env.NO_COLOR;
+    await Argv.build({color: false}, writeStreams);
+    expect(chalkBase.level).toBe(0);
+});
+
+test("NO_COLOR disables color", async () => {
+    chalkBase.level = 2;
+    process.env.NO_COLOR = "1";
+    await Argv.build({}, writeStreams);
+    expect(chalkBase.level).toBe(0);
+});
+
+test("an empty NO_COLOR leaves color enabled", async () => {
+    chalkBase.level = 2;
+    process.env.NO_COLOR = "";
+    await Argv.build({}, writeStreams);
+    expect(chalkBase.level).toBe(2);
+});

tests/argv-color.test.ts

@@ -75,7 +75,7 @@ describe("dependency-proxy", () => {
             }, writeStreams);
         } catch (e: any) {
             // In ci environment, gitlab.com:443 is not authenticated, but at least this shows that we're pulling from the correct path
-            expect(e.shortMessage).toEqual("Command failed with exit code 1: docker pull gitlab.com:443/gcl/dependency_proxy/containers/busybox:latest");
+            expect(e.command).toEqual("docker pull gitlab.com:443/gcl/dependency_proxy/containers/busybox:latest");
             return;
         }
         throw new Error("Error is expected but not thrown/caught");

tests/test-cases/dependency-proxy/integration.test.ts

@@ -1,11 +1,18 @@
+import fs from "fs-extra";
 import {WriteStreamsMock} from "../../../src/write-streams.js";
 import {handler} from "../../../src/handler.js";
 import chalk from "chalk-template";
 
+const cwd = "tests/test-cases/needs-parallel-matrix-artifacts";
+
+afterAll(async () => {
+    await Promise.all(["aws", "gcp"].map(provider => fs.rm(`${cwd}/tag-${provider}.txt`, {force: true})));
+});
+
 test.concurrent("needs-parallel-matrix-artifacts cascades only the matching producer's artifacts to each consumer permutation", async () => {
     const writeStreams = new WriteStreamsMock();
     await handler({
-        cwd: "tests/test-cases/needs-parallel-matrix-artifacts",
+        cwd,
         shellIsolation: true,
         stateDir: ".gitlab-ci-local-needs-parallel-matrix-artifacts",
     }, writeStreams);