From 87be37e8ccedaa778caf20e80b2656add699e428 Mon Sep 17 00:00:00 2001 From: tehut Date: Fri, 29 Aug 2025 09:34:58 -0700 Subject: [PATCH] nmd 940/pnpm related build failures (#26659) * replace yarn with pnpm in build scripts * pin node version to v20 * pin pnpm version to pnpm@10.15.0 --- package.json | 2 +- scripts/release/Dockerfile | 4 ++-- scripts/vagrant-linux-unpriv-ui.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ce76843e8..f86b38533 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "scripts": {}, "packageManager": "pnpm@10.15.0+sha512.486ebc259d3e999a4e8691ce03b5cac4a71cbeca39372a9b762cb500cfdf0873e2cb16abe3d951b1ee2cf012503f027b98b6584e4df22524e0c7450d9ec7aa7b", "engines": { - "node": ">= 22.17.1", + "node": "20.19.4", "pnpm": ">= 10" }, "pnpm": { diff --git a/scripts/release/Dockerfile b/scripts/release/Dockerfile index a0ce095e6..e17b7228e 100644 --- a/scripts/release/Dockerfile +++ b/scripts/release/Dockerfile @@ -39,9 +39,9 @@ RUN /bin/bash -c '. ~/.nvm/nvm.sh && ln -s ~/.nvm/versions/node/$(nvm current) ~ COPY ./scripts/release/docker-build-all /tmp/scripts/docker-build-all -# Update PATH with GO bin, yarn, and node +# Update PATH with GO bin, pnpm, and node ENV GOPATH="/opt/gopath" \ - PATH="/home/vagrant/.nvm/versions/node/.default/bin:/home/vagrant/bin:/opt/gopath/bin:/home/vagrant/.yarn/bin:/home/vagrant/.config/yarn/global/node_modules/.bin:$PATH" + PATH="/home/vagrant/.nvm/versions/node/.default/bin:/home/vagrant/bin:/opt/gopath/bin:/home/vagrant/.pnpm/bin:/home/vagrant/.config/pnpm/global/node_modules/.bin:$PATH" RUN mkdir -p /opt/gopath/src/github.com/hashicorp/nomad RUN mkdir -p /home/vagrant/bin \ diff --git a/scripts/vagrant-linux-unpriv-ui.sh b/scripts/vagrant-linux-unpriv-ui.sh index 18451778c..693b63cca 100755 --- a/scripts/vagrant-linux-unpriv-ui.sh +++ b/scripts/vagrant-linux-unpriv-ui.sh @@ -23,5 +23,5 @@ find ~/.nvm/versions/node -not -name "v${NODE_VERSION}" -depth 1 -exec rm -rf {} npm install -g ember-cli -# Install Yarn for front-end dependency management -curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.22.5 +# Install pnpm for front-end dependency management +npm install -g pnpm@10.15.0