From 2b463d4776f01a20e35db3b300e74bd9c32b713b Mon Sep 17 00:00:00 2001
From: Jakub Jankiewicz <jcubic@onet.pl>
Date: Fri, 10 Nov 2023 23:31:03 +0100
Subject: [PATCH] second attempt to fix Makefile on PR

---
 Makefile          |  8 ++++++--
 package-lock.json | 16 ++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 95a95b877..e80bfb007 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,7 @@ URL=`git config --get remote.origin.url`
 UNICODE=https://unicode.org/Public/UNIDATA/UnicodeData.txt
 
 MAKE=make
+ECHO=echo
 GIT=git
 CD=cd
 SED=sed
@@ -21,6 +22,7 @@ CP=cp
 RM=rm
 TEST=test
 CAT=cat
+TOUCH=touch
 NPM=npm
 NODE=node
 WGET=wget
@@ -66,8 +68,9 @@ assets/classDiagram.svg: assets/classDiagram
 	$(MERMAID) -i assets/classDiagram -o assets/classDiagram.svg
 
 README.md: templates/README.md dist/lips.js .$(VERSION)
+	$(ECHO) "building README ..."
 	$(GIT) branch | grep '* devel' > /dev/null && $(SED) -e "s/{{VER}}/DEV/g" -e \
-	"s/{{VER_DASH}}/$(VERSION_DASH)/g" -e "s/{{BRANCH}}/$(BRANCH)/g" -e "s/{{CHECKSUM}}/$(TESTS_CHECKSUM)/g" \
+	"s#{{VER_DASH}}#$(VERSION_DASH)#g" -e "s#{{BRANCH}}#$(BRANCH)#g" -e "s/{{CHECKSUM}}/$(TESTS_CHECKSUM)/g" \
 	-e "s/{{YEAR}}/${YEAR}/g"  -e "s/{{DATE}}/${DATE_SHORT}/" -e "s/{{COMMIT}}/$(COMMIT)/g" \
 	< templates/README.md > README.md || \
 	$(SED) -e "s/{{VER}}/$(VERSION)/g" -e "s/{{BRANCH}}/$(BRANCH)/g" -e "s/{{YEAR}}/${YEAR}/g" \
@@ -75,7 +78,8 @@ README.md: templates/README.md dist/lips.js .$(VERSION)
 	-e "s/{{VER_DASH}}/$(VERSION_DASH)/g" < templates/README.md > README.md
 
 .$(VERSION): Makefile
-	touch .$(VERSION)
+	@$(ECHO) "building from branch ${BRANCH}"
+	$(TOUCH) .$(VERSION)
 
 publish-beta:
 	$(GIT) clone $(URL) --depth 1 npm
diff --git a/package-lock.json b/package-lock.json
index a7202d80f..54b0b7322 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4436,9 +4436,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001447",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001447.tgz",
-      "integrity": "sha512-bdKU1BQDPeEXe9A39xJnGtY0uRq/z5osrnXUw0TcK+EYno45Y+U7QU9HhHEyzvMDffpYadFXi3idnSNkcwLkTw==",
+      "version": "1.0.30001561",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz",
+      "integrity": "sha512-NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw==",
       "dev": true,
       "funding": [
         {
@@ -4448,6 +4448,10 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ]
     },
@@ -12412,9 +12416,9 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001447",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001447.tgz",
-      "integrity": "sha512-bdKU1BQDPeEXe9A39xJnGtY0uRq/z5osrnXUw0TcK+EYno45Y+U7QU9HhHEyzvMDffpYadFXi3idnSNkcwLkTw==",
+      "version": "1.0.30001561",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz",
+      "integrity": "sha512-NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw==",
       "dev": true
     },
     "caseless": {