Revert to deepmerge dependency to support array merge

apps/charterafrica/package.json

@@ -59,7 +59,7 @@
     "@payloadcms/plugin-seo": "^2.3.2",
     "@payloadcms/richtext-slate": "^1.5.2",
     "@react-spring/web": "^9.7.4",
-    "@sentry/nextjs": "^8.21.0",
+    "@sentry/nextjs": "^8.22.0",
     "airtable": "^0.12.2",
     "dotenv": "^16.4.5",
     "express": "^4.19.2",

apps/codeforafrica/package.json

@@ -52,7 +52,7 @@
     "@payloadcms/plugin-sentry": "^0.0.6",
     "@payloadcms/plugin-seo": "^2.3.2",
     "@payloadcms/richtext-slate": "^1.5.2",
-    "@sentry/nextjs": "^8.21.0",
+    "@sentry/nextjs": "^8.22.0",
     "camelcase-keys": "^9.1.3",
     "dotenv": "^16.4.5",
     "express": "^4.19.2",

apps/pesayetu/package.json

@@ -82,14 +82,14 @@
     "@commons-ui/testing-library": "workspace:*",
     "@material-ui/codemod": "^4.5.1",
     "@playwright/test": "^1.45.3",
-    "@storybook/addon-essentials": "^8.2.6",
-    "@storybook/addon-interactions": "^8.2.6",
-    "@storybook/addon-links": "^8.2.6",
-    "@storybook/blocks": "^8.2.6",
-    "@storybook/cli": "^8.2.6",
-    "@storybook/nextjs": "^8.2.6",
-    "@storybook/react": "^8.2.6",
-    "@storybook/test": "^8.2.6",
+    "@storybook/addon-essentials": "^8.2.7",
+    "@storybook/addon-interactions": "^8.2.7",
+    "@storybook/addon-links": "^8.2.7",
+    "@storybook/blocks": "^8.2.7",
+    "@storybook/cli": "^8.2.7",
+    "@storybook/nextjs": "^8.2.7",
+    "@storybook/react": "^8.2.7",
+    "@storybook/test": "^8.2.7",
     "@svgr/webpack": "^8.1.0",
     "@types/node": "^20.14.13",
     "@types/react": "^18.3.3",
@@ -115,7 +115,7 @@
     "playwright-config-commons-ui": "workspace:*",
     "prettier": "^3.3.3",
     "react-test-renderer": "^18.3.1",
-    "storybook": "^8.2.6",
+    "storybook": "^8.2.7",
     "svg-url-loader": "^8.0.0",
     "typescript": "^5.5.4"
   },

apps/promisetracker/package.json

@@ -31,7 +31,7 @@
     "@mui/material": "^5.16.6",
     "@mui/styles": "^5.16.6",
     "@mui/utils": "^5.16.6",
-    "@sentry/nextjs": "^8.21.0",
+    "@sentry/nextjs": "^8.22.0",
     "clsx": "^2.1.1",
     "date-fns": "^2.30.0",
     "form-data": "^4.0.0",

apps/roboshield/package.json

@@ -35,7 +35,7 @@
     "@payloadcms/plugin-sentry": "^0.0.6",
     "@payloadcms/plugin-seo": "^2.3.2",
     "@payloadcms/richtext-slate": "^1.5.2",
-    "@sentry/nextjs": "^8.21.0",
+    "@sentry/nextjs": "^8.22.0",
     "ace-builds": "^1.35.4",
     "crawler-user-agents": "^1.0.142",
     "date-fns": "^3.6.0",

apps/uibook/package.json

@@ -51,22 +51,22 @@
   "devDependencies": {
     "@babel/core": "^7.25.2",
     "@babel/preset-react": "^7.24.7",
-    "@storybook/addon-essentials": "^8.2.6",
-    "@storybook/addon-interactions": "^8.2.6",
-    "@storybook/addon-links": "^8.2.6",
-    "@storybook/blocks": "^8.2.6",
-    "@storybook/cli": "^8.2.6",
-    "@storybook/nextjs": "^8.2.6",
-    "@storybook/react": "^8.2.6",
-    "@storybook/test": "^8.2.6",
+    "@storybook/addon-essentials": "^8.2.7",
+    "@storybook/addon-interactions": "^8.2.7",
+    "@storybook/addon-links": "^8.2.7",
+    "@storybook/blocks": "^8.2.7",
+    "@storybook/cli": "^8.2.7",
+    "@storybook/nextjs": "^8.2.7",
+    "@storybook/react": "^8.2.7",
+    "@storybook/test": "^8.2.7",
     "@types/node": "^20.14.13",
     "@types/react": "^18.3.3",
     "eslint": "^8.57.0",
     "eslint-config-commons-ui": "workspace:*",
     "eslint-import-resolver-webpack": "^0.13.8",
     "eslint-plugin-import": "^2.29.1",
     "prettier": "^3.3.3",
-    "storybook": "^8.2.6",
+    "storybook": "^8.2.7",
     "typescript": "^5.5.4",
     "webpack": "^5.93.0"
   },

apps/vpnmanager/package.json

@@ -24,7 +24,7 @@
     "@mui/utils": "^5.16.6",
     "@next/env": "^14.2.5",
     "@sendgrid/mail": "^8.1.3",
-    "@sentry/nextjs": "^8.21.0",
+    "@sentry/nextjs": "^8.22.0",
     "@svgr/webpack": "^8.1.0",
     "@types/jest": "^29.5.12",
     "googleapis": "^133.0.0",

packages/hurumap-core/package.json

@@ -40,14 +40,17 @@
     "@mui/utils": "^5.16.6",
     "@types/react": "^18.3.3",
     "babel-loader": "^9.1.3",
+    "deepmerge": "^4.3.1",
     "eslint": "^8.57.0",
     "eslint-config-commons-ui": "workspace:*",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "jest-config-commons-ui": "workspace:*",
     "prettier": "^3.3.3",
     "react": "^18.3.1",
+    "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^18.3.1",
+    "react-share": "^5.1.0",
     "react-test-renderer": "^18.3.1",
     "require-from-string": "^2.0.2",
     "typescript": "^5.5.4",
@@ -59,7 +62,7 @@
     "@emotion/styled": "^11.11.0",
     "@mui/material": "^5.14.0",
     "@mui/utils": "^5.12.3",
-    "leaflet": "^1.9.4",
+    "deepmerge": "^4.3.1",
     "react": "^18.2.0",
     "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^18.2.0",

packages/hurumap-core/src/Scope/BarChartScope.js

@@ -1,4 +1,4 @@
-import { deepmerge } from "@mui/utils";
+import merge from "deepmerge";
 
 import Scope from "./Scope";
 
@@ -17,7 +17,9 @@ export default function BarChartScope({
   const { parentLabel } = config;
 
   const { primary_group: primaryGroup } = metadata;
-  return deepmerge(
+
+  // Need to merge/contact arrays
+  return merge(
     Scope({
       primaryData,
       metadata,
@@ -345,8 +347,5 @@ export default function BarChartScope({
         },
       ],
     },
-    {
-      clone: false,
-    },
   );
 }