Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions agent/agentcontainers/dcspec/gen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -euo pipefail
# While you can install it using npm, we have it in our devDependencies
# in ${PROJECT_ROOT}/package.json.
PROJECT_ROOT="$(git rev-parse --show-toplevel)"
if ! pnpm list | grep quicktype &>/dev/null; then
if ! pnpm -C "${PROJECT_ROOT}" list | grep quicktype &>/dev/null; then
echo "quicktype is required to run this script!"
echo "Ensure that it is present in the devDependencies of ${PROJECT_ROOT}/package.json and then run pnpm install."
exit 1
Expand Down Expand Up @@ -40,7 +40,7 @@ if [[ " $* " == *" --quiet "* ]] || [[ ${DCSPEC_QUIET:-false} == "true" ]]; then
exec 2>"${TMPDIR}/stderr.log"
fi

if ! pnpm exec quicktype \
if ! pnpm -C "${PROJECT_ROOT}" exec quicktype \
--src-lang schema \
--lang go \
--top-level "DevContainer" \
Expand Down
2 changes: 1 addition & 1 deletion dogfood/coder/ubuntu-22.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ RUN source $NVM_DIR/nvm.sh && \
ENV PATH=$NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
RUN corepack enable && \
corepack prepare npm@10.8.1 --activate && \
corepack prepare pnpm@10.14.0 --activate
corepack prepare pnpm@10.33.2 --activate

RUN pnpx playwright@1.47.0 install --with-deps chromium

Expand Down
10 changes: 5 additions & 5 deletions dogfood/coder/ubuntu-26.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN sed -i 's|http://deb.debian.org/debian|http://mirrors.edge.kernel.org/debian
RUN apt-get update && apt-get install -y libssl-dev openssl pkg-config build-essential
RUN cargo install jj-cli typos-cli watchexec-cli

FROM ubuntu:resolute@sha256:cc925e589b7543b910fea57a240468940003fbfc0515245a495dd0ad8fe7cef1 AS go
FROM ubuntu:26.04@sha256:5e275723f82c67e387ba9e3c24baa0abdcb268917f276a0561c97bef9450d0b4 AS go

# Install Go manually, so that we can control the version
ARG GO_VERSION=1.25.9
Expand All @@ -27,7 +27,7 @@ ENV PATH=$PATH:/usr/local/go/bin
ARG GOPATH="/tmp/"
# Install Go utilities.
RUN apt-get update && \
apt-get install --yes gcc && \
apt-get install --yes build-essential && \
mkdir --parents /usr/local/go && \
tar --extract --gzip --directory=/usr/local/go --file=/usr/local/go.tar.gz --strip-components=1 && \
mkdir --parents "$GOPATH" && \
Expand Down Expand Up @@ -67,7 +67,7 @@ RUN apt-get update && \
# mockgen for generating mocks (v0.6.0+ required for Go 1.25)
go install go.uber.org/mock/mockgen@v0.6.0 && \
# Reduce image size.
apt-get remove --yes gcc && \
apt-get remove --yes build-essential && \
apt-get autoremove --yes && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* && \
Expand All @@ -83,7 +83,7 @@ RUN curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/d
unzip protoc.zip && \
rm protoc.zip

FROM ubuntu:resolute@sha256:cc925e589b7543b910fea57a240468940003fbfc0515245a495dd0ad8fe7cef1
FROM ubuntu:26.04@sha256:5e275723f82c67e387ba9e3c24baa0abdcb268917f276a0561c97bef9450d0b4

SHELL ["/bin/bash", "-c"]

Expand Down Expand Up @@ -255,7 +255,7 @@ RUN source $NVM_DIR/nvm.sh && \
ENV PATH=$NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
RUN corepack enable && \
corepack prepare npm@10.8.1 --activate && \
corepack prepare pnpm@10.14.0 --activate
corepack prepare pnpm@10.33.2 --activate

RUN pnpx playwright@1.47.0 install --with-deps chromium

Expand Down
2 changes: 1 addition & 1 deletion offlinedocs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
},
"engines": {
"npm": ">=9.0.0 <10.0.0",
"node": ">=18.0.0 <25.0.0"
"node": ">=22.0.0 <25.0.0"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

26 turns current today 🎉

},
"pnpm": {
"overrides": {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"_comment": "This version doesn't matter, it's just to allow importing from other repos.",
"name": "coder",
"name": "@coder/coder",
Comment thread
jeremyruppel marked this conversation as resolved.
"version": "0.0.0",
"packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748",
"packageManager": "pnpm@10.33.2+sha512.a90faf6feeab71ad6c6e57f94e0fe1a12f5dcc22cd754db40ae9593eb6a3e0b6b12e3540218bb37ae083404b1f2ce6db2a4121e979829b4aff94b99f49da1cf8",
"scripts": {
"format-docs": "markdown-table-formatter $(find docs -name '*.md') *.md",
"lint-docs": "markdownlint-cli2 --fix $(find docs -name '*.md') *.md",
Expand Down
8 changes: 4 additions & 4 deletions site/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "coder-v2",
"description": "Coder V2 (Workspaces V2)",
"name": "@coder/coder",
"description": "Coder",
"repository": "https://github.com/coder/coder",
"private": true,
"license": "AGPL-3.0",
"packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748",
"packageManager": "pnpm@10.33.2+sha512.a90faf6feeab71ad6c6e57f94e0fe1a12f5dcc22cd754db40ae9593eb6a3e0b6b12e3540218bb37ae083404b1f2ce6db2a4121e979829b4aff94b99f49da1cf8",
"scripts": {
"build": "NODE_ENV=production pnpm vite build",
"check": "biome check --error-on-warnings .",
Expand Down Expand Up @@ -195,7 +195,7 @@
},
"engines": {
"pnpm": ">=10.0.0 <11.0.0",
"node": ">=18.0.0 <25.0.0"
"node": ">=22.0.0 <25.0.0"
},
"pnpm": {
"overrides": {
Expand Down
Loading
Loading