fix: cf pages (#4575)

Co-authored-by: Jan Piotrowski <[email protected]>
Co-authored-by: Peter Bacon Darwin <[email protected]>

.github/scripts/test-project.sh

@@ -73,10 +73,10 @@ if [ -n "${FORCE_PRISMA_CLIENT_CUSTOM_OUTPUT+x}" ]; then
   echo ""
   echo "FORCE_PRISMA_CLIENT_CUSTOM_OUTPUT=$FORCE_PRISMA_CLIENT_CUSTOM_OUTPUT, executing commands to turn the project into a custom output project"
   echo ""
-  find . -name "*.js" ! -path "*/node_modules/*" ! -name "*test*" -print0 | xargs -0 -r sed -i "s/@prisma\/client/db/g"
-  find . -name "*.mjs" ! -path "*/node_modules/*" ! -name "*test*" -print0 | xargs -0 -r sed -i "s/@prisma\/client/db/g"
-  find . -name '*.prisma' ! -path '*/node_modules/*' -print0 | xargs -0 -r sed -i 's/provider\s*=\s*"prisma-client-js"/&\noutput = "client"/g'
-  find . -name "package.json" ! -path "*/node_modules/*" -print0 | xargs -0 -r sed -i 's/"dependencies": {/&\n"db": "link:.\/prisma\/client",/g'
+  find . -type f -name "*.js" ! -path "*/node_modules/*" ! -name "*test*" -print0 | xargs -0 -r sed -i "s/@prisma\/client/db/g"
+  find . -type f -name "*.mjs" ! -path "*/node_modules/*" ! -name "*test*" -print0 | xargs -0 -r sed -i "s/@prisma\/client/db/g"
+  find . -type f -name '*.prisma' ! -path '*/node_modules/*' -print0 | xargs -0 -r sed -i 's/provider\s*=\s*"prisma-client-js"/&\noutput = "client"/g'
+  find . -type f -name "package.json" ! -path "*/node_modules/*" -print0 | xargs -0 -r sed -i 's/"dependencies": {/&\n"db": "link:.\/prisma\/client",/g'
   bash ../../scripts/update-locks.sh
 
   # this adds some level of safety to ensure that js files were at least modified as one would expect

driver-adapters-wasm/pg-cfpages-basic/.gitignore

@@ -1,4 +1,5 @@
 deployment-logs.txt
 .env
 .wrangler
-.dev.vars
+.dev.vars
+_worker.js

driver-adapters-wasm/pg-cfpages-basic/finally.sh

@@ -1,4 +1,3 @@
 #!/usr/bin/env bash
 
-echo "Temporary disabled, see https://github.com/cloudflare/workers-sdk/pull/2541"
-# cat deployment-logs.txt
+cat deployment-logs.txt

driver-adapters-wasm/pg-cfpages-basic/prepare.sh

@@ -3,4 +3,4 @@
 export PRISMA_TELEMETRY_INFORMATION='ecosystem-tests driver-adapters-wasm pg-cfpages-basic build'
 export PRISMA_CLIENT_ENGINE_TYPE='wasm' # because setup otherwise makes it library/binary
 
-echo "export const DATABASE_URL = '$DATABASE_URL'" > ./functions/dbUrl.js
+echo "export const DATABASE_URL = '$DATABASE_URL'" > ./fns/dbUrl.js

driver-adapters-wasm/pg-cfpages-basic/run.sh

@@ -7,5 +7,14 @@ pnpm install
 
 pnpm prisma generate
 
-# pnpm wrangler pages deploy . --project-name pg-cfpages-basic --node-compat | tee deployment-logs.txt
-# sleep 15
+# First build the functions using the `--node-compat` flag into the `_worker.js` directory
+# (Note that the functions are in the non-standard `fns` directory so that they are not confused with the output `_worker.js` directory.)
+# Make sure build folder does not exist
+rm -rf build
+# Build pages function to build/_worker.js
+pnpm wrangler pages functions build fns --node-compat --outdir build/_worker.js
+# Copy index.html to build folder
+cp index.html build/index.html
+# Now deploy the _worker.js alongside the index.html asset to Pages
+pnpm wrangler pages deploy ./build --project-name pg-cfpages-basic -- | tee deployment-logs.txt
+sleep 15

driver-adapters-wasm/pg-cfpages-basic/test.sh

@@ -2,9 +2,7 @@
 
 set -eu
 
-echo "Temporary disabled, because wrangler does not support "--node-compat" flag for pages commands yet. See https://github.com/cloudflare/workers-sdk/pull/2541"
+export DEPLOYMENT_URL=$(cat deployment-logs.txt | grep -Eo "(https.*)\.pages\.dev$" --color=never)
+echo $DEPLOYMENT_URL
 
-# export DEPLOYMENT_URL=$(cat deployment-logs.txt | grep -Eo "(https.*)\.pages\.dev$" --color=never)
-# echo $DEPLOYMENT_URL
-
-# pnpm test
+pnpm test