Skip to content

Commit 2094974

Browse files
authored
Merge pull request #18 from ovistoica/main
fix: preserve per-build :js-options in merged-shadow-config
2 parents 9ac09aa + acf2bc0 commit 2094974

2 files changed

Lines changed: 12 additions & 5 deletions

File tree

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44

55
## Fixed
66

7+
- Preserve per-build `:js-options` in `merged-shadow-config`. Previously the
8+
root project's builds had their `:js-options` unconditionally replaced with
9+
`{}`, which clobbered settings like `:js-provider :external` and
10+
`:external-index`. Now the root project's `:js-options` are left untouched,
11+
and submodule builds get `:js-package-dirs` merged into their existing
12+
`:js-options` rather than replacing them.
13+
714
## Changed
815

916
# 0.47.210-alpha (2026-03-02 / 54388ed)

src/lambdaisland/launchpad/shadow.clj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@
9696
k
9797
(keyword module-name (name k)))]
9898
[build-id
99-
(assoc (update-build-keys process-root module-root v)
100-
:build-id build-id
101-
:js-options (if (= "" module-path)
102-
{}
103-
{:js-package-dirs [(str module-path "/node_modules")]}))])))
99+
(cond-> (update-build-keys process-root module-root v)
100+
true
101+
(assoc :build-id build-id)
102+
(not= "" module-path)
103+
(update :js-options merge {:js-package-dirs [(str module-path "/node_modules")]}))])))
104104

105105
builds)))))
106106
(assoc :deps {})

0 commit comments

Comments
 (0)