Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: move to pnpm #2652

Merged
merged 6 commits into from
Feb 13, 2025
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
26 changes: 14 additions & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,21 @@ orbs:
jobs:
build:
docker:
- image: cimg/node:20.12
- image: cimg/node:22.13
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we do 22.11 as apps?
Or move apps over to this as well

Copy link
Contributor Author

Choose a reason for hiding this comment

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

between 22.11 and 22.13 there is no breaking changes, so either way, we can leave everything as is I think

Copy link
Contributor Author

Choose a reason for hiding this comment

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

makes more sense to update apps if we really wanted to

Copy link
Contributor

Choose a reason for hiding this comment

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

I just like stuff being the same 😂
Yeah no worries I'll do apps later.

steps:
- checkout
- restore_cache:
key: dependency-v3-cache-{{ checksum "package-lock.json" }}
key: dependency-v4-cache-{{ checksum "pnpm-lock.yaml" }}
- run:
name: Install dependencies
command: npm install
command: |
sudo npm install -g [email protected]
pnpm install
- run:
name: Build
command: npm run build
command: pnpm run build
- save_cache:
key: dependency-v3-cache-{{ checksum "package-lock.json" }}
key: dependency-v4-cache-{{ checksum "pnpm-lock.yaml" }}
paths:
- ./node_modules
- persist_to_workspace:
Expand All @@ -28,7 +30,7 @@ jobs:
test:
resource_class: large
docker:
- image: cimg/node:20.12
- image: cimg/node:22.13
- image: postgres:17-alpine
environment:
POSTGRES_DB: api_test
Expand All @@ -38,7 +40,7 @@ jobs:
steps:
- checkout
- restore_cache:
key: dependency-v3-cache-{{ checksum "package-lock.json" }}
key: dependency-v4-cache-{{ checksum "pnpm-lock.yaml" }}
- run:
name: Wait for PostgreSQL
command: |
Expand All @@ -62,7 +64,7 @@ jobs:
- run:
name: Test
command: |
npm run pretest
pnpm run pretest
TEST=$(./node_modules/.bin/jest --listTests)
echo $TEST | circleci tests run --command="xargs ./node_modules/.bin/jest --testEnvironment=node --ci --runInBand --reporters=default --reporters=jest-junit --" --split-by=timings
environment:
Expand All @@ -88,13 +90,13 @@ jobs:
registry-url: us.gcr.io
pulumi_preview:
docker:
- image: cimg/node:20.12
- image: cimg/node:22.13
steps:
- checkout
- pulumi/login
- run:
name: Install dependencies
command: npm i
command: pnpm install --frozen-lockfile
working_directory: .infra
- run:
name: Pulumi preview
Expand All @@ -103,7 +105,7 @@ jobs:
pulumi_up:
circleci_ip_ranges: true
docker:
- image: cimg/node:20.12
- image: cimg/node:22.13
environment:
USE_GKE_GCLOUD_AUTH_PLUGIN: 'True'
steps:
Expand All @@ -115,7 +117,7 @@ jobs:
- pulumi/login
- run:
name: Install dependencies
command: npm i
command: pnpm install --frozen-lockfile
working_directory: .infra
- run:
name: Pulumi up
Expand Down
2 changes: 1 addition & 1 deletion .infra/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.12
22.13
2 changes: 1 addition & 1 deletion .infra/Pulumi.adhoc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ config:
api:env:
accessSecret: topsecret
analyticsUrl: http://localhost:3000
validLanguagesFeatureKey: valid_languages
cioReportingWebhookSecret: topsecret
cioWebhookSecret: topsecret
commentsPrefix: http://webapp.local.com:5002
Expand Down Expand Up @@ -85,6 +84,7 @@ config:
typeormUsername: postgres
tz: UTC
urlPrefix: http://api.local.com
validLanguagesFeatureKey: valid_languages
api:k8s:
namespace: local
api:temporal:
Expand Down
5 changes: 4 additions & 1 deletion .infra/Pulumi.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
name: api
runtime: nodejs
runtime:
name: nodejs
options:
packagemanager: pnpm
capJavert marked this conversation as resolved.
Show resolved Hide resolved
description: Infrastructure for daily-api
Loading
Loading