Serve Switchboard from Subdirectories

.github/workflows/build-and-deploy-arbitrum-prod.yaml

@@ -0,0 +1,42 @@
+name: Deploy Switchboard Arbitrum
+
+on:
+  push:
+    branches: [deployments/arbitrum]
+jobs:
+  build:
+    environment: Arbitrum Production
+    runs-on: ubuntu-latest
+    steps:
+      # Check-out your repository.
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Build, Push and Release API to Heroku. # Your custom step name
+        uses: gonuit/[email protected]
+        with:
+          email: ${{ secrets.HEROKU_EMAIL }}
+          heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
+          heroku_app_name: ${{ secrets.HEROKU_API_NAME }}
+          dockerfile_directory: ./api
+          dockerfile_name: Dockerfile
+          process_type: web
+      - name: Build, Push and Release Frontend to Heroku. # Your custom step name
+        uses: gonuit/[email protected]
+        with:
+          email: ${{ secrets.HEROKU_EMAIL }}
+          heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
+          heroku_app_name: ${{ secrets.HEROKU_FRONTEND_NAME }}
+          dockerfile_directory: ./frontend
+          dockerfile_name: Dockerfile
+          process_type: web
+          docker_options: "--build-arg NEXT_PUBLIC_SWITCHBOARD_GRAPHQL_HOST=${{ secrets.NEXT_PUBLIC_SWITCHBOARD_GRAPHQL_HOST }}"
+      - name: Build, Push and Release NGINX to Heroku. # Your custom step name
+        uses: gonuit/[email protected]
+        with:
+          email: ${{ secrets.HEROKU_EMAIL }}
+          heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
+          heroku_app_name: ${{ secrets.HEROKU_NGINX_NAME }}
+          dockerfile_directory: ./nginx
+          dockerfile_name: Dockerfile
+          process_type: web

.github/workflows/build-and-deploy-arbitrum-staging.yaml

@@ -0,0 +1,42 @@
+name: Deploy Switchboard Arbitrum Staging
+
+on:
+  push:
+    branches: [arb-ltip]
+jobs:
+  build:
+    environment: Arbitrum Staging
+    runs-on: ubuntu-latest
+    steps:
+      # Check-out your repository.
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Build, Push and Release API to Heroku. # Your custom step name
+        uses: gonuit/[email protected]
+        with:
+          email: ${{ secrets.HEROKU_EMAIL }}
+          heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
+          heroku_app_name: ${{ secrets.HEROKU_API_NAME }}
+          dockerfile_directory: ./api
+          dockerfile_name: Dockerfile
+          process_type: web
+      - name: Build, Push and Release Frontend to Heroku. # Your custom step name
+        uses: gonuit/[email protected]
+        with:
+          email: ${{ secrets.HEROKU_EMAIL }}
+          heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
+          heroku_app_name: ${{ secrets.HEROKU_FRONTEND_NAME }}
+          dockerfile_directory: ./frontend
+          dockerfile_name: Dockerfile
+          process_type: web
+          docker_options: "--build-arg NEXT_PUBLIC_SWITCHBOARD_GRAPHQL_HOST=${{ secrets.NEXT_PUBLIC_SWITCHBOARD_GRAPHQL_HOST }}"
+      - name: Build, Push and Release NGINX to Heroku. # Your custom step name
+        uses: gonuit/[email protected]
+        with:
+          email: ${{ secrets.HEROKU_EMAIL }}
+          heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
+          heroku_app_name: ${{ secrets.HEROKU_NGINX_NAME }}
+          dockerfile_directory: ./nginx
+          dockerfile_name: Dockerfile
+          process_type: web

.github/workflows/build-and-deploy-staging.yaml

@@ -30,7 +30,7 @@ jobs:
           dockerfile_directory: ./frontend
           dockerfile_name: Dockerfile
           process_type: web
-          docker_options: "--build-arg NEXT_PUBLIC_SWITCHBOARD_GRAPHQL_HOST=${{ secrets.NEXT_PUBLIC_SWITCHBOARD_GRAPHQL_HOST }}"
+          docker_options: "--build-arg NEXT_PUBLIC_SWITCHBOARD_GRAPHQL_HOST=${{ secrets.NEXT_PUBLIC_SWITCHBOARD_GRAPHQL_HOST }} --build-arg BASE_PATH=/makerdao/switchboard"
       - name: Build, Push and Release Wundergraph to Heroku. # Your custom step name
         uses: gonuit/[email protected]
         with:

api/package.json

@@ -15,18 +15,18 @@
     "watch": "vitest watch"
   },
   "dependencies": {
-    "@apollo/server": "^4.10.1",
+    "@apollo/server": "^4.10.2",
     "@prisma/client": "5.8.1",
     "@types/cookie-parser": "^1.4.7",
     "body-parser": "^1.20.2",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "document-drive": "1.0.0-alpha.17",
-    "document-model": "^1.0.31",
-    "document-model-libs": "^1.8.0",
+    "document-model": "^1.0.32",
+    "document-model-libs": "^1.15.0",
     "dotenv": "^16.4.5",
     "ethers": "^5.7.2",
-    "express": "^4.18.3",
+    "express": "^4.19.2",
     "graphql": "^16.8.1",
     "graphql-middleware": "^6.1.35",
     "graphql-playground-html": "^1.6.30",
@@ -41,7 +41,7 @@
     "pino-pretty": "^10.3.1",
     "siwe": "^2.1.4",
     "vite-node": "^0.29.8",
-    "vitest": "^0.31.4",
+    "vitest": "^0.32.4",
     "wildcard-match": "^5.1.3",
     "zod": "^3.22.4"
   },
@@ -51,7 +51,7 @@
     "@types/express": "^4.17.21",
     "@types/jsonwebtoken": "^9.0.6",
     "@types/ms": "^0.7.34",
-    "@types/node": "^18.19.24",
+    "@types/node": "^18.19.26",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "@vitest/coverage-istanbul": "^0.29.8",