Handle :paths in deps.local.edn, and top-level shadow builds

Author: plexus

deps.edn

@@ -5,10 +5,10 @@
   com.lambdaisland/dotenv {:mvn/version "0.2.5"}}
 
  :aliases
- {:clojure { :extra-deps {babashka/babashka {:mvn/version "1.0.164" :scope "provided"}
-                          org.clojure/tools.deps.alpha {:mvn/version "0.14.1222"}
+ {:clojure { :extra-deps {babashka/babashka {:mvn/version "1.0.167" :scope "provided"}
+                          org.clojure/tools.deps.alpha {:mvn/version "0.15.1254"}
                           com.nextjournal/beholder {:mvn/version "1.0.0"}
-                          thheller/shadow-cljs {:mvn/version "2.20.5"}
+                          thheller/shadow-cljs {:mvn/version "2.20.13"}
                           com.lambdaisland/classpath {:mvn/version "0.4.44"}}}
   :dev
   {:extra-paths ["dev"]

src/lambdaisland/launchpad.clj

@@ -171,6 +171,7 @@
         ;; Pull these out and inject them into -Sdeps, otherwise they are only
         ;; picked up with the next reload
         (update :extra-deps merge (:deps deps-local))
+        (assoc :paths (concat (:paths deps-edn) (:paths deps-local)))
         ;; It seems like if we set `{:aliases {}}` via `-Sdeps` it overrides
         ;; deps.edn aliases, rather than merging them, so we merge them
         ;; ourselves and pass them all to -Sdeps. Needs more testing to see if
@@ -233,13 +234,14 @@
                 `(future
                    (lambdaisland.launchpad.watcher/watch! ~watch-handlers))))))
 
-(defn clojure-cli-args [{:keys [aliases requires nrepl-port java-args middleware extra-deps alias-defs eval-forms] :as ctx}]
+(defn clojure-cli-args [{:keys [aliases requires nrepl-port java-args middleware extra-deps paths alias-defs eval-forms] :as ctx}]
   (cond-> ["clojure"]
     :-> (into (map #(str "-J" %)) java-args)
     (seq aliases)
     (conj (str/join (cons "-A" aliases)))
-    extra-deps
+    (or extra-deps paths alias-defs)
     (into ["-Sdeps" (pr-str {:deps extra-deps
+                             :paths paths
                              :aliases alias-defs})])
     :->
     (into ["-M" "-e" (pr-str `(do ~(when (seq requires)

src/lambdaisland/launchpad/shadow.clj

@@ -13,13 +13,15 @@
   (.toAbsolutePath (Path/of "" (into-array String []))))
 
 (defn find-shadow-roots
-  "Find all libraries included via :local/root that haev a shadow-cljs.edn at
+  "Find all libraries included via :local/root that have a shadow-cljs.edn at
   their root."
   []
-  (keep (fn [{:local/keys [root]}]
-          (when (and root (.exists (io/file root "shadow-cljs.edn")))
-            root))
-        (vals (:libs (licp/read-basis)))))
+  (cond-> (keep (fn [{:local/keys [root]}]
+                  (when (and root (.exists (io/file root "shadow-cljs.edn")))
+                    root))
+                (vals (:libs (licp/read-basis))))
+    (.exists (io/file "shadow-cljs.edn"))
+    (conj "")))
 
 (defn read-shadow-config
   "Slurp in a shadow-cljs.edn, applying normalization and defaults."
@@ -80,7 +82,9 @@
                                [build-id
                                 (assoc (update-build-keys process-root module-root v)
                                        :build-id build-id
-                                       :js-options {:js-package-dirs [(str module-path "/node_modules")]})])))
+                                       :js-options (if (= "" module-path)
+                                                     {}
+                                                     {:js-package-dirs [(str module-path "/node_modules")]}))])))
 
                       builds))))))
       (assoc :deps {})