new Makefile to meet jslibrary scheme

Makefile

@@ -3,21 +3,40 @@ LIBRARY_NAME := $(if $(LIBRARY_NAME),$(LIBRARY_NAME),$(current_dir))
 DIST_FOLDER := $(if $(DIST_FOLDER),$(DIST_FOLDER),dist)
 FILENAME = $(DIST_FOLDER)/$(LIBRARY_NAME)
 
+DEPENDS =
+DEPENDS_FOLDER = ./depends
+DEP_FILES = $(foreach fd, $(DEPENDS), $(DEPENDS_FOLDER)/$(fd)/dist/$(fd).module.js)
+
 PRE = 
 POST = 
 FILES = src/*.js
 
-build: rawfile
+build: rawfile depends
+	mkdir -p $(DIST_FOLDER)
+	cat $(DEP_FILES) $(FILENAME).raw.js | uglifyjs -e exports:window | js-beautify -t -s 1 -m 1 -j -n | cat notice - > $(FILENAME).full.js
+	cat $(DEP_FILES) $(FILENAME).raw.js | uglifyjs -e exports:window -b | js-beautify -t -s 1 -m 1 -j -n | cat notice - > $(FILENAME).js
+	cat $(DEP_FILES) $(FILENAME).raw.js | uglifyjs -e exports:window --toplevel --module -m | cat notice.min - > $(FILENAME).min.js
+	cat $(DEP_FILES) $(FILENAME).raw.js | uglifyjs -e exports:window --compress passes=3,dead_code=true,toplevel=true --toplevel --module -m -- | cat notice.min - > $(FILENAME).compress.js
+
+module: rawfile depends
 	mkdir -p $(DIST_FOLDER)
-	cat $(FILENAME).raw.js | uglifyjs -e window,document:window,document | js-beautify -t -s 1 -m 1 -j -n | cat notice - > $(FILENAME).full.js
-	cat $(FILENAME).raw.js | uglifyjs -e window,document:window,document -b | js-beautify -t -s 1 -m 1 -j -n | cat notice - > $(FILENAME).js
-	cat $(FILENAME).raw.js | uglifyjs -e window,document:window,document --toplevel --module -m | cat notice.min - > $(FILENAME).min.js
-	cat $(FILENAME).raw.js | uglifyjs -e window,document:window,document --compress passes=3,dead_code=true,toplevel=true --toplevel --module -m -- | cat notice.min - > $(FILENAME).compress.js
+	( cat notice; echo 'if (typeof imports === "undefined") { var imports = {}; }' ; cat $(DEP_FILES) $(FILENAME).raw.js | uglifyjs -e exports:imports | js-beautify -t -s 1 -m 1 -j -n ) > $(FILENAME).module.js
 
 rawfile: $(FILES) $(PRE) $(POST)
 	mkdir -p $(DIST_FOLDER)
 	cat $(PRE) $(FILES) $(POST) > $(FILENAME).raw.js
 
+depends: $(DEPENDS)
+	echo $(DEPENDS) $(DEP_FILES)
+
 clean:
-	rm -f $(FILENAME).raw.js $(FILENAME).full.js $(FILENAME).min.js $(FILENAME).js $(FILENAME).compress.js
-	if [ -d $(DIST_FOLDER) ] && [ -z "$(ls -A $(DIST_FOLDER))" ]; then rm -r $(DIST_FOLDER); fi
+	rm -f $(FILENAME).raw.js $(FILENAME).full.js $(FILENAME).min.js $(FILENAME).js $(FILENAME).compress.js $(FILENAME).module.js
+	if [ -d $(DIST_FOLDER) ] && [ -z "$(ls -A $(DIST_FOLDER))" ]; then rm -r $(DIST_FOLDER); fi
+
+cleanall: clean
+	for fd in $(DEPENDS); do $(MAKE) -C $(DEPENDS_FOLDER)/$$fd clean; done
+
+$(DEPENDS): FORCE
+	$(MAKE) -C $(DEPENDS_FOLDER)/$@ module
+
+FORCE:

dist/dom2object.full.js

@@ -22,7 +22,9 @@
     SOFTWARE.
 */
 
-(function (window, document) {
+(function (exports) {
+	"use strict";
+
 	function DOMToObject(el, acquireChildrenFromAnonymous = false) {
 		if (typeof el === "string") {
 			el = document.querySelector(el)
@@ -98,6 +100,7 @@
 						acquireChildren(proxy)
 					}
 				}
+				return true
 			}
 		});
 		acquireChildren(proxy);
@@ -119,4 +122,4 @@
 	};
 	DOMToObject.version = "0.9.0";
 	window.DOM2Object = DOMToObject
-})(window, document);
+})(window);

dist/dom2object.js

@@ -22,7 +22,9 @@
     SOFTWARE.
 */
 
-(function (window, document) {
+(function (exports) {
+	"use strict";
+
 	function DOMToObject(el, acquireChildrenFromAnonymous = false) {
 		if (typeof el === "string") {
 			el = document.querySelector(el);
@@ -98,6 +100,7 @@
 						acquireChildren(proxy);
 					}
 				}
+				return true;
 			}
 		});
 		acquireChildren(proxy);
@@ -119,4 +122,4 @@
 	};
 	DOMToObject.version = "0.9.0";
 	window.DOM2Object = DOMToObject;
-})(window, document);
+})(window);

dist/dom2object.raw.js

@@ -1,3 +1,5 @@
+"use strict";
+
 /**
  * Builds a Proxy for the given DOM element, so that it can be accessed as an object, but if each of the HTML elements has an id, it can be accessed by that id.
  *      e.g.
@@ -115,6 +117,7 @@ function DOMToObject(el, acquireChildrenFromAnonymous = false) {
                     acquireChildren(proxy);
                 }
             }
+            return true;
         }
     });