From 42622c8c08a72090aaf4089d41349949a0ba7ef8 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Sat, 25 Oct 2025 03:33:33 +0300 Subject: [PATCH] Install lodash.merge --- package-lock.json | 18 ++++++++++++++++++ package.json | 2 ++ scripts/core/siteConfig.ts | 4 ++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index d6491a8d..51e9bdb7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,6 +28,7 @@ "@types/inquirer": "^9.0.8", "@types/jest": "^30.0.0", "@types/langs": "^2.0.5", + "@types/lodash.merge": "^4.6.9", "@types/lodash.orderby": "^4.6.9", "@types/lodash.sortby": "^4.7.9", "@types/lodash.startcase": "^4.4.9", @@ -64,6 +65,7 @@ "jest-offline": "^1.0.1", "langs": "^2.0.0", "libxml2-wasm": "^0.5.0", + "lodash.merge": "^4.6.2", "lodash.orderby": "^4.6.0", "lodash.sortby": "^4.7.0", "lodash.startcase": "^4.4.0", @@ -3406,6 +3408,14 @@ "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==", "license": "MIT" }, + "node_modules/@types/lodash.merge": { + "version": "4.6.9", + "resolved": "https://registry.npmjs.org/@types/lodash.merge/-/lodash.merge-4.6.9.tgz", + "integrity": "sha512-23sHDPmzd59kUgWyKGiOMO2Qb9YtqRO/x4IhkgNUiPQ1+5MUVqi6bCZeq9nBJ17msjIMbEIO5u+XW4Kz6aGUhQ==", + "dependencies": { + "@types/lodash": "*" + } + }, "node_modules/@types/lodash.orderby": { "version": "4.6.9", "resolved": "https://registry.npmjs.org/@types/lodash.orderby/-/lodash.orderby-4.6.9.tgz", @@ -13560,6 +13570,14 @@ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz", "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==" }, + "@types/lodash.merge": { + "version": "4.6.9", + "resolved": "https://registry.npmjs.org/@types/lodash.merge/-/lodash.merge-4.6.9.tgz", + "integrity": "sha512-23sHDPmzd59kUgWyKGiOMO2Qb9YtqRO/x4IhkgNUiPQ1+5MUVqi6bCZeq9nBJ17msjIMbEIO5u+XW4Kz6aGUhQ==", + "requires": { + "@types/lodash": "*" + } + }, "@types/lodash.orderby": { "version": "4.6.9", "resolved": "https://registry.npmjs.org/@types/lodash.orderby/-/lodash.orderby-4.6.9.tgz", diff --git a/package.json b/package.json index 17303621..ef31e202 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,7 @@ "@types/inquirer": "^9.0.8", "@types/jest": "^30.0.0", "@types/langs": "^2.0.5", + "@types/lodash.merge": "^4.6.9", "@types/lodash.orderby": "^4.6.9", "@types/lodash.sortby": "^4.7.9", "@types/lodash.startcase": "^4.4.9", @@ -94,6 +95,7 @@ "jest-offline": "^1.0.1", "langs": "^2.0.0", "libxml2-wasm": "^0.5.0", + "lodash.merge": "^4.6.2", "lodash.orderby": "^4.6.0", "lodash.sortby": "^4.7.0", "lodash.startcase": "^4.4.0", diff --git a/scripts/core/siteConfig.ts b/scripts/core/siteConfig.ts index e7895020..a69c3abc 100644 --- a/scripts/core/siteConfig.ts +++ b/scripts/core/siteConfig.ts @@ -1,5 +1,5 @@ import * as epgGrabber from 'epg-grabber' -import _ from 'lodash' +import merge from 'lodash.merge' const _default = { days: 1, @@ -66,6 +66,6 @@ export class SiteConfig { this.output = config.output || _default.output this.logo = config.logo || _default.logo - this.request = _.merge(_default.request, config.request) + this.request = merge(_default.request, config.request) } }