Merge branch '771-turborepo-poc' of github.com:ethyca/fides into bann…

…er-infra
ethyca · May 4, 2023 · 147e5dd · 147e5dd
2 parents a5b51f4 + 9149f2f
commit 147e5dd
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 18 deletions.
diff --git a/clients/admin-ui/package.json b/clients/admin-ui/package.json
@@ -22,7 +22,7 @@
     "lint-staged:fix": "lint-staged --diff=main",
     "openapi:generate": "openapi --input http://localhost:8080/openapi.json --output ./src/types/api --exportCore false --exportServices false --indent 2",
     "start": "next start",
-    "test": "jest --watch",
+    "test": "jest --watchAll",
     "test:ci": "jest"
   },
   "dependencies": {

diff --git a/clients/admin-ui/turbo.json b/clients/admin-ui/turbo.json
@@ -18,9 +18,6 @@
     },
     "dev:mock": {
       "dependsOn": ["build"]
-    },
-    "dev": {
-      "dependsOn": []
     }
   }
 }
diff --git a/clients/fides-js/package.json b/clients/fides-js/package.json
@@ -12,12 +12,11 @@
   ],
   "scripts": {
     "build": "NODE_ENV=production rollup -c",
-    "dev": "NODE_ENV=development rollup -c -w",
     "clean": "rm -rf dist .turbo",
     "format": "prettier --write .",
     "format:ci": "prettier --check .",
     "lint": "eslint . --ext .ts,.tsx",
-    "test": "jest --watch",
+    "test": "jest --watchAll",
     "test:ci": "jest"
   },
   "repository": {

diff --git a/clients/privacy-center/package.json b/clients/privacy-center/package.json
@@ -9,7 +9,7 @@
     "lint:fix": "lint-staged --diff=main",
     "format": "prettier --write types/ theme/ pages/ config/ components/ __tests__/",
     "format:ci": "prettier --check types/ theme/ pages/ config/ components/ __tests__/",
-    "test": "jest --watch",
+    "test": "jest --watchAll",
     "test:ci": "tsc --noEmit && jest",
     "cy:open": "cypress open",
     "cy:run": "cypress run",

diff --git a/clients/privacy-center/turbo.json b/clients/privacy-center/turbo.json
diff --git a/clients/turbo.json b/clients/turbo.json
@@ -6,8 +6,10 @@
       "outputs": [".next/*", "!.next/cache/*"]
     },
     "dev": {
-      "dependsOn": [],
-      "outputs": [".next/*", "!.next/cache/*"]
+      "dependsOn": ["^build"],
+      "outputs": [".next/*", "!.next/cache/*"],
+      "cache": false,
+      "persistent": true
     },
     "start": {
       "dependsOn": ["build"],
@@ -26,7 +28,9 @@
       "dependsOn": []
     },
     "test": {
-      "dependsOn": ["build"]
+      "dependsOn": ["^build"],
+      "cache": false,
+      "persistent": true
     },
     "test:ci": {
       "dependsOn": ["build"]

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -51,6 +51,7 @@ services:
         read_only: False
       # do not volume mount over the node_modules
       - /fides/clients/node_modules
+      - /fides/clients/admin-ui/node_modules
     environment:
       - NEXT_PUBLIC_FIDESCTL_API_SERVER=http://fides:8080
 
@@ -68,6 +69,7 @@ services:
         read_only: False
       # do not volume mount over the node_modules
       - /fides/clients/node_modules
+      - /fides/clients/privacy-center/node_modules
 
   fides-db:
     image: postgres:12