diff --git a/apps/console b/apps/console index cda6d76928..d5f13a5bbb 160000 --- a/apps/console +++ b/apps/console @@ -1 +1 @@ -Subproject commit cda6d769283d5779f05b397a9cfc2b0f34e5cf6a +Subproject commit d5f13a5bbbab2b7cde6ad45e442b245d60b733d1 diff --git a/package.json b/package.json index d7fe7261c3..1f2e12512c 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "db-seed": "turbo run db-seed", "db-studio": "yarn workspace @calcom/prisma db-studio", "deploy": "turbo run deploy", + "predev": "echo 'Checking env files'", "dev": "turbo run dev --scope=\"@calcom/web\"", "dev:all": "turbo run dev --scope=\"@calcom/web\" --scope=\"@calcom/website\" --scope=\"@calcom/console\"", "dev:api": "turbo run dev --scope=\"@calcom/web\" --scope=\"@calcom/api\"", diff --git a/packages/lib/package.json b/packages/lib/package.json index 122cc8c25f..7ddbfa6188 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -5,7 +5,7 @@ "types": "./index.ts", "license": "MIT", "dependencies": { - "@prisma/client": "^3.14.0", + "@prisma/client": "^3.15.2", "bcryptjs": "^2.4.3", "dayjs": "^1.11.2", "ical.js": "^1.4.0", diff --git a/packages/prisma/package.json b/packages/prisma/package.json index 4c260b3f15..797d4b58a5 100644 --- a/packages/prisma/package.json +++ b/packages/prisma/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "scripts": { - "build": "echo 'Prisma build done'", + "build": "yarn prisma migrate deploy && yarn seed-app-store", "clean": "rm -rf .turbo && rm -rf node_modules", "db-deploy": "yarn prisma migrate deploy", "db-migrate": "yarn prisma migrate dev", @@ -13,7 +13,7 @@ "db-setup": "run-s db-up db-deploy db-seed", "db-studio": "yarn prisma studio", "db-up": "docker-compose up -d", - "dx": "echo 'DB setup complete'", + "dx": "yarn db-setup", "generate-schemas": "prisma generate && prisma format", "post-install": "yarn generate-schemas", "seed-app-store": "ts-node --transpile-only ./seed-app-store.ts", @@ -21,14 +21,14 @@ }, "devDependencies": { "npm-run-all": "^4.1.5", - "prisma": "^3.14.0", + "prisma": "^3.15.2", "ts-node": "^10.6.0", "zod": "^3.16.0", "zod-prisma": "^0.5.4" }, "dependencies": { "@calcom/lib": "*", - "@prisma/client": "^3.14.0" + "@prisma/client": "^3.15.2" }, "main": "index.ts", "types": "index.d.ts", diff --git a/turbo.json b/turbo.json index c840d829fa..467f6c6d78 100644 --- a/turbo.json +++ b/turbo.json @@ -99,6 +99,7 @@ "outputs": ["lint-results"] }, "post-install": { + "dependsOn": ["$PRISMA_GENERATE_DATAPROXY"], "outputs": ["../../node_modules/@prisma/client/**", "../../node_modules/@prisma/admin-client/**"], "inputs": ["./schema.prisma", "./prisma/schema.prisma"] }, diff --git a/yarn.lock b/yarn.lock index 64beae2f4a..e5abe3b60f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2401,12 +2401,12 @@ resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g== -"@prisma/client@^3.14.0": - version "3.14.0" - resolved "https://registry.yarnpkg.com/@prisma/client/-/client-3.14.0.tgz#bb90405c012fcca11f4647d91153ed4c58f3bd48" - integrity sha512-atb41UpgTR1MCst0VIbiHTMw8lmXnwUvE1KyUCAkq08+wJyjRE78Due+nSf+7uwqQn+fBFYVmoojtinhlLOSaA== +"@prisma/client@^3.15.2": + version "3.15.2" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-3.15.2.tgz#2181398147afc79bfe0d83c03a88dc45b49bd365" + integrity sha512-ErqtwhX12ubPhU4d++30uFY/rPcyvjk+mdifaZO5SeM21zS3t4jQrscy8+6IyB0GIYshl5ldTq6JSBo1d63i8w== dependencies: - "@prisma/engines-version" "3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a" + "@prisma/engines-version" "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e" "@prisma/debug@3.15.2": version "3.15.2" @@ -2426,15 +2426,15 @@ ms "2.1.3" strip-ansi "6.0.1" -"@prisma/engines-version@3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a": - version "3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a" - resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a.tgz#4edae57cf6527f35e22cebe75e49214fc0e99ac9" - integrity sha512-D+yHzq4a2r2Rrd0ZOW/mTZbgDIkUkD8ofKgusEI1xPiZz60Daks+UM7Me2ty5FzH3p/TgyhBpRrfIHx+ha20RQ== +"@prisma/engines-version@3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e": + version "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e" + resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e.tgz#bf5e2373ca68ce7556b967cb4965a7095e93fe53" + integrity sha512-e3k2Vd606efd1ZYy2NQKkT4C/pn31nehyLhVug6To/q8JT8FpiMrDy7zmm3KLF0L98NOQQcutaVtAPhzKhzn9w== -"@prisma/engines@3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a": - version "3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a" - resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a.tgz#7fa11bc26a51d450185c816cc0ab8cac673fb4bf" - integrity sha512-LwZvI3FY6f43xFjQNRuE10JM5R8vJzFTSmbV9X0Wuhv9kscLkjRlZt0BEoiHmO+2HA3B3xxbMfB5du7ZoSFXGg== +"@prisma/engines@3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e": + version "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e" + resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e.tgz#f691893df506b93e3cb1ccc15ec6e5ac64e8e570" + integrity sha512-NHlojO1DFTsSi3FtEleL9QWXeSF/UjhCW0fgpi7bumnNZ4wj/eQ+BJJ5n2pgoOliTOGv9nX2qXvmHap7rJMNmg== "@prisma/generator-helper@^3.13.0": version "3.15.2" @@ -13615,12 +13615,12 @@ prisma-field-encryption@^1.4.0-beta.2: object-path "^0.11.8" zod "^3.15.1" -prisma@^3.14.0: - version "3.14.0" - resolved "https://registry.yarnpkg.com/prisma/-/prisma-3.14.0.tgz#dd67ece37d7b5373e9fd9588971de0024b49be81" - integrity sha512-l9MOgNCn/paDE+i1K2fp9NZ+Du4trzPTJsGkaQHVBufTGqzoYHuNk8JfzXuIn0Gte6/ZjyKj652Jq/Lc1tp2yw== +prisma@^3.15.2: + version "3.15.2" + resolved "https://registry.yarnpkg.com/prisma/-/prisma-3.15.2.tgz#4ebe32fb284da3ac60c49fbc16c75e56ecf32067" + integrity sha512-nMNSMZvtwrvoEQ/mui8L/aiCLZRCj5t6L3yujKpcDhIPk7garp8tL4nMx2+oYsN0FWBacevJhazfXAbV1kfBzA== dependencies: - "@prisma/engines" "3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a" + "@prisma/engines" "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e" prismjs@^1.27.0: version "1.28.0"