Include highlight.js using cljsjs instead of npm-deps

This fixes the failing uberjar creation of intermine/bluegenes.
intermine · Aug 29, 2019 · febcc67 · febcc67
1 parent 613d128
commit febcc67
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 17 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "@cljs-oss/module-deps": "^1.1.1",
-    "highlight.js": "^9.12.0"
+    "@cljs-oss/module-deps": "^1.1.1"
   }
 }
diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.intermine/im-tables "0.8.2"
+(defproject org.intermine/im-tables "0.8.3"
   :dependencies [[org.clojure/clojure "1.10.1"]
                  [org.clojure/clojurescript "1.10.520"]
                  [org.clojure/core.async "0.4.500"]
@@ -8,6 +8,7 @@
                  [reagent "0.8.1"]
                  [cljsjs/react-transition-group "1.2.0-0"
                   :exclusions [cljsjs/react cljsjs/react-dom]]
+                 [cljsjs/highlight "9.12.0-2"]
                  [compojure "1.6.1"]
                  [ring "1.7.1"]
                  [cljs-http "0.1.46"]
@@ -57,8 +58,6 @@
                 :source-map-timestamp true
                 :preloads [devtools.preload]
                 :parallel-build true
-                :npm-deps {:highlight.js "9.12.0"}
-                :install-deps true
                 :external-config {:devtools/config {:features-to-install :all}}}}
 
 
@@ -69,8 +68,6 @@
                 :output-to "resources/public/js/compiled/app.js"
                 :optimizations :advanced
                 :closure-defines {goog.DEBUG false}
-                :npm-deps {:highlight.js "9.12.0"}
-                :install-deps true
                 :pretty-print false}}
 
     {:id "test"

diff --git a/src/im_tables/core.cljs b/src/im_tables/core.cljs
@@ -8,7 +8,13 @@
             [im-tables.config :as config]
             [imcljs.query :as query]
             [re-frisk.core :refer [enable-re-frisk!]]
-            [cljsjs.react-transition-group]))
+            [cljsjs.react-transition-group]
+            [cljsjs.highlight]
+            [cljsjs.highlight.langs.javascript]
+            [cljsjs.highlight.langs.perl]
+            [cljsjs.highlight.langs.python]
+            [cljsjs.highlight.langs.ruby]
+            [cljsjs.highlight.langs.java]))
 
 
 (defn dev-setup []

diff --git a/src/im_tables/views/dashboard/manager/codegen/main.cljs b/src/im_tables/views/dashboard/manager/codegen/main.cljs
@@ -1,7 +1,6 @@
 (ns im-tables.views.dashboard.manager.codegen.main
   (:require [re-frame.core :refer [subscribe dispatch]]
             [reagent.core :as r]
-            ["highlight.js" :as hljs]
             [clojure.string :as string]
             [imcljs.internal.utils :refer [scrub-url]]
             [oops.core :refer [ocall oget oset!]]))
@@ -66,11 +65,11 @@
                               (reset! max-height (-> js/window js/$ (ocall :height)))
                               (ocall (js/$ "pre code") :each
                                      (fn [i block]
-                                       (ocall hljs :highlightBlock block))))
+                                       (ocall js/hljs :highlightBlock block))))
        :component-did-update (fn [this]
                                (ocall (js/$ "pre code") :each
                                       (fn [i block]
-                                        (ocall hljs :highlightBlock block))))
+                                        (ocall js/hljs :highlightBlock block))))
        :reagent-render (fn [loc]
                          (let [highlight? (:highlight? @codegen-settings)]
                            [:div.container-fluid
@@ -120,4 +119,4 @@
                      [:li {:on-click (fn []
                                        (dispatch [:main/set-codegen-option loc :lang value true])
                                        (dispatch [:prep-modal loc (build-modal loc)]))}
-                      [:a label]]) languages))]])))
+                      [:a label]]) languages))]])))