Skip to content

Fix up missing "sources" in advanced compiled source map #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix up missing "sources" in advanced compiled source map #251

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions src/main/clojure/cljs/closure.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1389,11 +1389,12 @@
(let [source (first sources)]
(recur
(next sources)
(let [{:keys [provides source-url]} source]
(if (and provides source-url)
(let [{:keys [provides]} source
url (or (:source-url source) (:url source))]
(if (and provides url)
(assoc relpaths
(.getPath ^URL source-url)
(util/ns->relpath (first provides) (util/ext source-url)))
(.getPath ^URL url)
(util/ns->relpath (first provides) (util/ext url)))
relpaths))
(if-let [url (:url source)]
(let [path (.getPath ^URL url)]
Expand All @@ -1410,19 +1411,19 @@
(spit
(io/file name)
(sm/encode merged
{:preamble-line-count (+ (:preamble-line-count opts 0)
(:foreign-deps-line-count opts 0))
:lines (+ (:lineCount sm-json)
(:preamble-line-count opts 0)
(:foreign-deps-line-count opts 0)
2)
:file name
:output-dir (util/output-directory opts)
:source-map (:source-map opts)
:source-map-path (:source-map-path opts)
:source-map-timestamp (:source-map-timestamp opts)
{:preamble-line-count (+ (:preamble-line-count opts 0)
(:foreign-deps-line-count opts 0))
:lines (+ (:lineCount sm-json)
(:preamble-line-count opts 0)
(:foreign-deps-line-count opts 0)
2)
:file name
:output-dir (util/output-directory opts)
:source-map (:source-map opts)
:source-map-path (:source-map-path opts)
:source-map-timestamp (:source-map-timestamp opts)
:source-map-pretty-print (:source-map-pretty-print opts)
:relpaths relpaths}))))))
:relpaths relpaths}))))))

(defn write-variable-maps [^Result result opts]
(let [var-out (:closure-variable-map-out opts)]
Expand Down