Skip to content

Commit

Permalink
Update Turborepo and pnpm versions (#313)
Browse files Browse the repository at this point in the history
* feat: update turbo & pnpm versions

* feat: update pnpm version in linter action

* feat: update turborepo version in dockerfiles

* feat: remove mailer from app-types dependencies

* feat: update pnpm lock file
  • Loading branch information
fruneen authored Jul 11, 2024
1 parent 8e9d3aa commit 1e919c2
Show file tree
Hide file tree
Showing 11 changed files with 12,842 additions and 9,690 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linter.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v3
with:
version: 8
version: 9.5.0
- name: Use Node.js 20
uses: actions/setup-node@v4
with:
Expand Down
6 changes: 5 additions & 1 deletion pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions template/apps/api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM node:20-alpine AS builder
WORKDIR /app
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
RUN apk update && apk add --no-cache libc6-compat
RUN npm install --global --no-update-notifier --no-fund turbo@1.10.3
RUN npm install --global --no-update-notifier --no-fund turbo@2.0.6
COPY . .
RUN turbo prune --scope=api --docker

Expand All @@ -12,7 +12,7 @@ FROM node:20-alpine AS installer
WORKDIR /app
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
RUN apk update && apk add --no-cache libc6-compat
RUN npm install --global --no-update-notifier --no-fund pnpm@8.15.7
RUN npm install --global --no-update-notifier --no-fund pnpm@9.5.0

# First install the dependencies (as they change less often)
COPY --from=builder /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
Expand Down
4 changes: 2 additions & 2 deletions template/apps/api/Dockerfile.migrator
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM node:20-alpine AS builder
WORKDIR /app
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
RUN apk update && apk add --no-cache libc6-compat
RUN npm install --global --no-update-notifier --no-fund turbo@1.10.3
RUN npm install --global --no-update-notifier --no-fund turbo@2.0.6
COPY . .
RUN turbo prune --scope=api --docker

Expand All @@ -12,7 +12,7 @@ FROM node:20-alpine AS installer
WORKDIR /app
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
RUN apk update && apk add --no-cache libc6-compat
RUN npm install --global --no-update-notifier --no-fund pnpm@8.15.7
RUN npm install --global --no-update-notifier --no-fund pnpm@9.5.0

# First install the dependencies (as they change less often)
COPY --from=builder /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
Expand Down
4 changes: 2 additions & 2 deletions template/apps/api/Dockerfile.scheduler
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM node:20-alpine AS builder
WORKDIR /app
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
RUN apk update && apk add --no-cache libc6-compat
RUN npm install --global --no-update-notifier --no-fund turbo@1.10.3
RUN npm install --global --no-update-notifier --no-fund turbo@2.0.6
COPY . .
RUN turbo prune --scope=api --docker

Expand All @@ -12,7 +12,7 @@ FROM node:20-alpine AS installer
WORKDIR /app
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
RUN apk update && apk add --no-cache libc6-compat
RUN npm install --global --no-update-notifier --no-fund pnpm@8.15.7
RUN npm install --global --no-update-notifier --no-fund pnpm@9.5.0

# First install the dependencies (as they change less often)
COPY --from=builder /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
Expand Down
4 changes: 2 additions & 2 deletions template/apps/web/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM node:20-alpine AS builder
WORKDIR /app
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
RUN apk update && apk add --no-cache libc6-compat
RUN npm install --global --no-update-notifier --no-fund turbo@1.10.3
RUN npm install --global --no-update-notifier --no-fund turbo@2.0.6
COPY . .
RUN turbo prune --scope=web --docker

Expand All @@ -12,7 +12,7 @@ FROM node:20-alpine AS installer
WORKDIR /app
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
RUN apk update && apk add --no-cache libc6-compat
RUN npm install --global --no-update-notifier --no-fund pnpm@8.15.7
RUN npm install --global --no-update-notifier --no-fund pnpm@9.5.0

# First install the dependencies (as they change less often)
COPY --from=builder /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
Expand Down
19 changes: 9 additions & 10 deletions template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,20 @@
},
"devDependencies": {
"husky": "9.0.11",
"react": "18.2.0",
"react-dom": "18.2.0",
"turbo": "1.11.1"
"turbo": "2.0.6"
},
"optionalDependencies": {
"turbo-darwin-64": "1.11.1",
"turbo-darwin-arm64": "1.11.1",
"turbo-linux-64": "1.11.1",
"turbo-linux-arm64": "1.11.1",
"turbo-windows-64": "1.11.1",
"turbo-windows-arm64": "1.11.1"
"turbo-darwin-64": "2.0.6",
"turbo-darwin-arm64": "2.0.6",
"turbo-linux-64": "2.0.6",
"turbo-linux-arm64": "2.0.6",
"turbo-windows-64": "2.0.6",
"turbo-windows-arm64": "2.0.6"
},
"packageManager": "[email protected]",
"engines": {
"node": ">= 20.11.1",
"yarn": "please-use-pnpm",
"pnpm": ">= 8.15.7 <= 9.0.5"
"pnpm": ">=9.5.0"
}
}
1 change: 0 additions & 1 deletion template/packages/app-types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
},
"dependencies": {
"enums": "workspace:*",
"mailer": "workspace:*",
"schemas": "workspace:*",
"zod": "*"
},
Expand Down
4 changes: 2 additions & 2 deletions template/packages/mailer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM node:18-alpine AS builder
WORKDIR /app
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
RUN apk update && apk add --no-cache libc6-compat
RUN npm install --global --no-update-notifier --no-fund turbo@1.10.3
RUN npm install --global --no-update-notifier --no-fund turbo@2.0.6
COPY . .
RUN turbo prune --scope=mailer --docker

Expand All @@ -12,7 +12,7 @@ FROM node:18-alpine AS installer
WORKDIR /app
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
RUN apk update && apk add --no-cache libc6-compat
RUN npm install --global --no-update-notifier --no-fund pnpm@8.15.7
RUN npm install --global --no-update-notifier --no-fund pnpm@9.5.0

# First install the dependencies (as they change less often)
COPY --from=builder /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
Expand Down
Loading

0 comments on commit 1e919c2

Please sign in to comment.