Changed templating-tools to require uglify-js from NPM

packages/spacebars-compiler/.npm/package/.gitignore

@@ -0,0 +1 @@
+node_modules

packages/spacebars-compiler/.npm/package/README

@@ -0,0 +1,7 @@
+This directory and the files immediately inside it are automatically generated
+when you change this package's NPM dependencies. Commit the files in this
+directory (npm-shrinkwrap.json, .gitignore, and this README) to source control
+so that others run the same versions of sub-dependencies.
+
+You should NOT check in the node_modules directory that Meteor automatically
+creates; if you are using git, the .gitignore file tells git to ignore it.

packages/spacebars-compiler/compile_tests.js

@@ -25,6 +25,11 @@ Tinytest.add("spacebars-compiler - compiler output", function (test) {
           // but let's at least do some sort of test without it.
           // These regexes may have to be adjusted if new tests are added.
 
+          // ======================== !!NOTE!! =================================
+          // Since we are bringing uglify-js in from NPM, this code should no
+          // longer ever be needed. Leaving it just in case.
+          // ==================================+================================
+
           // Remove single-line comments, including line nums from build system.
           string = string.replace(/\/\/.*$/mg, '');
           string = string.replace(/\s+/g, ''); // kill whitespace
@@ -47,7 +52,6 @@ coffee = {
   runCompilerOutputTests: null // implemented in compiler_output_tests.coffee
 };
 
-
 Tinytest.add("spacebars-compiler - compiler errors", function (test) {
 
   var getError = function (input) {

packages/spacebars-compiler/compiler.js

@@ -1,3 +1,4 @@
+var UglifyJSMinify = Npm.require('uglify-js').minify;
 
 SpacebarsCompiler.parse = function (input) {
 
@@ -95,22 +96,20 @@ SpacebarsCompiler.codeGen = function (parseTree, options) {
 };
 
 SpacebarsCompiler._beautify = function (code) {
-  if (Package['minifier-js'] && Package['minifier-js'].UglifyJSMinify) {
-    var result = Package['minifier-js'].UglifyJSMinify(
-      code,
-      { fromString: true,
-        mangle: false,
-        compress: false,
-        output: { beautify: true,
-                  indent_level: 2,
-                  width: 80 } });
-    var output = result.code;
-    // Uglify interprets our expression as a statement and may add a semicolon.
-    // Strip trailing semicolon.
-    output = output.replace(/;$/, '');
-    return output;
-  } else {
-    // don't actually beautify; no UglifyJS
-    return code;
-  }
+  var result = UglifyJSMinify(code, { 
+    fromString: true,
+    mangle: false,
+    compress: false,
+    output: { 
+      beautify: true,
+      indent_level: 2,
+      width: 80
+    }
+  });
+
+  var output = result.code;
+  // Uglify interprets our expression as a statement and may add a semicolon.
+  // Strip trailing semicolon.
+  output = output.replace(/;$/, '');
+  return output;
 };

packages/spacebars-compiler/package.js

@@ -7,10 +7,6 @@ Package.describe({
 
 Package.onUse(function (api) {
   api.use('underscore@1.0.9');
-  // The templating plugin will pull in minifier-js, so that generated code will
-  // be beautified. But it's a weak dependency so that eg boilerplate-generator
-  // doesn't pull in the minifier.
-  api.use('minifier-js@1.2.14', ['server'], { weak: true });
 
   api.export('SpacebarsCompiler');
 
@@ -25,6 +21,11 @@ Package.onUse(function (api) {
     'codegen.js',
     'compiler.js'
   ]);
+
+  // Pull in uglify-js from NPM
+  Npm.depends({
+    'uglify-js': '2.7.5'
+  });
 });
 
 Package.onTest(function (api) {
@@ -46,4 +47,8 @@ Package.onTest(function (api) {
     'compile_tests.js',
     'compiler_output_tests.coffee'
   ]);
+
+  Npm.depends({
+    'uglify-js': '2.7.5'
+  })
 });