Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
188e28efd7 | ||
|
|
2df48924cc | ||
|
|
9fc6796d2a | ||
|
|
9fc8a52142 | ||
|
|
3a21861580 | ||
|
|
1dbffd48ea | ||
|
|
22a038e6a2 | ||
|
|
f652372c9a | ||
|
|
ad1fc3b71a |
@@ -287,6 +287,10 @@ can pass additional arguments that control the code output:
|
||||
you pass `false` then whenever possible we will use a newline instead of a
|
||||
semicolon, leading to more readable output of uglified code (size before
|
||||
gzip could be smaller; size after gzip insignificantly larger).
|
||||
- `negate-iife` (default `!beautify`) -- prefer negation, rather than
|
||||
parens, for "Immediately-Called Function Expressions". This defaults to
|
||||
`true` when beautification is off, and `false` if beautification is on;
|
||||
pass it manually to force a value.
|
||||
|
||||
### Keeping copyright notices or other comments
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ mangling you need to use `-c` and `-m`.\
|
||||
")
|
||||
.describe("source-map", "Specify an output file where to generate source map.")
|
||||
.describe("source-map-root", "The path to the original source to be included in the source map.")
|
||||
.describe("source-map-url", "The path to the source map to be added in //@ sourceMappingURL. Defaults to the value passed with --source-map.")
|
||||
.describe("source-map-url", "The path to the source map to be added in //# sourceMappingURL. Defaults to the value passed with --source-map.")
|
||||
.describe("in-source-map", "Input source map, useful if you're compressing JS that was generated from some other original code.")
|
||||
.describe("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).")
|
||||
.describe("expr", "Parse a single expression, rather than a program (for parsing JSON)")
|
||||
@@ -309,7 +309,7 @@ async.eachLimit(files, 1, function (file, cb) {
|
||||
|
||||
if (SOURCE_MAP) {
|
||||
fs.writeFileSync(ARGS.source_map, SOURCE_MAP, "utf8");
|
||||
output += "\n/*\n//@ sourceMappingURL=" + (ARGS.source_map_url || ARGS.source_map) + "\n*/";
|
||||
output += "\n//# sourceMappingURL=" + (ARGS.source_map_url || ARGS.source_map);
|
||||
}
|
||||
|
||||
if (OUTPUT_FILE) {
|
||||
|
||||
@@ -60,7 +60,8 @@ function OutputStream(options) {
|
||||
bracketize : false,
|
||||
semicolons : true,
|
||||
comments : false,
|
||||
preserve_line : false
|
||||
preserve_line : false,
|
||||
negate_iife : !(options && options.beautify),
|
||||
}, true);
|
||||
|
||||
var indentation = 0;
|
||||
@@ -352,7 +353,7 @@ function OutputStream(options) {
|
||||
var self = this, generator = self._codegen;
|
||||
stream.push_node(self);
|
||||
var needs_parens = self.needs_parens(stream);
|
||||
var fc = self instanceof AST_Function && !stream.option("beautify");
|
||||
var fc = self instanceof AST_Function && stream.option("negate_iife");
|
||||
if (force_parens || (needs_parens && !fc)) {
|
||||
stream.with_parens(function(){
|
||||
self.add_comments(stream);
|
||||
@@ -1122,7 +1123,7 @@ function OutputStream(options) {
|
||||
if (p instanceof AST_Statement && p.body === node)
|
||||
return true;
|
||||
if ((p instanceof AST_Seq && p.car === node ) ||
|
||||
(p instanceof AST_Call && p.expression === node ) ||
|
||||
(p instanceof AST_Call && p.expression === node && !(p instanceof AST_New) ) ||
|
||||
(p instanceof AST_Dot && p.expression === node ) ||
|
||||
(p instanceof AST_Sub && p.expression === node ) ||
|
||||
(p instanceof AST_Conditional && p.condition === node ) ||
|
||||
|
||||
@@ -187,6 +187,7 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(){
|
||||
} else {
|
||||
g = new SymbolDef(self, globals.size(), node);
|
||||
g.undeclared = true;
|
||||
g.global = true;
|
||||
globals.set(name, g);
|
||||
}
|
||||
node.thedef = g;
|
||||
|
||||
@@ -3,17 +3,17 @@
|
||||
"description": "JavaScript parser, mangler/compressor and beautifier toolkit",
|
||||
"homepage": "http://lisperator.net/uglifyjs",
|
||||
"main": "tools/node.js",
|
||||
"version": "2.3.4",
|
||||
"version": "2.3.6",
|
||||
"engines": { "node" : ">=0.4.0" },
|
||||
"maintainers": [{
|
||||
"name": "Mihai Bazon",
|
||||
"email": "mihai.bazon@gmail.com",
|
||||
"web": "http://lisperator.net/"
|
||||
}],
|
||||
"repositories": [{
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/mishoo/UglifyJS2.git"
|
||||
}],
|
||||
},
|
||||
"dependencies": {
|
||||
"async" : "~0.2.6",
|
||||
"source-map" : "~0.1.7",
|
||||
|
||||
Reference in New Issue
Block a user