From 7fc3ff26bcc7bdca63374893df6247b0dc47f65c Mon Sep 17 00:00:00 2001
From: Matt Aitken <matt@mattaitken.com>
Date: Fri, 16 Jun 2023 14:49:49 +0100
Subject: [PATCH] Rejigged database migrate deploy scripts

---
 package.json                   |  4 ++--
 packages/database/package.json |  1 -
 turbo.json                     | 44 ++++++++++------------------------
 3 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/package.json b/package.json
index 6e431e4cc..aa6d8ac47 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
   "scripts": {
     "build": "turbo run build",
     "build:force": "turbo run build --force",
-    "db:migrate": "turbo run db:push db:generate",
+    "db:migrate": "turbo run db:migrate:deploy db:generate",
     "db:seed": "turbo run db:seed",
     "dev": "turbo run dev --parallel",
     "i:dev": "infisical run -- turbo run dev --parallel",
@@ -63,4 +63,4 @@
     "@changesets/cli": "^2.26.0",
     "node-fetch": "2.6.x"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/database/package.json b/packages/database/package.json
index e7d85b9b7..24748f123 100644
--- a/packages/database/package.json
+++ b/packages/database/package.json
@@ -13,7 +13,6 @@
   },
   "scripts": {
     "db:generate": "prisma generate",
-    "db:push": "prisma db push --skip-generate",
     "db:migrate:dev": "prisma migrate dev",
     "db:migrate:deploy": "prisma migrate deploy"
   }
diff --git a/turbo.json b/turbo.json
index a69d83db9..0e8edcdb6 100644
--- a/turbo.json
+++ b/turbo.json
@@ -2,9 +2,7 @@
   "$schema": "https://turborepo.org/schema.json",
   "pipeline": {
     "build": {
-      "dependsOn": [
-        "^build"
-      ],
+      "dependsOn": ["^build"],
       "outputs": [
         "dist/**",
         "public/build/**",
@@ -14,25 +12,17 @@
       ]
     },
     "webapp#start": {
-      "dependsOn": [
-        "^build"
-      ],
-      "outputs": [
-        "public/build/**"
-      ]
+      "dependsOn": ["^build"],
+      "outputs": ["public/build/**"]
     },
     "start": {
-      "dependsOn": [
-        "^build"
-      ],
-      "outputs": [
-        "public/build/**"
-      ]
+      "dependsOn": ["^build"],
+      "outputs": ["public/build/**"]
     },
     "db:generate": {
       "cache": false
     },
-    "db:push": {
+    "db:migrate:deploy": {
       "cache": false
     },
     "db:seed": {
@@ -45,9 +35,7 @@
       "cache": false
     },
     "generate": {
-      "dependsOn": [
-        "^generate"
-      ]
+      "dependsOn": ["^generate"]
     },
     "lint": {
       "outputs": []
@@ -64,22 +52,16 @@
       "cache": false
     },
     "test:e2e:dev": {
-      "dependsOn": [
-        "^build"
-      ],
+      "dependsOn": ["^build"],
       "outputs": [],
       "cache": false
     },
     "test:e2e:ci": {
-      "dependsOn": [
-        "^build"
-      ],
+      "dependsOn": ["^build"],
       "outputs": []
     },
     "typecheck": {
-      "dependsOn": [
-        "^build"
-      ],
+      "dependsOn": ["^build"],
       "outputs": []
     },
     "clean": {
@@ -95,9 +77,7 @@
       "cache": false
     }
   },
-  "globalDependencies": [
-    ".env"
-  ],
+  "globalDependencies": [".env"],
   "globalEnv": [
     "NODE_ENV",
     "REMIX_APP_PORT",
@@ -121,4 +101,4 @@
     "APP_ENV",
     "APP_LOG_LEVEL"
   ]
-}
\ No newline at end of file
+}