From 37fa08ba62db8d81ff914f892301d6279786d974 Mon Sep 17 00:00:00 2001
From: "ala'n (Alexey Stsefanovich)" <astsefanovich@exadel.com>
Date: Fri, 26 Jan 2024 15:16:10 +0100
Subject: [PATCH] chore: fix lint-staged for merge commits and restricted env
 requirements

---
 .husky/pre-push    | 3 ++-
 package-lock.json  | 3 +++
 package.json       | 5 +----
 pages/package.json | 7 +++++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.husky/pre-push b/.husky/pre-push
index 71b37b33..c769b0ab 100644
--- a/.husky/pre-push
+++ b/.husky/pre-push
@@ -1 +1,2 @@
-npx lint-staged --verbose --quiet
+# ignore lint-staged if it is merge commit
+git rev-parse -q --no-revs --verify MERGE_HEAD || npx lint-staged --verbose --quiet
diff --git a/package-lock.json b/package-lock.json
index 547d2273..7e2fdfec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17650,6 +17650,9 @@
         "webpack": "^5.90.0",
         "webpack-bundle-analyzer": "^4.10.1",
         "webpack-cli": "^5.1.4"
+      },
+      "engines": {
+        "node": ">=20.0.0"
       }
     },
     "pages/node_modules/entities": {
diff --git a/package.json b/package.json
index ed6331b8..f61856c1 100644
--- a/package.json
+++ b/package.json
@@ -22,10 +22,7 @@
     "README.md",
     "CLA.md",
     "CHANGELOG.md",
-    "esm/**/*.js",
-    "esm/**/*.ts",
-    "esm/**/*.css",
-    "esm/**/*.less"
+    "esm/**/*.{js,ts,css,less}"
   ],
   "sideEffects": [
     "src/**/*.less"
diff --git a/pages/package.json b/pages/package.json
index e4b498e4..1163d4c5 100644
--- a/pages/package.json
+++ b/pages/package.json
@@ -3,6 +3,10 @@
   "version": "2.0.0-beta.10",
   "private": true,
   "description": "Site of UI Playground project",
+  "license": "MIT",
+  "engines": {
+    "node": ">=20.0.0"
+  },
   "scripts": {
     "start": "npm run clean && npm rum watch",
     "clean": "rimraf dist",
@@ -31,6 +35,5 @@
     "webpack": "^5.90.0",
     "webpack-bundle-analyzer": "^4.10.1",
     "webpack-cli": "^5.1.4"
-  },
-  "license": "MIT"
+  }
 }