diff --git a/package-lock.json b/package-lock.json index 7c1d8e767..16cf3af87 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1458,9 +1458,6 @@ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT OR Apache-2.0", "optional": true, "os": [ @@ -1478,9 +1475,6 @@ "arm64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT OR Apache-2.0", "optional": true, "os": [ @@ -1498,9 +1492,6 @@ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT OR Apache-2.0", "optional": true, "os": [ @@ -1518,9 +1509,6 @@ "x64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT OR Apache-2.0", "optional": true, "os": [ @@ -1564,6 +1552,23 @@ "node": ">=14.21.3" } }, + "node_modules/@bybrave/proper-lockfile2": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@bybrave/proper-lockfile2/-/proper-lockfile2-5.1.0.tgz", + "integrity": "sha512-A37VQpWEHZXktEn+ly02SntFftY4cQ0CkFvs7Fg0xMsqEm3RZFGrUmK9oM7IgyZ+iCCySAg6a/q/CaJZj6XTlA==", + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.11", + "retry": "^0.13.1", + "signal-exit": "^3.0.7" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://ko-fi.com/bybrave" + } + }, "node_modules/@clickhouse/client": { "version": "1.23.1", "resolved": "https://registry.npmjs.org/@clickhouse/client/-/client-1.23.1.tgz", @@ -4645,9 +4650,6 @@ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -4665,9 +4667,6 @@ "arm64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -4685,9 +4684,6 @@ "ppc64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -4705,9 +4701,6 @@ "riscv64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -4725,9 +4718,6 @@ "riscv64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -4745,9 +4735,6 @@ "s390x" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -4765,9 +4752,6 @@ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -4785,9 +4769,6 @@ "x64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -4982,9 +4963,6 @@ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -4999,9 +4977,6 @@ "arm64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -5016,9 +4991,6 @@ "ppc64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -5033,9 +5005,6 @@ "riscv64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -5050,9 +5019,6 @@ "riscv64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -5067,9 +5033,6 @@ "s390x" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -5084,9 +5047,6 @@ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -5101,9 +5061,6 @@ "x64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -5460,9 +5417,6 @@ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -5481,9 +5435,6 @@ "arm64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -5502,9 +5453,6 @@ "ppc64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -5523,9 +5471,6 @@ "s390x" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -5544,9 +5489,6 @@ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -5565,9 +5507,6 @@ "x64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -6104,15 +6043,6 @@ "pg-types": "^2.2.0" } }, - "node_modules/@types/proper-lockfile": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/@types/proper-lockfile/-/proper-lockfile-4.1.4.tgz", - "integrity": "sha512-uo2ABllncSqg9F1D4nugVl9v93RmjxF6LJzQLMLDdPaXCUIDPeOJ21Gbqi43xNKzBi/WQ0Q0dICqufzQbMjipQ==", - "dev": true, - "dependencies": { - "@types/retry": "*" - } - }, "node_modules/@types/readable-stream": { "version": "4.0.21", "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.21.tgz", @@ -6132,12 +6062,6 @@ "@types/node": "*" } }, - "node_modules/@types/retry": { - "version": "0.12.5", - "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.5.tgz", - "integrity": "sha512-3xSjTp3v03X/lSQLkczaN9UIEwJMoMCA1+Nb5HfbJEQWogdeQIyVtTvxPXDQjZ5zws8rFQfVfRdz03ARihPJgw==", - "dev": true - }, "node_modules/@types/selenium-webdriver": { "version": "4.35.7", "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-4.35.7.tgz", @@ -7073,15 +6997,6 @@ "retry": "0.13.1" } }, - "node_modules/async-retry/node_modules/retry": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", - "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -7689,9 +7604,6 @@ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -7709,9 +7621,6 @@ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -10862,9 +10771,6 @@ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MPL-2.0", "optional": true, "os": [ @@ -10887,9 +10793,6 @@ "arm64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MPL-2.0", "optional": true, "os": [ @@ -10912,9 +10815,6 @@ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MPL-2.0", "optional": true, "os": [ @@ -10937,9 +10837,6 @@ "x64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MPL-2.0", "optional": true, "os": [ @@ -12487,16 +12384,6 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, - "node_modules/proper-lockfile": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-4.1.2.tgz", - "integrity": "sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA==", - "dependencies": { - "graceful-fs": "^4.2.4", - "retry": "^0.12.0", - "signal-exit": "^3.0.2" - } - }, "node_modules/properties-reader": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/properties-reader/-/properties-reader-3.0.1.tgz", @@ -12785,9 +12672,10 @@ } }, "node_modules/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", + "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", + "license": "MIT", "engines": { "node": ">= 4" } @@ -15949,6 +15837,7 @@ "license": "MIT", "dependencies": { "@balena/dockerignore": "^1.0.2", + "@bybrave/proper-lockfile2": "^5.1.0", "@types/dockerode": "^4.0.1", "archiver": "^7.0.1", "async-lock": "^1.4.1", @@ -15957,7 +15846,6 @@ "docker-compose": "^1.5.0", "dockerode": "^5.0.1", "get-port": "^5.1.1", - "proper-lockfile": "^4.1.2", "properties-reader": "^3.0.1", "ssh-remote-port-forward": "^1.0.4", "tar-fs": "^3.1.3", @@ -15969,7 +15857,6 @@ "@types/async-lock": "^1.4.2", "@types/byline": "^4.2.36", "@types/debug": "^4.1.13", - "@types/proper-lockfile": "^4.1.4", "@types/tar-fs": "^2.0.4", "@types/tmp": "^0.2.6" }, diff --git a/packages/testcontainers/package.json b/packages/testcontainers/package.json index d210646e5..85053e6b4 100644 --- a/packages/testcontainers/package.json +++ b/packages/testcontainers/package.json @@ -31,6 +31,7 @@ }, "dependencies": { "@balena/dockerignore": "^1.0.2", + "@bybrave/proper-lockfile2": "^5.1.0", "@types/dockerode": "^4.0.1", "archiver": "^7.0.1", "async-lock": "^1.4.1", @@ -39,7 +40,6 @@ "docker-compose": "^1.5.0", "dockerode": "^5.0.1", "get-port": "^5.1.1", - "proper-lockfile": "^4.1.2", "properties-reader": "^3.0.1", "ssh-remote-port-forward": "^1.0.4", "tar-fs": "^3.1.3", @@ -51,7 +51,6 @@ "@types/async-lock": "^1.4.2", "@types/byline": "^4.2.36", "@types/debug": "^4.1.13", - "@types/proper-lockfile": "^4.1.4", "@types/tar-fs": "^2.0.4", "@types/tmp": "^0.2.6" }, diff --git a/packages/testcontainers/src/common/file-lock.ts b/packages/testcontainers/src/common/file-lock.ts index 1872d4330..bfab218ef 100644 --- a/packages/testcontainers/src/common/file-lock.ts +++ b/packages/testcontainers/src/common/file-lock.ts @@ -1,6 +1,6 @@ import { writeFile } from "node:fs/promises"; import path from "node:path"; -import lockFile from "proper-lockfile"; +import lockFile from "@bybrave/proper-lockfile2"; import tmp from "tmp"; import { log } from "./logger";