feat: merge mine in package json

hashgraph · Apr 2, 2024 · 0fec16a · 0fec16a
2 parents 5d1f6be + 344154d
commit 0fec16a
Show file tree

Hide file tree

Showing 18 changed files with 56 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 
 Guardian is a modular open-source solution that includes best-in-class identity management and decentralized ledger technology (DLT) libraries. At the heart of Guardian solution is a sophisticated Policy Workflow Engine (PWE) that enables applications to offer a digital (or digitized) Measurement, Reporting, and Verification requirements-based tokenization implementation.
 
-[HIP-19](https://github.com/hashgraph/hedera-improvement-proposal/blob/master/HIP/hip-19.md) · [HIP-28](https://github.com/hashgraph/hedera-improvement-proposal/blob/master/HIP/hip-28.md) · [HIP-29](https://github.com/hashgraph/hedera-improvement-proposal/blob/master/HIP/hip-29.md) · [Report a Bug](CONTRIBUTING#bug-reports) · [Request a Policy or a Feature](CONTRIBUTING#new-policy-or-feature-requests)
+[HIP-19](https://github.com/hashgraph/hedera-improvement-proposal/blob/master/HIP/hip-19.md) · [HIP-28](https://github.com/hashgraph/hedera-improvement-proposal/blob/master/HIP/hip-28.md) · [HIP-29](https://github.com/hashgraph/hedera-improvement-proposal/blob/master/HIP/hip-29.md) · [Report a Bug](CONTRIBUTING.md#bug-reports) · [Request a Policy or a Feature](CONTRIBUTING.md#new-policy-or-feature-requests)
 
 ## Discovering Digital Environmental Assets assets on Hedera
 

diff --git a/ai-service/package.json b/ai-service/package.json
@@ -4,10 +4,10 @@
     "main": "dist/app.js",
     "license": "Apache-2.0",
     "dependencies": {
-        "@mikro-orm/core": "^6.1.11",
-        "@mikro-orm/mongodb": "^6.1.11",
         "@guardian/common": "^2.23.0",
         "@guardian/interfaces": "^2.23.0",
+        "@mikro-orm/core": "^6.1.11",
+        "@mikro-orm/mongodb": "^6.1.11",
         "@nestjs/common": "^9.4.1",
         "@nestjs/core": "^9.4.1",
         "@types/express": "^4.17.18",
@@ -32,5 +32,8 @@
     "devDependencies": {
         "nodemon": "^3.0.1"
     },
+    "resolutions": {
+        "@types/mime": "3.0.4"
+    },
     "type": "module"
 }
diff --git a/analytics-service/package.json b/analytics-service/package.json
@@ -9,7 +9,8 @@
     },
     "resolutions": {
         "@azure/core-rest-pipeline": "1.12.1",
-        "image-size": "1.0.2"
+        "image-size": "1.0.2",
+        "@types/mime": "3.0.4"
     },
     "author": "Envision Blockchain Solutions <info@envisionblockchain.com>",
     "dependencies": {

diff --git a/api-gateway/package.json b/api-gateway/package.json
@@ -8,7 +8,8 @@
   },
   "resolutions": {
     "@azure/core-rest-pipeline": "1.12.1",
-    "image-size": "1.0.2"
+    "image-size": "1.0.2",
+    "@types/mime": "3.0.4"
   },
   "author": "Envision Blockchain Solutions <info@envisionblockchain.com>",
   "dependencies": {
@@ -84,4 +85,4 @@
   },
   "type": "module",
   "version": "2.23.0"
-}
+}
diff --git a/api-tests/package.json b/api-tests/package.json
@@ -26,5 +26,8 @@
         "gulp-rename": "^2.0.0",
         "gulp-sourcemaps": "^3.0.0",
         "gulp-typescript": "^6.0.0-alpha.1"
+    },
+    "resolutions": {
+        "@types/mime": "3.0.4"
     }
 }
diff --git a/auth-service/package.json b/auth-service/package.json
@@ -7,7 +7,8 @@
   "author": "Envision Blockchain Solutions <info@envisionblockchain.com>",
   "resolutions": {
     "@azure/core-rest-pipeline": "1.12.1",
-    "image-size": "1.0.2"
+    "image-size": "1.0.2",
+    "@types/mime": "3.0.4"
   },
   "dependencies": {
     "@guardian/common": "^2.23.0",
@@ -76,4 +77,4 @@
   },
   "type": "module",
   "version": "2.23.0"
-}
+}
diff --git a/common/package.json b/common/package.json
@@ -74,7 +74,8 @@
     "name": "@guardian/common",
     "resolutions": {
         "@azure/core-rest-pipeline": "1.12.1",
-        "image-size": "1.0.2"
+        "image-size": "1.0.2",
+        "@types/mime": "3.0.4"
     },
     "scripts": {
         "build": "tsc",

diff --git a/common/src/models/base-entity.ts b/common/src/models/base-entity.ts
@@ -1,4 +1,4 @@
-import { AfterCreate, BeforeCreate, BeforeUpdate, PrimaryKey, Property, SerializedPrimaryKey } from '@mikro-orm/core';
+import { BeforeCreate, BeforeUpdate, PrimaryKey, Property, SerializedPrimaryKey } from '@mikro-orm/core';
 import { ObjectId } from '@mikro-orm/mongodb';
 
 /**

diff --git a/guardian-service/package.json b/guardian-service/package.json
@@ -13,7 +13,8 @@
   "author": "Envision Blockchain Solutions <info@envisionblockchain.com>",
   "resolutions": {
     "@azure/core-rest-pipeline": "1.12.1",
-    "image-size": "1.0.2"
+    "image-size": "1.0.2",
+    "@types/mime": "3.0.4"
   },
   "dependencies": {
     "@guardian/common": "^2.23.0",
@@ -100,4 +101,4 @@
   },
   "type": "module",
   "version": "2.23.0"
-}
+}
diff --git a/interfaces/package.json b/interfaces/package.json
@@ -33,5 +33,9 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "type": "module",
-  "version": "2.23.0"
+  "version": "2.23.0",
+    "resolutions": {
+      "@types/mime": "3.0.4"
+  }
 }
+
diff --git a/logger-service/package.json b/logger-service/package.json
@@ -2,7 +2,8 @@
   "author": "Envision Blockchain Solutions <info@envisionblockchain.com>",
   "resolutions": {
     "@azure/core-rest-pipeline": "1.12.1",
-    "image-size": "1.0.2"
+    "image-size": "1.0.2",
+    "@types/mime": "3.0.4"
   },
   "dependencies": {
     "@mikro-orm/core": "^6.1.11",
@@ -55,4 +56,4 @@
   },
   "type": "module",
   "version": "2.23.0"
-}
+}
diff --git a/mrv-sender/package.json b/mrv-sender/package.json
@@ -2,7 +2,8 @@
   "author": "Envision Blockchain Solutions <info@envisionblockchain.com>",
   "resolutions": {
     "@azure/core-rest-pipeline": "1.12.1",
-    "image-size": "1.0.2"
+    "image-size": "1.0.2",
+    "@types/mime": "3.0.4"
   },
   "dependencies": {
     "@guardian/common": "^2.23.0",
@@ -45,4 +46,4 @@
   },
   "type": "module",
   "version": "2.23.0"
-}
+}
diff --git a/notification-service/package.json b/notification-service/package.json
@@ -2,7 +2,8 @@
   "author": "Envision Blockchain Solutions <info@envisionblockchain.com>",
   "resolutions": {
     "@azure/core-rest-pipeline": "1.12.1",
-    "image-size": "1.0.2"
+    "image-size": "1.0.2",
+    "@types/mime": "3.0.4"
   },
   "dependencies": {
     "@mikro-orm/core": "^6.1.11",
@@ -54,4 +55,4 @@
   },
   "type": "module",
   "version": "2.23.0"
-}
+}
diff --git a/package.json b/package.json
@@ -23,6 +23,11 @@
   "devDependencies": {
     "detect-secrets": "^1.0.6"
   },
+  "resolutions": {
+    "@azure/core-rest-pipeline": "1.12.1",
+    "image-size": "1.0.2",
+    "@types/mime": "3.0.4"
+  },
   "scripts": {
     "detect-secrets": "detect-secrets-launcher --word-list exclude-secrets.txt k8s-manifests/**/* */src/**.ts **/.env*",
     "publish-policies": "guardian-cli publish-policies \"Methodology Library\" -c \"configs/automatic-publish-policies.config.json\" -o \"published-policies.txt\""

diff --git a/policy-service/package.json b/policy-service/package.json
@@ -12,7 +12,8 @@
     "author": "Envision Blockchain Solutions <info@envisionblockchain.com>",
     "resolutions": {
         "@azure/core-rest-pipeline": "1.12.1",
-        "image-size": "1.0.2"
+        "image-size": "1.0.2",
+        "@types/mime": "3.0.4"
     },
     "dependencies": {
         "@guardian/common": "2.23.0",

diff --git a/topic-viewer/package.json b/topic-viewer/package.json
@@ -30,5 +30,8 @@
         "start": "node dist/index.js"
     },
     "type": "module",
-    "version": "2.23.0"
+    "version": "2.23.0",
+    "resolutions": {
+        "@types/mime": "3.0.4"
+    }
 }
diff --git a/tree-viewer/package.json b/tree-viewer/package.json
@@ -28,5 +28,8 @@
         "start": "node dist/index.js"
     },
     "type": "module",
-    "version": "2.23.0"
+    "version": "2.23.0",
+    "resolutions": {
+        "@types/mime": "3.0.4"
+    }
 }
diff --git a/worker-service/package.json b/worker-service/package.json
@@ -65,5 +65,8 @@
     },
     "type": "module",
     "types": "dist/index.d.ts",
-    "version": "2.23.0"
+    "version": "2.23.0",
+    "resolutions": {
+        "@types/mime": "3.0.4"
+    }
 }