From 1da7e0c30400b8cba3213bfee3af3161be387d75 Mon Sep 17 00:00:00 2001
From: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com>
Date: Mon, 8 Jan 2024 03:01:56 +0100
Subject: [PATCH] Remove lodash

---
 CHANGELOG.md                  | 2 ++
 package-lock.json             | 1 -
 package.json                  | 1 -
 tests/utils/weather_mocker.js | 5 +++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bd7e72d7b..97b3a84c81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,8 @@ _This release is scheduled to be released on 2024-04-01._
 
 ### Updated
 
+- Removing lodash dependency by replacing merge by spread operator
+
 ### Fixed
 
 - Skip changelog requirement when running tests for dependency updates (#3320)
diff --git a/package-lock.json b/package-lock.json
index 3e1330b197..6cf9bd5dc8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37,7 +37,6 @@
 				"jest": "^29.7.0",
 				"jsdom": "^23.0.1",
 				"lint-staged": "^15.2.0",
-				"lodash": "^4.17.21",
 				"playwright": "^1.40.1",
 				"prettier": "^3.1.1",
 				"sinon": "^17.0.1",
diff --git a/package.json b/package.json
index 17151bba14..1e9d84a6ca 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,6 @@
 		"jest": "^29.7.0",
 		"jsdom": "^23.0.1",
 		"lint-staged": "^15.2.0",
-		"lodash": "^4.17.21",
 		"playwright": "^1.40.1",
 		"prettier": "^3.1.1",
 		"sinon": "^17.0.1",
diff --git a/tests/utils/weather_mocker.js b/tests/utils/weather_mocker.js
index 83279001fa..e9de1566bd 100644
--- a/tests/utils/weather_mocker.js
+++ b/tests/utils/weather_mocker.js
@@ -2,7 +2,6 @@ const fs = require("fs");
 const path = require("path");
 const util = require("util");
 const exec = util.promisify(require("child_process").exec);
-const _ = require("lodash");
 
 /**
  * @param {string} type what data to read, can be "current" "forecast" or "hourly
@@ -25,7 +24,9 @@ const readMockData = (type, extendedData = {}) => {
 			break;
 	}
 
-	return JSON.stringify(_.merge({}, JSON.parse(fs.readFileSync(path.resolve(`${__dirname}/../mocks/${fileName}`)).toString()), extendedData));
+	const fileData = JSON.parse(fs.readFileSync(path.resolve(`${__dirname}/../mocks/${fileName}`)).toString());
+	const mergedData = JSON.stringify({ ...{}, ...fileData, ...extendedData });
+	return mergedData;
 };
 
 const injectMockData = (configFileName, extendedData = {}) => {