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 5a9e0f50f..6c149862b 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,2 @@ -nodejs 16.20.2 -yarn 1.22.4 +nodejs 26.13.0 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==