fix(uglify): stick with uglify-js which is the one that stays updated

Author: thepian

lib/client/bundler/index.js

@@ -8,7 +8,7 @@ var fs = require('fs'),
     CleanCSS = require('clean-css'),
     system = require('../system'),
     magicPath = require('../magic_path'),
-    uglifyjs = require('uglify-js2');
+    uglifyjs = require('uglify-js');
 
 /**
  * {const|local|start|lib|mod} AssetType

package.json

@@ -38,14 +38,15 @@
     "escape-html": "1.0.2",
     "eventemitter2": "= 0.4.14",
     "express-session": "1.11.3",
+    "minimatch": "2.0.10",
     "orchestrator": "0.3.7",
     "parseurl": "1.3.0",
     "redis": "0.12.1",
     "send": "0.13.0",
     "serve-favicon": "2.3.0",
     "serve-static": "1.10.0",
     "shortid": "2.2.2",
-    "uglify-js2": "2.1.11",
+    "uglify-js": "2.4.24",
     "uid2": "0.0.3",
     "utils-merge": "1.0.0"
   },
@@ -101,6 +102,5 @@
   },
   "bin": {
     "socketstream": "./bin/socketstream"
-  },
-  "license":"MIT"
+  }
 }

test/unit/client/formatters.test.js

@@ -174,8 +174,8 @@ var ss      = require( '../../fixtures/socketstream'),
         logHook.on();
         ss.api.bundler.packAssetSet('js', client,
           function(files) {
-            files[3].content.should.equal('require.define("/client/abc/index",function(){window.a="formatter index.a"});');
-            // var outs = 
+            files[3].content.should.equal('require.define("/client/abc/index",function(e,i,n,a,d){window.a="formatter index.a"});');
+            // var outs =
             logHook.off();
             //outs.should.match(/Minified .\/abc\/index.a from 0.121 KB to 0.076 KB/);
           },