Warn when merging shadow-cljs configs and build-ids conflict

Author: plexus

CHANGELOG.md

@@ -2,9 +2,7 @@
 
 ## Added
 
-## Fixed
-
-## Changed
+- Warn when merging shadow-cljs configs and build-ids conflict
 
 # 0.30.139-alpha (2024-06-12 / 3221f94)
 
@@ -237,4 +235,4 @@ Initial release
 - lambdaisland.classpath integration
 - Support for cider-nrepl, refactor-nrepl
 - Basic support for shadow-cljs cljs nREPL-base REPL
-- Auto-connect for Emacs
+- Auto-connect for Emacs

deps.edn

@@ -1,25 +1,25 @@
 {:paths ["src" "resources"]
 
  :deps
- {org.clojure/clojure {:mvn/version "1.11.1"}
+ {org.clojure/clojure {:mvn/version "1.11.2"}
   com.lambdaisland/dotenv {:mvn/version "0.2.5"}}
 
  :aliases
  {:clojure
-  {:extra-deps {babashka/babashka {:mvn/version "1.3.188" :scope "provided"}
+  {:extra-deps {babashka/babashka {:mvn/version "1.3.190" :scope "provided"}
                 org.clojure/tools.deps.alpha {:mvn/version "0.15.1254"}
                 com.nextjournal/beholder {:mvn/version "1.0.2"}
-                thheller/shadow-cljs {:mvn/version "2.26.5"}
+                thheller/shadow-cljs {:mvn/version "2.28.3"}
                 ;; prevent tools.deps.alpha from dragging in an old guava
-                com.google.guava/guava {:mvn/version "33.0.0-jre"}
+                com.google.guava/guava {:mvn/version "33.1.0-jre"}
                 com.lambdaisland/classpath {:mvn/version "0.5.48"}}}
   :dev
   {:extra-paths ["dev"]
    :extra-deps  {djblue/portal {:mvn/version "RELEASE"}}}
 
   :test
   {:extra-paths ["test"]
-   :extra-deps  {lambdaisland/kaocha {:mvn/version "1.87.1366"}}}
+   :extra-deps  {lambdaisland/kaocha {:mvn/version "1.88.1376"}}}
 
   :self-deps
   {:extra-deps {com.lambdaisland/launchpad-deps {:local/root "resources/launchpad"}}}

resources/launchpad/deps.edn

@@ -2,15 +2,15 @@
 ;; things to use. We keep it in deps.edn format so antq can automatically
 ;; upgrade versions.
 {:deps
- {com.lambdaisland/launchpad    {:mvn/version "0.22.110-alpha"}
+ {com.lambdaisland/launchpad    {:mvn/version "0.28.129-alpha"}
   com.lambdaisland/classpath    {:mvn/version "0.5.48"}
-  com.github.jnr/jnr-posix      {:mvn/version "3.1.18"}
-  thheller/shadow-cljs          {:mvn/version "2.26.5"}
-  com.google.guava/guava        {:mvn/version "33.0.0-jre"}
-  cider/cider-nrepl             {:mvn/version "0.45.0"}
-  nrepl/nrepl                   {:mvn/version "1.1.0"}
-  refactor-nrepl/refactor-nrepl {:mvn/version "3.9.1"}
-  djblue/portal                 {:mvn/version "0.51.1"}
+  com.github.jnr/jnr-posix      {:mvn/version "3.1.19"}
+  thheller/shadow-cljs          {:mvn/version "2.28.3"}
+  com.google.guava/guava        {:mvn/version "33.1.0-jre"}
+  cider/cider-nrepl             {:mvn/version "0.47.1"}
+  nrepl/nrepl                   {:mvn/version "1.1.1"}
+  refactor-nrepl/refactor-nrepl {:mvn/version "3.10.0"}
+  djblue/portal                 {:mvn/version "0.55.1"}
   com.billpiel/sayid            {:mvn/version "0.1.0"}
-  com.gfredericks/debug-repl    {:mvn/version "0.0.12"}
+  com.gfredericks/debug-repl    {:mvn/version "0.3.1-p1"}
   }}

src/lambdaisland/launchpad.clj

@@ -8,7 +8,8 @@
    [clojure.pprint :as pprint]
    [clojure.string :as str]
    [clojure.tools.cli :as tools-cli]
-   [lambdaisland.dotenv :as dotenv])
+   [lambdaisland.dotenv :as dotenv]
+   [lambdaisland.launchpad.log :refer :all])
   (:import
    (java.io InputStream OutputStream)
    (java.lang Process ProcessBuilder)
@@ -63,13 +64,6 @@
 ;;   the current version in `bb.edn`"
 ;;   {:mvn/version "RELEASE"})
 
-(def verbose? (some #{"-v" "--verbose"} *command-line-args*))
-
-(defn debug [& args] (when verbose? (apply println (java.util.Date.) "[DEBUG]" args)))
-(defn info [& args] (apply println (java.util.Date.) "[INFO]" args))
-(defn warn [& args] (apply println (java.util.Date.) "[WARN]" args))
-(defn error [& args] (apply println (java.util.Date.) "[ERROR]" args))
-
 (defn shellquote [a]
   (let [a (str a)]
     (cond
@@ -444,10 +438,11 @@
           (assoc :shadow-cljs/connect-ids connect-ids)
           (update :eval-forms (fnil conj [])
                   '(require 'lambdaisland.launchpad.shadow)
-                  `(apply
-                    lambdaisland.launchpad.shadow/start-builds!
-                    (filter (set (keys (:builds (lambdaisland.launchpad.shadow/merged-config))))
-                            ~(vec build-ids)))))
+                  `(let [config# (lambdaisland.launchpad.shadow/merged-config)]
+                     (apply
+                      lambdaisland.launchpad.shadow/start-builds! config#
+                      (filter (set (keys (:builds config#)))
+                              ~(vec build-ids))))))
       ctx)))
 
 (defn maybe-connect-emacs [{:keys [options nrepl-port project-root] :as ctx}]

src/lambdaisland/launchpad/log.clj

@@ -0,0 +1,8 @@
+(ns lambdaisland.launchpad.log)
+
+(def verbose? (some #{"-v" "--verbose"} *command-line-args*))
+
+(defn debug [& args] (when verbose? (apply println #_(str (java.util.Date.)) "[DEBUG]" args)))
+(defn info [& args] (apply println #_(str (java.util.Date.)) "[INFO]" args))
+(defn warn [& args] (apply println #_(str (java.util.Date.)) "[WARN]" args))
+(defn error [& args] (apply println #_(str (java.util.Date.)) "[ERROR]" args))

src/lambdaisland/launchpad/shadow.clj

@@ -1,11 +1,14 @@
-(ns ^:no-doc ;TODO re-enable
-  lambdaisland.launchpad.shadow
-  (:require [clojure.java.io :as io]
-            [shadow.cljs.devtools.api :as api]
-            [shadow.cljs.devtools.config :as config]
-            [shadow.cljs.devtools.server :as server]
-            [shadow.cljs.devtools.server.runtime :as runtime]
-            [lambdaisland.classpath :as licp])
+(ns lambdaisland.launchpad.shadow
+  "Shadow-cljs support, generates a shadow-cljs config based on subprojects."
+  (:require
+   [clojure.java.io :as io]
+   [clojure.string :as str]
+   [lambdaisland.classpath :as licp]
+   [lambdaisland.launchpad.log :as log]
+   [shadow.cljs.devtools.api :as api]
+   [shadow.cljs.devtools.config :as config]
+   [shadow.cljs.devtools.server :as server]
+   [shadow.cljs.devtools.server.runtime :as runtime])
   (:import (java.nio.file Path)))
 
 (def process-root
@@ -53,61 +56,73 @@
   "Given multiple locations that contain a shadow-cljs.edn, merge them into a
   single config, where the path locations have been updated."
   [module-paths]
-  (-> (apply
-       merge-with
-       (fn [a b]
-         (cond
-           (and (map? a) (map? b))
-           (merge a b)
-           (and (set? a) (set? b))
-           (into a b)
-           :else
-           b))
-       (for [module-path module-paths
-             :let [module-root (.toAbsolutePath (Path/of module-path (into-array String [])))
-                   config-file (str (.resolve module-root "shadow-cljs.edn"))
-                   module-name (str (.getFileName module-root))]]
-         (-> config-file
-             read-shadow-config
-             (update
-              :builds
-              (fn [builds]
-                (into {}
-                      (map (fn [[k v]]
-                             (let [build-id k
-                                   ;; Not sure yet if this is a good idea
-                                   #_(if (qualified-keyword? k)
-                                       k
-                                       (keyword module-name (name k)))]
-                               [build-id
-                                (assoc (update-build-keys process-root module-root v)
-                                       :build-id build-id
-                                       :js-options (if (= "" module-path)
-                                                     {}
-                                                     {:js-package-dirs [(str module-path "/node_modules")]}))])))
+  (let [modules
+        (for [module-path module-paths
+              :let [module-root (.toAbsolutePath (Path/of module-path (into-array String [])))
+                    config-file (str (.resolve module-root "shadow-cljs.edn"))
+                    module-name (str (.getFileName module-root))]]
+          {:module-path module-path
+           :module-root module-root
+           :config-file config-file
+           :module-name module-name
+           :config (read-shadow-config config-file)})]
+    (doseq [[build-id modules]
+            (group-by :build-id (for [{:keys [config module-name]} modules
+                                      [build-id] (:builds config)]
+                                  {:build-id build-id
+                                   :module-name module-name}))
+            :when (< 1 (count modules))]
+      (log/warn "Shadow-cljs build-id conflict:" build-id "used in" (str/join ", " (map :module-name modules)) ". Ensure build-ids are unique to prevent issues."))
+    (-> (apply
+         merge-with
+         (fn [a b]
+           (cond
+             (and (map? a) (map? b))
+             (merge a b)
+             (and (set? a) (set? b))
+             (into a b)
+             :else
+             b))
+         (for [{:keys [config module-root module-path]} modules]
+           (update
+            config
+            :builds
+            (fn [builds]
+              (into {}
+                    (map (fn [[k v]]
+                           (let [build-id k
+                                 ;; Not sure yet if this is a good idea
+                                 #_(if (qualified-keyword? k)
+                                     k
+                                     (keyword module-name (name k)))]
+                             [build-id
+                              (assoc (update-build-keys process-root module-root v)
+                                     :build-id build-id
+                                     :js-options (if (= "" module-path)
+                                                   {}
+                                                   {:js-package-dirs [(str module-path "/node_modules")]}))])))
 
-                      builds))))))
-      (assoc :deps {})
-      (dissoc :source-paths :dependencies)))
+                    builds)))))
+        (assoc :deps {})
+        (dissoc :source-paths :dependencies))))
 
 (defn merged-config
   "Return a complete, combined, shadow-cljs config map, that combines all
   shadow-cljs.edn files found in projects that were references via :local/root."
   []
   (merged-shadow-config (find-shadow-roots)))
 
-(defn start-builds! [& build-ids]
+(defn start-builds! [config & build-ids]
   (when (nil? @runtime/instance-ref)
-    (let [config (merged-config)]
-      (server/start! config)
-      (doseq [build-id build-ids]
-        (-> (get-in config [:builds build-id])
-            (assoc :build-id build-id)
-            api/watch))
-      (loop []
-        (when (nil? @runtime/instance-ref)
-          (Thread/sleep 250)
-          (recur))))))
+    (server/start! config)
+    (doseq [build-id build-ids]
+      (-> (get-in config [:builds build-id])
+          (assoc :build-id build-id)
+          api/watch))
+    (loop []
+      (when (nil? @runtime/instance-ref)
+        (Thread/sleep 250)
+        (recur)))))
 
 #_(start-builds :main)
 #_(require 'shadow.build)

src/lambdaisland/launchpad/watcher.clj

@@ -5,15 +5,17 @@
   specific directories. This can be done with [[watch!]], which will start the
   minimum number of watchers to cover all directories, and will dispatch to the
   right handler based on the changed file."
-  (:require [nextjournal.beholder :as beholder]
-            [clojure.java.io :as io])
-  (:import java.util.regex.Pattern
-           java.nio.file.LinkOption
-           java.nio.file.Files
-           java.nio.file.Paths
-           java.nio.file.Path
-           java.io.File
-           io.methvin.watcher.DirectoryWatcher))
+  (:require
+   [nextjournal.beholder :as beholder]
+   [clojure.java.io :as io])
+  (:import
+   java.util.regex.Pattern
+   java.nio.file.LinkOption
+   java.nio.file.Files
+   java.nio.file.Paths
+   java.nio.file.Path
+   java.io.File
+   io.methvin.watcher.DirectoryWatcher))
 
 (defonce handlers (atom nil))
 (defonce watchers (atom nil))