aboutsummaryrefslogtreecommitdiff
path: root/node_modules/uglify-js/lib/minify.js
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-12-10 21:51:33 +0100
committerFlorian Dold <florian.dold@gmail.com>2017-12-10 21:51:33 +0100
commit0469abd4a9c9270a1fdc962969e36e63699af8b4 (patch)
treef9864d4a4148621378958794cbbfdc2393733283 /node_modules/uglify-js/lib/minify.js
parent6947e79bbc258f7bc96af424ddb71a511f0c15a3 (diff)
upgrade dependencies
Diffstat (limited to 'node_modules/uglify-js/lib/minify.js')
-rw-r--r--node_modules/uglify-js/lib/minify.js20
1 files changed, 14 insertions, 6 deletions
diff --git a/node_modules/uglify-js/lib/minify.js b/node_modules/uglify-js/lib/minify.js
index 773e953ae..806c3aeba 100644
--- a/node_modules/uglify-js/lib/minify.js
+++ b/node_modules/uglify-js/lib/minify.js
@@ -55,6 +55,7 @@ function minify(files, options) {
nameCache: null,
output: {},
parse: {},
+ rename: undefined,
sourceMap: false,
timings: false,
toplevel: false,
@@ -64,6 +65,9 @@ function minify(files, options) {
var timings = options.timings && {
start: Date.now()
};
+ if (options.rename === undefined) {
+ options.rename = options.compress && options.mangle;
+ }
set_shorthand("ie8", options, [ "compress", "mangle", "output" ]);
set_shorthand("keep_fnames", options, [ "compress", "mangle" ]);
set_shorthand("toplevel", options, [ "compress", "mangle" ]);
@@ -137,11 +141,14 @@ function minify(files, options) {
if (options.wrap) {
toplevel = toplevel.wrap_commonjs(options.wrap);
}
- if (timings) timings.scope1 = Date.now();
- if (options.compress) toplevel.figure_out_scope(options.mangle);
+ if (timings) timings.rename = Date.now();
+ if (options.rename) {
+ toplevel.figure_out_scope(options.mangle);
+ toplevel.expand_names(options.mangle);
+ }
if (timings) timings.compress = Date.now();
if (options.compress) toplevel = new Compressor(options.compress).compress(toplevel);
- if (timings) timings.scope2 = Date.now();
+ if (timings) timings.scope = Date.now();
if (options.mangle) toplevel.figure_out_scope(options.mangle);
if (timings) timings.mangle = Date.now();
if (options.mangle) {
@@ -199,9 +206,10 @@ function minify(files, options) {
if (timings) {
timings.end = Date.now();
result.timings = {
- parse: 1e-3 * (timings.scope1 - timings.parse),
- scope: 1e-3 * (timings.compress - timings.scope1 + timings.mangle - timings.scope2),
- compress: 1e-3 * (timings.scope2 - timings.compress),
+ parse: 1e-3 * (timings.rename - timings.parse),
+ rename: 1e-3 * (timings.compress - timings.rename),
+ compress: 1e-3 * (timings.scope - timings.compress),
+ scope: 1e-3 * (timings.mangle - timings.scope),
mangle: 1e-3 * (timings.properties - timings.mangle),
properties: 1e-3 * (timings.output - timings.properties),
output: 1e-3 * (timings.end - timings.output),