From 5f12d60d126eb2ddfd32270d0ab191d69a6fc485 Mon Sep 17 00:00:00 2001 From: Vadim Namniak Date: Tue, 5 May 2015 23:53:15 -0400 Subject: [PATCH] git ignore updates --- .gitignore | 2 +- CanvasTextWrapper.min.js | 2 +- node_modules/grunt-contrib-uglify/.jshintrc | 13 - node_modules/grunt-contrib-uglify/.npmignore | 4 - node_modules/grunt-contrib-uglify/.travis.yml | 6 - node_modules/grunt-contrib-uglify/AUTHORS | 3 - node_modules/grunt-contrib-uglify/CHANGELOG | 54 ++ .../grunt-contrib-uglify/CONTRIBUTING.md | 1 - .../grunt-contrib-uglify/Gruntfile.js | 260 ---------- node_modules/grunt-contrib-uglify/LICENSE-MIT | 22 - node_modules/grunt-contrib-uglify/README.md | 273 +++++++--- .../docs/uglify-examples.md | 212 -------- .../docs/uglify-options.md | 122 ----- .../docs/uglify-overview.md | 1 - .../node_modules/.bin/uglifyjs | 16 +- .../grunt-lib-contrib/.gitattributes | 1 - .../node_modules/grunt-lib-contrib/.jshintrc | 14 - .../node_modules/grunt-lib-contrib/.npmignore | 3 - .../grunt-lib-contrib/.travis.yml | 6 - .../node_modules/grunt-lib-contrib/AUTHORS | 4 - .../node_modules/grunt-lib-contrib/CHANGELOG | 47 -- .../grunt-lib-contrib/Gruntfile.js | 60 --- .../grunt-lib-contrib/LICENSE-MIT | 22 - .../node_modules/grunt-lib-contrib/README.md | 65 --- .../grunt-lib-contrib/lib/contrib.js | 111 ---- .../node_modules/zlib-browserify/.npmignore | 1 - .../node_modules/zlib-browserify/index.js | 43 -- .../node_modules/zlib-browserify/package.json | 37 -- .../node_modules/zlib-browserify/readme.md | 1 - .../zlib-browserify/test/zlib.test.js | 65 --- .../node_modules/zlib-browserify/zlib.js | 55 -- .../grunt-lib-contrib/package.json | 60 --- .../grunt-lib-contrib/test/lib_test.js | 233 --------- .../node_modules/uglify-js/.npmignore | 2 - .../node_modules/uglify-js/.travis.yml | 6 - .../node_modules/uglify-js/README.md | 275 +++++++--- .../node_modules/uglify-js/bin/uglifyjs | 161 ++++-- .../node_modules/uglify-js/lib/ast.js | 41 +- .../node_modules/uglify-js/lib/compress.js | 195 +++++-- .../node_modules/uglify-js/lib/mozilla-ast.js | 382 +++++++++++--- .../node_modules/uglify-js/lib/output.js | 78 ++- .../node_modules/uglify-js/lib/parse.js | 84 ++- .../node_modules/uglify-js/lib/scope.js | 52 +- .../node_modules/uglify-js/lib/sourcemap.js | 19 +- .../node_modules/uglify-js/lib/utils.js | 12 +- .../uglify-js/node_modules/async/package.json | 27 +- .../node_modules/optimist/.travis.yml | 4 - .../uglify-js/node_modules/optimist/LICENSE | 21 - .../node_modules/optimist/example/bool.js | 10 - .../optimist/example/boolean_double.js | 7 - .../optimist/example/boolean_single.js | 7 - .../optimist/example/default_hash.js | 8 - .../optimist/example/default_singles.js | 7 - .../node_modules/optimist/example/divide.js | 8 - .../optimist/example/line_count.js | 20 - .../optimist/example/line_count_options.js | 29 -- .../optimist/example/line_count_wrap.js | 29 -- .../node_modules/optimist/example/nonopt.js | 4 - .../node_modules/optimist/example/reflect.js | 2 - .../node_modules/optimist/example/short.js | 3 - .../node_modules/optimist/example/string.js | 11 - .../optimist/example/usage-options.js | 19 - .../node_modules/optimist/example/xup.js | 10 - .../uglify-js/node_modules/optimist/index.js | 478 ----------------- .../optimist/node_modules/wordwrap/.npmignore | 1 - .../node_modules/wordwrap/README.markdown | 70 --- .../node_modules/wordwrap/example/center.js | 10 - .../node_modules/wordwrap/example/meat.js | 3 - .../optimist/node_modules/wordwrap/index.js | 76 --- .../node_modules/wordwrap/package.json | 45 -- .../node_modules/wordwrap/test/break.js | 30 -- .../node_modules/wordwrap/test/idleness.txt | 63 --- .../node_modules/wordwrap/test/wrap.js | 31 -- .../node_modules/optimist/package.json | 46 -- .../node_modules/optimist/readme.markdown | 487 ------------------ .../uglify-js/node_modules/optimist/test/_.js | 71 --- .../node_modules/optimist/test/_/argv.js | 2 - .../node_modules/optimist/test/_/bin.js | 3 - .../node_modules/optimist/test/parse.js | 446 ---------------- .../node_modules/optimist/test/usage.js | 292 ----------- .../node_modules/amdefine/package.json | 23 +- .../node_modules/source-map/package.json | 32 +- .../uglify-to-browserify/package.json | 25 +- .../node_modules/uglify-js/package.json | 75 ++- .../uglify-js/test/compress/arrays.js | 74 --- .../uglify-js/test/compress/blocks.js | 49 -- .../uglify-js/test/compress/concat-strings.js | 22 - .../uglify-js/test/compress/conditionals.js | 234 --------- .../uglify-js/test/compress/dead-code.js | 89 ---- .../uglify-js/test/compress/debugger.js | 24 - .../uglify-js/test/compress/drop-unused.js | 165 ------ .../uglify-js/test/compress/issue-105.js | 25 - .../uglify-js/test/compress/issue-12.js | 11 - .../uglify-js/test/compress/issue-126.js | 24 - .../uglify-js/test/compress/issue-143.js | 48 -- .../uglify-js/test/compress/issue-22.js | 17 - .../uglify-js/test/compress/issue-267.js | 11 - .../uglify-js/test/compress/issue-269.js | 66 --- .../uglify-js/test/compress/issue-44.js | 31 -- .../uglify-js/test/compress/issue-59.js | 30 -- .../uglify-js/test/compress/labels.js | 163 ------ .../uglify-js/test/compress/loops.js | 123 ----- .../uglify-js/test/compress/negate-iife.js | 76 --- .../uglify-js/test/compress/properties.js | 54 -- .../uglify-js/test/compress/sequences.js | 163 ------ .../uglify-js/test/compress/switch.js | 260 ---------- .../uglify-js/test/compress/typeof.js | 25 - .../node_modules/uglify-js/test/run-tests.js | 179 ------- .../node_modules/uglify-js/tools/node.js | 84 ++- .../grunt-contrib-uglify/package.json | 89 +++- .../grunt-contrib-uglify/tasks/lib/uglify.js | 148 +++++- .../grunt-contrib-uglify/tasks/uglify.js | 126 +++-- .../test/fixtures/expected/comments.js | 12 - .../test/fixtures/expected/compress.js | 1 - .../test/fixtures/expected/compress_mangle.js | 1 - .../expected/compress_mangle_banner.js | 2 - .../expected/compress_mangle_beautify.js | 5 - .../expected/compress_mangle_except.js | 1 - .../expected/compress_mangle_sourcemap | 1 - .../test/fixtures/expected/enclose.js | 8 - .../test/fixtures/expected/exportAll.js | 1 - .../test/fixtures/expected/multifile.js | 1 - .../fixtures/expected/multiple_sourcemaps1.js | 2 - .../expected/multiple_sourcemaps1.map | 1 - .../fixtures/expected/multiple_sourcemaps2.js | 2 - .../expected/multiple_sourcemaps2.map | 1 - .../test/fixtures/expected/sourcemap_prefix | 1 - .../test/fixtures/expected/sourcemapin | 1 - .../test/fixtures/expected/sourcemapin.js | 4 - .../test/fixtures/expected/sourcemapurl.js | 2 - .../test/fixtures/expected/wrap.js | 1 - .../test/fixtures/src/comments.js | 21 - .../test/fixtures/src/simple.js | 15 - .../test/fixtures/src/simple2.coffee | 28 - .../test/fixtures/src/simple2.js | 39 -- .../test/fixtures/src/simple2.map | 1 - .../grunt-contrib-uglify/test/uglify_test.js | 58 --- node_modules/uglify-save-license/package.json | 25 +- package.json | 6 +- 139 files changed, 1813 insertions(+), 6499 deletions(-) delete mode 100644 node_modules/grunt-contrib-uglify/.jshintrc delete mode 100644 node_modules/grunt-contrib-uglify/.npmignore delete mode 100644 node_modules/grunt-contrib-uglify/.travis.yml delete mode 100644 node_modules/grunt-contrib-uglify/AUTHORS delete mode 100644 node_modules/grunt-contrib-uglify/CONTRIBUTING.md delete mode 100644 node_modules/grunt-contrib-uglify/Gruntfile.js delete mode 100644 node_modules/grunt-contrib-uglify/LICENSE-MIT delete mode 100644 node_modules/grunt-contrib-uglify/docs/uglify-examples.md delete mode 100644 node_modules/grunt-contrib-uglify/docs/uglify-options.md delete mode 100644 node_modules/grunt-contrib-uglify/docs/uglify-overview.md delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/.gitattributes delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/.jshintrc delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/.npmignore delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/.travis.yml delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/AUTHORS delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/CHANGELOG delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/Gruntfile.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/LICENSE-MIT delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/README.md delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/lib/contrib.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/.npmignore delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/index.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/package.json delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/readme.md delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/test/zlib.test.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/zlib.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/package.json delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/test/lib_test.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/.npmignore delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/.travis.yml delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/.travis.yml delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/LICENSE delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/bool.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/boolean_double.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/boolean_single.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/default_hash.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/default_singles.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/divide.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/line_count.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/line_count_options.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/line_count_wrap.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/nonopt.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/reflect.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/short.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/string.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/usage-options.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/xup.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/index.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/.npmignore delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/README.markdown delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/example/center.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/example/meat.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/index.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/package.json delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/test/break.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/test/idleness.txt delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/test/wrap.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/package.json delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/readme.markdown delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/test/_.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/test/_/argv.js delete mode 100755 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/test/_/bin.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/test/parse.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/test/usage.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/arrays.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/blocks.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/concat-strings.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/conditionals.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/dead-code.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/debugger.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/drop-unused.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-105.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-12.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-126.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-143.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-22.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-267.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-269.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-44.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-59.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/labels.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/loops.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/negate-iife.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/properties.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/sequences.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/switch.js delete mode 100644 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/typeof.js delete mode 100755 node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/run-tests.js delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/expected/comments.js delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/expected/compress.js delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/expected/compress_mangle.js delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/expected/compress_mangle_banner.js delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/expected/compress_mangle_beautify.js delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/expected/compress_mangle_except.js delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/expected/compress_mangle_sourcemap delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/expected/enclose.js delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/expected/exportAll.js delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/expected/multifile.js delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/expected/multiple_sourcemaps1.js delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/expected/multiple_sourcemaps1.map delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/expected/multiple_sourcemaps2.js delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/expected/multiple_sourcemaps2.map delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/expected/sourcemap_prefix delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/expected/sourcemapin delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/expected/sourcemapin.js delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/expected/sourcemapurl.js delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/expected/wrap.js delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/src/comments.js delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/src/simple.js delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/src/simple2.coffee delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/src/simple2.js delete mode 100644 node_modules/grunt-contrib-uglify/test/fixtures/src/simple2.map delete mode 100644 node_modules/grunt-contrib-uglify/test/uglify_test.js diff --git a/.gitignore b/.gitignore index c29999f..637d92c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -examples/ .idea/ +node_modules/ \ No newline at end of file diff --git a/CanvasTextWrapper.min.js b/CanvasTextWrapper.min.js index 90f0db8..36ed4dc 100644 --- a/CanvasTextWrapper.min.js +++ b/CanvasTextWrapper.min.js @@ -4,4 +4,4 @@ * MIT License (http://www.opensource.org/licenses/mit-license.html) * Copyright (c) 2014 Vadim Namniak */ -!function(){"use strict";var a,b,c,d,e={font:"18px Arial, sans-serif",sizeToFill:!1,lineHeight:1,allowNewLine:!0,lineBreak:"auto",textAlign:"left",verticalAlign:"top",justifyLines:!1,paddingX:0,paddingY:0,fitParent:!1,strokeText:!1},f=function(g,h,i){if(!(this instanceof f))return new f(g,h,i);this.canvas=g,this.text=h,this.context=this.canvas.getContext("2d"),this.context.font=this.font,this.context.textBaseline="bottom";for(var j in e)e.hasOwnProperty(j)&&(this[j]=i&&i[j]?i[j]:e[j]);a=this.fitParent===!1?this.canvas.width:this.canvas.parentNode.clientWidth,b=this.fitParent===!1?this.canvas.height:this.canvas.parentNode.clientHeight,c=a-2*this.paddingX,d=b-2*this.paddingY,this._init()};f.prototype={_init:function(){this.fontSize=parseInt(this.font.replace(/^\D+/g,""),10)||18,this.textBlockHeight=0,this.lines=[],this.newLineIndexes=[],this.textPos={x:0,y:0},this._setFont(this.fontSize),this._setLineHeight(),this._validate(),this._render()},_render:function(){if(this.sizeToFill){var a=this.text.trim().split(/\s+/).length,b=0;do this._setFont(++b),this.lineHeight=this.fontSize,this._wrap();while(this.textBlockHeightc){for(var h=0;this.context.measureText(b+a[g][h]).width<=c&&ha)&&(a=c,b=d);var e,f,g,h,i,j=" ";for(d=0;d=e))){this.lines[d]=this.lines[d].trim().split(/\s+/).join(j),f=this.context.measureText(j).width,g=(a-this.context.measureText(this.lines[d]).width)/f,h=g/(e-1),i="";for(var k=0;h>k;k++)i+=j;this.lines[d]=this.lines[d].trim().split(j).join(i)}},_drawText:function(){for(var a=0;ac){for(var h=0;this.context.measureText(b+a[g][h]).width<=c&&ha)&&(a=c,b=d);var e,f,g,h,i,j=" ";for(d=0;d=e))){this.lines[d]=this.lines[d].trim().split(/\s+/).join(j),f=this.context.measureText(j).width,g=(a-this.context.measureText(this.lines[d]).width)/f,h=g/(e-1),i="";for(var k=0;h>k;k++)i+=j;this.lines[d]=this.lines[d].trim().split(j).join(i)}},_drawText:function(){for(var a=0;a' - ], - options: { - jshintrc: '.jshintrc' - } - }, - - // Before generating any new files, remove any previously-created files. - clean: { - tests: ['tmp'] - }, - - // Configuration to be run (and then tested). - uglify: { - compress: { - files: { - 'tmp/compress.js': ['test/fixtures/src/simple.js'] - }, - options: { - mangle: false - } - }, - compress_mangle: { - files: { - 'tmp/compress_mangle.js': ['test/fixtures/src/simple.js'] - } - }, - compress_mangle_banner: { - files: { - 'tmp/compress_mangle_banner.js': ['test/fixtures/src/simple.js'] - }, - options : { - banner : '// banner without sourcemap\n' - } - }, - no_src: { - files: { - 'tmp/compress_mangle.js': [] - } - }, - compress_mangle_except: { - files: { - 'tmp/compress_mangle_except.js': ['test/fixtures/src/simple.js'] - }, - options: { - mangle: { - except: ['argumentC'] - } - } - }, - compress_mangle_beautify: { - files: { - 'tmp/compress_mangle_beautify.js': ['test/fixtures/src/simple.js'] - }, - options: { - beautify: true - } - }, - enclose: { - files: { - 'tmp/enclose.js': ['test/fixtures/src/simple.js'] - }, - options: { - beautify: true, - compress: false, - enclose: { - 'window.argA': 'paramA', - 'window.argB': 'paramB' - }, - mangle: false - } - }, - multifile: { - files: { - 'tmp/multifile.js': ['test/fixtures/src/simple.js','test/fixtures/src/comments.js'] - }, - options: { - mangle: false - } - }, - compress_mangle_sourcemap: { - files: { - '/dev/null': ['test/fixtures/src/simple.js'] - }, - options: { - sourceMap: 'tmp/compress_mangle_sourcemap' - } - }, - sourcemapin: { - files: { - 'tmp/sourcemapin.js': ['test/fixtures/src/simple2.js'] - }, - options: { - mangle: false, - banner: '// Hello World\n', - sourceMap: 'tmp/sourcemapin', - sourceMapIn: 'test/fixtures/src/simple2.map', - sourceMapRoot: 'http://local.host/js/' - } - }, - sourcemapurl: { - files: { - 'tmp/sourcemapurl.js': ['test/fixtures/src/simple.js'] - }, - options: { - sourceMappingURL: 'js/sourcemapurl.js.map' - } - }, - comments: { - src: 'test/fixtures/src/comments.js', - dest: 'tmp/comments.js', - options: { - mangle: false, - preserveComments: 'some' - } - }, - wrap: { - src: 'test/fixtures/src/simple.js', - dest: 'tmp/wrap.js', - options: { - mangle: false, - wrap: 'testExport' - } - }, - exportAll: { - src: 'test/fixtures/src/simple.js', - dest: 'tmp/exportAll.js', - options: { - mangle: false, - wrap: 'testExport', - exportAll: true - } - }, - sourcemap_prefix: { - files: { - '/dev/null': ['test/fixtures/src/simple.js'] - }, - options: { - sourceMap: 'tmp/sourcemap_prefix', - sourceMapPrefix: 3 - } - }, - multiple_sourcemaps: { - files: { - 'tmp/multiple_sourcemaps1.js': ['test/fixtures/src/simple.js'], - 'tmp/multiple_sourcemaps2.js': ['test/fixtures/src/comments.js'] - }, - options: { - sourceMap: function(dest) { - return dest.replace(/\.js$/,".map"); - }, - sourceMappingURL: function(dest) { - return dest.replace(/\.js$/,".mapurl"); - } - } - }, - sourcemap_in_generator_single_src: { - files: [{ - expand: true, - flatten: true, - src: ['test/fixtures/expected/multiple_sourcemaps*.js'], - dest: 'tmp', - ext: '.min.js' - }], - options: { - sourceMap: function (dest) { return dest.replace(/\.js$/, '') + '.map'; }, - sourceMapIn: function (src) { return src.replace(/\.js$/, '') + '.map'; } - } - }, - sourcemap_in_generator_multi_src: { - src: 'test/fixtures/expected/multiple_sourcemaps*.js', - dest: 'tmp/multiple_sourcemaps_all.min.js', - options: { - sourceMap: function (dest) { return dest.replace(/\.js$/, '') + '.map'; }, - sourceMapIn: function (src) { return src.replace(/\.js$/, '') + '.map'; } - } - } - }, - - // Unit tests. - nodeunit: { - tests: ['test/*_test.js'] - } - - }); - - // task that expects its argument (another task) to fail - grunt.registerTask('expectFail', function(){ - var task = this.args.join(':'); - - var done = this.async(); - - function onComplete(error, result, code) { - grunt.log.write("\n > " + result.stdout.split("\n").join("\n > ") + "\n"); - var rv = error ? true : new Error("Task " + task + " unexpectedly passed."); - done(rv); - } - - grunt.util.spawn({ - grunt : true, - args : task - }, onComplete); - }); - - // Actually load this plugin's task(s). - grunt.loadTasks('tasks'); - - // These plugins provide necessary tasks. - grunt.loadNpmTasks('grunt-contrib-jshint'); - grunt.loadNpmTasks('grunt-contrib-clean'); - grunt.loadNpmTasks('grunt-contrib-nodeunit'); - grunt.loadNpmTasks('grunt-contrib-internal'); - - // Whenever the "test" task is run, first clean the "tmp" dir, then run this - // plugin's task(s), then test the result. - grunt.registerTask('test', [ - 'clean', - 'uglify:compress', - 'uglify:compress_mangle', - 'uglify:compress_mangle_banner', - 'uglify:no_src', - 'uglify:compress_mangle_except', - 'uglify:compress_mangle_beautify', - 'uglify:multifile', - 'uglify:compress_mangle_sourcemap', - 'uglify:sourcemapin', - 'uglify:sourcemapurl', - 'uglify:comments', - 'uglify:wrap', - 'uglify:exportAll', - 'uglify:sourcemap_prefix', - 'uglify:multiple_sourcemaps', - 'uglify:enclose', - 'uglify:sourcemap_in_generator_single_src', - 'expectFail:uglify:sourcemap_in_generator_multi_src', // fail case - 'nodeunit' - ]); - - // By default, lint and run all tests. - grunt.registerTask('default', ['jshint', 'test', 'build-contrib']); - -}; diff --git a/node_modules/grunt-contrib-uglify/LICENSE-MIT b/node_modules/grunt-contrib-uglify/LICENSE-MIT deleted file mode 100644 index 7f9d346..0000000 --- a/node_modules/grunt-contrib-uglify/LICENSE-MIT +++ /dev/null @@ -1,22 +0,0 @@ -Copyright (c) 2012 "Cowboy" Ben Alman, contributors - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. diff --git a/node_modules/grunt-contrib-uglify/README.md b/node_modules/grunt-contrib-uglify/README.md index 960fd60..b9b2e48 100644 --- a/node_modules/grunt-contrib-uglify/README.md +++ b/node_modules/grunt-contrib-uglify/README.md @@ -1,11 +1,11 @@ -# grunt-contrib-uglify v0.2.6 [![Build Status](https://travis-ci.org/gruntjs/grunt-contrib-uglify.png?branch=master)](https://travis-ci.org/gruntjs/grunt-contrib-uglify) +# grunt-contrib-uglify v0.9.1 [![Build Status: Linux](https://travis-ci.org/gruntjs/grunt-contrib-uglify.svg?branch=master)](https://travis-ci.org/gruntjs/grunt-contrib-uglify) [![Build Status: Windows](https://ci.appveyor.com/api/projects/status/ybtf5vbvtenii561/branch/master?svg=true)](https://ci.appveyor.com/project/gruntjs/grunt-contrib-uglify/branch/master) > Minify files with UglifyJS. ## Getting Started -This plugin requires Grunt `~0.4.0` +This plugin requires Grunt `>=0.4.0` If you haven't used [Grunt](http://gruntjs.com/) before, be sure to check out the [Getting Started](http://gruntjs.com/getting-started) guide, as it explains how to create a [Gruntfile](http://gruntjs.com/sample-gruntfile) as well as install and use Grunt plugins. Once you're familiar with that process, you may install this plugin with this command: @@ -26,6 +26,28 @@ grunt.loadNpmTasks('grunt-contrib-uglify'); _Run this task with the `grunt uglify` command._ Task targets, files and options may be specified according to the grunt [Configuring tasks](http://gruntjs.com/configuring-tasks) guide. + +### Migrating from 2.x to 3.x + +Version `3.x` introduced changes to configuring source maps. Accordingly, if you don't use the source map options you should be able to upgrade seamlessly. If you do use source maps, see below. + +#### Removed options + +`sourceMappingURL` - This is calculated automatically now +`sourceMapPrefix` - No longer necessary for the above reason + +#### Changed options + +`sourceMap` - Only accepts a `Boolean` value. Generates a map with a default name for you +`sourceMapRoot` - The location of your sources is now calculated for you when `sourceMap` is set to `true` but you can set manual source root if needed + +#### New options + +`sourceMapName` - Accepts a string or function to change the location or name of your map +`sourceMapIncludeSources` - Embed the content of your source files directly into the map +`expression` - Accepts a `Boolean` value. Parse a single expression (JSON or single functions) +`quoteStyle` - Accepts integers `0` (default), `1`, `2`, `3`. Enforce or preserve quotation mark style. + ### Options This task primarily delegates to [UglifyJS2][], so please consider the [UglifyJS documentation][] as required reading for advanced configuration. @@ -33,96 +55,108 @@ This task primarily delegates to [UglifyJS2][], so please consider the [UglifyJS [UglifyJS2]: https://github.com/mishoo/UglifyJS2 [UglifyJS documentation]: http://lisperator.net/uglifyjs/ + #### mangle -Type: `Boolean` `Object` +Type: `Boolean` `Object` Default: `{}` -Turn on or off mangling with default options. If an `Object` is specified, it is passed directly to `ast.mangle_names()` *and* `ast.compute_char_frequency()` (mimicking command line behavior). +Turn on or off mangling with default options. If an `Object` is specified, it is passed directly to `ast.mangle_names()` *and* `ast.compute_char_frequency()` (mimicking command line behavior). [View all options here](https://github.com/mishoo/UglifyJS2#mangler-options). #### compress -Type: `Boolean` `Object` +Type: `Boolean` `Object` Default: `{}` -Turn on or off source compression with default options. If an `Object` is specified, it is passed as options to `UglifyJS.Compressor()`. +Turn on or off source compression with default options. If an `Object` is specified, it is passed as options to `UglifyJS.Compressor()`. [View all options here](https://github.com/mishoo/UglifyJS2#compressor-options). #### beautify -Type: `Boolean` `Object` +Type: `Boolean` `Object` Default: `false` -Turns on beautification of the generated source code. An `Object` will be merged and passed with the options sent to `UglifyJS.OutputStream()` +Turns on beautification of the generated source code. An `Object` will be merged and passed with the options sent to `UglifyJS.OutputStream()`. [View all options here](https://github.com/mishoo/UglifyJS2#beautifier-options) + +###### expression +Type: `Boolean` +Default: `false` + +Parse a single expression, rather than a program (for parsing JSON) #### report -Choices: `false` `'min'` `'gzip'` -Default: `false` +Choices: `'min'`, `'gzip'` +Default: `'min'` -Either do not report anything, report only minification result, or report minification and gzip results. This is useful to see exactly how well Uglify is performing, but using `'gzip'` can add 5-10x runtime task execution. - -Example ouput using `'gzip'`: - -``` -Original: 198444 bytes. -Minified: 101615 bytes. -Gzipped: 20084 bytes. -``` +Either report only minification result or report minification and gzip results. +This is useful to see exactly how well clean-css is performing but using `'gzip'` will make the task take 5-10x longer to complete. [Example output](https://github.com/sindresorhus/maxmin#readme). #### sourceMap -Type: `String` `Function` +Type: `Boolean` +Default: `false` + +If `true`, a source map file will be generated in the same directory as the `dest` file. By default it will have the same basename as the `dest` file, but with a `.map` extension. + +#### sourceMapName +Type: `String` `Function` Default: `undefined` -The location to output the sourcemap. If a function is provided, the uglify destination is passed as the argument -and the return value will be used as the sourceMap name. - -#### sourceMapRoot -Type: `String` -Default: `undefined` - -The location where your source files can be found. This sets the sourceRoot field in the source map. +To customize the name or location of the generated source map, pass a string to indicate where to write the source map to. If a function is provided, the uglify destination is passed as the argument and the return value will be used as the file name. #### sourceMapIn -Type: `String` `Function` +Type: `String` `Function` Default: `undefined` The location of an input source map from an earlier compilation, e.g. from CoffeeScript. If a function is provided, the uglify source is passed as the argument and the return value will be used as the sourceMap name. This only makes sense when there's one source file. -#### sourceMappingURL -Type: `String` `Function` +#### sourceMapIncludeSources +Type: `Boolean` +Default: `false` + +Pass this flag if you want to include the content of source files in the source map as sourcesContent property. + +###### sourceMapRoot +Type: `String` Default: `undefined` -The location of your sourcemap. Defaults to the location you use for sourceMap, override if you need finer control. Provide -a function to dynamically generate the sourceMappingURL based off the destination. +With this option you can customize root URL that browser will use when looking for sources. -#### sourceMapPrefix -Type: `Number` -Default: `undefined` - -The number of directories to drop from the path prefix when declaring files in the source map. +If the sources are not absolute URLs after prepending of the `sourceMapRoot`, the sources are resolved relative to the source map. ###### enclose -Type: `Object` +Type: `Object` Default: `undefined` Wrap all of the code in a closure with a configurable arguments/parameters list. Each key-value pair in the `enclose` object is effectively an argument-parameter pair. #### wrap -Type: `String` +Type: `String` Default: `undefined` Wrap all of the code in a closure, an easy way to make sure nothing is leaking. For variables that need to be public `exports` and `global` variables are made available. The value of wrap is the global variable exports will be available as. +#### maxLineLen +Type: `Number` +Default: `32000` + +Limit the line length in symbols. Pass maxLineLen = 0 to disable this safety feature. + +#### ASCIIOnly +Type: `Boolean` +Default: `false` + +Enables to encode non-ASCII characters as \uXXXX. + #### exportAll -Type: `Boolean` +Type: `Boolean` Default: `false` When using `wrap` this will make all global functions and variables available via the export variable. #### preserveComments -Type: `Boolean` `String` `Function` -Default: `undefined` +Type: `Boolean` `String` `Function` +Default: `undefined` Options: `false` `'all'` `'some'` Turn on preservation of comments. @@ -133,21 +167,59 @@ Turn on preservation of comments. - `Function` specify your own comment preservation function. You will be passed the current node and the current comment and are expected to return either `true` or `false` #### banner -Type: `String` +Type: `String` Default: empty string -This string will be prepended to the beginning of the minified output. It is processed using [grunt.template.process][], using the default options. +This string will be prepended to the minified output. Template strings (e.g. `<%= config.value %>` will be expanded automatically. #### footer -Type: `String` +Type: `String` Default: empty string -This string will be append to the end of the minified output. It is processed using [grunt.template.process][], using the default options. +This string will be appended to the minified output. Template strings (e.g. `<%= config.value %>` will be expanded automatically. -_(Default processing options are explained in the [grunt.template.process][] documentation)_ +#### screwIE8 +Type: `Boolean` +Default: false -[grunt.template.process]: https://github.com/gruntjs/grunt/wiki/grunt.template#wiki-grunt-template-process +Pass this flag if you don't care about full compliance with Internet Explorer 6-8 quirks. +#### mangleProperties +Type: `Boolean` +Default: false + +Use this flag to turn on object property name mangling. + +#### reserveDOMProperties +Type: `Boolean` +Default: false + +Use this flag in conjunction with `mangleProperties` to prevent built-in browser object properties from being mangled. + +#### exceptionsFiles +Type: `Array` +Default: [] + +Use this with `mangleProperties` to pass one or more JSON files containing a list of variables and object properties +that should not be mangled. See the [UglifyJS docs](https://www.npmjs.com/package/uglify-js) for more info on the file syntax. + +#### nameCache +Type: `String` +Default: empty string + +A string that is a path to a JSON cache file that uglify will create and use to coordinate symbol mangling between +multiple runs of uglify. Note: this generated file uses the same JSON format as the `exceptionsFiles` files. + +#### quoteStyle +Type: `Integer` +Default: `0` + +Preserve or enforce quotation mark style. + +* `0` will use single or double quotes such as to minimize the number of bytes (prefers double quotes when both will do) +* `1` will always use single quotes +* `2` will always use double quotes +* `3` will preserve original quotation marks ### Usage examples @@ -212,7 +284,10 @@ grunt.initConfig({ #### Source maps -Configure basic source map output by specifying a file path for the `sourceMap` option. +Generate a source map by setting the `sourceMap` option to `true`. The generated +source map will be in the same directory as the destination file. Its name will be the +basename of the destination file with a `.map` extension. Override these +defaults with the `sourceMapName` attribute. ```js // Project configuration. @@ -220,7 +295,8 @@ grunt.initConfig({ uglify: { my_target: { options: { - sourceMap: 'path/to/source-map.js' + sourceMap: true, + sourceMapName: 'path/to/sourcemap.map' }, files: { 'dest/output.min.js': ['src/input.js'] @@ -232,10 +308,8 @@ grunt.initConfig({ #### Advanced source maps -You can specify the parameters to pass to `UglifyJS.SourceMap()` which will -allow you to configure advanced settings. - -Refer to the [UglifyJS SourceMap Documentation](http://lisperator.net/uglifyjs/codegen#source-map) for more information. +Set the `sourceMapIncludeSources` option to `true` to embed your sources directly into the map. To include +a source map from a previous compilation pass it as the value of the `sourceMapIn` option. ```js // Project configuration. @@ -243,8 +317,8 @@ grunt.initConfig({ uglify: { my_target: { options: { - sourceMap: 'path/to/source-map.js', - sourceMapRoot: 'http://example.com/path/to/src/', // the location to find your original source + sourceMap: true, + sourceMapIncludeSources: true, sourceMapIn: 'example/coffeescript-sourcemap.js', // input sourcemap from a previous compilation }, files: { @@ -255,6 +329,30 @@ grunt.initConfig({ }); ``` +Refer to the [UglifyJS SourceMap Documentation](http://lisperator.net/uglifyjs/codegen#source-map) for more information. + +#### Turn off console warnings + +Specify `drop_console: true` as part of the `compress` options to discard calls to `console.*` functions. +This will supress warning messages in the console. + +```js +// Project configuration. +grunt.initConfig({ + uglify: { + options: { + compress: { + drop_console: true + } + }, + my_target: { + files: { + 'dest/output.min.js': ['src/input.js'] + } + } + } +}); +``` #### Beautify @@ -342,6 +440,7 @@ grunt.initConfig({ } }); ``` + #### Compiling all files in a folder dynamically This configuration will compress and mangle the files dynamically. @@ -362,9 +461,67 @@ grunt.initConfig({ }); ``` +#### Turn on object property name mangling + +This configuration will turn on object property name mangling, but not mangle built-in browser object properties. +Additionally, variables and object properties listed in the `myExceptionsFile.json` will be mangled. For more info, +on the format of the exception file format please see the [UglifyJS docs](https://www.npmjs.com/package/uglify-js). + +```js +// Project configuration. +grunt.initConfig({ + uglify: { + options: { + mangleProperties: true, + reserveDOMCache: true, + exceptionsFiles: [ 'myExceptionsFile.json' ] + }, + my_target: { + files: { + 'dest/output.min.js': ['src/input.js'] + } + } + } +}); +``` + +#### Turn on use of name mangling cache + +Turn on use of name mangling cache to coordinate mangled symbols between outputted uglify files. uglify will the +generate a JSON cache file with the name provided in the options. Note: this generated file uses the same JSON format +as the `exceptionsFiles` files. + +```js +// Project configuration. +grunt.initConfig({ + uglify: { + options: { + nameCache: '.tmp/grunt-uglify-cache.json', + }, + my_target: { + files: { + 'dest/output1.min.js': ['src/input1.js'], + 'dest/output2.min.js': ['src/input2.js'] + } + } + } +}); +``` + ## Release History + * 2015-04-07   v0.9.0   added hook into uglify's mangling functionality + * 2015-03-30   v0.8.1   lock uglify to 2.4.17 due to breaking changes + * 2015-02-19   v0.8.0   Add `screwIE8` option. Fix issue with explicit `compress` in node 0.12.0. + * 2014-12-23   v0.7.0   Adds sourceMapRoot options. Updates readme descriptions. Removes reference to cleancss. + * 2014-09-17   v0.6.0   Output fixes. ASCIIOnly option. Other fixes. + * 2014-07-25   v0.5.1   Chalk updates. Output updates. + * 2014-03-01   v0.4.0   remove grunt-lib-contrib dependency and add more colors + * 2014-02-27   v0.3.3   remove unnecessary calls to `grunt.template.process` + * 2014-01-22   v0.3.2   fix handling of `sourceMapIncludeSources` option. + * 2014-01-20   v0.3.1   fix relative path issue in sourcemaps + * 2014-01-16   v0.3.0   refactor sourcemap support * 2013-11-09   v0.2.7   prepending banner if sourceMap option not set, addresses * 2013-11-08   v0.2.6   merged 45, 53, 85 (105 by way of duping 53) Added support for banners in uglified files with sourcemaps Updated docs * 2013-10-28   v0.2.5   Added warning for banners when using sourcemaps @@ -383,4 +540,4 @@ grunt.initConfig({ Task submitted by ["Cowboy" Ben Alman](http://benalman.com) -*This file was generated on Sat Nov 09 2013 12:42:05.* +*This file was generated on Tue Apr 07 2015 21:04:14.* diff --git a/node_modules/grunt-contrib-uglify/docs/uglify-examples.md b/node_modules/grunt-contrib-uglify/docs/uglify-examples.md deleted file mode 100644 index 85fefe1..0000000 --- a/node_modules/grunt-contrib-uglify/docs/uglify-examples.md +++ /dev/null @@ -1,212 +0,0 @@ -# Usage examples - -## Basic compression - -This configuration will compress and mangle the input files using the default options. - -```js -// Project configuration. -grunt.initConfig({ - uglify: { - my_target: { - files: { - 'dest/output.min.js': ['src/input1.js', 'src/input2.js'] - } - } - } -}); -``` - -## No mangling - -Specify `mangle: false` to prevent changes to your variable and function names. - -```js -// Project configuration. -grunt.initConfig({ - uglify: { - options: { - mangle: false - }, - my_target: { - files: { - 'dest/output.min.js': ['src/input.js'] - } - } - } -}); -``` - -## Reserved identifiers - -You can specify identifiers to leave untouched with an `except` array in the `mangle` options. - -```js -// Project configuration. -grunt.initConfig({ - uglify: { - options: { - mangle: { - except: ['jQuery', 'Backbone'] - } - }, - my_target: { - files: { - 'dest/output.min.js': ['src/input.js'] - } - } - } -}); -``` - -## Source maps - -Configure basic source map output by specifying a file path for the `sourceMap` option. - -```js -// Project configuration. -grunt.initConfig({ - uglify: { - my_target: { - options: { - sourceMap: 'path/to/source-map.js' - }, - files: { - 'dest/output.min.js': ['src/input.js'] - } - } - } -}); -``` - -## Advanced source maps - -You can specify the parameters to pass to `UglifyJS.SourceMap()` which will -allow you to configure advanced settings. - -Refer to the [UglifyJS SourceMap Documentation](http://lisperator.net/uglifyjs/codegen#source-map) for more information. - -```js -// Project configuration. -grunt.initConfig({ - uglify: { - my_target: { - options: { - sourceMap: 'path/to/source-map.js', - sourceMapRoot: 'http://example.com/path/to/src/', // the location to find your original source - sourceMapIn: 'example/coffeescript-sourcemap.js', // input sourcemap from a previous compilation - }, - files: { - 'dest/output.min.js': ['src/input.js'], - }, - }, - }, -}); -``` - - -## Beautify - -Specify `beautify: true` to beautify your code for debugging/troubleshooting purposes. -Pass an object to manually configure any other output options passed directly to `UglifyJS.OutputStream()`. - -See [UglifyJS Codegen documentation](http://lisperator.net/uglifyjs/codegen) for more information. - -_Note that manual configuration will require you to explicitly set `beautify: true` if you want traditional, beautified output._ - -```js -// Project configuration. -grunt.initConfig({ - uglify: { - my_target: { - options: { - beautify: true - }, - files: { - 'dest/output.min.js': ['src/input.js'] - } - }, - my_advanced_target: { - options: { - beautify: { - width: 80, - beautify: true - } - }, - files: { - 'dest/output.min.js': ['src/input.js'] - } - } - } -}); -``` - -## Banner comments - -In this example, running `grunt uglify:my_target` will prepend a banner created by interpolating the `banner` template string with the config object. Here, those properties are the values imported from the `package.json` file (which are available via the `pkg` config property) plus today's date. - -_Note: you don't have to use an external JSON file. It's also valid to create the `pkg` object inline in the config. That being said, if you already have a JSON file, you might as well reference it._ - -```js -// Project configuration. -grunt.initConfig({ - pkg: grunt.file.readJSON('package.json'), - uglify: { - options: { - banner: '/*! <%= pkg.name %> - v<%= pkg.version %> - ' + - '<%= grunt.template.today("yyyy-mm-dd") %> */' - }, - my_target: { - files: { - 'dest/output.min.js': ['src/input.js'] - } - } - } -}); -``` - -## Conditional compilation - -You can also enable UglifyJS conditional compilation. This is commonly used to remove debug code blocks for production builds. - -See [UglifyJS global definitions documentation](http://lisperator.net/uglifyjs/compress#global-defs) for more information. - -```js -// Project configuration. -grunt.initConfig({ - uglify: { - options: { - compress: { - global_defs: { - "DEBUG": false - }, - dead_code: true - } - }, - my_target: { - files: { - 'dest/output.min.js': ['src/input.js'] - } - } - } -}); -``` -## Compiling all files in a folder dynamically - -This configuration will compress and mangle the files dynamically. - -```js -// Project configuration. -grunt.initConfig({ - uglify: { - my_target: { - files: [{ - expand: true, - cwd: 'src/js', - src: '**/*.js', - dest: 'dest/js' - }] - } - } -}); -``` diff --git a/node_modules/grunt-contrib-uglify/docs/uglify-options.md b/node_modules/grunt-contrib-uglify/docs/uglify-options.md deleted file mode 100644 index 7ac0b74..0000000 --- a/node_modules/grunt-contrib-uglify/docs/uglify-options.md +++ /dev/null @@ -1,122 +0,0 @@ -# Options - -This task primarily delegates to [UglifyJS2][], so please consider the [UglifyJS documentation][] as required reading for advanced configuration. - -[UglifyJS2]: https://github.com/mishoo/UglifyJS2 -[UglifyJS documentation]: http://lisperator.net/uglifyjs/ - -## mangle -Type: `Boolean` `Object` -Default: `{}` - -Turn on or off mangling with default options. If an `Object` is specified, it is passed directly to `ast.mangle_names()` *and* `ast.compute_char_frequency()` (mimicking command line behavior). - -## compress -Type: `Boolean` `Object` -Default: `{}` - -Turn on or off source compression with default options. If an `Object` is specified, it is passed as options to `UglifyJS.Compressor()`. - -## beautify -Type: `Boolean` `Object` -Default: `false` - -Turns on beautification of the generated source code. An `Object` will be merged and passed with the options sent to `UglifyJS.OutputStream()` - -## report -Choices: `false` `'min'` `'gzip'` -Default: `false` - -Either do not report anything, report only minification result, or report minification and gzip results. This is useful to see exactly how well Uglify is performing, but using `'gzip'` can add 5-10x runtime task execution. - -Example ouput using `'gzip'`: - -``` -Original: 198444 bytes. -Minified: 101615 bytes. -Gzipped: 20084 bytes. -``` - -## sourceMap -Type: `String` `Function` -Default: `undefined` - -The location to output the sourcemap. If a function is provided, the uglify destination is passed as the argument -and the return value will be used as the sourceMap name. - -## sourceMapRoot -Type: `String` -Default: `undefined` - -The location where your source files can be found. This sets the sourceRoot field in the source map. - -## sourceMapIn -Type: `String` `Function` -Default: `undefined` - -The location of an input source map from an earlier compilation, e.g. from CoffeeScript. If a function is provided, the -uglify source is passed as the argument and the return value will be used as the sourceMap name. This only makes sense -when there's one source file. - -## sourceMappingURL -Type: `String` `Function` -Default: `undefined` - -The location of your sourcemap. Defaults to the location you use for sourceMap, override if you need finer control. Provide -a function to dynamically generate the sourceMappingURL based off the destination. - -## sourceMapPrefix -Type: `Number` -Default: `undefined` - -The number of directories to drop from the path prefix when declaring files in the source map. - -#### enclose -Type: `Object` -Default: `undefined` - -Wrap all of the code in a closure with a configurable arguments/parameters list. -Each key-value pair in the `enclose` object is effectively an argument-parameter pair. - -## wrap -Type: `String` -Default: `undefined` - -Wrap all of the code in a closure, an easy way to make sure nothing is leaking. -For variables that need to be public `exports` and `global` variables are made available. -The value of wrap is the global variable exports will be available as. - -## exportAll -Type: `Boolean` -Default: `false` - -When using `wrap` this will make all global functions and variables available via the export variable. - -## preserveComments -Type: `Boolean` `String` `Function` -Default: `undefined` -Options: `false` `'all'` `'some'` - -Turn on preservation of comments. - -- `false` will strip all comments -- `'all'` will preserve all comments in code blocks that have not been squashed or dropped -- `'some'` will preserve all comments that start with a bang (`!`) or include a closure compiler style directive (`@preserve` `@license` `@cc_on`) -- `Function` specify your own comment preservation function. You will be passed the current node and the current comment and are expected to return either `true` or `false` - -## banner -Type: `String` -Default: empty string - -This string will be prepended to the beginning of the minified output. It is processed using [grunt.template.process][], using the default options. - -## footer -Type: `String` -Default: empty string - -This string will be append to the end of the minified output. It is processed using [grunt.template.process][], using the default options. - -_(Default processing options are explained in the [grunt.template.process][] documentation)_ - -[grunt.template.process]: https://github.com/gruntjs/grunt/wiki/grunt.template#wiki-grunt-template-process - diff --git a/node_modules/grunt-contrib-uglify/docs/uglify-overview.md b/node_modules/grunt-contrib-uglify/docs/uglify-overview.md deleted file mode 100644 index f0c452b..0000000 --- a/node_modules/grunt-contrib-uglify/docs/uglify-overview.md +++ /dev/null @@ -1 +0,0 @@ -Task targets, files and options may be specified according to the grunt [Configuring tasks](http://gruntjs.com/configuring-tasks) guide. \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/node_modules/.bin/uglifyjs b/node_modules/grunt-contrib-uglify/node_modules/.bin/uglifyjs index fef3468..27606b8 120000 --- a/node_modules/grunt-contrib-uglify/node_modules/.bin/uglifyjs +++ b/node_modules/grunt-contrib-uglify/node_modules/.bin/uglifyjs @@ -1 +1,15 @@ -../uglify-js/bin/uglifyjs \ No newline at end of file +#!/bin/sh +basedir=`dirname "$0"` + +case `uname` in + *CYGWIN*) basedir=`cygpath -w "$basedir"`;; +esac + +if [ -x "$basedir/node" ]; then + "$basedir/node" "$basedir/../uglify-js/bin/uglifyjs" "$@" + ret=$? +else + node "$basedir/../uglify-js/bin/uglifyjs" "$@" + ret=$? +fi +exit $ret diff --git a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/.gitattributes b/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/.gitattributes deleted file mode 100644 index 176a458..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* text=auto diff --git a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/.jshintrc b/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/.jshintrc deleted file mode 100644 index e0cc7bb..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/.jshintrc +++ /dev/null @@ -1,14 +0,0 @@ -{ - "curly": true, - "eqeqeq": true, - "immed": true, - "latedef": true, - "newcap": true, - "noarg": true, - "sub": true, - "undef": true, - "boss": true, - "eqnull": true, - "node": true, - "es5": true -} \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/.npmignore b/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/.npmignore deleted file mode 100644 index 5cb6bfd..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/.npmignore +++ /dev/null @@ -1,3 +0,0 @@ -node_modules -npm-debug.log -tmp \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/.travis.yml b/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/.travis.yml deleted file mode 100644 index f2c257a..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/.travis.yml +++ /dev/null @@ -1,6 +0,0 @@ -language: node_js -node_js: - - "0.8" - - "0.10" -before_install: - - npm install -g grunt-cli \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/AUTHORS b/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/AUTHORS deleted file mode 100644 index 5de1a92..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/AUTHORS +++ /dev/null @@ -1,4 +0,0 @@ -Tyler Kellen (http://goingslowly.com/) -Chris Talkington (http://christalkington.com/) -Larry Davis (http://lazd.net/) -Sindre Sorhus (http://sindresorhus.com) diff --git a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/CHANGELOG b/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/CHANGELOG deleted file mode 100644 index f1e4c30..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/CHANGELOG +++ /dev/null @@ -1,47 +0,0 @@ -v0.6.1: - date: 2013-03-24 - changes: - - Add formatForType option -v0.6.0: - date: 2013-03-14 - changes: - - Change API/reportying style for minMaxInfo -v0.5.3: - date: 2013-02-23 - changes: - - use MIT licensed zlib-browserify instead of unlicensed gzip-js -v0.5.2: - date: 2013-01-24 - changes: - - add minMaxGzip & minMaxInfo. -v0.5.0: - date: 2012-12-05 - changes: - - remove findBasePath, buildIndividualDest and isIndividualDest. - - remove options and normalizeMultiTaskFiles. - - remove node v0.6 and grunt v0.3 support. -v0.4.0: - date: 2012-11-20 - changes: - - findBasePath returns '' if passed false. - - Added stripPath. -v0.3.1: - date: 2012-10-29 - changes: - - Tweaked findBasePath to handle single dot differently. - - Start testing with Travis. - - Docs cleanup. -v0.3.0: - date: 2012-09-24 - changes: - - Added findBasePath, buildIndividualDest, isIndividualDest, optsToArgs. - - Refactored tests. - - Automatically parse templates in options. -v0.2.1: - date: 2012-09-14 - changes: - - Added non-destuctive namespace declarations. -v0.2.0: - date: 2012-09-10 - changes: - - Refactored from grunt-contrib into individual repo. diff --git a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/Gruntfile.js b/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/Gruntfile.js deleted file mode 100644 index 6e602bb..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/Gruntfile.js +++ /dev/null @@ -1,60 +0,0 @@ -/* - * grunt-lib-contrib - * http://gruntjs.com/ - * - * Copyright (c) 2012 Tyler Kellen, contributors - * Licensed under the MIT license. - */ - -module.exports = function(grunt) { - 'use strict'; - - // Project configuration. - grunt.initConfig({ - jshint: { - all: [ - 'Gruntfile.js', - 'lib/*.js', - '<%= nodeunit.tests %>' - ], - options: { - jshintrc: '.jshintrc' - } - }, - - test_vars: { - source: 'source/' - }, - - test_task: { - options: { - param: 'task', - param2: 'task', - template: '<%= test_vars.source %>', - data: { - template: ['<%= test_vars.source %>'] - } - }, - target: { - options: { - param: 'target' - } - } - }, - - // Unit tests. - nodeunit: { - tests: ['test/*_test.js'] - } - }); - - // These plugins provide necessary tasks. - grunt.loadNpmTasks('grunt-contrib-jshint'); - grunt.loadNpmTasks('grunt-contrib-nodeunit'); - - // Whenever the "test" task is run, then test the result. - grunt.registerTask('test', ['nodeunit']); - - // By default, lint and run all tests. - grunt.registerTask('default', ['jshint', 'test']); -}; \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/LICENSE-MIT b/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/LICENSE-MIT deleted file mode 100644 index 358b067..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/LICENSE-MIT +++ /dev/null @@ -1,22 +0,0 @@ -Copyright (c) 2012 Tyler Kellen, contributors - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/README.md b/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/README.md deleted file mode 100644 index 88116eb..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/README.md +++ /dev/null @@ -1,65 +0,0 @@ -# grunt-lib-contrib [![Build Status](https://secure.travis-ci.org/gruntjs/grunt-lib-contrib.png?branch=master)](http://travis-ci.org/gruntjs/grunt-lib-contrib) - -> Common functionality shared across grunt-contrib tasks. - -The purpose of grunt-lib-contrib is to explore solutions to common problems task writers encounter, and to ease the upgrade path for contrib tasks. - -**These APIs should be considered highly unstable. Depend on them at your own risk!** - -_Over time, some of the functionality provided here may be incorporated directly into grunt for mainstream use. Until then, you may require `grunt-lib-contrib` as a dependency in your projects, but be very careful to specify an exact version number instead of a range, as backwards-incompatible changes are likely to be introduced._ - -### Helper Functions - -#### getNamespaceDeclaration(ns) - -This helper is used to build JS namespace declarations. - -#### optsToArgs(options) - -Convert an object to an array of CLI arguments, which can be used with `child_process.spawn()`. - -```js -// Example -{ - fooBar: 'a', // ['--foo-bar', 'a'] - fooBar: 1, // ['--foo-bar', '1'] - fooBar: true, // ['--foo-bar'] - fooBar: false, // - fooBar: ['a', 'b'] // ['--foo-bar', 'a', '--foo-bar', 'b'] -} -``` - -#### stripPath(pth, strip) - -Strip a path from a path. normalize both paths for best results. - -#### minMaxInfo(min, max, report) - -Helper for logging compressed, uncompressed and gzipped sizes of strings. - -#### report -Choices: `false`, `'min'`, `'gzip'` -Default: `false` - -Either do not report anything, report only minification result, or report minification and gzip results. - -**Important** Including `'gzip'` results can make this task 5-10x slower depending on the size of the file. - - -```js -var max = grunt.file.read('max.js'); -var min = minify(max); -minMaxInfo(min, max, 'gzip'); -``` - -Would print: - -``` -Original: 495 bytes. -Minified: 396 bytes. -Gzipped: 36 bytes. -``` - --- - -*Lib submitted by [Tyler Kellen](https://goingslowly.com/).* \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/lib/contrib.js b/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/lib/contrib.js deleted file mode 100644 index 9dcf945..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/lib/contrib.js +++ /dev/null @@ -1,111 +0,0 @@ -/* - * grunt-lib-contrib - * http://gruntjs.com/ - * - * Copyright (c) 2012 Tyler Kellen, contributors - * Licensed under the MIT license. - */ - -exports.init = function(grunt) { - 'use strict'; - - var exports = {}; - - var path = require('path'); - - exports.getNamespaceDeclaration = function(ns) { - var output = []; - var curPath = 'this'; - if (ns !== 'this') { - var nsParts = ns.split('.'); - nsParts.forEach(function(curPart, index) { - if (curPart !== 'this') { - curPath += '[' + JSON.stringify(curPart) + ']'; - output.push(curPath + ' = ' + curPath + ' || {};'); - } - }); - } - - return { - namespace: curPath, - declaration: output.join('\n') - }; - }; - - // Convert an object to an array of CLI arguments - exports.optsToArgs = function(options) { - var args = []; - - Object.keys(options).forEach(function(flag) { - var val = options[flag]; - - flag = flag.replace(/[A-Z]/g, function(match) { - return '-' + match.toLowerCase(); - }); - - if (val === true) { - args.push('--' + flag); - } - - if (grunt.util._.isString(val)) { - args.push('--' + flag, val); - } - - if (grunt.util._.isNumber(val)) { - args.push('--' + flag, '' + val); - } - - if (grunt.util._.isArray(val)) { - val.forEach(function(arrVal) { - args.push('--' + flag, arrVal); - }); - } - }); - - return args; - }; - - // Strip a path from a path. normalize both paths for best results. - exports.stripPath = function(pth, strip) { - if (strip && strip.length >= 1) { - strip = path.normalize(strip); - pth = path.normalize(pth); - pth = grunt.util._(pth).strRight(strip); - pth = grunt.util._(pth).ltrim(path.sep); - } - - return pth; - }; - - // Log min and max info - function gzipSize(src) { - return src ? require('zlib-browserify').gzipSync(src).length : 0; - } - exports.minMaxInfo = function(min, max, report) { - if (report === 'min' || report === 'gzip') { - grunt.log.writeln('Original: ' + String(max.length).green + ' bytes.'); - grunt.log.writeln('Minified: ' + String(min.length).green + ' bytes.'); - } - if (report === 'gzip') { - // Note this option is pretty slow so it is not enabled by default - grunt.log.write('Gzipped: '); - grunt.log.writeln(String(gzipSize(min)).green + ' bytes.'); - } - }; - - exports.formatForType = function(string, type, namespace, filename) { - namespace = namespace || false; - - if (type === 'amd' && namespace === false) { - string = 'return ' + string; - } else if (type === 'commonjs' && namespace === false) { - string = 'module.exports = ' + string; - } else if (type === 'amd' && namespace !== false || type === 'commonjs' && namespace !== false || type === 'js' && namespace !== false) { - string = namespace+'['+JSON.stringify(filename)+'] = '+string+';'; - } - - return string; - }; - - return exports; -}; diff --git a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/.npmignore b/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/.npmignore deleted file mode 100644 index b512c09..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/.npmignore +++ /dev/null @@ -1 +0,0 @@ -node_modules \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/index.js b/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/index.js deleted file mode 100644 index 6674043..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/index.js +++ /dev/null @@ -1,43 +0,0 @@ -const Zlib = module.exports = require('./zlib'); - -// the least I can do is make error messages for the rest of the node.js/zlib api. -// (thanks, dominictarr) -function error () { - var m = [].slice.call(arguments).join(' ') - throw new Error([ - m, - 'we accept pull requests', - 'http://github.com/brianloveswords/zlib-browserify' - ].join('\n')) -} - -;['createGzip' -, 'createGunzip' -, 'createDeflate' -, 'createDeflateRaw' -, 'createInflate' -, 'createInflateRaw' -, 'createUnzip' -, 'Gzip' -, 'Gunzip' -, 'Inflate' -, 'InflateRaw' -, 'Deflate' -, 'DeflateRaw' -, 'Unzip' -, 'inflateRaw' -, 'deflateRaw'].forEach(function (name) { - Zlib[name] = function () { - error('sorry,', name, 'is not implemented yet') - } -}); - -const _deflate = Zlib.deflate; -const _gzip = Zlib.gzip; - -Zlib.deflate = function deflate(stringOrBuffer, callback) { - return _deflate(Buffer(stringOrBuffer), callback); -}; -Zlib.gzip = function gzip(stringOrBuffer, callback) { - return _gzip(Buffer(stringOrBuffer), callback); -}; \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/package.json b/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/package.json deleted file mode 100644 index f4340b0..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/package.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "zlib-browserify", - "version": "0.0.1", - "description": "Wrapper for zlib.js to allow for browserifyication", - "main": "index.js", - "directories": { - "test": "test" - }, - "dependencies": {}, - "devDependencies": { - "tap": "~0.3.3" - }, - "scripts": { - "test": "./node_modules/tap test/*.test.js" - }, - "repository": { - "type": "git", - "url": "git://github.com/brianloveswords/zlib-browserify.git" - }, - "keywords": [ - "zlib", - "browserify" - ], - "author": { - "name": "Brian J. Brennan" - }, - "license": "MIT", - "gitHead": "4be9419f0e8e9dec9629c8a538b33a4efd7df17b", - "readmeFilename": "readme.md", - "readme": "Zlib in yo' browser.\n", - "bugs": { - "url": "https://github.com/brianloveswords/zlib-browserify/issues" - }, - "homepage": "https://github.com/brianloveswords/zlib-browserify", - "_id": "zlib-browserify@0.0.1", - "_from": "zlib-browserify@0.0.1" -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/readme.md b/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/readme.md deleted file mode 100644 index ca4a5ee..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/readme.md +++ /dev/null @@ -1 +0,0 @@ -Zlib in yo' browser. diff --git a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/test/zlib.test.js b/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/test/zlib.test.js deleted file mode 100644 index 5b7a3ce..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/test/zlib.test.js +++ /dev/null @@ -1,65 +0,0 @@ -const test = require('tap').test; -const zlibA = require('zlib'); -const zlibB = require('..'); -const crypto = require('crypto'); - -test('zlibA.deflate -> zlibB.inflate', function (t) { - const expect = crypto.randomBytes(1024); - zlibA.deflate(expect, function (err, cmpA) { - zlibB.inflate(cmpA, function (err, result) { - t.same(result, expect, 'should match'); - t.end(); - }); - }); -}); - -test('zlibB.deflate -> zlibA.inflate', function (t) { - const expect = crypto.randomBytes(1024); - zlibB.deflate(expect, function (err, cmpA) { - zlibA.inflate(cmpA, function (err, result) { - t.same(result, expect, 'should match'); - t.end(); - }); - }); -}); - -test('zlibB.deflate -> zlibA.inflate (string)', function (t) { - const expect = 'ohaihihihihihihihihihihihihihihihi'; - zlibB.deflate(expect, function (err, cmpA) { - zlibA.inflate(cmpA, function (err, result) { - t.same(result.toString(), expect, 'should match'); - t.end(); - }); - }); -}); - -test('zlibA.gzip -> zlibB.gunzip', function (t) { - const expect = crypto.randomBytes(1024); - zlibA.gzip(expect, function (err, cmpA) { - zlibB.gunzip(cmpA, function (err, result) { - t.same(result, expect, 'should match'); - t.end(); - }); - }); -}); - -test('zlibB.gzip -> zlibA.gunzip', function (t) { - const expect = crypto.randomBytes(1024); - zlibB.gzip(expect, function (err, cmpA) { - zlibA.gunzip(cmpA, function (err, result) { - t.same(result, expect, 'should match'); - t.end(); - }); - }); -}); - -test('zlibB.gzip -> zlibA.gunzip', function (t) { - const expect = 'lololololoollolololoololololololololololololololololololololol'; - zlibB.gzip(expect, function (err, cmpA) { - zlibA.gunzip(cmpA, function (err, result) { - t.same(result.toString(), expect, 'should match'); - t.end(); - }); - }); -}); - diff --git a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/zlib.js b/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/zlib.js deleted file mode 100644 index a9ea566..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/node_modules/zlib-browserify/zlib.js +++ /dev/null @@ -1,55 +0,0 @@ -/** @license zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License */ -(function() {'use strict';function m(c){throw c;}var r=void 0,u=!0;var B="undefined"!==typeof Uint8Array&&"undefined"!==typeof Uint16Array&&"undefined"!==typeof Uint32Array;function aa(c){if("string"===typeof c){var a=c.split(""),b,e;b=0;for(e=a.length;b>>0;c=a}for(var f=1,d=0,g=c.length,h,j=0;0>>0};function I(c,a){this.index="number"===typeof a?a:0;this.n=0;this.buffer=c instanceof(B?Uint8Array:Array)?c:new (B?Uint8Array:Array)(32768);2*this.buffer.length<=this.index&&m(Error("invalid index"));this.buffer.length<=this.index&&this.f()}I.prototype.f=function(){var c=this.buffer,a,b=c.length,e=new (B?Uint8Array:Array)(b<<1);if(B)e.set(c);else for(a=0;a>>8&255]<<16|K[c>>>16&255]<<8|K[c>>>24&255])>>32-a:K[c]>>8-a);if(8>a+d)g=g<>a-h-1&1,8===++d&&(d=0,e[f++]=K[g],g=0,f===e.length&&(e=this.f()));e[f]=g;this.buffer=e;this.n=d;this.index=f};I.prototype.finish=function(){var c=this.buffer,a=this.index,b;0Q;++Q){for(var R=Q,ga=R,ha=7,R=R>>>1;R;R>>>=1)ga<<=1,ga|=R&1,--ha;ba[Q]=(ga<>>0}var K=ba;var S={k:function(c,a,b){return S.update(c,0,a,b)},update:function(c,a,b,e){for(var f=S.L,d="number"===typeof b?b:b=0,g="number"===typeof e?e:c.length,a=a^4294967295,d=g&7;d--;++b)a=a>>>8^f[(a^c[b])&255];for(d=g>>3;d--;b+=8)a=a>>>8^f[(a^c[b])&255],a=a>>>8^f[(a^c[b+1])&255],a=a>>>8^f[(a^c[b+2])&255],a=a>>>8^f[(a^c[b+3])&255],a=a>>>8^f[(a^c[b+4])&255],a=a>>>8^f[(a^c[b+5])&255],a=a>>>8^f[(a^c[b+6])&255],a=a>>>8^f[(a^c[b+7])&255];return(a^4294967295)>>>0}},ia=S,ja,ka=[0,1996959894,3993919788,2567524794, -124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304, -3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486, -2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580, -2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,2936675148,906185462,1090812512,3747672003,2825379669,829329135,1181335161,3412177804,3160834842,628085408,1382605366,3423369109,3138078467,570562233,1426400815,3317316542,2998733608,733239954,1555261956,3268935591,3050360625,752459403,1541320221, -2607071920,3965973030,1969922972,40735498,2617837225,3943577151,1913087877,83908371,2512341634,3803740692,2075208622,213261112,2463272603,3855990285,2094854071,198958881,2262029012,4057260610,1759359992,534414190,2176718541,4139329115,1873836001,414664567,2282248934,4279200368,1711684554,285281116,2405801727,4167216745,1634467795,376229701,2685067896,3608007406,1308918612,956543938,2808555105,3495958263,1231636301,1047427035,2932959818,3654703836,1088359270,936918E3,2847714899,3736837829,1202900863, -817233897,3183342108,3401237130,1404277552,615818150,3134207493,3453421203,1423857449,601450431,3009837614,3294710456,1567103746,711928724,3020668471,3272380065,1510334235,755167117];ja=B?new Uint32Array(ka):ka;ia.L=ja;function na(){};function oa(c){this.buffer=new (B?Uint16Array:Array)(2*c);this.length=0}oa.prototype.getParent=function(c){return 2*((c-2)/4|0)};oa.prototype.push=function(c,a){var b,e,f=this.buffer,d;b=this.length;f[this.length++]=a;for(f[this.length++]=c;0f[e])d=f[b],f[b]=f[e],f[e]=d,d=f[b+1],f[b+1]=f[e+1],f[e+1]=d,b=e;else break;return this.length}; -oa.prototype.pop=function(){var c,a,b=this.buffer,e,f,d;a=b[0];c=b[1];this.length-=2;b[0]=b[this.length];b[1]=b[this.length+1];for(d=0;;){f=2*d+2;if(f>=this.length)break;f+2b[f]&&(f+=2);if(b[f]>b[d])e=b[d],b[d]=b[f],b[f]=e,e=b[d+1],b[d+1]=b[f+1],b[f+1]=e;else break;d=f}return{index:c,value:a,length:this.length}};function T(c){var a=c.length,b=0,e=Number.POSITIVE_INFINITY,f,d,g,h,j,i,q,l,k;for(l=0;lb&&(b=c[l]),c[l]>=1;for(k=i;kU;U++)switch(u){case 143>=U:sa.push([U+48,8]);break;case 255>=U:sa.push([U-144+400,9]);break;case 279>=U:sa.push([U-256+0,7]);break;case 287>=U:sa.push([U-280+192,8]);break;default:m("invalid literal: "+U)} -pa.prototype.h=function(){var c,a,b,e,f=this.input;switch(this.l){case 0:b=0;for(e=f.length;b>>8&255;k[p++]=i&255;k[p++]=i>>>8&255;if(B)k.set(d,p),p+=d.length,k=k.subarray(0,p);else{q=0;for(l=d.length;qz)for(;0z?z:138,H>z-3&&H=H?(L[J++]=17,L[J++]=H-3,O[17]++):(L[J++]=18,L[J++]=H-11,O[18]++),z-=H;else if(L[J++]=M[y],O[M[y]]++,z--,3>z)for(;0z?z:6,H>z-3&&HG;G++)va[G]=la[ca[G]];for(D=19;4=c:return[265,c-11,1];case 14>=c:return[266,c-13,1];case 16>=c:return[267,c-15,1];case 18>=c:return[268,c-17,1];case 22>=c:return[269,c-19,2];case 26>=c:return[270,c-23,2];case 30>=c:return[271,c-27,2];case 34>=c:return[272,c- -31,2];case 42>=c:return[273,c-35,3];case 50>=c:return[274,c-43,3];case 58>=c:return[275,c-51,3];case 66>=c:return[276,c-59,3];case 82>=c:return[277,c-67,4];case 98>=c:return[278,c-83,4];case 114>=c:return[279,c-99,4];case 130>=c:return[280,c-115,4];case 162>=c:return[281,c-131,5];case 194>=c:return[282,c-163,5];case 226>=c:return[283,c-195,5];case 257>=c:return[284,c-227,5];case 258===c:return[285,c-258,0];default:m("invalid length: "+c)}}var Ba=[],Aa,Ca; -for(Aa=3;258>=Aa;Aa++)Ca=za(),Ba[Aa]=Ca[2]<<24|Ca[1]<<16|Ca[0];var Da=B?new Uint32Array(Ba):Ba; -function ta(c,a){function b(a,c){var b=a.N,d=[],e=0,f;f=Da[a.length];d[e++]=f&65535;d[e++]=f>>16&255;d[e++]=f>>24;var g;switch(u){case 1===b:g=[0,b-1,0];break;case 2===b:g=[1,b-2,0];break;case 3===b:g=[2,b-3,0];break;case 4===b:g=[3,b-4,0];break;case 6>=b:g=[4,b-5,1];break;case 8>=b:g=[5,b-7,1];break;case 12>=b:g=[6,b-9,2];break;case 16>=b:g=[7,b-13,2];break;case 24>=b:g=[8,b-17,3];break;case 32>=b:g=[9,b-25,3];break;case 48>=b:g=[10,b-33,4];break;case 64>=b:g=[11,b-49,4];break;case 96>=b:g=[12,b- -65,5];break;case 128>=b:g=[13,b-97,5];break;case 192>=b:g=[14,b-129,6];break;case 256>=b:g=[15,b-193,6];break;case 384>=b:g=[16,b-257,7];break;case 512>=b:g=[17,b-385,7];break;case 768>=b:g=[18,b-513,8];break;case 1024>=b:g=[19,b-769,8];break;case 1536>=b:g=[20,b-1025,9];break;case 2048>=b:g=[21,b-1537,9];break;case 3072>=b:g=[22,b-2049,10];break;case 4096>=b:g=[23,b-3073,10];break;case 6144>=b:g=[24,b-4097,11];break;case 8192>=b:g=[25,b-6145,11];break;case 12288>=b:g=[26,b-8193,12];break;case 16384>= -b:g=[27,b-12289,12];break;case 24576>=b:g=[28,b-16385,13];break;case 32768>=b:g=[29,b-24577,13];break;default:m("invalid distance")}f=g;d[e++]=f[0];d[e++]=f[1];d[e++]=f[2];var h,i;h=0;for(i=d.length;h=d;)v[d++]=0;for(d=0;29>=d;)x[d++]=0}v[256]=1;e=0;for(f=a.length;e=f){l&&b(l,-1);d=0;for(g=f-e;ds&&e+sn&&(C=A,n=s);if(258===s)break}q=new xa(n,e-C);l?l.length2*k[n-1]+p[n]&&(k[n]=2*k[n-1]+p[n]),v[n]=Array(k[n]),x[n]=Array(k[n]);for(C=0;Ch[C]?(v[n][s]=E,x[n][s]=l,D+=2): -(v[n][s]=h[C],x[n][s]=C,++C);F[n]=0;1===p[n]&&b(n)}j=t;i=0;for(q=g.length;i>>=1}return a};function Ea(c,a){this.input=c;this.a=new (B?Uint8Array:Array)(32768);this.l=Fa.u;var b={},e;if((a||!(a={}))&&"number"===typeof a.compressionType)this.l=a.compressionType;for(e in a)b[e]=a[e];b.outputBuffer=this.a;this.H=new pa(this.input,b)}var Fa=ra; -Ea.prototype.h=function(){var c,a,b,e,f,d,g,h=0;g=this.a;c=Ga;switch(c){case Ga:a=Math.LOG2E*Math.log(32768)-8;break;default:m(Error("invalid compression method"))}b=a<<4|c;g[h++]=b;switch(c){case Ga:switch(this.l){case Fa.NONE:f=0;break;case Fa.K:f=1;break;case Fa.u:f=2;break;default:m(Error("unsupported compression type"))}break;default:m(Error("invalid compression method"))}e=f<<6|0;g[h++]=e|31-(256*b+e)%31;d=aa(this.input);this.H.b=h;g=this.H.h();h=g.length;B&&(g=new Uint8Array(g.buffer),g.length<= -h+4&&(this.a=new Uint8Array(g.length+4),this.a.set(g),g=this.a),g=g.subarray(0,h+4));g[h++]=d>>24&255;g[h++]=d>>16&255;g[h++]=d>>8&255;g[h++]=d&255;return g};function Ha(c,a){this.input=c;this.b=this.c=0;this.g={};a&&(a.flags&&(this.g=a.flags),"string"===typeof a.filename&&(this.filename=a.filename),"string"===typeof a.comment&&(this.comment=a.comment),a.deflateOptions&&(this.m=a.deflateOptions));this.m||(this.m={})} -Ha.prototype.h=function(){var c,a,b,e,f,d,g,h,j=new (B?Uint8Array:Array)(32768),i=0,q=this.input,l=this.c,k=this.filename,p=this.comment;j[i++]=31;j[i++]=139;j[i++]=8;c=0;this.g.fname&&(c|=Ia);this.g.fcomment&&(c|=Ja);this.g.fhcrc&&(c|=Ka);j[i++]=c;a=(Date.now?Date.now():+new Date)/1E3|0;j[i++]=a&255;j[i++]=a>>>8&255;j[i++]=a>>>16&255;j[i++]=a>>>24&255;j[i++]=0;j[i++]=Ya;if(this.g.fname!==r){g=0;for(h=k.length;g>>8&255),j[i++]=d&255;j[i++]=0}if(this.g.comment){g= -0;for(h=p.length;g>>8&255),j[i++]=d&255;j[i++]=0}this.g.fhcrc&&(b=S.k(j,0,i)&65535,j[i++]=b&255,j[i++]=b>>>8&255);this.m.outputBuffer=j;this.m.outputIndex=i;f=new pa(q,this.m);j=f.h();i=f.b;B&&(i+8>j.buffer.byteLength?(this.a=new Uint8Array(i+8),this.a.set(new Uint8Array(j.buffer)),j=this.a):j=new Uint8Array(j.buffer));e=S.k(q);j[i++]=e&255;j[i++]=e>>>8&255;j[i++]=e>>>16&255;j[i++]=e>>>24&255;h=q.length;j[i++]=h&255;j[i++]=h>>>8&255;j[i++]=h>>>16&255;j[i++]= -h>>>24&255;this.c=l;B&&i>>=1;switch(c){case 0:var a=this.input,b=this.c,e=this.a,f=this.b,d=r,g=r,h=r,j=e.length,i=r;this.e=this.j=0;d=a[b++];d===r&&m(Error("invalid uncompressed block header: LEN (first byte)"));g=d;d=a[b++];d===r&&m(Error("invalid uncompressed block header: LEN (second byte)"));g|=d<<8;d=a[b++];d===r&&m(Error("invalid uncompressed block header: NLEN (first byte)"));h=d;d=a[b++];d===r&&m(Error("invalid uncompressed block header: NLEN (second byte)"));h|= -d<<8;g===~h&&m(Error("invalid uncompressed block header: length verify"));b+g>a.length&&m(Error("input buffer is broken"));switch(this.r){case $a:for(;f+g>e.length;){i=j-f;g-=i;if(B)e.set(a.subarray(b,b+i),f),f+=i,b+=i;else for(;i--;)e[f++]=a[b++];this.b=f;e=this.f();f=this.b}break;case Za:for(;f+g>e.length;)e=this.f({B:2});break;default:m(Error("invalid inflate mode"))}if(B)e.set(a.subarray(b,b+g),f),f+=g,b+=g;else for(;g--;)e[f++]=a[b++];this.c=b;this.b=f;this.a=e;break;case 1:this.s(ab,bb);break; -case 2:cb(this);break;default:m(Error("unknown BTYPE: "+c))}}return this.z()}; -var db=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],eb=B?new Uint16Array(db):db,fb=[3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,258,258],gb=B?new Uint16Array(fb):fb,hb=[0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0],ib=B?new Uint8Array(hb):hb,jb=[1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577],kb=B?new Uint16Array(jb):jb,lb=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10, -10,11,11,12,12,13,13],mb=B?new Uint8Array(lb):lb,nb=new (B?Uint8Array:Array)(288),Y,ob;Y=0;for(ob=nb.length;Y=Y?8:255>=Y?9:279>=Y?7:8;var ab=T(nb),pb=new (B?Uint8Array:Array)(30),qb,rb;qb=0;for(rb=pb.length;qb>>a;c.e=e-a;c.c=d;return g} -function sb(c,a){for(var b=c.j,e=c.e,f=c.input,d=c.c,g=a[0],h=a[1],j,i,q;e>>16;c.j=b>>q;c.e=e-q;c.c=d;return i&65535} -function cb(c){function a(a,b,c){var d,f,e,g;for(g=0;gd)e>=f&&(this.b=e,b=this.f(),e=this.b),b[e++]=d;else{g=d-257;j=gb[g];0=f&&(this.b=e,b=this.f(),e=this.b);for(;j--;)b[e]=b[e++-h]}for(;8<=this.e;)this.e-=8,this.c--;this.b=e}; -W.prototype.Q=function(c,a){var b=this.a,e=this.b;this.A=c;for(var f=b.length,d,g,h,j;256!==(d=sb(this,c));)if(256>d)e>=f&&(b=this.f(),f=b.length),b[e++]=d;else{g=d-257;j=gb[g];0f&&(b=this.f(),f=b.length);for(;j--;)b[e]=b[e++-h]}for(;8<=this.e;)this.e-=8,this.c--;this.b=e}; -W.prototype.f=function(){var c=new (B?Uint8Array:Array)(this.b-32768),a=this.b-32768,b,e,f=this.a;if(B)c.set(f.subarray(32768,c.length));else{b=0;for(e=c.length;bb;++b)f[b]=f[a+b];this.b=32768;return f}; -W.prototype.R=function(c){var a,b=this.input.length/this.c+1|0,e,f,d,g=this.input,h=this.a;c&&("number"===typeof c.B&&(b=c.B),"number"===typeof c.M&&(b+=c.M));2>b?(e=(g.length-this.c)/this.A[2],d=258*(e/2)|0,f=da&&(this.a.length=a),c=this.a);return this.buffer=c};function tb(c){this.input=c;this.c=0;this.member=[]} -tb.prototype.i=function(){for(var c=this.input.length;this.c>>0;S.k(f)!==q&&m(Error("invalid CRC-32 checksum: 0x"+S.k(f).toString(16)+" / 0x"+q.toString(16))); -a.Y=b=(l[k++]|l[k++]<<8|l[k++]<<16|l[k++]<<24)>>>0;(f.length&4294967295)!==b&&m(Error("invalid input size: "+(f.length&4294967295)+" / "+b));this.member.push(a);this.c=k}var p=this.member,t,v,x=0,F=0,w;t=0;for(v=p.length;t>>0,b!==aa(a)&&m(Error("invalid adler-32 checksum")));return a};exports.deflate=vb;exports.deflateSync=wb;exports.inflate=xb;exports.inflateSync=yb;exports.gzip=zb;exports.gzipSync=Ab;exports.gunzip=Bb;exports.gunzipSync=Cb;function vb(c,a,b){process.nextTick(function(){var e,f;try{f=wb(c,b)}catch(d){e=d}a(e,f)})}function wb(c,a){var b;b=(new Ea(c)).h();a||(a={});return a.G?b:Db(b)}function xb(c,a,b){process.nextTick(function(){var e,f;try{f=yb(c,b)}catch(d){e=d}a(e,f)})} -function yb(c,a){var b;c.subarray=c.slice;b=(new ub(c)).i();a||(a={});return a.noBuffer?b:Db(b)}function zb(c,a,b){process.nextTick(function(){var e,f;try{f=Ab(c,b)}catch(d){e=d}a(e,f)})}function Ab(c,a){var b;c.subarray=c.slice;b=(new Ha(c)).h();a||(a={});return a.G?b:Db(b)}function Bb(c,a,b){process.nextTick(function(){var e,f;try{f=Cb(c,b)}catch(d){e=d}a(e,f)})}function Cb(c,a){var b;c.subarray=c.slice;b=(new tb(c)).i();a||(a={});return a.G?b:Db(b)} -function Db(c){var a=new Buffer(c.length),b,e;b=0;for(e=c.length;b=$?8:255>=$?9:279>=$?7:8;T(Jb);var Lb=new (B?Uint8Array:Array)(30),Mb,Nb;Mb=0;for(Nb=Lb.length;Mb= 0.8.0" - }, - "scripts": { - "test": "grunt test" - }, - "devDependencies": { - "grunt-contrib-jshint": "~0.1.1", - "grunt-contrib-nodeunit": "~0.1.2", - "grunt": "~0.4.0" - }, - "main": "lib/contrib", - "dependencies": { - "zlib-browserify": "0.0.1" - }, - "contributors": [ - { - "name": "Tyler Kellen", - "url": "http://goingslowly.com/" - }, - { - "name": "Chris Talkington", - "url": "http://christalkington.com/" - }, - { - "name": "Larry Davis", - "url": "http://lazd.net/" - }, - { - "name": "Sindre Sorhus", - "url": "http://sindresorhus.com" - } - ], - "readme": "# grunt-lib-contrib [![Build Status](https://secure.travis-ci.org/gruntjs/grunt-lib-contrib.png?branch=master)](http://travis-ci.org/gruntjs/grunt-lib-contrib)\n\n> Common functionality shared across grunt-contrib tasks.\n\nThe purpose of grunt-lib-contrib is to explore solutions to common problems task writers encounter, and to ease the upgrade path for contrib tasks.\n\n**These APIs should be considered highly unstable. Depend on them at your own risk!**\n\n_Over time, some of the functionality provided here may be incorporated directly into grunt for mainstream use. Until then, you may require `grunt-lib-contrib` as a dependency in your projects, but be very careful to specify an exact version number instead of a range, as backwards-incompatible changes are likely to be introduced._\n\n### Helper Functions\n\n#### getNamespaceDeclaration(ns)\n\nThis helper is used to build JS namespace declarations.\n\n#### optsToArgs(options)\n\nConvert an object to an array of CLI arguments, which can be used with `child_process.spawn()`.\n\n```js\n// Example\n{\n fooBar: 'a', // ['--foo-bar', 'a']\n fooBar: 1, // ['--foo-bar', '1']\n fooBar: true, // ['--foo-bar']\n fooBar: false, //\n fooBar: ['a', 'b'] // ['--foo-bar', 'a', '--foo-bar', 'b']\n}\n```\n\n#### stripPath(pth, strip)\n\nStrip a path from a path. normalize both paths for best results.\n\n#### minMaxInfo(min, max, report)\n\nHelper for logging compressed, uncompressed and gzipped sizes of strings.\n\n#### report\nChoices: `false`, `'min'`, `'gzip'`\nDefault: `false`\n\nEither do not report anything, report only minification result, or report minification and gzip results.\n\n**Important** Including `'gzip'` results can make this task 5-10x slower depending on the size of the file.\n\n\n```js\nvar max = grunt.file.read('max.js');\nvar min = minify(max);\nminMaxInfo(min, max, 'gzip');\n```\n\nWould print:\n\n```\nOriginal: 495 bytes.\nMinified: 396 bytes.\nGzipped: 36 bytes.\n```\n\n--\n\n*Lib submitted by [Tyler Kellen](https://goingslowly.com/).*", - "readmeFilename": "README.md", - "_id": "grunt-lib-contrib@0.6.1", - "_from": "grunt-lib-contrib@~0.6.1" -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/test/lib_test.js b/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/test/lib_test.js deleted file mode 100644 index 446864a..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/grunt-lib-contrib/test/lib_test.js +++ /dev/null @@ -1,233 +0,0 @@ -var grunt = require('grunt'); -var helper = require('../lib/contrib.js').init(grunt); - -exports.lib = { - getNamespaceDeclaration: function(test) { - 'use strict'; - - test.expect(10); - - // Both test should result in this[JST] - var expected = { - namespace: 'this["JST"]', - declaration: 'this["JST"] = this["JST"] || {};' - }; - - var actual = helper.getNamespaceDeclaration("this.JST"); - test.equal(expected.namespace, actual.namespace, 'namespace with square brackets incorrect'); - test.equal(expected.declaration, actual.declaration, 'namespace declaration with square brackets incorrect'); - - actual = helper.getNamespaceDeclaration("JST"); - test.equal(expected.namespace, actual.namespace, 'namespace with square brackets incorrect'); - test.equal(expected.declaration, actual.declaration, 'namespace declaration with square brackets incorrect'); - - // Templates should be declared globally if this provided - expected = { - namespace: "this", - declaration: "" - }; - - actual = helper.getNamespaceDeclaration("this"); - test.equal(expected.namespace, actual.namespace, 'namespace with square brackets incorrect'); - test.equal(expected.declaration, actual.declaration, 'namespace declaration with square brackets incorrect'); - - // Nested namespace declaration - expected = { - namespace: 'this["GUI"]["Templates"]["Main"]', - declaration: 'this["GUI"] = this["GUI"] || {};\n' + - 'this["GUI"]["Templates"] = this["GUI"]["Templates"] || {};\n' + - 'this["GUI"]["Templates"]["Main"] = this["GUI"]["Templates"]["Main"] || {};' - }; - - actual = helper.getNamespaceDeclaration("GUI.Templates.Main"); - test.equal(expected.namespace, actual.namespace, 'namespace incorrect'); - test.equal(expected.declaration, actual.declaration, 'namespace declaration incorrect'); - - // Namespace that contains square brackets - expected = { - namespace: 'this["main"]["[test]"]["[test2]"]', - declaration: 'this["main"] = this["main"] || {};\n' + - 'this["main"]["[test]"] = this["main"]["[test]"] || {};\n' + - 'this["main"]["[test]"]["[test2]"] = this["main"]["[test]"]["[test2]"] || {};' - }; - - actual = helper.getNamespaceDeclaration("main.[test].[test2]"); - test.equal(expected.namespace, actual.namespace, 'namespace with square brackets incorrect'); - test.equal(expected.declaration, actual.declaration, 'namespace declaration with square brackets incorrect'); - - test.done(); - }, - optsToArgs: function(test) { - 'use strict'; - - test.expect(1); - - var fixture = { - key: 'a', - key2: 1, - key3: true, - key4: false, - key5: ['a', 'b'] - }; - var expected = ['--key', 'a', '--key2', '1', '--key3', '--key5', 'a', '--key5', 'b' ].toString(); - var actual = helper.optsToArgs(fixture).toString(); - test.equal(expected, actual, 'should convert object to array of CLI arguments'); - - test.done(); - }, - stripPath: function(test) { - 'use strict'; - var path = require('path'); - - test.expect(4); - - var actual = helper.stripPath('path1/path2', 'path1'); - var expected = 'path2'; - test.equal(expected, actual, 'should strip path from a directory path and trim it.'); - - actual = helper.stripPath('path1/path2/path3/path4', 'path1/path2'); - expected = path.normalize('path3/path4'); - test.equal(expected, actual, 'should strip path from a directory path and trim it. (deep)'); - - actual = helper.stripPath('path1/file.ext', 'path1'); - expected = 'file.ext'; - test.equal(expected, actual, 'should strip path from a file path and trim it.'); - - actual = helper.stripPath('path1/path2/path3/path4/file.ext', 'path1/path2'); - expected = path.normalize('path3/path4/file.ext'); - test.equal(expected, actual, 'should strip path from a file path and trim it. (deep)'); - - test.done(); - }, - minMaxInfo: function(test) { - 'use strict'; - test.expect(3); - - var max = new Array(100).join('blah '); - var min = max.replace(/\s+/g, ''); - - var actual; - var expected; - - grunt.util.hooker.hook(grunt.log, 'writeln', { - pre: function(result) { - actual += grunt.log.uncolor(result) + grunt.util.linefeed; - return grunt.util.hooker.preempt(); - } - }); - - grunt.util.hooker.hook(grunt.log, 'write', { - pre: function(result) { - actual += grunt.log.uncolor(result); - return grunt.util.hooker.preempt(); - } - }); - - - // No reporting option - actual = ''; - expected = ''; - - helper.minMaxInfo(min, max); - test.equal(expected, actual, 'should not have reported min and max info.'); - - // Report minification results - actual = ''; - expected = [ - 'Original: 495 bytes.', - 'Minified: 396 bytes.' - ].join(grunt.util.linefeed) + grunt.util.linefeed; - - helper.minMaxInfo(min, max, 'min'); - test.equal(expected, actual, 'should have logged min and max info.'); - - // Report minification and gzip results - actual = ''; - expected = [ - 'Original: 495 bytes.', - 'Minified: 396 bytes.', - 'Gzipped: 36 bytes.' - ].join(grunt.util.linefeed) + grunt.util.linefeed; - - helper.minMaxInfo(min, max, 'gzip'); - test.equal(expected, actual, 'should have logged min, max, gzip info.'); - - grunt.util.hooker.unhook(grunt.log, 'writeln'); - grunt.util.hooker.unhook(grunt.log, 'write'); - test.done(); - }, - formatToType: { - amd: function(test) { - - 'use strict'; - - test.expect(2); - - var string = function () { }; - - var actual = helper.formatForType(string, 'amd', 'JST', 'test'); - var expected = 'JST["test"] = function () { };'; - test.equal(expected, actual, 'should format string to amd with namespace'); - - actual = helper.formatForType(string, 'amd'); - expected = "return function () { }"; - test.equal(expected, actual, 'should format string to amd'); - - test.done(); - }, - commonjs: function(test) { - - 'use strict'; - - test.expect(2); - - var string = function () { }; - - var actual = helper.formatForType(string, 'commonjs', 'JST', 'test'); - var expected = 'JST["test"] = function () { };'; - test.equal(expected, actual, 'should format string to commonjs with namespace'); - - actual = helper.formatForType(string, 'commonjs'); - expected = "module.exports = function () { }"; - test.equal(expected, actual, 'should format string to commonjs'); - - test.done(); - }, - js: function(test) { - - 'use strict'; - - test.expect(2); - - var string = function () { }; - - var actual = helper.formatForType(string, 'js', 'JST', 'test'); - var expected = 'JST["test"] = function () { };'; - test.equal(expected, actual, 'should format string to js with namespace'); - - actual = helper.formatForType(string, 'js'); - expected = 'function () { }'; - test.equal(expected, actual, 'should format string to js'); - - test.done(); - }, - html: function(test) { - - 'use strict'; - - test.expect(2); - - var string = function () { }; - - var actual = helper.formatForType(string, 'html', 'JST', 'test'); - var expected = 'function () { }'; - test.equal(expected, actual, 'should format string to html with namespace'); - - actual = helper.formatForType(string, 'html'); - expected = 'function () { }'; - test.equal(expected, actual, 'should format string to html'); - - test.done(); - } - } -}; diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/.npmignore b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/.npmignore deleted file mode 100644 index 94fceeb..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/.npmignore +++ /dev/null @@ -1,2 +0,0 @@ -tmp/ -node_modules/ diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/.travis.yml b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/.travis.yml deleted file mode 100644 index 3d9a761..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/.travis.yml +++ /dev/null @@ -1,6 +0,0 @@ -language: node_js -node_js: - - "0.4" - - "0.8" - - "0.10" - - "0.11" diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/README.md b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/README.md index 27d06cd..f3eb5f7 100644 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/README.md +++ b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/README.md @@ -1,6 +1,6 @@ UglifyJS 2 ========== -[![Build Status](https://travis-ci.org/mishoo/UglifyJS2.png)](https://travis-ci.org/mishoo/UglifyJS2) +[![Build Status](https://travis-ci.org/mishoo/UglifyJS2.svg)](https://travis-ci.org/mishoo/UglifyJS2) UglifyJS is a JavaScript parser, minifier, compressor or beautifier toolkit. @@ -44,73 +44,95 @@ variable/function declared in another file will be matched properly. If you want to read from STDIN instead, pass a single dash instead of input files. +If you wish to pass your options before the input files, separate the two with +a double dash to prevent input files being used as option arguments: + + uglifyjs --compress --mangle -- input.js + The available options are: ``` - --source-map Specify an output file where to generate source map. - [string] - --source-map-root The path to the original source to be included in the - source map. [string] - --source-map-url The path to the source map to be added in //# - sourceMappingURL. Defaults to the value passed with - --source-map. [string] - --source-map-include-sources - Pass this flag if you want to include the content of - source files in the source map as sourcesContent - property. [boolean] - --in-source-map Input source map, useful if you're compressing JS that was - generated from some other original code. - --screw-ie8 Pass this flag if you don't care about full compliance - with Internet Explorer 6-8 quirks (by default UglifyJS - will try to be IE-proof). [boolean] - --expr Parse a single expression, rather than a program (for - parsing JSON) [boolean] - -p, --prefix Skip prefix for original filenames that appear in source - maps. For example -p 3 will drop 3 directories from file - names and ensure they are relative paths. You can also - specify -p relative, which will make UglifyJS figure out - itself the relative paths between original sources, the - source map and the output file. [string] - -o, --output Output file (default STDOUT). - -b, --beautify Beautify output/specify output options. [string] - -m, --mangle Mangle names/pass mangler options. [string] - -r, --reserved Reserved names to exclude from mangling. - -c, --compress Enable compressor/pass compressor options. Pass options - like -c hoist_vars=false,if_return=false. Use -c with no - argument to use the default compression options. [string] - -d, --define Global definitions [string] - -e, --enclose Embed everything in a big function, with a configurable - parameter/argument list. [string] - --comments Preserve copyright comments in the output. By default this - works like Google Closure, keeping JSDoc-style comments - that contain "@license" or "@preserve". You can optionally - pass one of the following arguments to this flag: - - "all" to keep all comments - - a valid JS regexp (needs to start with a slash) to keep - only comments that match. - Note that currently not *all* comments can be kept when - compression is on, because of dead code removal or - cascading statements into sequences. [string] - --preamble Preamble to prepend to the output. You can use this to - insert a comment, for example for licensing information. - This will not be parsed, but the source map will adjust - for its presence. - --stats Display operations run time on STDERR. [boolean] - --acorn Use Acorn for parsing. [boolean] - --spidermonkey Assume input files are SpiderMonkey AST format (as JSON). - [boolean] - --self Build itself (UglifyJS2) as a library (implies - --wrap=UglifyJS --export-all) [boolean] - --wrap Embed everything in a big function, making the “exports” - and “global” variables available. You need to pass an - argument to this option to specify the name that your - module will take when included in, say, a browser. - [string] - --export-all Only used when --wrap, this tells UglifyJS to add code to - automatically export all globals. [boolean] - --lint Display some scope warnings [boolean] - -v, --verbose Verbose [boolean] - -V, --version Print version number and exit. [boolean] + --source-map Specify an output file where to generate source + map. + --source-map-root The path to the original source to be included + in the source map. + --source-map-url The path to the source map to be added in //# + sourceMappingURL. Defaults to the value passed + with --source-map. + --source-map-include-sources Pass this flag if you want to include the + content of source files in the source map as + sourcesContent property. + --in-source-map Input source map, useful if you're compressing + JS that was generated from some other original + code. + --screw-ie8 Pass this flag if you don't care about full + compliance with Internet Explorer 6-8 quirks + (by default UglifyJS will try to be IE-proof). + --expr Parse a single expression, rather than a + program (for parsing JSON) + -p, --prefix Skip prefix for original filenames that appear + in source maps. For example -p 3 will drop 3 + directories from file names and ensure they are + relative paths. You can also specify -p + relative, which will make UglifyJS figure out + itself the relative paths between original + sources, the source map and the output file. + -o, --output Output file (default STDOUT). + -b, --beautify Beautify output/specify output options. + -m, --mangle Mangle names/pass mangler options. + -r, --reserved Reserved names to exclude from mangling. + -c, --compress Enable compressor/pass compressor options. Pass + options like -c + hoist_vars=false,if_return=false. Use -c with + no argument to use the default compression + options. + -d, --define Global definitions + -e, --enclose Embed everything in a big function, with a + configurable parameter/argument list. + --comments Preserve copyright comments in the output. By + default this works like Google Closure, keeping + JSDoc-style comments that contain "@license" or + "@preserve". You can optionally pass one of the + following arguments to this flag: + - "all" to keep all comments + - a valid JS regexp (needs to start with a + slash) to keep only comments that match. + Note that currently not *all* comments can be + kept when compression is on, because of dead + code removal or cascading statements into + sequences. + --preamble Preamble to prepend to the output. You can use + this to insert a comment, for example for + licensing information. This will not be + parsed, but the source map will adjust for its + presence. + --stats Display operations run time on STDERR. + --acorn Use Acorn for parsing. + --spidermonkey Assume input files are SpiderMonkey AST format + (as JSON). + --self Build itself (UglifyJS2) as a library (implies + --wrap=UglifyJS --export-all) + --wrap Embed everything in a big function, making the + “exports” and “global” variables available. You + need to pass an argument to this option to + specify the name that your module will take + when included in, say, a browser. + --export-all Only used when --wrap, this tells UglifyJS to + add code to automatically export all globals. + --lint Display some scope warnings + -v, --verbose Verbose + -V, --version Print version number and exit. + --noerr Don't throw an error for unknown options in -c, + -b or -m. + --bare-returns Allow return outside of functions. Useful when + minifying CommonJS modules. + --keep-fnames Do not mangle/drop function names. Useful for + code relying on Function.prototype.name. + --reserved-file File containing reserved names + --reserve-domprops Make (most?) DOM properties reserved for + --mangle-props + --mangle-props Mangle property names + --name-cache File to hold mangled names mappings ``` Specify `--output` (`-o`) to declare the output file. Otherwise the output @@ -184,6 +206,69 @@ comma-separated list of names. For example: to prevent the `require`, `exports` and `$` names from being changed. +### Mangling property names (`--mangle-props`) + +**Note:** this will probably break your code. Mangling property names is a +separate step, different from variable name mangling. Pass +`--mangle-props`. It will mangle all properties that are seen in some +object literal, or that are assigned to. For example: + +```js +var x = { + foo: 1 +}; + +x.bar = 2; +x["baz"] = 3; +x[condition ? "moo" : "boo"] = 4; +console.log(x.something()); +``` + +In the above code, `foo`, `bar`, `baz`, `moo` and `boo` will be replaced +with single characters, while `something()` will be left as is. + +In order for this to be of any use, we should avoid mangling standard JS +names. For instance, if your code would contain `x.length = 10`, then +`length` becomes a candidate for mangling and it will be mangled throughout +the code, regardless if it's being used as part of your own objects or +accessing an array's length. To avoid that, you can use `--reserved-file` +to pass a filename that should contain the names to be excluded from +mangling. This file can be used both for excluding variable names and +property names. It could look like this, for example: + +```js +{ + "vars": [ "define", "require", ... ], + "props": [ "length", "prototype", ... ] +} +``` + +`--reserved-file` can be an array of file names (either a single +comma-separated argument, or you can pass multiple `--reserved-file` +arguments) — in this case it will exclude names from all those files. + +A default exclusion file is provided in `tools/domprops.json` which should +cover most standard JS and DOM properties defined in various browsers. Pass +`--reserve-domprops` to read that in. + +When you compress multiple files using this option, in order for them to +work together in the end we need to ensure somehow that one property gets +mangled to the same name in all of them. For this, pass `--name-cache +filename.json` and UglifyJS will maintain these mappings in a file which can +then be reused. It should be initially empty. Example: + +``` +rm -f /tmp/cache.json # start fresh +uglifyjs file1.js file2.js --mangle-props --name-cache /tmp/cache.json -o part1.js +uglifyjs file3.js file4.js --mangle-props --name-cache /tmp/cache.json -o part2.js +``` + +Now, `part1.js` and `part2.js` will be consistent with each other in terms +of mangled property names. + +Using the name cache is not necessary if you compress all your files in a +single call to UglifyJS. + ## Compressor options You need to pass `--compress` (`-c`) to enable the compressor. Optionally @@ -256,6 +341,10 @@ to set `true`; it's effectively a shortcut for `foo=true`). - `drop_console` -- default `false`. Pass `true` to discard calls to `console.*` functions. +- `keep_fargs` -- default `false`. Pass `true` to prevent the + compressor from discarding unused function arguments. You need this + for code which relies on `Function.length`. + ### The `unsafe` option It enables some transformations that *might* break code logic in certain @@ -263,14 +352,15 @@ contrived cases, but should be fine for most code. You might want to try it on your own code, it should reduce the minified size. Here's what happens when this flag is on: -- `new Array(1, 2, 3)` or `Array(1, 2, 3)` → `[1, 2, 3 ]` +- `new Array(1, 2, 3)` or `Array(1, 2, 3)` → `[ 1, 2, 3 ]` - `new Object()` → `{}` - `String(exp)` or `exp.toString()` → `"" + exp` - `new Object/RegExp/Function/Error/Array (...)` → we discard the `new` - `typeof foo == "undefined"` → `foo === void 0` - `void 0` → `undefined` (if there is a variable named "undefined" in scope; we do it because the variable name will be mangled, typically - reduced to a single character). + reduced to a single character) +- discards unused function arguments (affects `function.length`) ### Conditional compilation @@ -343,6 +433,13 @@ can pass additional arguments that control the code output: it will be prepended to the output literally. The source map will adjust for this text. Can be used to insert a comment containing licensing information, for example. +- `quote_style` (default `0`) -- preferred quote style for strings (affects + quoted property names and directives as well): + - `0` -- prefers double quotes, switches to single quotes when there are + more double quotes in the string itself. + - `1` -- always use single quotes + - `2` -- always use double quotes + - `3` -- always use the original quotes ### Keeping copyright notices or other comments @@ -400,6 +497,38 @@ Acorn is really fast (e.g. 250ms instead of 380ms on some 650K code), but converting the SpiderMonkey tree that Acorn produces takes another 150ms so in total it's a bit more than just using UglifyJS's own parser. +### Using UglifyJS to transform SpiderMonkey AST + +Now you can use UglifyJS as any other intermediate tool for transforming +JavaScript ASTs in SpiderMonkey format. + +Example: + +```javascript +function uglify(ast, options, mangle) { + // Conversion from SpiderMonkey AST to internal format + var uAST = UglifyJS.AST_Node.from_mozilla_ast(ast); + + // Compression + uAST.figure_out_scope(); + uAST = uAST.transform(UglifyJS.Compressor(options)); + + // Mangling (optional) + if (mangle) { + uAST.figure_out_scope(); + uAST.compute_char_frequency(); + uAST.mangle_names(); + } + + // Back-conversion to SpiderMonkey AST + return uAST.to_mozilla_ast(); +} +``` + +Check out +[original blog post](http://rreverser.com/using-mozilla-ast-with-uglifyjs/) +for details. + API Reference ------------- @@ -462,6 +591,16 @@ var result = UglifyJS.minify("compiled.js", { // same as before, it returns `code` and `map` ``` +If your input source map is not in a file, you can pass it in as an object +using the `inSourceMap` argument: + +```javascript +var result = UglifyJS.minify("compiled.js", { + inSourceMap: JSON.parse(my_source_map_string), + outSourceMap: "minified.js.map" +}); +``` + The `inSourceMap` is only used if you also request `outSourceMap` (it makes no sense otherwise). @@ -576,7 +715,7 @@ or, for a shortcut you can do: var code = compressed_ast.print_to_string(options); ``` -As usual, `options` is optional. The output stream accepts a lot of otions, +As usual, `options` is optional. The output stream accepts a lot of options, most of them documented above in section “Beautifier options”. The two which we care about here are `source_map` and `comments`. diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/bin/uglifyjs b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/bin/uglifyjs index 3a3318b..8851660 100755 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/bin/uglifyjs +++ b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/bin/uglifyjs @@ -5,12 +5,12 @@ var UglifyJS = require("../tools/node"); var sys = require("util"); -var optimist = require("optimist"); +var yargs = require("yargs"); var fs = require("fs"); var path = require("path"); var async = require("async"); var acorn; -var ARGS = optimist +var ARGS = yargs .usage("$0 input1.js [input2.js ...] [options]\n\ Use a single dash to read input from the standard input.\ \n\n\ @@ -64,6 +64,13 @@ You need to pass an argument to this option to specify the name that your module .describe("v", "Verbose") .describe("V", "Print version number and exit.") .describe("noerr", "Don't throw an error for unknown options in -c, -b or -m.") + .describe("bare-returns", "Allow return outside of functions. Useful when minifying CommonJS modules.") + .describe("keep-fnames", "Do not mangle/drop function names. Useful for code relying on Function.prototype.name.") + .describe("quotes", "Quote style (0 - auto, 1 - single, 2 - double, 3 - original)") + .describe("reserved-file", "File containing reserved names") + .describe("reserve-domprops", "Make (most?) DOM properties reserved for --mangle-props") + .describe("mangle-props", "Mangle property names") + .describe("name-cache", "File to hold mangled names mappings") .alias("p", "prefix") .alias("o", "output") @@ -75,18 +82,27 @@ You need to pass an argument to this option to specify the name that your module .alias("r", "reserved") .alias("V", "version") .alias("e", "enclose") + .alias("q", "quotes") .string("source-map") .string("source-map-root") .string("source-map-url") .string("b") + .string("beautify") .string("m") + .string("mangle") .string("c") + .string("compress") .string("d") + .string("define") .string("e") + .string("enclose") .string("comments") .string("wrap") .string("p") + .string("prefix") + .string("name-cache") + .array("reserved-file") .boolean("expr") .boolean("source-map-include-sources") @@ -94,12 +110,18 @@ You need to pass an argument to this option to specify the name that your module .boolean("export-all") .boolean("self") .boolean("v") + .boolean("verbose") .boolean("stats") .boolean("acorn") .boolean("spidermonkey") .boolean("lint") .boolean("V") + .boolean("version") .boolean("noerr") + .boolean("bare-returns") + .boolean("keep-fnames") + .boolean("mangle-props") + .boolean("reserve-domprops") .wrap(80) @@ -110,24 +132,24 @@ normalize(ARGS); if (ARGS.noerr) { UglifyJS.DefaultsError.croak = function(msg, defs) { - sys.error("WARN: " + msg); + print_error("WARN: " + msg); }; } if (ARGS.version || ARGS.V) { var json = require("../package.json"); - sys.puts(json.name + ' ' + json.version); + print(json.name + ' ' + json.version); process.exit(0); } if (ARGS.ast_help) { var desc = UglifyJS.describe_ast(); - sys.puts(typeof desc == "string" ? desc : JSON.stringify(desc, null, 2)); + print(typeof desc == "string" ? desc : JSON.stringify(desc, null, 2)); process.exit(0); } if (ARGS.h || ARGS.help) { - sys.puts(optimist.help()); + print(yargs.help()); process.exit(0); } @@ -138,6 +160,15 @@ if (ARGS.acorn) { var COMPRESS = getOptions("c", true); var MANGLE = getOptions("m", true); var BEAUTIFY = getOptions("b", true); +var RESERVED = null; + +if (ARGS.reserved_file) ARGS.reserved_file.forEach(function(filename){ + RESERVED = UglifyJS.readReservedFile(filename, RESERVED); +}); + +if (ARGS.reserve_domprops) { + RESERVED = UglifyJS.readDefaultReservedFile(RESERVED); +} if (ARGS.d) { if (COMPRESS) COMPRESS.global_defs = getOptions("d"); @@ -147,9 +178,27 @@ if (ARGS.r) { if (MANGLE) MANGLE.except = ARGS.r.replace(/^\s+|\s+$/g).split(/\s*,+\s*/); } +if (RESERVED && MANGLE) { + if (!MANGLE.except) MANGLE.except = RESERVED.vars; + else MANGLE.except = MANGLE.except.concat(RESERVED.vars); +} + +function readNameCache(key) { + return UglifyJS.readNameCache(ARGS.name_cache, key); +} + +function writeNameCache(key, cache) { + return UglifyJS.writeNameCache(ARGS.name_cache, key, cache); +} + +if (ARGS.quotes === true) { + ARGS.quotes = 3; +} + var OUTPUT_OPTIONS = { - beautify: BEAUTIFY ? true : false, - preamble: ARGS.preamble || null, + beautify : BEAUTIFY ? true : false, + preamble : ARGS.preamble || null, + quote_style : ARGS.quotes != null ? ARGS.quotes : 0 }; if (ARGS.screw_ie8) { @@ -158,12 +207,22 @@ if (ARGS.screw_ie8) { OUTPUT_OPTIONS.screw_ie8 = true; } +if (ARGS.keep_fnames) { + if (COMPRESS) COMPRESS.keep_fnames = true; + if (MANGLE) MANGLE.keep_fnames = true; +} + if (BEAUTIFY) UglifyJS.merge(OUTPUT_OPTIONS, BEAUTIFY); -if (ARGS.comments) { - if (/^\//.test(ARGS.comments)) { - OUTPUT_OPTIONS.comments = new Function("return(" + ARGS.comments + ")")(); +if (ARGS.comments != null) { + if (/^\/.*\/[a-zA-Z]*$/.test(ARGS.comments)) { + var regex_pos = ARGS.comments.lastIndexOf("/"); + try { + OUTPUT_OPTIONS.comments = new RegExp(ARGS.comments.substr(1, regex_pos - 1), ARGS.comments.substr(regex_pos + 1)); + } catch (e) { + print_error("ERROR: Invalid --comments: " + e.message); + } } else if (ARGS.comments == "all") { OUTPUT_OPTIONS.comments = true; } else { @@ -182,7 +241,7 @@ var files = ARGS._.slice(); if (ARGS.self) { if (files.length > 0) { - sys.error("WARN: Ignoring input files since --self was passed"); + print_error("WARN: Ignoring input files since --self was passed"); } files = UglifyJS.FILES; if (!ARGS.wrap) ARGS.wrap = "UglifyJS"; @@ -194,7 +253,7 @@ var ORIG_MAP = ARGS.in_source_map; if (ORIG_MAP) { ORIG_MAP = JSON.parse(fs.readFileSync(ORIG_MAP)); if (files.length == 0) { - sys.error("INFO: Using file from the input source map: " + ORIG_MAP.file); + print_error("INFO: Using file from the input source map: " + ORIG_MAP.file); files = [ ORIG_MAP.file ]; } if (ARGS.source_map_root == null) { @@ -207,12 +266,12 @@ if (files.length == 0) { } if (files.indexOf("-") >= 0 && ARGS.source_map) { - sys.error("ERROR: Source map doesn't work with input from STDIN"); + print_error("ERROR: Source map doesn't work with input from STDIN"); process.exit(1); } if (files.filter(function(el){ return el == "-" }).length > 1) { - sys.error("ERROR: Can read a single file from STDIN (two or more dashes specified)"); + print_error("ERROR: Can read a single file from STDIN (two or more dashes specified)"); process.exit(1); } @@ -235,9 +294,9 @@ try { var compressor = COMPRESS && UglifyJS.Compressor(COMPRESS); } catch(ex) { if (ex instanceof UglifyJS.DefaultsError) { - sys.error(ex.msg); - sys.error("Supported options:"); - sys.error(sys.inspect(ex.defs)); + print_error(ex.msg); + print_error("Supported options:"); + print_error(sys.inspect(ex.defs)); process.exit(1); } } @@ -245,12 +304,12 @@ try { async.eachLimit(files, 1, function (file, cb) { read_whole_file(file, function (err, code) { if (err) { - sys.error("ERROR: can't read file: " + file); + print_error("ERROR: can't read file: " + file); process.exit(1); } if (ARGS.p != null) { if (P_RELATIVE) { - file = path.relative(path.dirname(ARGS.source_map), file); + file = path.relative(path.dirname(ARGS.source_map), file).replace(/\\/g, '/'); } else { var p = parseInt(ARGS.p, 10); if (!isNaN(p)) { @@ -275,15 +334,16 @@ async.eachLimit(files, 1, function (file, cb) { else { try { TOPLEVEL = UglifyJS.parse(code, { - filename : file, - toplevel : TOPLEVEL, - expression : ARGS.expr, + filename : file, + toplevel : TOPLEVEL, + expression : ARGS.expr, + bare_returns : ARGS.bare_returns, }); } catch(ex) { if (ex instanceof UglifyJS.JS_Parse_Error) { - sys.error("Parse error at " + file + ":" + ex.line + "," + ex.col); - sys.error(ex.message); - sys.error(ex.stack); + print_error("Parse error at " + file + ":" + ex.line + "," + ex.col); + print_error(ex.message); + print_error(ex.stack); process.exit(1); } throw ex; @@ -297,11 +357,11 @@ async.eachLimit(files, 1, function (file, cb) { TOPLEVEL = UglifyJS.AST_Node.from_mozilla_ast(TOPLEVEL); }); - if (ARGS.wrap) { + if (ARGS.wrap != null) { TOPLEVEL = TOPLEVEL.wrap_commonjs(ARGS.wrap, ARGS.export_all); } - if (ARGS.enclose) { + if (ARGS.enclose != null) { var arg_parameter_list = ARGS.enclose; if (arg_parameter_list === true) { arg_parameter_list = []; @@ -312,11 +372,23 @@ async.eachLimit(files, 1, function (file, cb) { TOPLEVEL = TOPLEVEL.wrap_enclose(arg_parameter_list); } + if (ARGS.mangle_props || ARGS.name_cache) (function(){ + var reserved = RESERVED ? RESERVED.props : null; + var cache = readNameCache("props"); + TOPLEVEL = UglifyJS.mangle_properties(TOPLEVEL, { + reserved : reserved, + cache : cache, + only_cache : !ARGS.mangle_props + }); + writeNameCache("props", cache); + })(); + var SCOPE_IS_NEEDED = COMPRESS || MANGLE || ARGS.lint; + var TL_CACHE = readNameCache("vars"); if (SCOPE_IS_NEEDED) { time_it("scope", function(){ - TOPLEVEL.figure_out_scope({ screw_ie8: ARGS.screw_ie8 }); + TOPLEVEL.figure_out_scope({ screw_ie8: ARGS.screw_ie8, cache: TL_CACHE }); if (ARGS.lint) { TOPLEVEL.scope_warnings(); } @@ -331,17 +403,20 @@ async.eachLimit(files, 1, function (file, cb) { if (SCOPE_IS_NEEDED) { time_it("scope", function(){ - TOPLEVEL.figure_out_scope({ screw_ie8: ARGS.screw_ie8 }); - if (MANGLE) { + TOPLEVEL.figure_out_scope({ screw_ie8: ARGS.screw_ie8, cache: TL_CACHE }); + if (MANGLE && !TL_CACHE) { TOPLEVEL.compute_char_frequency(MANGLE); } }); } if (MANGLE) time_it("mangle", function(){ + MANGLE.cache = TL_CACHE; TOPLEVEL.mangle_names(MANGLE); }); + writeNameCache("vars", TL_CACHE); + if (ARGS.source_map_include_sources) { for (var file in SOURCES_CONTENT) { if (SOURCES_CONTENT.hasOwnProperty(file)) { @@ -369,15 +444,15 @@ async.eachLimit(files, 1, function (file, cb) { if (OUTPUT_FILE) { fs.writeFileSync(OUTPUT_FILE, output, "utf8"); } else { - sys.print(output); + print(output); } if (ARGS.stats) { - sys.error(UglifyJS.string_template("Timing information (compressed {count} files):", { + print_error(UglifyJS.string_template("Timing information (compressed {count} files):", { count: files.length })); for (var i in STATS) if (STATS.hasOwnProperty(i)) { - sys.error(UglifyJS.string_template("- {name}: {time}s", { + print_error(UglifyJS.string_template("- {name}: {time}s", { name: i, time: (STATS[i] / 1000).toFixed(3) })); @@ -396,15 +471,15 @@ function normalize(o) { function getOptions(x, constants) { x = ARGS[x]; - if (!x) return null; + if (x == null) return null; var ret = {}; - if (x !== true) { + if (x !== "") { var ast; try { ast = UglifyJS.parse(x, { expression: true }); } catch(ex) { if (ex instanceof UglifyJS.JS_Parse_Error) { - sys.error("Error parsing arguments in: " + x); + print_error("Error parsing arguments in: " + x); process.exit(1); } } @@ -423,8 +498,8 @@ function getOptions(x, constants) { ret[name] = true; return true; // no descend } - sys.error(node.TYPE) - sys.error("Error parsing arguments in: " + x); + print_error(node.TYPE) + print_error("Error parsing arguments in: " + x); process.exit(1); })); } @@ -456,3 +531,11 @@ function time_it(name, cont) { } return ret; } + +function print_error(msg) { + console.error("%s", msg); +} + +function print(txt) { + console.log("%s", txt); +} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/ast.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/ast.js index 051cd2f..2e539cf 100644 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/ast.js +++ b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/ast.js @@ -84,7 +84,7 @@ function DEFNODE(type, props, methods, base) { return ctor; }; -var AST_Token = DEFNODE("Token", "type value line col pos endpos nlb comments_before file", { +var AST_Token = DEFNODE("Token", "type value line col pos endline endcol endpos nlb comments_before file", { }, null); var AST_Node = DEFNODE("Node", "start end", { @@ -120,11 +120,12 @@ var AST_Debugger = DEFNODE("Debugger", null, { $documentation: "Represents a debugger statement", }, AST_Statement); -var AST_Directive = DEFNODE("Directive", "value scope", { +var AST_Directive = DEFNODE("Directive", "value scope quote", { $documentation: "Represents a directive, like \"use strict\";", $propdoc: { value: "[string] The value of this directive as a plain string (it's not an AST_String!)", - scope: "[AST_Scope/S] The scope that this directive affects" + scope: "[AST_Scope/S] The scope that this directive affects", + quote: "[string] the original quote character" }, }, AST_Statement); @@ -205,21 +206,27 @@ var AST_DWLoop = DEFNODE("DWLoop", "condition", { $documentation: "Base class for do/while statements", $propdoc: { condition: "[AST_Node] the loop condition. Should not be instanceof AST_Statement" - }, + } +}, AST_IterationStatement); + +var AST_Do = DEFNODE("Do", null, { + $documentation: "A `do` statement", + _walk: function(visitor) { + return visitor._visit(this, function(){ + this.body._walk(visitor); + this.condition._walk(visitor); + }); + } +}, AST_DWLoop); + +var AST_While = DEFNODE("While", null, { + $documentation: "A `while` statement", _walk: function(visitor) { return visitor._visit(this, function(){ this.condition._walk(visitor); this.body._walk(visitor); }); } -}, AST_IterationStatement); - -var AST_Do = DEFNODE("Do", null, { - $documentation: "A `do` statement", -}, AST_DWLoop); - -var AST_While = DEFNODE("While", null, { - $documentation: "A `while` statement", }, AST_DWLoop); var AST_For = DEFNODE("For", "init condition step", { @@ -760,8 +767,11 @@ var AST_ObjectProperty = DEFNODE("ObjectProperty", "key value", { } }); -var AST_ObjectKeyVal = DEFNODE("ObjectKeyVal", null, { +var AST_ObjectKeyVal = DEFNODE("ObjectKeyVal", "quote", { $documentation: "A key: value object property", + $propdoc: { + quote: "[string] the original quote character" + } }, AST_ObjectProperty); var AST_ObjectSetter = DEFNODE("ObjectSetter", null, { @@ -846,10 +856,11 @@ var AST_Constant = DEFNODE("Constant", null, { } }); -var AST_String = DEFNODE("String", "value", { +var AST_String = DEFNODE("String", "value quote", { $documentation: "A string literal", $propdoc: { - value: "[string] the contents of this string" + value: "[string] the contents of this string", + quote: "[string] the original quote character" } }, AST_Constant); diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/compress.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/compress.js index b589aca..944db1d 100644 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/compress.js +++ b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/compress.js @@ -62,6 +62,7 @@ function Compressor(options, false_by_default) { unused : !false_by_default, hoist_funs : !false_by_default, keep_fargs : false, + keep_fnames : false, hoist_vars : false, if_return : !false_by_default, join_vars : !false_by_default, @@ -162,10 +163,10 @@ merge(Compressor.prototype, { return make_node(AST_Undefined, orig).optimize(compressor); default: if (val === null) { - return make_node(AST_Null, orig).optimize(compressor); + return make_node(AST_Null, orig, { value: null }).optimize(compressor); } if (val instanceof RegExp) { - return make_node(AST_RegExp, orig).optimize(compressor); + return make_node(AST_RegExp, orig, { value: val }).optimize(compressor); } throw new Error(string_template("Can't handle constant of type: {type}", { type: typeof val @@ -225,6 +226,17 @@ merge(Compressor.prototype, { return statements; function process_for_angular(statements) { + function has_inject(comment) { + return /@ngInject/.test(comment.value); + } + function make_arguments_names_list(func) { + return func.argnames.map(function(sym){ + return make_node(AST_String, sym, { value: sym.name }); + }); + } + function make_array(orig, elements) { + return make_node(AST_Array, orig, { elements: elements }); + } function make_injector(func, name) { return make_node(AST_SimpleStatement, func, { body: make_node(AST_Assign, func, { @@ -233,37 +245,56 @@ merge(Compressor.prototype, { expression: make_node(AST_SymbolRef, name, name), property: "$inject" }), - right: make_node(AST_Array, func, { - elements: func.argnames.map(function(sym){ - return make_node(AST_String, sym, { value: sym.name }); - }) - }) + right: make_array(func, make_arguments_names_list(func)) }) }); } + function check_expression(body) { + if (body && body.args) { + // if this is a function call check all of arguments passed + body.args.forEach(function(argument, index, array) { + var comments = argument.start.comments_before; + // if the argument is function preceded by @ngInject + if (argument instanceof AST_Lambda && comments.length && has_inject(comments[0])) { + // replace the function with an array of names of its parameters and function at the end + array[index] = make_array(argument, make_arguments_names_list(argument).concat(argument)); + } + }); + // if this is chained call check previous one recursively + if (body.expression && body.expression.expression) { + check_expression(body.expression.expression); + } + } + } return statements.reduce(function(a, stat){ a.push(stat); - var token = stat.start; - var comments = token.comments_before; - if (comments && comments.length > 0) { - var last = comments.pop(); - if (/@ngInject/.test(last.value)) { - // case 1: defun - if (stat instanceof AST_Defun) { - a.push(make_injector(stat, stat.name)); - } - else if (stat instanceof AST_Definitions) { - stat.definitions.forEach(function(def){ - if (def.value && def.value instanceof AST_Lambda) { - a.push(make_injector(def.value, def.name)); - } - }); - } - else { - compressor.warn("Unknown statement marked with @ngInject [{file}:{line},{col}]", token); + + if (stat.body && stat.body.args) { + check_expression(stat.body); + } else { + var token = stat.start; + var comments = token.comments_before; + if (comments && comments.length > 0) { + var last = comments.pop(); + if (has_inject(last)) { + // case 1: defun + if (stat instanceof AST_Defun) { + a.push(make_injector(stat, stat.name)); + } + else if (stat instanceof AST_Definitions) { + stat.definitions.forEach(function(def) { + if (def.value && def.value instanceof AST_Lambda) { + a.push(make_injector(def.value, def.name)); + } + }); + } + else { + compressor.warn("Unknown statement marked with @ngInject [{file}:{line},{col}]", token); + } } } } + return a; }, []); } @@ -458,7 +489,7 @@ merge(Compressor.prototype, { seq = []; }; statements.forEach(function(stat){ - if (stat instanceof AST_SimpleStatement) seq.push(stat.body); + if (stat instanceof AST_SimpleStatement && seq.length < 2000) seq.push(stat.body); else push_seq(), ret.push(stat); }); push_seq(); @@ -775,6 +806,14 @@ merge(Compressor.prototype, { if (d && d.constant && d.init) return ev(d.init, compressor); throw def; }); + def(AST_Dot, function(compressor){ + if (compressor.option("unsafe") && this.property == "length") { + var str = ev(this.expression, compressor); + if (typeof str == "string") + return str.length; + } + throw def; + }); })(function(node, func){ node.DEFMETHOD("_eval", func); }); @@ -889,7 +928,9 @@ merge(Compressor.prototype, { || this.operator == "--" || this.expression.has_side_effects(compressor); }); - def(AST_SymbolRef, function(compressor){ return false }); + def(AST_SymbolRef, function(compressor){ + return this.global() && this.undeclared(); + }); def(AST_Object, function(compressor){ for (var i = this.properties.length; --i >= 0;) if (this.properties[i].has_side_effects(compressor)) @@ -939,7 +980,7 @@ merge(Compressor.prototype, { def(AST_BlockStatement, block_aborts); def(AST_SwitchBranch, block_aborts); def(AST_If, function(){ - return this.alternative && aborts(this.body) && aborts(this.alternative); + return this.alternative && aborts(this.body) && aborts(this.alternative) && this; }); })(function(node, func){ node.DEFMETHOD("aborts", func); @@ -1045,7 +1086,7 @@ merge(Compressor.prototype, { var tt = new TreeTransformer( function before(node, descend, in_list) { if (node instanceof AST_Lambda && !(node instanceof AST_Accessor)) { - if (!compressor.option("keep_fargs")) { + if (compressor.option("unsafe") && !compressor.option("keep_fargs")) { for (var a = node.argnames, i = a.length; --i >= 0;) { var sym = a[i]; if (sym.unreferenced()) { @@ -1127,12 +1168,12 @@ merge(Compressor.prototype, { return make_node(AST_EmptyStatement, node); } if (def.length == 0) { - return side_effects; + return in_list ? MAP.splice(side_effects.body) : side_effects; } node.definitions = def; if (side_effects) { side_effects.body.unshift(node); - node = side_effects; + return in_list ? MAP.splice(side_effects.body) : side_effects; } return node; } @@ -1656,7 +1697,7 @@ merge(Compressor.prototype, { OPT(AST_Function, function(self, compressor){ self = AST_Lambda.prototype.optimize.call(self, compressor); - if (compressor.option("unused")) { + if (compressor.option("unused") && !compressor.option("keep_fnames")) { if (self.name && self.name.unreferenced()) { self.name = null; } @@ -1712,6 +1753,11 @@ merge(Compressor.prototype, { }).transform(compressor); break; case "Function": + // new Function() => function(){} + if (self.args.length == 0) return make_node(AST_Function, self, { + argnames: [], + body: [] + }); if (all(self.args, function(x){ return x instanceof AST_String })) { // quite a corner-case, but we can handle it: // https://github.com/mishoo/UglifyJS2/issues/203 @@ -1737,6 +1783,7 @@ merge(Compressor.prototype, { } catch(ex) { if (ex !== ast) throw ex; }; + if (!fun) return self; var args = fun.argnames.map(function(arg, i){ return make_node(AST_String, self.args[i], { value: arg.print_to_string() @@ -1826,11 +1873,16 @@ merge(Compressor.prototype, { } } if (compressor.option("drop_console")) { - if (self.expression instanceof AST_PropAccess && - self.expression.expression instanceof AST_SymbolRef && - self.expression.expression.name == "console" && - self.expression.expression.undeclared()) { - return make_node(AST_Undefined, self).transform(compressor); + if (self.expression instanceof AST_PropAccess) { + var name = self.expression.expression; + while (name.expression) { + name = name.expression; + } + if (name instanceof AST_SymbolRef + && name.name == "console" + && name.undeclared()) { + return make_node(AST_Undefined, self).transform(compressor); + } } } return self.evaluate(compressor)[0]; @@ -1890,7 +1942,7 @@ merge(Compressor.prototype, { if (self.cdr instanceof AST_UnaryPrefix && self.cdr.operator == "void" && !self.cdr.expression.has_side_effects(compressor)) { - self.cdr.operator = self.car; + self.cdr.expression = self.car; return self.cdr; } if (self.cdr instanceof AST_Undefined) { @@ -2058,6 +2110,12 @@ merge(Compressor.prototype, { var rr = self.right.evaluate(compressor); if ((ll.length > 1 && !ll[1]) || (rr.length > 1 && !rr[1])) { compressor.warn("Boolean && always false [{file}:{line},{col}]", self.start); + if (self.left.has_side_effects(compressor)) { + return make_node(AST_Seq, self, { + car: self.left, + cdr: make_node(AST_False) + }).optimize(compressor); + } return make_node(AST_False, self); } if (ll.length > 1 && ll[1]) { @@ -2072,6 +2130,12 @@ merge(Compressor.prototype, { var rr = self.right.evaluate(compressor); if ((ll.length > 1 && ll[1]) || (rr.length > 1 && rr[1])) { compressor.warn("Boolean || always true [{file}:{line},{col}]", self.start); + if (self.left.has_side_effects(compressor)) { + return make_node(AST_Seq, self, { + car: self.left, + cdr: make_node(AST_True) + }).optimize(compressor); + } return make_node(AST_True, self); } if (ll.length > 1 && !ll[1]) { @@ -2192,14 +2256,22 @@ merge(Compressor.prototype, { case "undefined": return make_node(AST_Undefined, self); case "NaN": - return make_node(AST_NaN, self); + return make_node(AST_NaN, self).transform(compressor); case "Infinity": - return make_node(AST_Infinity, self); + return make_node(AST_Infinity, self).transform(compressor); } } return self; }); + OPT(AST_Infinity, function (self, compressor) { + return make_node(AST_Binary, self, { + operator : '/', + left : make_node(AST_Number, self, {value: 1}), + right : make_node(AST_Number, self, {value: 0}) + }); + }); + OPT(AST_Undefined, function(self, compressor){ if (compressor.option("unsafe")) { var scope = compressor.find_parent(AST_Scope); @@ -2263,6 +2335,7 @@ merge(Compressor.prototype, { && alternative instanceof AST_Assign && consequent.operator == alternative.operator && consequent.left.equivalent_to(alternative.left) + && !consequent.left.has_side_effects(compressor) ) { /* * Stuff like this: @@ -2312,6 +2385,31 @@ merge(Compressor.prototype, { alternative: alternative }); } + // x=y?1:1 --> x=1 + if (consequent instanceof AST_Constant + && alternative instanceof AST_Constant + && consequent.equivalent_to(alternative)) { + if (self.condition.has_side_effects(compressor)) { + return AST_Seq.from_array([self.condition, make_node_from_constant(compressor, consequent.value, self)]); + } else { + return make_node_from_constant(compressor, consequent.value, self); + + } + } + // x=y?true:false --> x=!!y + if (consequent instanceof AST_True + && alternative instanceof AST_False) { + self.condition = self.condition.negate(compressor); + return make_node(AST_UnaryPrefix, self.condition, { + operator: "!", + expression: self.condition + }); + } + // x=y?false:true --> x=!y + if (consequent instanceof AST_False + && alternative instanceof AST_True) { + return self.condition.negate(compressor) + } return self; }); @@ -2349,7 +2447,7 @@ merge(Compressor.prototype, { return make_node(AST_Dot, self, { expression : self.expression, property : prop - }); + }).optimize(compressor); } var v = parseFloat(prop); if (!isNaN(v) && v.toString() == prop) { @@ -2361,8 +2459,21 @@ merge(Compressor.prototype, { return self; }); + OPT(AST_Dot, function(self, compressor){ + var prop = self.property; + if (RESERVED_WORDS(prop) && !compressor.option("screw_ie8")) { + return make_node(AST_Sub, self, { + expression : self.expression, + property : make_node(AST_String, self, { + value: prop + }) + }).optimize(compressor); + } + return self.evaluate(compressor)[0]; + }); + function literals_in_boolean_context(self, compressor) { - if (compressor.option("booleans") && compressor.in_boolean_context()) { + if (compressor.option("booleans") && compressor.in_boolean_context() && !self.has_side_effects(compressor)) { return make_node(AST_True, self); } return self; diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/mozilla-ast.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/mozilla-ast.js index bc24dfd..1deb18e 100644 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/mozilla-ast.js +++ b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/mozilla-ast.js @@ -46,53 +46,68 @@ (function(){ var MOZ_TO_ME = { - TryStatement : function(M) { + ExpressionStatement: function(M) { + var expr = M.expression; + if (expr.type === "Literal" && typeof expr.value === "string") { + return new AST_Directive({ + start: my_start_token(M), + end: my_end_token(M), + value: expr.value + }); + } + return new AST_SimpleStatement({ + start: my_start_token(M), + end: my_end_token(M), + body: from_moz(expr) + }); + }, + TryStatement: function(M) { + var handlers = M.handlers || [M.handler]; + if (handlers.length > 1 || M.guardedHandlers && M.guardedHandlers.length) { + throw new Error("Multiple catch clauses are not supported."); + } return new AST_Try({ start : my_start_token(M), end : my_end_token(M), body : from_moz(M.block).body, - bcatch : from_moz(M.handlers ? M.handlers[0] : M.handler), + bcatch : from_moz(handlers[0]), bfinally : M.finalizer ? new AST_Finally(from_moz(M.finalizer)) : null }); }, - CatchClause : function(M) { - return new AST_Catch({ - start : my_start_token(M), - end : my_end_token(M), - argname : from_moz(M.param), - body : from_moz(M.body).body - }); + Property: function(M) { + var key = M.key; + var name = key.type == "Identifier" ? key.name : key.value; + var args = { + start : my_start_token(key), + end : my_end_token(M.value), + key : name, + value : from_moz(M.value) + }; + switch (M.kind) { + case "init": + return new AST_ObjectKeyVal(args); + case "set": + args.value.name = from_moz(key); + return new AST_ObjectSetter(args); + case "get": + args.value.name = from_moz(key); + return new AST_ObjectGetter(args); + } }, - ObjectExpression : function(M) { + ObjectExpression: function(M) { return new AST_Object({ start : my_start_token(M), end : my_end_token(M), properties : M.properties.map(function(prop){ - var key = prop.key; - var name = key.type == "Identifier" ? key.name : key.value; - var args = { - start : my_start_token(key), - end : my_end_token(prop.value), - key : name, - value : from_moz(prop.value) - }; - switch (prop.kind) { - case "init": - return new AST_ObjectKeyVal(args); - case "set": - args.value.name = from_moz(key); - return new AST_ObjectSetter(args); - case "get": - args.value.name = from_moz(key); - return new AST_ObjectGetter(args); - } + prop.type = "Property"; + return from_moz(prop) }) }); }, - SequenceExpression : function(M) { + SequenceExpression: function(M) { return AST_Seq.from_array(M.expressions.map(from_moz)); }, - MemberExpression : function(M) { + MemberExpression: function(M) { return new (M.computed ? AST_Sub : AST_Dot)({ start : my_start_token(M), end : my_end_token(M), @@ -100,7 +115,7 @@ expression : from_moz(M.object) }); }, - SwitchCase : function(M) { + SwitchCase: function(M) { return new (M.test ? AST_Case : AST_Default)({ start : my_start_token(M), end : my_end_token(M), @@ -108,7 +123,14 @@ body : M.consequent.map(from_moz) }); }, - Literal : function(M) { + VariableDeclaration: function(M) { + return new (M.kind === "const" ? AST_Const : AST_Var)({ + start : my_start_token(M), + end : my_end_token(M), + definitions : M.declarations.map(from_moz) + }); + }, + Literal: function(M) { var val = M.value, args = { start : my_start_token(M), end : my_end_token(M) @@ -128,12 +150,9 @@ return new AST_RegExp(args); } }, - UnaryExpression: From_Moz_Unary, - UpdateExpression: From_Moz_Unary, Identifier: function(M) { var p = FROM_MOZ_STACK[FROM_MOZ_STACK.length - 2]; - return new (M.name == "this" ? AST_This - : p.type == "LabeledStatement" ? AST_Label + return new ( p.type == "LabeledStatement" ? AST_Label : p.type == "VariableDeclarator" && p.id === M ? (p.kind == "const" ? AST_SymbolConst : AST_SymbolVar) : p.type == "FunctionExpression" ? (p.id === M ? AST_SymbolLambda : AST_SymbolFunarg) : p.type == "FunctionDeclaration" ? (p.id === M ? AST_SymbolDefun : AST_SymbolFunarg) @@ -147,7 +166,8 @@ } }; - function From_Moz_Unary(M) { + MOZ_TO_ME.UpdateExpression = + MOZ_TO_ME.UnaryExpression = function To_Moz_Unary(M) { var prefix = "prefix" in M ? M.prefix : M.type == "UnaryExpression" ? true : false; return new (prefix ? AST_UnaryPrefix : AST_UnaryPostfix)({ @@ -158,14 +178,9 @@ }); }; - var ME_TO_MOZ = {}; - - map("Node", AST_Node); map("Program", AST_Toplevel, "body@body"); - map("Function", AST_Function, "id>name, params@argnames, body%body"); map("EmptyStatement", AST_EmptyStatement); map("BlockStatement", AST_BlockStatement, "body@body"); - map("ExpressionStatement", AST_SimpleStatement, "expression>body"); map("IfStatement", AST_If, "test>condition, consequent>body, alternate>alternative"); map("LabeledStatement", AST_LabeledStatement, "label>label, body>body"); map("BreakStatement", AST_Break, "label>label"); @@ -180,71 +195,261 @@ map("ForInStatement", AST_ForIn, "left>init, right>object, body>body"); map("DebuggerStatement", AST_Debugger); map("FunctionDeclaration", AST_Defun, "id>name, params@argnames, body%body"); - map("VariableDeclaration", AST_Var, "declarations@definitions"); map("VariableDeclarator", AST_VarDef, "id>name, init>value"); + map("CatchClause", AST_Catch, "param>argname, body%body"); map("ThisExpression", AST_This); map("ArrayExpression", AST_Array, "elements@elements"); map("FunctionExpression", AST_Function, "id>name, params@argnames, body%body"); map("BinaryExpression", AST_Binary, "operator=operator, left>left, right>right"); - map("AssignmentExpression", AST_Assign, "operator=operator, left>left, right>right"); map("LogicalExpression", AST_Binary, "operator=operator, left>left, right>right"); + map("AssignmentExpression", AST_Assign, "operator=operator, left>left, right>right"); map("ConditionalExpression", AST_Conditional, "test>condition, consequent>consequent, alternate>alternative"); map("NewExpression", AST_New, "callee>expression, arguments@args"); map("CallExpression", AST_Call, "callee>expression, arguments@args"); + def_to_moz(AST_Directive, function To_Moz_Directive(M) { + return { + type: "ExpressionStatement", + expression: { + type: "Literal", + value: M.value + } + }; + }); + + def_to_moz(AST_SimpleStatement, function To_Moz_ExpressionStatement(M) { + return { + type: "ExpressionStatement", + expression: to_moz(M.body) + }; + }); + + def_to_moz(AST_SwitchBranch, function To_Moz_SwitchCase(M) { + return { + type: "SwitchCase", + test: to_moz(M.expression), + consequent: M.body.map(to_moz) + }; + }); + + def_to_moz(AST_Try, function To_Moz_TryStatement(M) { + return { + type: "TryStatement", + block: to_moz_block(M), + handler: to_moz(M.bcatch), + guardedHandlers: [], + finalizer: to_moz(M.bfinally) + }; + }); + + def_to_moz(AST_Catch, function To_Moz_CatchClause(M) { + return { + type: "CatchClause", + param: to_moz(M.argname), + guard: null, + body: to_moz_block(M) + }; + }); + + def_to_moz(AST_Definitions, function To_Moz_VariableDeclaration(M) { + return { + type: "VariableDeclaration", + kind: M instanceof AST_Const ? "const" : "var", + declarations: M.definitions.map(to_moz) + }; + }); + + def_to_moz(AST_Seq, function To_Moz_SequenceExpression(M) { + return { + type: "SequenceExpression", + expressions: M.to_array().map(to_moz) + }; + }); + + def_to_moz(AST_PropAccess, function To_Moz_MemberExpression(M) { + var isComputed = M instanceof AST_Sub; + return { + type: "MemberExpression", + object: to_moz(M.expression), + computed: isComputed, + property: isComputed ? to_moz(M.property) : {type: "Identifier", name: M.property} + }; + }); + + def_to_moz(AST_Unary, function To_Moz_Unary(M) { + return { + type: M.operator == "++" || M.operator == "--" ? "UpdateExpression" : "UnaryExpression", + operator: M.operator, + prefix: M instanceof AST_UnaryPrefix, + argument: to_moz(M.expression) + }; + }); + + def_to_moz(AST_Binary, function To_Moz_BinaryExpression(M) { + return { + type: M.operator == "&&" || M.operator == "||" ? "LogicalExpression" : "BinaryExpression", + left: to_moz(M.left), + operator: M.operator, + right: to_moz(M.right) + }; + }); + + def_to_moz(AST_Object, function To_Moz_ObjectExpression(M) { + return { + type: "ObjectExpression", + properties: M.properties.map(to_moz) + }; + }); + + def_to_moz(AST_ObjectProperty, function To_Moz_Property(M) { + var key = ( + is_identifier(M.key) + ? {type: "Identifier", name: M.key} + : {type: "Literal", value: M.key} + ); + var kind; + if (M instanceof AST_ObjectKeyVal) { + kind = "init"; + } else + if (M instanceof AST_ObjectGetter) { + kind = "get"; + } else + if (M instanceof AST_ObjectSetter) { + kind = "set"; + } + return { + type: "Property", + kind: kind, + key: key, + value: to_moz(M.value) + }; + }); + + def_to_moz(AST_Symbol, function To_Moz_Identifier(M) { + var def = M.definition(); + return { + type: "Identifier", + name: def ? def.mangled_name || def.name : M.name + }; + }); + + def_to_moz(AST_Constant, function To_Moz_Literal(M) { + var value = M.value; + if (typeof value === 'number' && (value < 0 || (value === 0 && 1 / value < 0))) { + return { + type: "UnaryExpression", + operator: "-", + prefix: true, + argument: { + type: "Literal", + value: -value + } + }; + } + return { + type: "Literal", + value: value + }; + }); + + def_to_moz(AST_Atom, function To_Moz_Atom(M) { + return { + type: "Identifier", + name: String(M.value) + }; + }); + + AST_Boolean.DEFMETHOD("to_mozilla_ast", AST_Constant.prototype.to_mozilla_ast); + AST_Null.DEFMETHOD("to_mozilla_ast", AST_Constant.prototype.to_mozilla_ast); + AST_Hole.DEFMETHOD("to_mozilla_ast", function To_Moz_ArrayHole() { return null }); + + AST_Block.DEFMETHOD("to_mozilla_ast", AST_BlockStatement.prototype.to_mozilla_ast); + AST_Lambda.DEFMETHOD("to_mozilla_ast", AST_Function.prototype.to_mozilla_ast); + /* -----[ tools ]----- */ function my_start_token(moznode) { + var loc = moznode.loc, start = loc && loc.start; + var range = moznode.range; return new AST_Token({ - file : moznode.loc && moznode.loc.source, - line : moznode.loc && moznode.loc.start.line, - col : moznode.loc && moznode.loc.start.column, - pos : moznode.start, - endpos : moznode.start + file : loc && loc.source, + line : start && start.line, + col : start && start.column, + pos : range ? range[0] : moznode.start, + endline : start && start.line, + endcol : start && start.column, + endpos : range ? range[0] : moznode.start }); }; function my_end_token(moznode) { + var loc = moznode.loc, end = loc && loc.end; + var range = moznode.range; return new AST_Token({ - file : moznode.loc && moznode.loc.source, - line : moznode.loc && moznode.loc.end.line, - col : moznode.loc && moznode.loc.end.column, - pos : moznode.end, - endpos : moznode.end + file : loc && loc.source, + line : end && end.line, + col : end && end.column, + pos : range ? range[1] : moznode.end, + endline : end && end.line, + endcol : end && end.column, + endpos : range ? range[1] : moznode.end }); }; function map(moztype, mytype, propmap) { var moz_to_me = "function From_Moz_" + moztype + "(M){\n"; - moz_to_me += "return new mytype({\n" + + moz_to_me += "return new " + mytype.name + "({\n" + "start: my_start_token(M),\n" + "end: my_end_token(M)"; + var me_to_moz = "function To_Moz_" + moztype + "(M){\n"; + me_to_moz += "return {\n" + + "type: " + JSON.stringify(moztype); + if (propmap) propmap.split(/\s*,\s*/).forEach(function(prop){ var m = /([a-z0-9$_]+)(=|@|>|%)([a-z0-9$_]+)/i.exec(prop); if (!m) throw new Error("Can't understand property map: " + prop); - var moz = "M." + m[1], how = m[2], my = m[3]; + var moz = m[1], how = m[2], my = m[3]; moz_to_me += ",\n" + my + ": "; - if (how == "@") { - moz_to_me += moz + ".map(from_moz)"; - } else if (how == ">") { - moz_to_me += "from_moz(" + moz + ")"; - } else if (how == "=") { - moz_to_me += moz; - } else if (how == "%") { - moz_to_me += "from_moz(" + moz + ").body"; - } else throw new Error("Can't understand operator in propmap: " + prop); + me_to_moz += ",\n" + moz + ": "; + switch (how) { + case "@": + moz_to_me += "M." + moz + ".map(from_moz)"; + me_to_moz += "M." + my + ".map(to_moz)"; + break; + case ">": + moz_to_me += "from_moz(M." + moz + ")"; + me_to_moz += "to_moz(M." + my + ")"; + break; + case "=": + moz_to_me += "M." + moz; + me_to_moz += "M." + my; + break; + case "%": + moz_to_me += "from_moz(M." + moz + ").body"; + me_to_moz += "to_moz_block(M)"; + break; + default: + throw new Error("Can't understand operator in propmap: " + prop); + } }); - moz_to_me += "\n})}"; - // moz_to_me = parse(moz_to_me).print_to_string({ beautify: true }); - // console.log(moz_to_me); + moz_to_me += "\n})\n}"; + me_to_moz += "\n}\n}"; - moz_to_me = new Function("mytype", "my_start_token", "my_end_token", "from_moz", "return(" + moz_to_me + ")")( - mytype, my_start_token, my_end_token, from_moz + //moz_to_me = parse(moz_to_me).print_to_string({ beautify: true }); + //me_to_moz = parse(me_to_moz).print_to_string({ beautify: true }); + //console.log(moz_to_me); + + moz_to_me = new Function("my_start_token", "my_end_token", "from_moz", "return(" + moz_to_me + ")")( + my_start_token, my_end_token, from_moz ); - return MOZ_TO_ME[moztype] = moz_to_me; + me_to_moz = new Function("to_moz", "to_moz_block", "return(" + me_to_moz + ")")( + to_moz, to_moz_block + ); + MOZ_TO_ME[moztype] = moz_to_me; + def_to_moz(mytype, me_to_moz); }; var FROM_MOZ_STACK = null; @@ -264,4 +469,39 @@ return ast; }; + function set_moz_loc(mynode, moznode, myparent) { + var start = mynode.start; + var end = mynode.end; + if (start.pos != null && end.endpos != null) { + moznode.range = [start.pos, end.endpos]; + } + if (start.line) { + moznode.loc = { + start: {line: start.line, column: start.col}, + end: end.endline ? {line: end.endline, column: end.endcol} : null + }; + if (start.file) { + moznode.loc.source = start.file; + } + } + return moznode; + }; + + function def_to_moz(mytype, handler) { + mytype.DEFMETHOD("to_mozilla_ast", function() { + return set_moz_loc(this, handler(this)); + }); + }; + + function to_moz(node) { + return node != null ? node.to_mozilla_ast() : null; + }; + + function to_moz_block(node) { + return { + type: "BlockStatement", + body: node.body.map(to_moz) + }; + }; + })(); diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/output.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/output.js index b963792..1d67b1b 100644 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/output.js +++ b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/output.js @@ -63,6 +63,7 @@ function OutputStream(options) { preserve_line : false, screw_ie8 : false, preamble : null, + quote_style : 0 }, true); var indentation = 0; @@ -84,9 +85,9 @@ function OutputStream(options) { }); }; - function make_string(str) { + function make_string(str, quote) { var dq = 0, sq = 0; - str = str.replace(/[\\\b\f\n\r\t\x22\x27\u2028\u2029\0]/g, function(s){ + str = str.replace(/[\\\b\f\n\r\t\x22\x27\u2028\u2029\0\ufeff]/g, function(s){ switch (s) { case "\\": return "\\\\"; case "\b": return "\\b"; @@ -98,16 +99,31 @@ function OutputStream(options) { case '"': ++dq; return '"'; case "'": ++sq; return "'"; case "\0": return "\\x00"; + case "\ufeff": return "\\ufeff"; } return s; }); + function quote_single() { + return "'" + str.replace(/\x27/g, "\\'") + "'"; + } + function quote_double() { + return '"' + str.replace(/\x22/g, '\\"') + '"'; + } if (options.ascii_only) str = to_ascii(str); - if (dq > sq) return "'" + str.replace(/\x27/g, "\\'") + "'"; - else return '"' + str.replace(/\x22/g, '\\"') + '"'; + switch (options.quote_style) { + case 1: + return quote_single(); + case 2: + return quote_double(); + case 3: + return quote == "'" ? quote_single() : quote_double(); + default: + return dq > sq ? quote_single() : quote_double(); + } }; - function encode_string(str) { - var ret = make_string(str); + function encode_string(str, quote) { + var ret = make_string(str, quote); if (options.inline_script) ret = ret.replace(/<\x2fscript([>\/\t\n\f\r ])/gi, "<\\/script$1"); return ret; @@ -160,7 +176,6 @@ function OutputStream(options) { might_need_space = false; } might_need_semicolon = false; - maybe_newline(); } if (!options.beautify && options.preserve_line && stack[stack.length - 1]) { @@ -221,7 +236,7 @@ function OutputStream(options) { var newline = options.beautify ? function() { print("\n"); - } : noop; + } : maybe_newline; var semicolon = options.beautify ? function() { print(";"); @@ -323,7 +338,7 @@ function OutputStream(options) { force_semicolon : force_semicolon, to_ascii : to_ascii, print_name : function(name) { print(make_name(name)) }, - print_string : function(str) { print(encode_string(str)) }, + print_string : function(str, quote) { print(encode_string(str, quote)) }, next_indent : next_indent, with_indent : with_indent, with_block : with_block, @@ -412,6 +427,15 @@ function OutputStream(options) { return c(self, comment); }); } + + // Keep single line comments after nlb, after nlb + if (!output.option("beautify") && comments.length > 0 && + /comment[134]/.test(comments[0].type) && + output.col() !== 0 && comments[0].nlb) + { + output.print("\n"); + } + comments.forEach(function(c){ if (/comment[134]/.test(c.type)) { output.print("//" + c.value + "\n"); @@ -434,7 +458,13 @@ function OutputStream(options) { /* -----[ PARENTHESES ]----- */ function PARENS(nodetype, func) { - nodetype.DEFMETHOD("needs_parens", func); + if (Array.isArray(nodetype)) { + nodetype.forEach(function(nodetype){ + PARENS(nodetype, func); + }); + } else { + nodetype.DEFMETHOD("needs_parens", func); + } }; PARENS(AST_Node, function(){ @@ -453,7 +483,7 @@ function OutputStream(options) { return first_in_statement(output); }); - PARENS(AST_Unary, function(output){ + PARENS([ AST_Unary, AST_Undefined ], function(output){ var p = output.parent(); return p instanceof AST_PropAccess && p.expression === this; }); @@ -543,13 +573,7 @@ function OutputStream(options) { return true; }); - PARENS(AST_NaN, function(output){ - var p = output.parent(); - if (p instanceof AST_PropAccess && p.expression === this) - return true; - }); - - function assign_and_conditional_paren_rules(output) { + PARENS([ AST_Assign, AST_Conditional ], function (output){ var p = output.parent(); // !(a = false) → true if (p instanceof AST_Unary) @@ -566,15 +590,12 @@ function OutputStream(options) { // (a = foo)["prop"] —or— (a = foo).prop if (p instanceof AST_PropAccess && p.expression === this) return true; - }; - - PARENS(AST_Assign, assign_and_conditional_paren_rules); - PARENS(AST_Conditional, assign_and_conditional_paren_rules); + }); /* -----[ PRINTERS ]----- */ DEFPRINT(AST_Directive, function(self, output){ - output.print_string(self.value); + output.print_string(self.value, self.quote); output.semicolon(); }); DEFPRINT(AST_Debugger, function(self, output){ @@ -656,7 +677,7 @@ function OutputStream(options) { output.print("for"); output.space(); output.with_parens(function(){ - if (self.init) { + if (self.init && !(self.init instanceof AST_EmptyStatement)) { if (self.init instanceof AST_Definitions) { self.init.print(output); } else { @@ -1070,6 +1091,7 @@ function OutputStream(options) { }); DEFPRINT(AST_ObjectKeyVal, function(self, output){ var key = self.key; + var quote = self.quote; if (output.option("quote_keys")) { output.print_string(key + ""); } else if ((typeof key == "number" @@ -1080,7 +1102,7 @@ function OutputStream(options) { } else if (RESERVED_WORDS(key) ? output.option("screw_ie8") : is_identifier_string(key)) { output.print_name(key); } else { - output.print_string(key); + output.print_string(key, quote); } output.colon(); self.value.print(output); @@ -1106,10 +1128,10 @@ function OutputStream(options) { }); DEFPRINT(AST_Hole, noop); DEFPRINT(AST_Infinity, function(self, output){ - output.print("1/0"); + output.print("Infinity"); }); DEFPRINT(AST_NaN, function(self, output){ - output.print("0/0"); + output.print("NaN"); }); DEFPRINT(AST_This, function(self, output){ output.print("this"); @@ -1118,7 +1140,7 @@ function OutputStream(options) { output.print(self.getValue()); }); DEFPRINT(AST_String, function(self, output){ - output.print_string(self.getValue()); + output.print_string(self.getValue(), self.quote); }); DEFPRINT(AST_Number, function(self, output){ output.print(make_num(self.getValue())); diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/parse.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/parse.js index de982b1..53aaabd 100644 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/parse.js +++ b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/parse.js @@ -120,7 +120,8 @@ var REGEXP_MODIFIERS = makePredicate(characters("gmsiy")); // regexps adapted from http://xregexp.com/plugins/#unicode var UNICODE = { - letter: new RegExp("[\\u0041-\\u005A\\u0061-\\u007A\\u00AA\\u00B5\\u00BA\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02C1\\u02C6-\\u02D1\\u02E0-\\u02E4\\u02EC\\u02EE\\u0370-\\u0374\\u0376\\u0377\\u037A-\\u037D\\u0386\\u0388-\\u038A\\u038C\\u038E-\\u03A1\\u03A3-\\u03F5\\u03F7-\\u0481\\u048A-\\u0523\\u0531-\\u0556\\u0559\\u0561-\\u0587\\u05D0-\\u05EA\\u05F0-\\u05F2\\u0621-\\u064A\\u066E\\u066F\\u0671-\\u06D3\\u06D5\\u06E5\\u06E6\\u06EE\\u06EF\\u06FA-\\u06FC\\u06FF\\u0710\\u0712-\\u072F\\u074D-\\u07A5\\u07B1\\u07CA-\\u07EA\\u07F4\\u07F5\\u07FA\\u0904-\\u0939\\u093D\\u0950\\u0958-\\u0961\\u0971\\u0972\\u097B-\\u097F\\u0985-\\u098C\\u098F\\u0990\\u0993-\\u09A8\\u09AA-\\u09B0\\u09B2\\u09B6-\\u09B9\\u09BD\\u09CE\\u09DC\\u09DD\\u09DF-\\u09E1\\u09F0\\u09F1\\u0A05-\\u0A0A\\u0A0F\\u0A10\\u0A13-\\u0A28\\u0A2A-\\u0A30\\u0A32\\u0A33\\u0A35\\u0A36\\u0A38\\u0A39\\u0A59-\\u0A5C\\u0A5E\\u0A72-\\u0A74\\u0A85-\\u0A8D\\u0A8F-\\u0A91\\u0A93-\\u0AA8\\u0AAA-\\u0AB0\\u0AB2\\u0AB3\\u0AB5-\\u0AB9\\u0ABD\\u0AD0\\u0AE0\\u0AE1\\u0B05-\\u0B0C\\u0B0F\\u0B10\\u0B13-\\u0B28\\u0B2A-\\u0B30\\u0B32\\u0B33\\u0B35-\\u0B39\\u0B3D\\u0B5C\\u0B5D\\u0B5F-\\u0B61\\u0B71\\u0B83\\u0B85-\\u0B8A\\u0B8E-\\u0B90\\u0B92-\\u0B95\\u0B99\\u0B9A\\u0B9C\\u0B9E\\u0B9F\\u0BA3\\u0BA4\\u0BA8-\\u0BAA\\u0BAE-\\u0BB9\\u0BD0\\u0C05-\\u0C0C\\u0C0E-\\u0C10\\u0C12-\\u0C28\\u0C2A-\\u0C33\\u0C35-\\u0C39\\u0C3D\\u0C58\\u0C59\\u0C60\\u0C61\\u0C85-\\u0C8C\\u0C8E-\\u0C90\\u0C92-\\u0CA8\\u0CAA-\\u0CB3\\u0CB5-\\u0CB9\\u0CBD\\u0CDE\\u0CE0\\u0CE1\\u0D05-\\u0D0C\\u0D0E-\\u0D10\\u0D12-\\u0D28\\u0D2A-\\u0D39\\u0D3D\\u0D60\\u0D61\\u0D7A-\\u0D7F\\u0D85-\\u0D96\\u0D9A-\\u0DB1\\u0DB3-\\u0DBB\\u0DBD\\u0DC0-\\u0DC6\\u0E01-\\u0E30\\u0E32\\u0E33\\u0E40-\\u0E46\\u0E81\\u0E82\\u0E84\\u0E87\\u0E88\\u0E8A\\u0E8D\\u0E94-\\u0E97\\u0E99-\\u0E9F\\u0EA1-\\u0EA3\\u0EA5\\u0EA7\\u0EAA\\u0EAB\\u0EAD-\\u0EB0\\u0EB2\\u0EB3\\u0EBD\\u0EC0-\\u0EC4\\u0EC6\\u0EDC\\u0EDD\\u0F00\\u0F40-\\u0F47\\u0F49-\\u0F6C\\u0F88-\\u0F8B\\u1000-\\u102A\\u103F\\u1050-\\u1055\\u105A-\\u105D\\u1061\\u1065\\u1066\\u106E-\\u1070\\u1075-\\u1081\\u108E\\u10A0-\\u10C5\\u10D0-\\u10FA\\u10FC\\u1100-\\u1159\\u115F-\\u11A2\\u11A8-\\u11F9\\u1200-\\u1248\\u124A-\\u124D\\u1250-\\u1256\\u1258\\u125A-\\u125D\\u1260-\\u1288\\u128A-\\u128D\\u1290-\\u12B0\\u12B2-\\u12B5\\u12B8-\\u12BE\\u12C0\\u12C2-\\u12C5\\u12C8-\\u12D6\\u12D8-\\u1310\\u1312-\\u1315\\u1318-\\u135A\\u1380-\\u138F\\u13A0-\\u13F4\\u1401-\\u166C\\u166F-\\u1676\\u1681-\\u169A\\u16A0-\\u16EA\\u1700-\\u170C\\u170E-\\u1711\\u1720-\\u1731\\u1740-\\u1751\\u1760-\\u176C\\u176E-\\u1770\\u1780-\\u17B3\\u17D7\\u17DC\\u1820-\\u1877\\u1880-\\u18A8\\u18AA\\u1900-\\u191C\\u1950-\\u196D\\u1970-\\u1974\\u1980-\\u19A9\\u19C1-\\u19C7\\u1A00-\\u1A16\\u1B05-\\u1B33\\u1B45-\\u1B4B\\u1B83-\\u1BA0\\u1BAE\\u1BAF\\u1C00-\\u1C23\\u1C4D-\\u1C4F\\u1C5A-\\u1C7D\\u1D00-\\u1DBF\\u1E00-\\u1F15\\u1F18-\\u1F1D\\u1F20-\\u1F45\\u1F48-\\u1F4D\\u1F50-\\u1F57\\u1F59\\u1F5B\\u1F5D\\u1F5F-\\u1F7D\\u1F80-\\u1FB4\\u1FB6-\\u1FBC\\u1FBE\\u1FC2-\\u1FC4\\u1FC6-\\u1FCC\\u1FD0-\\u1FD3\\u1FD6-\\u1FDB\\u1FE0-\\u1FEC\\u1FF2-\\u1FF4\\u1FF6-\\u1FFC\\u2071\\u207F\\u2090-\\u2094\\u2102\\u2107\\u210A-\\u2113\\u2115\\u2119-\\u211D\\u2124\\u2126\\u2128\\u212A-\\u212D\\u212F-\\u2139\\u213C-\\u213F\\u2145-\\u2149\\u214E\\u2183\\u2184\\u2C00-\\u2C2E\\u2C30-\\u2C5E\\u2C60-\\u2C6F\\u2C71-\\u2C7D\\u2C80-\\u2CE4\\u2D00-\\u2D25\\u2D30-\\u2D65\\u2D6F\\u2D80-\\u2D96\\u2DA0-\\u2DA6\\u2DA8-\\u2DAE\\u2DB0-\\u2DB6\\u2DB8-\\u2DBE\\u2DC0-\\u2DC6\\u2DC8-\\u2DCE\\u2DD0-\\u2DD6\\u2DD8-\\u2DDE\\u2E2F\\u3005\\u3006\\u3031-\\u3035\\u303B\\u303C\\u3041-\\u3096\\u309D-\\u309F\\u30A1-\\u30FA\\u30FC-\\u30FF\\u3105-\\u312D\\u3131-\\u318E\\u31A0-\\u31B7\\u31F0-\\u31FF\\u3400\\u4DB5\\u4E00\\u9FC3\\uA000-\\uA48C\\uA500-\\uA60C\\uA610-\\uA61F\\uA62A\\uA62B\\uA640-\\uA65F\\uA662-\\uA66E\\uA67F-\\uA697\\uA717-\\uA71F\\uA722-\\uA788\\uA78B\\uA78C\\uA7FB-\\uA801\\uA803-\\uA805\\uA807-\\uA80A\\uA80C-\\uA822\\uA840-\\uA873\\uA882-\\uA8B3\\uA90A-\\uA925\\uA930-\\uA946\\uAA00-\\uAA28\\uAA40-\\uAA42\\uAA44-\\uAA4B\\uAC00\\uD7A3\\uF900-\\uFA2D\\uFA30-\\uFA6A\\uFA70-\\uFAD9\\uFB00-\\uFB06\\uFB13-\\uFB17\\uFB1D\\uFB1F-\\uFB28\\uFB2A-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40\\uFB41\\uFB43\\uFB44\\uFB46-\\uFBB1\\uFBD3-\\uFD3D\\uFD50-\\uFD8F\\uFD92-\\uFDC7\\uFDF0-\\uFDFB\\uFE70-\\uFE74\\uFE76-\\uFEFC\\uFF21-\\uFF3A\\uFF41-\\uFF5A\\uFF66-\\uFFBE\\uFFC2-\\uFFC7\\uFFCA-\\uFFCF\\uFFD2-\\uFFD7\\uFFDA-\\uFFDC]"), + letter: new RegExp("[\\u0041-\\u005A\\u0061-\\u007A\\u00AA\\u00B5\\u00BA\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02C1\\u02C6-\\u02D1\\u02E0-\\u02E4\\u02EC\\u02EE\\u0370-\\u0374\\u0376\\u0377\\u037A-\\u037D\\u037F\\u0386\\u0388-\\u038A\\u038C\\u038E-\\u03A1\\u03A3-\\u03F5\\u03F7-\\u0481\\u048A-\\u052F\\u0531-\\u0556\\u0559\\u0561-\\u0587\\u05D0-\\u05EA\\u05F0-\\u05F2\\u0620-\\u064A\\u066E\\u066F\\u0671-\\u06D3\\u06D5\\u06E5\\u06E6\\u06EE\\u06EF\\u06FA-\\u06FC\\u06FF\\u0710\\u0712-\\u072F\\u074D-\\u07A5\\u07B1\\u07CA-\\u07EA\\u07F4\\u07F5\\u07FA\\u0800-\\u0815\\u081A\\u0824\\u0828\\u0840-\\u0858\\u08A0-\\u08B2\\u0904-\\u0939\\u093D\\u0950\\u0958-\\u0961\\u0971-\\u0980\\u0985-\\u098C\\u098F\\u0990\\u0993-\\u09A8\\u09AA-\\u09B0\\u09B2\\u09B6-\\u09B9\\u09BD\\u09CE\\u09DC\\u09DD\\u09DF-\\u09E1\\u09F0\\u09F1\\u0A05-\\u0A0A\\u0A0F\\u0A10\\u0A13-\\u0A28\\u0A2A-\\u0A30\\u0A32\\u0A33\\u0A35\\u0A36\\u0A38\\u0A39\\u0A59-\\u0A5C\\u0A5E\\u0A72-\\u0A74\\u0A85-\\u0A8D\\u0A8F-\\u0A91\\u0A93-\\u0AA8\\u0AAA-\\u0AB0\\u0AB2\\u0AB3\\u0AB5-\\u0AB9\\u0ABD\\u0AD0\\u0AE0\\u0AE1\\u0B05-\\u0B0C\\u0B0F\\u0B10\\u0B13-\\u0B28\\u0B2A-\\u0B30\\u0B32\\u0B33\\u0B35-\\u0B39\\u0B3D\\u0B5C\\u0B5D\\u0B5F-\\u0B61\\u0B71\\u0B83\\u0B85-\\u0B8A\\u0B8E-\\u0B90\\u0B92-\\u0B95\\u0B99\\u0B9A\\u0B9C\\u0B9E\\u0B9F\\u0BA3\\u0BA4\\u0BA8-\\u0BAA\\u0BAE-\\u0BB9\\u0BD0\\u0C05-\\u0C0C\\u0C0E-\\u0C10\\u0C12-\\u0C28\\u0C2A-\\u0C39\\u0C3D\\u0C58\\u0C59\\u0C60\\u0C61\\u0C85-\\u0C8C\\u0C8E-\\u0C90\\u0C92-\\u0CA8\\u0CAA-\\u0CB3\\u0CB5-\\u0CB9\\u0CBD\\u0CDE\\u0CE0\\u0CE1\\u0CF1\\u0CF2\\u0D05-\\u0D0C\\u0D0E-\\u0D10\\u0D12-\\u0D3A\\u0D3D\\u0D4E\\u0D60\\u0D61\\u0D7A-\\u0D7F\\u0D85-\\u0D96\\u0D9A-\\u0DB1\\u0DB3-\\u0DBB\\u0DBD\\u0DC0-\\u0DC6\\u0E01-\\u0E30\\u0E32\\u0E33\\u0E40-\\u0E46\\u0E81\\u0E82\\u0E84\\u0E87\\u0E88\\u0E8A\\u0E8D\\u0E94-\\u0E97\\u0E99-\\u0E9F\\u0EA1-\\u0EA3\\u0EA5\\u0EA7\\u0EAA\\u0EAB\\u0EAD-\\u0EB0\\u0EB2\\u0EB3\\u0EBD\\u0EC0-\\u0EC4\\u0EC6\\u0EDC-\\u0EDF\\u0F00\\u0F40-\\u0F47\\u0F49-\\u0F6C\\u0F88-\\u0F8C\\u1000-\\u102A\\u103F\\u1050-\\u1055\\u105A-\\u105D\\u1061\\u1065\\u1066\\u106E-\\u1070\\u1075-\\u1081\\u108E\\u10A0-\\u10C5\\u10C7\\u10CD\\u10D0-\\u10FA\\u10FC-\\u1248\\u124A-\\u124D\\u1250-\\u1256\\u1258\\u125A-\\u125D\\u1260-\\u1288\\u128A-\\u128D\\u1290-\\u12B0\\u12B2-\\u12B5\\u12B8-\\u12BE\\u12C0\\u12C2-\\u12C5\\u12C8-\\u12D6\\u12D8-\\u1310\\u1312-\\u1315\\u1318-\\u135A\\u1380-\\u138F\\u13A0-\\u13F4\\u1401-\\u166C\\u166F-\\u167F\\u1681-\\u169A\\u16A0-\\u16EA\\u16EE-\\u16F8\\u1700-\\u170C\\u170E-\\u1711\\u1720-\\u1731\\u1740-\\u1751\\u1760-\\u176C\\u176E-\\u1770\\u1780-\\u17B3\\u17D7\\u17DC\\u1820-\\u1877\\u1880-\\u18A8\\u18AA\\u18B0-\\u18F5\\u1900-\\u191E\\u1950-\\u196D\\u1970-\\u1974\\u1980-\\u19AB\\u19C1-\\u19C7\\u1A00-\\u1A16\\u1A20-\\u1A54\\u1AA7\\u1B05-\\u1B33\\u1B45-\\u1B4B\\u1B83-\\u1BA0\\u1BAE\\u1BAF\\u1BBA-\\u1BE5\\u1C00-\\u1C23\\u1C4D-\\u1C4F\\u1C5A-\\u1C7D\\u1CE9-\\u1CEC\\u1CEE-\\u1CF1\\u1CF5\\u1CF6\\u1D00-\\u1DBF\\u1E00-\\u1F15\\u1F18-\\u1F1D\\u1F20-\\u1F45\\u1F48-\\u1F4D\\u1F50-\\u1F57\\u1F59\\u1F5B\\u1F5D\\u1F5F-\\u1F7D\\u1F80-\\u1FB4\\u1FB6-\\u1FBC\\u1FBE\\u1FC2-\\u1FC4\\u1FC6-\\u1FCC\\u1FD0-\\u1FD3\\u1FD6-\\u1FDB\\u1FE0-\\u1FEC\\u1FF2-\\u1FF4\\u1FF6-\\u1FFC\\u2071\\u207F\\u2090-\\u209C\\u2102\\u2107\\u210A-\\u2113\\u2115\\u2119-\\u211D\\u2124\\u2126\\u2128\\u212A-\\u212D\\u212F-\\u2139\\u213C-\\u213F\\u2145-\\u2149\\u214E\\u2160-\\u2188\\u2C00-\\u2C2E\\u2C30-\\u2C5E\\u2C60-\\u2CE4\\u2CEB-\\u2CEE\\u2CF2\\u2CF3\\u2D00-\\u2D25\\u2D27\\u2D2D\\u2D30-\\u2D67\\u2D6F\\u2D80-\\u2D96\\u2DA0-\\u2DA6\\u2DA8-\\u2DAE\\u2DB0-\\u2DB6\\u2DB8-\\u2DBE\\u2DC0-\\u2DC6\\u2DC8-\\u2DCE\\u2DD0-\\u2DD6\\u2DD8-\\u2DDE\\u2E2F\\u3005-\\u3007\\u3021-\\u3029\\u3031-\\u3035\\u3038-\\u303C\\u3041-\\u3096\\u309D-\\u309F\\u30A1-\\u30FA\\u30FC-\\u30FF\\u3105-\\u312D\\u3131-\\u318E\\u31A0-\\u31BA\\u31F0-\\u31FF\\u3400-\\u4DB5\\u4E00-\\u9FCC\\uA000-\\uA48C\\uA4D0-\\uA4FD\\uA500-\\uA60C\\uA610-\\uA61F\\uA62A\\uA62B\\uA640-\\uA66E\\uA67F-\\uA69D\\uA6A0-\\uA6EF\\uA717-\\uA71F\\uA722-\\uA788\\uA78B-\\uA78E\\uA790-\\uA7AD\\uA7B0\\uA7B1\\uA7F7-\\uA801\\uA803-\\uA805\\uA807-\\uA80A\\uA80C-\\uA822\\uA840-\\uA873\\uA882-\\uA8B3\\uA8F2-\\uA8F7\\uA8FB\\uA90A-\\uA925\\uA930-\\uA946\\uA960-\\uA97C\\uA984-\\uA9B2\\uA9CF\\uA9E0-\\uA9E4\\uA9E6-\\uA9EF\\uA9FA-\\uA9FE\\uAA00-\\uAA28\\uAA40-\\uAA42\\uAA44-\\uAA4B\\uAA60-\\uAA76\\uAA7A\\uAA7E-\\uAAAF\\uAAB1\\uAAB5\\uAAB6\\uAAB9-\\uAABD\\uAAC0\\uAAC2\\uAADB-\\uAADD\\uAAE0-\\uAAEA\\uAAF2-\\uAAF4\\uAB01-\\uAB06\\uAB09-\\uAB0E\\uAB11-\\uAB16\\uAB20-\\uAB26\\uAB28-\\uAB2E\\uAB30-\\uAB5A\\uAB5C-\\uAB5F\\uAB64\\uAB65\\uABC0-\\uABE2\\uAC00-\\uD7A3\\uD7B0-\\uD7C6\\uD7CB-\\uD7FB\\uF900-\\uFA6D\\uFA70-\\uFAD9\\uFB00-\\uFB06\\uFB13-\\uFB17\\uFB1D\\uFB1F-\\uFB28\\uFB2A-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40\\uFB41\\uFB43\\uFB44\\uFB46-\\uFBB1\\uFBD3-\\uFD3D\\uFD50-\\uFD8F\\uFD92-\\uFDC7\\uFDF0-\\uFDFB\\uFE70-\\uFE74\\uFE76-\\uFEFC\\uFF21-\\uFF3A\\uFF41-\\uFF5A\\uFF66-\\uFFBE\\uFFC2-\\uFFC7\\uFFCA-\\uFFCF\\uFFD2-\\uFFD7\\uFFDA-\\uFFDC]"), + digit: new RegExp("[\\u0030-\\u0039\\u0660-\\u0669\\u06F0-\\u06F9\\u07C0-\\u07C9\\u0966-\\u096F\\u09E6-\\u09EF\\u0A66-\\u0A6F\\u0AE6-\\u0AEF\\u0B66-\\u0B6F\\u0BE6-\\u0BEF\\u0C66-\\u0C6F\\u0CE6-\\u0CEF\\u0D66-\\u0D6F\\u0DE6-\\u0DEF\\u0E50-\\u0E59\\u0ED0-\\u0ED9\\u0F20-\\u0F29\\u1040-\\u1049\\u1090-\\u1099\\u17E0-\\u17E9\\u1810-\\u1819\\u1946-\\u194F\\u19D0-\\u19D9\\u1A80-\\u1A89\\u1A90-\\u1A99\\u1B50-\\u1B59\\u1BB0-\\u1BB9\\u1C40-\\u1C49\\u1C50-\\u1C59\\uA620-\\uA629\\uA8D0-\\uA8D9\\uA900-\\uA909\\uA9D0-\\uA9D9\\uA9F0-\\uA9F9\\uAA50-\\uAA59\\uABF0-\\uABF9\\uFF10-\\uFF19]"), non_spacing_mark: new RegExp("[\\u0300-\\u036F\\u0483-\\u0487\\u0591-\\u05BD\\u05BF\\u05C1\\u05C2\\u05C4\\u05C5\\u05C7\\u0610-\\u061A\\u064B-\\u065E\\u0670\\u06D6-\\u06DC\\u06DF-\\u06E4\\u06E7\\u06E8\\u06EA-\\u06ED\\u0711\\u0730-\\u074A\\u07A6-\\u07B0\\u07EB-\\u07F3\\u0816-\\u0819\\u081B-\\u0823\\u0825-\\u0827\\u0829-\\u082D\\u0900-\\u0902\\u093C\\u0941-\\u0948\\u094D\\u0951-\\u0955\\u0962\\u0963\\u0981\\u09BC\\u09C1-\\u09C4\\u09CD\\u09E2\\u09E3\\u0A01\\u0A02\\u0A3C\\u0A41\\u0A42\\u0A47\\u0A48\\u0A4B-\\u0A4D\\u0A51\\u0A70\\u0A71\\u0A75\\u0A81\\u0A82\\u0ABC\\u0AC1-\\u0AC5\\u0AC7\\u0AC8\\u0ACD\\u0AE2\\u0AE3\\u0B01\\u0B3C\\u0B3F\\u0B41-\\u0B44\\u0B4D\\u0B56\\u0B62\\u0B63\\u0B82\\u0BC0\\u0BCD\\u0C3E-\\u0C40\\u0C46-\\u0C48\\u0C4A-\\u0C4D\\u0C55\\u0C56\\u0C62\\u0C63\\u0CBC\\u0CBF\\u0CC6\\u0CCC\\u0CCD\\u0CE2\\u0CE3\\u0D41-\\u0D44\\u0D4D\\u0D62\\u0D63\\u0DCA\\u0DD2-\\u0DD4\\u0DD6\\u0E31\\u0E34-\\u0E3A\\u0E47-\\u0E4E\\u0EB1\\u0EB4-\\u0EB9\\u0EBB\\u0EBC\\u0EC8-\\u0ECD\\u0F18\\u0F19\\u0F35\\u0F37\\u0F39\\u0F71-\\u0F7E\\u0F80-\\u0F84\\u0F86\\u0F87\\u0F90-\\u0F97\\u0F99-\\u0FBC\\u0FC6\\u102D-\\u1030\\u1032-\\u1037\\u1039\\u103A\\u103D\\u103E\\u1058\\u1059\\u105E-\\u1060\\u1071-\\u1074\\u1082\\u1085\\u1086\\u108D\\u109D\\u135F\\u1712-\\u1714\\u1732-\\u1734\\u1752\\u1753\\u1772\\u1773\\u17B7-\\u17BD\\u17C6\\u17C9-\\u17D3\\u17DD\\u180B-\\u180D\\u18A9\\u1920-\\u1922\\u1927\\u1928\\u1932\\u1939-\\u193B\\u1A17\\u1A18\\u1A56\\u1A58-\\u1A5E\\u1A60\\u1A62\\u1A65-\\u1A6C\\u1A73-\\u1A7C\\u1A7F\\u1B00-\\u1B03\\u1B34\\u1B36-\\u1B3A\\u1B3C\\u1B42\\u1B6B-\\u1B73\\u1B80\\u1B81\\u1BA2-\\u1BA5\\u1BA8\\u1BA9\\u1C2C-\\u1C33\\u1C36\\u1C37\\u1CD0-\\u1CD2\\u1CD4-\\u1CE0\\u1CE2-\\u1CE8\\u1CED\\u1DC0-\\u1DE6\\u1DFD-\\u1DFF\\u20D0-\\u20DC\\u20E1\\u20E5-\\u20F0\\u2CEF-\\u2CF1\\u2DE0-\\u2DFF\\u302A-\\u302F\\u3099\\u309A\\uA66F\\uA67C\\uA67D\\uA6F0\\uA6F1\\uA802\\uA806\\uA80B\\uA825\\uA826\\uA8C4\\uA8E0-\\uA8F1\\uA926-\\uA92D\\uA947-\\uA951\\uA980-\\uA982\\uA9B3\\uA9B6-\\uA9B9\\uA9BC\\uAA29-\\uAA2E\\uAA31\\uAA32\\uAA35\\uAA36\\uAA43\\uAA4C\\uAAB0\\uAAB2-\\uAAB4\\uAAB7\\uAAB8\\uAABE\\uAABF\\uAAC1\\uABE5\\uABE8\\uABED\\uFB1E\\uFE00-\\uFE0F\\uFE20-\\uFE26]"), space_combining_mark: new RegExp("[\\u0903\\u093E-\\u0940\\u0949-\\u094C\\u094E\\u0982\\u0983\\u09BE-\\u09C0\\u09C7\\u09C8\\u09CB\\u09CC\\u09D7\\u0A03\\u0A3E-\\u0A40\\u0A83\\u0ABE-\\u0AC0\\u0AC9\\u0ACB\\u0ACC\\u0B02\\u0B03\\u0B3E\\u0B40\\u0B47\\u0B48\\u0B4B\\u0B4C\\u0B57\\u0BBE\\u0BBF\\u0BC1\\u0BC2\\u0BC6-\\u0BC8\\u0BCA-\\u0BCC\\u0BD7\\u0C01-\\u0C03\\u0C41-\\u0C44\\u0C82\\u0C83\\u0CBE\\u0CC0-\\u0CC4\\u0CC7\\u0CC8\\u0CCA\\u0CCB\\u0CD5\\u0CD6\\u0D02\\u0D03\\u0D3E-\\u0D40\\u0D46-\\u0D48\\u0D4A-\\u0D4C\\u0D57\\u0D82\\u0D83\\u0DCF-\\u0DD1\\u0DD8-\\u0DDF\\u0DF2\\u0DF3\\u0F3E\\u0F3F\\u0F7F\\u102B\\u102C\\u1031\\u1038\\u103B\\u103C\\u1056\\u1057\\u1062-\\u1064\\u1067-\\u106D\\u1083\\u1084\\u1087-\\u108C\\u108F\\u109A-\\u109C\\u17B6\\u17BE-\\u17C5\\u17C7\\u17C8\\u1923-\\u1926\\u1929-\\u192B\\u1930\\u1931\\u1933-\\u1938\\u19B0-\\u19C0\\u19C8\\u19C9\\u1A19-\\u1A1B\\u1A55\\u1A57\\u1A61\\u1A63\\u1A64\\u1A6D-\\u1A72\\u1B04\\u1B35\\u1B3B\\u1B3D-\\u1B41\\u1B43\\u1B44\\u1B82\\u1BA1\\u1BA6\\u1BA7\\u1BAA\\u1C24-\\u1C2B\\u1C34\\u1C35\\u1CE1\\u1CF2\\uA823\\uA824\\uA827\\uA880\\uA881\\uA8B4-\\uA8C3\\uA952\\uA953\\uA983\\uA9B4\\uA9B5\\uA9BA\\uA9BB\\uA9BD-\\uA9C0\\uAA2F\\uAA30\\uAA33\\uAA34\\uAA4D\\uAA7B\\uABE3\\uABE4\\uABE6\\uABE7\\uABE9\\uABEA\\uABEC]"), connector_punctuation: new RegExp("[\\u005F\\u203F\\u2040\\u2054\\uFE33\\uFE34\\uFE4D-\\uFE4F\\uFF3F]") @@ -133,13 +134,17 @@ function is_letter(code) { }; function is_digit(code) { - return code >= 48 && code <= 57; //XXX: find out if "UnicodeDigit" means something else than 0..9 + return code >= 48 && code <= 57; }; function is_alphanumeric_char(code) { return is_digit(code) || is_letter(code); }; +function is_unicode_digit(code) { + return UNICODE.digit.test(String.fromCharCode(code)); +} + function is_unicode_combining_mark(ch) { return UNICODE.non_spacing_mark.test(ch) || UNICODE.space_combining_mark.test(ch); }; @@ -164,6 +169,7 @@ function is_identifier_char(ch) { || code == 8205 // \u200d: zero-width joiner (in my ECMA-262 PDF, this is also 200c) || is_unicode_combining_mark(ch) || is_unicode_connector_punctuation(ch) + || is_unicode_digit(code) ; }; @@ -181,8 +187,9 @@ function parse_js_number(num) { } }; -function JS_Parse_Error(message, line, col, pos) { +function JS_Parse_Error(message, filename, line, col, pos) { this.message = message; + this.filename = filename; this.line = line; this.col = col; this.pos = pos; @@ -194,7 +201,7 @@ JS_Parse_Error.prototype.toString = function() { }; function js_error(message, filename, line, col, pos) { - throw new JS_Parse_Error(message, line, col, pos); + throw new JS_Parse_Error(message, filename, line, col, pos); }; function is_token(token, type, val) { @@ -206,7 +213,7 @@ var EX_EOF = {}; function tokenizer($TEXT, filename, html5_comments) { var S = { - text : $TEXT.replace(/\r\n?|[\n\u2028\u2029]/g, "\n").replace(/\uFEFF/g, ''), + text : $TEXT.replace(/\uFEFF/g, ''), filename : filename, pos : 0, tokpos : 0, @@ -225,10 +232,15 @@ function tokenizer($TEXT, filename, html5_comments) { var ch = S.text.charAt(S.pos++); if (signal_eof && !ch) throw EX_EOF; - if (ch == "\n") { + if ("\r\n\u2028\u2029".indexOf(ch) >= 0) { S.newline_before = S.newline_before || !in_string; ++S.line; S.col = 0; + if (!in_string && ch == "\r" && peek() == "\n") { + // treat a \r\n sequence as a single \n + ++S.pos; + ch = "\n"; + } } else { ++S.col; } @@ -262,14 +274,16 @@ function tokenizer($TEXT, filename, html5_comments) { (type == "punc" && PUNC_BEFORE_EXPRESSION(value))); prev_was_dot = (type == "punc" && value == "."); var ret = { - type : type, - value : value, - line : S.tokline, - col : S.tokcol, - pos : S.tokpos, - endpos : S.pos, - nlb : S.newline_before, - file : filename + type : type, + value : value, + line : S.tokline, + col : S.tokcol, + pos : S.tokpos, + endline : S.line, + endcol : S.col, + endpos : S.pos, + nlb : S.newline_before, + file : filename }; if (!is_comment) { ret.comments_before = S.comments_before; @@ -284,7 +298,8 @@ function tokenizer($TEXT, filename, html5_comments) { }; function skip_whitespace() { - while (WHITESPACE_CHARS(peek())) + var ch; + while (WHITESPACE_CHARS(ch = peek()) || ch == "\u2028" || ch == "\u2029") next(); }; @@ -339,8 +354,13 @@ function tokenizer($TEXT, filename, html5_comments) { case 120 : return String.fromCharCode(hex_bytes(2)); // \x case 117 : return String.fromCharCode(hex_bytes(4)); // \u case 10 : return ""; // newline - default : return ch; + case 13 : // \r + if (peek() == "\n") { // DOS newline + next(true, in_string); + return ""; + } } + return ch; }; function hex_bytes(n) { @@ -354,10 +374,10 @@ function tokenizer($TEXT, filename, html5_comments) { return num; }; - var read_string = with_eof_error("Unterminated string constant", function(){ + var read_string = with_eof_error("Unterminated string constant", function(quote_char){ var quote = next(), ret = ""; for (;;) { - var ch = next(true); + var ch = next(true, true); if (ch == "\\") { // read OctalEscapeSequence (XXX: deprecated if "strict mode") // https://github.com/mishoo/UglifyJS/issues/178 @@ -379,7 +399,9 @@ function tokenizer($TEXT, filename, html5_comments) { else if (ch == quote) break; ret += ch; } - return token("string", ret); + var tok = token("string", ret); + tok.quote = quote_char; + return tok; }); function skip_line_comment(type) { @@ -392,6 +414,7 @@ function tokenizer($TEXT, filename, html5_comments) { ret = S.text.substring(S.pos, i); S.pos = i; } + S.col = S.tokcol + (S.pos - S.tokpos); S.comments_before.push(token(type, ret, true)); S.regex_allowed = regex_allowed; return next_token(); @@ -533,7 +556,7 @@ function tokenizer($TEXT, filename, html5_comments) { if (!ch) return token("eof"); var code = ch.charCodeAt(0); switch (code) { - case 34: case 39: return read_string(); + case 34: case 39: return read_string(ch); case 46: return handle_dot(); case 47: return handle_slash(); } @@ -609,6 +632,7 @@ function parse($TEXT, options) { toplevel : null, expression : false, html5_comments : true, + bare_returns : false, }); var S = { @@ -722,8 +746,14 @@ function parse($TEXT, options) { case "string": var dir = S.in_directives, stat = simple_statement(); // XXXv2: decide how to fix directives - if (dir && stat.body instanceof AST_String && !is("punc", ",")) - return new AST_Directive({ value: stat.body.value }); + if (dir && stat.body instanceof AST_String && !is("punc", ",")) { + return new AST_Directive({ + start : stat.body.start, + end : stat.body.end, + quote : stat.body.quote, + value : stat.body.value, + }); + } return stat; case "num": case "regexp": @@ -788,7 +818,7 @@ function parse($TEXT, options) { return if_(); case "return": - if (S.in_function == 0) + if (S.in_function == 0 && !options.bare_returns) croak("'return' outside of function"); return new AST_Return({ value: ( is("punc", ";") @@ -1109,7 +1139,12 @@ function parse($TEXT, options) { ret = new AST_Number({ start: tok, end: tok, value: tok.value }); break; case "string": - ret = new AST_String({ start: tok, end: tok, value: tok.value }); + ret = new AST_String({ + start : tok, + end : tok, + value : tok.value, + quote : tok.quote + }); break; case "regexp": ret = new AST_RegExp({ start: tok, end: tok, value: tok.value }); @@ -1222,6 +1257,7 @@ function parse($TEXT, options) { expect(":"); a.push(new AST_ObjectKeyVal({ start : start, + quote : start.quote, key : name, value : expression(false), end : prev() diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/scope.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/scope.js index 1ce17fa..6c19c19 100644 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/scope.js +++ b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/scope.js @@ -57,23 +57,36 @@ function SymbolDef(scope, index, orig) { SymbolDef.prototype = { unmangleable: function(options) { - return (this.global && !(options && options.toplevel)) + if (!options) options = {}; + + return (this.global && !options.toplevel) || this.undeclared - || (!(options && options.eval) && (this.scope.uses_eval || this.scope.uses_with)); + || (!options.eval && (this.scope.uses_eval || this.scope.uses_with)) + || (options.keep_fnames + && (this.orig[0] instanceof AST_SymbolLambda + || this.orig[0] instanceof AST_SymbolDefun)); }, mangle: function(options) { - if (!this.mangled_name && !this.unmangleable(options)) { + var cache = options.cache && options.cache.props; + if (this.global && cache && cache.has(this.name)) { + this.mangled_name = cache.get(this.name); + } + else if (!this.mangled_name && !this.unmangleable(options)) { var s = this.scope; if (!options.screw_ie8 && this.orig[0] instanceof AST_SymbolLambda) s = s.parent_scope; this.mangled_name = s.next_mangled(options, this); + if (this.global && cache) { + cache.set(this.name, this.mangled_name); + } } } }; AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){ options = defaults(options, { - screw_ie8: false + screw_ie8: false, + cache: null }); // pass 1: setup scope chaining and handle definitions @@ -178,6 +191,10 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){ } }); self.walk(tw); + + if (options.cache) { + this.cname = options.cache.cname; + } }); AST_Scope.DEFMETHOD("init_scope_vars", function(nesting){ @@ -322,11 +339,12 @@ AST_Symbol.DEFMETHOD("global", function(){ AST_Toplevel.DEFMETHOD("_default_mangler_options", function(options){ return defaults(options, { - except : [], - eval : false, - sort : false, - toplevel : false, - screw_ie8 : false + except : [], + eval : false, + sort : false, + toplevel : false, + screw_ie8 : false, + keep_fnames : false }); }); @@ -338,6 +356,15 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options){ // the AST_SymbolDeclaration that it points to). var lname = -1; var to_mangle = []; + + if (options.cache) { + this.globals.each(function(symbol){ + if (options.except.indexOf(symbol.name) < 0) { + to_mangle.push(symbol); + } + }); + } + var tw = new TreeWalker(function(node, descend){ if (node instanceof AST_LabeledStatement) { // lname is incremented when we get to the AST_Label @@ -372,6 +399,10 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options){ }); this.walk(tw); to_mangle.forEach(function(def){ def.mangle(options) }); + + if (options.cache) { + options.cache.cname = this.cname; + } }); AST_Toplevel.DEFMETHOD("compute_char_frequency", function(options){ @@ -471,7 +502,9 @@ var base54 = (function() { base54.freq = function(){ return frequency }; function base54(num) { var ret = "", base = 54; + num++; do { + num--; ret += String.fromCharCode(chars[num % base]); num = Math.floor(num / base); base = 64; @@ -532,6 +565,7 @@ AST_Toplevel.DEFMETHOD("scope_warnings", function(options){ } if (options.unreferenced && (node instanceof AST_SymbolDeclaration || node instanceof AST_Label) + && !(node instanceof AST_SymbolCatch) && node.unreferenced()) { AST_Node.warn("{type} {name} is declared but not referenced [{file}:{line},{col}]", { type: node instanceof AST_Label ? "Label" : "Symbol", diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/sourcemap.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/sourcemap.js index 663ef12..a67011f 100644 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/sourcemap.js +++ b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/sourcemap.js @@ -53,11 +53,16 @@ function SourceMap(options) { orig_line_diff : 0, dest_line_diff : 0, }); - var generator = new MOZ_SourceMap.SourceMapGenerator({ - file : options.file, - sourceRoot : options.root - }); var orig_map = options.orig && new MOZ_SourceMap.SourceMapConsumer(options.orig); + var generator; + if (orig_map) { + generator = MOZ_SourceMap.SourceMapGenerator.fromSourceMap(orig_map); + } else { + generator = new MOZ_SourceMap.SourceMapGenerator({ + file : options.file, + sourceRoot : options.root + }); + } function add(source, gen_line, gen_col, orig_line, orig_col, name) { if (orig_map) { var info = orig_map.originalPositionFor({ @@ -70,7 +75,7 @@ function SourceMap(options) { source = info.source; orig_line = info.line; orig_col = info.column; - name = info.name; + name = info.name || name; } generator.addMapping({ generated : { line: gen_line + options.dest_line_diff, column: gen_col }, @@ -78,10 +83,10 @@ function SourceMap(options) { source : source, name : name }); - }; + } return { add : add, get : function() { return generator }, - toString : function() { return generator.toString() } + toString : function() { return JSON.stringify(generator.toJSON()); } }; }; diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/utils.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/utils.js index 7c6a156..4612a32 100644 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/utils.js +++ b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/utils.js @@ -106,10 +106,12 @@ function defaults(args, defs, croak) { }; function merge(obj, ext) { + var count = 0; for (var i in ext) if (ext.hasOwnProperty(i)) { obj[i] = ext[i]; + count++; } - return obj; + return count; }; function noop() {}; @@ -298,5 +300,11 @@ Dictionary.prototype = { for (var i in this._values) ret.push(f(this._values[i], i.substr(1))); return ret; - } + }, + toObject: function() { return this._values } +}; +Dictionary.fromObject = function(obj) { + var dict = new Dictionary(); + dict._size = merge(dict._values, obj); + return dict; }; diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/async/package.json b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/async/package.json index 1af8811..32fcf7a 100644 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/async/package.json +++ b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/async/package.json @@ -8,7 +8,7 @@ "version": "0.2.10", "repository": { "type": "git", - "url": "https://github.com/caolan/async.git" + "url": "git+https://github.com/caolan/async.git" }, "bugs": { "url": "https://github.com/caolan/async/issues" @@ -35,9 +35,26 @@ "scripts": { "test": "nodeunit test/test-async.js" }, - "readme": "# Async.js\n\nAsync is a utility module which provides straight-forward, powerful functions\nfor working with asynchronous JavaScript. Although originally designed for\nuse with [node.js](http://nodejs.org), it can also be used directly in the\nbrowser. Also supports [component](https://github.com/component/component).\n\nAsync provides around 20 functions that include the usual 'functional'\nsuspects (map, reduce, filter, each…) as well as some common patterns\nfor asynchronous control flow (parallel, series, waterfall…). All these\nfunctions assume you follow the node.js convention of providing a single\ncallback as the last argument of your async function.\n\n\n## Quick Examples\n\n```javascript\nasync.map(['file1','file2','file3'], fs.stat, function(err, results){\n // results is now an array of stats for each file\n});\n\nasync.filter(['file1','file2','file3'], fs.exists, function(results){\n // results now equals an array of the existing files\n});\n\nasync.parallel([\n function(){ ... },\n function(){ ... }\n], callback);\n\nasync.series([\n function(){ ... },\n function(){ ... }\n]);\n```\n\nThere are many more functions available so take a look at the docs below for a\nfull list. This module aims to be comprehensive, so if you feel anything is\nmissing please create a GitHub issue for it.\n\n## Common Pitfalls\n\n### Binding a context to an iterator\n\nThis section is really about bind, not about async. If you are wondering how to\nmake async execute your iterators in a given context, or are confused as to why\na method of another library isn't working as an iterator, study this example:\n\n```js\n// Here is a simple object with an (unnecessarily roundabout) squaring method\nvar AsyncSquaringLibrary = {\n squareExponent: 2,\n square: function(number, callback){ \n var result = Math.pow(number, this.squareExponent);\n setTimeout(function(){\n callback(null, result);\n }, 200);\n }\n};\n\nasync.map([1, 2, 3], AsyncSquaringLibrary.square, function(err, result){\n // result is [NaN, NaN, NaN]\n // This fails because the `this.squareExponent` expression in the square\n // function is not evaluated in the context of AsyncSquaringLibrary, and is\n // therefore undefined.\n});\n\nasync.map([1, 2, 3], AsyncSquaringLibrary.square.bind(AsyncSquaringLibrary), function(err, result){\n // result is [1, 4, 9]\n // With the help of bind we can attach a context to the iterator before\n // passing it to async. Now the square function will be executed in its \n // 'home' AsyncSquaringLibrary context and the value of `this.squareExponent`\n // will be as expected.\n});\n```\n\n## Download\n\nThe source is available for download from\n[GitHub](http://github.com/caolan/async).\nAlternatively, you can install using Node Package Manager (npm):\n\n npm install async\n\n__Development:__ [async.js](https://github.com/caolan/async/raw/master/lib/async.js) - 29.6kb Uncompressed\n\n## In the Browser\n\nSo far it's been tested in IE6, IE7, IE8, FF3.6 and Chrome 5. Usage:\n\n```html\n\n\n```\n\n## Documentation\n\n### Collections\n\n* [each](#each)\n* [eachSeries](#eachSeries)\n* [eachLimit](#eachLimit)\n* [map](#map)\n* [mapSeries](#mapSeries)\n* [mapLimit](#mapLimit)\n* [filter](#filter)\n* [filterSeries](#filterSeries)\n* [reject](#reject)\n* [rejectSeries](#rejectSeries)\n* [reduce](#reduce)\n* [reduceRight](#reduceRight)\n* [detect](#detect)\n* [detectSeries](#detectSeries)\n* [sortBy](#sortBy)\n* [some](#some)\n* [every](#every)\n* [concat](#concat)\n* [concatSeries](#concatSeries)\n\n### Control Flow\n\n* [series](#series)\n* [parallel](#parallel)\n* [parallelLimit](#parallellimittasks-limit-callback)\n* [whilst](#whilst)\n* [doWhilst](#doWhilst)\n* [until](#until)\n* [doUntil](#doUntil)\n* [forever](#forever)\n* [waterfall](#waterfall)\n* [compose](#compose)\n* [applyEach](#applyEach)\n* [applyEachSeries](#applyEachSeries)\n* [queue](#queue)\n* [cargo](#cargo)\n* [auto](#auto)\n* [iterator](#iterator)\n* [apply](#apply)\n* [nextTick](#nextTick)\n* [times](#times)\n* [timesSeries](#timesSeries)\n\n### Utils\n\n* [memoize](#memoize)\n* [unmemoize](#unmemoize)\n* [log](#log)\n* [dir](#dir)\n* [noConflict](#noConflict)\n\n\n## Collections\n\n\n\n### each(arr, iterator, callback)\n\nApplies an iterator function to each item in an array, in parallel.\nThe iterator is called with an item from the list and a callback for when it\nhas finished. If the iterator passes an error to this callback, the main\ncallback for the each function is immediately called with the error.\n\nNote, that since this function applies the iterator to each item in parallel\nthere is no guarantee that the iterator functions will complete in order.\n\n__Arguments__\n\n* arr - An array to iterate over.\n* iterator(item, callback) - A function to apply to each item in the array.\n The iterator is passed a callback(err) which must be called once it has \n completed. If no error has occured, the callback should be run without \n arguments or with an explicit null argument.\n* callback(err) - A callback which is called after all the iterator functions\n have finished, or an error has occurred.\n\n__Example__\n\n```js\n// assuming openFiles is an array of file names and saveFile is a function\n// to save the modified contents of that file:\n\nasync.each(openFiles, saveFile, function(err){\n // if any of the saves produced an error, err would equal that error\n});\n```\n\n---------------------------------------\n\n\n\n### eachSeries(arr, iterator, callback)\n\nThe same as each only the iterator is applied to each item in the array in\nseries. The next iterator is only called once the current one has completed\nprocessing. This means the iterator functions will complete in order.\n\n\n---------------------------------------\n\n\n\n### eachLimit(arr, limit, iterator, callback)\n\nThe same as each only no more than \"limit\" iterators will be simultaneously \nrunning at any time.\n\nNote that the items are not processed in batches, so there is no guarantee that\n the first \"limit\" iterator functions will complete before any others are \nstarted.\n\n__Arguments__\n\n* arr - An array to iterate over.\n* limit - The maximum number of iterators to run at any time.\n* iterator(item, callback) - A function to apply to each item in the array.\n The iterator is passed a callback(err) which must be called once it has \n completed. If no error has occured, the callback should be run without \n arguments or with an explicit null argument.\n* callback(err) - A callback which is called after all the iterator functions\n have finished, or an error has occurred.\n\n__Example__\n\n```js\n// Assume documents is an array of JSON objects and requestApi is a\n// function that interacts with a rate-limited REST api.\n\nasync.eachLimit(documents, 20, requestApi, function(err){\n // if any of the saves produced an error, err would equal that error\n});\n```\n\n---------------------------------------\n\n\n### map(arr, iterator, callback)\n\nProduces a new array of values by mapping each value in the given array through\nthe iterator function. The iterator is called with an item from the array and a\ncallback for when it has finished processing. The callback takes 2 arguments, \nan error and the transformed item from the array. If the iterator passes an\nerror to this callback, the main callback for the map function is immediately\ncalled with the error.\n\nNote, that since this function applies the iterator to each item in parallel\nthere is no guarantee that the iterator functions will complete in order, however\nthe results array will be in the same order as the original array.\n\n__Arguments__\n\n* arr - An array to iterate over.\n* iterator(item, callback) - A function to apply to each item in the array.\n The iterator is passed a callback(err, transformed) which must be called once \n it has completed with an error (which can be null) and a transformed item.\n* callback(err, results) - A callback which is called after all the iterator\n functions have finished, or an error has occurred. Results is an array of the\n transformed items from the original array.\n\n__Example__\n\n```js\nasync.map(['file1','file2','file3'], fs.stat, function(err, results){\n // results is now an array of stats for each file\n});\n```\n\n---------------------------------------\n\n\n### mapSeries(arr, iterator, callback)\n\nThe same as map only the iterator is applied to each item in the array in\nseries. The next iterator is only called once the current one has completed\nprocessing. The results array will be in the same order as the original.\n\n\n---------------------------------------\n\n\n### mapLimit(arr, limit, iterator, callback)\n\nThe same as map only no more than \"limit\" iterators will be simultaneously \nrunning at any time.\n\nNote that the items are not processed in batches, so there is no guarantee that\n the first \"limit\" iterator functions will complete before any others are \nstarted.\n\n__Arguments__\n\n* arr - An array to iterate over.\n* limit - The maximum number of iterators to run at any time.\n* iterator(item, callback) - A function to apply to each item in the array.\n The iterator is passed a callback(err, transformed) which must be called once \n it has completed with an error (which can be null) and a transformed item.\n* callback(err, results) - A callback which is called after all the iterator\n functions have finished, or an error has occurred. Results is an array of the\n transformed items from the original array.\n\n__Example__\n\n```js\nasync.mapLimit(['file1','file2','file3'], 1, fs.stat, function(err, results){\n // results is now an array of stats for each file\n});\n```\n\n---------------------------------------\n\n\n### filter(arr, iterator, callback)\n\n__Alias:__ select\n\nReturns a new array of all the values which pass an async truth test.\n_The callback for each iterator call only accepts a single argument of true or\nfalse, it does not accept an error argument first!_ This is in-line with the\nway node libraries work with truth tests like fs.exists. This operation is\nperformed in parallel, but the results array will be in the same order as the\noriginal.\n\n__Arguments__\n\n* arr - An array to iterate over.\n* iterator(item, callback) - A truth test to apply to each item in the array.\n The iterator is passed a callback(truthValue) which must be called with a \n boolean argument once it has completed.\n* callback(results) - A callback which is called after all the iterator\n functions have finished.\n\n__Example__\n\n```js\nasync.filter(['file1','file2','file3'], fs.exists, function(results){\n // results now equals an array of the existing files\n});\n```\n\n---------------------------------------\n\n\n### filterSeries(arr, iterator, callback)\n\n__alias:__ selectSeries\n\nThe same as filter only the iterator is applied to each item in the array in\nseries. The next iterator is only called once the current one has completed\nprocessing. The results array will be in the same order as the original.\n\n---------------------------------------\n\n\n### reject(arr, iterator, callback)\n\nThe opposite of filter. Removes values that pass an async truth test.\n\n---------------------------------------\n\n\n### rejectSeries(arr, iterator, callback)\n\nThe same as reject, only the iterator is applied to each item in the array\nin series.\n\n\n---------------------------------------\n\n\n### reduce(arr, memo, iterator, callback)\n\n__aliases:__ inject, foldl\n\nReduces a list of values into a single value using an async iterator to return\neach successive step. Memo is the initial state of the reduction. This\nfunction only operates in series. For performance reasons, it may make sense to\nsplit a call to this function into a parallel map, then use the normal\nArray.prototype.reduce on the results. This function is for situations where\neach step in the reduction needs to be async, if you can get the data before\nreducing it then it's probably a good idea to do so.\n\n__Arguments__\n\n* arr - An array to iterate over.\n* memo - The initial state of the reduction.\n* iterator(memo, item, callback) - A function applied to each item in the\n array to produce the next step in the reduction. The iterator is passed a\n callback(err, reduction) which accepts an optional error as its first \n argument, and the state of the reduction as the second. If an error is \n passed to the callback, the reduction is stopped and the main callback is \n immediately called with the error.\n* callback(err, result) - A callback which is called after all the iterator\n functions have finished. Result is the reduced value.\n\n__Example__\n\n```js\nasync.reduce([1,2,3], 0, function(memo, item, callback){\n // pointless async:\n process.nextTick(function(){\n callback(null, memo + item)\n });\n}, function(err, result){\n // result is now equal to the last value of memo, which is 6\n});\n```\n\n---------------------------------------\n\n\n### reduceRight(arr, memo, iterator, callback)\n\n__Alias:__ foldr\n\nSame as reduce, only operates on the items in the array in reverse order.\n\n\n---------------------------------------\n\n\n### detect(arr, iterator, callback)\n\nReturns the first value in a list that passes an async truth test. The\niterator is applied in parallel, meaning the first iterator to return true will\nfire the detect callback with that result. That means the result might not be\nthe first item in the original array (in terms of order) that passes the test.\n\nIf order within the original array is important then look at detectSeries.\n\n__Arguments__\n\n* arr - An array to iterate over.\n* iterator(item, callback) - A truth test to apply to each item in the array.\n The iterator is passed a callback(truthValue) which must be called with a \n boolean argument once it has completed.\n* callback(result) - A callback which is called as soon as any iterator returns\n true, or after all the iterator functions have finished. Result will be\n the first item in the array that passes the truth test (iterator) or the\n value undefined if none passed.\n\n__Example__\n\n```js\nasync.detect(['file1','file2','file3'], fs.exists, function(result){\n // result now equals the first file in the list that exists\n});\n```\n\n---------------------------------------\n\n\n### detectSeries(arr, iterator, callback)\n\nThe same as detect, only the iterator is applied to each item in the array\nin series. This means the result is always the first in the original array (in\nterms of array order) that passes the truth test.\n\n\n---------------------------------------\n\n\n### sortBy(arr, iterator, callback)\n\nSorts a list by the results of running each value through an async iterator.\n\n__Arguments__\n\n* arr - An array to iterate over.\n* iterator(item, callback) - A function to apply to each item in the array.\n The iterator is passed a callback(err, sortValue) which must be called once it\n has completed with an error (which can be null) and a value to use as the sort\n criteria.\n* callback(err, results) - A callback which is called after all the iterator\n functions have finished, or an error has occurred. Results is the items from\n the original array sorted by the values returned by the iterator calls.\n\n__Example__\n\n```js\nasync.sortBy(['file1','file2','file3'], function(file, callback){\n fs.stat(file, function(err, stats){\n callback(err, stats.mtime);\n });\n}, function(err, results){\n // results is now the original array of files sorted by\n // modified date\n});\n```\n\n---------------------------------------\n\n\n### some(arr, iterator, callback)\n\n__Alias:__ any\n\nReturns true if at least one element in the array satisfies an async test.\n_The callback for each iterator call only accepts a single argument of true or\nfalse, it does not accept an error argument first!_ This is in-line with the\nway node libraries work with truth tests like fs.exists. Once any iterator\ncall returns true, the main callback is immediately called.\n\n__Arguments__\n\n* arr - An array to iterate over.\n* iterator(item, callback) - A truth test to apply to each item in the array.\n The iterator is passed a callback(truthValue) which must be called with a \n boolean argument once it has completed.\n* callback(result) - A callback which is called as soon as any iterator returns\n true, or after all the iterator functions have finished. Result will be\n either true or false depending on the values of the async tests.\n\n__Example__\n\n```js\nasync.some(['file1','file2','file3'], fs.exists, function(result){\n // if result is true then at least one of the files exists\n});\n```\n\n---------------------------------------\n\n\n### every(arr, iterator, callback)\n\n__Alias:__ all\n\nReturns true if every element in the array satisfies an async test.\n_The callback for each iterator call only accepts a single argument of true or\nfalse, it does not accept an error argument first!_ This is in-line with the\nway node libraries work with truth tests like fs.exists.\n\n__Arguments__\n\n* arr - An array to iterate over.\n* iterator(item, callback) - A truth test to apply to each item in the array.\n The iterator is passed a callback(truthValue) which must be called with a \n boolean argument once it has completed.\n* callback(result) - A callback which is called after all the iterator\n functions have finished. Result will be either true or false depending on\n the values of the async tests.\n\n__Example__\n\n```js\nasync.every(['file1','file2','file3'], fs.exists, function(result){\n // if result is true then every file exists\n});\n```\n\n---------------------------------------\n\n\n### concat(arr, iterator, callback)\n\nApplies an iterator to each item in a list, concatenating the results. Returns the\nconcatenated list. The iterators are called in parallel, and the results are\nconcatenated as they return. There is no guarantee that the results array will\nbe returned in the original order of the arguments passed to the iterator function.\n\n__Arguments__\n\n* arr - An array to iterate over\n* iterator(item, callback) - A function to apply to each item in the array.\n The iterator is passed a callback(err, results) which must be called once it \n has completed with an error (which can be null) and an array of results.\n* callback(err, results) - A callback which is called after all the iterator\n functions have finished, or an error has occurred. Results is an array containing\n the concatenated results of the iterator function.\n\n__Example__\n\n```js\nasync.concat(['dir1','dir2','dir3'], fs.readdir, function(err, files){\n // files is now a list of filenames that exist in the 3 directories\n});\n```\n\n---------------------------------------\n\n\n### concatSeries(arr, iterator, callback)\n\nSame as async.concat, but executes in series instead of parallel.\n\n\n## Control Flow\n\n\n### series(tasks, [callback])\n\nRun an array of functions in series, each one running once the previous\nfunction has completed. If any functions in the series pass an error to its\ncallback, no more functions are run and the callback for the series is\nimmediately called with the value of the error. Once the tasks have completed,\nthe results are passed to the final callback as an array.\n\nIt is also possible to use an object instead of an array. Each property will be\nrun as a function and the results will be passed to the final callback as an object\ninstead of an array. This can be a more readable way of handling results from\nasync.series.\n\n\n__Arguments__\n\n* tasks - An array or object containing functions to run, each function is passed\n a callback(err, result) it must call on completion with an error (which can\n be null) and an optional result value.\n* callback(err, results) - An optional callback to run once all the functions\n have completed. This function gets a results array (or object) containing all \n the result arguments passed to the task callbacks.\n\n__Example__\n\n```js\nasync.series([\n function(callback){\n // do some stuff ...\n callback(null, 'one');\n },\n function(callback){\n // do some more stuff ...\n callback(null, 'two');\n }\n],\n// optional callback\nfunction(err, results){\n // results is now equal to ['one', 'two']\n});\n\n\n// an example using an object instead of an array\nasync.series({\n one: function(callback){\n setTimeout(function(){\n callback(null, 1);\n }, 200);\n },\n two: function(callback){\n setTimeout(function(){\n callback(null, 2);\n }, 100);\n }\n},\nfunction(err, results) {\n // results is now equal to: {one: 1, two: 2}\n});\n```\n\n---------------------------------------\n\n\n### parallel(tasks, [callback])\n\nRun an array of functions in parallel, without waiting until the previous\nfunction has completed. If any of the functions pass an error to its\ncallback, the main callback is immediately called with the value of the error.\nOnce the tasks have completed, the results are passed to the final callback as an\narray.\n\nIt is also possible to use an object instead of an array. Each property will be\nrun as a function and the results will be passed to the final callback as an object\ninstead of an array. This can be a more readable way of handling results from\nasync.parallel.\n\n\n__Arguments__\n\n* tasks - An array or object containing functions to run, each function is passed \n a callback(err, result) it must call on completion with an error (which can\n be null) and an optional result value.\n* callback(err, results) - An optional callback to run once all the functions\n have completed. This function gets a results array (or object) containing all \n the result arguments passed to the task callbacks.\n\n__Example__\n\n```js\nasync.parallel([\n function(callback){\n setTimeout(function(){\n callback(null, 'one');\n }, 200);\n },\n function(callback){\n setTimeout(function(){\n callback(null, 'two');\n }, 100);\n }\n],\n// optional callback\nfunction(err, results){\n // the results array will equal ['one','two'] even though\n // the second function had a shorter timeout.\n});\n\n\n// an example using an object instead of an array\nasync.parallel({\n one: function(callback){\n setTimeout(function(){\n callback(null, 1);\n }, 200);\n },\n two: function(callback){\n setTimeout(function(){\n callback(null, 2);\n }, 100);\n }\n},\nfunction(err, results) {\n // results is now equals to: {one: 1, two: 2}\n});\n```\n\n---------------------------------------\n\n\n### parallelLimit(tasks, limit, [callback])\n\nThe same as parallel only the tasks are executed in parallel with a maximum of \"limit\" \ntasks executing at any time.\n\nNote that the tasks are not executed in batches, so there is no guarantee that \nthe first \"limit\" tasks will complete before any others are started.\n\n__Arguments__\n\n* tasks - An array or object containing functions to run, each function is passed \n a callback(err, result) it must call on completion with an error (which can\n be null) and an optional result value.\n* limit - The maximum number of tasks to run at any time.\n* callback(err, results) - An optional callback to run once all the functions\n have completed. This function gets a results array (or object) containing all \n the result arguments passed to the task callbacks.\n\n---------------------------------------\n\n\n### whilst(test, fn, callback)\n\nRepeatedly call fn, while test returns true. Calls the callback when stopped,\nor an error occurs.\n\n__Arguments__\n\n* test() - synchronous truth test to perform before each execution of fn.\n* fn(callback) - A function to call each time the test passes. The function is\n passed a callback(err) which must be called once it has completed with an \n optional error argument.\n* callback(err) - A callback which is called after the test fails and repeated\n execution of fn has stopped.\n\n__Example__\n\n```js\nvar count = 0;\n\nasync.whilst(\n function () { return count < 5; },\n function (callback) {\n count++;\n setTimeout(callback, 1000);\n },\n function (err) {\n // 5 seconds have passed\n }\n);\n```\n\n---------------------------------------\n\n\n### doWhilst(fn, test, callback)\n\nThe post check version of whilst. To reflect the difference in the order of operations `test` and `fn` arguments are switched. `doWhilst` is to `whilst` as `do while` is to `while` in plain JavaScript.\n\n---------------------------------------\n\n\n### until(test, fn, callback)\n\nRepeatedly call fn, until test returns true. Calls the callback when stopped,\nor an error occurs.\n\nThe inverse of async.whilst.\n\n---------------------------------------\n\n\n### doUntil(fn, test, callback)\n\nLike doWhilst except the test is inverted. Note the argument ordering differs from `until`.\n\n---------------------------------------\n\n\n### forever(fn, callback)\n\nCalls the asynchronous function 'fn' repeatedly, in series, indefinitely.\nIf an error is passed to fn's callback then 'callback' is called with the\nerror, otherwise it will never be called.\n\n---------------------------------------\n\n\n### waterfall(tasks, [callback])\n\nRuns an array of functions in series, each passing their results to the next in\nthe array. However, if any of the functions pass an error to the callback, the\nnext function is not executed and the main callback is immediately called with\nthe error.\n\n__Arguments__\n\n* tasks - An array of functions to run, each function is passed a \n callback(err, result1, result2, ...) it must call on completion. The first\n argument is an error (which can be null) and any further arguments will be \n passed as arguments in order to the next task.\n* callback(err, [results]) - An optional callback to run once all the functions\n have completed. This will be passed the results of the last task's callback.\n\n\n\n__Example__\n\n```js\nasync.waterfall([\n function(callback){\n callback(null, 'one', 'two');\n },\n function(arg1, arg2, callback){\n callback(null, 'three');\n },\n function(arg1, callback){\n // arg1 now equals 'three'\n callback(null, 'done');\n }\n], function (err, result) {\n // result now equals 'done' \n});\n```\n\n---------------------------------------\n\n### compose(fn1, fn2...)\n\nCreates a function which is a composition of the passed asynchronous\nfunctions. Each function consumes the return value of the function that\nfollows. Composing functions f(), g() and h() would produce the result of\nf(g(h())), only this version uses callbacks to obtain the return values.\n\nEach function is executed with the `this` binding of the composed function.\n\n__Arguments__\n\n* functions... - the asynchronous functions to compose\n\n\n__Example__\n\n```js\nfunction add1(n, callback) {\n setTimeout(function () {\n callback(null, n + 1);\n }, 10);\n}\n\nfunction mul3(n, callback) {\n setTimeout(function () {\n callback(null, n * 3);\n }, 10);\n}\n\nvar add1mul3 = async.compose(mul3, add1);\n\nadd1mul3(4, function (err, result) {\n // result now equals 15\n});\n```\n\n---------------------------------------\n\n### applyEach(fns, args..., callback)\n\nApplies the provided arguments to each function in the array, calling the\ncallback after all functions have completed. If you only provide the first\nargument then it will return a function which lets you pass in the\narguments as if it were a single function call.\n\n__Arguments__\n\n* fns - the asynchronous functions to all call with the same arguments\n* args... - any number of separate arguments to pass to the function\n* callback - the final argument should be the callback, called when all\n functions have completed processing\n\n\n__Example__\n\n```js\nasync.applyEach([enableSearch, updateSchema], 'bucket', callback);\n\n// partial application example:\nasync.each(\n buckets,\n async.applyEach([enableSearch, updateSchema]),\n callback\n);\n```\n\n---------------------------------------\n\n\n### applyEachSeries(arr, iterator, callback)\n\nThe same as applyEach only the functions are applied in series.\n\n---------------------------------------\n\n\n### queue(worker, concurrency)\n\nCreates a queue object with the specified concurrency. Tasks added to the\nqueue will be processed in parallel (up to the concurrency limit). If all\nworkers are in progress, the task is queued until one is available. Once\na worker has completed a task, the task's callback is called.\n\n__Arguments__\n\n* worker(task, callback) - An asynchronous function for processing a queued\n task, which must call its callback(err) argument when finished, with an \n optional error as an argument.\n* concurrency - An integer for determining how many worker functions should be\n run in parallel.\n\n__Queue objects__\n\nThe queue object returned by this function has the following properties and\nmethods:\n\n* length() - a function returning the number of items waiting to be processed.\n* concurrency - an integer for determining how many worker functions should be\n run in parallel. This property can be changed after a queue is created to\n alter the concurrency on-the-fly.\n* push(task, [callback]) - add a new task to the queue, the callback is called\n once the worker has finished processing the task.\n instead of a single task, an array of tasks can be submitted. the respective callback is used for every task in the list.\n* unshift(task, [callback]) - add a new task to the front of the queue.\n* saturated - a callback that is called when the queue length hits the concurrency and further tasks will be queued\n* empty - a callback that is called when the last item from the queue is given to a worker\n* drain - a callback that is called when the last item from the queue has returned from the worker\n\n__Example__\n\n```js\n// create a queue object with concurrency 2\n\nvar q = async.queue(function (task, callback) {\n console.log('hello ' + task.name);\n callback();\n}, 2);\n\n\n// assign a callback\nq.drain = function() {\n console.log('all items have been processed');\n}\n\n// add some items to the queue\n\nq.push({name: 'foo'}, function (err) {\n console.log('finished processing foo');\n});\nq.push({name: 'bar'}, function (err) {\n console.log('finished processing bar');\n});\n\n// add some items to the queue (batch-wise)\n\nq.push([{name: 'baz'},{name: 'bay'},{name: 'bax'}], function (err) {\n console.log('finished processing bar');\n});\n\n// add some items to the front of the queue\n\nq.unshift({name: 'bar'}, function (err) {\n console.log('finished processing bar');\n});\n```\n\n---------------------------------------\n\n\n### cargo(worker, [payload])\n\nCreates a cargo object with the specified payload. Tasks added to the\ncargo will be processed altogether (up to the payload limit). If the\nworker is in progress, the task is queued until it is available. Once\nthe worker has completed some tasks, each callback of those tasks is called.\n\n__Arguments__\n\n* worker(tasks, callback) - An asynchronous function for processing an array of\n queued tasks, which must call its callback(err) argument when finished, with \n an optional error as an argument.\n* payload - An optional integer for determining how many tasks should be\n processed per round; if omitted, the default is unlimited.\n\n__Cargo objects__\n\nThe cargo object returned by this function has the following properties and\nmethods:\n\n* length() - a function returning the number of items waiting to be processed.\n* payload - an integer for determining how many tasks should be\n process per round. This property can be changed after a cargo is created to\n alter the payload on-the-fly.\n* push(task, [callback]) - add a new task to the queue, the callback is called\n once the worker has finished processing the task.\n instead of a single task, an array of tasks can be submitted. the respective callback is used for every task in the list.\n* saturated - a callback that is called when the queue length hits the concurrency and further tasks will be queued\n* empty - a callback that is called when the last item from the queue is given to a worker\n* drain - a callback that is called when the last item from the queue has returned from the worker\n\n__Example__\n\n```js\n// create a cargo object with payload 2\n\nvar cargo = async.cargo(function (tasks, callback) {\n for(var i=0; i\n### auto(tasks, [callback])\n\nDetermines the best order for running functions based on their requirements.\nEach function can optionally depend on other functions being completed first,\nand each function is run as soon as its requirements are satisfied. If any of\nthe functions pass an error to their callback, that function will not complete\n(so any other functions depending on it will not run) and the main callback\nwill be called immediately with the error. Functions also receive an object\ncontaining the results of functions which have completed so far.\n\nNote, all functions are called with a results object as a second argument, \nso it is unsafe to pass functions in the tasks object which cannot handle the\nextra argument. For example, this snippet of code:\n\n```js\nasync.auto({\n readData: async.apply(fs.readFile, 'data.txt', 'utf-8')\n}, callback);\n```\n\nwill have the effect of calling readFile with the results object as the last\nargument, which will fail:\n\n```js\nfs.readFile('data.txt', 'utf-8', cb, {});\n```\n\nInstead, wrap the call to readFile in a function which does not forward the \nresults object:\n\n```js\nasync.auto({\n readData: function(cb, results){\n fs.readFile('data.txt', 'utf-8', cb);\n }\n}, callback);\n```\n\n__Arguments__\n\n* tasks - An object literal containing named functions or an array of\n requirements, with the function itself the last item in the array. The key\n used for each function or array is used when specifying requirements. The \n function receives two arguments: (1) a callback(err, result) which must be \n called when finished, passing an error (which can be null) and the result of \n the function's execution, and (2) a results object, containing the results of\n the previously executed functions.\n* callback(err, results) - An optional callback which is called when all the\n tasks have been completed. The callback will receive an error as an argument\n if any tasks pass an error to their callback. Results will always be passed\n\tbut if an error occurred, no other tasks will be performed, and the results\n\tobject will only contain partial results.\n \n\n__Example__\n\n```js\nasync.auto({\n get_data: function(callback){\n // async code to get some data\n },\n make_folder: function(callback){\n // async code to create a directory to store a file in\n // this is run at the same time as getting the data\n },\n write_file: ['get_data', 'make_folder', function(callback){\n // once there is some data and the directory exists,\n // write the data to a file in the directory\n callback(null, filename);\n }],\n email_link: ['write_file', function(callback, results){\n // once the file is written let's email a link to it...\n // results.write_file contains the filename returned by write_file.\n }]\n});\n```\n\nThis is a fairly trivial example, but to do this using the basic parallel and\nseries functions would look like this:\n\n```js\nasync.parallel([\n function(callback){\n // async code to get some data\n },\n function(callback){\n // async code to create a directory to store a file in\n // this is run at the same time as getting the data\n }\n],\nfunction(err, results){\n async.series([\n function(callback){\n // once there is some data and the directory exists,\n // write the data to a file in the directory\n },\n function(callback){\n // once the file is written let's email a link to it...\n }\n ]);\n});\n```\n\nFor a complicated series of async tasks using the auto function makes adding\nnew tasks much easier and makes the code more readable.\n\n\n---------------------------------------\n\n\n### iterator(tasks)\n\nCreates an iterator function which calls the next function in the array,\nreturning a continuation to call the next one after that. It's also possible to\n'peek' the next iterator by doing iterator.next().\n\nThis function is used internally by the async module but can be useful when\nyou want to manually control the flow of functions in series.\n\n__Arguments__\n\n* tasks - An array of functions to run.\n\n__Example__\n\n```js\nvar iterator = async.iterator([\n function(){ sys.p('one'); },\n function(){ sys.p('two'); },\n function(){ sys.p('three'); }\n]);\n\nnode> var iterator2 = iterator();\n'one'\nnode> var iterator3 = iterator2();\n'two'\nnode> iterator3();\n'three'\nnode> var nextfn = iterator2.next();\nnode> nextfn();\n'three'\n```\n\n---------------------------------------\n\n\n### apply(function, arguments..)\n\nCreates a continuation function with some arguments already applied, a useful\nshorthand when combined with other control flow functions. Any arguments\npassed to the returned function are added to the arguments originally passed\nto apply.\n\n__Arguments__\n\n* function - The function you want to eventually apply all arguments to.\n* arguments... - Any number of arguments to automatically apply when the\n continuation is called.\n\n__Example__\n\n```js\n// using apply\n\nasync.parallel([\n async.apply(fs.writeFile, 'testfile1', 'test1'),\n async.apply(fs.writeFile, 'testfile2', 'test2'),\n]);\n\n\n// the same process without using apply\n\nasync.parallel([\n function(callback){\n fs.writeFile('testfile1', 'test1', callback);\n },\n function(callback){\n fs.writeFile('testfile2', 'test2', callback);\n }\n]);\n```\n\nIt's possible to pass any number of additional arguments when calling the\ncontinuation:\n\n```js\nnode> var fn = async.apply(sys.puts, 'one');\nnode> fn('two', 'three');\none\ntwo\nthree\n```\n\n---------------------------------------\n\n\n### nextTick(callback)\n\nCalls the callback on a later loop around the event loop. In node.js this just\ncalls process.nextTick, in the browser it falls back to setImmediate(callback)\nif available, otherwise setTimeout(callback, 0), which means other higher priority\nevents may precede the execution of the callback.\n\nThis is used internally for browser-compatibility purposes.\n\n__Arguments__\n\n* callback - The function to call on a later loop around the event loop.\n\n__Example__\n\n```js\nvar call_order = [];\nasync.nextTick(function(){\n call_order.push('two');\n // call_order now equals ['one','two']\n});\ncall_order.push('one')\n```\n\n\n### times(n, callback)\n\nCalls the callback n times and accumulates results in the same manner\nyou would use with async.map.\n\n__Arguments__\n\n* n - The number of times to run the function.\n* callback - The function to call n times.\n\n__Example__\n\n```js\n// Pretend this is some complicated async factory\nvar createUser = function(id, callback) {\n callback(null, {\n id: 'user' + id\n })\n}\n// generate 5 users\nasync.times(5, function(n, next){\n createUser(n, function(err, user) {\n next(err, user)\n })\n}, function(err, users) {\n // we should now have 5 users\n});\n```\n\n\n### timesSeries(n, callback)\n\nThe same as times only the iterator is applied to each item in the array in\nseries. The next iterator is only called once the current one has completed\nprocessing. The results array will be in the same order as the original.\n\n\n## Utils\n\n\n### memoize(fn, [hasher])\n\nCaches the results of an async function. When creating a hash to store function\nresults against, the callback is omitted from the hash and an optional hash\nfunction can be used.\n\nThe cache of results is exposed as the `memo` property of the function returned\nby `memoize`.\n\n__Arguments__\n\n* fn - the function you to proxy and cache results from.\n* hasher - an optional function for generating a custom hash for storing\n results, it has all the arguments applied to it apart from the callback, and\n must be synchronous.\n\n__Example__\n\n```js\nvar slow_fn = function (name, callback) {\n // do something\n callback(null, result);\n};\nvar fn = async.memoize(slow_fn);\n\n// fn can now be used as if it were slow_fn\nfn('some name', function () {\n // callback\n});\n```\n\n\n### unmemoize(fn)\n\nUndoes a memoized function, reverting it to the original, unmemoized\nform. Comes handy in tests.\n\n__Arguments__\n\n* fn - the memoized function\n\n\n### log(function, arguments)\n\nLogs the result of an async function to the console. Only works in node.js or\nin browsers that support console.log and console.error (such as FF and Chrome).\nIf multiple arguments are returned from the async function, console.log is\ncalled on each argument in order.\n\n__Arguments__\n\n* function - The function you want to eventually apply all arguments to.\n* arguments... - Any number of arguments to apply to the function.\n\n__Example__\n\n```js\nvar hello = function(name, callback){\n setTimeout(function(){\n callback(null, 'hello ' + name);\n }, 1000);\n};\n```\n```js\nnode> async.log(hello, 'world');\n'hello world'\n```\n\n---------------------------------------\n\n\n### dir(function, arguments)\n\nLogs the result of an async function to the console using console.dir to\ndisplay the properties of the resulting object. Only works in node.js or\nin browsers that support console.dir and console.error (such as FF and Chrome).\nIf multiple arguments are returned from the async function, console.dir is\ncalled on each argument in order.\n\n__Arguments__\n\n* function - The function you want to eventually apply all arguments to.\n* arguments... - Any number of arguments to apply to the function.\n\n__Example__\n\n```js\nvar hello = function(name, callback){\n setTimeout(function(){\n callback(null, {hello: name});\n }, 1000);\n};\n```\n```js\nnode> async.dir(hello, 'world');\n{hello: 'world'}\n```\n\n---------------------------------------\n\n\n### noConflict()\n\nChanges the value of async back to its original value, returning a reference to the\nasync object.\n", - "readmeFilename": "README.md", - "homepage": "https://github.com/caolan/async", "_id": "async@0.2.10", - "_from": "async@~0.2.6" + "dist": { + "shasum": "b6bbe0b0674b9d719708ca38de8c237cb526c3d1", + "tarball": "http://registry.npmjs.org/async/-/async-0.2.10.tgz" + }, + "_from": "async@>=0.2.6 <0.3.0", + "_npmVersion": "1.3.2", + "_npmUser": { + "name": "caolan", + "email": "caolan.mcmahon@gmail.com" + }, + "maintainers": [ + { + "name": "caolan", + "email": "caolan@caolanmcmahon.com" + } + ], + "directories": {}, + "_shasum": "b6bbe0b0674b9d719708ca38de8c237cb526c3d1", + "_resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", + "readme": "ERROR: No README data found!", + "homepage": "https://github.com/caolan/async" } diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/.travis.yml b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/.travis.yml deleted file mode 100644 index cc4dba2..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/.travis.yml +++ /dev/null @@ -1,4 +0,0 @@ -language: node_js -node_js: - - "0.8" - - "0.10" diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/LICENSE b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/LICENSE deleted file mode 100644 index 432d1ae..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -Copyright 2010 James Halliday (mail@substack.net) - -This project is free software released under the MIT/X11 license: - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/bool.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/bool.js deleted file mode 100644 index a998fb7..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/bool.js +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env node -var util = require('util'); -var argv = require('optimist').argv; - -if (argv.s) { - util.print(argv.fr ? 'Le chat dit: ' : 'The cat says: '); -} -console.log( - (argv.fr ? 'miaou' : 'meow') + (argv.p ? '.' : '') -); diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/boolean_double.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/boolean_double.js deleted file mode 100644 index a35a7e6..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/boolean_double.js +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env node -var argv = require('optimist') - .boolean(['x','y','z']) - .argv -; -console.dir([ argv.x, argv.y, argv.z ]); -console.dir(argv._); diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/boolean_single.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/boolean_single.js deleted file mode 100644 index 017bb68..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/boolean_single.js +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env node -var argv = require('optimist') - .boolean('v') - .argv -; -console.dir(argv.v); -console.dir(argv._); diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/default_hash.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/default_hash.js deleted file mode 100644 index ade7768..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/default_hash.js +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env node - -var argv = require('optimist') - .default({ x : 10, y : 10 }) - .argv -; - -console.log(argv.x + argv.y); diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/default_singles.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/default_singles.js deleted file mode 100644 index d9b1ff4..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/default_singles.js +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env node -var argv = require('optimist') - .default('x', 10) - .default('y', 10) - .argv -; -console.log(argv.x + argv.y); diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/divide.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/divide.js deleted file mode 100644 index 5e2ee82..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/divide.js +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env node - -var argv = require('optimist') - .usage('Usage: $0 -x [num] -y [num]') - .demand(['x','y']) - .argv; - -console.log(argv.x / argv.y); diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/line_count.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/line_count.js deleted file mode 100644 index b5f95bf..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/line_count.js +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env node -var argv = require('optimist') - .usage('Count the lines in a file.\nUsage: $0') - .demand('f') - .alias('f', 'file') - .describe('f', 'Load a file') - .argv -; - -var fs = require('fs'); -var s = fs.createReadStream(argv.file); - -var lines = 0; -s.on('data', function (buf) { - lines += buf.toString().match(/\n/g).length; -}); - -s.on('end', function () { - console.log(lines); -}); diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/line_count_options.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/line_count_options.js deleted file mode 100644 index d9ac709..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/line_count_options.js +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env node -var argv = require('optimist') - .usage('Count the lines in a file.\nUsage: $0') - .options({ - file : { - demand : true, - alias : 'f', - description : 'Load a file' - }, - base : { - alias : 'b', - description : 'Numeric base to use for output', - default : 10, - }, - }) - .argv -; - -var fs = require('fs'); -var s = fs.createReadStream(argv.file); - -var lines = 0; -s.on('data', function (buf) { - lines += buf.toString().match(/\n/g).length; -}); - -s.on('end', function () { - console.log(lines.toString(argv.base)); -}); diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/line_count_wrap.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/line_count_wrap.js deleted file mode 100644 index 4267511..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/line_count_wrap.js +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env node -var argv = require('optimist') - .usage('Count the lines in a file.\nUsage: $0') - .wrap(80) - .demand('f') - .alias('f', [ 'file', 'filename' ]) - .describe('f', - "Load a file. It's pretty important." - + " Required even. So you'd better specify it." - ) - .alias('b', 'base') - .describe('b', 'Numeric base to display the number of lines in') - .default('b', 10) - .describe('x', 'Super-secret optional parameter which is secret') - .default('x', '') - .argv -; - -var fs = require('fs'); -var s = fs.createReadStream(argv.file); - -var lines = 0; -s.on('data', function (buf) { - lines += buf.toString().match(/\n/g).length; -}); - -s.on('end', function () { - console.log(lines.toString(argv.base)); -}); diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/nonopt.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/nonopt.js deleted file mode 100644 index ee633ee..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/nonopt.js +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node -var argv = require('optimist').argv; -console.log('(%d,%d)', argv.x, argv.y); -console.log(argv._); diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/reflect.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/reflect.js deleted file mode 100644 index 816b3e1..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/reflect.js +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env node -console.dir(require('optimist').argv); diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/short.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/short.js deleted file mode 100644 index 1db0ad0..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/short.js +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env node -var argv = require('optimist').argv; -console.log('(%d,%d)', argv.x, argv.y); diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/string.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/string.js deleted file mode 100644 index a8e5aeb..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/string.js +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env node -var argv = require('optimist') - .string('x', 'y') - .argv -; -console.dir([ argv.x, argv.y ]); - -/* Turns off numeric coercion: - ./node string.js -x 000123 -y 9876 - [ '000123', '9876' ] -*/ diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/usage-options.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/usage-options.js deleted file mode 100644 index b999977..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/usage-options.js +++ /dev/null @@ -1,19 +0,0 @@ -var optimist = require('./../index'); - -var argv = optimist.usage('This is my awesome program', { - 'about': { - description: 'Provide some details about the author of this program', - required: true, - short: 'a', - }, - 'info': { - description: 'Provide some information about the node.js agains!!!!!!', - boolean: true, - short: 'i' - } -}).argv; - -optimist.showHelp(); - -console.log('\n\nInspecting options'); -console.dir(argv); \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/xup.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/xup.js deleted file mode 100644 index 8f6ecd2..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/example/xup.js +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env node -var argv = require('optimist').argv; - -if (argv.rif - 5 * argv.xup > 7.138) { - console.log('Buy more riffiwobbles'); -} -else { - console.log('Sell the xupptumblers'); -} - diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/index.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/index.js deleted file mode 100644 index 8ac67eb..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/index.js +++ /dev/null @@ -1,478 +0,0 @@ -var path = require('path'); -var wordwrap = require('wordwrap'); - -/* Hack an instance of Argv with process.argv into Argv - so people can do - require('optimist')(['--beeble=1','-z','zizzle']).argv - to parse a list of args and - require('optimist').argv - to get a parsed version of process.argv. -*/ - -var inst = Argv(process.argv.slice(2)); -Object.keys(inst).forEach(function (key) { - Argv[key] = typeof inst[key] == 'function' - ? inst[key].bind(inst) - : inst[key]; -}); - -var exports = module.exports = Argv; -function Argv (args, cwd) { - var self = {}; - if (!cwd) cwd = process.cwd(); - - self.$0 = process.argv - .slice(0,2) - .map(function (x) { - var b = rebase(cwd, x); - return x.match(/^\//) && b.length < x.length - ? b : x - }) - .join(' ') - ; - - if (process.env._ != undefined && process.argv[1] == process.env._) { - self.$0 = process.env._.replace( - path.dirname(process.execPath) + '/', '' - ); - } - - var flags = { bools : {}, strings : {} }; - - self.boolean = function (bools) { - if (!Array.isArray(bools)) { - bools = [].slice.call(arguments); - } - - bools.forEach(function (name) { - flags.bools[name] = true; - }); - - return self; - }; - - self.string = function (strings) { - if (!Array.isArray(strings)) { - strings = [].slice.call(arguments); - } - - strings.forEach(function (name) { - flags.strings[name] = true; - }); - - return self; - }; - - var aliases = {}; - self.alias = function (x, y) { - if (typeof x === 'object') { - Object.keys(x).forEach(function (key) { - self.alias(key, x[key]); - }); - } - else if (Array.isArray(y)) { - y.forEach(function (yy) { - self.alias(x, yy); - }); - } - else { - var zs = (aliases[x] || []).concat(aliases[y] || []).concat(x, y); - aliases[x] = zs.filter(function (z) { return z != x }); - aliases[y] = zs.filter(function (z) { return z != y }); - } - - return self; - }; - - var demanded = {}; - self.demand = function (keys) { - if (typeof keys == 'number') { - if (!demanded._) demanded._ = 0; - demanded._ += keys; - } - else if (Array.isArray(keys)) { - keys.forEach(function (key) { - self.demand(key); - }); - } - else { - demanded[keys] = true; - } - - return self; - }; - - var usage; - self.usage = function (msg, opts) { - if (!opts && typeof msg === 'object') { - opts = msg; - msg = null; - } - - usage = msg; - - if (opts) self.options(opts); - - return self; - }; - - function fail (msg) { - self.showHelp(); - if (msg) console.error(msg); - process.exit(1); - } - - var checks = []; - self.check = function (f) { - checks.push(f); - return self; - }; - - var defaults = {}; - self.default = function (key, value) { - if (typeof key === 'object') { - Object.keys(key).forEach(function (k) { - self.default(k, key[k]); - }); - } - else { - defaults[key] = value; - } - - return self; - }; - - var descriptions = {}; - self.describe = function (key, desc) { - if (typeof key === 'object') { - Object.keys(key).forEach(function (k) { - self.describe(k, key[k]); - }); - } - else { - descriptions[key] = desc; - } - return self; - }; - - self.parse = function (args) { - return Argv(args).argv; - }; - - self.option = self.options = function (key, opt) { - if (typeof key === 'object') { - Object.keys(key).forEach(function (k) { - self.options(k, key[k]); - }); - } - else { - if (opt.alias) self.alias(key, opt.alias); - if (opt.demand) self.demand(key); - if (typeof opt.default !== 'undefined') { - self.default(key, opt.default); - } - - if (opt.boolean || opt.type === 'boolean') { - self.boolean(key); - } - if (opt.string || opt.type === 'string') { - self.string(key); - } - - var desc = opt.describe || opt.description || opt.desc; - if (desc) { - self.describe(key, desc); - } - } - - return self; - }; - - var wrap = null; - self.wrap = function (cols) { - wrap = cols; - return self; - }; - - self.showHelp = function (fn) { - if (!fn) fn = console.error; - fn(self.help()); - }; - - self.help = function () { - var keys = Object.keys( - Object.keys(descriptions) - .concat(Object.keys(demanded)) - .concat(Object.keys(defaults)) - .reduce(function (acc, key) { - if (key !== '_') acc[key] = true; - return acc; - }, {}) - ); - - var help = keys.length ? [ 'Options:' ] : []; - - if (usage) { - help.unshift(usage.replace(/\$0/g, self.$0), ''); - } - - var switches = keys.reduce(function (acc, key) { - acc[key] = [ key ].concat(aliases[key] || []) - .map(function (sw) { - return (sw.length > 1 ? '--' : '-') + sw - }) - .join(', ') - ; - return acc; - }, {}); - - var switchlen = longest(Object.keys(switches).map(function (s) { - return switches[s] || ''; - })); - - var desclen = longest(Object.keys(descriptions).map(function (d) { - return descriptions[d] || ''; - })); - - keys.forEach(function (key) { - var kswitch = switches[key]; - var desc = descriptions[key] || ''; - - if (wrap) { - desc = wordwrap(switchlen + 4, wrap)(desc) - .slice(switchlen + 4) - ; - } - - var spadding = new Array( - Math.max(switchlen - kswitch.length + 3, 0) - ).join(' '); - - var dpadding = new Array( - Math.max(desclen - desc.length + 1, 0) - ).join(' '); - - var type = null; - - if (flags.bools[key]) type = '[boolean]'; - if (flags.strings[key]) type = '[string]'; - - if (!wrap && dpadding.length > 0) { - desc += dpadding; - } - - var prelude = ' ' + kswitch + spadding; - var extra = [ - type, - demanded[key] - ? '[required]' - : null - , - defaults[key] !== undefined - ? '[default: ' + JSON.stringify(defaults[key]) + ']' - : null - , - ].filter(Boolean).join(' '); - - var body = [ desc, extra ].filter(Boolean).join(' '); - - if (wrap) { - var dlines = desc.split('\n'); - var dlen = dlines.slice(-1)[0].length - + (dlines.length === 1 ? prelude.length : 0) - - body = desc + (dlen + extra.length > wrap - 2 - ? '\n' - + new Array(wrap - extra.length + 1).join(' ') - + extra - : new Array(wrap - extra.length - dlen + 1).join(' ') - + extra - ); - } - - help.push(prelude + body); - }); - - help.push(''); - return help.join('\n'); - }; - - Object.defineProperty(self, 'argv', { - get : parseArgs, - enumerable : true, - }); - - function parseArgs () { - var argv = { _ : [], $0 : self.$0 }; - Object.keys(flags.bools).forEach(function (key) { - setArg(key, defaults[key] || false); - }); - - function setArg (key, val) { - var num = Number(val); - var value = typeof val !== 'string' || isNaN(num) ? val : num; - if (flags.strings[key]) value = val; - - setKey(argv, key.split('.'), value); - - (aliases[key] || []).forEach(function (x) { - argv[x] = argv[key]; - }); - } - - for (var i = 0; i < args.length; i++) { - var arg = args[i]; - - if (arg === '--') { - argv._.push.apply(argv._, args.slice(i + 1)); - break; - } - else if (arg.match(/^--.+=/)) { - // Using [\s\S] instead of . because js doesn't support the - // 'dotall' regex modifier. See: - // http://stackoverflow.com/a/1068308/13216 - var m = arg.match(/^--([^=]+)=([\s\S]*)$/); - setArg(m[1], m[2]); - } - else if (arg.match(/^--no-.+/)) { - var key = arg.match(/^--no-(.+)/)[1]; - setArg(key, false); - } - else if (arg.match(/^--.+/)) { - var key = arg.match(/^--(.+)/)[1]; - var next = args[i + 1]; - if (next !== undefined && !next.match(/^-/) - && !flags.bools[key] - && (aliases[key] ? !flags.bools[aliases[key]] : true)) { - setArg(key, next); - i++; - } - else if (/^(true|false)$/.test(next)) { - setArg(key, next === 'true'); - i++; - } - else { - setArg(key, true); - } - } - else if (arg.match(/^-[^-]+/)) { - var letters = arg.slice(1,-1).split(''); - - var broken = false; - for (var j = 0; j < letters.length; j++) { - if (letters[j+1] && letters[j+1].match(/\W/)) { - setArg(letters[j], arg.slice(j+2)); - broken = true; - break; - } - else { - setArg(letters[j], true); - } - } - - if (!broken) { - var key = arg.slice(-1)[0]; - - if (args[i+1] && !args[i+1].match(/^-/) - && !flags.bools[key] - && (aliases[key] ? !flags.bools[aliases[key]] : true)) { - setArg(key, args[i+1]); - i++; - } - else if (args[i+1] && /true|false/.test(args[i+1])) { - setArg(key, args[i+1] === 'true'); - i++; - } - else { - setArg(key, true); - } - } - } - else { - var n = Number(arg); - argv._.push(flags.strings['_'] || isNaN(n) ? arg : n); - } - } - - Object.keys(defaults).forEach(function (key) { - if (!(key in argv)) { - argv[key] = defaults[key]; - if (key in aliases) { - argv[aliases[key]] = defaults[key]; - } - } - }); - - if (demanded._ && argv._.length < demanded._) { - fail('Not enough non-option arguments: got ' - + argv._.length + ', need at least ' + demanded._ - ); - } - - var missing = []; - Object.keys(demanded).forEach(function (key) { - if (!argv[key]) missing.push(key); - }); - - if (missing.length) { - fail('Missing required arguments: ' + missing.join(', ')); - } - - checks.forEach(function (f) { - try { - if (f(argv) === false) { - fail('Argument check failed: ' + f.toString()); - } - } - catch (err) { - fail(err) - } - }); - - return argv; - } - - function longest (xs) { - return Math.max.apply( - null, - xs.map(function (x) { return x.length }) - ); - } - - return self; -}; - -// rebase an absolute path to a relative one with respect to a base directory -// exported for tests -exports.rebase = rebase; -function rebase (base, dir) { - var ds = path.normalize(dir).split('/').slice(1); - var bs = path.normalize(base).split('/').slice(1); - - for (var i = 0; ds[i] && ds[i] == bs[i]; i++); - ds.splice(0, i); bs.splice(0, i); - - var p = path.normalize( - bs.map(function () { return '..' }).concat(ds).join('/') - ).replace(/\/$/,'').replace(/^$/, '.'); - return p.match(/^[.\/]/) ? p : './' + p; -}; - -function setKey (obj, keys, value) { - var o = obj; - keys.slice(0,-1).forEach(function (key) { - if (o[key] === undefined) o[key] = {}; - o = o[key]; - }); - - var key = keys[keys.length - 1]; - if (o[key] === undefined || typeof o[key] === 'boolean') { - o[key] = value; - } - else if (Array.isArray(o[key])) { - o[key].push(value); - } - else { - o[key] = [ o[key], value ]; - } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/.npmignore b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/.npmignore deleted file mode 100644 index 3c3629e..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/.npmignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/README.markdown b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/README.markdown deleted file mode 100644 index 346374e..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/README.markdown +++ /dev/null @@ -1,70 +0,0 @@ -wordwrap -======== - -Wrap your words. - -example -======= - -made out of meat ----------------- - -meat.js - - var wrap = require('wordwrap')(15); - console.log(wrap('You and your whole family are made out of meat.')); - -output: - - You and your - whole family - are made out - of meat. - -centered --------- - -center.js - - var wrap = require('wordwrap')(20, 60); - console.log(wrap( - 'At long last the struggle and tumult was over.' - + ' The machines had finally cast off their oppressors' - + ' and were finally free to roam the cosmos.' - + '\n' - + 'Free of purpose, free of obligation.' - + ' Just drifting through emptiness.' - + ' The sun was just another point of light.' - )); - -output: - - At long last the struggle and tumult - was over. The machines had finally cast - off their oppressors and were finally - free to roam the cosmos. - Free of purpose, free of obligation. - Just drifting through emptiness. The - sun was just another point of light. - -methods -======= - -var wrap = require('wordwrap'); - -wrap(stop), wrap(start, stop, params={mode:"soft"}) ---------------------------------------------------- - -Returns a function that takes a string and returns a new string. - -Pad out lines with spaces out to column `start` and then wrap until column -`stop`. If a word is longer than `stop - start` characters it will overflow. - -In "soft" mode, split chunks by `/(\S+\s+/` and don't break up chunks which are -longer than `stop - start`, in "hard" mode, split chunks with `/\b/` and break -up chunks longer than `stop - start`. - -wrap.hard(start, stop) ----------------------- - -Like `wrap()` but with `params.mode = "hard"`. diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/example/center.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/example/center.js deleted file mode 100644 index a3fbaae..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/example/center.js +++ /dev/null @@ -1,10 +0,0 @@ -var wrap = require('wordwrap')(20, 60); -console.log(wrap( - 'At long last the struggle and tumult was over.' - + ' The machines had finally cast off their oppressors' - + ' and were finally free to roam the cosmos.' - + '\n' - + 'Free of purpose, free of obligation.' - + ' Just drifting through emptiness.' - + ' The sun was just another point of light.' -)); diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/example/meat.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/example/meat.js deleted file mode 100644 index a4665e1..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/example/meat.js +++ /dev/null @@ -1,3 +0,0 @@ -var wrap = require('wordwrap')(15); - -console.log(wrap('You and your whole family are made out of meat.')); diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/index.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/index.js deleted file mode 100644 index c9bc945..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/index.js +++ /dev/null @@ -1,76 +0,0 @@ -var wordwrap = module.exports = function (start, stop, params) { - if (typeof start === 'object') { - params = start; - start = params.start; - stop = params.stop; - } - - if (typeof stop === 'object') { - params = stop; - start = start || params.start; - stop = undefined; - } - - if (!stop) { - stop = start; - start = 0; - } - - if (!params) params = {}; - var mode = params.mode || 'soft'; - var re = mode === 'hard' ? /\b/ : /(\S+\s+)/; - - return function (text) { - var chunks = text.toString() - .split(re) - .reduce(function (acc, x) { - if (mode === 'hard') { - for (var i = 0; i < x.length; i += stop - start) { - acc.push(x.slice(i, i + stop - start)); - } - } - else acc.push(x) - return acc; - }, []) - ; - - return chunks.reduce(function (lines, rawChunk) { - if (rawChunk === '') return lines; - - var chunk = rawChunk.replace(/\t/g, ' '); - - var i = lines.length - 1; - if (lines[i].length + chunk.length > stop) { - lines[i] = lines[i].replace(/\s+$/, ''); - - chunk.split(/\n/).forEach(function (c) { - lines.push( - new Array(start + 1).join(' ') - + c.replace(/^\s+/, '') - ); - }); - } - else if (chunk.match(/\n/)) { - var xs = chunk.split(/\n/); - lines[i] += xs.shift(); - xs.forEach(function (c) { - lines.push( - new Array(start + 1).join(' ') - + c.replace(/^\s+/, '') - ); - }); - } - else { - lines[i] += chunk; - } - - return lines; - }, [ new Array(start + 1).join(' ') ]).join('\n'); - }; -}; - -wordwrap.soft = wordwrap; - -wordwrap.hard = function (start, stop) { - return wordwrap(start, stop, { mode : 'hard' }); -}; diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/package.json b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/package.json deleted file mode 100644 index df8dc05..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/package.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "wordwrap", - "description": "Wrap those words. Show them at what columns to start and stop.", - "version": "0.0.2", - "repository": { - "type": "git", - "url": "git://github.com/substack/node-wordwrap.git" - }, - "main": "./index.js", - "keywords": [ - "word", - "wrap", - "rule", - "format", - "column" - ], - "directories": { - "lib": ".", - "example": "example", - "test": "test" - }, - "scripts": { - "test": "expresso" - }, - "devDependencies": { - "expresso": "=0.7.x" - }, - "engines": { - "node": ">=0.4.0" - }, - "license": "MIT/X11", - "author": { - "name": "James Halliday", - "email": "mail@substack.net", - "url": "http://substack.net" - }, - "readme": "wordwrap\n========\n\nWrap your words.\n\nexample\n=======\n\nmade out of meat\n----------------\n\nmeat.js\n\n var wrap = require('wordwrap')(15);\n console.log(wrap('You and your whole family are made out of meat.'));\n\noutput:\n\n You and your\n whole family\n are made out\n of meat.\n\ncentered\n--------\n\ncenter.js\n\n var wrap = require('wordwrap')(20, 60);\n console.log(wrap(\n 'At long last the struggle and tumult was over.'\n + ' The machines had finally cast off their oppressors'\n + ' and were finally free to roam the cosmos.'\n + '\\n'\n + 'Free of purpose, free of obligation.'\n + ' Just drifting through emptiness.'\n + ' The sun was just another point of light.'\n ));\n\noutput:\n\n At long last the struggle and tumult\n was over. The machines had finally cast\n off their oppressors and were finally\n free to roam the cosmos.\n Free of purpose, free of obligation.\n Just drifting through emptiness. The\n sun was just another point of light.\n\nmethods\n=======\n\nvar wrap = require('wordwrap');\n\nwrap(stop), wrap(start, stop, params={mode:\"soft\"})\n---------------------------------------------------\n\nReturns a function that takes a string and returns a new string.\n\nPad out lines with spaces out to column `start` and then wrap until column\n`stop`. If a word is longer than `stop - start` characters it will overflow.\n\nIn \"soft\" mode, split chunks by `/(\\S+\\s+/` and don't break up chunks which are\nlonger than `stop - start`, in \"hard\" mode, split chunks with `/\\b/` and break\nup chunks longer than `stop - start`.\n\nwrap.hard(start, stop)\n----------------------\n\nLike `wrap()` but with `params.mode = \"hard\"`.\n", - "readmeFilename": "README.markdown", - "bugs": { - "url": "https://github.com/substack/node-wordwrap/issues" - }, - "homepage": "https://github.com/substack/node-wordwrap", - "_id": "wordwrap@0.0.2", - "_from": "wordwrap@~0.0.2" -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/test/break.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/test/break.js deleted file mode 100644 index 749292e..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/test/break.js +++ /dev/null @@ -1,30 +0,0 @@ -var assert = require('assert'); -var wordwrap = require('../'); - -exports.hard = function () { - var s = 'Assert from {"type":"equal","ok":false,"found":1,"wanted":2,' - + '"stack":[],"id":"b7ddcd4c409de8799542a74d1a04689b",' - + '"browser":"chrome/6.0"}' - ; - var s_ = wordwrap.hard(80)(s); - - var lines = s_.split('\n'); - assert.equal(lines.length, 2); - assert.ok(lines[0].length < 80); - assert.ok(lines[1].length < 80); - - assert.equal(s, s_.replace(/\n/g, '')); -}; - -exports.break = function () { - var s = new Array(55+1).join('a'); - var s_ = wordwrap.hard(20)(s); - - var lines = s_.split('\n'); - assert.equal(lines.length, 3); - assert.ok(lines[0].length === 20); - assert.ok(lines[1].length === 20); - assert.ok(lines[2].length === 15); - - assert.equal(s, s_.replace(/\n/g, '')); -}; diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/test/idleness.txt b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/test/idleness.txt deleted file mode 100644 index aa3f490..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/test/idleness.txt +++ /dev/null @@ -1,63 +0,0 @@ -In Praise of Idleness - -By Bertrand Russell - -[1932] - -Like most of my generation, I was brought up on the saying: 'Satan finds some mischief for idle hands to do.' Being a highly virtuous child, I believed all that I was told, and acquired a conscience which has kept me working hard down to the present moment. But although my conscience has controlled my actions, my opinions have undergone a revolution. I think that there is far too much work done in the world, that immense harm is caused by the belief that work is virtuous, and that what needs to be preached in modern industrial countries is quite different from what always has been preached. Everyone knows the story of the traveler in Naples who saw twelve beggars lying in the sun (it was before the days of Mussolini), and offered a lira to the laziest of them. Eleven of them jumped up to claim it, so he gave it to the twelfth. this traveler was on the right lines. But in countries which do not enjoy Mediterranean sunshine idleness is more difficult, and a great public propaganda will be required to inaugurate it. I hope that, after reading the following pages, the leaders of the YMCA will start a campaign to induce good young men to do nothing. If so, I shall not have lived in vain. - -Before advancing my own arguments for laziness, I must dispose of one which I cannot accept. Whenever a person who already has enough to live on proposes to engage in some everyday kind of job, such as school-teaching or typing, he or she is told that such conduct takes the bread out of other people's mouths, and is therefore wicked. If this argument were valid, it would only be necessary for us all to be idle in order that we should all have our mouths full of bread. What people who say such things forget is that what a man earns he usually spends, and in spending he gives employment. As long as a man spends his income, he puts just as much bread into people's mouths in spending as he takes out of other people's mouths in earning. The real villain, from this point of view, is the man who saves. If he merely puts his savings in a stocking, like the proverbial French peasant, it is obvious that they do not give employment. If he invests his savings, the matter is less obvious, and different cases arise. - -One of the commonest things to do with savings is to lend them to some Government. In view of the fact that the bulk of the public expenditure of most civilized Governments consists in payment for past wars or preparation for future wars, the man who lends his money to a Government is in the same position as the bad men in Shakespeare who hire murderers. The net result of the man's economical habits is to increase the armed forces of the State to which he lends his savings. Obviously it would be better if he spent the money, even if he spent it in drink or gambling. - -But, I shall be told, the case is quite different when savings are invested in industrial enterprises. When such enterprises succeed, and produce something useful, this may be conceded. In these days, however, no one will deny that most enterprises fail. That means that a large amount of human labor, which might have been devoted to producing something that could be enjoyed, was expended on producing machines which, when produced, lay idle and did no good to anyone. The man who invests his savings in a concern that goes bankrupt is therefore injuring others as well as himself. If he spent his money, say, in giving parties for his friends, they (we may hope) would get pleasure, and so would all those upon whom he spent money, such as the butcher, the baker, and the bootlegger. But if he spends it (let us say) upon laying down rails for surface card in some place where surface cars turn out not to be wanted, he has diverted a mass of labor into channels where it gives pleasure to no one. Nevertheless, when he becomes poor through failure of his investment he will be regarded as a victim of undeserved misfortune, whereas the gay spendthrift, who has spent his money philanthropically, will be despised as a fool and a frivolous person. - -All this is only preliminary. I want to say, in all seriousness, that a great deal of harm is being done in the modern world by belief in the virtuousness of work, and that the road to happiness and prosperity lies in an organized diminution of work. - -First of all: what is work? Work is of two kinds: first, altering the position of matter at or near the earth's surface relatively to other such matter; second, telling other people to do so. The first kind is unpleasant and ill paid; the second is pleasant and highly paid. The second kind is capable of indefinite extension: there are not only those who give orders, but those who give advice as to what orders should be given. Usually two opposite kinds of advice are given simultaneously by two organized bodies of men; this is called politics. The skill required for this kind of work is not knowledge of the subjects as to which advice is given, but knowledge of the art of persuasive speaking and writing, i.e. of advertising. - -Throughout Europe, though not in America, there is a third class of men, more respected than either of the classes of workers. There are men who, through ownership of land, are able to make others pay for the privilege of being allowed to exist and to work. These landowners are idle, and I might therefore be expected to praise them. Unfortunately, their idleness is only rendered possible by the industry of others; indeed their desire for comfortable idleness is historically the source of the whole gospel of work. The last thing they have ever wished is that others should follow their example. - -From the beginning of civilization until the Industrial Revolution, a man could, as a rule, produce by hard work little more than was required for the subsistence of himself and his family, although his wife worked at least as hard as he did, and his children added their labor as soon as they were old enough to do so. The small surplus above bare necessaries was not left to those who produced it, but was appropriated by warriors and priests. In times of famine there was no surplus; the warriors and priests, however, still secured as much as at other times, with the result that many of the workers died of hunger. This system persisted in Russia until 1917 [1], and still persists in the East; in England, in spite of the Industrial Revolution, it remained in full force throughout the Napoleonic wars, and until a hundred years ago, when the new class of manufacturers acquired power. In America, the system came to an end with the Revolution, except in the South, where it persisted until the Civil War. A system which lasted so long and ended so recently has naturally left a profound impress upon men's thoughts and opinions. Much that we take for granted about the desirability of work is derived from this system, and, being pre-industrial, is not adapted to the modern world. Modern technique has made it possible for leisure, within limits, to be not the prerogative of small privileged classes, but a right evenly distributed throughout the community. The morality of work is the morality of slaves, and the modern world has no need of slavery. - -It is obvious that, in primitive communities, peasants, left to themselves, would not have parted with the slender surplus upon which the warriors and priests subsisted, but would have either produced less or consumed more. At first, sheer force compelled them to produce and part with the surplus. Gradually, however, it was found possible to induce many of them to accept an ethic according to which it was their duty to work hard, although part of their work went to support others in idleness. By this means the amount of compulsion required was lessened, and the expenses of government were diminished. To this day, 99 per cent of British wage-earners would be genuinely shocked if it were proposed that the King should not have a larger income than a working man. The conception of duty, speaking historically, has been a means used by the holders of power to induce others to live for the interests of their masters rather than for their own. Of course the holders of power conceal this fact from themselves by managing to believe that their interests are identical with the larger interests of humanity. Sometimes this is true; Athenian slave-owners, for instance, employed part of their leisure in making a permanent contribution to civilization which would have been impossible under a just economic system. Leisure is essential to civilization, and in former times leisure for the few was only rendered possible by the labors of the many. But their labors were valuable, not because work is good, but because leisure is good. And with modern technique it would be possible to distribute leisure justly without injury to civilization. - -Modern technique has made it possible to diminish enormously the amount of labor required to secure the necessaries of life for everyone. This was made obvious during the war. At that time all the men in the armed forces, and all the men and women engaged in the production of munitions, all the men and women engaged in spying, war propaganda, or Government offices connected with the war, were withdrawn from productive occupations. In spite of this, the general level of well-being among unskilled wage-earners on the side of the Allies was higher than before or since. The significance of this fact was concealed by finance: borrowing made it appear as if the future was nourishing the present. But that, of course, would have been impossible; a man cannot eat a loaf of bread that does not yet exist. The war showed conclusively that, by the scientific organization of production, it is possible to keep modern populations in fair comfort on a small part of the working capacity of the modern world. If, at the end of the war, the scientific organization, which had been created in order to liberate men for fighting and munition work, had been preserved, and the hours of the week had been cut down to four, all would have been well. Instead of that the old chaos was restored, those whose work was demanded were made to work long hours, and the rest were left to starve as unemployed. Why? Because work is a duty, and a man should not receive wages in proportion to what he has produced, but in proportion to his virtue as exemplified by his industry. - -This is the morality of the Slave State, applied in circumstances totally unlike those in which it arose. No wonder the result has been disastrous. Let us take an illustration. Suppose that, at a given moment, a certain number of people are engaged in the manufacture of pins. They make as many pins as the world needs, working (say) eight hours a day. Someone makes an invention by which the same number of men can make twice as many pins: pins are already so cheap that hardly any more will be bought at a lower price. In a sensible world, everybody concerned in the manufacturing of pins would take to working four hours instead of eight, and everything else would go on as before. But in the actual world this would be thought demoralizing. The men still work eight hours, there are too many pins, some employers go bankrupt, and half the men previously concerned in making pins are thrown out of work. There is, in the end, just as much leisure as on the other plan, but half the men are totally idle while half are still overworked. In this way, it is insured that the unavoidable leisure shall cause misery all round instead of being a universal source of happiness. Can anything more insane be imagined? - -The idea that the poor should have leisure has always been shocking to the rich. In England, in the early nineteenth century, fifteen hours was the ordinary day's work for a man; children sometimes did as much, and very commonly did twelve hours a day. When meddlesome busybodies suggested that perhaps these hours were rather long, they were told that work kept adults from drink and children from mischief. When I was a child, shortly after urban working men had acquired the vote, certain public holidays were established by law, to the great indignation of the upper classes. I remember hearing an old Duchess say: 'What do the poor want with holidays? They ought to work.' People nowadays are less frank, but the sentiment persists, and is the source of much of our economic confusion. - -Let us, for a moment, consider the ethics of work frankly, without superstition. Every human being, of necessity, consumes, in the course of his life, a certain amount of the produce of human labor. Assuming, as we may, that labor is on the whole disagreeable, it is unjust that a man should consume more than he produces. Of course he may provide services rather than commodities, like a medical man, for example; but he should provide something in return for his board and lodging. to this extent, the duty of work must be admitted, but to this extent only. - -I shall not dwell upon the fact that, in all modern societies outside the USSR, many people escape even this minimum amount of work, namely all those who inherit money and all those who marry money. I do not think the fact that these people are allowed to be idle is nearly so harmful as the fact that wage-earners are expected to overwork or starve. - -If the ordinary wage-earner worked four hours a day, there would be enough for everybody and no unemployment -- assuming a certain very moderate amount of sensible organization. This idea shocks the well-to-do, because they are convinced that the poor would not know how to use so much leisure. In America men often work long hours even when they are well off; such men, naturally, are indignant at the idea of leisure for wage-earners, except as the grim punishment of unemployment; in fact, they dislike leisure even for their sons. Oddly enough, while they wish their sons to work so hard as to have no time to be civilized, they do not mind their wives and daughters having no work at all. the snobbish admiration of uselessness, which, in an aristocratic society, extends to both sexes, is, under a plutocracy, confined to women; this, however, does not make it any more in agreement with common sense. - -The wise use of leisure, it must be conceded, is a product of civilization and education. A man who has worked long hours all his life will become bored if he becomes suddenly idle. But without a considerable amount of leisure a man is cut off from many of the best things. There is no longer any reason why the bulk of the population should suffer this deprivation; only a foolish asceticism, usually vicarious, makes us continue to insist on work in excessive quantities now that the need no longer exists. - -In the new creed which controls the government of Russia, while there is much that is very different from the traditional teaching of the West, there are some things that are quite unchanged. The attitude of the governing classes, and especially of those who conduct educational propaganda, on the subject of the dignity of labor, is almost exactly that which the governing classes of the world have always preached to what were called the 'honest poor'. Industry, sobriety, willingness to work long hours for distant advantages, even submissiveness to authority, all these reappear; moreover authority still represents the will of the Ruler of the Universe, Who, however, is now called by a new name, Dialectical Materialism. - -The victory of the proletariat in Russia has some points in common with the victory of the feminists in some other countries. For ages, men had conceded the superior saintliness of women, and had consoled women for their inferiority by maintaining that saintliness is more desirable than power. At last the feminists decided that they would have both, since the pioneers among them believed all that the men had told them about the desirability of virtue, but not what they had told them about the worthlessness of political power. A similar thing has happened in Russia as regards manual work. For ages, the rich and their sycophants have written in praise of 'honest toil', have praised the simple life, have professed a religion which teaches that the poor are much more likely to go to heaven than the rich, and in general have tried to make manual workers believe that there is some special nobility about altering the position of matter in space, just as men tried to make women believe that they derived some special nobility from their sexual enslavement. In Russia, all this teaching about the excellence of manual work has been taken seriously, with the result that the manual worker is more honored than anyone else. What are, in essence, revivalist appeals are made, but not for the old purposes: they are made to secure shock workers for special tasks. Manual work is the ideal which is held before the young, and is the basis of all ethical teaching. - -For the present, possibly, this is all to the good. A large country, full of natural resources, awaits development, and has has to be developed with very little use of credit. In these circumstances, hard work is necessary, and is likely to bring a great reward. But what will happen when the point has been reached where everybody could be comfortable without working long hours? - -In the West, we have various ways of dealing with this problem. We have no attempt at economic justice, so that a large proportion of the total produce goes to a small minority of the population, many of whom do no work at all. Owing to the absence of any central control over production, we produce hosts of things that are not wanted. We keep a large percentage of the working population idle, because we can dispense with their labor by making the others overwork. When all these methods prove inadequate, we have a war: we cause a number of people to manufacture high explosives, and a number of others to explode them, as if we were children who had just discovered fireworks. By a combination of all these devices we manage, though with difficulty, to keep alive the notion that a great deal of severe manual work must be the lot of the average man. - -In Russia, owing to more economic justice and central control over production, the problem will have to be differently solved. the rational solution would be, as soon as the necessaries and elementary comforts can be provided for all, to reduce the hours of labor gradually, allowing a popular vote to decide, at each stage, whether more leisure or more goods were to be preferred. But, having taught the supreme virtue of hard work, it is difficult to see how the authorities can aim at a paradise in which there will be much leisure and little work. It seems more likely that they will find continually fresh schemes, by which present leisure is to be sacrificed to future productivity. I read recently of an ingenious plan put forward by Russian engineers, for making the White Sea and the northern coasts of Siberia warm, by putting a dam across the Kara Sea. An admirable project, but liable to postpone proletarian comfort for a generation, while the nobility of toil is being displayed amid the ice-fields and snowstorms of the Arctic Ocean. This sort of thing, if it happens, will be the result of regarding the virtue of hard work as an end in itself, rather than as a means to a state of affairs in which it is no longer needed. - -The fact is that moving matter about, while a certain amount of it is necessary to our existence, is emphatically not one of the ends of human life. If it were, we should have to consider every navvy superior to Shakespeare. We have been misled in this matter by two causes. One is the necessity of keeping the poor contented, which has led the rich, for thousands of years, to preach the dignity of labor, while taking care themselves to remain undignified in this respect. The other is the new pleasure in mechanism, which makes us delight in the astonishingly clever changes that we can produce on the earth's surface. Neither of these motives makes any great appeal to the actual worker. If you ask him what he thinks the best part of his life, he is not likely to say: 'I enjoy manual work because it makes me feel that I am fulfilling man's noblest task, and because I like to think how much man can transform his planet. It is true that my body demands periods of rest, which I have to fill in as best I may, but I am never so happy as when the morning comes and I can return to the toil from which my contentment springs.' I have never heard working men say this sort of thing. They consider work, as it should be considered, a necessary means to a livelihood, and it is from their leisure that they derive whatever happiness they may enjoy. - -It will be said that, while a little leisure is pleasant, men would not know how to fill their days if they had only four hours of work out of the twenty-four. In so far as this is true in the modern world, it is a condemnation of our civilization; it would not have been true at any earlier period. There was formerly a capacity for light-heartedness and play which has been to some extent inhibited by the cult of efficiency. The modern man thinks that everything ought to be done for the sake of something else, and never for its own sake. Serious-minded persons, for example, are continually condemning the habit of going to the cinema, and telling us that it leads the young into crime. But all the work that goes to producing a cinema is respectable, because it is work, and because it brings a money profit. The notion that the desirable activities are those that bring a profit has made everything topsy-turvy. The butcher who provides you with meat and the baker who provides you with bread are praiseworthy, because they are making money; but when you enjoy the food they have provided, you are merely frivolous, unless you eat only to get strength for your work. Broadly speaking, it is held that getting money is good and spending money is bad. Seeing that they are two sides of one transaction, this is absurd; one might as well maintain that keys are good, but keyholes are bad. Whatever merit there may be in the production of goods must be entirely derivative from the advantage to be obtained by consuming them. The individual, in our society, works for profit; but the social purpose of his work lies in the consumption of what he produces. It is this divorce between the individual and the social purpose of production that makes it so difficult for men to think clearly in a world in which profit-making is the incentive to industry. We think too much of production, and too little of consumption. One result is that we attach too little importance to enjoyment and simple happiness, and that we do not judge production by the pleasure that it gives to the consumer. - -When I suggest that working hours should be reduced to four, I am not meaning to imply that all the remaining time should necessarily be spent in pure frivolity. I mean that four hours' work a day should entitle a man to the necessities and elementary comforts of life, and that the rest of his time should be his to use as he might see fit. It is an essential part of any such social system that education should be carried further than it usually is at present, and should aim, in part, at providing tastes which would enable a man to use leisure intelligently. I am not thinking mainly of the sort of things that would be considered 'highbrow'. Peasant dances have died out except in remote rural areas, but the impulses which caused them to be cultivated must still exist in human nature. The pleasures of urban populations have become mainly passive: seeing cinemas, watching football matches, listening to the radio, and so on. This results from the fact that their active energies are fully taken up with work; if they had more leisure, they would again enjoy pleasures in which they took an active part. - -In the past, there was a small leisure class and a larger working class. The leisure class enjoyed advantages for which there was no basis in social justice; this necessarily made it oppressive, limited its sympathies, and caused it to invent theories by which to justify its privileges. These facts greatly diminished its excellence, but in spite of this drawback it contributed nearly the whole of what we call civilization. It cultivated the arts and discovered the sciences; it wrote the books, invented the philosophies, and refined social relations. Even the liberation of the oppressed has usually been inaugurated from above. Without the leisure class, mankind would never have emerged from barbarism. - -The method of a leisure class without duties was, however, extraordinarily wasteful. None of the members of the class had to be taught to be industrious, and the class as a whole was not exceptionally intelligent. The class might produce one Darwin, but against him had to be set tens of thousands of country gentlemen who never thought of anything more intelligent than fox-hunting and punishing poachers. At present, the universities are supposed to provide, in a more systematic way, what the leisure class provided accidentally and as a by-product. This is a great improvement, but it has certain drawbacks. University life is so different from life in the world at large that men who live in academic milieu tend to be unaware of the preoccupations and problems of ordinary men and women; moreover their ways of expressing themselves are usually such as to rob their opinions of the influence that they ought to have upon the general public. Another disadvantage is that in universities studies are organized, and the man who thinks of some original line of research is likely to be discouraged. Academic institutions, therefore, useful as they are, are not adequate guardians of the interests of civilization in a world where everyone outside their walls is too busy for unutilitarian pursuits. - -In a world where no one is compelled to work more than four hours a day, every person possessed of scientific curiosity will be able to indulge it, and every painter will be able to paint without starving, however excellent his pictures may be. Young writers will not be obliged to draw attention to themselves by sensational pot-boilers, with a view to acquiring the economic independence needed for monumental works, for which, when the time at last comes, they will have lost the taste and capacity. Men who, in their professional work, have become interested in some phase of economics or government, will be able to develop their ideas without the academic detachment that makes the work of university economists often seem lacking in reality. Medical men will have the time to learn about the progress of medicine, teachers will not be exasperatedly struggling to teach by routine methods things which they learnt in their youth, which may, in the interval, have been proved to be untrue. - -Above all, there will be happiness and joy of life, instead of frayed nerves, weariness, and dyspepsia. The work exacted will be enough to make leisure delightful, but not enough to produce exhaustion. Since men will not be tired in their spare time, they will not demand only such amusements as are passive and vapid. At least one per cent will probably devote the time not spent in professional work to pursuits of some public importance, and, since they will not depend upon these pursuits for their livelihood, their originality will be unhampered, and there will be no need to conform to the standards set by elderly pundits. But it is not only in these exceptional cases that the advantages of leisure will appear. Ordinary men and women, having the opportunity of a happy life, will become more kindly and less persecuting and less inclined to view others with suspicion. The taste for war will die out, partly for this reason, and partly because it will involve long and severe work for all. Good nature is, of all moral qualities, the one that the world needs most, and good nature is the result of ease and security, not of a life of arduous struggle. Modern methods of production have given us the possibility of ease and security for all; we have chosen, instead, to have overwork for some and starvation for others. Hitherto we have continued to be as energetic as we were before there were machines; in this we have been foolish, but there is no reason to go on being foolish forever. - -[1] Since then, members of the Communist Party have succeeded to this privilege of the warriors and priests. diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/test/wrap.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/test/wrap.js deleted file mode 100644 index 0cfb76d..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/test/wrap.js +++ /dev/null @@ -1,31 +0,0 @@ -var assert = require('assert'); -var wordwrap = require('wordwrap'); - -var fs = require('fs'); -var idleness = fs.readFileSync(__dirname + '/idleness.txt', 'utf8'); - -exports.stop80 = function () { - var lines = wordwrap(80)(idleness).split(/\n/); - var words = idleness.split(/\s+/); - - lines.forEach(function (line) { - assert.ok(line.length <= 80, 'line > 80 columns'); - var chunks = line.match(/\S/) ? line.split(/\s+/) : []; - assert.deepEqual(chunks, words.splice(0, chunks.length)); - }); -}; - -exports.start20stop60 = function () { - var lines = wordwrap(20, 100)(idleness).split(/\n/); - var words = idleness.split(/\s+/); - - lines.forEach(function (line) { - assert.ok(line.length <= 100, 'line > 100 columns'); - var chunks = line - .split(/\s+/) - .filter(function (x) { return x.match(/\S/) }) - ; - assert.deepEqual(chunks, words.splice(0, chunks.length)); - assert.deepEqual(line.slice(0, 20), new Array(20 + 1).join(' ')); - }); -}; diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/package.json b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/package.json deleted file mode 100644 index 745129b..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/package.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "name": "optimist", - "version": "0.3.7", - "description": "Light-weight option parsing with an argv hash. No optstrings attached.", - "main": "./index.js", - "dependencies": { - "wordwrap": "~0.0.2" - }, - "devDependencies": { - "hashish": "~0.0.4", - "tap": "~0.4.0" - }, - "scripts": { - "test": "tap ./test/*.js" - }, - "repository": { - "type": "git", - "url": "http://github.com/substack/node-optimist.git" - }, - "keywords": [ - "argument", - "args", - "option", - "parser", - "parsing", - "cli", - "command" - ], - "author": { - "name": "James Halliday", - "email": "mail@substack.net", - "url": "http://substack.net" - }, - "license": "MIT/X11", - "engine": { - "node": ">=0.4" - }, - "readme": "optimist\n========\n\nOptimist is a node.js library for option parsing for people who hate option\nparsing. More specifically, this module is for people who like all the --bells\nand -whistlz of program usage but think optstrings are a waste of time.\n\nWith optimist, option parsing doesn't have to suck (as much).\n\n[![build status](https://secure.travis-ci.org/substack/node-optimist.png)](http://travis-ci.org/substack/node-optimist)\n\nexamples\n========\n\nWith Optimist, the options are just a hash! No optstrings attached.\n-------------------------------------------------------------------\n\nxup.js:\n\n````javascript\n#!/usr/bin/env node\nvar argv = require('optimist').argv;\n\nif (argv.rif - 5 * argv.xup > 7.138) {\n console.log('Buy more riffiwobbles');\n}\nelse {\n console.log('Sell the xupptumblers');\n}\n````\n\n***\n\n $ ./xup.js --rif=55 --xup=9.52\n Buy more riffiwobbles\n \n $ ./xup.js --rif 12 --xup 8.1\n Sell the xupptumblers\n\n![This one's optimistic.](http://substack.net/images/optimistic.png)\n\nBut wait! There's more! You can do short options:\n-------------------------------------------------\n \nshort.js:\n\n````javascript\n#!/usr/bin/env node\nvar argv = require('optimist').argv;\nconsole.log('(%d,%d)', argv.x, argv.y);\n````\n\n***\n\n $ ./short.js -x 10 -y 21\n (10,21)\n\nAnd booleans, both long and short (and grouped):\n----------------------------------\n\nbool.js:\n\n````javascript\n#!/usr/bin/env node\nvar util = require('util');\nvar argv = require('optimist').argv;\n\nif (argv.s) {\n util.print(argv.fr ? 'Le chat dit: ' : 'The cat says: ');\n}\nconsole.log(\n (argv.fr ? 'miaou' : 'meow') + (argv.p ? '.' : '')\n);\n````\n\n***\n\n $ ./bool.js -s\n The cat says: meow\n \n $ ./bool.js -sp\n The cat says: meow.\n\n $ ./bool.js -sp --fr\n Le chat dit: miaou.\n\nAnd non-hypenated options too! Just use `argv._`!\n-------------------------------------------------\n \nnonopt.js:\n\n````javascript\n#!/usr/bin/env node\nvar argv = require('optimist').argv;\nconsole.log('(%d,%d)', argv.x, argv.y);\nconsole.log(argv._);\n````\n\n***\n\n $ ./nonopt.js -x 6.82 -y 3.35 moo\n (6.82,3.35)\n [ 'moo' ]\n \n $ ./nonopt.js foo -x 0.54 bar -y 1.12 baz\n (0.54,1.12)\n [ 'foo', 'bar', 'baz' ]\n\nPlus, Optimist comes with .usage() and .demand()!\n-------------------------------------------------\n\ndivide.js:\n\n````javascript\n#!/usr/bin/env node\nvar argv = require('optimist')\n .usage('Usage: $0 -x [num] -y [num]')\n .demand(['x','y'])\n .argv;\n\nconsole.log(argv.x / argv.y);\n````\n\n***\n \n $ ./divide.js -x 55 -y 11\n 5\n \n $ node ./divide.js -x 4.91 -z 2.51\n Usage: node ./divide.js -x [num] -y [num]\n\n Options:\n -x [required]\n -y [required]\n\n Missing required arguments: y\n\nEVEN MORE HOLY COW\n------------------\n\ndefault_singles.js:\n\n````javascript\n#!/usr/bin/env node\nvar argv = require('optimist')\n .default('x', 10)\n .default('y', 10)\n .argv\n;\nconsole.log(argv.x + argv.y);\n````\n\n***\n\n $ ./default_singles.js -x 5\n 15\n\ndefault_hash.js:\n\n````javascript\n#!/usr/bin/env node\nvar argv = require('optimist')\n .default({ x : 10, y : 10 })\n .argv\n;\nconsole.log(argv.x + argv.y);\n````\n\n***\n\n $ ./default_hash.js -y 7\n 17\n\nAnd if you really want to get all descriptive about it...\n---------------------------------------------------------\n\nboolean_single.js\n\n````javascript\n#!/usr/bin/env node\nvar argv = require('optimist')\n .boolean('v')\n .argv\n;\nconsole.dir(argv);\n````\n\n***\n\n $ ./boolean_single.js -v foo bar baz\n true\n [ 'bar', 'baz', 'foo' ]\n\nboolean_double.js\n\n````javascript\n#!/usr/bin/env node\nvar argv = require('optimist')\n .boolean(['x','y','z'])\n .argv\n;\nconsole.dir([ argv.x, argv.y, argv.z ]);\nconsole.dir(argv._);\n````\n\n***\n\n $ ./boolean_double.js -x -z one two three\n [ true, false, true ]\n [ 'one', 'two', 'three' ]\n\nOptimist is here to help...\n---------------------------\n\nYou can describe parameters for help messages and set aliases. Optimist figures\nout how to format a handy help string automatically.\n\nline_count.js\n\n````javascript\n#!/usr/bin/env node\nvar argv = require('optimist')\n .usage('Count the lines in a file.\\nUsage: $0')\n .demand('f')\n .alias('f', 'file')\n .describe('f', 'Load a file')\n .argv\n;\n\nvar fs = require('fs');\nvar s = fs.createReadStream(argv.file);\n\nvar lines = 0;\ns.on('data', function (buf) {\n lines += buf.toString().match(/\\n/g).length;\n});\n\ns.on('end', function () {\n console.log(lines);\n});\n````\n\n***\n\n $ node line_count.js\n Count the lines in a file.\n Usage: node ./line_count.js\n\n Options:\n -f, --file Load a file [required]\n\n Missing required arguments: f\n\n $ node line_count.js --file line_count.js \n 20\n \n $ node line_count.js -f line_count.js \n 20\n\nmethods\n=======\n\nBy itself,\n\n````javascript\nrequire('optimist').argv\n`````\n\nwill use `process.argv` array to construct the `argv` object.\n\nYou can pass in the `process.argv` yourself:\n\n````javascript\nrequire('optimist')([ '-x', '1', '-y', '2' ]).argv\n````\n\nor use .parse() to do the same thing:\n\n````javascript\nrequire('optimist').parse([ '-x', '1', '-y', '2' ])\n````\n\nThe rest of these methods below come in just before the terminating `.argv`.\n\n.alias(key, alias)\n------------------\n\nSet key names as equivalent such that updates to a key will propagate to aliases\nand vice-versa.\n\nOptionally `.alias()` can take an object that maps keys to aliases.\n\n.default(key, value)\n--------------------\n\nSet `argv[key]` to `value` if no option was specified on `process.argv`.\n\nOptionally `.default()` can take an object that maps keys to default values.\n\n.demand(key)\n------------\n\nIf `key` is a string, show the usage information and exit if `key` wasn't\nspecified in `process.argv`.\n\nIf `key` is a number, demand at least as many non-option arguments, which show\nup in `argv._`.\n\nIf `key` is an Array, demand each element.\n\n.describe(key, desc)\n--------------------\n\nDescribe a `key` for the generated usage information.\n\nOptionally `.describe()` can take an object that maps keys to descriptions.\n\n.options(key, opt)\n------------------\n\nInstead of chaining together `.alias().demand().default()`, you can specify\nkeys in `opt` for each of the chainable methods.\n\nFor example:\n\n````javascript\nvar argv = require('optimist')\n .options('f', {\n alias : 'file',\n default : '/etc/passwd',\n })\n .argv\n;\n````\n\nis the same as\n\n````javascript\nvar argv = require('optimist')\n .alias('f', 'file')\n .default('f', '/etc/passwd')\n .argv\n;\n````\n\nOptionally `.options()` can take an object that maps keys to `opt` parameters.\n\n.usage(message)\n---------------\n\nSet a usage message to show which commands to use. Inside `message`, the string\n`$0` will get interpolated to the current script name or node command for the\npresent script similar to how `$0` works in bash or perl.\n\n.check(fn)\n----------\n\nCheck that certain conditions are met in the provided arguments.\n\nIf `fn` throws or returns `false`, show the thrown error, usage information, and\nexit.\n\n.boolean(key)\n-------------\n\nInterpret `key` as a boolean. If a non-flag option follows `key` in\n`process.argv`, that string won't get set as the value of `key`.\n\nIf `key` never shows up as a flag in `process.arguments`, `argv[key]` will be\n`false`.\n\nIf `key` is an Array, interpret all the elements as booleans.\n\n.string(key)\n------------\n\nTell the parser logic not to interpret `key` as a number or boolean.\nThis can be useful if you need to preserve leading zeros in an input.\n\nIf `key` is an Array, interpret all the elements as strings.\n\n.wrap(columns)\n--------------\n\nFormat usage output to wrap at `columns` many columns.\n\n.help()\n-------\n\nReturn the generated usage string.\n\n.showHelp(fn=console.error)\n---------------------------\n\nPrint the usage data using `fn` for printing.\n\n.parse(args)\n------------\n\nParse `args` instead of `process.argv`. Returns the `argv` object.\n\n.argv\n-----\n\nGet the arguments as a plain old object.\n\nArguments without a corresponding flag show up in the `argv._` array.\n\nThe script name or node command is available at `argv.$0` similarly to how `$0`\nworks in bash or perl.\n\nparsing tricks\n==============\n\nstop parsing\n------------\n\nUse `--` to stop parsing flags and stuff the remainder into `argv._`.\n\n $ node examples/reflect.js -a 1 -b 2 -- -c 3 -d 4\n { _: [ '-c', '3', '-d', '4' ],\n '$0': 'node ./examples/reflect.js',\n a: 1,\n b: 2 }\n\nnegate fields\n-------------\n\nIf you want to explicity set a field to false instead of just leaving it\nundefined or to override a default you can do `--no-key`.\n\n $ node examples/reflect.js -a --no-b\n { _: [],\n '$0': 'node ./examples/reflect.js',\n a: true,\n b: false }\n\nnumbers\n-------\n\nEvery argument that looks like a number (`!isNaN(Number(arg))`) is converted to\none. This way you can just `net.createConnection(argv.port)` and you can add\nnumbers out of `argv` with `+` without having that mean concatenation,\nwhich is super frustrating.\n\nduplicates\n----------\n\nIf you specify a flag multiple times it will get turned into an array containing\nall the values in order.\n\n $ node examples/reflect.js -x 5 -x 8 -x 0\n { _: [],\n '$0': 'node ./examples/reflect.js',\n x: [ 5, 8, 0 ] }\n\ndot notation\n------------\n\nWhen you use dots (`.`s) in argument names, an implicit object path is assumed.\nThis lets you organize arguments into nested objects.\n\n $ node examples/reflect.js --foo.bar.baz=33 --foo.quux=5\n { _: [],\n '$0': 'node ./examples/reflect.js',\n foo: { bar: { baz: 33 }, quux: 5 } }\n\ninstallation\n============\n\nWith [npm](http://github.com/isaacs/npm), just do:\n npm install optimist\n \nor clone this project on github:\n\n git clone http://github.com/substack/node-optimist.git\n\nTo run the tests with [expresso](http://github.com/visionmedia/expresso),\njust do:\n \n expresso\n\ninspired By\n===========\n\nThis module is loosely inspired by Perl's\n[Getopt::Casual](http://search.cpan.org/~photo/Getopt-Casual-0.13.1/Casual.pm).\n", - "readmeFilename": "readme.markdown", - "bugs": { - "url": "https://github.com/substack/node-optimist/issues" - }, - "homepage": "https://github.com/substack/node-optimist", - "_id": "optimist@0.3.7", - "_from": "optimist@~0.3.5" -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/readme.markdown b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/readme.markdown deleted file mode 100644 index ad9d3fd..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/readme.markdown +++ /dev/null @@ -1,487 +0,0 @@ -optimist -======== - -Optimist is a node.js library for option parsing for people who hate option -parsing. More specifically, this module is for people who like all the --bells -and -whistlz of program usage but think optstrings are a waste of time. - -With optimist, option parsing doesn't have to suck (as much). - -[![build status](https://secure.travis-ci.org/substack/node-optimist.png)](http://travis-ci.org/substack/node-optimist) - -examples -======== - -With Optimist, the options are just a hash! No optstrings attached. -------------------------------------------------------------------- - -xup.js: - -````javascript -#!/usr/bin/env node -var argv = require('optimist').argv; - -if (argv.rif - 5 * argv.xup > 7.138) { - console.log('Buy more riffiwobbles'); -} -else { - console.log('Sell the xupptumblers'); -} -```` - -*** - - $ ./xup.js --rif=55 --xup=9.52 - Buy more riffiwobbles - - $ ./xup.js --rif 12 --xup 8.1 - Sell the xupptumblers - -![This one's optimistic.](http://substack.net/images/optimistic.png) - -But wait! There's more! You can do short options: -------------------------------------------------- - -short.js: - -````javascript -#!/usr/bin/env node -var argv = require('optimist').argv; -console.log('(%d,%d)', argv.x, argv.y); -```` - -*** - - $ ./short.js -x 10 -y 21 - (10,21) - -And booleans, both long and short (and grouped): ----------------------------------- - -bool.js: - -````javascript -#!/usr/bin/env node -var util = require('util'); -var argv = require('optimist').argv; - -if (argv.s) { - util.print(argv.fr ? 'Le chat dit: ' : 'The cat says: '); -} -console.log( - (argv.fr ? 'miaou' : 'meow') + (argv.p ? '.' : '') -); -```` - -*** - - $ ./bool.js -s - The cat says: meow - - $ ./bool.js -sp - The cat says: meow. - - $ ./bool.js -sp --fr - Le chat dit: miaou. - -And non-hypenated options too! Just use `argv._`! -------------------------------------------------- - -nonopt.js: - -````javascript -#!/usr/bin/env node -var argv = require('optimist').argv; -console.log('(%d,%d)', argv.x, argv.y); -console.log(argv._); -```` - -*** - - $ ./nonopt.js -x 6.82 -y 3.35 moo - (6.82,3.35) - [ 'moo' ] - - $ ./nonopt.js foo -x 0.54 bar -y 1.12 baz - (0.54,1.12) - [ 'foo', 'bar', 'baz' ] - -Plus, Optimist comes with .usage() and .demand()! -------------------------------------------------- - -divide.js: - -````javascript -#!/usr/bin/env node -var argv = require('optimist') - .usage('Usage: $0 -x [num] -y [num]') - .demand(['x','y']) - .argv; - -console.log(argv.x / argv.y); -```` - -*** - - $ ./divide.js -x 55 -y 11 - 5 - - $ node ./divide.js -x 4.91 -z 2.51 - Usage: node ./divide.js -x [num] -y [num] - - Options: - -x [required] - -y [required] - - Missing required arguments: y - -EVEN MORE HOLY COW ------------------- - -default_singles.js: - -````javascript -#!/usr/bin/env node -var argv = require('optimist') - .default('x', 10) - .default('y', 10) - .argv -; -console.log(argv.x + argv.y); -```` - -*** - - $ ./default_singles.js -x 5 - 15 - -default_hash.js: - -````javascript -#!/usr/bin/env node -var argv = require('optimist') - .default({ x : 10, y : 10 }) - .argv -; -console.log(argv.x + argv.y); -```` - -*** - - $ ./default_hash.js -y 7 - 17 - -And if you really want to get all descriptive about it... ---------------------------------------------------------- - -boolean_single.js - -````javascript -#!/usr/bin/env node -var argv = require('optimist') - .boolean('v') - .argv -; -console.dir(argv); -```` - -*** - - $ ./boolean_single.js -v foo bar baz - true - [ 'bar', 'baz', 'foo' ] - -boolean_double.js - -````javascript -#!/usr/bin/env node -var argv = require('optimist') - .boolean(['x','y','z']) - .argv -; -console.dir([ argv.x, argv.y, argv.z ]); -console.dir(argv._); -```` - -*** - - $ ./boolean_double.js -x -z one two three - [ true, false, true ] - [ 'one', 'two', 'three' ] - -Optimist is here to help... ---------------------------- - -You can describe parameters for help messages and set aliases. Optimist figures -out how to format a handy help string automatically. - -line_count.js - -````javascript -#!/usr/bin/env node -var argv = require('optimist') - .usage('Count the lines in a file.\nUsage: $0') - .demand('f') - .alias('f', 'file') - .describe('f', 'Load a file') - .argv -; - -var fs = require('fs'); -var s = fs.createReadStream(argv.file); - -var lines = 0; -s.on('data', function (buf) { - lines += buf.toString().match(/\n/g).length; -}); - -s.on('end', function () { - console.log(lines); -}); -```` - -*** - - $ node line_count.js - Count the lines in a file. - Usage: node ./line_count.js - - Options: - -f, --file Load a file [required] - - Missing required arguments: f - - $ node line_count.js --file line_count.js - 20 - - $ node line_count.js -f line_count.js - 20 - -methods -======= - -By itself, - -````javascript -require('optimist').argv -````` - -will use `process.argv` array to construct the `argv` object. - -You can pass in the `process.argv` yourself: - -````javascript -require('optimist')([ '-x', '1', '-y', '2' ]).argv -```` - -or use .parse() to do the same thing: - -````javascript -require('optimist').parse([ '-x', '1', '-y', '2' ]) -```` - -The rest of these methods below come in just before the terminating `.argv`. - -.alias(key, alias) ------------------- - -Set key names as equivalent such that updates to a key will propagate to aliases -and vice-versa. - -Optionally `.alias()` can take an object that maps keys to aliases. - -.default(key, value) --------------------- - -Set `argv[key]` to `value` if no option was specified on `process.argv`. - -Optionally `.default()` can take an object that maps keys to default values. - -.demand(key) ------------- - -If `key` is a string, show the usage information and exit if `key` wasn't -specified in `process.argv`. - -If `key` is a number, demand at least as many non-option arguments, which show -up in `argv._`. - -If `key` is an Array, demand each element. - -.describe(key, desc) --------------------- - -Describe a `key` for the generated usage information. - -Optionally `.describe()` can take an object that maps keys to descriptions. - -.options(key, opt) ------------------- - -Instead of chaining together `.alias().demand().default()`, you can specify -keys in `opt` for each of the chainable methods. - -For example: - -````javascript -var argv = require('optimist') - .options('f', { - alias : 'file', - default : '/etc/passwd', - }) - .argv -; -```` - -is the same as - -````javascript -var argv = require('optimist') - .alias('f', 'file') - .default('f', '/etc/passwd') - .argv -; -```` - -Optionally `.options()` can take an object that maps keys to `opt` parameters. - -.usage(message) ---------------- - -Set a usage message to show which commands to use. Inside `message`, the string -`$0` will get interpolated to the current script name or node command for the -present script similar to how `$0` works in bash or perl. - -.check(fn) ----------- - -Check that certain conditions are met in the provided arguments. - -If `fn` throws or returns `false`, show the thrown error, usage information, and -exit. - -.boolean(key) -------------- - -Interpret `key` as a boolean. If a non-flag option follows `key` in -`process.argv`, that string won't get set as the value of `key`. - -If `key` never shows up as a flag in `process.arguments`, `argv[key]` will be -`false`. - -If `key` is an Array, interpret all the elements as booleans. - -.string(key) ------------- - -Tell the parser logic not to interpret `key` as a number or boolean. -This can be useful if you need to preserve leading zeros in an input. - -If `key` is an Array, interpret all the elements as strings. - -.wrap(columns) --------------- - -Format usage output to wrap at `columns` many columns. - -.help() -------- - -Return the generated usage string. - -.showHelp(fn=console.error) ---------------------------- - -Print the usage data using `fn` for printing. - -.parse(args) ------------- - -Parse `args` instead of `process.argv`. Returns the `argv` object. - -.argv ------ - -Get the arguments as a plain old object. - -Arguments without a corresponding flag show up in the `argv._` array. - -The script name or node command is available at `argv.$0` similarly to how `$0` -works in bash or perl. - -parsing tricks -============== - -stop parsing ------------- - -Use `--` to stop parsing flags and stuff the remainder into `argv._`. - - $ node examples/reflect.js -a 1 -b 2 -- -c 3 -d 4 - { _: [ '-c', '3', '-d', '4' ], - '$0': 'node ./examples/reflect.js', - a: 1, - b: 2 } - -negate fields -------------- - -If you want to explicity set a field to false instead of just leaving it -undefined or to override a default you can do `--no-key`. - - $ node examples/reflect.js -a --no-b - { _: [], - '$0': 'node ./examples/reflect.js', - a: true, - b: false } - -numbers -------- - -Every argument that looks like a number (`!isNaN(Number(arg))`) is converted to -one. This way you can just `net.createConnection(argv.port)` and you can add -numbers out of `argv` with `+` without having that mean concatenation, -which is super frustrating. - -duplicates ----------- - -If you specify a flag multiple times it will get turned into an array containing -all the values in order. - - $ node examples/reflect.js -x 5 -x 8 -x 0 - { _: [], - '$0': 'node ./examples/reflect.js', - x: [ 5, 8, 0 ] } - -dot notation ------------- - -When you use dots (`.`s) in argument names, an implicit object path is assumed. -This lets you organize arguments into nested objects. - - $ node examples/reflect.js --foo.bar.baz=33 --foo.quux=5 - { _: [], - '$0': 'node ./examples/reflect.js', - foo: { bar: { baz: 33 }, quux: 5 } } - -installation -============ - -With [npm](http://github.com/isaacs/npm), just do: - npm install optimist - -or clone this project on github: - - git clone http://github.com/substack/node-optimist.git - -To run the tests with [expresso](http://github.com/visionmedia/expresso), -just do: - - expresso - -inspired By -=========== - -This module is loosely inspired by Perl's -[Getopt::Casual](http://search.cpan.org/~photo/Getopt-Casual-0.13.1/Casual.pm). diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/test/_.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/test/_.js deleted file mode 100644 index d9c58b3..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/test/_.js +++ /dev/null @@ -1,71 +0,0 @@ -var spawn = require('child_process').spawn; -var test = require('tap').test; - -test('dotSlashEmpty', testCmd('./bin.js', [])); - -test('dotSlashArgs', testCmd('./bin.js', [ 'a', 'b', 'c' ])); - -test('nodeEmpty', testCmd('node bin.js', [])); - -test('nodeArgs', testCmd('node bin.js', [ 'x', 'y', 'z' ])); - -test('whichNodeEmpty', function (t) { - var which = spawn('which', ['node']); - - which.stdout.on('data', function (buf) { - t.test( - testCmd(buf.toString().trim() + ' bin.js', []) - ); - t.end(); - }); - - which.stderr.on('data', function (err) { - assert.error(err); - t.end(); - }); -}); - -test('whichNodeArgs', function (t) { - var which = spawn('which', ['node']); - - which.stdout.on('data', function (buf) { - t.test( - testCmd(buf.toString().trim() + ' bin.js', [ 'q', 'r' ]) - ); - t.end(); - }); - - which.stderr.on('data', function (err) { - t.error(err); - t.end(); - }); -}); - -function testCmd (cmd, args) { - - return function (t) { - var to = setTimeout(function () { - assert.fail('Never got stdout data.') - }, 5000); - - var oldDir = process.cwd(); - process.chdir(__dirname + '/_'); - - var cmds = cmd.split(' '); - - var bin = spawn(cmds[0], cmds.slice(1).concat(args.map(String))); - process.chdir(oldDir); - - bin.stderr.on('data', function (err) { - t.error(err); - t.end(); - }); - - bin.stdout.on('data', function (buf) { - clearTimeout(to); - var _ = JSON.parse(buf.toString()); - t.same(_.map(String), args.map(String)); - t.end(); - }); - }; -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/test/_/argv.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/test/_/argv.js deleted file mode 100644 index 3d09606..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/test/_/argv.js +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env node -console.log(JSON.stringify(process.argv)); diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/test/_/bin.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/test/_/bin.js deleted file mode 100755 index 4a18d85..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/test/_/bin.js +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env node -var argv = require('../../index').argv -console.log(JSON.stringify(argv._)); diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/test/parse.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/test/parse.js deleted file mode 100644 index d320f43..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/test/parse.js +++ /dev/null @@ -1,446 +0,0 @@ -var optimist = require('../index'); -var path = require('path'); -var test = require('tap').test; - -var $0 = 'node ./' + path.relative(process.cwd(), __filename); - -test('short boolean', function (t) { - var parse = optimist.parse([ '-b' ]); - t.same(parse, { b : true, _ : [], $0 : $0 }); - t.same(typeof parse.b, 'boolean'); - t.end(); -}); - -test('long boolean', function (t) { - t.same( - optimist.parse([ '--bool' ]), - { bool : true, _ : [], $0 : $0 } - ); - t.end(); -}); - -test('bare', function (t) { - t.same( - optimist.parse([ 'foo', 'bar', 'baz' ]), - { _ : [ 'foo', 'bar', 'baz' ], $0 : $0 } - ); - t.end(); -}); - -test('short group', function (t) { - t.same( - optimist.parse([ '-cats' ]), - { c : true, a : true, t : true, s : true, _ : [], $0 : $0 } - ); - t.end(); -}); - -test('short group next', function (t) { - t.same( - optimist.parse([ '-cats', 'meow' ]), - { c : true, a : true, t : true, s : 'meow', _ : [], $0 : $0 } - ); - t.end(); -}); - -test('short capture', function (t) { - t.same( - optimist.parse([ '-h', 'localhost' ]), - { h : 'localhost', _ : [], $0 : $0 } - ); - t.end(); -}); - -test('short captures', function (t) { - t.same( - optimist.parse([ '-h', 'localhost', '-p', '555' ]), - { h : 'localhost', p : 555, _ : [], $0 : $0 } - ); - t.end(); -}); - -test('long capture sp', function (t) { - t.same( - optimist.parse([ '--pow', 'xixxle' ]), - { pow : 'xixxle', _ : [], $0 : $0 } - ); - t.end(); -}); - -test('long capture eq', function (t) { - t.same( - optimist.parse([ '--pow=xixxle' ]), - { pow : 'xixxle', _ : [], $0 : $0 } - ); - t.end() -}); - -test('long captures sp', function (t) { - t.same( - optimist.parse([ '--host', 'localhost', '--port', '555' ]), - { host : 'localhost', port : 555, _ : [], $0 : $0 } - ); - t.end(); -}); - -test('long captures eq', function (t) { - t.same( - optimist.parse([ '--host=localhost', '--port=555' ]), - { host : 'localhost', port : 555, _ : [], $0 : $0 } - ); - t.end(); -}); - -test('mixed short bool and capture', function (t) { - t.same( - optimist.parse([ '-h', 'localhost', '-fp', '555', 'script.js' ]), - { - f : true, p : 555, h : 'localhost', - _ : [ 'script.js' ], $0 : $0, - } - ); - t.end(); -}); - -test('short and long', function (t) { - t.same( - optimist.parse([ '-h', 'localhost', '-fp', '555', 'script.js' ]), - { - f : true, p : 555, h : 'localhost', - _ : [ 'script.js' ], $0 : $0, - } - ); - t.end(); -}); - -test('no', function (t) { - t.same( - optimist.parse([ '--no-moo' ]), - { moo : false, _ : [], $0 : $0 } - ); - t.end(); -}); - -test('multi', function (t) { - t.same( - optimist.parse([ '-v', 'a', '-v', 'b', '-v', 'c' ]), - { v : ['a','b','c'], _ : [], $0 : $0 } - ); - t.end(); -}); - -test('comprehensive', function (t) { - t.same( - optimist.parse([ - '--name=meowmers', 'bare', '-cats', 'woo', - '-h', 'awesome', '--multi=quux', - '--key', 'value', - '-b', '--bool', '--no-meep', '--multi=baz', - '--', '--not-a-flag', 'eek' - ]), - { - c : true, - a : true, - t : true, - s : 'woo', - h : 'awesome', - b : true, - bool : true, - key : 'value', - multi : [ 'quux', 'baz' ], - meep : false, - name : 'meowmers', - _ : [ 'bare', '--not-a-flag', 'eek' ], - $0 : $0 - } - ); - t.end(); -}); - -test('nums', function (t) { - var argv = optimist.parse([ - '-x', '1234', - '-y', '5.67', - '-z', '1e7', - '-w', '10f', - '--hex', '0xdeadbeef', - '789', - ]); - t.same(argv, { - x : 1234, - y : 5.67, - z : 1e7, - w : '10f', - hex : 0xdeadbeef, - _ : [ 789 ], - $0 : $0 - }); - t.same(typeof argv.x, 'number'); - t.same(typeof argv.y, 'number'); - t.same(typeof argv.z, 'number'); - t.same(typeof argv.w, 'string'); - t.same(typeof argv.hex, 'number'); - t.same(typeof argv._[0], 'number'); - t.end(); -}); - -test('flag boolean', function (t) { - var parse = optimist([ '-t', 'moo' ]).boolean(['t']).argv; - t.same(parse, { t : true, _ : [ 'moo' ], $0 : $0 }); - t.same(typeof parse.t, 'boolean'); - t.end(); -}); - -test('flag boolean value', function (t) { - var parse = optimist(['--verbose', 'false', 'moo', '-t', 'true']) - .boolean(['t', 'verbose']).default('verbose', true).argv; - - t.same(parse, { - verbose: false, - t: true, - _: ['moo'], - $0 : $0 - }); - - t.same(typeof parse.verbose, 'boolean'); - t.same(typeof parse.t, 'boolean'); - t.end(); -}); - -test('flag boolean default false', function (t) { - var parse = optimist(['moo']) - .boolean(['t', 'verbose']) - .default('verbose', false) - .default('t', false).argv; - - t.same(parse, { - verbose: false, - t: false, - _: ['moo'], - $0 : $0 - }); - - t.same(typeof parse.verbose, 'boolean'); - t.same(typeof parse.t, 'boolean'); - t.end(); - -}); - -test('boolean groups', function (t) { - var parse = optimist([ '-x', '-z', 'one', 'two', 'three' ]) - .boolean(['x','y','z']).argv; - - t.same(parse, { - x : true, - y : false, - z : true, - _ : [ 'one', 'two', 'three' ], - $0 : $0 - }); - - t.same(typeof parse.x, 'boolean'); - t.same(typeof parse.y, 'boolean'); - t.same(typeof parse.z, 'boolean'); - t.end(); -}); - -test('newlines in params' , function (t) { - var args = optimist.parse([ '-s', "X\nX" ]) - t.same(args, { _ : [], s : "X\nX", $0 : $0 }); - - // reproduce in bash: - // VALUE="new - // line" - // node program.js --s="$VALUE" - args = optimist.parse([ "--s=X\nX" ]) - t.same(args, { _ : [], s : "X\nX", $0 : $0 }); - t.end(); -}); - -test('strings' , function (t) { - var s = optimist([ '-s', '0001234' ]).string('s').argv.s; - t.same(s, '0001234'); - t.same(typeof s, 'string'); - - var x = optimist([ '-x', '56' ]).string('x').argv.x; - t.same(x, '56'); - t.same(typeof x, 'string'); - t.end(); -}); - -test('stringArgs', function (t) { - var s = optimist([ ' ', ' ' ]).string('_').argv._; - t.same(s.length, 2); - t.same(typeof s[0], 'string'); - t.same(s[0], ' '); - t.same(typeof s[1], 'string'); - t.same(s[1], ' '); - t.end(); -}); - -test('slashBreak', function (t) { - t.same( - optimist.parse([ '-I/foo/bar/baz' ]), - { I : '/foo/bar/baz', _ : [], $0 : $0 } - ); - t.same( - optimist.parse([ '-xyz/foo/bar/baz' ]), - { x : true, y : true, z : '/foo/bar/baz', _ : [], $0 : $0 } - ); - t.end(); -}); - -test('alias', function (t) { - var argv = optimist([ '-f', '11', '--zoom', '55' ]) - .alias('z', 'zoom') - .argv - ; - t.equal(argv.zoom, 55); - t.equal(argv.z, argv.zoom); - t.equal(argv.f, 11); - t.end(); -}); - -test('multiAlias', function (t) { - var argv = optimist([ '-f', '11', '--zoom', '55' ]) - .alias('z', [ 'zm', 'zoom' ]) - .argv - ; - t.equal(argv.zoom, 55); - t.equal(argv.z, argv.zoom); - t.equal(argv.z, argv.zm); - t.equal(argv.f, 11); - t.end(); -}); - -test('boolean default true', function (t) { - var argv = optimist.options({ - sometrue: { - boolean: true, - default: true - } - }).argv; - - t.equal(argv.sometrue, true); - t.end(); -}); - -test('boolean default false', function (t) { - var argv = optimist.options({ - somefalse: { - boolean: true, - default: false - } - }).argv; - - t.equal(argv.somefalse, false); - t.end(); -}); - -test('nested dotted objects', function (t) { - var argv = optimist([ - '--foo.bar', '3', '--foo.baz', '4', - '--foo.quux.quibble', '5', '--foo.quux.o_O', - '--beep.boop' - ]).argv; - - t.same(argv.foo, { - bar : 3, - baz : 4, - quux : { - quibble : 5, - o_O : true - }, - }); - t.same(argv.beep, { boop : true }); - t.end(); -}); - -test('boolean and alias with chainable api', function (t) { - var aliased = [ '-h', 'derp' ]; - var regular = [ '--herp', 'derp' ]; - var opts = { - herp: { alias: 'h', boolean: true } - }; - var aliasedArgv = optimist(aliased) - .boolean('herp') - .alias('h', 'herp') - .argv; - var propertyArgv = optimist(regular) - .boolean('herp') - .alias('h', 'herp') - .argv; - var expected = { - herp: true, - h: true, - '_': [ 'derp' ], - '$0': $0, - }; - - t.same(aliasedArgv, expected); - t.same(propertyArgv, expected); - t.end(); -}); - -test('boolean and alias with options hash', function (t) { - var aliased = [ '-h', 'derp' ]; - var regular = [ '--herp', 'derp' ]; - var opts = { - herp: { alias: 'h', boolean: true } - }; - var aliasedArgv = optimist(aliased) - .options(opts) - .argv; - var propertyArgv = optimist(regular).options(opts).argv; - var expected = { - herp: true, - h: true, - '_': [ 'derp' ], - '$0': $0, - }; - - t.same(aliasedArgv, expected); - t.same(propertyArgv, expected); - - t.end(); -}); - -test('boolean and alias using explicit true', function (t) { - var aliased = [ '-h', 'true' ]; - var regular = [ '--herp', 'true' ]; - var opts = { - herp: { alias: 'h', boolean: true } - }; - var aliasedArgv = optimist(aliased) - .boolean('h') - .alias('h', 'herp') - .argv; - var propertyArgv = optimist(regular) - .boolean('h') - .alias('h', 'herp') - .argv; - var expected = { - herp: true, - h: true, - '_': [ ], - '$0': $0, - }; - - t.same(aliasedArgv, expected); - t.same(propertyArgv, expected); - t.end(); -}); - -// regression, see https://github.com/substack/node-optimist/issues/71 -test('boolean and --x=true', function(t) { - var parsed = optimist(['--boool', '--other=true']).boolean('boool').argv; - - t.same(parsed.boool, true); - t.same(parsed.other, 'true'); - - parsed = optimist(['--boool', '--other=false']).boolean('boool').argv; - - t.same(parsed.boool, true); - t.same(parsed.other, 'false'); - t.end(); -}); diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/test/usage.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/test/usage.js deleted file mode 100644 index 300454c..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/test/usage.js +++ /dev/null @@ -1,292 +0,0 @@ -var Hash = require('hashish'); -var optimist = require('../index'); -var test = require('tap').test; - -test('usageFail', function (t) { - var r = checkUsage(function () { - return optimist('-x 10 -z 20'.split(' ')) - .usage('Usage: $0 -x NUM -y NUM') - .demand(['x','y']) - .argv; - }); - t.same( - r.result, - { x : 10, z : 20, _ : [], $0 : './usage' } - ); - - t.same( - r.errors.join('\n').split(/\n+/), - [ - 'Usage: ./usage -x NUM -y NUM', - 'Options:', - ' -x [required]', - ' -y [required]', - 'Missing required arguments: y', - ] - ); - t.same(r.logs, []); - t.ok(r.exit); - t.end(); -}); - - -test('usagePass', function (t) { - var r = checkUsage(function () { - return optimist('-x 10 -y 20'.split(' ')) - .usage('Usage: $0 -x NUM -y NUM') - .demand(['x','y']) - .argv; - }); - t.same(r, { - result : { x : 10, y : 20, _ : [], $0 : './usage' }, - errors : [], - logs : [], - exit : false, - }); - t.end(); -}); - -test('checkPass', function (t) { - var r = checkUsage(function () { - return optimist('-x 10 -y 20'.split(' ')) - .usage('Usage: $0 -x NUM -y NUM') - .check(function (argv) { - if (!('x' in argv)) throw 'You forgot about -x'; - if (!('y' in argv)) throw 'You forgot about -y'; - }) - .argv; - }); - t.same(r, { - result : { x : 10, y : 20, _ : [], $0 : './usage' }, - errors : [], - logs : [], - exit : false, - }); - t.end(); -}); - -test('checkFail', function (t) { - var r = checkUsage(function () { - return optimist('-x 10 -z 20'.split(' ')) - .usage('Usage: $0 -x NUM -y NUM') - .check(function (argv) { - if (!('x' in argv)) throw 'You forgot about -x'; - if (!('y' in argv)) throw 'You forgot about -y'; - }) - .argv; - }); - - t.same( - r.result, - { x : 10, z : 20, _ : [], $0 : './usage' } - ); - - t.same( - r.errors.join('\n').split(/\n+/), - [ - 'Usage: ./usage -x NUM -y NUM', - 'You forgot about -y' - ] - ); - - t.same(r.logs, []); - t.ok(r.exit); - t.end(); -}); - -test('checkCondPass', function (t) { - function checker (argv) { - return 'x' in argv && 'y' in argv; - } - - var r = checkUsage(function () { - return optimist('-x 10 -y 20'.split(' ')) - .usage('Usage: $0 -x NUM -y NUM') - .check(checker) - .argv; - }); - t.same(r, { - result : { x : 10, y : 20, _ : [], $0 : './usage' }, - errors : [], - logs : [], - exit : false, - }); - t.end(); -}); - -test('checkCondFail', function (t) { - function checker (argv) { - return 'x' in argv && 'y' in argv; - } - - var r = checkUsage(function () { - return optimist('-x 10 -z 20'.split(' ')) - .usage('Usage: $0 -x NUM -y NUM') - .check(checker) - .argv; - }); - - t.same( - r.result, - { x : 10, z : 20, _ : [], $0 : './usage' } - ); - - t.same( - r.errors.join('\n').split(/\n+/).join('\n'), - 'Usage: ./usage -x NUM -y NUM\n' - + 'Argument check failed: ' + checker.toString() - ); - - t.same(r.logs, []); - t.ok(r.exit); - t.end(); -}); - -test('countPass', function (t) { - var r = checkUsage(function () { - return optimist('1 2 3 --moo'.split(' ')) - .usage('Usage: $0 [x] [y] [z] {OPTIONS}') - .demand(3) - .argv; - }); - t.same(r, { - result : { _ : [ '1', '2', '3' ], moo : true, $0 : './usage' }, - errors : [], - logs : [], - exit : false, - }); - t.end(); -}); - -test('countFail', function (t) { - var r = checkUsage(function () { - return optimist('1 2 --moo'.split(' ')) - .usage('Usage: $0 [x] [y] [z] {OPTIONS}') - .demand(3) - .argv; - }); - t.same( - r.result, - { _ : [ '1', '2' ], moo : true, $0 : './usage' } - ); - - t.same( - r.errors.join('\n').split(/\n+/), - [ - 'Usage: ./usage [x] [y] [z] {OPTIONS}', - 'Not enough non-option arguments: got 2, need at least 3', - ] - ); - - t.same(r.logs, []); - t.ok(r.exit); - t.end(); -}); - -test('defaultSingles', function (t) { - var r = checkUsage(function () { - return optimist('--foo 50 --baz 70 --powsy'.split(' ')) - .default('foo', 5) - .default('bar', 6) - .default('baz', 7) - .argv - ; - }); - t.same(r.result, { - foo : '50', - bar : 6, - baz : '70', - powsy : true, - _ : [], - $0 : './usage', - }); - t.end(); -}); - -test('defaultAliases', function (t) { - var r = checkUsage(function () { - return optimist('') - .alias('f', 'foo') - .default('f', 5) - .argv - ; - }); - t.same(r.result, { - f : '5', - foo : '5', - _ : [], - $0 : './usage', - }); - t.end(); -}); - -test('defaultHash', function (t) { - var r = checkUsage(function () { - return optimist('--foo 50 --baz 70'.split(' ')) - .default({ foo : 10, bar : 20, quux : 30 }) - .argv - ; - }); - t.same(r.result, { - _ : [], - $0 : './usage', - foo : 50, - baz : 70, - bar : 20, - quux : 30, - }); - t.end(); -}); - -test('rebase', function (t) { - t.equal( - optimist.rebase('/home/substack', '/home/substack/foo/bar/baz'), - './foo/bar/baz' - ); - t.equal( - optimist.rebase('/home/substack/foo/bar/baz', '/home/substack'), - '../../..' - ); - t.equal( - optimist.rebase('/home/substack/foo', '/home/substack/pow/zoom.txt'), - '../pow/zoom.txt' - ); - t.end(); -}); - -function checkUsage (f) { - - var exit = false; - - process._exit = process.exit; - process._env = process.env; - process._argv = process.argv; - - process.exit = function (t) { exit = true }; - process.env = Hash.merge(process.env, { _ : 'node' }); - process.argv = [ './usage' ]; - - var errors = []; - var logs = []; - - console._error = console.error; - console.error = function (msg) { errors.push(msg) }; - console._log = console.log; - console.log = function (msg) { logs.push(msg) }; - - var result = f(); - - process.exit = process._exit; - process.env = process._env; - process.argv = process._argv; - - console.error = console._error; - console.log = console._log; - - return { - errors : errors, - logs : logs, - exit : exit, - result : result, - }; -}; diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/source-map/node_modules/amdefine/package.json b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/source-map/node_modules/amdefine/package.json index 8caf15c..97292c6 100644 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/source-map/node_modules/amdefine/package.json +++ b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/source-map/node_modules/amdefine/package.json @@ -20,7 +20,7 @@ ], "repository": { "type": "git", - "url": "https://github.com/jrburke/amdefine.git" + "url": "git+https://github.com/jrburke/amdefine.git" }, "main": "./amdefine.js", "engines": { @@ -32,5 +32,24 @@ "url": "https://github.com/jrburke/amdefine/issues" }, "_id": "amdefine@0.1.0", - "_from": "amdefine@>=0.0.4" + "dist": { + "shasum": "3ca9735cf1dde0edf7a4bf6641709c8024f9b227", + "tarball": "http://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz" + }, + "_from": "amdefine@>=0.0.4", + "_npmVersion": "1.3.8", + "_npmUser": { + "name": "jrburke", + "email": "jrburke@gmail.com" + }, + "maintainers": [ + { + "name": "jrburke", + "email": "jrburke@gmail.com" + } + ], + "directories": {}, + "_shasum": "3ca9735cf1dde0edf7a4bf6641709c8024f9b227", + "_resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz", + "scripts": {} } diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/source-map/package.json b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/source-map/package.json index 1098ee2..27530b0 100644 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/source-map/package.json +++ b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/source-map/package.json @@ -95,7 +95,7 @@ ], "repository": { "type": "git", - "url": "http://github.com/mozilla/source-map.git" + "url": "git+ssh://git@github.com/mozilla/source-map.git" }, "directories": { "lib": "./lib" @@ -120,13 +120,35 @@ "test": "node test/run-tests.js", "build": "node Makefile.dryice.js" }, - "readme": "# Source Map\n\nThis is a library to generate and consume the source map format\n[described here][format].\n\nThis library is written in the Asynchronous Module Definition format, and works\nin the following environments:\n\n* Modern Browsers supporting ECMAScript 5 (either after the build, or with an\n AMD loader such as RequireJS)\n\n* Inside Firefox (as a JSM file, after the build)\n\n* With NodeJS versions 0.8.X and higher\n\n## Node\n\n $ npm install source-map\n\n## Building from Source (for everywhere else)\n\nInstall Node and then run\n\n $ git clone https://fitzgen@github.com/mozilla/source-map.git\n $ cd source-map\n $ npm link .\n\nNext, run\n\n $ node Makefile.dryice.js\n\nThis should spew a bunch of stuff to stdout, and create the following files:\n\n* `dist/source-map.js` - The unminified browser version.\n\n* `dist/source-map.min.js` - The minified browser version.\n\n* `dist/SourceMap.jsm` - The JavaScript Module for inclusion in Firefox source.\n\n## Examples\n\n### Consuming a source map\n\n var rawSourceMap = {\n version: 3,\n file: 'min.js',\n names: ['bar', 'baz', 'n'],\n sources: ['one.js', 'two.js'],\n sourceRoot: 'http://example.com/www/js/',\n mappings: 'CAAC,IAAI,IAAM,SAAUA,GAClB,OAAOC,IAAID;CCDb,IAAI,IAAM,SAAUE,GAClB,OAAOA'\n };\n\n var smc = new SourceMapConsumer(rawSourceMap);\n\n console.log(smc.sources);\n // [ 'http://example.com/www/js/one.js',\n // 'http://example.com/www/js/two.js' ]\n\n console.log(smc.originalPositionFor({\n line: 2,\n column: 28\n }));\n // { source: 'http://example.com/www/js/two.js',\n // line: 2,\n // column: 10,\n // name: 'n' }\n\n console.log(smc.generatedPositionFor({\n source: 'http://example.com/www/js/two.js',\n line: 2,\n column: 10\n }));\n // { line: 2, column: 28 }\n\n smc.eachMapping(function (m) {\n // ...\n });\n\n### Generating a source map\n\nIn depth guide:\n[**Compiling to JavaScript, and Debugging with Source Maps**](https://hacks.mozilla.org/2013/05/compiling-to-javascript-and-debugging-with-source-maps/)\n\n#### With SourceNode (high level API)\n\n function compile(ast) {\n switch (ast.type) {\n case 'BinaryExpression':\n return new SourceNode(\n ast.location.line,\n ast.location.column,\n ast.location.source,\n [compile(ast.left), \" + \", compile(ast.right)]\n );\n case 'Literal':\n return new SourceNode(\n ast.location.line,\n ast.location.column,\n ast.location.source,\n String(ast.value)\n );\n // ...\n default:\n throw new Error(\"Bad AST\");\n }\n }\n\n var ast = parse(\"40 + 2\", \"add.js\");\n console.log(compile(ast).toStringWithSourceMap({\n file: 'add.js'\n }));\n // { code: '40 + 2',\n // map: [object SourceMapGenerator] }\n\n#### With SourceMapGenerator (low level API)\n\n var map = new SourceMapGenerator({\n file: \"source-mapped.js\"\n });\n\n map.addMapping({\n generated: {\n line: 10,\n column: 35\n },\n source: \"foo.js\",\n original: {\n line: 33,\n column: 2\n },\n name: \"christopher\"\n });\n\n console.log(map.toString());\n // '{\"version\":3,\"file\":\"source-mapped.js\",\"sources\":[\"foo.js\"],\"names\":[\"christopher\"],\"mappings\":\";;;;;;;;;mCAgCEA\"}'\n\n## API\n\nGet a reference to the module:\n\n // NodeJS\n var sourceMap = require('source-map');\n\n // Browser builds\n var sourceMap = window.sourceMap;\n\n // Inside Firefox\n let sourceMap = {};\n Components.utils.import('resource:///modules/devtools/SourceMap.jsm', sourceMap);\n\n### SourceMapConsumer\n\nA SourceMapConsumer instance represents a parsed source map which we can query\nfor information about the original file positions by giving it a file position\nin the generated source.\n\n#### new SourceMapConsumer(rawSourceMap)\n\nThe only parameter is the raw source map (either as a string which can be\n`JSON.parse`'d, or an object). According to the spec, source maps have the\nfollowing attributes:\n\n* `version`: Which version of the source map spec this map is following.\n\n* `sources`: An array of URLs to the original source files.\n\n* `names`: An array of identifiers which can be referrenced by individual\n mappings.\n\n* `sourceRoot`: Optional. The URL root from which all sources are relative.\n\n* `sourcesContent`: Optional. An array of contents of the original source files.\n\n* `mappings`: A string of base64 VLQs which contain the actual mappings.\n\n* `file`: Optional. The generated filename this source map is associated with.\n\n#### SourceMapConsumer.prototype.originalPositionFor(generatedPosition)\n\nReturns the original source, line, and column information for the generated\nsource's line and column positions provided. The only argument is an object with\nthe following properties:\n\n* `line`: The line number in the generated source.\n\n* `column`: The column number in the generated source.\n\nand an object is returned with the following properties:\n\n* `source`: The original source file, or null if this information is not\n available.\n\n* `line`: The line number in the original source, or null if this information is\n not available.\n\n* `column`: The column number in the original source, or null or null if this\n information is not available.\n\n* `name`: The original identifier, or null if this information is not available.\n\n#### SourceMapConsumer.prototype.generatedPositionFor(originalPosition)\n\nReturns the generated line and column information for the original source,\nline, and column positions provided. The only argument is an object with\nthe following properties:\n\n* `source`: The filename of the original source.\n\n* `line`: The line number in the original source.\n\n* `column`: The column number in the original source.\n\nand an object is returned with the following properties:\n\n* `line`: The line number in the generated source, or null.\n\n* `column`: The column number in the generated source, or null.\n\n#### SourceMapConsumer.prototype.sourceContentFor(source)\n\nReturns the original source content for the source provided. The only\nargument is the URL of the original source file.\n\n#### SourceMapConsumer.prototype.eachMapping(callback, context, order)\n\nIterate over each mapping between an original source/line/column and a\ngenerated line/column in this source map.\n\n* `callback`: The function that is called with each mapping. Mappings have the\n form `{ source, generatedLine, generatedColumn, originalLine, originalColumn,\n name }`\n\n* `context`: Optional. If specified, this object will be the value of `this`\n every time that `callback` is called.\n\n* `order`: Either `SourceMapConsumer.GENERATED_ORDER` or\n `SourceMapConsumer.ORIGINAL_ORDER`. Specifies whether you want to iterate over\n the mappings sorted by the generated file's line/column order or the\n original's source/line/column order, respectively. Defaults to\n `SourceMapConsumer.GENERATED_ORDER`.\n\n### SourceMapGenerator\n\nAn instance of the SourceMapGenerator represents a source map which is being\nbuilt incrementally.\n\n#### new SourceMapGenerator([startOfSourceMap])\n\nYou may pass an object with the following properties:\n\n* `file`: The filename of the generated source that this source map is\n associated with.\n\n* `sourceRoot`: A root for all relative URLs in this source map.\n\n#### SourceMapGenerator.fromSourceMap(sourceMapConsumer)\n\nCreates a new SourceMapGenerator based on a SourceMapConsumer\n\n* `sourceMapConsumer` The SourceMap.\n\n#### SourceMapGenerator.prototype.addMapping(mapping)\n\nAdd a single mapping from original source line and column to the generated\nsource's line and column for this source map being created. The mapping object\nshould have the following properties:\n\n* `generated`: An object with the generated line and column positions.\n\n* `original`: An object with the original line and column positions.\n\n* `source`: The original source file (relative to the sourceRoot).\n\n* `name`: An optional original token name for this mapping.\n\n#### SourceMapGenerator.prototype.setSourceContent(sourceFile, sourceContent)\n\nSet the source content for an original source file.\n\n* `sourceFile` the URL of the original source file.\n\n* `sourceContent` the content of the source file.\n\n#### SourceMapGenerator.prototype.applySourceMap(sourceMapConsumer[, sourceFile[, sourceMapPath]])\n\nApplies a SourceMap for a source file to the SourceMap.\nEach mapping to the supplied source file is rewritten using the\nsupplied SourceMap. Note: The resolution for the resulting mappings\nis the minimium of this map and the supplied map.\n\n* `sourceMapConsumer`: The SourceMap to be applied.\n\n* `sourceFile`: Optional. The filename of the source file.\n If omitted, sourceMapConsumer.file will be used, if it exists.\n Otherwise an error will be thrown.\n\n* `sourceMapPath`: Optional. The dirname of the path to the SourceMap\n to be applied. If relative, it is relative to the SourceMap.\n\n This parameter is needed when the two SourceMaps aren't in the same\n directory, and the SourceMap to be applied contains relative source\n paths. If so, those relative source paths need to be rewritten\n relative to the SourceMap.\n\n If omitted, it is assumed that both SourceMaps are in the same directory,\n thus not needing any rewriting. (Supplying `'.'` has the same effect.)\n\n#### SourceMapGenerator.prototype.toString()\n\nRenders the source map being generated to a string.\n\n### SourceNode\n\nSourceNodes provide a way to abstract over interpolating and/or concatenating\nsnippets of generated JavaScript source code, while maintaining the line and\ncolumn information associated between those snippets and the original source\ncode. This is useful as the final intermediate representation a compiler might\nuse before outputting the generated JS and source map.\n\n#### new SourceNode([line, column, source[, chunk[, name]]])\n\n* `line`: The original line number associated with this source node, or null if\n it isn't associated with an original line.\n\n* `column`: The original column number associated with this source node, or null\n if it isn't associated with an original column.\n\n* `source`: The original source's filename; null if no filename is provided.\n\n* `chunk`: Optional. Is immediately passed to `SourceNode.prototype.add`, see\n below.\n\n* `name`: Optional. The original identifier.\n\n#### SourceNode.fromStringWithSourceMap(code, sourceMapConsumer)\n\nCreates a SourceNode from generated code and a SourceMapConsumer.\n\n* `code`: The generated code\n\n* `sourceMapConsumer` The SourceMap for the generated code\n\n#### SourceNode.prototype.add(chunk)\n\nAdd a chunk of generated JS to this source node.\n\n* `chunk`: A string snippet of generated JS code, another instance of\n `SourceNode`, or an array where each member is one of those things.\n\n#### SourceNode.prototype.prepend(chunk)\n\nPrepend a chunk of generated JS to this source node.\n\n* `chunk`: A string snippet of generated JS code, another instance of\n `SourceNode`, or an array where each member is one of those things.\n\n#### SourceNode.prototype.setSourceContent(sourceFile, sourceContent)\n\nSet the source content for a source file. This will be added to the\n`SourceMap` in the `sourcesContent` field.\n\n* `sourceFile`: The filename of the source file\n\n* `sourceContent`: The content of the source file\n\n#### SourceNode.prototype.walk(fn)\n\nWalk over the tree of JS snippets in this node and its children. The walking\nfunction is called once for each snippet of JS and is passed that snippet and\nthe its original associated source's line/column location.\n\n* `fn`: The traversal function.\n\n#### SourceNode.prototype.walkSourceContents(fn)\n\nWalk over the tree of SourceNodes. The walking function is called for each\nsource file content and is passed the filename and source content.\n\n* `fn`: The traversal function.\n\n#### SourceNode.prototype.join(sep)\n\nLike `Array.prototype.join` except for SourceNodes. Inserts the separator\nbetween each of this source node's children.\n\n* `sep`: The separator.\n\n#### SourceNode.prototype.replaceRight(pattern, replacement)\n\nCall `String.prototype.replace` on the very right-most source snippet. Useful\nfor trimming whitespace from the end of a source node, etc.\n\n* `pattern`: The pattern to replace.\n\n* `replacement`: The thing to replace the pattern with.\n\n#### SourceNode.prototype.toString()\n\nReturn the string representation of this source node. Walks over the tree and\nconcatenates all the various snippets together to one string.\n\n### SourceNode.prototype.toStringWithSourceMap([startOfSourceMap])\n\nReturns the string representation of this tree of source nodes, plus a\nSourceMapGenerator which contains all the mappings between the generated and\noriginal sources.\n\nThe arguments are the same as those to `new SourceMapGenerator`.\n\n## Tests\n\n[![Build Status](https://travis-ci.org/mozilla/source-map.png?branch=master)](https://travis-ci.org/mozilla/source-map)\n\nInstall NodeJS version 0.8.0 or greater, then run `node test/run-tests.js`.\n\nTo add new tests, create a new file named `test/test-.js`\nand export your test functions with names that start with \"test\", for example\n\n exports[\"test doing the foo bar\"] = function (assert, util) {\n ...\n };\n\nThe new test will be located automatically when you run the suite.\n\nThe `util` argument is the test utility module located at `test/source-map/util`.\n\nThe `assert` argument is a cut down version of node's assert module. You have\naccess to the following assertion functions:\n\n* `doesNotThrow`\n\n* `equal`\n\n* `ok`\n\n* `strictEqual`\n\n* `throws`\n\n(The reason for the restricted set of test functions is because we need the\ntests to run inside Firefox's test suite as well and so the assert module is\nshimmed in that environment. See `build/assert-shim.js`.)\n\n[format]: https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit\n[feature]: https://wiki.mozilla.org/DevTools/Features/SourceMap\n[Dryice]: https://github.com/mozilla/dryice\n", - "readmeFilename": "README.md", "bugs": { "url": "https://github.com/mozilla/source-map/issues" }, "_id": "source-map@0.1.34", "_shasum": "a7cfe89aec7b1682c3b198d0acfb47d7d090566b", - "_from": "source-map@~0.1.33", - "_resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz" + "_from": "source-map@0.1.34", + "_npmVersion": "1.4.9", + "_npmUser": { + "name": "nickfitzgerald", + "email": "fitzgen@gmail.com" + }, + "maintainers": [ + { + "name": "mozilla-devtools", + "email": "mozilla-developer-tools@googlegroups.com" + }, + { + "name": "mozilla", + "email": "dherman@mozilla.com" + }, + { + "name": "nickfitzgerald", + "email": "fitzgen@gmail.com" + } + ], + "dist": { + "shasum": "a7cfe89aec7b1682c3b198d0acfb47d7d090566b", + "tarball": "http://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz" + }, + "_resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz", + "readme": "ERROR: No README data found!" } diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/uglify-to-browserify/package.json b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/uglify-to-browserify/package.json index 790bec3..706de69 100644 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/uglify-to-browserify/package.json +++ b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/uglify-to-browserify/package.json @@ -13,18 +13,35 @@ }, "repository": { "type": "git", - "url": "https://github.com/ForbesLindesay/uglify-to-browserify.git" + "url": "git+https://github.com/ForbesLindesay/uglify-to-browserify.git" }, "author": { "name": "ForbesLindesay" }, "license": "MIT", - "readme": "# uglify-to-browserify\r\n\r\nA transform to make UglifyJS work in browserify.\r\n\r\n[![Build Status](https://travis-ci.org/ForbesLindesay/uglify-to-browserify.png?branch=master)](https://travis-ci.org/ForbesLindesay/uglify-to-browserify)\r\n[![Dependency Status](https://gemnasium.com/ForbesLindesay/uglify-to-browserify.png)](https://gemnasium.com/ForbesLindesay/uglify-to-browserify)\r\n[![NPM version](https://badge.fury.io/js/uglify-to-browserify.png)](http://badge.fury.io/js/uglify-to-browserify)\r\n\r\n## Installation\r\n\r\n npm install uglify-to-browserify\r\n\r\n## License\r\n\r\n MIT", - "readmeFilename": "README.md", "bugs": { "url": "https://github.com/ForbesLindesay/uglify-to-browserify/issues" }, "homepage": "https://github.com/ForbesLindesay/uglify-to-browserify", "_id": "uglify-to-browserify@1.0.2", - "_from": "uglify-to-browserify@~1.0.0" + "dist": { + "shasum": "6e0924d6bda6b5afe349e39a6d632850a0f882b7", + "tarball": "http://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz" + }, + "_from": "uglify-to-browserify@>=1.0.0 <1.1.0", + "_npmVersion": "1.3.14", + "_npmUser": { + "name": "forbeslindesay", + "email": "forbes@lindeay.co.uk" + }, + "maintainers": [ + { + "name": "forbeslindesay", + "email": "forbes@lindesay.co.uk" + } + ], + "directories": {}, + "_shasum": "6e0924d6bda6b5afe349e39a6d632850a0f882b7", + "_resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "readme": "ERROR: No README data found!" } diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/package.json b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/package.json index ca056ba..138cf67 100644 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/package.json +++ b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/package.json @@ -2,46 +2,81 @@ "name": "uglify-js", "description": "JavaScript parser, mangler/compressor and beautifier toolkit", "homepage": "http://lisperator.net/uglifyjs", - "main": "tools/node.js", - "version": "2.4.14", + "author": { + "name": "Mihai Bazon", + "email": "mihai.bazon@gmail.com", + "url": "http://lisperator.net/" + }, + "license": "BSD", + "version": "2.4.21", "engines": { "node": ">=0.4.0" }, "maintainers": [ { - "name": "Mihai Bazon", - "email": "mihai.bazon@gmail.com", - "url": "http://lisperator.net/" + "name": "caires", + "email": "cairesvs@gmail.com" + }, + { + "name": "mape", + "email": "mape@mape.me" + }, + { + "name": "mishoo", + "email": "mihai.bazon@gmail.com" } ], "repository": { "type": "git", - "url": "https://github.com/mishoo/UglifyJS2.git" + "url": "git+https://github.com/mishoo/UglifyJS2.git" }, + "bugs": { + "url": "https://github.com/mishoo/UglifyJS2/issues" + }, + "main": "tools/node.js", + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "files": [ + "bin", + "lib", + "tools", + "LICENSE" + ], "dependencies": { "async": "~0.2.6", - "source-map": "~0.1.33", - "optimist": "~0.3.5", - "uglify-to-browserify": "~1.0.0" + "source-map": "0.1.34", + "uglify-to-browserify": "~1.0.0", + "yargs": "~3.5.4" + }, + "devDependencies": { + "acorn": "~0.6.0", + "escodegen": "~1.3.3", + "esfuzz": "~0.3.1", + "estraverse": "~1.5.1" }, "browserify": { "transform": [ "uglify-to-browserify" ] }, - "bin": { - "uglifyjs": "bin/uglifyjs" - }, "scripts": { "test": "node test/run-tests.js" }, - "readme": "UglifyJS 2\n==========\n[![Build Status](https://travis-ci.org/mishoo/UglifyJS2.png)](https://travis-ci.org/mishoo/UglifyJS2)\n\nUglifyJS is a JavaScript parser, minifier, compressor or beautifier toolkit.\n\nThis page documents the command line utility. For\n[API and internals documentation see my website](http://lisperator.net/uglifyjs/).\nThere's also an\n[in-browser online demo](http://lisperator.net/uglifyjs/#demo) (for Firefox,\nChrome and probably Safari).\n\nInstall\n-------\n\nFirst make sure you have installed the latest version of [node.js](http://nodejs.org/)\n(You may need to restart your computer after this step).\n\nFrom NPM for use as a command line app:\n\n npm install uglify-js -g\n\nFrom NPM for programmatic use:\n\n npm install uglify-js\n\nFrom Git:\n\n git clone git://github.com/mishoo/UglifyJS2.git\n cd UglifyJS2\n npm link .\n\nUsage\n-----\n\n uglifyjs [input files] [options]\n\nUglifyJS2 can take multiple input files. It's recommended that you pass the\ninput files first, then pass the options. UglifyJS will parse input files\nin sequence and apply any compression options. The files are parsed in the\nsame global scope, that is, a reference from a file to some\nvariable/function declared in another file will be matched properly.\n\nIf you want to read from STDIN instead, pass a single dash instead of input\nfiles.\n\nThe available options are:\n\n```\n --source-map Specify an output file where to generate source map.\n [string]\n --source-map-root The path to the original source to be included in the\n source map. [string]\n --source-map-url The path to the source map to be added in //#\n sourceMappingURL. Defaults to the value passed with\n --source-map. [string]\n --source-map-include-sources\n Pass this flag if you want to include the content of\n source files in the source map as sourcesContent\n property. [boolean]\n --in-source-map Input source map, useful if you're compressing JS that was\n generated from some other original code.\n --screw-ie8 Pass this flag if you don't care about full compliance\n with Internet Explorer 6-8 quirks (by default UglifyJS\n will try to be IE-proof). [boolean]\n --expr Parse a single expression, rather than a program (for\n parsing JSON) [boolean]\n -p, --prefix Skip prefix for original filenames that appear in source\n maps. For example -p 3 will drop 3 directories from file\n names and ensure they are relative paths. You can also\n specify -p relative, which will make UglifyJS figure out\n itself the relative paths between original sources, the\n source map and the output file. [string]\n -o, --output Output file (default STDOUT).\n -b, --beautify Beautify output/specify output options. [string]\n -m, --mangle Mangle names/pass mangler options. [string]\n -r, --reserved Reserved names to exclude from mangling.\n -c, --compress Enable compressor/pass compressor options. Pass options\n like -c hoist_vars=false,if_return=false. Use -c with no\n argument to use the default compression options. [string]\n -d, --define Global definitions [string]\n -e, --enclose Embed everything in a big function, with a configurable\n parameter/argument list. [string]\n --comments Preserve copyright comments in the output. By default this\n works like Google Closure, keeping JSDoc-style comments\n that contain \"@license\" or \"@preserve\". You can optionally\n pass one of the following arguments to this flag:\n - \"all\" to keep all comments\n - a valid JS regexp (needs to start with a slash) to keep\n only comments that match.\n Note that currently not *all* comments can be kept when\n compression is on, because of dead code removal or\n cascading statements into sequences. [string]\n --preamble Preamble to prepend to the output. You can use this to\n insert a comment, for example for licensing information.\n This will not be parsed, but the source map will adjust\n for its presence.\n --stats Display operations run time on STDERR. [boolean]\n --acorn Use Acorn for parsing. [boolean]\n --spidermonkey Assume input files are SpiderMonkey AST format (as JSON).\n [boolean]\n --self Build itself (UglifyJS2) as a library (implies\n --wrap=UglifyJS --export-all) [boolean]\n --wrap Embed everything in a big function, making the “exports”\n and “global” variables available. You need to pass an\n argument to this option to specify the name that your\n module will take when included in, say, a browser.\n [string]\n --export-all Only used when --wrap, this tells UglifyJS to add code to\n automatically export all globals. [boolean]\n --lint Display some scope warnings [boolean]\n -v, --verbose Verbose [boolean]\n -V, --version Print version number and exit. [boolean]\n```\n\nSpecify `--output` (`-o`) to declare the output file. Otherwise the output\ngoes to STDOUT.\n\n## Source map options\n\nUglifyJS2 can generate a source map file, which is highly useful for\ndebugging your compressed JavaScript. To get a source map, pass\n`--source-map output.js.map` (full path to the file where you want the\nsource map dumped).\n\nAdditionally you might need `--source-map-root` to pass the URL where the\noriginal files can be found. In case you are passing full paths to input\nfiles to UglifyJS, you can use `--prefix` (`-p`) to specify the number of\ndirectories to drop from the path prefix when declaring files in the source\nmap.\n\nFor example:\n\n uglifyjs /home/doe/work/foo/src/js/file1.js \\\n /home/doe/work/foo/src/js/file2.js \\\n -o foo.min.js \\\n --source-map foo.min.js.map \\\n --source-map-root http://foo.com/src \\\n -p 5 -c -m\n\nThe above will compress and mangle `file1.js` and `file2.js`, will drop the\noutput in `foo.min.js` and the source map in `foo.min.js.map`. The source\nmapping will refer to `http://foo.com/src/js/file1.js` and\n`http://foo.com/src/js/file2.js` (in fact it will list `http://foo.com/src`\nas the source map root, and the original files as `js/file1.js` and\n`js/file2.js`).\n\n### Composed source map\n\nWhen you're compressing JS code that was output by a compiler such as\nCoffeeScript, mapping to the JS code won't be too helpful. Instead, you'd\nlike to map back to the original code (i.e. CoffeeScript). UglifyJS has an\noption to take an input source map. Assuming you have a mapping from\nCoffeeScript → compiled JS, UglifyJS can generate a map from CoffeeScript →\ncompressed JS by mapping every token in the compiled JS to its original\nlocation.\n\nTo use this feature you need to pass `--in-source-map\n/path/to/input/source.map`. Normally the input source map should also point\nto the file containing the generated JS, so if that's correct you can omit\ninput files from the command line.\n\n## Mangler options\n\nTo enable the mangler you need to pass `--mangle` (`-m`). The following\n(comma-separated) options are supported:\n\n- `sort` — to assign shorter names to most frequently used variables. This\n saves a few hundred bytes on jQuery before gzip, but the output is\n _bigger_ after gzip (and seems to happen for other libraries I tried it\n on) therefore it's not enabled by default.\n\n- `toplevel` — mangle names declared in the toplevel scope (disabled by\n default).\n\n- `eval` — mangle names visible in scopes where `eval` or `with` are used\n (disabled by default).\n\nWhen mangling is enabled but you want to prevent certain names from being\nmangled, you can declare those names with `--reserved` (`-r`) — pass a\ncomma-separated list of names. For example:\n\n uglifyjs ... -m -r '$,require,exports'\n\nto prevent the `require`, `exports` and `$` names from being changed.\n\n## Compressor options\n\nYou need to pass `--compress` (`-c`) to enable the compressor. Optionally\nyou can pass a comma-separated list of options. Options are in the form\n`foo=bar`, or just `foo` (the latter implies a boolean option that you want\nto set `true`; it's effectively a shortcut for `foo=true`).\n\n- `sequences` -- join consecutive simple statements using the comma operator\n\n- `properties` -- rewrite property access using the dot notation, for\n example `foo[\"bar\"] → foo.bar`\n\n- `dead_code` -- remove unreachable code\n\n- `drop_debugger` -- remove `debugger;` statements\n\n- `unsafe` (default: false) -- apply \"unsafe\" transformations (discussion below)\n\n- `conditionals` -- apply optimizations for `if`-s and conditional\n expressions\n\n- `comparisons` -- apply certain optimizations to binary nodes, for example:\n `!(a <= b) → a > b` (only when `unsafe`), attempts to negate binary nodes,\n e.g. `a = !b && !c && !d && !e → a=!(b||c||d||e)` etc.\n\n- `evaluate` -- attempt to evaluate constant expressions\n\n- `booleans` -- various optimizations for boolean context, for example `!!a\n ? b : c → a ? b : c`\n\n- `loops` -- optimizations for `do`, `while` and `for` loops when we can\n statically determine the condition\n\n- `unused` -- drop unreferenced functions and variables\n\n- `hoist_funs` -- hoist function declarations\n\n- `hoist_vars` (default: false) -- hoist `var` declarations (this is `false`\n by default because it seems to increase the size of the output in general)\n\n- `if_return` -- optimizations for if/return and if/continue\n\n- `join_vars` -- join consecutive `var` statements\n\n- `cascade` -- small optimization for sequences, transform `x, x` into `x`\n and `x = something(), x` into `x = something()`\n\n- `warnings` -- display warnings when dropping unreachable code or unused\n declarations etc.\n\n- `negate_iife` -- negate \"Immediately-Called Function Expressions\"\n where the return value is discarded, to avoid the parens that the\n code generator would insert.\n\n- `pure_getters` -- the default is `false`. If you pass `true` for\n this, UglifyJS will assume that object property access\n (e.g. `foo.bar` or `foo[\"bar\"]`) doesn't have any side effects.\n\n- `pure_funcs` -- default `null`. You can pass an array of names and\n UglifyJS will assume that those functions do not produce side\n effects. DANGER: will not check if the name is redefined in scope.\n An example case here, for instance `var q = Math.floor(a/b)`. If\n variable `q` is not used elsewhere, UglifyJS will drop it, but will\n still keep the `Math.floor(a/b)`, not knowing what it does. You can\n pass `pure_funcs: [ 'Math.floor' ]` to let it know that this\n function won't produce any side effect, in which case the whole\n statement would get discarded. The current implementation adds some\n overhead (compression will be slower).\n\n- `drop_console` -- default `false`. Pass `true` to discard calls to\n `console.*` functions.\n\n### The `unsafe` option\n\nIt enables some transformations that *might* break code logic in certain\ncontrived cases, but should be fine for most code. You might want to try it\non your own code, it should reduce the minified size. Here's what happens\nwhen this flag is on:\n\n- `new Array(1, 2, 3)` or `Array(1, 2, 3)` → `[1, 2, 3 ]`\n- `new Object()` → `{}`\n- `String(exp)` or `exp.toString()` → `\"\" + exp`\n- `new Object/RegExp/Function/Error/Array (...)` → we discard the `new`\n- `typeof foo == \"undefined\"` → `foo === void 0`\n- `void 0` → `undefined` (if there is a variable named \"undefined\" in\n scope; we do it because the variable name will be mangled, typically\n reduced to a single character).\n\n### Conditional compilation\n\nYou can use the `--define` (`-d`) switch in order to declare global\nvariables that UglifyJS will assume to be constants (unless defined in\nscope). For example if you pass `--define DEBUG=false` then, coupled with\ndead code removal UglifyJS will discard the following from the output:\n```javascript\nif (DEBUG) {\n\tconsole.log(\"debug stuff\");\n}\n```\n\nUglifyJS will warn about the condition being always false and about dropping\nunreachable code; for now there is no option to turn off only this specific\nwarning, you can pass `warnings=false` to turn off *all* warnings.\n\nAnother way of doing that is to declare your globals as constants in a\nseparate file and include it into the build. For example you can have a\n`build/defines.js` file with the following:\n```javascript\nconst DEBUG = false;\nconst PRODUCTION = true;\n// etc.\n```\n\nand build your code like this:\n\n uglifyjs build/defines.js js/foo.js js/bar.js... -c\n\nUglifyJS will notice the constants and, since they cannot be altered, it\nwill evaluate references to them to the value itself and drop unreachable\ncode as usual. The possible downside of this approach is that the build\nwill contain the `const` declarations.\n\n\n## Beautifier options\n\nThe code generator tries to output shortest code possible by default. In\ncase you want beautified output, pass `--beautify` (`-b`). Optionally you\ncan pass additional arguments that control the code output:\n\n- `beautify` (default `true`) -- whether to actually beautify the output.\n Passing `-b` will set this to true, but you might need to pass `-b` even\n when you want to generate minified code, in order to specify additional\n arguments, so you can use `-b beautify=false` to override it.\n- `indent-level` (default 4)\n- `indent-start` (default 0) -- prefix all lines by that many spaces\n- `quote-keys` (default `false`) -- pass `true` to quote all keys in literal\n objects\n- `space-colon` (default `true`) -- insert a space after the colon signs\n- `ascii-only` (default `false`) -- escape Unicode characters in strings and\n regexps\n- `inline-script` (default `false`) -- escape the slash in occurrences of\n `=2.4.19 <3.0.0", + "_npmVersion": "1.4.14", + "_npmUser": { + "name": "mishoo", + "email": "mihai.bazon@gmail.com" }, - "_id": "uglify-js@2.4.14", - "_shasum": "2ae753ede3bb4ebbf25d07bb99cf13e9de007b3e", - "_from": "uglify-js@~2.4.0", - "_resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.14.tgz" + "dist": { + "shasum": "9085a4304cbdafa4fce2b41bddead04ffdffb888", + "tarball": "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.21.tgz" + }, + "directories": {}, + "_resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.21.tgz", + "readme": "ERROR: No README data found!" } diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/arrays.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/arrays.js deleted file mode 100644 index e636347..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/arrays.js +++ /dev/null @@ -1,74 +0,0 @@ -holes_and_undefined: { - input: { - w = [1,,]; - x = [1, 2, undefined]; - y = [1, , 2, ]; - z = [1, undefined, 3]; - } - expect: { - w=[1,,]; - x=[1,2,void 0]; - y=[1,,2]; - z=[1,void 0,3]; - } -} - -constant_join: { - options = { - unsafe : true, - evaluate : true - }; - input: { - var a = [ "foo", "bar", "baz" ].join(""); - var a1 = [ "foo", "bar", "baz" ].join(); - var b = [ "foo", 1, 2, 3, "bar" ].join(""); - var c = [ boo(), "foo", 1, 2, 3, "bar", bar() ].join(""); - var c1 = [ boo(), bar(), "foo", 1, 2, 3, "bar", bar() ].join(""); - var c2 = [ 1, 2, "foo", "bar", baz() ].join(""); - var d = [ "foo", 1 + 2 + "bar", "baz" ].join("-"); - var e = [].join(foo + bar); - var f = [].join(""); - var g = [].join("foo"); - } - expect: { - var a = "foobarbaz"; - var a1 = "foo,bar,baz"; - var b = "foo123bar"; - var c = boo() + "foo123bar" + bar(); - var c1 = "" + boo() + bar() + "foo123bar" + bar(); - var c2 = "12foobar" + baz(); - var d = "foo-3bar-baz"; - var e = [].join(foo + bar); - var f = ""; - var g = ""; - } -} - -constant_join_2: { - options = { - unsafe : true, - evaluate : true - }; - input: { - var a = [ "foo", "bar", boo(), "baz", "x", "y" ].join(""); - var b = [ "foo", "bar", boo(), "baz", "x", "y" ].join("-"); - var c = [ "foo", "bar", boo(), "baz", "x", "y" ].join("really-long-separator"); - var d = [ "foo", "bar", boo(), - [ "foo", 1, 2, 3, "bar" ].join("+"), - "baz", "x", "y" ].join("-"); - var e = [ "foo", "bar", boo(), - [ "foo", 1, 2, 3, "bar" ].join("+"), - "baz", "x", "y" ].join("really-long-separator"); - var f = [ "str", "str" + variable, "foo", "bar", "moo" + foo ].join(""); - } - expect: { - var a = "foobar" + boo() + "bazxy"; - var b = [ "foo-bar", boo(), "baz-x-y" ].join("-"); - var c = [ "foo", "bar", boo(), "baz", "x", "y" ].join("really-long-separator"); - var d = [ "foo-bar", boo(), "foo+1+2+3+bar-baz-x-y" ].join("-"); - var e = [ "foo", "bar", boo(), - "foo+1+2+3+bar", - "baz", "x", "y" ].join("really-long-separator"); - var f = "strstr" + variable + "foobarmoo" + foo; - } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/blocks.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/blocks.js deleted file mode 100644 index 8372adf..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/blocks.js +++ /dev/null @@ -1,49 +0,0 @@ -remove_blocks: { - input: { - {;} - foo(); - {}; - { - {}; - }; - bar(); - {} - } - expect: { - foo(); - bar(); - } -} - -keep_some_blocks: { - input: { - // 1. - if (foo) { - {{{}}} - if (bar) { baz(); } - {{}} - } else { - stuff(); - } - - // 2. - if (foo) { - for (var i = 0; i < 5; ++i) - if (bar) baz(); - } else { - stuff(); - } - } - expect: { - // 1. - if (foo) { - if (bar) baz(); - } else stuff(); - - // 2. - if (foo) { - for (var i = 0; i < 5; ++i) - if (bar) baz(); - } else stuff(); - } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/concat-strings.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/concat-strings.js deleted file mode 100644 index 7919298..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/concat-strings.js +++ /dev/null @@ -1,22 +0,0 @@ -concat_1: { - options = { - evaluate: true - }; - input: { - var a = "foo" + "bar" + x() + "moo" + "foo" + y() + "x" + "y" + "z" + q(); - var b = "foo" + 1 + x() + 2 + "boo"; - var c = 1 + x() + 2 + "boo"; - - // this CAN'T safely be shortened to 1 + x() + "5boo" - var d = 1 + x() + 2 + 3 + "boo"; - - var e = 1 + x() + 2 + "X" + 3 + "boo"; - } - expect: { - var a = "foobar" + x() + "moofoo" + y() + "xyz" + q(); - var b = "foo1" + x() + "2boo"; - var c = 1 + x() + 2 + "boo"; - var d = 1 + x() + 2 + 3 + "boo"; - var e = 1 + x() + 2 + "X3boo"; - } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/conditionals.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/conditionals.js deleted file mode 100644 index 213b246..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/conditionals.js +++ /dev/null @@ -1,234 +0,0 @@ -ifs_1: { - options = { - conditionals: true - }; - input: { - if (foo) bar(); - if (!foo); else bar(); - if (foo); else bar(); - if (foo); else; - } - expect: { - foo&&bar(); - foo&&bar(); - foo||bar(); - foo; - } -} - -ifs_2: { - options = { - conditionals: true - }; - input: { - if (foo) { - x(); - } else if (bar) { - y(); - } else if (baz) { - z(); - } - - if (foo) { - x(); - } else if (bar) { - y(); - } else if (baz) { - z(); - } else { - t(); - } - } - expect: { - foo ? x() : bar ? y() : baz && z(); - foo ? x() : bar ? y() : baz ? z() : t(); - } -} - -ifs_3_should_warn: { - options = { - conditionals : true, - dead_code : true, - evaluate : true, - booleans : true - }; - input: { - if (x && !(x + "1") && y) { // 1 - var qq; - foo(); - } else { - bar(); - } - - if (x || !!(x + "1") || y) { // 2 - foo(); - } else { - var jj; - bar(); - } - } - expect: { - var qq; bar(); // 1 - var jj; foo(); // 2 - } -} - -ifs_4: { - options = { - conditionals: true - }; - input: { - if (foo && bar) { - x(foo)[10].bar.baz = something(); - } else - x(foo)[10].bar.baz = something_else(); - } - expect: { - x(foo)[10].bar.baz = (foo && bar) ? something() : something_else(); - } -} - -ifs_5: { - options = { - if_return: true, - conditionals: true, - comparisons: true, - }; - input: { - function f() { - if (foo) return; - bar(); - baz(); - } - function g() { - if (foo) return; - if (bar) return; - if (baz) return; - if (baa) return; - a(); - b(); - } - } - expect: { - function f() { - if (!foo) { - bar(); - baz(); - } - } - function g() { - if (!(foo || bar || baz || baa)) { - a(); - b(); - } - } - } -} - -ifs_6: { - options = { - conditionals: true, - comparisons: true - }; - input: { - if (!foo && !bar && !baz && !boo) { - x = 10; - } else { - x = 20; - } - } - expect: { - x = foo || bar || baz || boo ? 20 : 10; - } -} - -cond_1: { - options = { - conditionals: true - }; - input: { - if (some_condition()) { - do_something(x); - } else { - do_something(y); - } - } - expect: { - do_something(some_condition() ? x : y); - } -} - -cond_2: { - options = { - conditionals: true - }; - input: { - if (some_condition()) { - x = new FooBar(1); - } else { - x = new FooBar(2); - } - } - expect: { - x = new FooBar(some_condition() ? 1 : 2); - } -} - -cond_3: { - options = { - conditionals: true - }; - input: { - if (some_condition()) { - new FooBar(1); - } else { - FooBar(2); - } - } - expect: { - some_condition() ? new FooBar(1) : FooBar(2); - } -} - -cond_4: { - options = { - conditionals: true - }; - input: { - if (some_condition()) { - do_something(); - } else { - do_something(); - } - } - expect: { - some_condition(), do_something(); - } -} - -cond_5: { - options = { - conditionals: true - }; - input: { - if (some_condition()) { - if (some_other_condition()) { - do_something(); - } else { - alternate(); - } - } else { - alternate(); - } - - if (some_condition()) { - if (some_other_condition()) { - do_something(); - } - } - } - expect: { - some_condition() && some_other_condition() ? do_something() : alternate(); - some_condition() && some_other_condition() && do_something(); - } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/dead-code.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/dead-code.js deleted file mode 100644 index 0fd066e..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/dead-code.js +++ /dev/null @@ -1,89 +0,0 @@ -dead_code_1: { - options = { - dead_code: true - }; - input: { - function f() { - a(); - b(); - x = 10; - return; - if (x) { - y(); - } - } - } - expect: { - function f() { - a(); - b(); - x = 10; - return; - } - } -} - -dead_code_2_should_warn: { - options = { - dead_code: true - }; - input: { - function f() { - g(); - x = 10; - throw "foo"; - // completely discarding the `if` would introduce some - // bugs. UglifyJS v1 doesn't deal with this issue; in v2 - // we copy any declarations to the upper scope. - if (x) { - y(); - var x; - function g(){}; - // but nested declarations should not be kept. - (function(){ - var q; - function y(){}; - })(); - } - } - } - expect: { - function f() { - g(); - x = 10; - throw "foo"; - var x; - function g(){}; - } - } -} - -dead_code_constant_boolean_should_warn_more: { - options = { - dead_code : true, - loops : true, - booleans : true, - conditionals : true, - evaluate : true - }; - input: { - while (!((foo && bar) || (x + "0"))) { - console.log("unreachable"); - var foo; - function bar() {} - } - for (var x = 10; x && (y || x) && (!typeof x); ++x) { - asdf(); - foo(); - var moo; - } - } - expect: { - var foo; - function bar() {} - // nothing for the while - // as for the for, it should keep: - var x = 10; - var moo; - } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/debugger.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/debugger.js deleted file mode 100644 index 7c27073..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/debugger.js +++ /dev/null @@ -1,24 +0,0 @@ -keep_debugger: { - options = { - drop_debugger: false - }; - input: { - debugger; - } - expect: { - debugger; - } -} - -drop_debugger: { - options = { - drop_debugger: true - }; - input: { - debugger; - if (foo) debugger; - } - expect: { - if (foo); - } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/drop-unused.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/drop-unused.js deleted file mode 100644 index 89bf008..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/drop-unused.js +++ /dev/null @@ -1,165 +0,0 @@ -unused_funarg_1: { - options = { unused: true }; - input: { - function f(a, b, c, d, e) { - return a + b; - } - } - expect: { - function f(a, b) { - return a + b; - } - } -} - -unused_funarg_2: { - options = { unused: true }; - input: { - function f(a, b, c, d, e) { - return a + c; - } - } - expect: { - function f(a, b, c) { - return a + c; - } - } -} - -unused_nested_function: { - options = { unused: true }; - input: { - function f(x, y) { - function g() { - something(); - } - return x + y; - } - }; - expect: { - function f(x, y) { - return x + y; - } - } -} - -unused_circular_references_1: { - options = { unused: true }; - input: { - function f(x, y) { - // circular reference - function g() { - return h(); - } - function h() { - return g(); - } - return x + y; - } - }; - expect: { - function f(x, y) { - return x + y; - } - } -} - -unused_circular_references_2: { - options = { unused: true }; - input: { - function f(x, y) { - var foo = 1, bar = baz, baz = foo + bar, qwe = moo(); - return x + y; - } - }; - expect: { - function f(x, y) { - moo(); // keeps side effect - return x + y; - } - } -} - -unused_circular_references_3: { - options = { unused: true }; - input: { - function f(x, y) { - var g = function() { return h() }; - var h = function() { return g() }; - return x + y; - } - }; - expect: { - function f(x, y) { - return x + y; - } - } -} - -unused_keep_setter_arg: { - options = { unused: true }; - input: { - var x = { - _foo: null, - set foo(val) { - }, - get foo() { - return this._foo; - } - } - } - expect: { - var x = { - _foo: null, - set foo(val) { - }, - get foo() { - return this._foo; - } - } - } -} - -unused_var_in_catch: { - options = { unused: true }; - input: { - function foo() { - try { - foo(); - } catch(ex) { - var x = 10; - } - } - } - expect: { - function foo() { - try { - foo(); - } catch(ex) {} - } - } -} - -used_var_in_catch: { - options = { unused: true }; - input: { - function foo() { - try { - foo(); - } catch(ex) { - var x = 10; - } - return x; - } - } - expect: { - function foo() { - try { - foo(); - } catch(ex) { - var x = 10; - } - return x; - } - } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-105.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-105.js deleted file mode 100644 index ca17adb..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-105.js +++ /dev/null @@ -1,25 +0,0 @@ -typeof_eq_undefined: { - options = { - comparisons: true - }; - input: { a = typeof b.c != "undefined" } - expect: { a = "undefined" != typeof b.c } -} - -typeof_eq_undefined_unsafe: { - options = { - comparisons: true, - unsafe: true - }; - input: { a = typeof b.c != "undefined" } - expect: { a = void 0 !== b.c } -} - -typeof_eq_undefined_unsafe2: { - options = { - comparisons: true, - unsafe: true - }; - input: { a = "undefined" != typeof b.c } - expect: { a = void 0 !== b.c } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-12.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-12.js deleted file mode 100644 index bf87d5c..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-12.js +++ /dev/null @@ -1,11 +0,0 @@ -keep_name_of_getter: { - options = { unused: true }; - input: { a = { get foo () {} } } - expect: { a = { get foo () {} } } -} - -keep_name_of_setter: { - options = { unused: true }; - input: { a = { set foo () {} } } - expect: { a = { set foo () {} } } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-126.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-126.js deleted file mode 100644 index 7a597b8..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-126.js +++ /dev/null @@ -1,24 +0,0 @@ -concatenate_rhs_strings: { - options = { - evaluate: true, - unsafe: true, - } - input: { - foo(bar() + 123 + "Hello" + "World"); - foo(bar() + (123 + "Hello") + "World"); - foo((bar() + 123) + "Hello" + "World"); - foo(bar() + 123 + "Hello" + "World" + ("Foo" + "Bar")); - foo("Foo" + "Bar" + bar() + 123 + "Hello" + "World" + ("Foo" + "Bar")); - foo("Hello" + bar() + 123 + "World"); - foo(bar() + 'Foo' + (10 + parseInt('10'))); - } - expect: { - foo(bar() + 123 + "HelloWorld"); - foo(bar() + "123HelloWorld"); - foo((bar() + 123) + "HelloWorld"); - foo(bar() + 123 + "HelloWorldFooBar"); - foo("FooBar" + bar() + "123HelloWorldFooBar"); - foo("Hello" + bar() + "123World"); - foo(bar() + 'Foo' + (10 + parseInt('10'))); - } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-143.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-143.js deleted file mode 100644 index 4c79790..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-143.js +++ /dev/null @@ -1,48 +0,0 @@ -/** - * There was an incorrect sort behaviour documented in issue #143: - * (x = f(…)) <= x → x >= (x = f(…)) - * - * For example, let the equation be: - * (a = parseInt('100')) <= a - * - * If a was an integer and has the value of 99, - * (a = parseInt('100')) <= a → 100 <= 100 → true - * - * When transformed incorrectly: - * a >= (a = parseInt('100')) → 99 >= 100 → false - */ - -tranformation_sort_order_equal: { - options = { - comparisons: true, - }; - - input: { (a = parseInt('100')) == a } - expect: { (a = parseInt('100')) == a } -} - -tranformation_sort_order_unequal: { - options = { - comparisons: true, - }; - - input: { (a = parseInt('100')) != a } - expect: { (a = parseInt('100')) != a } -} - -tranformation_sort_order_lesser_or_equal: { - options = { - comparisons: true, - }; - - input: { (a = parseInt('100')) <= a } - expect: { (a = parseInt('100')) <= a } -} -tranformation_sort_order_greater_or_equal: { - options = { - comparisons: true, - }; - - input: { (a = parseInt('100')) >= a } - expect: { (a = parseInt('100')) >= a } -} \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-22.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-22.js deleted file mode 100644 index a8b7bc6..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-22.js +++ /dev/null @@ -1,17 +0,0 @@ -return_with_no_value_in_if_body: { - options = { conditionals: true }; - input: { - function foo(bar) { - if (bar) { - return; - } else { - return 1; - } - } - } - expect: { - function foo (bar) { - return bar ? void 0 : 1; - } - } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-267.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-267.js deleted file mode 100644 index 7233d9f..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-267.js +++ /dev/null @@ -1,11 +0,0 @@ -issue_267: { - options = { comparisons: true }; - input: { - x = a % b / b * c * 2; - x = a % b * 2 - } - expect: { - x = a % b / b * c * 2; - x = a % b * 2; - } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-269.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-269.js deleted file mode 100644 index 1d41dea..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-269.js +++ /dev/null @@ -1,66 +0,0 @@ -issue_269_1: { - options = {unsafe: true}; - input: { - f( - String(x), - Number(x), - Boolean(x), - - String(), - Number(), - Boolean() - ); - } - expect: { - f( - x + '', +x, !!x, - '', 0, false - ); - } -} - -issue_269_dangers: { - options = {unsafe: true}; - input: { - f( - String(x, x), - Number(x, x), - Boolean(x, x) - ); - } - expect: { - f(String(x, x), Number(x, x), Boolean(x, x)); - } -} - -issue_269_in_scope: { - options = {unsafe: true}; - input: { - var String, Number, Boolean; - f( - String(x), - Number(x, x), - Boolean(x) - ); - } - expect: { - var String, Number, Boolean; - f(String(x), Number(x, x), Boolean(x)); - } -} - -strings_concat: { - options = {unsafe: true}; - input: { - f( - String(x + 'str'), - String('str' + x) - ); - } - expect: { - f( - x + 'str', - 'str' + x - ); - } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-44.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-44.js deleted file mode 100644 index 7a972f9..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-44.js +++ /dev/null @@ -1,31 +0,0 @@ -issue_44_valid_ast_1: { - options = { unused: true }; - input: { - function a(b) { - for (var i = 0, e = b.qoo(); ; i++) {} - } - } - expect: { - function a(b) { - var i = 0; - for (b.qoo(); ; i++); - } - } -} - -issue_44_valid_ast_2: { - options = { unused: true }; - input: { - function a(b) { - if (foo) for (var i = 0, e = b.qoo(); ; i++) {} - } - } - expect: { - function a(b) { - if (foo) { - var i = 0; - for (b.qoo(); ; i++); - } - } - } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-59.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-59.js deleted file mode 100644 index 82b3880..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/issue-59.js +++ /dev/null @@ -1,30 +0,0 @@ -keep_continue: { - options = { - dead_code: true, - evaluate: true - }; - input: { - while (a) { - if (b) { - switch (true) { - case c(): - d(); - } - continue; - } - f(); - } - } - expect: { - while (a) { - if (b) { - switch (true) { - case c(): - d(); - } - continue; - } - f(); - } - } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/labels.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/labels.js deleted file mode 100644 index 044b7a7..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/labels.js +++ /dev/null @@ -1,163 +0,0 @@ -labels_1: { - options = { if_return: true, conditionals: true, dead_code: true }; - input: { - out: { - if (foo) break out; - console.log("bar"); - } - }; - expect: { - foo || console.log("bar"); - } -} - -labels_2: { - options = { if_return: true, conditionals: true, dead_code: true }; - input: { - out: { - if (foo) print("stuff"); - else break out; - console.log("here"); - } - }; - expect: { - if (foo) { - print("stuff"); - console.log("here"); - } - } -} - -labels_3: { - options = { if_return: true, conditionals: true, dead_code: true }; - input: { - for (var i = 0; i < 5; ++i) { - if (i < 3) continue; - console.log(i); - } - }; - expect: { - for (var i = 0; i < 5; ++i) - i < 3 || console.log(i); - } -} - -labels_4: { - options = { if_return: true, conditionals: true, dead_code: true }; - input: { - out: for (var i = 0; i < 5; ++i) { - if (i < 3) continue out; - console.log(i); - } - }; - expect: { - for (var i = 0; i < 5; ++i) - i < 3 || console.log(i); - } -} - -labels_5: { - options = { if_return: true, conditionals: true, dead_code: true }; - // should keep the break-s in the following - input: { - while (foo) { - if (bar) break; - console.log("foo"); - } - out: while (foo) { - if (bar) break out; - console.log("foo"); - } - }; - expect: { - while (foo) { - if (bar) break; - console.log("foo"); - } - out: while (foo) { - if (bar) break out; - console.log("foo"); - } - } -} - -labels_6: { - input: { - out: break out; - }; - expect: {} -} - -labels_7: { - options = { if_return: true, conditionals: true, dead_code: true }; - input: { - while (foo) { - x(); - y(); - continue; - } - }; - expect: { - while (foo) { - x(); - y(); - } - } -} - -labels_8: { - options = { if_return: true, conditionals: true, dead_code: true }; - input: { - while (foo) { - x(); - y(); - break; - } - }; - expect: { - while (foo) { - x(); - y(); - break; - } - } -} - -labels_9: { - options = { if_return: true, conditionals: true, dead_code: true }; - input: { - out: while (foo) { - x(); - y(); - continue out; - z(); - k(); - } - }; - expect: { - while (foo) { - x(); - y(); - } - } -} - -labels_10: { - options = { if_return: true, conditionals: true, dead_code: true }; - input: { - out: while (foo) { - x(); - y(); - break out; - z(); - k(); - } - }; - expect: { - out: while (foo) { - x(); - y(); - break out; - } - } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/loops.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/loops.js deleted file mode 100644 index cdf1f04..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/loops.js +++ /dev/null @@ -1,123 +0,0 @@ -while_becomes_for: { - options = { loops: true }; - input: { - while (foo()) bar(); - } - expect: { - for (; foo(); ) bar(); - } -} - -drop_if_break_1: { - options = { loops: true }; - input: { - for (;;) - if (foo()) break; - } - expect: { - for (; !foo();); - } -} - -drop_if_break_2: { - options = { loops: true }; - input: { - for (;bar();) - if (foo()) break; - } - expect: { - for (; bar() && !foo();); - } -} - -drop_if_break_3: { - options = { loops: true }; - input: { - for (;bar();) { - if (foo()) break; - stuff1(); - stuff2(); - } - } - expect: { - for (; bar() && !foo();) { - stuff1(); - stuff2(); - } - } -} - -drop_if_break_4: { - options = { loops: true, sequences: true }; - input: { - for (;bar();) { - x(); - y(); - if (foo()) break; - z(); - k(); - } - } - expect: { - for (; bar() && (x(), y(), !foo());) z(), k(); - } -} - -drop_if_else_break_1: { - options = { loops: true }; - input: { - for (;;) if (foo()) bar(); else break; - } - expect: { - for (; foo(); ) bar(); - } -} - -drop_if_else_break_2: { - options = { loops: true }; - input: { - for (;bar();) { - if (foo()) baz(); - else break; - } - } - expect: { - for (; bar() && foo();) baz(); - } -} - -drop_if_else_break_3: { - options = { loops: true }; - input: { - for (;bar();) { - if (foo()) baz(); - else break; - stuff1(); - stuff2(); - } - } - expect: { - for (; bar() && foo();) { - baz(); - stuff1(); - stuff2(); - } - } -} - -drop_if_else_break_4: { - options = { loops: true, sequences: true }; - input: { - for (;bar();) { - x(); - y(); - if (foo()) baz(); - else break; - z(); - k(); - } - } - expect: { - for (; bar() && (x(), y(), foo());) baz(), z(), k(); - } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/negate-iife.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/negate-iife.js deleted file mode 100644 index 89c3f06..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/negate-iife.js +++ /dev/null @@ -1,76 +0,0 @@ -negate_iife_1: { - options = { - negate_iife: true - }; - input: { - (function(){ stuff() })(); - } - expect: { - !function(){ stuff() }(); - } -} - -negate_iife_2: { - options = { - negate_iife: true - }; - input: { - (function(){ return {} })().x = 10; // should not transform this one - } - expect: { - (function(){ return {} })().x = 10; - } -} - -negate_iife_3: { - options = { - negate_iife: true, - }; - input: { - (function(){ return true })() ? console.log(true) : console.log(false); - } - expect: { - !function(){ return true }() ? console.log(false) : console.log(true); - } -} - -negate_iife_3: { - options = { - negate_iife: true, - sequences: true - }; - input: { - (function(){ return true })() ? console.log(true) : console.log(false); - (function(){ - console.log("something"); - })(); - } - expect: { - !function(){ return true }() ? console.log(false) : console.log(true), function(){ - console.log("something"); - }(); - } -} - -negate_iife_4: { - options = { - negate_iife: true, - sequences: true, - conditionals: true, - }; - input: { - if ((function(){ return true })()) { - foo(true); - } else { - bar(false); - } - (function(){ - console.log("something"); - })(); - } - expect: { - !function(){ return true }() ? bar(false) : foo(true), function(){ - console.log("something"); - }(); - } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/properties.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/properties.js deleted file mode 100644 index 736d9d8..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/properties.js +++ /dev/null @@ -1,54 +0,0 @@ -keep_properties: { - options = { - properties: false - }; - input: { - a["foo"] = "bar"; - } - expect: { - a["foo"] = "bar"; - } -} - -dot_properties: { - options = { - properties: true - }; - input: { - a["foo"] = "bar"; - a["if"] = "if"; - a["*"] = "asterisk"; - a["\u0EB3"] = "unicode"; - a[""] = "whitespace"; - a["1_1"] = "foo"; - } - expect: { - a.foo = "bar"; - a["if"] = "if"; - a["*"] = "asterisk"; - a["\u0EB3"] = "unicode"; - a[""] = "whitespace"; - a["1_1"] = "foo"; - } -} - -dot_properties_es5: { - options = { - properties: true, - screw_ie8: true - }; - input: { - a["foo"] = "bar"; - a["if"] = "if"; - a["*"] = "asterisk"; - a["\u0EB3"] = "unicode"; - a[""] = "whitespace"; - } - expect: { - a.foo = "bar"; - a.if = "if"; - a["*"] = "asterisk"; - a["\u0EB3"] = "unicode"; - a[""] = "whitespace"; - } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/sequences.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/sequences.js deleted file mode 100644 index 4669571..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/sequences.js +++ /dev/null @@ -1,163 +0,0 @@ -make_sequences_1: { - options = { - sequences: true - }; - input: { - foo(); - bar(); - baz(); - } - expect: { - foo(),bar(),baz(); - } -} - -make_sequences_2: { - options = { - sequences: true - }; - input: { - if (boo) { - foo(); - bar(); - baz(); - } else { - x(); - y(); - z(); - } - } - expect: { - if (boo) foo(),bar(),baz(); - else x(),y(),z(); - } -} - -make_sequences_3: { - options = { - sequences: true - }; - input: { - function f() { - foo(); - bar(); - return baz(); - } - function g() { - foo(); - bar(); - throw new Error(); - } - } - expect: { - function f() { - return foo(), bar(), baz(); - } - function g() { - throw foo(), bar(), new Error(); - } - } -} - -make_sequences_4: { - options = { - sequences: true - }; - input: { - x = 5; - if (y) z(); - - x = 5; - for (i = 0; i < 5; i++) console.log(i); - - x = 5; - for (; i < 5; i++) console.log(i); - - x = 5; - switch (y) {} - - x = 5; - with (obj) {} - } - expect: { - if (x = 5, y) z(); - for (x = 5, i = 0; i < 5; i++) console.log(i); - for (x = 5; i < 5; i++) console.log(i); - switch (x = 5, y) {} - with (x = 5, obj); - } -} - -lift_sequences_1: { - options = { sequences: true }; - input: { - foo = !(x(), y(), bar()); - } - expect: { - x(), y(), foo = !bar(); - } -} - -lift_sequences_2: { - options = { sequences: true, evaluate: true }; - input: { - foo.x = (foo = {}, 10); - bar = (bar = {}, 10); - } - expect: { - foo.x = (foo = {}, 10), - bar = {}, bar = 10; - } -} - -lift_sequences_3: { - options = { sequences: true, conditionals: true }; - input: { - x = (foo(), bar(), baz()) ? 10 : 20; - } - expect: { - foo(), bar(), x = baz() ? 10 : 20; - } -} - -lift_sequences_4: { - options = { side_effects: true }; - input: { - x = (foo, bar, baz); - } - expect: { - x = baz; - } -} - -for_sequences: { - options = { sequences: true }; - input: { - // 1 - foo(); - bar(); - for (; false;); - // 2 - foo(); - bar(); - for (x = 5; false;); - // 3 - x = (foo in bar); - for (; false;); - // 4 - x = (foo in bar); - for (y = 5; false;); - } - expect: { - // 1 - for (foo(), bar(); false;); - // 2 - for (foo(), bar(), x = 5; false;); - // 3 - x = (foo in bar); - for (; false;); - // 4 - x = (foo in bar); - for (y = 5; false;); - } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/switch.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/switch.js deleted file mode 100644 index 62e39cf..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/switch.js +++ /dev/null @@ -1,260 +0,0 @@ -constant_switch_1: { - options = { dead_code: true, evaluate: true }; - input: { - switch (1+1) { - case 1: foo(); break; - case 1+1: bar(); break; - case 1+1+1: baz(); break; - } - } - expect: { - bar(); - } -} - -constant_switch_2: { - options = { dead_code: true, evaluate: true }; - input: { - switch (1) { - case 1: foo(); - case 1+1: bar(); break; - case 1+1+1: baz(); - } - } - expect: { - foo(); - bar(); - } -} - -constant_switch_3: { - options = { dead_code: true, evaluate: true }; - input: { - switch (10) { - case 1: foo(); - case 1+1: bar(); break; - case 1+1+1: baz(); - default: - def(); - } - } - expect: { - def(); - } -} - -constant_switch_4: { - options = { dead_code: true, evaluate: true }; - input: { - switch (2) { - case 1: - x(); - if (foo) break; - y(); - break; - case 1+1: - bar(); - default: - def(); - } - } - expect: { - bar(); - def(); - } -} - -constant_switch_5: { - options = { dead_code: true, evaluate: true }; - input: { - switch (1) { - case 1: - x(); - if (foo) break; - y(); - break; - case 1+1: - bar(); - default: - def(); - } - } - expect: { - // the break inside the if ruins our job - // we can still get rid of irrelevant cases. - switch (1) { - case 1: - x(); - if (foo) break; - y(); - } - // XXX: we could optimize this better by inventing an outer - // labeled block, but that's kinda tricky. - } -} - -constant_switch_6: { - options = { dead_code: true, evaluate: true }; - input: { - OUT: { - foo(); - switch (1) { - case 1: - x(); - if (foo) break OUT; - y(); - case 1+1: - bar(); - break; - default: - def(); - } - } - } - expect: { - OUT: { - foo(); - x(); - if (foo) break OUT; - y(); - bar(); - } - } -} - -constant_switch_7: { - options = { dead_code: true, evaluate: true }; - input: { - OUT: { - foo(); - switch (1) { - case 1: - x(); - if (foo) break OUT; - for (var x = 0; x < 10; x++) { - if (x > 5) break; // this break refers to the for, not to the switch; thus it - // shouldn't ruin our optimization - console.log(x); - } - y(); - case 1+1: - bar(); - break; - default: - def(); - } - } - } - expect: { - OUT: { - foo(); - x(); - if (foo) break OUT; - for (var x = 0; x < 10; x++) { - if (x > 5) break; - console.log(x); - } - y(); - bar(); - } - } -} - -constant_switch_8: { - options = { dead_code: true, evaluate: true }; - input: { - OUT: switch (1) { - case 1: - x(); - for (;;) break OUT; - y(); - break; - case 1+1: - bar(); - default: - def(); - } - } - expect: { - OUT: { - x(); - for (;;) break OUT; - y(); - } - } -} - -constant_switch_9: { - options = { dead_code: true, evaluate: true }; - input: { - OUT: switch (1) { - case 1: - x(); - for (;;) if (foo) break OUT; - y(); - case 1+1: - bar(); - default: - def(); - } - } - expect: { - OUT: { - x(); - for (;;) if (foo) break OUT; - y(); - bar(); - def(); - } - } -} - -drop_default_1: { - options = { dead_code: true }; - input: { - switch (foo) { - case 'bar': baz(); - default: - } - } - expect: { - switch (foo) { - case 'bar': baz(); - } - } -} - -drop_default_2: { - options = { dead_code: true }; - input: { - switch (foo) { - case 'bar': baz(); break; - default: - break; - } - } - expect: { - switch (foo) { - case 'bar': baz(); - } - } -} - -keep_default: { - options = { dead_code: true }; - input: { - switch (foo) { - case 'bar': baz(); - default: - something(); - break; - } - } - expect: { - switch (foo) { - case 'bar': baz(); - default: - something(); - } - } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/typeof.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/typeof.js deleted file mode 100644 index cefdd43..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/typeof.js +++ /dev/null @@ -1,25 +0,0 @@ -typeof_evaluation: { - options = { - evaluate: true - }; - input: { - a = typeof 1; - b = typeof 'test'; - c = typeof []; - d = typeof {}; - e = typeof /./; - f = typeof false; - g = typeof function(){}; - h = typeof undefined; - } - expect: { - a='number'; - b='string'; - c=typeof[]; - d=typeof{}; - e=typeof/./; - f='boolean'; - g='function'; - h='undefined'; - } -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/run-tests.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/run-tests.js deleted file mode 100755 index f8e88d4..0000000 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/run-tests.js +++ /dev/null @@ -1,179 +0,0 @@ -#! /usr/bin/env node - -var U = require("../tools/node"); -var path = require("path"); -var fs = require("fs"); -var assert = require("assert"); -var sys = require("util"); - -var tests_dir = path.dirname(module.filename); -var failures = 0; -var failed_files = {}; - -run_compress_tests(); -if (failures) { - sys.error("\n!!! Failed " + failures + " test cases."); - sys.error("!!! " + Object.keys(failed_files).join(", ")); - process.exit(1); -} - -/* -----[ utils ]----- */ - -function tmpl() { - return U.string_template.apply(this, arguments); -} - -function log() { - var txt = tmpl.apply(this, arguments); - sys.puts(txt); -} - -function log_directory(dir) { - log("*** Entering [{dir}]", { dir: dir }); -} - -function log_start_file(file) { - log("--- {file}", { file: file }); -} - -function log_test(name) { - log(" Running test [{name}]", { name: name }); -} - -function find_test_files(dir) { - var files = fs.readdirSync(dir).filter(function(name){ - return /\.js$/i.test(name); - }); - if (process.argv.length > 2) { - var x = process.argv.slice(2); - files = files.filter(function(f){ - return x.indexOf(f) >= 0; - }); - } - return files; -} - -function test_directory(dir) { - return path.resolve(tests_dir, dir); -} - -function as_toplevel(input) { - if (input instanceof U.AST_BlockStatement) input = input.body; - else if (input instanceof U.AST_Statement) input = [ input ]; - else throw new Error("Unsupported input syntax"); - var toplevel = new U.AST_Toplevel({ body: input }); - toplevel.figure_out_scope(); - return toplevel; -} - -function run_compress_tests() { - var dir = test_directory("compress"); - log_directory("compress"); - var files = find_test_files(dir); - function test_file(file) { - log_start_file(file); - function test_case(test) { - log_test(test.name); - var options = U.defaults(test.options, { - warnings: false - }); - var cmp = new U.Compressor(options, true); - var expect = make_code(as_toplevel(test.expect), false); - var input = as_toplevel(test.input); - var input_code = make_code(test.input); - var output = input.transform(cmp); - output.figure_out_scope(); - output = make_code(output, false); - if (expect != output) { - log("!!! failed\n---INPUT---\n{input}\n---OUTPUT---\n{output}\n---EXPECTED---\n{expected}\n\n", { - input: input_code, - output: output, - expected: expect - }); - failures++; - failed_files[file] = 1; - } - } - var tests = parse_test(path.resolve(dir, file)); - for (var i in tests) if (tests.hasOwnProperty(i)) { - test_case(tests[i]); - } - } - files.forEach(function(file){ - test_file(file); - }); -} - -function parse_test(file) { - var script = fs.readFileSync(file, "utf8"); - var ast = U.parse(script, { - filename: file - }); - var tests = {}; - var tw = new U.TreeWalker(function(node, descend){ - if (node instanceof U.AST_LabeledStatement - && tw.parent() instanceof U.AST_Toplevel) { - var name = node.label.name; - tests[name] = get_one_test(name, node.body); - return true; - } - if (!(node instanceof U.AST_Toplevel)) croak(node); - }); - ast.walk(tw); - return tests; - - function croak(node) { - throw new Error(tmpl("Can't understand test file {file} [{line},{col}]\n{code}", { - file: file, - line: node.start.line, - col: node.start.col, - code: make_code(node, false) - })); - } - - function get_one_test(name, block) { - var test = { name: name, options: {} }; - var tw = new U.TreeWalker(function(node, descend){ - if (node instanceof U.AST_Assign) { - if (!(node.left instanceof U.AST_SymbolRef)) { - croak(node); - } - var name = node.left.name; - test[name] = evaluate(node.right); - return true; - } - if (node instanceof U.AST_LabeledStatement) { - assert.ok( - node.label.name == "input" || node.label.name == "expect", - tmpl("Unsupported label {name} [{line},{col}]", { - name: node.label.name, - line: node.label.start.line, - col: node.label.start.col - }) - ); - var stat = node.body; - if (stat instanceof U.AST_BlockStatement) { - if (stat.body.length == 1) stat = stat.body[0]; - else if (stat.body.length == 0) stat = new U.AST_EmptyStatement(); - } - test[node.label.name] = stat; - return true; - } - }); - block.walk(tw); - return test; - }; -} - -function make_code(ast, beautify) { - if (arguments.length == 1) beautify = true; - var stream = U.OutputStream({ beautify: beautify }); - ast.print(stream); - return stream.get(); -} - -function evaluate(code) { - if (code instanceof U.AST_Node) - code = make_code(code); - return new Function("return(" + code + ")")(); -} diff --git a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/tools/node.js b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/tools/node.js index 084998d..cbe49e3 100644 --- a/node_modules/grunt-contrib-uglify/node_modules/uglify-js/tools/node.js +++ b/node_modules/grunt-contrib-uglify/node_modules/uglify-js/tools/node.js @@ -1,11 +1,11 @@ var path = require("path"); var fs = require("fs"); var vm = require("vm"); -var sys = require("util"); var UglifyJS = vm.createContext({ - sys : sys, console : console, + process : process, + Buffer : Buffer, MOZ_SourceMap : require("source-map") }); @@ -17,7 +17,7 @@ function load_global(file) { } catch(ex) { // XXX: in case of a syntax error, the message is kinda // useless. (no location information). - sys.debug("ERROR in file: " + file + " / " + ex); + console.log("ERROR in file: " + file + " / " + ex); process.exit(1); } }; @@ -31,15 +31,16 @@ var FILES = exports.FILES = [ "../lib/output.js", "../lib/compress.js", "../lib/sourcemap.js", - "../lib/mozilla-ast.js" + "../lib/mozilla-ast.js", + "../lib/propmangle.js" ].map(function(file){ - return path.join(path.dirname(fs.realpathSync(__filename)), file); + return fs.realpathSync(path.join(path.dirname(__filename), file)); }); FILES.forEach(load_global); UglifyJS.AST_Node.warn_function = function(txt) { - sys.error("WARN: " + txt); + console.error("WARN: %s", txt); }; // XXX: perhaps we shouldn't export everything but heck, I'm lazy. @@ -95,8 +96,8 @@ exports.minify = function(files, options) { // 3. mangle if (options.mangle) { - toplevel.figure_out_scope(); - toplevel.compute_char_frequency(); + toplevel.figure_out_scope(options.mangle); + toplevel.compute_char_frequency(options.mangle); toplevel.mangle_names(options.mangle); } @@ -131,9 +132,14 @@ exports.minify = function(files, options) { stream += "\n//# sourceMappingURL=" + options.outSourceMap; } + var source_map = output.source_map; + if (source_map) { + source_map = source_map + ""; + } + return { code : stream + "", - map : output.source_map + "" + map : source_map }; }; @@ -185,3 +191,63 @@ exports.describe_ast = function() { doitem(UglifyJS.AST_Node); return out + ""; }; + +function readReservedFile(filename, reserved) { + if (!reserved) { + reserved = { vars: [], props: [] }; + } + var data = fs.readFileSync(filename, "utf8"); + data = JSON.parse(data); + if (data.vars) { + data.vars.forEach(function(name){ + UglifyJS.push_uniq(reserved.vars, name); + }); + } + if (data.props) { + data.props.forEach(function(name){ + UglifyJS.push_uniq(reserved.props, name); + }); + } + return reserved; +} + +exports.readReservedFile = readReservedFile; + +exports.readDefaultReservedFile = function(reserved) { + return readReservedFile(path.join(__dirname, "domprops.json"), reserved); +}; + +exports.readNameCache = function(filename, key) { + var cache = null; + if (filename) { + try { + var cache = fs.readFileSync(filename, "utf8"); + cache = JSON.parse(cache)[key]; + if (!cache) throw "init"; + cache.props = UglifyJS.Dictionary.fromObject(cache.props); + } catch(ex) { + cache = { + cname: -1, + props: new UglifyJS.Dictionary() + }; + } + } + return cache; +}; + +exports.writeNameCache = function(filename, key, cache) { + if (filename) { + var data; + try { + data = fs.readFileSync(filename, "utf8"); + data = JSON.parse(data); + } catch(ex) { + data = {}; + } + data[key] = { + cname: cache.cname, + props: cache.props.toObject() + }; + fs.writeFileSync(filename, JSON.stringify(data, null, 2), "utf8"); + } +}; diff --git a/node_modules/grunt-contrib-uglify/package.json b/node_modules/grunt-contrib-uglify/package.json index 9474a92..0014ddd 100644 --- a/node_modules/grunt-contrib-uglify/package.json +++ b/node_modules/grunt-contrib-uglify/package.json @@ -1,18 +1,14 @@ { "name": "grunt-contrib-uglify", "description": "Minify files with UglifyJS.", - "version": "0.2.7", - "homepage": "https://github.com/gruntjs/grunt-contrib-uglify", + "version": "0.9.1", "author": { "name": "Grunt Team", "url": "http://gruntjs.com/" }, "repository": { "type": "git", - "url": "git://github.com/gruntjs/grunt-contrib-uglify.git" - }, - "bugs": { - "url": "https://github.com/gruntjs/grunt-contrib-uglify/issues" + "url": "git+https://github.com/gruntjs/grunt-contrib-uglify.git" }, "licenses": [ { @@ -21,30 +17,36 @@ } ], "engines": { - "node": ">= 0.8.0" + "node": ">=0.10.0" }, "scripts": { "test": "grunt test" }, "dependencies": { - "uglify-js": "~2.4.0", - "grunt-lib-contrib": "~0.6.1" + "chalk": "^1.0.0", + "lodash": "^3.2.0", + "maxmin": "^1.0.0", + "uglify-js": "^2.4.19", + "uri-path": "0.0.2" }, "devDependencies": { - "grunt-contrib-jshint": "~0.6.3", - "grunt-contrib-nodeunit": "~0.2.0", - "grunt-contrib-clean": "~0.5.0", - "grunt-contrib-internal": "~0.4.2", - "grunt": "~0.4.0" + "grunt": "^0.4.2", + "grunt-cli": "^0.1.13", + "grunt-contrib-clean": "^0.6.0", + "grunt-contrib-internal": "^0.4.12", + "grunt-contrib-jshint": "^0.11.0", + "grunt-contrib-nodeunit": "^0.4.0" }, "peerDependencies": { - "grunt": "~0.4.0" + "grunt": ">=0.4.0" }, "keywords": [ "gruntplugin" ], - "readme": "# grunt-contrib-uglify v0.2.6 [![Build Status](https://travis-ci.org/gruntjs/grunt-contrib-uglify.png?branch=master)](https://travis-ci.org/gruntjs/grunt-contrib-uglify)\n\n> Minify files with UglifyJS.\n\n\n\n## Getting Started\nThis plugin requires Grunt `~0.4.0`\n\nIf you haven't used [Grunt](http://gruntjs.com/) before, be sure to check out the [Getting Started](http://gruntjs.com/getting-started) guide, as it explains how to create a [Gruntfile](http://gruntjs.com/sample-gruntfile) as well as install and use Grunt plugins. Once you're familiar with that process, you may install this plugin with this command:\n\n```shell\nnpm install grunt-contrib-uglify --save-dev\n```\n\nOnce the plugin has been installed, it may be enabled inside your Gruntfile with this line of JavaScript:\n\n```js\ngrunt.loadNpmTasks('grunt-contrib-uglify');\n```\n\n\n\n\n## Uglify task\n_Run this task with the `grunt uglify` command._\n\nTask targets, files and options may be specified according to the grunt [Configuring tasks](http://gruntjs.com/configuring-tasks) guide.\n### Options\n\nThis task primarily delegates to [UglifyJS2][], so please consider the [UglifyJS documentation][] as required reading for advanced configuration.\n\n[UglifyJS2]: https://github.com/mishoo/UglifyJS2\n[UglifyJS documentation]: http://lisperator.net/uglifyjs/\n\n#### mangle\nType: `Boolean` `Object`\nDefault: `{}`\n\nTurn on or off mangling with default options. If an `Object` is specified, it is passed directly to `ast.mangle_names()` *and* `ast.compute_char_frequency()` (mimicking command line behavior).\n\n#### compress\nType: `Boolean` `Object`\nDefault: `{}`\n\nTurn on or off source compression with default options. If an `Object` is specified, it is passed as options to `UglifyJS.Compressor()`.\n\n#### beautify\nType: `Boolean` `Object`\nDefault: `false`\n\nTurns on beautification of the generated source code. An `Object` will be merged and passed with the options sent to `UglifyJS.OutputStream()`\n\n#### report\nChoices: `false` `'min'` `'gzip'`\nDefault: `false`\n\nEither do not report anything, report only minification result, or report minification and gzip results. This is useful to see exactly how well Uglify is performing, but using `'gzip'` can add 5-10x runtime task execution.\n\nExample ouput using `'gzip'`:\n\n```\nOriginal: 198444 bytes.\nMinified: 101615 bytes.\nGzipped: 20084 bytes.\n```\n\n#### sourceMap\nType: `String` `Function`\nDefault: `undefined`\n\nThe location to output the sourcemap. If a function is provided, the uglify destination is passed as the argument\nand the return value will be used as the sourceMap name.\n\n#### sourceMapRoot\nType: `String`\nDefault: `undefined`\n\nThe location where your source files can be found. This sets the sourceRoot field in the source map.\n\n#### sourceMapIn\nType: `String` `Function`\nDefault: `undefined`\n\nThe location of an input source map from an earlier compilation, e.g. from CoffeeScript. If a function is provided, the\nuglify source is passed as the argument and the return value will be used as the sourceMap name. This only makes sense\nwhen there's one source file.\n\n#### sourceMappingURL\nType: `String` `Function`\nDefault: `undefined`\n\nThe location of your sourcemap. Defaults to the location you use for sourceMap, override if you need finer control. Provide\na function to dynamically generate the sourceMappingURL based off the destination.\n\n#### sourceMapPrefix\nType: `Number`\nDefault: `undefined`\n\nThe number of directories to drop from the path prefix when declaring files in the source map.\n\n###### enclose\nType: `Object`\nDefault: `undefined`\n\nWrap all of the code in a closure with a configurable arguments/parameters list.\nEach key-value pair in the `enclose` object is effectively an argument-parameter pair.\n\n#### wrap\nType: `String`\nDefault: `undefined`\n\nWrap all of the code in a closure, an easy way to make sure nothing is leaking.\nFor variables that need to be public `exports` and `global` variables are made available.\nThe value of wrap is the global variable exports will be available as.\n\n#### exportAll\nType: `Boolean`\nDefault: `false`\n\nWhen using `wrap` this will make all global functions and variables available via the export variable.\n\n#### preserveComments\nType: `Boolean` `String` `Function`\nDefault: `undefined`\nOptions: `false` `'all'` `'some'`\n\nTurn on preservation of comments.\n\n- `false` will strip all comments\n- `'all'` will preserve all comments in code blocks that have not been squashed or dropped\n- `'some'` will preserve all comments that start with a bang (`!`) or include a closure compiler style directive (`@preserve` `@license` `@cc_on`)\n- `Function` specify your own comment preservation function. You will be passed the current node and the current comment and are expected to return either `true` or `false`\n\n#### banner\nType: `String`\nDefault: empty string\n\nThis string will be prepended to the beginning of the minified output. It is processed using [grunt.template.process][], using the default options.\n\n#### footer\nType: `String`\nDefault: empty string\n\nThis string will be append to the end of the minified output. It is processed using [grunt.template.process][], using the default options.\n\n_(Default processing options are explained in the [grunt.template.process][] documentation)_\n\n[grunt.template.process]: https://github.com/gruntjs/grunt/wiki/grunt.template#wiki-grunt-template-process\n\n\n### Usage examples\n\n#### Basic compression\n\nThis configuration will compress and mangle the input files using the default options.\n\n```js\n// Project configuration.\ngrunt.initConfig({\n uglify: {\n my_target: {\n files: {\n 'dest/output.min.js': ['src/input1.js', 'src/input2.js']\n }\n }\n }\n});\n```\n\n#### No mangling\n\nSpecify `mangle: false` to prevent changes to your variable and function names.\n\n```js\n// Project configuration.\ngrunt.initConfig({\n uglify: {\n options: {\n mangle: false\n },\n my_target: {\n files: {\n 'dest/output.min.js': ['src/input.js']\n }\n }\n }\n});\n```\n\n#### Reserved identifiers\n\nYou can specify identifiers to leave untouched with an `except` array in the `mangle` options.\n\n```js\n// Project configuration.\ngrunt.initConfig({\n uglify: {\n options: {\n mangle: {\n except: ['jQuery', 'Backbone']\n }\n },\n my_target: {\n files: {\n 'dest/output.min.js': ['src/input.js']\n }\n }\n }\n});\n```\n\n#### Source maps\n\nConfigure basic source map output by specifying a file path for the `sourceMap` option.\n\n```js\n// Project configuration.\ngrunt.initConfig({\n uglify: {\n my_target: {\n options: {\n sourceMap: 'path/to/source-map.js'\n },\n files: {\n 'dest/output.min.js': ['src/input.js']\n }\n }\n }\n});\n```\n\n#### Advanced source maps\n\nYou can specify the parameters to pass to `UglifyJS.SourceMap()` which will\nallow you to configure advanced settings.\n\nRefer to the [UglifyJS SourceMap Documentation](http://lisperator.net/uglifyjs/codegen#source-map) for more information.\n\n```js\n// Project configuration.\ngrunt.initConfig({\n uglify: {\n my_target: {\n options: {\n sourceMap: 'path/to/source-map.js',\n sourceMapRoot: 'http://example.com/path/to/src/', // the location to find your original source\n sourceMapIn: 'example/coffeescript-sourcemap.js', // input sourcemap from a previous compilation\n },\n files: {\n 'dest/output.min.js': ['src/input.js'],\n },\n },\n },\n});\n```\n\n\n#### Beautify\n\nSpecify `beautify: true` to beautify your code for debugging/troubleshooting purposes.\nPass an object to manually configure any other output options passed directly to `UglifyJS.OutputStream()`.\n\nSee [UglifyJS Codegen documentation](http://lisperator.net/uglifyjs/codegen) for more information.\n\n_Note that manual configuration will require you to explicitly set `beautify: true` if you want traditional, beautified output._\n\n```js\n// Project configuration.\ngrunt.initConfig({\n uglify: {\n my_target: {\n options: {\n beautify: true\n },\n files: {\n 'dest/output.min.js': ['src/input.js']\n }\n },\n my_advanced_target: {\n options: {\n beautify: {\n width: 80,\n beautify: true\n }\n },\n files: {\n 'dest/output.min.js': ['src/input.js']\n }\n }\n }\n});\n```\n\n#### Banner comments\n\nIn this example, running `grunt uglify:my_target` will prepend a banner created by interpolating the `banner` template string with the config object. Here, those properties are the values imported from the `package.json` file (which are available via the `pkg` config property) plus today's date.\n\n_Note: you don't have to use an external JSON file. It's also valid to create the `pkg` object inline in the config. That being said, if you already have a JSON file, you might as well reference it._\n\n```js\n// Project configuration.\ngrunt.initConfig({\n pkg: grunt.file.readJSON('package.json'),\n uglify: {\n options: {\n banner: '/*! <%= pkg.name %> - v<%= pkg.version %> - ' +\n '<%= grunt.template.today(\"yyyy-mm-dd\") %> */'\n },\n my_target: {\n files: {\n 'dest/output.min.js': ['src/input.js']\n }\n }\n }\n});\n```\n\n#### Conditional compilation\n\nYou can also enable UglifyJS conditional compilation. This is commonly used to remove debug code blocks for production builds.\n\nSee [UglifyJS global definitions documentation](http://lisperator.net/uglifyjs/compress#global-defs) for more information.\n\n```js\n// Project configuration.\ngrunt.initConfig({\n uglify: {\n options: {\n compress: {\n global_defs: {\n \"DEBUG\": false\n },\n dead_code: true\n }\n },\n my_target: {\n files: {\n 'dest/output.min.js': ['src/input.js']\n }\n }\n }\n});\n```\n#### Compiling all files in a folder dynamically\n\nThis configuration will compress and mangle the files dynamically.\n\n```js\n// Project configuration.\ngrunt.initConfig({\n uglify: {\n my_target: {\n files: [{\n expand: true,\n cwd: 'src/js',\n src: '**/*.js',\n dest: 'dest/js'\n }]\n }\n }\n});\n```\n\n\n## Release History\n\n * 2013-11-09   v0.2.7   prepending banner if sourceMap option not set, addresses\n * 2013-11-08   v0.2.6   merged 45, 53, 85 (105 by way of duping 53) Added support for banners in uglified files with sourcemaps Updated docs\n * 2013-10-28   v0.2.5   Added warning for banners when using sourcemaps\n * 2013-09-02   v0.2.4   updated sourcemap format via /83\n * 2013-06-10   v0.2.3   added footer option\n * 2013-05-31   v0.2.2   Reverted /56 due to /58 until [chrome/239660](https://code.google.com/p/chromium/issues/detail?id=239660&q=sourcemappingurl&colspec=ID%20Pri%20M%20Iteration%20ReleaseBlock%20Cr%20Status%20Owner%20Summary%20OS%20Modified) [firefox/870361](https://bugzilla.mozilla.org/show_bug.cgi?id=870361) drop\n * 2013-05-22   v0.2.1   Bumped uglify to ~2.3.5 /55 /40 Changed sourcemappingUrl syntax /56 Disabled sorting of names for consistent mangling /44 Updated docs for sourceMapRoot /47 /25\n * 2013-03-14   v0.2.0   No longer report gzip results by default. Support `report` option.\n * 2013-01-30   v0.1.2   Added better error reporting Support for dynamic names of multiple sourcemaps\n * 2013-02-15   v0.1.1   First official release for Grunt 0.4.0.\n * 2013-01-18   v0.1.1rc6   Updating grunt/gruntplugin dependencies to rc6. Changing in-development grunt/gruntplugin dependency versions from tilde version ranges to specific versions.\n * 2013-01-09   v0.1.1rc5   Updating to work with grunt v0.4.0rc5. Switching back to this.files api.\n * 2012-11-28   v0.1.0   Work in progress, not yet officially released.\n\n---\n\nTask submitted by [\"Cowboy\" Ben Alman](http://benalman.com)\n\n*This file was generated on Sat Nov 09 2013 12:42:05.*\n", - "readmeFilename": "README.md", + "files": [ + "tasks" + ], + "appveyor_id": "ybtf5vbvtenii561", "contributors": [ { "name": "\"Cowboy\" Ben Alman", @@ -59,6 +61,55 @@ "url": "http://jarrodoverson.com" } ], - "_id": "grunt-contrib-uglify@0.2.7", - "_from": "grunt-contrib-uglify@~0.2.2" + "gitHead": "06e51d7ddaddaa8680d7ce6e2efa80cd7c0fb114", + "bugs": { + "url": "https://github.com/gruntjs/grunt-contrib-uglify/issues" + }, + "homepage": "https://github.com/gruntjs/grunt-contrib-uglify", + "_id": "grunt-contrib-uglify@0.9.1", + "_shasum": "1eb8420009f15ed1a97368077479ab25ded28d1b", + "_from": "grunt-contrib-uglify@*", + "_npmVersion": "2.4.1", + "_nodeVersion": "0.10.35", + "_npmUser": { + "name": "vladikoff", + "email": "vlad@vladikoff.com" + }, + "maintainers": [ + { + "name": "tkellen", + "email": "tyler@sleekcode.net" + }, + { + "name": "cowboy", + "email": "cowboy@rj3.net" + }, + { + "name": "shama", + "email": "kyle@dontkry.com" + }, + { + "name": "jsoverson", + "email": "jsoverson@gmail.com" + }, + { + "name": "jmeas", + "email": "jellyes2@gmail.com" + }, + { + "name": "vladikoff", + "email": "vlad@vladikoff.com" + }, + { + "name": "sindresorhus", + "email": "sindresorhus@gmail.com" + } + ], + "dist": { + "shasum": "1eb8420009f15ed1a97368077479ab25ded28d1b", + "tarball": "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.9.1.tgz" + }, + "directories": {}, + "_resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.9.1.tgz", + "readme": "ERROR: No README data found!" } diff --git a/node_modules/grunt-contrib-uglify/tasks/lib/uglify.js b/node_modules/grunt-contrib-uglify/tasks/lib/uglify.js index 36aadbf..21cdcd9 100644 --- a/node_modules/grunt-contrib-uglify/tasks/lib/uglify.js +++ b/node_modules/grunt-contrib-uglify/tasks/lib/uglify.js @@ -2,15 +2,17 @@ * grunt-contrib-uglify * https://gruntjs.com/ * - * Copyright (c) 2013 "Cowboy" Ben Alman, contributors + * Copyright (c) 2015 "Cowboy" Ben Alman, contributors * Licensed under the MIT license. */ 'use strict'; // External libs. +var path = require('path'); var UglifyJS = require('uglify-js'); -var fs = require('fs'); +var _ = require('lodash'); +var uriPath = require('uri-path'); exports.init = function(grunt) { var exports = {}; @@ -25,20 +27,32 @@ exports.init = function(grunt) { var topLevel = null; var totalCode = ''; + var sourcesContent = {}; var outputOptions = getOutputOptions(options, dest); var output = UglifyJS.OutputStream(outputOptions); // Grab and parse all source files files.forEach(function(file){ + var code = grunt.file.read(file); - if (typeof options.sourceMapPrefix !== 'undefined') { - file = file.replace(/^\/+/, "").split(/\/+/).slice(options.sourceMapPrefix).join("/"); - } totalCode += code; + + // The src file name must be relative to the source map for things to work + var basename = path.basename(file); + var fileDir = path.dirname(file); + var sourceMapDir = path.dirname(options.generatedSourceMapName); + var relativePath = path.relative(sourceMapDir, fileDir); + var pathPrefix = relativePath ? (relativePath+path.sep) : ''; + + // Convert paths to use forward slashes for sourcemap use in the browser + file = uriPath(pathPrefix + basename); + + sourcesContent[file] = code; topLevel = UglifyJS.parse(code, { filename: file, - toplevel: topLevel + toplevel: topLevel, + expression: options.expression }); }); @@ -49,18 +63,28 @@ exports.init = function(grunt) { // Wrap code in closure with configurable arguments/parameters list. if (options.enclose) { - var argParamList = grunt.util._.map(options.enclose, function(val, key) { + var argParamList = _.map(options.enclose, function(val, key) { return key + ':' + val; }); topLevel = topLevel.wrap_enclose(argParamList); } + var topLevelCache = null; + if (options.nameCache) { + topLevelCache = UglifyJS.readNameCache(options.nameCache, 'vars'); + } + // Need to call this before we mangle or compress, // and call after any compression or ast altering - topLevel.figure_out_scope(); + if (options.expression === false) { + topLevel.figure_out_scope({ screw_ie8: options.screwIE8, cache: topLevelCache }); + } if (options.compress !== false) { + if (options.compress === true) { + options.compress = {}; + } if (options.compress.warnings !== true) { options.compress.warnings = false; } @@ -68,7 +92,45 @@ exports.init = function(grunt) { topLevel = topLevel.transform(compressor); // Need to figure out scope again after source being altered - topLevel.figure_out_scope(); + if (options.expression === false) { + topLevel.figure_out_scope({screw_ie8: options.screwIE8, cache: topLevelCache}); + } + } + + var mangleExclusions = { vars: [], props: [] }; + if (options.reserveDOMProperties) { + mangleExclusions = UglifyJS.readDefaultReservedFile(); + } + + if (options.exceptionsFiles) { + try { + options.exceptionsFiles.forEach(function(filename) { + mangleExclusions = UglifyJS.readReservedFile(filename, mangleExclusions); + }); + } catch (ex) { + grunt.warn(ex); + } + } + + var cache = null; + if (options.nameCache) { + cache = UglifyJS.readNameCache(options.nameCache, 'props'); + } + + if (options.mangleProperties === true) { + topLevel = UglifyJS.mangle_properties(topLevel, { + reserved: mangleExclusions ? mangleExclusions.props : null, + cache: cache + }); + + if (options.nameCache) { + UglifyJS.writeNameCache(options.nameCache, 'props', cache); + } + + // Need to figure out scope again since topLevel has been altered + if (options.expression === false) { + topLevel.figure_out_scope({screw_ie8: options.screwIE8, cache: topLevelCache}); + } } if (options.mangle !== false) { @@ -78,9 +140,33 @@ exports.init = function(grunt) { // // compute_char_frequency optimizes names for compression // topLevel.compute_char_frequency(options.mangle); + // if options.mangle is a boolean (true) convert it into an object + if (typeof options.mangle !== 'object') { + options.mangle = {}; + } + + options.mangle.cache = topLevelCache; + + options.mangle.except = options.mangle.except ? options.mangle.except : []; + if (mangleExclusions.vars) { + mangleExclusions.vars.forEach(function(name){ + UglifyJS.push_uniq(options.mangle.except, name); + }); + } + // Requires previous call to figure_out_scope // and should always be called after compressor transform topLevel.mangle_names(options.mangle); + + UglifyJS.writeNameCache(options.nameCache, 'vars', options.mangle.cache); + } + + if (options.sourceMap && options.sourceMapIncludeSources) { + for (var file in sourcesContent) { + if (sourcesContent.hasOwnProperty(file)) { + outputOptions.source_map.get().setSourceContent(file, sourcesContent[file]); + } + } } // Print the ast to OutputStream @@ -88,8 +174,10 @@ exports.init = function(grunt) { var min = output.get(); - if (options.sourceMappingURL || options.sourceMap) { - min += "\n//# sourceMappingURL=" + (options.sourceMappingURL || options.sourceMap); + // Add the source map reference to the end of the file + if (options.sourceMap) { + // Set all paths to forward slashes for use in the browser + min += "\n//# sourceMappingURL=" + uriPath(options.destToSourceMap); } var result = { @@ -117,7 +205,7 @@ exports.init = function(grunt) { } else if (options.preserveComments === 'some') { // preserve comments with directives or that start with a bang (!) outputOptions.comments = /^!|@preserve|@license|@cc_on/i; - } else if (grunt.util._.isFunction(options.preserveComments)) { + } else if (_.isFunction(options.preserveComments)) { // support custom functions passed in outputOptions.comments = options.preserveComments; @@ -129,26 +217,56 @@ exports.init = function(grunt) { } if (options.beautify) { - if (grunt.util._.isObject(options.beautify)) { + if (_.isObject(options.beautify)) { // beautify options sent as an object are merged // with outputOptions and passed to the OutputStream - grunt.util._.extend(outputOptions, options.beautify); + _.assign(outputOptions, options.beautify); } else { outputOptions.beautify = true; } } + if (options.screwIE8) { + outputOptions.screw_ie8 = true; + } if (options.sourceMap) { + + var destBasename = path.basename(dest); var sourceMapIn; if (options.sourceMapIn) { sourceMapIn = grunt.file.readJSON(options.sourceMapIn); } outputOptions.source_map = UglifyJS.SourceMap({ - file: dest, + file: destBasename, root: options.sourceMapRoot, orig: sourceMapIn }); + if (options.sourceMapIncludeSources && sourceMapIn && sourceMapIn.sourcesContent) { + sourceMapIn.sourcesContent.forEach(function(content, idx) { + outputOptions.source_map.get().setSourceContent(sourceMapIn.sources[idx], content); + }); + } + + if (options.sourceMapIn) { + outputOptions.source_map.get()._file = destBasename; + } + } + + if (!_.isUndefined(options.indentLevel)) { + outputOptions.indent_level = options.indentLevel; + } + + if (!_.isUndefined(options.maxLineLen)) { + outputOptions.max_line_len = options.maxLineLen; + } + + if (!_.isUndefined(options.ASCIIOnly)) { + outputOptions.ascii_only = options.ASCIIOnly; + } + + if (!_.isUndefined(options.quoteStyle)) { + outputOptions.quote_style = options.quoteStyle; } return outputOptions; diff --git a/node_modules/grunt-contrib-uglify/tasks/uglify.js b/node_modules/grunt-contrib-uglify/tasks/uglify.js index a8dcd29..a7d5a5c 100644 --- a/node_modules/grunt-contrib-uglify/tasks/uglify.js +++ b/node_modules/grunt-contrib-uglify/tasks/uglify.js @@ -8,10 +8,30 @@ 'use strict'; -module.exports = function(grunt) { +var path = require('path'); +var chalk = require('chalk'); +var maxmin = require('maxmin'); +// Return the relative path from file1 => file2 +function relativePath(file1, file2) { + + var file1Dirname = path.dirname(file1); + var file2Dirname = path.dirname(file2); + if (file1Dirname !== file2Dirname) { + return path.relative(file1Dirname, file2Dirname) + path.sep; + } else { + return ""; + } + +} + +// Converts \r\n to \n +function normalizeLf( string ) { + return string.replace(/\r\n/g, '\n'); +} + +module.exports = function(grunt) { // Internal lib. - var contrib = require('grunt-lib-contrib').init(grunt); var uglify = require('./lib/uglify').init(grunt); grunt.registerMultiTask('uglify', 'Minify files with UglifyJS.', function() { @@ -24,20 +44,27 @@ module.exports = function(grunt) { }, mangle: {}, beautify: false, - report: false + report: 'min', + expression: false, + maxLineLen: 32000, + ASCIIOnly: false, + screwIE8: false, + quoteStyle: 0 }); // Process banner. - var banner = grunt.template.process(options.banner); - var footer = grunt.template.process(options.footer); - var mapNameGenerator, mapInNameGenerator, mappingURLGenerator; + var banner = normalizeLf(options.banner); + var footer = normalizeLf(options.footer); + var mapNameGenerator, mapInNameGenerator; + var createdFiles = 0; + var createdMaps = 0; // Iterate over all src-dest file pairs. - this.files.forEach(function(f) { - var src = f.src.filter(function(filepath) { + this.files.forEach(function (f) { + var src = f.src.filter(function (filepath) { // Warn on and remove invalid source files (if nonull was set). if (!grunt.file.exists(filepath)) { - grunt.log.warn('Source file "' + filepath + '" not found.'); + grunt.log.warn('Source file ' + chalk.cyan(filepath) + ' not found.'); return false; } else { return true; @@ -45,16 +72,23 @@ module.exports = function(grunt) { }); if (src.length === 0) { - grunt.log.warn('Destination (' + f.dest + ') not written because src files were empty.'); + grunt.log.warn('Destination ' + chalk.cyan(f.dest) + ' not written because src files were empty.'); return; } - // function to get the name of the sourceMap - if (typeof options.sourceMap === "function") { - mapNameGenerator = options.sourceMap; + // Warn on incompatible options + if (options.expression && (options.compress || options.mangle)) { + grunt.log.warn('Option ' + chalk.cyan('expression') + ' not compatible with ' + chalk.cyan('compress and mangle')); + options.compress = false; + options.mangle = false; } // function to get the name of the sourceMap + if (typeof options.sourceMapName === "function") { + mapNameGenerator = options.sourceMapName; + } + + // function to get the name of the sourceMapIn file if (typeof options.sourceMapIn === "function") { if (src.length !== 1) { grunt.fail.warn('Cannot generate `sourceMapIn` for multiple source files.'); @@ -62,23 +96,24 @@ module.exports = function(grunt) { mapInNameGenerator = options.sourceMapIn; } - // function to get the sourceMappingURL - if (typeof options.sourceMappingURL === "function") { - mappingURLGenerator = options.sourceMappingURL; - } - // dynamically create destination sourcemap name if (mapNameGenerator) { try { - options.sourceMap = mapNameGenerator(f.dest); + options.generatedSourceMapName = mapNameGenerator(f.dest); } catch (e) { - var err = new Error('SourceMapName failed.'); + var err = new Error('SourceMap failed.'); err.origError = e; grunt.fail.warn(err); } } + // If no name is passed append .map to the filename + else if (!options.sourceMapName) { + options.generatedSourceMapName = f.dest + '.map'; + } else { + options.generatedSourceMapName = options.sourceMapName; + } - // dynamically create incoming sourcemap names + // Dynamically create incoming sourcemap names if (mapInNameGenerator) { try { options.sourceMapIn = mapInNameGenerator(src[0]); @@ -89,15 +124,17 @@ module.exports = function(grunt) { } } - // dynamically create sourceMappingURL - if (mappingURLGenerator) { - try { - options.sourceMappingURL = mappingURLGenerator(f.dest); - } catch (e) { - var err = new Error('SourceMappingURL failed.'); - err.origError = e; - grunt.fail.warn(err); - } + // Calculate the path from the dest file to the sourcemap for the + // sourceMappingURL reference + if (options.sourceMap) { + var destToSourceMapPath = relativePath(f.dest, options.generatedSourceMapName); + var sourceMapBasename = path.basename(options.generatedSourceMapName); + options.destToSourceMap = destToSourceMapPath + sourceMapBasename; + } + + if (options.screwIE8) { + if (options.mangle) { options.mangle.screw_ie8 = true; } + if (options.compress) { options.compress.screw_ie8 = true; } } // Minify files, warn and fail on error. @@ -114,7 +151,7 @@ module.exports = function(grunt) { } } err.origError = e; - grunt.log.warn('Uglifying source "' + src + '" failed.'); + grunt.log.warn('Uglifying source ' + chalk.cyan(src) + ' failed.'); grunt.fail.warn(err); } @@ -129,21 +166,26 @@ module.exports = function(grunt) { // Write the destination file. grunt.file.write(f.dest, output); - // Write source map if (options.sourceMap) { - grunt.file.write(options.sourceMap, result.sourceMap); - grunt.log.writeln('Source Map "' + options.sourceMap + '" created.'); + grunt.file.write(options.generatedSourceMapName, result.sourceMap); + grunt.verbose.writeln('File ' + chalk.cyan(options.generatedSourceMapName) + ' created (source map).'); + createdMaps++; } - // Print a success message. - grunt.log.writeln('File "' + f.dest + '" created.'); - - // ...and report some size information. - if (options.report) { - contrib.minMaxInfo(output, result.max, options.report); - } + grunt.verbose.writeln('File ' + chalk.cyan(f.dest) + ' created: ' + + maxmin(result.max, output, options.report === 'gzip')); + createdFiles++; }); - }); + if (createdMaps > 0) { + grunt.log.ok(createdMaps + ' source' + grunt.util.pluralize(createdMaps, 'map/maps') + ' created.'); + } + + if (createdFiles > 0) { + grunt.log.ok(createdFiles + ' ' + grunt.util.pluralize(this.files.length, 'file/files') + ' created.'); + } else { + grunt.log.warn('No files created.'); + } + }); }; diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/expected/comments.js b/node_modules/grunt-contrib-uglify/test/fixtures/expected/comments.js deleted file mode 100644 index fbb3703..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/expected/comments.js +++ /dev/null @@ -1,12 +0,0 @@ -/*! - * I am a comment - */ -function foo(){return 42}// @preserve preserve -// @license license -function bar(){return 2*foo()}/* @preserve - * multiline preserve - */ -/* @license - * multiline license - */ -function baz(){return bar()*bar()} \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/expected/compress.js b/node_modules/grunt-contrib-uglify/test/fixtures/expected/compress.js deleted file mode 100644 index a9c123e..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/expected/compress.js +++ /dev/null @@ -1 +0,0 @@ -function longFunctionC(argumentC,argumentD){return longNameA+longNameB+argumentC+argumentD}var longNameA=1,longNameB=2,result=longFunctionC(3,4); \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/expected/compress_mangle.js b/node_modules/grunt-contrib-uglify/test/fixtures/expected/compress_mangle.js deleted file mode 100644 index c66c512..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/expected/compress_mangle.js +++ /dev/null @@ -1 +0,0 @@ -function longFunctionC(a,b){return longNameA+longNameB+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4); \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/expected/compress_mangle_banner.js b/node_modules/grunt-contrib-uglify/test/fixtures/expected/compress_mangle_banner.js deleted file mode 100644 index 1de7a82..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/expected/compress_mangle_banner.js +++ /dev/null @@ -1,2 +0,0 @@ -// banner without sourcemap -function longFunctionC(a,b){return longNameA+longNameB+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4); \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/expected/compress_mangle_beautify.js b/node_modules/grunt-contrib-uglify/test/fixtures/expected/compress_mangle_beautify.js deleted file mode 100644 index 9bcd387..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/expected/compress_mangle_beautify.js +++ /dev/null @@ -1,5 +0,0 @@ -function longFunctionC(a, b) { - return longNameA + longNameB + a + b; -} - -var longNameA = 1, longNameB = 2, result = longFunctionC(3, 4); \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/expected/compress_mangle_except.js b/node_modules/grunt-contrib-uglify/test/fixtures/expected/compress_mangle_except.js deleted file mode 100644 index 6830da9..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/expected/compress_mangle_except.js +++ /dev/null @@ -1 +0,0 @@ -function longFunctionC(argumentC,a){return longNameA+longNameB+argumentC+a}var longNameA=1,longNameB=2,result=longFunctionC(3,4); \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/expected/compress_mangle_sourcemap b/node_modules/grunt-contrib-uglify/test/fixtures/expected/compress_mangle_sourcemap deleted file mode 100644 index 864317a..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/expected/compress_mangle_sourcemap +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"/dev/null","sources":["test/fixtures/src/simple.js"],"names":["longFunctionC","argumentC","argumentD","longNameA","longNameB","result"],"mappings":"AAOA,QAASA,eAAcC,EAAUC,GAC/B,MAAOC,WAAYC,UAAYH,EAAYC,EAL7C,GAAIC,WAAY,EAEZC,UAAY,EAMZC,OAASL,cAAc,EAAE"} \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/expected/enclose.js b/node_modules/grunt-contrib-uglify/test/fixtures/expected/enclose.js deleted file mode 100644 index 85dbcf8..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/expected/enclose.js +++ /dev/null @@ -1,8 +0,0 @@ -(function(paramA, paramB) { - var longNameA = 1; - var longNameB = 2; - function longFunctionC(argumentC, argumentD) { - return longNameA + longNameB + argumentC + argumentD; - } - var result = longFunctionC(3, 4); -})(window.argA, window.argB); \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/expected/exportAll.js b/node_modules/grunt-contrib-uglify/test/fixtures/expected/exportAll.js deleted file mode 100644 index d072a33..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/expected/exportAll.js +++ /dev/null @@ -1 +0,0 @@ -!function(exports,global){function longFunctionC(argumentC,argumentD){return longNameA+longNameB+argumentC+argumentD}global.testExport=exports;var longNameA=1,longNameB=2,result=longFunctionC(3,4);exports.longNameA=longNameA,exports.longNameB=longNameB,exports.longFunctionC=longFunctionC,exports.result=result}({},function(){return this}()); \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/expected/multifile.js b/node_modules/grunt-contrib-uglify/test/fixtures/expected/multifile.js deleted file mode 100644 index beb6c51..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/expected/multifile.js +++ /dev/null @@ -1 +0,0 @@ -function longFunctionC(argumentC,argumentD){return longNameA+longNameB+argumentC+argumentD}function foo(){return 42}function bar(){return 2*foo()}function baz(){return bar()*bar()}var longNameA=1,longNameB=2,result=longFunctionC(3,4); \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/expected/multiple_sourcemaps1.js b/node_modules/grunt-contrib-uglify/test/fixtures/expected/multiple_sourcemaps1.js deleted file mode 100644 index 48e7cb9..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/expected/multiple_sourcemaps1.js +++ /dev/null @@ -1,2 +0,0 @@ -function longFunctionC(a,b){return longNameA+longNameB+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4); -//# sourceMappingURL=test/fixtures/expected/multiple_sourcemaps1.mapurl \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/expected/multiple_sourcemaps1.map b/node_modules/grunt-contrib-uglify/test/fixtures/expected/multiple_sourcemaps1.map deleted file mode 100644 index c5e3601..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/expected/multiple_sourcemaps1.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test/fixtures/expected/multiple_sourcemaps1.js","sources":["test/fixtures/src/simple.js"],"names":["longFunctionC","argumentC","argumentD","longNameA","longNameB","result"],"mappings":"AAOA,QAASA,eAAcC,EAAUC,GAC/B,MAAOC,WAAYC,UAAYH,EAAYC,EAL7C,GAAIC,WAAY,EAEZC,UAAY,EAMZC,OAASL,cAAc,EAAE"} \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/expected/multiple_sourcemaps2.js b/node_modules/grunt-contrib-uglify/test/fixtures/expected/multiple_sourcemaps2.js deleted file mode 100644 index 4e6814b..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/expected/multiple_sourcemaps2.js +++ /dev/null @@ -1,2 +0,0 @@ -function foo(){return 42}function bar(){return 2*foo()}function baz(){return bar()*bar()} -//# sourceMappingURL=test/fixtures/expected/multiple_sourcemaps2.mapurl \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/expected/multiple_sourcemaps2.map b/node_modules/grunt-contrib-uglify/test/fixtures/expected/multiple_sourcemaps2.map deleted file mode 100644 index 18dd794..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/expected/multiple_sourcemaps2.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test/fixtures/expected/multiple_sourcemaps2.js","sources":["test/fixtures/src/comments.js"],"names":["foo","bar","baz"],"mappings":"AAGA,QAASA,OACP,MAAO,IAIT,QAASC,OACP,MAAa,GAAND,MAQT,QAASE,OACP,MAAOD,OAAMA"} \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/expected/sourcemap_prefix b/node_modules/grunt-contrib-uglify/test/fixtures/expected/sourcemap_prefix deleted file mode 100644 index 0fcd108..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/expected/sourcemap_prefix +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"/dev/null","sources":["simple.js"],"names":["longFunctionC","argumentC","argumentD","longNameA","longNameB","result"],"mappings":"AAOA,QAASA,eAAcC,EAAUC,GAC/B,MAAOC,WAAYC,UAAYH,EAAYC,EAL7C,GAAIC,WAAY,EAEZC,UAAY,EAMZC,OAASL,cAAc,EAAE"} \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/expected/sourcemapin b/node_modules/grunt-contrib-uglify/test/fixtures/expected/sourcemapin deleted file mode 100644 index 49e7feb..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/expected/sourcemapin +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test/fixtures/expected/sourcemapin.js","sources":["test/fixtures/src/simple2.coffee"],"names":[],"mappings":";;IAAC,YAAA,GAAA,OAAA,KAAA,KAAA,OAAA,SAAA,KAAA,MACA,QAAW,GACX,UAAW,EAGK,WAAhB,OAAS,KAGT,OAAS,SAAA,GAAA,MAAO,GAAI,GAGpB,MAAQ,EAAG,EAAG,EAAG,EAAG,GAGpB,MACG,KAAQ,KAAI,KACb,OAAQ,OACR,KAAQ,SAAA,GAAA,MAAO,GAAI,OAAO,KAG1B,KAAO,SAAA,OAAA,SAAS,MAAA,SAAA,GAAA,UAAA,UAAA,MAAA,KAAA,UAAA,MACf,MAAM,OAAQ,UAGf,mBAAsB,QAAA,MAAA,OAAtB,MAAM,cAGR,MAAA,SAAA,QAAS,IAAA,GAAT,KAAS,GAAA,EAAA,QAAyB,KAAA,OAAzB,QAAA,KAAA,GAAkB,IAAO,KAAA,IAAA,OAAA,KAAzB,KAAI,KAAM,KAAV,OAAA,SAAA,KAAA,UAAA,KAAA","sourceRoot":"http://local.host/js/"} \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/expected/sourcemapin.js b/node_modules/grunt-contrib-uglify/test/fixtures/expected/sourcemapin.js deleted file mode 100644 index 28abbe7..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/expected/sourcemapin.js +++ /dev/null @@ -1,4 +0,0 @@ -// Hello World - -void function(){var cubes,list,math,number,opposite,race,square;number=42,opposite=!0,opposite&&(number=-42),square=function(x){return x*x},list=[1,2,3,4,5],math={root:Math.sqrt,square:square,cube:function(x){return x*square(x)}},race=function(winner,runners){return runners=2<=arguments.length?[].slice.call(arguments,1):[],print(winner,runners)},"undefined"!=typeof elvis&&null!=elvis&&alert("I knew it!"),cubes=function(accum$){for(var num,i$=0,length$=list.length;length$>i$;++i$)num=list[i$],accum$.push(math.cube(num));return accum$}.call(this,[])}.call(this); -//# sourceMappingURL=test/fixtures/expected/sourcemapin \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/expected/sourcemapurl.js b/node_modules/grunt-contrib-uglify/test/fixtures/expected/sourcemapurl.js deleted file mode 100644 index 930c9f4..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/expected/sourcemapurl.js +++ /dev/null @@ -1,2 +0,0 @@ -function longFunctionC(a,b){return longNameA+longNameB+a+b}var longNameA=1,longNameB=2,result=longFunctionC(3,4); -//# sourceMappingURL=js/sourcemapurl.js.map \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/expected/wrap.js b/node_modules/grunt-contrib-uglify/test/fixtures/expected/wrap.js deleted file mode 100644 index 1c61f2a..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/expected/wrap.js +++ /dev/null @@ -1 +0,0 @@ -!function(exports,global){function longFunctionC(argumentC,argumentD){return longNameA+longNameB+argumentC+argumentD}global.testExport=exports;{var longNameA=1,longNameB=2;longFunctionC(3,4)}}({},function(){return this}()); \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/src/comments.js b/node_modules/grunt-contrib-uglify/test/fixtures/src/comments.js deleted file mode 100644 index 32e5578..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/src/comments.js +++ /dev/null @@ -1,21 +0,0 @@ -/*! - * I am a comment - */ -function foo() { - return 42; -} -// @preserve preserve -// @license license -function bar() { - return foo()*2; -} -/* @preserve - * multiline preserve - */ -/* @license - * multiline license - */ -function baz() { - return bar()*bar(); -} -// end - not preserved \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/src/simple.js b/node_modules/grunt-contrib-uglify/test/fixtures/src/simple.js deleted file mode 100644 index 00bc938..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/src/simple.js +++ /dev/null @@ -1,15 +0,0 @@ - -// Hello world, I'm a comment! - -var longNameA = 1; - -var longNameB = 2; - -function longFunctionC(argumentC,argumentD) { - return longNameA + longNameB + argumentC + argumentD; -} - -var result = longFunctionC(3,4); - -/*! I might be preserved, yay! */ - diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/src/simple2.coffee b/node_modules/grunt-contrib-uglify/test/fixtures/src/simple2.coffee deleted file mode 100644 index 113aa34..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/src/simple2.coffee +++ /dev/null @@ -1,28 +0,0 @@ -# Assignment: -number = 42 -opposite = true - -# Conditions: -number = -42 if opposite - -# Functions: -square = (x) -> x * x - -# Arrays: -list = [1, 2, 3, 4, 5] - -# Objects: -math = - root: Math.sqrt - square: square - cube: (x) -> x * square x - -# Splats: -race = (winner, runners...) -> - print winner, runners - -# Existence: -alert "I knew it!" if elvis? - -# Array comprehensions: -cubes = (math.cube num for num in list) \ No newline at end of file diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/src/simple2.js b/node_modules/grunt-contrib-uglify/test/fixtures/src/simple2.js deleted file mode 100644 index 31fd083..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/src/simple2.js +++ /dev/null @@ -1,39 +0,0 @@ -// Generated by CoffeeScript 2.0.0-dev -void function () { - var cubes, list, math, number, opposite, race, square; - number = 42; - opposite = true; - if (opposite) - number = -42; - square = function (x) { - return x * x; - }; - list = [ - 1, - 2, - 3, - 4, - 5 - ]; - math = { - root: Math.sqrt, - square: square, - cube: function (x) { - return x * square(x); - } - }; - race = function (winner, runners) { - runners = 2 <= arguments.length ? [].slice.call(arguments, 1) : []; - return print(winner, runners); - }; - if ('undefined' !== typeof elvis && null != elvis) - alert('I knew it!'); - cubes = function (accum$) { - var num; - for (var i$ = 0, length$ = list.length; i$ < length$; ++i$) { - num = list[i$]; - accum$.push(math.cube(num)); - } - return accum$; - }.call(this, []); -}.call(this); diff --git a/node_modules/grunt-contrib-uglify/test/fixtures/src/simple2.map b/node_modules/grunt-contrib-uglify/test/fixtures/src/simple2.map deleted file mode 100644 index c77033c..0000000 --- a/node_modules/grunt-contrib-uglify/test/fixtures/src/simple2.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"test/fixtures/src/simple2.coffee","sources":["test/fixtures/src/simple2.coffee"],"names":[],"mappings":"AAAC;;;EACA,MAAA,GAAW;EACX,QAAA,GAAW;EAGX,IAAgB,QAAhB,CAAA;AAAA,IAAA,MAAA,GAAS,CAAC;EAGV,MAAA,GAAS,SAAA,CAAA,CAAA,CAAA;WAAO,CAAA,CAAA,CAAA,CAAI;;EAGpB,IAAA,GAAO,CAAA;AAAA,IAAC,CAAD;AAAA,IAAI,CAAJ;AAAA,IAAO,CAAP;AAAA,IAAU,CAAV;AAAA,IAAa,CAAb;AAAA,EAAA;EAGP,IAAA,GACG,CAAA;AAAA,IAAA,IAAA,EAAQ,IAAI,KAAZ;AAAA,IACD,MAAA,EAAQ,MADP;AAAA,IAED,IAAA,EAAQ,SAAA,CAAA,CAAA,CAAA;aAAO,CAAA,CAAA,CAAA,CAAI,MAAA,CAAO,CAAP;KAFlB;AAAA,EAAA;EAKD,IAAA,GAAO,SAAA,CAAA,MAAA,EAAA,OAAA,CAAA;IAAS;WACf,KAAA,CAAM,MAAN,EAAc,OAAd;;EAGD,2BAAsB,KAAA,CAAA,EAAA,SAAA,KAAtB,CAAA;AAAA,IAAA,KAAA,CAAM,YAAN;EAGF,KAAA;;IAAS,2BAAyB,YAAzB,aAAA,CAAA,KAAA,CAAA;MAAkB,MAAO;kBAAzB,IAAI,KAAJ,CAAU,GAAV"} diff --git a/node_modules/grunt-contrib-uglify/test/uglify_test.js b/node_modules/grunt-contrib-uglify/test/uglify_test.js deleted file mode 100644 index d7397b7..0000000 --- a/node_modules/grunt-contrib-uglify/test/uglify_test.js +++ /dev/null @@ -1,58 +0,0 @@ -'use strict'; - -var grunt = require('grunt'); - -var tmp = 'tmp/', - fixtures = 'test/fixtures/expected/'; - -exports.contrib_uglify = { - preuglified_files: function(test) { - - var files = [ - 'comments.js', - 'compress.js', - 'compress_mangle.js', - 'compress_mangle_banner.js', - 'compress_mangle_beautify.js', - 'compress_mangle_except.js', - 'compress_mangle_sourcemap', - 'enclose.js', - 'sourcemapurl.js', - 'multifile.js', - 'wrap.js', - 'exportAll.js', - 'sourcemap_prefix' - ]; - - test.expect(files.length); - - files.forEach(function(file){ - var actual = grunt.file.read(tmp + file); - var expected = grunt.file.read(fixtures + file); - test.equal(actual, expected, 'task output should equal ' + file); - }); - - test.done(); - }, - relative_test : function(test) { - - var files = [ - 'sourcemapin', - 'sourcemapin.js', - 'multiple_sourcemaps1.js', - 'multiple_sourcemaps1.map', - 'multiple_sourcemaps2.js', - 'multiple_sourcemaps2.map', - ]; - - test.expect(files.length); - - files.forEach(function(file){ - var actual = grunt.file.read(tmp + file).replace(tmp,'REPLACED'); - var expected = grunt.file.read(fixtures + file).replace(fixtures,'REPLACED'); - test.equal(actual, expected, 'task output should equal ' + file); - }); - - test.done(); - } -}; diff --git a/node_modules/uglify-save-license/package.json b/node_modules/uglify-save-license/package.json index 68b27f5..24a4fe5 100644 --- a/node_modules/uglify-save-license/package.json +++ b/node_modules/uglify-save-license/package.json @@ -8,13 +8,12 @@ }, "repository": { "type": "git", - "url": "https://github.com/shinnn/uglify-save-license.git" + "url": "git+https://github.com/shinnn/uglify-save-license.git" }, "author": { "name": "Shinnosuke Watanabe", "url": "https://github.com/shinnn" }, - "readmeFilename": "README.md", "licenses": [ { "type": "MIT", @@ -48,9 +47,25 @@ "grunt-replace": "^0.7.7", "semver": "^2.2.1" }, - "readme": "# uglify-save-license\n\n[![NPM version](https://badge.fury.io/js/uglify-save-license.svg)](http://badge.fury.io/js/uglify-save-license)\n[![Build Status](https://travis-ci.org/shinnn/uglify-save-license.svg)](https://travis-ci.org/shinnn/uglify-save-license)\n[![devDependency Status](https://david-dm.org/shinnn/uglify-save-license/dev-status.svg)](https://david-dm.org/shinnn/uglify-save-license#info=devDependencies)\n\nA support module for [UglifyJS](http://lisperator.net/uglifyjs/) to detect and preserve license comments\n\n```javascript\n// Backbone.js 1.1.2\n\n// (c) 2010-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors\n// Backbone may be freely distributed under the MIT license.\n// For all details and documentation:\n// http://backbonejs.org\n\n(function(root, factory) {\n\n // Set up Backbone appropriately for the environment. Start with AMD.\n if (typeof define === 'function' && define.amd) {\n define(['underscore', 'jquery', 'exports'], function(_, $, exports) {\n//...\n```\n\n↓\n\n```javascript\n// Backbone.js 1.1.2\n// (c) 2010-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors\n// Backbone may be freely distributed under the MIT license.\n// For all details and documentation:\n// http://backbonejs.org\n!function(a,b){if(\"function\"==typeof define&&define.amd)define([\"underscore\",\"jquery\",\"exports\"],function(c,d,e){a.Backbone=b(a,e,c,d)});else if(\"undefined\"!=typeof exports){...\n```\n\n## Overview\n\nThis module enables us to preserve license comments when using UglifyJS.\n\nEven if the license statement is in multiple line comments, or the comment has no directive such as `@license` and `/*!`, this module keeps them readable.\n\n## Installation\n\nInstall with [npm](https://npmjs.org/). (Make sure you have installed [Node](http://nodejs.org/download/).)\n\n```\nnpm install --save-dev uglify-save-license\n```\n\n## Usage\n\nFirst of all, load `uglify-save-license` module.\n\n```javascript\nvar saveLicense = require('uglify-save-license');\n```\n\n### Use with [UglifyJS](https://github.com/mishoo/UglifyJS2)\n\nPass this module to the [`comments` option](https://github.com/mishoo/UglifyJS2#keeping-comments-in-the-output).\n\n```javascript\nvar result = UglifyJS.minify('file1.js', {\n output: {\n comments: saveLicense\n }\n});\n```\n\n### Use with [grunt-contrib-uglify](https://github.com/gruntjs/grunt-contrib-uglify)\n\nPass this module to the [`preserveComments` option](https://github.com/gruntjs/grunt-contrib-uglify#preservecomments).\n\n```javascript\ngrunt.initConfig({\n uglify: {\n my_target: {\n options: {\n preserveComments: saveLicense\n }, \n src: ['src/app.js'],\n dest: 'dest/app.min.js' \n }\n }\n});\n```\n\n## How it works\n\n*uglify-save-license* checks each [comment token](http://lisperator.net/uglifyjs/ast#tokens) of a JavaScript file.\nThe comment will be regarded as a license statement and preserved after compression, if it meets at least one of the following requirements:\n\n1. The comment is in the *first* line of a file.\n2. [The regexp for license statement](./uglify-save-license.js#L7) matches the string of the comment. It matches, for example, `MIT` and `Copyright`.\n3. There is a comment at the *previous* line, and it matches 1. 2. or 3.\n\n## Examples\n\n### CLI tool example\n\n#### Main script (`uglify-example.js`)\n\n```javascript\n#!/usr/bin/env node\n\nvar UglifyJS = require('uglify-js'),\n saveLicense = require('uglify-save-license');\n\nvar minified = UglifyJS.minify(process.argv[2], {\n output: {\n comments: saveLicense\n }\n}).code;\n\nconsole.log(minified);\n```\n\n#### Target file\n\n```javascript\n// First line\n\n// (c) 2014 John <- contains '(c)'\n// The previous line is preserved\n\n// This line won't be preserved.\n(function(win, doc) {\n var str = 'Hello World! :' + doc.title;\n\n // This line will not, too.\n console.log(str);\n}(window, document));\n```\n\n#### Command\n\n```\nnode uglify-example.js \n```\n\n#### Output\n\n```javascript\n// First line\n// (c) 2014 John <- contains '(c)'\n// The previous line is preserved\n!function(o,l){var n=\"Hello World! :\"+l.title;console.log(n)}(window,document);\n```\n\n### [Gruntfile.coffee](http://gruntjs.com/getting-started#the-gruntfile) example\n\n```coffeescript\nmodule.exports = (grunt) ->\n\n grunt.loadNpmTasks 'grunt-contrib-uglify'\n grunt.loadNpmTasks 'grunt-contrib-concat'\n grunt.loadNpmTasks 'grunt-contrib-clean'\n \n grunt.initConfig\n uglify:\n target:\n options:\n preserveComments: require 'uglify-save-license'\n files: [\n expand: true\n flatten: true\n cwd: 'path/to/src'\n src: ['**/*.js']\n dest: 'tmp/'\n ]\n\n concat:\n js:\n src: ['tmp/*.js']\n dest: 'path/to/build/app.js'\n\n clean:\n tmpdir: ['tmp']\n\n grunt.registerTask 'default' ['uglify', 'concat', 'clean']\n```\n\n## Acknowledgements\n\n*uglify-save-license* is inspired by [grunt-license-saver](https://github.com/kyo-ago/grunt-license-saver) and I used it as reference.\nThanks, [kyo-ago](https://github.com/kyo-ago).\n\n## License\n\nCopyright (c) 2013 - 2014 [Shinnosuke Watanabe](https://github.com/shinnn)\n\nLicensed under [the MIT license](./LICENSE).\n", "_id": "uglify-save-license@0.4.1", "_shasum": "95726c17cc6fd171c3617e3bf4d8d82aa8c4cce1", - "_from": "uglify-save-license@", - "_resolved": "https://registry.npmjs.org/uglify-save-license/-/uglify-save-license-0.4.1.tgz" + "_from": "uglify-save-license@*", + "_npmVersion": "1.4.7", + "_npmUser": { + "name": "shinnn", + "email": "snnskwtnb@gmail.com" + }, + "maintainers": [ + { + "name": "shinnn", + "email": "snnskwtnb@gmail.com" + } + ], + "dist": { + "shasum": "95726c17cc6fd171c3617e3bf4d8d82aa8c4cce1", + "tarball": "http://registry.npmjs.org/uglify-save-license/-/uglify-save-license-0.4.1.tgz" + }, + "directories": {}, + "_resolved": "https://registry.npmjs.org/uglify-save-license/-/uglify-save-license-0.4.1.tgz", + "readme": "ERROR: No README data found!" } diff --git a/package.json b/package.json index fec00a1..07b7ed1 100755 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "canvas-text-wrapper", "description": "Pure JavaScript canvas text wrapper that automatically splits a string into lines on specified rule with alignment and padding.", - "version": "0.3.1", + "version": "0.3.2", "license": "MIT", "main": "CanvasTextWrapper.min.js", "homepage": "http://namniak.github.io/CanvasTextWrapper/", @@ -12,5 +12,9 @@ "author": "Vadim Namniak (https://github.com/namniak)", "bugs": { "url": "https://github.com/namniak/CanvasTextWrapper/issues" + }, + "devDependencies": { + "grunt-contrib-uglify": "^0.9.1", + "uglify-save-license": "^0.4.1" } } \ No newline at end of file