Review comments, minor tweaks

Author: midzelis

.github/workflows/test.yml

@@ -233,7 +233,7 @@ jobs:
         run: pnpm install --frozen-lockfile && pnpm build
         working-directory: ./open-api/typescript-sdk
       - name: Run npm install
-        run: SKIP_SHARP_FILTERING=true pnpm install --frozen-lockfile
+        run: pnpm install --frozen-lockfile
       - name: Run tsc
         run: pnpm check:typescript
         if: ${{ !cancelled() }}
@@ -341,7 +341,7 @@ jobs:
           cache: 'pnpm'
           cache-dependency-path: '**/pnpm-lock.yaml'
       - name: Run pnpm install
-        run: SKIP_SHARP_FILTERING=true pnpm install --frozen-lockfile
+        run: SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm install --frozen-lockfile
       - name: Run medium tests
         run: pnpm test:medium
         if: ${{ !cancelled() }}
@@ -565,7 +565,7 @@ jobs:
           cache: 'pnpm'
           cache-dependency-path: '**/pnpm-lock.yaml'
       - name: Install server dependencies
-        run: SKIP_SHARP_FILTERING=true pnpm --filter immich install --frozen-lockfile
+        run: SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm --filter immich install --frozen-lockfile
       - name: Build the app
         run: pnpm --filter immich build
       - name: Run API generation
@@ -619,7 +619,7 @@ jobs:
           cache: 'pnpm'
           cache-dependency-path: '**/pnpm-lock.yaml'
       - name: Install server dependencies
-        run: SKIP_SHARP_FILTERING=true pnpm install --frozen-lockfile
+        run: SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm install --frozen-lockfile
       - name: Build the app
         run: pnpm build
       - name: Run existing migrations

.pnpmfile.cjs

@@ -3,6 +3,7 @@ module.exports = {
     readPackage: (pkg) => {
       if (pkg.name && pkg.name === "exiftool-vendored") {
         if (pkg.optionalDependencies["exiftool-vendored.pl"]) {
+          // make exiftool-vendored.pl a regular dependency
           pkg.dependencies["exiftool-vendored.pl"] =
             pkg.optionalDependencies["exiftool-vendored.pl"];
           delete pkg.optionalDependencies["exiftool-vendored.pl"];
@@ -13,7 +14,10 @@ module.exports = {
           (dep) => dep.startsWith("@img")
         );
         for (const dep of optionalDeps) {
-          if (dep.includes("musl") || process.env.SKIP_SHARP_FILTERING) {
+          // remove all optionalDepdencies from sharp (they will be compiled from source), except:
+          //   include the precompiled musl version of sharp, for web/Dockerfile
+          //   include precompiled linux-x64 version of sharp, for server/Dockerfile, stage: web-prod
+          if (dep.includes("musl") || dep.includes("linux-x64")) {
             continue;
           }
           delete pkg.optionalDependencies[dep];

Makefile

@@ -8,7 +8,7 @@ dev-update:
 	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --build -V --remove-orphans
 
 dev-scale:
-	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --build -V  --scale immich-server=3 --remove-orphans
+	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --build -V --scale immich-server=3 --remove-orphans
 
 dev-docs:
 	npm --prefix docs run start

docker/docker-compose.dev.yml

@@ -17,8 +17,6 @@ services:
   immich-server:
     container_name: immich_server
     command: ['immich-dev']
-    # entrypoint: ["/bin/sh"]
-    # command: ["-c", "sleep infinity"]
     image: immich-server-dev:latest
     # extends:
     #   file: hwaccel.transcoding.yml

open-api/bin/generate-open-api.sh

@@ -15,7 +15,7 @@ function dart {
   patch --no-backup-if-mismatch -u api.mustache <api.mustache.patch
 
   cd ../../
-  npx --yes @openapitools/openapi-generator-cli generate -g dart -i ./immich-openapi-specs.json -o ../mobile/openapi -t ./templates/mobile
+  pnpx oazapfts @openapitools/openapi-generator-cli generate -g dart -i ./immich-openapi-specs.json -o ../mobile/openapi -t ./templates/mobile
 
   # Post generate patches
   patch --no-backup-if-mismatch -u ../mobile/openapi/lib/api_client.dart <./patch/api_client.dart.patch
@@ -27,16 +27,15 @@ function dart {
 }
 
 function typescript {
-  npx --yes oazapfts --optimistic --argumentStyle=object --useEnumType immich-openapi-specs.json typescript-sdk/src/fetch-client.ts
+  pnpx oazapfts --optimistic --argumentStyle=object --useEnumType immich-openapi-specs.json typescript-sdk/src/fetch-client.ts
   pnpm --filter @immich/sdk install --frozen-lockfile
   pnpm --filter @immich/sdk build
 }
 
 # requires server to be built
 (
   cd .. 
-  pnpm --filter immich install
-  pnpm --filter immich build
+  SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm --filter immich build
   pnpm --filter immich sync:open-api
 )
 

pnpm-lock.yaml

@@ -6,8 +6,6 @@ packages:
   - server
   - web
   - .github
-
-
 ignoredBuiltDependencies:
   - '@nestjs/core'
   - '@scarf/scarf'
@@ -24,28 +22,12 @@ ignoredBuiltDependencies:
   - protobufjs
   - ssh2
   - utimes
-
 onlyBuiltDependencies:
   - sharp
   - '@tailwindcss/oxide'
-
 overrides:
   canvas: 2.11.2
   sharp: ^0.34.2
-  '@img/sharp-darwin-arm64': '-'
-  '@img/sharp-darwin-x64': '-'
-  '@img/sharp-libvips-darwin-arm64': '-'
-  '@img/sharp-libvips-darwin-x64': '-'
-  '@img/sharp-libvips-linux-ppc64': '-'
-  '@img/sharp-libvips-linux-s390x': '-'
-  '@img/sharp-libvips-linuxmusl-arm64': '-'
-  '@img/sharp-linux-s390x': '-'
-  '@img/sharp-linuxmusl-arm64': '-'
-  '@img/sharp-wasm32': '-'
-  '@img/sharp-win32-arm64': '-'
-  '@img/sharp-win32-ia32': '-'
-  '@img/sharp-win32-x64': '-'
-
 packageExtensions:
   nestjs-kysely:
     dependencies:
@@ -65,13 +47,11 @@ packageExtensions:
       node-gyp: '*'
   '@immich/ui':
     dependencies:
-      tailwindcss: ^4.1.11
+      tailwindcss: '>=4.1'
   tailwind-variants:
     dependencies:
-      tailwindcss: ^4.1.11
-
+      tailwindcss: '>=4.1'
 dedupePeerDependents: false
-packageImportMethod: hardlink
 preferWorkspacePackages: true
 injectWorkspacePackages: true
 shamefullyHoist: false

pnpm-workspace.yaml

@@ -9,7 +9,16 @@ WORKDIR /usr/src/app
 
 RUN npm install --global corepack@latest && \
   corepack enable pnpm && \
-  pnpm config set store-dir /buildcache/pnpm-store
+  echo "store-dir=/buildcache/pnpm-store" >> /usr/local/etc/npmrc && \
+  echo "devdir=/buildcache/node-gyp" >> /usr/local/etc/npmrc
+
+COPY ./package* ./pnpm* .pnpmfile.cjs /tmp/create-dep-cache/
+COPY ./web/package* ./web/pnpm* /tmp/create-dep-cache/web/
+COPY ./server/package* ./server/pnpm* /tmp/create-dep-cache/server/
+COPY ./open-api/typescript-sdk/package* ./open-api/typescript-sdk/pnpm* /tmp/create-dep-cache/open-api/typescript-sdk/
+WORKDIR /tmp/create-dep-cache
+RUN pnpm fetch && rm -rf /tmp/create-dep-cache && chmod -R o+rw /buildcache
+WORKDIR /usr/src/app
 
 ENV PATH="${PATH}:/usr/src/app/server/bin" \
   IMMICH_ENV=development \
@@ -31,13 +40,6 @@ RUN usermod -aG sudo node && \
 RUN chown node:node -R /workspaces
 COPY --chown=node:node --chmod=755 ../.devcontainer/server/*.sh /immich-devcontainer/
 
-
-COPY ./package* ./pnpm* .pnpmfile.cjs /tmp/create-dep-cache/
-COPY ./web/package* ./web/pnpm* /tmp/create-dep-cache/web/
-COPY ./server/package* ./server/pnpm* /tmp/create-dep-cache/server/
-COPY ./open-api/typescript-sdk/package* ./open-api/typescript-sdk/pnpm* /tmp/create-dep-cache/open-api/typescript-sdk/
-WORKDIR /tmp/create-dep-cache
-RUN pnpm fetch && rm -rf /tmp/create-dep-cache
 WORKDIR /workspaces/immich
 
 FROM dev-container-server AS dev-container-mobile

server/Dockerfile

@@ -6,7 +6,7 @@ ENV CHOKIDAR_USEPOLLING=true \
 
 RUN npm install --global corepack@latest && \
   corepack enable && corepack install -g pnpm && \
-  apk add --no-cache tini make bash&& \
+  apk add --no-cache tini make bash && \
   mkdir -p /buildcache/pnpm-store && \
   pnpm config set store-dir /buildcache/pnpm-store
 

web/Dockerfile

@@ -19,7 +19,7 @@
     "lint:fix": "npm run lint -- --fix",
     "format": "prettier --check .",
     "format:fix": "prettier --write . && npm run format:i18n",
-    "format:i18n": "npx --yes sort-json ../i18n/*.json",
+    "format:i18n": "pnpx sort-json ../i18n/*.json",
     "test": "vitest --run",
     "test:cov": "vitest --coverage",
     "test:watch": "vitest dev",