From 739a55ce347dafda40d32c0765abf3794e8171d6 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Fri, 28 Nov 2025 09:14:08 +0100
Subject: [PATCH] :sparkles: Replace hightlight.js internal bundle with direct
 npm use

---
 frontend/package.json                     |  2 +-
 frontend/src/app/util/code_highlight.cljs |  4 ++--
 frontend/vendor/hljs/index.js             |  5 -----
 frontend/vendor/hljs/package.json         | 13 -------------
 frontend/vendor/hljs/yarn.lock            | 21 ---------------------
 frontend/yarn.lock                        | 10 +---------
 6 files changed, 4 insertions(+), 51 deletions(-)
 delete mode 100644 frontend/vendor/hljs/index.js
 delete mode 100644 frontend/vendor/hljs/package.json
 delete mode 100644 frontend/vendor/hljs/yarn.lock

diff --git a/frontend/package.json b/frontend/package.json
index 8209e9e8b0..df7794a174 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -54,7 +54,6 @@
   },
   "devDependencies": {
     "@penpot/draft-js": "portal:./vendor/draft-js",
-    "@penpot/hljs": "portal:./vendor/hljs",
     "@penpot/mousetrap": "portal:./vendor/mousetrap",
     "@penpot/plugins-runtime": "1.3.2",
     "@penpot/svgo": "penpot/svgo#v3.2",
@@ -79,6 +78,7 @@
     "fancy-log": "^2.0.0",
     "getopts": "^2.3.0",
     "gettext-parser": "^8.0.0",
+    "highlight.js": "^11.10.0",
     "js-beautify": "^1.15.4",
     "jsdom": "^27.0.0",
     "lodash": "^4.17.21",
diff --git a/frontend/src/app/util/code_highlight.cljs b/frontend/src/app/util/code_highlight.cljs
index 710cdd1e12..979282d6ba 100644
--- a/frontend/src/app/util/code_highlight.cljs
+++ b/frontend/src/app/util/code_highlight.cljs
@@ -6,11 +6,11 @@
 
 (ns app.util.code-highlight
   (:require
-   ["@penpot/hljs" :as hljs]
+   ["highlight.js" :as hljs]
    [app.util.dom :as dom]))
 
 (defn highlight!
   {:lazy-loadable true}
   [node]
   (dom/set-data! node "highlighted" nil)
-  (hljs/highlightElement node))
+  (.highlightElement hljs/default node))
diff --git a/frontend/vendor/hljs/index.js b/frontend/vendor/hljs/index.js
deleted file mode 100644
index 74c0456161..0000000000
--- a/frontend/vendor/hljs/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import h from "highlight.js";
-
-export function highlightElement(node) {
-  return h.highlightElement(node);
-}
diff --git a/frontend/vendor/hljs/package.json b/frontend/vendor/hljs/package.json
deleted file mode 100644
index 6af2a5502c..0000000000
--- a/frontend/vendor/hljs/package.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "@penpot/hljs",
-  "version": "1.0.0",
-  "description": "Penpot Hightlight.js ESM wrapper",
-  "main": "index.js",
-  "packageManager": "yarn@4.3.1",
-  "author": "Andrey Antukh",
-  "license": "MPL-2.0",
-  "type": "module",
-  "dependencies": {
-    "highlight.js": "^11.10.0"
-  }
-}
diff --git a/frontend/vendor/hljs/yarn.lock b/frontend/vendor/hljs/yarn.lock
deleted file mode 100644
index db22e39861..0000000000
--- a/frontend/vendor/hljs/yarn.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is generated by running "yarn install" inside your project.
-# Manual changes might be lost - proceed with caution!
-
-__metadata:
-  version: 8
-  cacheKey: 10c0
-
-"@penpot/hljs@workspace:.":
-  version: 0.0.0-use.local
-  resolution: "@penpot/hljs@workspace:."
-  dependencies:
-    highlight.js: "npm:^11.10.0"
-  languageName: unknown
-  linkType: soft
-
-"highlight.js@npm:^11.10.0":
-  version: 11.10.0
-  resolution: "highlight.js@npm:11.10.0"
-  checksum: 10c0/cd8bf7ef06cbd72ddb83580ecabe769f08f062be8bb82d2eb492d31c17f7480d1f8d14a66fc81deee0601645435f19f04c470510563f847242a41ccff0ab873e
-  languageName: node
-  linkType: hard
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 88faf9e89d..9401a3f9e7 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -963,14 +963,6 @@ __metadata:
   languageName: node
   linkType: soft
 
-"@penpot/hljs@portal:./vendor/hljs::locator=frontend%40workspace%3A.":
-  version: 0.0.0-use.local
-  resolution: "@penpot/hljs@portal:./vendor/hljs::locator=frontend%40workspace%3A."
-  dependencies:
-    highlight.js: "npm:^11.10.0"
-  languageName: node
-  linkType: soft
-
 "@penpot/mousetrap@portal:./vendor/mousetrap::locator=frontend%40workspace%3A.":
   version: 0.0.0-use.local
   resolution: "@penpot/mousetrap@portal:./vendor/mousetrap::locator=frontend%40workspace%3A."
@@ -3765,7 +3757,6 @@ __metadata:
   resolution: "frontend@workspace:."
   dependencies:
     "@penpot/draft-js": "portal:./vendor/draft-js"
-    "@penpot/hljs": "portal:./vendor/hljs"
     "@penpot/mousetrap": "portal:./vendor/mousetrap"
     "@penpot/plugins-runtime": "npm:1.3.2"
     "@penpot/svgo": "penpot/svgo#v3.2"
@@ -3790,6 +3781,7 @@ __metadata:
     fancy-log: "npm:^2.0.0"
     getopts: "npm:^2.3.0"
     gettext-parser: "npm:^8.0.0"
+    highlight.js: "npm:^11.10.0"
     js-beautify: "npm:^1.15.4"
     jsdom: "npm:^27.0.0"
     lodash: "npm:^4.17.21"