From 283e859172aedd89a9a0e6675d389d91dbe3ea3e Mon Sep 17 00:00:00 2001
From: Ian <ian.c.bacher@gmail.com>
Date: Wed, 31 Jul 2024 14:33:48 -0400
Subject: [PATCH] (fix) Fix various tooling issues in core

---
 package.json                                      | 8 +-------
 packages/apps/esm-login-app/package.json          | 5 ++++-
 packages/framework/esm-utils/package.json         | 1 +
 packages/tooling/openmrs/package.json             | 1 +
 packages/tooling/openmrs/src/commands/assemble.ts | 2 +-
 yarn.lock                                         | 9 +++++----
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index c2eb5df79..08ef6e230 100644
--- a/package.json
+++ b/package.json
@@ -76,11 +76,5 @@
     "@carbon/icons-react": "11.37.0",
     "minipass": "3.3.5"
   },
-  "packageManager": "yarn@4.2.2",
-  "dependencies": {
-    "@formatjs/intl-durationformat": "^0.2.4",
-    "@hookform/resolvers": "^3.6.0",
-    "react-hook-form": "^7.52.0",
-    "zod": "^3.23.8"
-  }
+  "packageManager": "yarn@4.2.2"
 }
diff --git a/packages/apps/esm-login-app/package.json b/packages/apps/esm-login-app/package.json
index 678770872..84262c262 100644
--- a/packages/apps/esm-login-app/package.json
+++ b/packages/apps/esm-login-app/package.json
@@ -39,7 +39,10 @@
   },
   "dependencies": {
     "@carbon/react": "~1.37.0",
-    "lodash-es": "^4.17.21"
+    "@hookform/resolvers": "^3.6.0",
+    "lodash-es": "^4.17.21",
+    "react-hook-form": "^7.52.0",
+    "zod": "^3.23.8"
   },
   "peerDependencies": {
     "@carbon/react": "1.x",
diff --git a/packages/framework/esm-utils/package.json b/packages/framework/esm-utils/package.json
index 3f132be29..7c1fbddd5 100644
--- a/packages/framework/esm-utils/package.json
+++ b/packages/framework/esm-utils/package.json
@@ -51,6 +51,7 @@
     "rxjs": "6.x"
   },
   "dependencies": {
+    "@formatjs/intl-durationformat": "^0.2.4",
     "@internationalized/date": "^3.5.4",
     "semver": "7.3.2"
   }
diff --git a/packages/tooling/openmrs/package.json b/packages/tooling/openmrs/package.json
index 0eb4b29ac..c7b0e9a46 100644
--- a/packages/tooling/openmrs/package.json
+++ b/packages/tooling/openmrs/package.json
@@ -44,6 +44,7 @@
     "glob": "^7.1.3",
     "html-webpack-plugin": "^5.5.0",
     "inquirer": "^7.3.3",
+    "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
     "mini-css-extract-plugin": "^2.9.0",
     "node-watch": "^0.7.4",
diff --git a/packages/tooling/openmrs/src/commands/assemble.ts b/packages/tooling/openmrs/src/commands/assemble.ts
index 293ee46d9..93040ad16 100644
--- a/packages/tooling/openmrs/src/commands/assemble.ts
+++ b/packages/tooling/openmrs/src/commands/assemble.ts
@@ -8,7 +8,7 @@ import axios from 'axios';
 import npmRegistryFetch from 'npm-registry-fetch';
 import pacote from 'pacote';
 import semver from 'semver';
-import { merge } from 'lodash-es';
+import merge from 'lodash/merge';
 import { contentHash, logInfo, logWarn, untar } from '../utils';
 import { getNpmRegistryConfiguration } from '../utils/npmConfig';
 
diff --git a/yarn.lock b/yarn.lock
index 866ffc356..af6db2667 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3042,8 +3042,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@openmrs/esm-core@workspace:."
   dependencies:
-    "@formatjs/intl-durationformat": "npm:^0.2.4"
-    "@hookform/resolvers": "npm:^3.6.0"
     "@playwright/test": "npm:1.45.3"
     "@swc/core": "npm:^1.3.58"
     "@swc/jest": "npm:^0.2.29"
@@ -3075,7 +3073,6 @@ __metadata:
     openmrs: "workspace:*"
     postcss: "npm:^8.4.6"
     prettier: "npm:^3.1.0"
-    react-hook-form: "npm:^7.52.0"
     swc-loader: "npm:^0.2.3"
     systemjs-webpack-interop: "npm:^2.3.7"
     timezone-mock: "npm:^1.2.2"
@@ -3086,7 +3083,6 @@ __metadata:
     typedoc-plugin-no-inherit: "npm:^1.3.1"
     typescript: "npm:~4.6.4"
     webpack: "npm:^5.88.0"
-    zod: "npm:^3.23.8"
   languageName: unknown
   linkType: soft
 
@@ -3272,17 +3268,20 @@ __metadata:
   resolution: "@openmrs/esm-login-app@workspace:packages/apps/esm-login-app"
   dependencies:
     "@carbon/react": "npm:~1.37.0"
+    "@hookform/resolvers": "npm:^3.6.0"
     "@openmrs/esm-framework": "workspace:*"
     "@openmrs/webpack-config": "workspace:*"
     jest: "npm:^29.7.0"
     lodash-es: "npm:^4.17.21"
     react: "npm:^18.1.0"
     react-dom: "npm:^18.1.0"
+    react-hook-form: "npm:^7.52.0"
     react-i18next: "npm:^11.18.6"
     react-router-dom: "npm:^6.3.0"
     rxjs: "npm:^6.5.3"
     swr: "npm:^2.2.2"
     webpack: "npm:^5.88.0"
+    zod: "npm:^3.23.8"
   peerDependencies:
     "@carbon/react": 1.x
     "@openmrs/esm-framework": "*"
@@ -3522,6 +3521,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@openmrs/esm-utils@workspace:packages/framework/esm-utils"
   dependencies:
+    "@formatjs/intl-durationformat": "npm:^0.2.4"
     "@internationalized/date": "npm:^3.5.4"
     "@openmrs/esm-globals": "workspace:*"
     "@types/semver": "npm:^7.3.4"
@@ -14318,6 +14318,7 @@ __metadata:
     glob: "npm:^7.1.3"
     html-webpack-plugin: "npm:^5.5.0"
     inquirer: "npm:^7.3.3"
+    lodash: "npm:^4.17.21"
     lodash-es: "npm:^4.17.21"
     mini-css-extract-plugin: "npm:^2.9.0"
     node-watch: "npm:^0.7.4"