Merge remote-tracking branch 'marked/master' into lint

Gulpfile.js

@@ -1,22 +0,0 @@
-var gulp = require('gulp');
-var uglify = require('gulp-uglify');
-var concat = require('gulp-concat');
-
-var preserveFirstComment = function() {
-  var set = false;
-
-  return function() {
-     if (set) return false;
-     set = true;
-     return true;
-  };
-};
-
-gulp.task('uglify', function() {
-  gulp.src('lib/marked.js')
-    .pipe(uglify({preserveComments: preserveFirstComment()}))
-    .pipe(concat('marked.min.js'))
-    .pipe(gulp.dest('.'));
-});
-
-gulp.task('default', ['uglify']);

package.json

@@ -31,17 +31,15 @@
     "eslint-plugin-standard": "^3.0.1",
     "front-matter": "^2.3.0",
     "glob-to-regexp": "0.3.0",
-    "gulp": "^3.8.11",
-    "gulp-concat": "^2.5.2",
-    "gulp-uglify": "^1.1.0",
     "markdown": "*",
     "markdown-it": "*",
-    "showdown": "*"
+    "showdown": "*",
+    "uglify-js": "^3.3.10"
   },
   "scripts": {
     "test": "node test",
     "bench": "node test --bench",
-    "build": "gulp",
-    "lint": "eslint --fix lib/marked.js test/index.js"
+    "lint": "eslint --fix lib/marked.js test/index.js",
+    "build": "uglifyjs lib/marked.js -cm  --comments /Copyright/ -o marked.min.js"
   }
 }

test/index.js

@@ -14,7 +14,8 @@ var fs = require('fs'),
     path = require('path'),
     fm = require('front-matter'),
     g2r = require('glob-to-regexp'),
-    marked = require('../');
+    marked = require('../'),
+    markedMin = require('../marked.min.js');
 
 /**
  * Load Tests
@@ -488,6 +489,10 @@ function parseArg() {
       case '--time':
         options.time = true;
         break;
+      case '-m':
+      case '--minified':
+        options.minified = true;
+        break;
       case '--glob':
         arg = argv.shift();
         options.glob = arg.replace(/^=/, '');
@@ -552,6 +557,9 @@ function main(argv) {
     return time(opt);
   }
 
+  if (opt.minified) {
+    marked = markedMin;
+  }
   return runTests(opt);
 }