Merge branch 'upstream' into feat-og-image-config-gen

Author: woolen-sheep

Dockerfile

@@ -20,6 +20,12 @@ RUN sh ./scripts/preinstall.sh
 # Install all dependencies
 RUN pnpm install --frozen-lockfile
 
+# Copy zeroperl.wasm to web public directory before build.
+# @uswriting/exiftool depends on @6over3/zeroperl-ts which loads zeroperl.wasm via fetch("./zeroperl.wasm")
+# relative to the current page URL, so it must be available under both root and /photos/ paths.
+RUN mkdir -p apps/web/public/photos && \
+    find node_modules -name "zeroperl.wasm" -path "*/esm/*" -exec cp {} apps/web/public/ \; -exec cp {} apps/web/public/photos/ \; -quit
+
 ARG S3_ACCESS_KEY_ID
 ARG S3_SECRET_ACCESS_KEY
 ARG GIT_TOKEN

apps/docs/package.json

@@ -26,46 +26,46 @@
     "@types/mdast": "^4.0.4",
     "clsx": "2.1.1",
     "cmdk": "1.1.1",
-    "lucide-react": "^0.562.0",
+    "lucide-react": "^0.564.0",
     "mdast": "^3.0.0",
-    "motion": "12.25.0",
+    "motion": "12.34.0",
     "next-themes": "^0.4.6",
-    "react": "^19.2.3",
-    "react-dom": "^19.2.3",
+    "react": "^19.2.4",
+    "react-dom": "^19.2.4",
     "remark-frontmatter": "^5.0.0",
     "remark-gfm": "^4.0.1",
     "remark-mdx": "^3.1.1",
     "remark-parse": "^11.0.0",
     "tailwind-scrollbar-hide": "^4.0.0",
     "unified": "^11.0.5",
-    "unist-util-visit": "^5.0.0"
+    "unist-util-visit": "^5.1.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.39.2",
-    "@shikijs/rehype": "^3.21.0",
+    "@eslint/js": "^10.0.1",
+    "@shikijs/rehype": "^3.22.0",
     "@tailwindcss/postcss": "catalog:",
     "@tailwindcss/typography": "catalog:",
     "@types/glob": "^9.0.0",
     "@types/mdx": "^2.0.13",
-    "@types/react": "^19.2.8",
-    "@types/react-dom": "^19.2.3",
+    "@types/react": "catalog:",
+    "@types/react-dom": "catalog:",
     "@types/remark-heading-id": "^1.0.0",
-    "@vitejs/plugin-react": "^5.1.2",
-    "code-inspector-plugin": "1.3.4",
-    "eslint": "^9.39.2",
+    "@vitejs/plugin-react": "^5.1.4",
+    "code-inspector-plugin": "1.4.2",
+    "eslint": "^10.0.0",
     "eslint-plugin-react-hooks": "^7.0.1",
-    "eslint-plugin-react-refresh": "^0.4.26",
-    "glob": "^13.0.0",
-    "globals": "^16.5.0",
-    "shiki": "^3.21.0",
+    "eslint-plugin-react-refresh": "^0.5.0",
+    "glob": "^13.0.3",
+    "globals": "^17.3.0",
+    "shiki": "^3.22.0",
     "tailwind-scrollbar": "catalog:",
     "tailwindcss": "catalog:",
     "tailwindcss-animate": "catalog:",
     "tailwindcss-safe-area": "catalog:",
     "tailwindcss-uikit-colors": "catalog:",
     "tsx": "^4.21.0",
     "typescript": "~5.9.3",
-    "typescript-eslint": "^8.52.0",
+    "typescript-eslint": "^8.55.0",
     "vite": "8.0.0-beta.0"
   }
 }

apps/ssr/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@afilmory/ssr",
   "version": "1.0.0",
-  "description": "",
+  "description": "Next.js SSR host and SEO for the gallery",
+  "license": "SEE LICENSE IN LICENSE.md",
   "author": "Innei",
   "type": "module",
   "main": "index.js",
@@ -24,13 +25,13 @@
     "@t3-oss/env-nextjs": "0.13.10",
     "clsx": "2.1.1",
     "drizzle-orm": "0.45.1",
-    "es-toolkit": "1.43.0",
+    "es-toolkit": "1.44.0",
     "linkedom": "0.18.12",
-    "pg": "8.16.3",
+    "pg": "8.18.0",
     "postgres": "3.4.8",
     "prop-types": "15.8.1",
-    "react": "19.2.3",
-    "react-dom": "19.2.3",
+    "react": "19.2.4",
+    "react-dom": "19.2.4",
     "react-responsive-masonry": "2.7.1",
     "react-use": "17.6.0",
     "tailwind-merge": "3.4.0",
@@ -44,21 +45,21 @@
     "@iconify-json/mingcute": "catalog:",
     "@tailwindcss/postcss": "catalog:",
     "@tailwindcss/typography": "catalog:",
-    "@types/node": "24.10.1",
+    "@types/node": "25.2.3",
     "@types/pg": "8.16.0",
-    "@types/react": "19.2.8",
-    "@types/react-dom": "19.2.3",
+    "@types/react": "catalog:",
+    "@types/react-dom": "catalog:",
     "concurrently": "9.2.1",
     "cross-env": "10.1.0",
     "dotenv-expand": "catalog:",
     "drizzle-kit": "0.31.8",
-    "next": "16.1.1",
+    "next": "16.1.6",
     "postcss": "8.5.6",
     "tailwind-scrollbar": "catalog:",
     "tailwindcss": "catalog:",
     "tailwindcss-animate": "catalog:",
     "tailwindcss-safe-area": "catalog:",
     "tailwindcss-uikit-colors": "catalog:"
   },
-  "packageManager": "pnpm@10.26.2"
-}
+  "packageManager": "pnpm@10.29.3"
+}

apps/ssr/src/app/og/[photoId]/route.tsx

@@ -1,10 +1,20 @@
+import { hostname } from 'node:os'
+
 import type { NextRequest } from 'next/server'
 
+function getDefaultCoreApiBase(): string {
+  // In Docker, HOSTNAME is set to the container ID, and localhost may not resolve correctly (IPv6 issues).
+  // Use os.hostname() which is resolvable within the Docker network.
+  const isDocker = process.env.HOSTNAME && /^[a-f0-9]{12,64}$/.test(process.env.HOSTNAME)
+  const host = isDocker ? hostname() : 'localhost'
+  return `http://${host}:3000`
+}
+
 const CORE_API_BASE =
   process.env.CORE_API_URL ??
   process.env.NEXT_PUBLIC_CORE_API_URL ??
   process.env.API_BASE_URL ??
-  'http://localhost:3000'
+  getDefaultCoreApiBase()
 
 const FORWARDED_HEADER_KEYS = ['cookie', 'authorization', 'x-forwarded-host', 'x-forwarded-proto', 'host']
 

apps/web/package.json

@@ -1,10 +1,12 @@
 {
   "name": "@afilmory/web",
   "version": "0.0.1",
+  "description": "Photo gallery SPA",
   "repository": {
     "type": "git",
     "url": "https://github.com/Afilmory/Afilmory"
   },
+  "license": "SEE LICENSE IN LICENSE.md",
   "type": "module",
   "scripts": {
     "analyze": "analyzer=1 vite build",
@@ -34,69 +36,69 @@
     "@radix-ui/react-dropdown-menu": "2.1.16",
     "@react-hook/window-size": "3.1.1",
     "@t3-oss/env-core": "catalog:",
-    "@tanstack/react-query": "5.90.16",
+    "@tanstack/react-query": "5.90.21",
     "@tanstack/react-virtual": "3.13.18",
     "@use-gesture/react": "10.3.1",
     "@uswriting/exiftool": "1.0.9",
     "blurhash": "2.0.5",
     "clsx": "2.1.1",
     "consola": "3.4.2",
-    "dotenv": "17.2.3",
-    "es-toolkit": "1.43.0",
+    "dotenv": "17.3.1",
+    "es-toolkit": "1.44.0",
     "file-type": "^21.3.0",
     "foxact": "0.2.51",
-    "heic-to": "1.3.0",
-    "i18next": "25.7.4",
-    "i18next-browser-languagedetector": "8.2.0",
-    "immer": "11.1.3",
-    "jotai": "2.16.1",
-    "maplibre-gl": "^5.15.0",
+    "heic-to": "1.4.2",
+    "i18next": "25.8.7",
+    "i18next-browser-languagedetector": "8.2.1",
+    "immer": "11.1.4",
+    "jotai": "2.17.1",
+    "maplibre-gl": "^5.18.0",
     "masonic": "4.1.0",
-    "motion": "12.25.0",
+    "motion": "12.34.0",
     "ofetch": "1.5.1",
-    "react": "19.2.3",
+    "react": "19.2.4",
     "react-blurhash": "0.3.0",
-    "react-dom": "19.2.3",
-    "react-error-boundary": "6.0.3",
+    "react-dom": "19.2.4",
+    "react-error-boundary": "6.1.0",
     "react-freeze": "1.0.4",
-    "react-i18next": "16.5.1",
+    "react-i18next": "16.5.4",
     "react-image-gallery": "1.4.0",
-    "react-intersection-observer": "10.0.0",
+    "react-intersection-observer": "10.0.2",
     "react-map-gl": "^8.1.0",
     "react-remove-scroll": "2.7.2",
     "react-responsive-masonry": "2.7.1",
-    "react-router": "7.12.0",
+    "react-router": "7.13.0",
     "react-scan": "0.4.3",
     "react-use-measure": "2.1.7",
     "react-zoom-pan-pinch": "3.7.0",
     "sonner": "2.0.7",
-    "swiper": "12.0.3",
-    "swr": "2.3.8",
+    "swiper": "12.1.0",
+    "swr": "2.4.0",
     "tailwind-merge": "3.4.0",
     "tailwind-variants": "catalog:",
     "thumbhash": "0.1.1",
     "tiff": "^7.1.3",
     "usehooks-ts": "3.1.1",
     "vaul": "1.1.2",
     "zod": "catalog:",
-    "zustand": "5.0.9"
+    "zustand": "5.0.11"
   },
   "devDependencies": {
     "@egoist/tailwindcss-icons": "catalog:",
-    "@iconify-json/lucide": "1.2.83",
+    "@iconify-json/lucide": "1.2.90",
     "@iconify-json/mingcute": "catalog:",
-    "@iconify-json/simple-icons": "1.2.65",
+    "@iconify-json/simple-icons": "1.2.70",
     "@tailwindcss/postcss": "catalog:",
     "@tailwindcss/typography": "catalog:",
     "@tailwindcss/vite": "4.1.18",
-    "@types/node": "24.10.1",
-    "@types/react": "19.2.8",
-    "@types/react-dom": "19.2.3",
-    "@vitejs/plugin-react": "^5.1.2",
+    "@types/node": "25.2.3",
+    "@types/react": "catalog:",
+    "@types/react-dom": "catalog:",
+    "@vitejs/plugin-react": "^5.1.4",
     "ast-kit": "2.2.0",
     "babel-plugin-react-compiler": "1.0.0",
-    "code-inspector-plugin": "1.3.4",
-    "daisyui": "5.5.14",
+    "code-inspector-plugin": "1.4.2",
+    "daisyui": "5.5.18",
     "execa": "9.6.1",
     "kolorist": "1.8.0",
     "linkedom": "0.18.12",
@@ -110,10 +112,11 @@
     "tailwindcss-animate": "catalog:",
     "tailwindcss-safe-area": "catalog:",
     "tailwindcss-uikit-colors": "catalog:",
-    "unplugin-ast": "0.15.4",
+    "unplugin-ast": "0.16.0",
+    "vite": "8.0.0-beta.0",
     "vite-plugin-html": "3.2.2",
     "vite-plugin-pwa": "1.2.0",
     "vite-plugin-route-builder": "0.5.0-alpha.1"
   },
-  "packageManager": "pnpm@10.26.2"
-}
+  "packageManager": "pnpm@10.29.3"
+}

apps/web/plugins/vite/feed-sitemap.ts

@@ -67,7 +67,7 @@ function generateSitemap(photos: PhotoManifestItem[], config: SiteConfig): strin
     .map((photo) => {
       const lastmod = new Date(photo.lastModified || photo.dateTaken).toISOString()
       return `  <url>
-    <loc>${config.url}/${photo.id}</loc>
+    <loc>${config.url}/photos/${encodeURIComponent(photo.id)}</loc>
     <lastmod>${lastmod}</lastmod>
     <changefreq>monthly</changefreq>
     <priority>0.8</priority>

apps/web/src/atoms/viewer.ts

@@ -0,0 +1,30 @@
+import { atom } from 'jotai'
+
+import { jotaiStore } from '~/lib/jotai'
+
+// Source of truth for viewer state, synced with URL
+export interface ViewerState {
+  isOpen: boolean
+  photoId: string | null
+  // Internal state not synced with URL
+  triggerElement: HTMLElement | null
+}
+
+export const viewerAtom = atom<ViewerState>({
+  isOpen: false,
+  photoId: null,
+  triggerElement: null,
+})
+
+// Helper to get viewer state from store
+export const getViewer = () => jotaiStore.get(viewerAtom)
+
+// Helper to set viewer state - supports both direct value and updater function
+export const setViewer = (valueOrUpdater: ViewerState | ((prev: ViewerState) => ViewerState)) => {
+  if (typeof valueOrUpdater === 'function') {
+    const prev = jotaiStore.get(viewerAtom)
+    jotaiStore.set(viewerAtom, valueOrUpdater(prev))
+  } else {
+    jotaiStore.set(viewerAtom, valueOrUpdater)
+  }
+}

apps/web/src/components/ui/number/SlidingNumber.tsx

@@ -2,7 +2,7 @@
 
 import { clsxm, Spring } from '@afilmory/utils'
 import type { MotionValue, SpringOptions, UseInViewOptions } from 'motion/react'
-import { m as motion, useInView, useSpring, useTransform } from 'motion/react'
+import { m as motion, useInView, useReducedMotion, useSpring, useTransform } from 'motion/react'
 import * as React from 'react'
 import useMeasure from 'react-use-measure'
 
@@ -16,7 +16,12 @@ type SlidingNumberRollerProps = {
 function SlidingNumberRoller({ prevValue, value, place, transition }: SlidingNumberRollerProps) {
   const startNumber = Math.floor(prevValue / place) % 10
   const targetNumber = Math.floor(value / place) % 10
-  const animatedValue = useSpring(startNumber, transition)
+  const shouldReduceMotion = useReducedMotion()
+
+  const animatedValue = useSpring(
+    shouldReduceMotion ? targetNumber : startNumber,
+    shouldReduceMotion ? { duration: 0 } : transition,
+  )
 
   React.useEffect(() => {
     animatedValue.set(targetNumber)