Pkg & Docker-Compose Updates (#373)

* chore(pkg): updated client browserlist * fix(docker-compose): added user field and removed rw from target to fix file ownership issues * chore(pkgs): updated prisma and playwright * chore(docker-compose): added prisma-studio service
c2c-project · Dec 1, 2022 · 82bfb9a · 82bfb9a
1 parent 7b9a307
commit 82bfb9a
Show file tree

Hide file tree

Showing 23 changed files with 108 additions and 133 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/cache/@playwright-test-npm-1.22.2-fa49b9813b-55392a97d9.zip b/.yarn/cache/@playwright-test-npm-1.22.2-fa49b9813b-55392a97d9.zip
diff --git a/.yarn/cache/@playwright-test-npm-1.28.1-b090e47146-dc39dfdf84.zip b/.yarn/cache/@playwright-test-npm-1.28.1-b090e47146-dc39dfdf84.zip
diff --git a/.yarn/cache/@prisma-client-npm-3.9.2-126a2a9156-5b4b8f2526.zip b/.yarn/cache/@prisma-client-npm-3.9.2-126a2a9156-5b4b8f2526.zip
diff --git a/.yarn/cache/@prisma-client-npm-4.7.0-88c4eaff96-5d896cd05b.zip b/.yarn/cache/@prisma-client-npm-4.7.0-88c4eaff96-5d896cd05b.zip
diff --git a/...a-engines-npm-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009-c1aff4e71f-f934a02f0d.zip b/...a-engines-npm-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009-c1aff4e71f-f934a02f0d.zip
diff --git a/.yarn/cache/@prisma-engines-npm-4.7.0-39de9e88e3-6cd5bae7fc.zip b/.yarn/cache/@prisma-engines-npm-4.7.0-39de9e88e3-6cd5bae7fc.zip
diff --git a/...s-version-npm-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009-0bf56c444c-413d478fc1.zip b/...s-version-npm-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009-0bf56c444c-413d478fc1.zip
diff --git a/...s-version-npm-4.7.0-74.39190b250ebc338586e25e6da45e5e783bc8a635-5cd652f090-2c8ea09f2a.zip b/...s-version-npm-4.7.0-74.39190b250ebc338586e25e6da45e5e783bc8a635-5cd652f090-2c8ea09f2a.zip
diff --git a/.yarn/cache/caniuse-lite-npm-1.0.30001271-40ad299ce0-0271e234e1.zip b/.yarn/cache/caniuse-lite-npm-1.0.30001271-40ad299ce0-0271e234e1.zip
diff --git a/.yarn/cache/caniuse-lite-npm-1.0.30001307-9bab493bd5-e592d53727.zip b/.yarn/cache/caniuse-lite-npm-1.0.30001307-9bab493bd5-e592d53727.zip
diff --git a/.yarn/cache/caniuse-lite-npm-1.0.30001312-8a724a2f18-753fb9ea1e.zip b/.yarn/cache/caniuse-lite-npm-1.0.30001312-8a724a2f18-753fb9ea1e.zip
diff --git a/.yarn/cache/caniuse-lite-npm-1.0.30001352-3e25bb8cf7-575ad03134.zip b/.yarn/cache/caniuse-lite-npm-1.0.30001352-3e25bb8cf7-575ad03134.zip
diff --git a/.yarn/cache/caniuse-lite-npm-1.0.30001435-7cebb35f0a-ec88b9c37f.zip b/.yarn/cache/caniuse-lite-npm-1.0.30001435-7cebb35f0a-ec88b9c37f.zip
diff --git a/.yarn/cache/playwright-core-npm-1.22.2-ac980e0dc5-7381c35359.zip b/.yarn/cache/playwright-core-npm-1.22.2-ac980e0dc5-7381c35359.zip
diff --git a/.yarn/cache/playwright-core-npm-1.28.1-ec5428623a-8899e0d65d.zip b/.yarn/cache/playwright-core-npm-1.28.1-ec5428623a-8899e0d65d.zip
diff --git a/...ight-npm-1.22.2-a26df4072c-e9e9c4a959.zip → ...ight-npm-1.28.1-14870ff747-97c6fff283.zip b/...ight-npm-1.22.2-a26df4072c-e9e9c4a959.zip → ...ight-npm-1.28.1-14870ff747-97c6fff283.zip
diff --git a/.yarn/cache/prisma-npm-3.9.2-ec628eff87-4070b61b09.zip b/.yarn/cache/prisma-npm-3.9.2-ec628eff87-4070b61b09.zip
diff --git a/.yarn/cache/prisma-npm-4.7.0-9425f90026-8ea3085460.zip b/.yarn/cache/prisma-npm-4.7.0-9425f90026-8ea3085460.zip
diff --git a/app/e2e/package.json b/app/e2e/package.json
@@ -11,12 +11,12 @@
         "allure:open-report": "yarn allure:generate-report && allure open ./allure-report"
     },
     "devDependencies": {
-        "@playwright/test": "^1.22.2",
+        "@playwright/test": "^1.28.1",
         "@types/node": "^17.0.42",
         "allure-commandline": "^2.17.2",
         "dotenv-cli": "^5.1.0",
         "experimental-allure-playwright": "^0.0.3",
-        "playwright": "^1.22.2",
+        "playwright": "^1.28.1",
         "typescript": "4.3.2"
     }
 }
diff --git a/app/server/package.json b/app/server/package.json
@@ -29,7 +29,7 @@
         "@graphql-tools/load-files": "^6.3.2",
         "@graphql-tools/merge": "^6.2.13",
         "@graphql-tools/schema": "^7.1.3",
-        "@prisma/client": "^3.9.2",
+        "@prisma/client": "^4.7.0",
         "altair-fastify-plugin": "^4.0.2",
         "bcryptjs": "^2.4.3",
         "cors": "^2.8.5",
@@ -75,7 +75,7 @@
         "jest": "^27.5.1",
         "jest-mock-extended": "^2.0.5",
         "mercurius-integration-testing": "^4.0.0",
-        "prisma": "^3.9.2",
+        "prisma": "^4.7.0",
         "supertest": "^6.2.3",
         "ts-jest": "^27.1.4",
         "ts-node-dev": "^1.1.6",

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,19 +1,20 @@
 version: '3.6'
 services:
     app:
+        user: '${UID}:${GID}'
         container_name: app
         build: .
         tty: true
         volumes:
             - type: bind
               source: .
-              target: /usr/monorepo:rw
+              target: /usr/monorepo
         working_dir: /usr/monorepo
         ports:
             - 8080:8080
         environment:
-            - NODE_ENV=development
-            - DATABASE_URL=postgresql://postgres:postgrespassword@db:5432
+            NODE_ENV: development
+            DATABASE_URL: postgresql://postgres:postgrespassword@db:5432
     db:
         container_name: db
         user: postgres
@@ -27,6 +28,22 @@ services:
             POSTGRES_USER: postgres
             POSTGRES_PASSWORD: postgrespassword
             POSTGRES_DB: postgres
+    prisma-studio:
+        container_name: prisma-studio
+        image: timothyjmiller/prisma-studio:latest
+        restart: unless-stopped
+        environment:
+            PROJECT_NAME: prytaneum
+            POSTGRES_DATABASE: postgres
+            POSTGRES_HOST: db
+            POSTGRES_USERNAME: postgres
+            POSTGRES_PASSWORD: postgrespassword
+            POSTGRES_PORT: 5432
+            PRISMA_STUDIO_PORT: 5555
+            POSTGRES_PATH: db_data
+            POSTGRES_URL: postgresql://postgres:postgrespassword@db:5432
+        ports:
+            - 5555:5555
 
 volumes:
     db_data: