From 930e645bc7f4e0efd9810f2061c1e914799bf965 Mon Sep 17 00:00:00 2001
From: "circleci-app[bot]"
 <127350680+circleci-app[bot]@users.noreply.github.com>
Date: Wed, 3 Jun 2026 08:15:28 +0000
Subject: [PATCH 1/2] Fix npm install ERESOLVE peer dependency conflict

react-router@7.15.0 requires react>=18 but project uses react@16.14.0.
Add --legacy-peer-deps to npm i --save to bypass strict peer resolution.
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a57ca9f..ced46b2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -36,7 +36,7 @@ jobs:
       - run: 'CI=false && npm cache clean -force && rm package-lock.json' 
 
       #- run: 'CI=false && npm i --save --legacy-peer-deps && npm install marked marked-man && npm audit fix && npm run build-nix'
-      - run: npm i --save
+      - run: npm i --save --legacy-peer-deps
       
       - run: npm audit fix || true
       

From 69569b56913fd45fe3386eefbd3cd7f202becd0e Mon Sep 17 00:00:00 2001
From: Linards <33150232+HolimaX@users.noreply.github.com>
Date: Wed, 3 Jun 2026 11:26:08 +0300
Subject: [PATCH 2/2] Add Node.js 18.x to CI workflow matrix

Signed-off-by: Linards <33150232+HolimaX@users.noreply.github.com>
---
 .github/workflows/nodejs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index cb24af9..54624b3 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -10,7 +10,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [12.x, 14.x, 16.x, 18.x]
 
     steps:
       - uses: actions/checkout@v2