File tree Expand file tree Collapse file tree 2 files changed +10
-13
lines changed Expand file tree Collapse file tree 2 files changed +10
-13
lines changed Original file line number Diff line number Diff line change 1114
1114
(not (false ? (:static-fns opts))))
1115
1115
(assoc opts :static-fns true )
1116
1116
opts)]
1117
- (if (requires-compilation? src-file dest-file opts)
1117
+ (if (or (requires-compilation? src-file dest-file opts)
1118
+ (:force opts))
1118
1119
(do
1119
1120
(util/mkdirs dest-file)
1120
1121
(when (and (get-in nses [ns :defs ])
1121
- (not= ns 'cljs.core))
1122
+ (not= 'cljs.core ns )
1123
+ (not= :interactive (:mode opts)))
1122
1124
(swap! env/*compiler* update-in [::ana/namespaces ] dissoc ns ))
1123
1125
(let [ret (compile-file* src-file dest-file opts)]
1124
1126
(when *dependents*
Original file line number Diff line number Diff line change 492
492
(util/url? f) f
493
493
(.exists (io/file f)) (io/file f)
494
494
:else (io/resource f))
495
- compiled (cljsc/compile src
496
- (assoc opts
497
- :output-file
498
- (cljsc/src-file->target-file src)))]
495
+ compiled (binding [ana/*reload-macros* true ]
496
+ (cljsc/compile src
497
+ (assoc opts
498
+ :output-file (cljsc/src-file->target-file src)
499
+ :force true
500
+ :mode :interactive )))]
499
501
; ; copy over the original source file if source maps enabled
500
502
(when-let [ns (and (:source-map opts) (first (:provides compiled)))]
501
503
(spit
504
506
(slurp src)))
505
507
; ; need to load dependencies first
506
508
(load-dependencies repl-env (:requires compiled) opts)
507
- ; ; remove the ns to get :reload semantics
508
- (ana-api/remove-ns (:ns (ana/parse-ns src)))
509
- ; ; make sure it's been analyzed, this is because if it's already compiled
510
- ; ; cljs.compiler/compile-file won't do anything, good for builds,
511
- ; ; but a bit annoying here
512
- (binding [ana/*reload-macros* true ]
513
- (ana/analyze-file src opts))
514
509
(-evaluate repl-env f 1 (cljsc/add-dep-string opts compiled))
515
510
(-evaluate repl-env f 1
516
511
(cljsc/src-file->goog-require src {:wrap true :reload true })))
You can’t perform that action at this time.
0 commit comments