Upgrade pixelmatch to v7 and refactor imports

Upgrade pixelmatch to v7 and refactor imports

Upgraded the 'pixelmatch' dependency to version 7.1.0 and removed '@types/pixelmatch' as types are now included. Refactored PixelmatchService to use dynamic import for pixelmatch, updated related tests to mock the new import pattern, and adjusted Jest configs to handle ESM modules. Also updated TypeScript configs to use 'NodeNext' module resolution and added 'isolatedModules'. Minor import type-only refactors were made for improved type safety.

Author: pashidlos

Dockerfile

@@ -2,7 +2,7 @@ FROM node:20-bookworm-slim AS builder
 # Create app directory
 WORKDIR /app
 
-COPY ./prisma/schema.prisma ./
+COPY ./prisma ./prisma
 
 # A wildcard is used to ensure both package.json AND package-lock.json are copied
 COPY package*.json ./

jest.config.ts

@@ -2,9 +2,10 @@
 module.exports = async () => {
   return {
     projects: [
-      './src/jest.config.ts', 
-      './test/jest.config.ts', 
-      './test_acceptance/jest.config.ts'
+      './src/jest.config.ts',
+      './test/jest.config.ts',
+      './test_acceptance/jest.config.ts',
+      './test_ldap/jest.config.ts'
     ],
     roots: ['./'],
     testTimeout: 30000,

package-lock.json

@@ -57,7 +57,7 @@
     "passport-local": "^1.0.0",
     "pg": "^8.16.3",
     "pg-hstore": "^2.3.4",
-    "pixelmatch": "^5.3.0",
+    "pixelmatch": "^7.1.0",
     "pngjs": "^7.0.0",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^5.0.1",
@@ -79,7 +79,6 @@
     "@types/node": "^20.14.10",
     "@types/passport-jwt": "^3.0.9",
     "@types/passport-local": "^1.0.38",
-    "@types/pixelmatch": "^5.2.6",
     "@types/pngjs": "^6.0.5",
     "@types/supertest": "^2.0.12",
     "@typescript-eslint/eslint-plugin": "^8.46.3",

package.json

@@ -2,16 +2,17 @@ FROM node:20-bookworm-slim
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt update && apt install -y libssl3 && rm -rf /var/lib/apt/lists/*
 
-WORKDIR /app
+WORKDIR /workspace
 
-COPY . .
+COPY . ./prisma
 
-ENV NODE_TLS_REJECT_UNAUTHORIZED='0'
-RUN npm ci --verbose
+WORKDIR /workspace/prisma
 
-RUN chmod +x /app/wait-for-it.sh
-RUN chmod +x /app/entrypoint.sh
+ENV NODE_TLS_REJECT_UNAUTHORIZED='0'
+RUN npm ci --verbose && \
+    chmod +x /workspace/prisma/wait-for-it.sh && \
+    chmod +x /workspace/prisma/entrypoint.sh
 
-ENTRYPOINT ["/app/entrypoint.sh"]
+ENTRYPOINT ["/workspace/prisma/entrypoint.sh"]
 
 CMD ["sh"]

prisma/Dockerfile

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-/app/wait-for-it.sh postgres:5432 -- echo Postgress is up!
+./wait-for-it.sh postgres:5432 -- echo Postgress is up!
 
 echo Start applying migrations...
 
@@ -11,4 +11,4 @@ npx prisma migrate deploy
 echo Seeding data...
 
 # seed data
-npx ts-node seed.ts
+npx ts-node seed.ts

prisma/entrypoint.sh

@@ -6,6 +6,7 @@
   "private": true,
   "license": "Apache-2.0",
   "scripts": {
+    "postinstall": "prisma generate",
     "test": "jest"
   },
   "dependencies": {
@@ -22,4 +23,4 @@
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3"
   }
-}
+}

prisma/package.json

@@ -11,6 +11,7 @@
     "incremental": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
+    "isolatedModules": true,
     // See: https://github.com/prisma/prisma/issues/10203
     "strictNullChecks": true
   },

prisma/tsconfig.json

@@ -23,7 +23,7 @@ import { Build, Role } from '@prisma/client';
 import { BuildDto } from './dto/build.dto';
 import { MixedGuard } from '../auth/guards/mixed.guard';
 import { PaginatedBuildDto } from './dto/build-paginated.dto';
-import { ModifyBuildDto } from './dto/build-modify.dto';
+import type { ModifyBuildDto } from './dto/build-modify.dto';
 import { ProjectsService } from '../projects/projects.service';
 import { RoleGuard } from '../auth/guards/role.guard';
 import { Roles } from '../shared/roles.decorator';

src/builds/builds.controller.ts

@@ -3,12 +3,11 @@ import { BuildsService } from './builds.service';
 import { PrismaService } from '../prisma/prisma.service';
 import { TestRunsService } from '../test-runs/test-runs.service';
 import { EventsGateway } from '../shared/events/events.gateway';
-import { Build, TestRun, TestStatus } from '@prisma/client';
+import { Build, Prisma, TestRun, TestStatus } from '@prisma/client';
 import { mocked, MockedObject } from 'jest-mock';
 import { BuildDto } from './dto/build.dto';
 import { ProjectsService } from '../projects/projects.service';
 import { generateTestRun } from '../_data_';
-import { PrismaClientKnownRequestError } from '@prisma/client/runtime/library';
 
 jest.mock('./dto/build.dto');
 
@@ -387,7 +386,9 @@ describe('BuildsService', () => {
     it('create with retry', async () => {
       const buildUpsertMock = jest
         .fn()
-        .mockRejectedValueOnce(new PrismaClientKnownRequestError('mock error', { code: 'P2002', clientVersion: '5' }));
+        .mockRejectedValueOnce(
+          new Prisma.PrismaClientKnownRequestError('mock error', { code: 'P2002', clientVersion: '5' })
+        );
       const buildUpdateMock = jest.fn().mockResolvedValueOnce(build);
       service = await initService({ buildUpsertMock, buildUpdateMock });
       service.incrementBuildNumber = jest.fn().mockResolvedValueOnce(build);