fix: update dependencies to allow last version of Prisma client (6.10) (#62)(@flemaitre33)

* fix: update dependencies

* ci: update workflow to use actions/cache@v4

* chore: update peer dependencies to accept both Prisma v5 and v6

Author: flemaitre33

.github/workflows/push.yml

@@ -11,7 +11,7 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: '18'
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         id: yarn-cache
         with:
           path: node_modules
@@ -28,7 +28,7 @@ jobs:
     needs: setup
     env:
       NODE_ENV: test
-      DATABASE_URL: "postgresql://postgres:postgres@localhost:5432/prisma_example_test?schema=public"
+      DATABASE_URL: 'postgresql://postgres:postgres@localhost:5432/prisma_example_test?schema=public'
     services:
       postgres:
         image: postgres:10.8
@@ -37,7 +37,7 @@ jobs:
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: prisma_example_test
         ports:
-        - 5432:5432
+          - 5432:5432
         # needed because the postgres container does not provide a healthcheck
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
@@ -47,7 +47,7 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: '18'
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         id: yarn-cache
         with:
           path: node_modules
@@ -63,7 +63,7 @@ jobs:
         run: npx prisma migrate dev
       - name: Test
         run: yarn test
- 
+
   publish:
     name: Publish
     needs: test
@@ -75,7 +75,7 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: '18'
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         id: yarn-cache
         with:
           path: node_modules

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-  "typescript.tsdk": "node_modules/typescript/lib"
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "editor.formatOnSave": true
 }

package.json

@@ -40,7 +40,7 @@
   "author": "Rafał Dzięgielewski <rafal.dzieg@gmail.com>",
   "license": "MIT",
   "peerDependencies": {
-    "@prisma/client": "^5.0.0",
+    "@prisma/client": "^5.0.0 || ^6.0.0",
     "adminjs": "^7.0.0"
   },
   "prisma": {
@@ -51,13 +51,13 @@
     "@commitlint/cli": "^17.4.4",
     "@commitlint/config-conventional": "^17.4.4",
     "@jest/globals": "^29.5.0",
-    "@prisma/client": "^5.0.0",
+    "@prisma/client": "^6.10.0",
     "@semantic-release/git": "^10.0.1",
     "@types/jest": "^29.4.0",
     "@types/node": "^18",
     "@typescript-eslint/eslint-plugin": "^5.54.1",
     "@typescript-eslint/parser": "^5.54.1",
-    "adminjs": "^7.0.9",
+    "adminjs": "^7.8.16",
     "dotenv-cli": "^7.0.0",
     "eslint": "^8.35.0",
     "eslint-config-airbnb": "^19.0.4",
@@ -68,12 +68,12 @@
     "husky": "^4.2.5",
     "jest": "^29.5.0",
     "pg": "^8.10.0",
-    "prisma": "^5.0.0",
+    "prisma": "^6.10.0",
     "semantic-release": "^20.1.1",
     "semantic-release-slack-bot": "^4.0.0",
     "ts-jest": "^29.0.5",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.1.2",
     "typescript": "^4.9.5"
   }
-}
+}

spec/Resource.spec.ts

@@ -12,18 +12,14 @@ const prisma = new PrismaClient();
 /**
  * Test temporarily turned off due to Prisma bug: https://github.com/prisma/prisma/issues/18146
  */
-describe.skip('Resource', () => {
+describe('Resource', () => {
   let resource: Resource;
 
   const data = {
     name: 'Someone',
     email: 'random@email.com',
   };
 
-  beforeAll(async () => {
-    await prisma.$connect();
-  })
-
   beforeEach(async () => {
     resource = new Resource({ model: getModelByName('User'), client: prisma });
 
@@ -32,13 +28,14 @@ describe.skip('Resource', () => {
     await prisma.post.deleteMany({});
   });
 
-  afterAll(async () => {
-    await prisma.$disconnect();
-  });
-
   describe('.isAdapterFor', () => {
     it('returns true when Prisma model is given', () => {
-      expect(Resource.isAdapterFor({ model: getModelByName('Post'), client: prisma })).toEqual(true);
+      expect(
+        Resource.isAdapterFor({
+          model: getModelByName('Post'),
+          client: prisma,
+        }),
+      ).toEqual(true);
     });
 
     it('returns false for any other kind of resources', () => {
@@ -124,8 +121,12 @@ describe.skip('Resource', () => {
 
       const filter = new Filter(undefined, resource);
       filter.filters = {
-        name: { path: 'name', value: params.name, property: resource.property('name') as BaseProperty },
-      }
+        name: {
+          path: 'name',
+          value: params.name,
+          property: resource.property('name') as BaseProperty,
+        },
+      };
       record = await resource.find(filter);
 
       expect(record[0] && record[0].get('name')).toEqual(data.name);
@@ -134,14 +135,21 @@ describe.skip('Resource', () => {
     });
 
     it('finds by record uuid column', async () => {
-      const uuidResource = new Resource({ model: getModelByName('UuidExample'), client: prisma });
+      const uuidResource = new Resource({
+        model: getModelByName('UuidExample'),
+        client: prisma,
+      });
       const params = await uuidResource.create({ label: 'test' });
       await uuidResource.create({ label: 'another test' });
 
       const filter = new Filter(undefined, uuidResource);
       filter.filters = {
-        id: { path: 'id', value: params.id, property: uuidResource.property('id') as BaseProperty },
-      }
+        id: {
+          path: 'id',
+          value: params.id,
+          property: uuidResource.property('id') as BaseProperty,
+        },
+      };
       record = await uuidResource.find(filter);
 
       expect(record[0] && record[0].get('id')).toEqual(params.id);
@@ -157,7 +165,10 @@ describe.skip('Resource', () => {
 
     beforeEach(async () => {
       user = await resource.create(data);
-      profileResource = new Resource({ model: getModelByName('Profile'), client: prisma });
+      profileResource = new Resource({
+        model: getModelByName('Profile'),
+        client: prisma,
+      });
     });
 
     it('creates new resource', async () => {