Upgrade lerna and codegen add/cli to unblock arm builds without compi…

…ling due problematic watcher dependency
opencrvs · Jun 21, 2024 · e7bdb5c · e7bdb5c
1 parent 6a23862
commit e7bdb5c
Show file tree

Hide file tree

Showing 10 changed files with 1,717 additions and 1,987 deletions.
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
@@ -6,7 +6,6 @@
 # & Healthcare Disclaimer located at http://opencrvs.org/license.
 #
 # Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
-version: '3.3'
 
 services:
   client:

diff --git a/docker-compose.demo-deps.yml b/docker-compose.demo-deps.yml
@@ -6,7 +6,6 @@
 # & Healthcare Disclaimer located at http://opencrvs.org/license.
 #
 # Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
-version: '3.3'
 
 services:
   # For dependencies, expose ports locally for dev

diff --git a/docker-compose.deps.yml b/docker-compose.deps.yml
@@ -6,7 +6,6 @@
 # & Healthcare Disclaimer located at http://opencrvs.org/license.
 #
 # Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
-version: '3.3'
 volumes:
   metricbeat:
 services:

diff --git a/docker-compose.dev-deps.yml b/docker-compose.dev-deps.yml
@@ -6,7 +6,6 @@
 # & Healthcare Disclaimer located at http://opencrvs.org/license.
 #
 # Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
-version: '3.3'
 
 services:
   # For dependencies, expose ports locally for dev

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -6,7 +6,6 @@
 # & Healthcare Disclaimer located at http://opencrvs.org/license.
 #
 # Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
-version: '3.3'
 
 services:
   # Expose dev secrets as a plain volume - these will use docker secrets in staging and prod

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,20 +6,19 @@
 # & Healthcare Disclaimer located at http://opencrvs.org/license.
 #
 # Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
-version: '3.3'
 
 services:
   base:
     image: opencrvs/ocrvs-base:${VERSION}
-    platform: linux/amd64
+    #platform: linux/amd64
     build:
       context: .
       dockerfile: ./packages/Dockerfile.base
     deploy:
       replicas: 0
   client:
     image: opencrvs/ocrvs-client:${VERSION}
-    platform: linux/amd64
+    #platform: linux/amd64
     build:
       context: .
       dockerfile: ./packages/client/Dockerfile
@@ -29,7 +28,7 @@ services:
 
   dashboards:
     image: opencrvs/ocrvs-dashboards:${VERSION}
-    platform: linux/amd64
+    #platform: linux/amd64
     build:
       context: .
       dockerfile: ./packages/dashboards/Dockerfile
@@ -39,7 +38,7 @@ services:
 
   components:
     image: opencrvs/ocrvs-components:${VERSION}
-    platform: linux/amd64
+    #platform: linux/amd64
     build:
       context: .
       dockerfile: ./packages/components/Dockerfile
@@ -48,7 +47,7 @@ services:
       - base
   login:
     image: opencrvs/ocrvs-login:${VERSION}
-    platform: linux/amd64
+    #platform: linux/amd64
     build:
       context: .
       dockerfile: ./packages/login/Dockerfile
@@ -57,7 +56,7 @@ services:
       - base
   gateway:
     image: opencrvs/ocrvs-gateway:${VERSION}
-    platform: linux/amd64
+    #platform: linux/amd64
     build:
       context: .
       dockerfile: ./packages/gateway/Dockerfile
@@ -85,7 +84,7 @@ services:
   # User facing services
   workflow:
     image: opencrvs/ocrvs-workflow:${VERSION}
-    platform: linux/amd64
+    #platform: linux/amd64
     build:
       context: .
       dockerfile: ./packages/workflow/Dockerfile
@@ -106,7 +105,7 @@ services:
       - COUNTRY=${COUNTRY:-bgd} # PEN_TEST change to gbr
   search:
     image: opencrvs/ocrvs-search:${VERSION}
-    platform: linux/amd64
+    #platform: linux/amd64
     build:
       context: .
       dockerfile: ./packages/search/Dockerfile
@@ -122,7 +121,7 @@ services:
       - APPLICATION_CONFIG_URL=http://config:2021/
   metrics:
     image: opencrvs/ocrvs-metrics:${VERSION}
-    platform: linux/amd64
+    #platform: linux/amd64
     build:
       context: .
       dockerfile: ./packages/metrics/Dockerfile
@@ -145,7 +144,7 @@ services:
   # END User facing services
   scheduler:
     image: opencrvs/ocrvs-scheduler:${VERSION}
-    platform: linux/amd64
+    #platform: linux/amd64
     build:
       context: .
       dockerfile: ./packages/scheduler/Dockerfile
@@ -157,7 +156,7 @@ services:
       - OPENHIM_MONGO_URL=mongodb://mongo1/openhim-dev
   auth:
     image: opencrvs/ocrvs-auth:${VERSION}
-    platform: linux/amd64
+    #platform: linux/amd64
     build:
       context: .
       dockerfile: ./packages/auth/Dockerfile
@@ -173,7 +172,7 @@ services:
       - METRICS_URL=http://metrics:1050
   user-mgnt:
     image: opencrvs/ocrvs-user-mgnt:${VERSION}
-    platform: linux/amd64
+    #platform: linux/amd64
     build:
       context: .
       dockerfile: ./packages/user-mgnt/Dockerfile
@@ -189,7 +188,7 @@ services:
       - APPLICATION_CONFIG_URL=http://config:2021/
   webhooks:
     image: opencrvs/ocrvs-webhooks:${VERSION}
-    platform: linux/amd64
+    #platform: linux/amd64
     build:
       context: .
       dockerfile: ./packages/webhooks/Dockerfile
@@ -206,7 +205,7 @@ services:
       - FHIR_URL=http://hearth:3447/fhir
   notification:
     image: opencrvs/ocrvs-notification:${VERSION}
-    platform: linux/amd64
+    #platform: linux/amd64
     build:
       context: .
       dockerfile: ./packages/notification/Dockerfile
@@ -219,7 +218,7 @@ services:
       - COUNTRY_CONFIG_URL=http://countryconfig:3040
   config:
     image: opencrvs/ocrvs-config:${VERSION}
-    platform: linux/amd64
+    #platform: linux/amd64
     build:
       context: .
       dockerfile: ./packages/config/Dockerfile
@@ -241,7 +240,7 @@ services:
       - CHECK_INVALID_TOKEN=true
   migration:
     image: opencrvs/ocrvs-migration:${VERSION}
-    platform: linux/amd64
+    #platform: linux/amd64
     build:
       context: .
       dockerfile: ./packages/migration/Dockerfile
@@ -261,7 +260,7 @@ services:
       - WAIT_HOSTS=mongo1:27017,influxdb:8086,minio:9000,elasticsearch:9200
   documents:
     image: opencrvs/ocrvs-documents:${VERSION}
-    platform: linux/amd64
+    #platform: linux/amd64
     build:
       context: .
       dockerfile: ./packages/documents/Dockerfile

diff --git a/lerna.json b/lerna.json
@@ -5,5 +5,4 @@
   ],
   "version": "0.0.0",
   "npmClient": "yarn",
-  "useWorkspaces": true
 }
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "@types/dotenv": "^6.1.0",
     "concurrently": "^8.0.0",
     "husky": "1.3.1",
-    "lerna": "^5.6.2",
+    "lerna": "^8.0.0",
     "lint-staged": "^7.1.0",
     "prettier": "2.8.8"
   },

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -108,8 +108,8 @@
     "xregexp": "^4.2.0"
   },
   "devDependencies": {
-    "@graphql-codegen/add": "^3.1.1",
-    "@graphql-codegen/cli": "^3.0.0",
+    "@graphql-codegen/add": "^5.0.0",
+    "@graphql-codegen/cli": "^5.0.0",
     "@graphql-codegen/introspection": "^3.0.0",
     "@graphql-codegen/typescript": "^3.0.0",
     "@graphql-codegen/typescript-operations": "^3.0.0",