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
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,18 +60,18 @@ jobs:
with:
persist-credentials: false

- name: Set up pnpm
uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
- name: Set up Bun
uses: oven-sh/setup-bun@4bc047ad259df6fc24a6c9b0f9a0cb08cf17fbe5 # v2
with:
version: 10.32.1
run_install: false
bun-version: "1.3.14"

- name: Set up Node.js
uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6
- name: Cache Bun dependencies
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
with:
node-version: "22"
cache: pnpm
cache-dependency-path: pnpm-lock.yaml
path: ~/.bun/install/cache
key: bun-${{ runner.os }}-${{ hashFiles('bun.lock') }}
restore-keys: |
bun-${{ runner.os }}-

- name: Set up just
uses: extractions/setup-just@f8a3cce218d9f83db3a2ecd90e41ac3de6cdfd9b # v3
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

# Dependencies
node_modules/
.pnpm-store/
.bun/
*.tsbuildinfo

# Next.js
Expand Down
4 changes: 2 additions & 2 deletions README.ko.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,12 +43,12 @@ PostgreSQL이 system of record이며,
필요 환경:

- Java 21
- Node.js와 pnpm
- Bun
- Docker
- `just`

```bash
pnpm install
bun install
just dev-api
just dev-web
```
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,12 +42,12 @@ PostgreSQL is the system of record. Flyway migrations under
Requirements:

- Java 21
- Node.js and pnpm
- Bun
- Docker
- `just`

```bash
pnpm install
bun install
just dev-api
just dev-web
```
Expand Down
1 change: 0 additions & 1 deletion apps/web/.gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,6 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.pnpm-debug.log*

# env files (can opt-in for committing if needed)
.env*
Expand Down
1,353 changes: 1,353 additions & 0 deletions bun.lock

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions justfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,15 +8,15 @@ help:

# Install JavaScript workspace dependencies
install:
CI=true pnpm install
bun install

# Start the Spring Boot API
dev-api:
cd apps/api && set -a && source .env.local && set +a && ./gradlew bootRun

# Start the Next.js app
dev-web:
pnpm --filter @plot/web dev
bun --filter @plot/web dev

# Forward Polar sandbox webhooks to the local API
polar-listen:
Expand All@@ -28,20 +28,20 @@ test-api:

# Test the browser API client contract
test-api-client:
pnpm --filter @plot/api-client test
bun --filter @plot/api-client test


# Test the Next.js app
test-web:
pnpm --filter @plot/web test
bun --filter @plot/web test

# Run all tests
test: test-api test-api-client test-web
@echo "Tests complete"

# Lint the Next.js app
lint-web:
pnpm --filter @plot/web lint
bun --filter @plot/web lint

# Run all lint checks
lint: lint-web
Expand All@@ -61,7 +61,7 @@ update-jooq:

# Build the Next.js app
build-web:
pnpm --filter @plot/web build
bun --filter @plot/web build

# Build all apps
build: build-api build-web
Expand Down
12 changes: 11 additions & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
{
"name": "plot",
"private": true,
"packageManager": "pnpm@10.32.1",
"packageManager": "bun@1.3.14",
"workspaces": [
"apps/web",
"packages/*"
],
"overrides": {
"brace-expansion@<2.0.0": "1.1.16",
"brace-expansion@>=5.0.0 <5.0.8": "5.0.8",
"postcss@<8.5.18": "8.5.23",
"sharp@<0.35.0": "0.35.0"
},
"scripts": {
"dev:api": "just dev-api",
"build:api": "just build-api",
Expand Down
Loading
Loading