From 63a3189b98a2176153f119c6fa100c38f68cc0b1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 Nov 2026 23:22:25 +0000 Subject: [PATCH 1/2] Update Node.js to v26 --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 5a9e0f50f..81ddd5939 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ -nodejs 16.20.2 +nodejs 26.13.0 yarn 1.22.4 github-cli 2.103.3 From 74e5d02c2ee2a326c7a3ee72c48646e9d7ea5707 Mon Sep 17 00:00:00 2001 From: Marc LeBlanc <7050295+marcleblanc2@users.noreply.github.com> Date: Tue, 10 Nov 2026 17:58:15 -0600 Subject: [PATCH 2/2] ci: Run Prettier with npm instead of Yarn Yarn 1 calls url.parse() while it reads yarn.lock, so on Node 24 and newer every install prints the DEP0169 deprecation warning. Yarn 1.22.22, the last 1.x release, prints it too. npm ships with Node, so .tool-versions no longer pins a package manager. package-lock.json holds the same two packages, at the same versions and integrity hashes, as yarn.lock did. Amp-Thread-ID: https://ampcode.com/threads/T-01a1c7cf-1424-7181-b636-ba95a34ad11a Co-authored-by: Amp --- .buildkite/prettier-check.sh | 4 ++-- .tool-versions | 1 - package-lock.json | 33 +++++++++++++++++++++++++++++++++ package.json | 2 +- yarn.lock | 13 ------------- 5 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 package-lock.json delete mode 100644 yarn.lock diff --git a/.buildkite/prettier-check.sh b/.buildkite/prettier-check.sh index 497b2b37a..2d032c79a 100755 --- a/.buildkite/prettier-check.sh +++ b/.buildkite/prettier-check.sh @@ -3,5 +3,5 @@ cd "$(dirname "${BASH_SOURCE[0]}")/.." set -euxo pipefail -yarn -yarn run prettier-check +npm ci +npm run prettier-check diff --git a/.tool-versions b/.tool-versions index 81ddd5939..6c149862b 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,2 @@ nodejs 26.13.0 -yarn 1.22.4 github-cli 2.103.3 diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 000000000..b934fbb10 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,33 @@ +{ + "name": "deploy-sourcegraph-docker", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "devDependencies": { + "@sourcegraph/prettierrc": "3.0.3", + "prettier": "1.19.1" + } + }, + "node_modules/@sourcegraph/prettierrc": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@sourcegraph/prettierrc/-/prettierrc-3.0.3.tgz", + "integrity": "sha512-FQ1/Ued4I02R0JkrHHofDN163juVxUnPALzfxPZrDZUHv+c3jHjfZhmTHEz+Wd+g3b7MFk0fkj36nZSnvPyU8A==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/prettier": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", + "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", + "dev": true, + "license": "MIT", + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=4" + } + } + } +} diff --git a/package.json b/package.json index 2eac8995b..35aa4e1b2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "scripts": { "prettier": "prettier '**/{*.{js?(on),ts?(x),graphql,md,scss},.*.js?(on)}' --write --list-different --config prettier.config.js", - "prettier-check": "yarn -s run prettier --write=false" + "prettier-check": "npm run --silent prettier -- --write=false" }, "devDependencies": { "@sourcegraph/prettierrc": "3.0.3", diff --git a/yarn.lock b/yarn.lock deleted file mode 100644 index de551fc13..000000000 --- a/yarn.lock +++ /dev/null @@ -1,13 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@sourcegraph/prettierrc@3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@sourcegraph/prettierrc/-/prettierrc-3.0.3.tgz#51bfa9b2588fe35121593fa877143e6373028289" - integrity sha512-FQ1/Ued4I02R0JkrHHofDN163juVxUnPALzfxPZrDZUHv+c3jHjfZhmTHEz+Wd+g3b7MFk0fkj36nZSnvPyU8A== - -prettier@1.19.1: - version "1.19.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" - integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==