Skip to content

Commit d39bf42

Browse files
committed
Merge branch 'main' into feat/claim-management
2 parents 3b9f381 + 4f4ab0f commit d39bf42

83 files changed

Lines changed: 4419 additions & 3218 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ DEFAULT_CURRENCY=USD
88
# Set the logging level: trace | debug | info | warn | error | fatal | silent
99
LOG_LEVEL=info
1010
# Maxinum image size that can be uploaded (in bytes)
11-
MAX_IMAGE_SIZE=5000000
11+
MAX_IMAGE_SIZE=5000000

.github/CONTRIBUTING.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ Please ensure:
6666

6767
---
6868

69+
## Internationalization (I18n)
70+
71+
Edit only the en.json file. All other language translations will be handled via Weblate. [See README's Translation section for more infomraiton](README.md#translations)
72+
73+
---
74+
6975
## Issues & Discussions
7076

7177
Before opening a new issue:

.github/workflows/build_push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v6
20+
uses: actions/checkout@v7
2121
with:
2222
fetch-depth: 0
2323

.github/workflows/build_test.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v6
19+
uses: actions/checkout@v7
2020
with:
2121
fetch-depth: 0
2222

@@ -35,15 +35,14 @@ jobs:
3535
cache-from: type=gha
3636
cache-to: type=gha,mode=max
3737

38-
- uses: pnpm/action-setup@v5
38+
- uses: pnpm/action-setup@v6
3939
name: Install pnpm
4040
id: pnpm-install
4141
with:
42-
version: 10
4342
run_install: false
4443

4544
- name: Install Node.js
46-
uses: actions/setup-node@v6
45+
uses: actions/setup-node@v7
4746
with:
4847
node-version: 24
4948

@@ -53,7 +52,7 @@ jobs:
5352
run: |
5453
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
5554
56-
- uses: actions/cache@v5
55+
- uses: actions/cache@v6
5756
name: Setup pnpm cache
5857
with:
5958
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}

.github/workflows/lint.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,17 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v6
18+
uses: actions/checkout@v7
1919

2020
- name: Install Node.js
21-
uses: actions/setup-node@v6
21+
uses: actions/setup-node@v7
2222
with:
2323
node-version: 24
2424

25-
- uses: pnpm/action-setup@v5
25+
- uses: pnpm/action-setup@v6
2626
name: Install pnpm
2727
id: pnpm-install
2828
with:
29-
version: 10
3029
run_install: false
3130

3231
- name: Get pnpm store directory
@@ -35,7 +34,7 @@ jobs:
3534
run: |
3635
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
3736
38-
- uses: actions/cache@v5
37+
- uses: actions/cache@v6
3938
name: Setup pnpm cache
4039
with:
4140
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}

DEVELOPMENT.md

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
## Prerequisites
44

5-
- node v24.x
6-
- [pnpm](https://pnpm.io/installation) v10.x
5+
- node v24.15.x
6+
- [pnpm](https://pnpm.io/installation) v11.x
77

88
## Install dependencies
99

@@ -15,19 +15,30 @@ pnpm install
1515

1616
### Create an env file
1717

18-
An example env file for local development. You might want to customize the database URL to your needs:
18+
Copy `.env.example` to `.env`. The Prisma config (`prisma.config.ts`), the Prisma
19+
client, and SvelteKit all load `.env` automatically via `dotenv`.
1920

2021
```sh
21-
#.env.development
22+
cp .env.example .env
23+
```
24+
25+
Database URL needs to be an **absolute** `file:` URL.
2226

23-
export ORIGIN=http://localhost:3000
24-
export DATABASE_URL="file:$(pwd)//dev.db"
27+
```sh
28+
echo "DATABASE_URL=\"file:$(pwd)/prisma/dev.db\"" >> .env
2529
```
2630

2731
### First Time Run
2832

33+
Create the 'uploads' directory in the project root to store item images.
34+
35+
```sh
36+
mkdir -p uploads
37+
```
38+
39+
Setup Prisma ORM and development database:
40+
2941
```sh
30-
source .env.development
3142
pnpm prisma generate
3243
pnpm prisma migrate dev
3344
pnpm prisma db seed
@@ -65,6 +76,10 @@ docker build . --tag wishlist-dev:latest
6576
Specific platform, current linux/amd64 and linux/arm64 are confirmed supported
6677

6778
```sh
68-
docker build . --tag wishlist-dev:amd64 --platform linux/amd64
69-
docker build . --tag wishlist-dev:amd64 --platform linux/arm64
79+
docker build . --tag wishlist-dev:amd64 --platform linux/amd64
80+
docker build . --tag wishlist-dev:arm64 --platform linux/arm64
7081
```
82+
83+
## Internationalization (I18n)
84+
85+
Edit only the en.json file. All other language translations will be handled via Weblate. [See README's Translation section for more infomraiton](README.md#translations)

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM node:24-slim@sha256:d8e448a56fc63242f70026718378bd4b00f8c82e78d20eefb199224a4d8e33d8 AS base
1+
FROM node:24-slim@sha256:b31e7a42fdf8b8aa5f5ed477c72d694301273f1069c5a2f71d53c6482e99a2fc AS base
22
WORKDIR /usr/src/app
3-
RUN npm install -g pnpm@latest-10
3+
RUN corepack enable
44

55
# Build step
66
FROM base AS build
@@ -30,7 +30,7 @@ RUN pnpm run build
3030
RUN pnpm prune --prod
3131

3232
# Download Caddy from github
33-
FROM --platform=$BUILDPLATFORM alpine:3.23.3@sha256:25109184c71bdad752c8312a8623239686a9a2071e8825f20acb8f2198c3f659 AS caddy
33+
FROM --platform=$BUILDPLATFORM alpine:3.24.1@sha256:28bd5fe8b56d1bd048e5babf5b10710ebe0bae67db86916198a6eec434943f8b AS caddy
3434

3535
ARG TARGETPLATFORM
3636
ARG CADDY_VERSION=2.10.0
@@ -58,7 +58,7 @@ RUN apt-get update \
5858
&& rm -rf /var/lib/apt/lists/*
5959

6060
COPY --from=caddy /caddy /usr/bin/caddy
61-
COPY ["package.json", "pnpm-lock.yaml", "entrypoint.sh", "prisma.config.ts", "Caddyfile", "./"]
61+
COPY ["package.json", "pnpm-lock.yaml", "pnpm-workspace.yaml", "entrypoint.sh", "prisma.config.ts", "Caddyfile", "./"]
6262
COPY ./templates/ ./templates
6363
COPY ./prisma/ ./prisma/
6464

SECURITY.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Security Policy
2+
3+
## Supported Versions
4+
5+
Only the latest version of Wishlist is actively supported. Security patches will only be made available in the next version not back-ported to older versions.
6+
7+
## Reporting a Vulnerability
8+
9+
This repository has [private vulnerability reporting](https://docs.github.com/en/code-security/how-tos/report-and-fix-vulnerabilities/privately-reporting-a-security-vulnerability) enabled. To confidentially report a security issue, click the **"Report a vulnerability"** button on the [Security tab](../../security/advisories/new) of this repository. This allows you to submit details directly to the maintainers without public disclosure.
10+
11+
For non-sensitive issues or general feedback, feel free to open a GitHub issue or contribute a fix via pull request.

entrypoint.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ caddy start --config /usr/src/app/Caddyfile
88

99
pnpm prisma migrate deploy && \
1010
pnpm prisma db seed && \
11-
pnpm db:patch && \
12-
pnpm start
11+
pnpm db:patch
12+
13+
exec pnpm start

package.json

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
"@tailwindcss/forms": "^0.5.10",
3131
"@tailwindcss/vite": "^4.1.18",
3232
"@types/eslint": "^9.6.1",
33-
"@types/node": "^24.12.0",
34-
"@types/nodemailer": "^7.0.0",
33+
"@types/node": "^24.13.2",
34+
"@types/nodemailer": "^8.0.0",
3535
"@types/pulltorefreshjs": "^0.1.7",
3636
"@vite-pwa/sveltekit": "^1.0.0",
3737
"autoprefixer": "^10.4.21",
@@ -41,8 +41,8 @@
4141
"globals": "^17.0.0",
4242
"pino-pretty": "^13.1.1",
4343
"prettier": "^3.6.2",
44-
"prettier-plugin-svelte": "^3.4.0",
45-
"prettier-plugin-tailwindcss": "^0.7.2",
44+
"prettier-plugin-svelte": "^4.0.0",
45+
"prettier-plugin-tailwindcss": "^0.8.0",
4646
"pulltorefreshjs": "^0.1.22",
4747
"svelte": "^5.38.2",
4848
"svelte-check": "^4.3.1",
@@ -52,7 +52,7 @@
5252
"tailwindcss": "^4.1.18",
5353
"ts-node": "^10.9.2",
5454
"tslib": "^2.8.1",
55-
"typescript": "^5.9.2",
55+
"typescript": "^6.0.0",
5656
"typescript-eslint": "^8.40.0",
5757
"vite": "^8.0.0",
5858
"vite-plugin-pwa": "^1.0.2",
@@ -68,41 +68,31 @@
6868
"@paralleldrive/cuid2": "^3.0.0",
6969
"@prisma/adapter-better-sqlite3": "^7.1.0",
7070
"@prisma/client": "^7.1.0",
71-
"@zxcvbn-ts/core": "^3.0.4",
72-
"@zxcvbn-ts/language-common": "^3.0.4",
73-
"@zxcvbn-ts/language-de": "^3.0.2",
74-
"@zxcvbn-ts/language-en": "^3.0.2",
75-
"@zxcvbn-ts/language-es-es": "^3.0.2",
76-
"@zxcvbn-ts/language-fr": "^3.0.2",
71+
"@zxcvbn-ts/core": "^4.0.0",
72+
"@zxcvbn-ts/language-common": "^4.0.0",
73+
"@zxcvbn-ts/language-de": "^4.0.0",
74+
"@zxcvbn-ts/language-en": "^4.0.0",
75+
"@zxcvbn-ts/language-es-es": "^4.0.0",
76+
"@zxcvbn-ts/language-fr": "^4.0.0",
7777
"dotenv": "^17.2.3",
7878
"got-scraping": "^4.1.2",
7979
"handlebars": "^4.7.8",
8080
"metascraper": "^5.49.1",
8181
"metascraper-image": "^5.49.1",
8282
"metascraper-title": "^5.49.1",
83-
"nodemailer": "^8.0.0",
83+
"nodemailer": "^9.0.0",
8484
"openid-client": "^6.6.4",
8585
"pino": "^10.0.0",
8686
"prisma": "^7.1.0",
87-
"sharp": "^0.34.3",
87+
"sharp": "^0.35.0",
8888
"svelte-i18n": "^4.0.1",
8989
"svelte-virtuallists": "^1.4.2",
9090
"tsx": "^4.21.0",
9191
"zod": "^4.0.17"
9292
},
9393
"engines": {
9494
"node": "^24.0.0",
95-
"pnpm": "^10"
95+
"pnpm": "11.11.0"
9696
},
97-
"pnpm": {
98-
"onlyBuiltDependencies": [
99-
"better-sqlite3",
100-
"es5-ext",
101-
"esbuild",
102-
"prisma",
103-
"re2",
104-
"svelte-preprocess",
105-
"@tailwindcss/oxide"
106-
]
107-
}
97+
"packageManager": "pnpm@11.11.0+sha512.4463f65fd80ed80d69bc1d4bf163ee94f605c7380fc318bb5b2ebe15f8cd12d49c51a4d59e951b401e764d3b6ca751cbf51bc50ed7001a6bcb4935e684c34882"
10898
}

0 commit comments

Comments
 (0)