File tree Expand file tree Collapse file tree 1 file changed +17
-15
lines changed
Expand file tree Collapse file tree 1 file changed +17
-15
lines changed Original file line number Diff line number Diff line change 19951995 (string/includes? p' " _" )
19961996 (conj (string/replace p' " _" " -" )))))
19971997 (expand-lib* [{:keys [file] :as lib}]
1998- (let [root (.getAbsolutePath (io/file file))
1999- dir (io/file file)]
2000- (if (.isDirectory dir)
2001- (into []
2002- (comp
2003- (filter #(.endsWith (.getName ^File %) " .js" ))
2004- (filter #(not (.isHidden ^File %)))
2005- (map
2006- (fn [^File f]
2007- (let [p (.getPath f)
2008- ap (.getAbsolutePath f)]
2009- (merge lib
2010- {:file p :provides (path->provides (prep-path ap root))})))))
2011- (file-seq dir))
2012- [lib])))]
1998+ (if-not file
1999+ [] ; ; foreign-lib override case - David
2000+ (let [root (.getAbsolutePath (io/file file))
2001+ dir (io/file file)]
2002+ (if (.isDirectory dir)
2003+ (into []
2004+ (comp
2005+ (filter #(.endsWith (.getName ^File %) " .js" ))
2006+ (filter #(not (.isHidden ^File %)))
2007+ (map
2008+ (fn [^File f]
2009+ (let [p (.getPath f)
2010+ ap (.getAbsolutePath f)]
2011+ (merge lib
2012+ {:file p :provides (path->provides (prep-path ap root))})))))
2013+ (file-seq dir))
2014+ [lib]))))]
20132015 (into [] (mapcat expand-lib* libs))))
20142016
20152017(declare index-node-modules )
You can’t perform that action at this time.
0 commit comments