From 676a55bd66fed807fa02546e3cc05beaf13535af Mon Sep 17 00:00:00 2001 From: Kar Rui Lau Date: Mon, 23 Sep 2024 15:01:38 +0800 Subject: [PATCH] feat: downgrade prisma to v5.8.0 for compat with dd-trace --- apps/studio/package.json | 11 ++--- package-lock.json | 103 +++++++++++++++++++++++++++++++-------- 2 files changed, 85 insertions(+), 29 deletions(-) diff --git a/apps/studio/package.json b/apps/studio/package.json index c3d38348a..654ac85c7 100644 --- a/apps/studio/package.json +++ b/apps/studio/package.json @@ -33,7 +33,7 @@ "test:unit": "dotenv -e .env.test vitest run", "test-ci:unit": "vitest run", "test:load:build": "webpack --config tests/load/webpack.config.js", - "test:e2e": "dotenv -e .env.test playwright test", + "test:e2e": "dotenv -e .env.test npx playwright test", "test-dev": "start-server-and-test dev http://127.0.0.1:3000 test", "test-dev:unit": "dotenv -e .env.test vitest", "test-ci:e2e": "start-server-and-test start http://127.0.0.1:3000 test:e2e", @@ -67,7 +67,7 @@ "@opengovsg/sgid-client": "^2.2.0", "@opengovsg/starter-kitty-validators": "^1.1.0", "@paralleldrive/cuid2": "^2.2.2", - "@prisma/client": "^5.18.0", + "@prisma/client": "5.8.0", "@sendgrid/mail": "^8.1.3", "@tanstack/match-sorter-utils": "^8.15.1", "@tanstack/react-query": "^4.36.1", @@ -121,7 +121,7 @@ "pg": "^8.12.0", "pino": "^9.2.0", "pino-pretty": "^11.2.1", - "prisma": "^5.18.0", + "prisma": "5.8.0", "prisma-json-types-generator": "^3.0.4", "prisma-kysely": "^1.8.0", "react": "^18.3.1", @@ -190,11 +190,6 @@ "webpack-cli": "^5.1.4", "webpack-glob-entries": "^1.0.1" }, - "overrides": { - "dd-trace": { - "import-in-the-middle": "^1.11.0" - } - }, "publishConfig": { "access": "restricted" }, diff --git a/package-lock.json b/package-lock.json index 612cd5519..edee53d76 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "@opengovsg/sgid-client": "^2.2.0", "@opengovsg/starter-kitty-validators": "^1.1.0", "@paralleldrive/cuid2": "^2.2.2", - "@prisma/client": "^5.18.0", + "@prisma/client": "5.8.0", "@sendgrid/mail": "^8.1.3", "@tanstack/match-sorter-utils": "^8.15.1", "@tanstack/react-query": "^4.36.1", @@ -96,7 +96,7 @@ "pg": "^8.12.0", "pino": "^9.2.0", "pino-pretty": "^11.2.1", - "prisma": "^5.18.0", + "prisma": "5.8.0", "prisma-json-types-generator": "^3.0.4", "prisma-kysely": "^1.8.0", "react": "^18.3.1", @@ -166,6 +166,63 @@ "webpack-glob-entries": "^1.0.1" } }, + "apps/studio/node_modules/@prisma/client": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@prisma/client/-/client-5.8.0.tgz", + "integrity": "sha512-QxO6C4MaA/ysTIbC+EcAH1aX/YkpymhXtO6zPdk+FvA7+59tNibIYpd+7koPdViLg2iKES4ojsxWNUGNJaEcbA==", + "hasInstallScript": true, + "engines": { + "node": ">=16.13" + }, + "peerDependencies": { + "prisma": "*" + }, + "peerDependenciesMeta": { + "prisma": { + "optional": true + } + } + }, + "apps/studio/node_modules/@prisma/debug": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.8.0.tgz", + "integrity": "sha512-ZqPpkvbovu/kQJ1bvy57NO4dw97fpQGcbQSCtsqlwSE1UNKJP75R3BKxdznk8ZPMY+GJdMRetWNv4oAvSbWn8Q==" + }, + "apps/studio/node_modules/@prisma/engines": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.8.0.tgz", + "integrity": "sha512-Qhqm9WWLujNEC13AuZlUO14SQ15tNLe5puaz+tOk7UqINqJ3PtqMmuSuzomiw2diGVqZ+HYiSQzlR3+pPucVHA==", + "hasInstallScript": true, + "dependencies": { + "@prisma/debug": "5.8.0", + "@prisma/engines-version": "5.8.0-37.0a83d8541752d7582de2ebc1ece46519ce72a848", + "@prisma/fetch-engine": "5.8.0", + "@prisma/get-platform": "5.8.0" + } + }, + "apps/studio/node_modules/@prisma/engines-version": { + "version": "5.8.0-37.0a83d8541752d7582de2ebc1ece46519ce72a848", + "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.8.0-37.0a83d8541752d7582de2ebc1ece46519ce72a848.tgz", + "integrity": "sha512-cXcoVweYbnv8xRfkWq9oj8BECOdzHUazrSpYCa0ehp5TNz4l5Spa8jbq/VROCTzj3ZncH5D9Q2TmySYTOUeKlw==" + }, + "apps/studio/node_modules/@prisma/fetch-engine": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.8.0.tgz", + "integrity": "sha512-1CAuE+JoYsPNggMEn6qk0zos06Uc9bYZBJ0VBPHD6R7REL05614koAbOCmn52IaYz3nobb7f25hqW6AY7rLkIw==", + "dependencies": { + "@prisma/debug": "5.8.0", + "@prisma/engines-version": "5.8.0-37.0a83d8541752d7582de2ebc1ece46519ce72a848", + "@prisma/get-platform": "5.8.0" + } + }, + "apps/studio/node_modules/@prisma/get-platform": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.8.0.tgz", + "integrity": "sha512-Nk3rhTFZ1LYkFZJnpSvQcLPCaBWgJQfteHII6UEENOOkYlmP0k3FuswND54tzzEr4qs39wOdV9pbXKX9U2lv7A==", + "dependencies": { + "@prisma/debug": "5.8.0" + } + }, "apps/studio/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -306,6 +363,21 @@ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, + "apps/studio/node_modules/prisma": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/prisma/-/prisma-5.8.0.tgz", + "integrity": "sha512-hDKoEqPt2qEUTH5yGO3l27CBnPtwvte0CGMKrpCr9+/A919JghfqJ3qgCGgMbOwdkXUOzdho0RH9tyUF3UhpMw==", + "hasInstallScript": true, + "dependencies": { + "@prisma/engines": "5.8.0" + }, + "bin": { + "prisma": "build/index.js" + }, + "engines": { + "node": ">=16.13" + } + }, "apps/studio/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -7991,27 +8063,11 @@ "url": "https://opencollective.com/popperjs" } }, - "node_modules/@prisma/client": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@prisma/client/-/client-5.18.0.tgz", - "integrity": "sha512-BWivkLh+af1kqC89zCJYkHsRcyWsM8/JHpsDMM76DjP3ZdEquJhXa4IeX+HkWPnwJ5FanxEJFZZDTWiDs/Kvyw==", - "hasInstallScript": true, - "engines": { - "node": ">=16.13" - }, - "peerDependencies": { - "prisma": "*" - }, - "peerDependenciesMeta": { - "prisma": { - "optional": true - } - } - }, "node_modules/@prisma/debug": { "version": "5.18.0", "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.18.0.tgz", - "integrity": "sha512-f+ZvpTLidSo3LMJxQPVgAxdAjzv5OpzAo/eF8qZqbwvgi2F5cTOI9XCpdRzJYA0iGfajjwjOKKrVq64vkxEfUw==" + "integrity": "sha512-f+ZvpTLidSo3LMJxQPVgAxdAjzv5OpzAo/eF8qZqbwvgi2F5cTOI9XCpdRzJYA0iGfajjwjOKKrVq64vkxEfUw==", + "peer": true }, "node_modules/@prisma/driver-adapter-utils": { "version": "5.14.0", @@ -8033,6 +8089,7 @@ "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.18.0.tgz", "integrity": "sha512-ofmpGLeJ2q2P0wa/XaEgTnX/IsLnvSp/gZts0zjgLNdBhfuj2lowOOPmDcfKljLQUXMvAek3lw5T01kHmCG8rg==", "hasInstallScript": true, + "peer": true, "dependencies": { "@prisma/debug": "5.18.0", "@prisma/engines-version": "5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169", @@ -8043,12 +8100,14 @@ "node_modules/@prisma/engines-version": { "version": "5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169", "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169.tgz", - "integrity": "sha512-a/+LpJj8vYU3nmtkg+N3X51ddbt35yYrRe8wqHTJtYQt7l1f8kjIBcCs6sHJvodW/EK5XGvboOiwm47fmNrbgg==" + "integrity": "sha512-a/+LpJj8vYU3nmtkg+N3X51ddbt35yYrRe8wqHTJtYQt7l1f8kjIBcCs6sHJvodW/EK5XGvboOiwm47fmNrbgg==", + "peer": true }, "node_modules/@prisma/fetch-engine": { "version": "5.18.0", "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.18.0.tgz", "integrity": "sha512-I/3u0x2n31rGaAuBRx2YK4eB7R/1zCuayo2DGwSpGyrJWsZesrV7QVw7ND0/Suxeo/vLkJ5OwuBqHoCxvTHpOg==", + "peer": true, "dependencies": { "@prisma/debug": "5.18.0", "@prisma/engines-version": "5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169", @@ -8104,6 +8163,7 @@ "version": "5.18.0", "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.18.0.tgz", "integrity": "sha512-Tk+m7+uhqcKDgnMnFN0lRiH7Ewea0OEsZZs9pqXa7i3+7svS3FSCqDBCaM9x5fmhhkufiG0BtunJVDka+46DlA==", + "peer": true, "dependencies": { "@prisma/debug": "5.18.0" } @@ -30382,6 +30442,7 @@ "resolved": "https://registry.npmjs.org/prisma/-/prisma-5.18.0.tgz", "integrity": "sha512-+TrSIxZsh64OPOmaSgVPH7ALL9dfU0jceYaMJXsNrTkFHO7/3RANi5K2ZiPB1De9+KDxCWn7jvRq8y8pvk+o9g==", "hasInstallScript": true, + "peer": true, "dependencies": { "@prisma/engines": "5.18.0" },