Fix driver adapters tests after migration of driver adapters to prisma (

prisma#4398)

* Fix tests

* Make

* Remove symlinks and use instead parent directory

* DRIVER_ADAPTERS_BRANCH=chore/client/adapter-porting-nits add debug to workspace

* Build packages in the old directory

otherwise @esbuild-register is not found despite being defined as a devDependency within driver adapters @millsp

.gitignore

@@ -47,5 +47,6 @@ graph.dot
 
 prisma-schema-wasm/nodejs
 
-# This symlink looks orphan here, but it comes from prisma/prisma where driver adapters reference a file in their parent directory
-tsconfig.build.adapter.json
+# Ignore pnpm-lock.yaml
+query-engine/driver-adapters/pnpm-lock.yaml
+package-lock.json

Makefile

@@ -285,25 +285,14 @@ test-driver-adapter-planetscale: test-planetscale-vitess8
 build-qe-napi:
 	cargo build --package query-engine-node-api
 
-build-connector-kit-js: build-driver-adapters symlink-driver-adapters
-	cd query-engine/driver-adapters/connector-test-kit-executor && pnpm i && pnpm build
+build-connector-kit-js: build-driver-adapters
+	cd query-engine/driver-adapters && pnpm i && pnpm build
 
 build-driver-adapters: ensure-prisma-present
 	@echo "Building driver adapters..."
-	@cd ../prisma && pnpm --filter "*adapter*" i && pnpm --filter "*adapter*" build
+	@cd ../prisma && pnpm --filter "*adapter*" i
 	@echo "Driver adapters build completed.";
 
-symlink-driver-adapters: ensure-prisma-present
-	@echo "Creating symbolic links for driver adapters..."
-	@for dir in $(wildcard $(realpath ../prisma)/packages/*adapter*); do \
-        if [ -d "$$dir" ]; then \
-            dir_name=$$(basename "$$dir"); \
-            ln -sfn "$$dir" "$(realpath .)/query-engine/driver-adapters/$$dir_name"; \
-            echo "Created symbolic link for $$dir_name"; \
-        fi; \
-	done;
-	echo "Symbolic links creation completed.";
-
 ensure-prisma-present:
 	@if [ -d ../prisma ]; then \
 		cd "$(realpath ../prisma)" && git fetch origin main; \

query-engine/driver-adapters/connector-test-kit-executor/package.json

@@ -10,8 +10,7 @@
   "module": "dist/index.mjs",
   "private": true,
   "scripts": {
-    "build": "tsup ./src/index.ts --format esm --dts",
-    "lint": "tsc -p ./tsconfig.build.json"
+    "build": "tsup ./src/index.ts --format esm --dts"
   },
   "keywords": [],
   "author": "",
@@ -21,11 +20,11 @@
     "@libsql/client": "0.3.5",
     "@neondatabase/serverless": "^0.6.0",
     "@planetscale/database": "1.11.0",
-    "@prisma/adapter-libsql": "../adapter-libsql",
-    "@prisma/adapter-neon": "../adapter-neon",
-    "@prisma/adapter-pg": "../adapter-pg",
-    "@prisma/adapter-planetscale": "../adapter-planetscale",
-    "@prisma/driver-adapter-utils": "../driver-adapter-utils",
+    "@prisma/adapter-libsql": "workspace:*",
+    "@prisma/adapter-neon": "workspace:*",
+    "@prisma/adapter-pg": "workspace:*",
+    "@prisma/adapter-planetscale": "workspace:*",
+    "@prisma/driver-adapter-utils": "workspace:*",
     "@types/pg": "^8.10.2",
     "pg": "^8.11.3",
     "undici": "^5.26.5",
@@ -34,7 +33,6 @@
   "devDependencies": {
     "@types/node": "^20.5.1",
     "tsup": "^7.2.0",
-    "tsx": "^3.12.7",
-    "typescript": "^5.1.6"
+    "typescript": "5.2.2"
   }
 }

query-engine/driver-adapters/package.json

@@ -0,0 +1,25 @@
+{
+  "private": true,
+  "name": "js",
+  "version": "0.0.2",
+  "description": "",
+  "engines": {
+    "node": ">=16.13",
+    "pnpm": ">=8.6.6 <9"
+  },
+  "license": "Apache-2.0",
+  "scripts": {
+    "build": "pnpm -r run build",
+    "lint": "pnpm -r run lint",
+    "clean": "git clean -nXd -e !query-engine/driver-adapters"
+  },
+  "keywords": [],
+  "author": "",
+  "devDependencies": {
+    "@types/node": "^20.5.1",
+    "tsup": "^7.2.0",
+    "typescript": "5.2.2",
+    "esbuild": "0.19.5",
+    "esbuild-register": "3.5.0"
+  }
+}

query-engine/driver-adapters/pnpm-workspace.yaml

@@ -0,0 +1,8 @@
+packages:
+  - '../../../prisma/packages/adapter-libsql'
+  - '../../../prisma/packages/adapter-neon'
+  - '../../../prisma/packages/adapter-pg'
+  - '../../../prisma/packages/adapter-planetscale'
+  - '../../../prisma/packages/driver-adapter-utils'
+  - '../../../prisma/packages/debug'
+  - './connector-test-kit-executor'