Skip to content

Commit c66e138

Browse files
anmonteiroswannodette
authored andcommitted
CLJS-2322: Require only @cljs-oss/module-deps to be installed to figure out Node.js dep graph
1 parent 86b482a commit c66e138

File tree

4 files changed

+9
-15
lines changed

4 files changed

+9
-15
lines changed

src/main/clojure/cljs/build/api.clj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,8 @@
275275
(defn node-inputs
276276
"EXPERIMENTAL: return the foreign libs entries as computed by running
277277
the module-deps package on the supplied JavaScript entry points. Assumes
278-
that the `@cljs-oss/module-deps`, `enhanced-resolve` and `konan` NPM packages
279-
are either locally or globally installed."
278+
that the `@cljs-oss/module-deps` NPM package is either locally or globally
279+
installed."
280280
[entries]
281281
(closure/node-inputs entries))
282282

src/main/clojure/cljs/closure.clj

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2137,8 +2137,7 @@
21372137
(when-not (.exists pkg-json)
21382138
(spit pkg-json "{}"))
21392139
(let [proc (-> (ProcessBuilder.
2140-
(into (cond->> ["npm" "install" "@cljs-oss/module-deps"
2141-
"enhanced-resolve" "resolve" "konan"]
2140+
(into (cond->> ["npm" "install" "@cljs-oss/module-deps"]
21422141
util/windows? (into ["cmd" "/c"]))
21432142
(map (fn [[dep version]] (str (name dep) "@" version)))
21442143
npm-deps))
@@ -2162,8 +2161,8 @@
21622161
(defn node-module-deps
21632162
"EXPERIMENTAL: return the foreign libs entries as computed by running
21642163
the module-deps package on the supplied JavaScript entry point. Assumes
2165-
that the `@cljs-oss/module-deps`, `enhanced-resolve`, `enhanced-resolve` and
2166-
`konan` NPM packages are either locally or globally installed."
2164+
that the `@cljs-oss/module-deps` NPM package is either locally or globally
2165+
installed."
21672166
([entry]
21682167
(node-module-deps entry
21692168
(when env/*compiler*
@@ -2202,8 +2201,8 @@
22022201
(defn node-inputs
22032202
"EXPERIMENTAL: return the foreign libs entries as computed by running
22042203
the module-deps package on the supplied JavaScript entry points. Assumes
2205-
that the `@cljs-oss/module-deps`, `enhanced-resolve` and `konan` NPM packages
2206-
are either locally or globally installed."
2204+
that the `@cljs-oss/module-deps` NPM package is either locally or globally
2205+
installed."
22072206
([entries]
22082207
(node-inputs entries
22092208
(when env/*compiler*

src/test/clojure/cljs/build_api_tests.clj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -427,9 +427,7 @@
427427
(test/delete-node-modules)
428428
(.delete (io/file "package-lock.json"))
429429
(spit (io/file "package.json") (json/json-str {:dependencies {:left-pad "1.1.3"}
430-
:devDependencies {"@cljs-oss/module-deps" "*"
431-
:konan "*"
432-
:enhanced-resolve "*"}}))
430+
:devDependencies {"@cljs-oss/module-deps" "*"}}))
433431
(apply sh/sh (cond->> ["npm" "install"]
434432
util/windows? (into ["cmd" "/c"])))
435433
(let [ws (atom [])

src/test/clojure/cljs/closure_tests.clj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,7 @@
244244
(test/delete-out-files out)))
245245

246246
(deftest test-cljs-2315
247-
(spit (io/file "package.json") (json/json-str {:devDependencies {"@cljs-oss/module-deps" "*"
248-
:konan "*"
249-
:resolve "*"
250-
:enhanced-resolve "*"}}))
247+
(spit (io/file "package.json") (json/json-str {:devDependencies {"@cljs-oss/module-deps" "*"}}))
251248
(apply sh/sh (cond->> ["npm" "install"]
252249
util/windows? (into ["cmd" "/c"])))
253250
(let [file (io/file (test/tmp-dir) "cljs-2315-inputs.js")

0 commit comments

Comments
 (0)