Skip to content

Commit e752b94

Browse files
committed
CLJS-1097: source map url for AOTed cljs.core is wrong
Allow supplying custom :source-map-url to cljs.compiler/compile-file* Rewrite source map JSON "file" for core to be the correct value according to build options
1 parent fe28e87 commit e752b94

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

src/clj/cljs/closure.clj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1580,6 +1580,7 @@ should contain the source for the given namespace name."
15801580
(env/with-compiler-env (env/default-compiler-env)
15811581
(comp/compile-file src dest
15821582
{:source-map true
1583+
:source-map-url "core.js.map"
15831584
:output-dir (str "src" File/separator "cljs")})
15841585
(ana/write-analysis-cache 'cljs.core cache))))
15851586

src/clj/cljs/compiler.clj

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
[cljs.env :as env]
1616
[cljs.tagged-literals :as tags]
1717
[cljs.analyzer :as ana]
18-
[cljs.source-map :as sm])
18+
[cljs.source-map :as sm]
19+
[clojure.data.json :as json])
1920
(:import java.lang.StringBuilder
2021
java.io.File))
2122

@@ -989,7 +990,11 @@
989990
(spit dest (slurp cached))
990991
(when (true? (:source-map opts))
991992
(spit (io/file (str dest ".map"))
992-
(slurp (io/resource "cljs/core.aot.js.map"))))
993+
(json/write-str
994+
(assoc
995+
(json/read-str (slurp (io/resource "cljs/core.aot.js.map")))
996+
"file"
997+
(str (io/file (util/output-directory opts) "cljs" "core.js"))))))
993998
(ana/parse-ns src dest nil))
994999
(with-open [out ^java.io.Writer (io/make-writer dest {})]
9951000
(binding [*out* out
@@ -1028,7 +1033,8 @@
10281033
{:source-map (:source-map sm-data)}))]
10291034
(when (and sm-data (= (:optimizations opts) :none))
10301035
(let [sm-file (io/file (str (.getPath ^File dest) ".map"))]
1031-
(emits "\n//# sourceMappingURL=" (.getName sm-file)
1036+
(emits "\n//# sourceMappingURL="
1037+
(or (:source-map-url opts) (.getName sm-file))
10321038
(if (true? (:source-map-timestamp opts))
10331039
(str "?rel=" (System/currentTimeMillis))
10341040
""))

0 commit comments

Comments
 (0)