2 files changed, 15 insertions, 8 deletions
diff --git a/node_modules/ajv/scripts/bundle.js b/node_modules/ajv/scripts/bundle.js
index b3a9890c5..e381a762d 100644
--- a/node_modules/ajv/scripts/bundle.js
+++ b/node_modules/ajv/scripts/bundle.js
@@ -29,8 +29,6 @@ browserify(bOpts)
   }
 
   var outputFile = path.join(distDir, json.name);
-  var outputBundle = outputFile + '.bundle.js';
-  fs.writeFileSync(outputBundle, buf);
   var uglifyOpts = {
     warnings: true,
     compress: {},
@@ -40,15 +38,24 @@ browserify(bOpts)
   };
   if (compress) {
     var compressOpts = compress.split(',');
-    for (var i=0; i<compressOpts.length; ++i) {
+    for (var i=0, il = compressOpts.length; i<il; ++i) {
       var pair = compressOpts[i].split('=');
       uglifyOpts.compress[pair[0]] = pair.length < 1 || pair[1] != 'false';
     }
   }
-  if (standalone) uglifyOpts.outSourceMap = json.name + '.min.js.map';
+  if (standalone) {
+    uglifyOpts.sourceMap = {
+      filename: json.name + '.min.js',
+      url: json.name + '.min.js.map'
+    };
+  }
 
-  var result = uglify.minify(outputBundle, uglifyOpts);
+  var result = uglify.minify(buf.toString(), uglifyOpts);
   fs.writeFileSync(outputFile + '.min.js', result.code);
   if (result.map) fs.writeFileSync(outputFile + '.min.js.map', result.map);
-  if (!standalone) fs.unlinkSync(outputBundle);
+  if (standalone) fs.writeFileSync(outputFile + '.bundle.js', buf);
+  if (result.warnings) {
+    for (var j=0, jl = result.warnings.length; j<jl; ++j)
+      console.warn('UglifyJS warning:', result.warnings[j]);
+  }
 });
diff --git a/node_modules/ajv/scripts/compile-dots.js b/node_modules/ajv/scripts/compile-dots.js
index e6a27dc39..5a21a7ddd 100644
--- a/node_modules/ajv/scripts/compile-dots.js
+++ b/node_modules/ajv/scripts/compile-dots.js
@@ -26,7 +26,7 @@ console.log('\n\nCompiling:');
 
 var FUNCTION_NAME = /function\s+anonymous\s*\(it[^)]*\)\s*{/;
 var OUT_EMPTY_STRING = /out\s*\+=\s*'\s*';/g;
-var ISTANBUL = /\'(istanbul[^']+)\';/g;
+var ISTANBUL = /'(istanbul[^']+)';/g;
 var ERROR_KEYWORD = /\$errorKeyword/g;
 var ERROR_KEYWORD_OR = /\$errorKeyword\s+\|\|/g;
 var VARS = [
@@ -42,7 +42,7 @@ files.forEach(function (f) {
   var code = doT.compile(template, defs);
   code = code.toString()
              .replace(OUT_EMPTY_STRING, '')
-             .replace(FUNCTION_NAME, 'function generate_' + keyword + '(it, $keyword) {')
+             .replace(FUNCTION_NAME, 'function generate_' + keyword + '(it, $keyword, $ruleType) {')
              .replace(ISTANBUL, '/* $1 */');
   removeAlwaysFalsyInOr();
   VARS.forEach(removeUnusedVar);