File tree Expand file tree Collapse file tree 5 files changed +20
-8
lines changed Expand file tree Collapse file tree 5 files changed +20
-8
lines changed Original file line number Diff line number Diff line change 2
2
(:require [goog.dom :as gdom]
3
3
[goog.events :as events]
4
4
[cljs.loader :as loader]
5
- ; [my. foreign]
6
- )
5
+ [ foreign.a ]
6
+ [foreign.b] )
7
7
(:import [goog.events EventType]))
8
8
9
9
(enable-console-print! )
Load Diff This file was deleted.
Original file line number Diff line number Diff line change
1
+ global . foreignA = function ( ) {
2
+ console . log ( "I'm foreign!" )
3
+ } ;
Original file line number Diff line number Diff line change
1
+ global . foreignB = function ( ) {
2
+ console . log ( "I'm foreign too!" ) ;
3
+ } ;
Original file line number Diff line number Diff line change 186
186
{:output-dir output-dir
187
187
:optimizations :none
188
188
:verbose true
189
- ; :foreign-libs [{:file "loader_test/foreign.js"
190
- ; :provides ["my.foreign"]}]
189
+ :foreign-libs [{:file " src/test/cljs_build/loader_test/foreignA.js"
190
+ :provides [" foreign.a" ]}
191
+ {:file " src/test/cljs_build/loader_test/foreignB.js"
192
+ :provides [" foreign.b" ]
193
+ :requires [" foreign.a" ]}]
191
194
:modules
192
195
{:foo
193
196
{:output-to (str (io/file output-dir " foo.js" ))
213
216
(test/delete-out-files out)
214
217
(let [{:keys [inputs opts]} (merge-with merge (loader-test-project out)
215
218
{:opts {:optimizations :whitespace }})]
216
- (build/build (build/inputs inputs) opts)))))
219
+ (build/build (build/inputs inputs) opts)))
220
+ (testing " CLJS-2309 foreign libs order preserved"
221
+ (test/delete-out-files out)
222
+ (let [{:keys [inputs opts]} (merge-with merge (loader-test-project out)
223
+ {:opts {:optimizations :advanced }})]
224
+ (build/build (build/inputs inputs) opts)
225
+ (is (not (nil? (re-find #"foreignA[\s\S ]+foreignB" (slurp (io/file out " foo.js" ))))))))))
217
226
218
227
(deftest test-npm-deps
219
228
(test/delete-node-modules )
You can’t perform that action at this time.
0 commit comments