Version 1.3.0.

The version number is now derived from package.json.

UglifyJS and D3 dependencies have also been updated.

Makefile

@@ -1,12 +1,8 @@
-JS_TESTER = ./node_modules/vows/bin/vows
-JS_UGLIFY = ./node_modules/uglify-js/bin/uglifyjs
-
 .PHONY: test benchmark
 
-all: crossfilter.min.js package.json
+all: crossfilter.min.js
 
 crossfilter.js: \
-	src/version.js \
 	src/identity.js \
 	src/permute.js \
 	src/bisect.js \
@@ -24,25 +20,21 @@ crossfilter.js: \
 
 %.min.js: %.js Makefile
 	@rm -f $@
-	$(JS_UGLIFY) $< -c -m -o $@
+	node_modules/.bin/uglifyjs $< -c unsafe=true -m -o $@
 
 %.js:
 	@rm -f $@
 	@echo '(function(exports){' > $@
+	@echo 'crossfilter.version = "'$(shell node -p 'require("./package.json").version')'";' >> $@
 	cat $(filter %.js,$^) >> $@
 	@echo '})(this);' >> $@
 	@chmod a-w $@
 
-package.json: crossfilter.js src/package.js
-	@rm -f $@
-	node src/package.js > $@
-	@chmod a-w $@
-
 clean:
-	rm -f crossfilter.js crossfilter.min.js package.json
+	rm -f crossfilter.js crossfilter.min.js
 
 test: all
-	@$(JS_TESTER)
+	@npm test
 
 benchmark: all
 	@node test/benchmark.js

crossfilter.js

@@ -1,5 +1,5 @@
 (function(exports){
-crossfilter.version = "1.2.0";
+crossfilter.version = "1.3.0";
 function crossfilter_identity(d) {
   return d;
 }
@@ -1182,6 +1182,7 @@ function crossfilter() {
       return g;
     }
 
+    // Removes this dimension and associated groups and event listeners.
     function dispose() {
       dimensionGroups.forEach(function(group) { group.dispose(); });
       var i = dataListeners.indexOf(preAdd);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "crossfilter",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Fast multidimensional filtering for coordinated views.",
   "keywords": [
     "square",
@@ -30,9 +30,9 @@
     "url": "http://github.com/square/crossfilter.git"
   },
   "devDependencies": {
-    "d3": "3.0.x",
+    "d3": "3.3",
     "vows": "0.7.0",
-    "uglify-js": "git://github.com/mishoo/UglifyJS2.git#aebafad4"
+    "uglify-js": "2.4.0"
   },
   "scripts": {
     "test": "./node_modules/.bin/vows"

src/crossfilter.js

@@ -667,6 +667,7 @@ function crossfilter() {
       return g;
     }
 
+    // Removes this dimension and associated groups and event listeners.
     function dispose() {
       dimensionGroups.forEach(function(group) { group.dispose(); });
       var i = dataListeners.indexOf(preAdd);