Merge branch 'master' of https://github.com/METS-Programme/esm-ugandaemr-core into fix-clinical-views

Author: jabahum

.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

@@ -1,7 +1,3 @@
 nodeLinker: node-modules
 
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"
-
-yarnPath: .yarn/releases/yarn-3.2.4.cjs
+yarnPath: .yarn/releases/yarn-4.9.2.cjs

.yarn/releases/yarn-3.2.4.cjs

@@ -32,10 +32,10 @@
         "react-to-print": "^2.14.13",
         "recharts": "^2.7.2",
         "swr": "^2.1.1",
-        "zod": "^3.22.4"
+        "zod": "^3.23.8"
     },
     "devDependencies": {
-        "@carbon/react": "^1.64.1",
+        "@carbon/react": "^1.83.0",
         "@ohri/openmrs-esm-ohri-commons-lib": "next",
         "@openmrs/esm-framework": "next",
         "@openmrs/esm-patient-common-lib": "next",
@@ -49,49 +49,47 @@
         "@testing-library/user-event": "^14.4.3",
         "@types/jest": "^28.1.8",
         "@types/lodash-es": "^4.17.3",
-        "@types/react": "^18.2.14",
-        "@types/react-dom": "^18.2.6",
-        "@types/react-router": "^5.1.20",
-        "@types/react-router-dom": "^5.3.3",
+        "@types/react": "^18.3.2",
+        "@types/react-dom": "^18.3.0",
         "@types/testing-library__jest-dom": "^5.14.1",
-        "@types/webpack-env": "^1.18.1",
-        "@typescript-eslint/eslint-plugin": "^5.61.0",
-        "@typescript-eslint/parser": "^5.61.0",
-        "clean-webpack-plugin": "^3.0.0",
-        "concurrently": "^7.4.0",
+        "@types/webpack-env": "^1.18.8",
+        "@typescript-eslint/eslint-plugin": "^6.7.3",
+        "@typescript-eslint/parser": "^6.7.3",
+        "clean-webpack-plugin": "^4.0.0",
+        "concurrently": "^8.2.1",
         "cross-env": "^7.0.3",
         "css-loader": "^6.8.1",
-        "eslint": "^8.44.0",
+        "eslint": "^8.50.0",
         "eslint-config-prettier": "^8.8.0",
         "eslint-config-ts-react-important-stuff": "^3.0.0",
-        "eslint-plugin-prettier": "^4.2.1",
+        "eslint-plugin-prettier": "^5.1.3",
         "husky": "^8.0.3",
         "i18next": "^23.2.8",
         "i18next-parser": "^8.0.0",
         "identity-obj-proxy": "^3.0.0",
         "install-peers": "^1.0.4",
-        "jest": "^28.1.3",
-        "jest-cli": "^28.1.3",
-        "jest-environment-jsdom": "^28.1.3",
+        "jest": "^29.7.0",
+        "jest-cli": "^29.7.0",
+        "jest-environment-jsdom": "^29.7.0",
         "lerna": "^5.6.1",
         "lodash": "^4.17.21",
         "openmrs": "next",
-        "prettier": "^2.8.8",
+        "prettier": "^3.0.3",
         "pretty-quick": "^3.1.3",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "react-i18next": "^11.18.6",
         "react-router-dom": "^6.14.1",
         "rxjs": "^6.6.7",
         "sass": "^1.54.3",
         "swc-loader": "^0.2.3",
         "systemjs-webpack-interop": "^2.3.7",
-        "turbo": "^1.10.13",
+        "turbo": "^2.5.2",
         "typescript": "^5.0.2",
-        "webpack": "^5.83.1",
+        "webpack": "^5.99.9",
         "webpack-bundle-analyzer": "^4.4.0",
-        "webpack-cli": "^4.10.0",
-        "webpack-dev-server": "^4.8.1"
+        "webpack-cli": "^6.0.1",
+        "webpack-dev-server": "^5.2.1"
     },
-    "packageManager": "yarn@3.2.4"
+    "packageManager": "yarn@4.9.2"
 }

.yarn/releases/yarn-4.9.2.cjs

@@ -33,20 +33,20 @@
     "url": "git+https://github.com/METS-Programme/esm-ugandaemr-core/issues"
   },
   "dependencies": {
-    "@carbon/react": "^1.64.1",
+    "@carbon/react": "^1.83.0",
     "lodash-es": "^4.17.15",
     "react-to-print": "^2.14.13"
   },
   "peerDependencies": {
-    "@openmrs/esm-framework": "*",
-    "@openmrs/esm-patient-common-lib": "x",
+    "@openmrs/esm-framework": "7.x",
+    "@openmrs/esm-patient-common-lib": "10.x",
     "react": "^18.1.0",
     "react-i18next": "11.x",
     "react-router-dom": "6.x",
     "swr": "2.x"
   },
   "devDependencies": {
     "@openmrs/esm-patient-common-lib": "next",
-    "webpack": "^5.74.0"
+    "webpack": "^5.99.9"
   }
 }

.yarnrc.yml

@@ -15,11 +15,7 @@ const CarePanelTabs: React.FC<CarePanelTabsProps> = ({ patientUuid }) => {
   const [selectedTab, setSelectedTab] = useState(0);
   return (
     <div className={styles.tabContainer}>
-      <Tabs
-        selectedIndex={selectedTab}
-        onChange={({ selectedIndex }) => setSelectedTab(selectedIndex)}
-        className={styles.tabs}
-      >
+      <Tabs selectedIndex={selectedTab} onChange={({ selectedIndex }) => setSelectedTab(selectedIndex)}>
         <TabList contained className={styles.tabList}>
           <Tab>{t('dsdmHistory', 'DSDM History')}</Tab>
           <Tab>{t('vlHistory', 'Viral Load History')}</Tab>

package.json

@@ -22,7 +22,7 @@ const CarePanel: React.FC<CarePanelProps> = ({ patientUuid, formEntrySub, launch
   if (isLoading) {
     return (
       <div className={styles.widgetCard}>
-        <StructuredListSkeleton role="progressbar" />
+        <StructuredListSkeleton />
       </div>
     );
   }

packages/esm-care-panel-app/package.json

@@ -21,7 +21,7 @@ const CarePanelMCH: React.FC<CarePanelProps> = ({ patientUuid, formEntrySub, lau
   if (isLoading) {
     return (
       <div className={styles.widgetCard}>
-        <StructuredListSkeleton role="progressbar" />
+        <StructuredListSkeleton />
       </div>
     );
   }

packages/esm-care-panel-app/src/care-panel/care-panel-tabs/care-panel-tabs.component.tsx

@@ -21,7 +21,7 @@ const CarePanelTB: React.FC<CarePanelProps> = ({ patientUuid, formEntrySub, laun
   if (isLoading) {
     return (
       <div className={styles.widgetCard}>
-        <StructuredListSkeleton role="progressbar" />
+        <StructuredListSkeleton />
       </div>
     );
   }