rollup 0.57.0 → 0.57.1

package/dist/rollup.js

@@ -1,6 +1,6 @@
 /*
-	Rollup.js v0.57.0
-	Thu, 15 Mar 2018 07:10:25 GMT - commit 010b0e2fc56a3df7e186c359ca1688724943f776
+	Rollup.js v0.57.1
+	Sat, 17 Mar 2018 08:30:04 GMT - commit 23256e40cfaddf96fef80edd2fa35f194ff05a62
 
 
 	https://github.com/rollup/rollup
@@ -356,7 +356,12 @@ function deprecateOptions(options, deprecateConfig) {
     }
 }
 
-function normalizeObjectOptionValue(optionValue) {
+var createGetOption = function (config, command) { return function (name, defaultValue) {
+    return command[name] !== undefined
+        ? command[name]
+        : config[name] !== undefined ? config[name] : defaultValue;
+}; };
+var normalizeObjectOptionValue = function (optionValue) {
     if (!optionValue) {
         return optionValue;
     }
@@ -364,7 +369,17 @@ function normalizeObjectOptionValue(optionValue) {
         return {};
     }
     return optionValue;
-}
+};
+var getObjectOption = function (config, command, name) {
+    var commandOption = normalizeObjectOptionValue(command[name]);
+    var configOption = normalizeObjectOptionValue(config[name]);
+    if (commandOption !== undefined) {
+        return commandOption && configOption
+            ? Object.assign({}, configOption, commandOption)
+            : commandOption;
+    }
+    return configOption;
+};
 var defaultOnWarn = function (warning) {
     if (typeof warning === 'string') {
         console.warn(warning); // eslint-disable-line no-console
@@ -373,148 +388,147 @@ var defaultOnWarn = function (warning) {
         console.warn(warning.message); // eslint-disable-line no-console
     }
 };
+var getOnWarn = function (config, command, defaultOnWarnHandler) {
+    if (defaultOnWarnHandler === void 0) { defaultOnWarnHandler = defaultOnWarn; }
+    return command.silent
+        ? function () { }
+        : config.onwarn
+            ? function (warning) { return config.onwarn(warning, defaultOnWarnHandler); }
+            : defaultOnWarnHandler;
+};
+var getExternal = function (config, command) {
+    var configExternal = config.external;
+    return typeof configExternal === 'function'
+        ? function (id) {
+            var rest = [];
+            for (var _i = 1; _i < arguments.length; _i++) {
+                rest[_i - 1] = arguments[_i];
+            }
+            return configExternal.apply(void 0, [id].concat(rest)) || command.external.indexOf(id) !== -1;
+        }
+        : (configExternal || []).concat(command.external);
+};
+var commandAliases = {
+    c: 'config',
+    d: 'indent',
+    e: 'external',
+    f: 'format',
+    g: 'globals',
+    h: 'help',
+    i: 'input',
+    l: 'legacy',
+    m: 'sourcemap',
+    n: 'name',
+    o: 'file',
+    v: 'version',
+    w: 'watch'
+};
 function mergeOptions(_a) {
-    var config = _a.config, _b = _a.command, command = _b === void 0 ? {} : _b, deprecateConfig = _a.deprecateConfig, _c = _a.defaultOnWarnHandler, defaultOnWarnHandler = _c === void 0 ? defaultOnWarn : _c;
-    var deprecations = deprecate(config, command, deprecateConfig);
-    var getOption = function (config) { return function (name) {
-        return command[name] !== undefined ? command[name] : config[name];
-    }; };
-    var getInputOption = getOption(config);
-    var getOutputOption = getOption(config.output || {});
-    function getObjectOption(name) {
-        var commandOption = normalizeObjectOptionValue(command[name]);
-        var configOption = normalizeObjectOptionValue(config[name]);
-        if (commandOption !== undefined) {
-            return commandOption && configOption
-                ? Object.assign({}, configOption, commandOption)
-                : commandOption;
-        }
-        return configOption;
-    }
-    var onwarn = config.onwarn;
-    var warn;
-    if (onwarn) {
-        warn = function (warning) { return onwarn(warning, defaultOnWarnHandler); };
-    }
-    else {
-        warn = defaultOnWarnHandler;
+    var _b = _a.config, config = _b === void 0 ? {} : _b, _c = _a.command, rawCommandOptions = _c === void 0 ? {} : _c, deprecateConfig = _a.deprecateConfig, defaultOnWarnHandler = _a.defaultOnWarnHandler;
+    var deprecations = deprecate(config, rawCommandOptions, deprecateConfig);
+    var command = getCommandOptions(rawCommandOptions);
+    var inputOptions = getInputOptions(config, command, defaultOnWarnHandler);
+    if (command.output) {
+        Object.assign(command, command.output);
+    }
+    var normalizedOutputOptions = ensureArray(config.output);
+    if (normalizedOutputOptions.length === 0)
+        normalizedOutputOptions.push({});
+    var outputOptions = normalizedOutputOptions.map(function (singleOutputOptions) {
+        return getOutputOptions(singleOutputOptions, command);
+    });
+    var unknownOptionErrors = [];
+    var validInputOptions = Object.keys(inputOptions);
+    addUnknownOptionErrors(unknownOptionErrors, Object.keys(config), validInputOptions, 'input option', /^output$/);
+    var validOutputOptions = Object.keys(outputOptions[0]);
+    addUnknownOptionErrors(unknownOptionErrors, outputOptions.reduce(function (allKeys, options) { return allKeys.concat(Object.keys(options)); }, []), validOutputOptions, 'output option');
+    addUnknownOptionErrors(unknownOptionErrors, Object.keys(command), validInputOptions.concat(validOutputOptions, Object.keys(commandAliases), 'config', 'environment', 'silent'), 'CLI flag', /^_|output|(config.*)$/);
+    return {
+        inputOptions: inputOptions,
+        outputOptions: outputOptions,
+        deprecations: deprecations,
+        optionError: unknownOptionErrors.length > 0 ? unknownOptionErrors.join('\n') : null
+    };
+}
+function addUnknownOptionErrors(errors, options, validOptions, optionType, ignoredKeys) {
+    if (ignoredKeys === void 0) { ignoredKeys = /$./; }
+    var unknownOptions = options.filter(function (key) { return validOptions.indexOf(key) === -1 && !ignoredKeys.test(key); });
+    if (unknownOptions.length > 0)
+        errors.push("Unknown " + optionType + ": " + unknownOptions.join(', ') + ". Allowed options: " + validOptions.sort().join(', '));
+}
+function getCommandOptions(rawCommandOptions) {
+    var command = Object.assign({}, rawCommandOptions);
+    command.external = (rawCommandOptions.external || '').split(',');
+    if (rawCommandOptions.globals) {
+        command.globals = Object.create(null);
+        rawCommandOptions.globals.split(',').forEach(function (str) {
+            var names = str.split(':');
+            command.globals[names[0]] = names[1];
+            // Add missing Module IDs to external.
+            if (command.external.indexOf(names[0]) === -1) {
+                command.external.push(names[0]);
+            }
+        });
     }
+    return command;
+}
+function getInputOptions(config, command, defaultOnWarnHandler) {
+    if (command === void 0) { command = {}; }
+    var getOption = createGetOption(config, command);
     var inputOptions = {
         acorn: config.acorn,
         acornInjectPlugins: config.acornInjectPlugins,
-        cache: getInputOption('cache'),
+        cache: getOption('cache'),
         context: config.context,
-        experimentalCodeSplitting: getInputOption('experimentalCodeSplitting'),
-        experimentalDynamicImport: getInputOption('experimentalDynamicImport'),
-        experimentalPreserveModules: getInputOption('experimentalPreserveModules'),
-        input: getInputOption('input'),
-        legacy: getInputOption('legacy'),
+        experimentalCodeSplitting: getOption('experimentalCodeSplitting'),
+        experimentalDynamicImport: getOption('experimentalDynamicImport'),
+        experimentalPreserveModules: getOption('experimentalPreserveModules'),
+        external: getExternal(config, command),
+        input: getOption('input'),
         moduleContext: config.moduleContext,
-        onwarn: warn,
-        perf: getInputOption('perf'),
+        onwarn: getOnWarn(config, command, defaultOnWarnHandler),
+        perf: getOption('perf', false),
         plugins: config.plugins,
-        preferConst: getInputOption('preferConst'),
-        preserveSymlinks: getInputOption('preserveSymlinks'),
-        treeshake: getObjectOption('treeshake'),
+        preferConst: getOption('preferConst'),
+        preserveSymlinks: getOption('preserveSymlinks'),
+        treeshake: getObjectOption(config, command, 'treeshake'),
         watch: config.watch
     };
-    // legacy, to ensure e.g. commonjs plugin still works
-    inputOptions.entry = inputOptions.input;
-    var commandExternal = (command.external || '').split(',');
-    var configExternal = config.external;
-    if (command.globals) {
-        var globals_1 = Object.create(null);
-        command.globals.split(',').forEach(function (str) {
-            var names = str.split(':');
-            globals_1[names[0]] = names[1];
-            // Add missing Module IDs to external.
-            if (commandExternal.indexOf(names[0]) === -1) {
-                commandExternal.push(names[0]);
-            }
-        });
-        command.globals = globals_1;
-    }
-    if (typeof configExternal === 'function') {
-        inputOptions.external = function (id) {
-            var rest = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                rest[_i - 1] = arguments[_i];
-            }
-            return configExternal.apply(void 0, [id].concat(rest)) || commandExternal.indexOf(id) !== -1;
-        };
-    }
-    else {
-        inputOptions.external = (configExternal || []).concat(commandExternal);
-    }
-    if (command.silent) {
-        inputOptions.onwarn = function () { };
-    }
-    // Make sure the CLI treats this the same way as when we are code-splitting
     if (inputOptions.experimentalPreserveModules && !Array.isArray(inputOptions.input)) {
         inputOptions.input = [inputOptions.input];
     }
-    var baseOutputOptions = {
-        amd: Object.assign({}, config.amd, command.amd),
-        banner: getOutputOption('banner'),
-        dir: getOutputOption('dir'),
-        exports: getOutputOption('exports'),
-        extend: getOutputOption('extend'),
-        file: getOutputOption('file'),
-        footer: getOutputOption('footer'),
-        format: getOutputOption('format'),
-        freeze: getOutputOption('freeze'),
-        globals: getOutputOption('globals'),
-        indent: getOutputOption('indent'),
-        interop: getOutputOption('interop'),
-        intro: getOutputOption('intro'),
-        legacy: getOutputOption('legacy'),
-        name: getOutputOption('name'),
-        namespaceToStringTag: getOutputOption('namespaceToStringTag'),
-        noConflict: getOutputOption('noConflict'),
-        outro: getOutputOption('outro'),
-        paths: getOutputOption('paths'),
-        sourcemap: getOutputOption('sourcemap'),
-        sourcemapFile: getOutputOption('sourcemapFile'),
-        strict: getOutputOption('strict')
-    };
-    var mergedOutputOptions;
-    if (Array.isArray(config.output)) {
-        mergedOutputOptions = config.output.map(function (output) {
-            return Object.assign({}, output, command.output);
-        });
-    }
-    else if (config.output && command.output) {
-        mergedOutputOptions = [Object.assign({}, config.output, command.output)];
-    }
-    else {
-        mergedOutputOptions =
-            command.output || config.output
-                ? ensureArray(command.output || config.output)
-                : [
-                    {
-                        file: command.output ? command.output.file : null,
-                        format: command.output ? command.output.format : null
-                    }
-                ];
-    }
-    var outputOptions = mergedOutputOptions.map(function (output) {
-        return Object.assign({}, baseOutputOptions, output);
-    });
-    // check for errors
-    var validKeys = Object.keys(inputOptions).concat(Object.keys(baseOutputOptions), [
-        'pureExternalModules' // (backward compatibility) till everyone moves to treeshake.pureExternalModules
-    ]);
-    var outputOptionKeys = Array.isArray(config.output)
-        ? config.output.reduce(function (keys, o) { return keys.concat(Object.keys(o)); }, [])
-        : Object.keys(config.output || {});
-    var errors = Object.keys(config || {}).concat(outputOptionKeys).filter(function (k) { return k !== 'output' && validKeys.indexOf(k) === -1; });
+    // legacy to make sure certain plugins still work
+    inputOptions.entry = Array.isArray(inputOptions.input)
+        ? inputOptions.input[0]
+        : inputOptions.input;
+    return inputOptions;
+}
+function getOutputOptions(config, command) {
+    if (command === void 0) { command = {}; }
+    var getOption = createGetOption(config, command);
     return {
-        inputOptions: inputOptions,
-        outputOptions: outputOptions,
-        deprecations: deprecations,
-        optionError: errors.length
-            ? "Unknown option found: " + errors.join(', ') + ". Allowed keys: " + validKeys.join(', ')
-            : null
+        amd: Object.assign({}, config.amd, command.amd),
+        banner: getOption('banner'),
+        dir: getOption('dir'),
+        exports: getOption('exports'),
+        extend: getOption('extend'),
+        file: getOption('file'),
+        footer: getOption('footer'),
+        format: getOption('format'),
+        freeze: getOption('freeze'),
+        globals: getOption('globals'),
+        indent: getOption('indent', true),
+        interop: getOption('interop', true),
+        intro: getOption('intro'),
+        legacy: getOption('legacy', false),
+        name: getOption('name'),
+        namespaceToStringTag: getOption('namespaceToStringTag'),
+        noConflict: getOption('noConflict'),
+        outro: getOption('outro'),
+        paths: getOption('paths'),
+        sourcemap: getOption('sourcemap'),
+        sourcemapFile: getOption('sourcemapFile'),
+        strict: getOption('strict', true)
     };
 }
 function deprecate(config, command, deprecateConfig) {
@@ -532,17 +546,10 @@ function deprecate(config, command, deprecateConfig) {
     if (typeof command.output === 'string') {
         deprecations.push({
             old: '--output',
-            new: '--output.file'
+            new: '--file'
         });
         command.output = { file: command.output };
     }
-    if (command.format) {
-        deprecations.push({
-            old: '--format',
-            new: '--output.format'
-        });
-        (command.output || (command.output = {})).format = command.format;
-    }
     // config file
     deprecations.push.apply(deprecations, deprecateOptions(config, deprecateConfig));
     return deprecations;
@@ -5985,48 +5992,56 @@ function first(candidates) {
     };
 }
 
-var integerToChar = {};
-
-'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='.split( '' ).forEach( function ( char, i ) {
-	integerToChar[ i ] = char;
-});
-
-function encode ( value ) {
-	var result;
-
-	if ( typeof value === 'number' ) {
-		result = encodeInteger( value );
-	} else {
-		result = '';
-		for ( var i = 0; i < value.length; i += 1 ) {
-			result += encodeInteger( value[i] );
-		}
-	}
-
-	return result;
+var chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+function encode(decoded) {
+    var sourceFileIndex = 0; // second field
+    var sourceCodeLine = 0; // third field
+    var sourceCodeColumn = 0; // fourth field
+    var nameIndex = 0; // fifth field
+    var mappings = '';
+    for (var i = 0; i < decoded.length; i++) {
+        var line = decoded[i];
+        if (i > 0)
+            mappings += ';';
+        if (line.length === 0)
+            continue;
+        var generatedCodeColumn = 0; // first field
+        var lineMappings = [];
+        for (var _i = 0, line_1 = line; _i < line_1.length; _i++) {
+            var segment = line_1[_i];
+            var segmentMappings = encodeInteger(segment[0] - generatedCodeColumn);
+            generatedCodeColumn = segment[0];
+            if (segment.length > 1) {
+                segmentMappings +=
+                    encodeInteger(segment[1] - sourceFileIndex) +
+                        encodeInteger(segment[2] - sourceCodeLine) +
+                        encodeInteger(segment[3] - sourceCodeColumn);
+                sourceFileIndex = segment[1];
+                sourceCodeLine = segment[2];
+                sourceCodeColumn = segment[3];
+            }
+            if (segment.length === 5) {
+                segmentMappings += encodeInteger(segment[4] - nameIndex);
+                nameIndex = segment[4];
+            }
+            lineMappings.push(segmentMappings);
+        }
+        mappings += lineMappings.join(',');
+    }
+    return mappings;
 }
-
-function encodeInteger ( num ) {
-	var result = '';
-
-	if ( num < 0 ) {
-		num = ( -num << 1 ) | 1;
-	} else {
-		num <<= 1;
-	}
-
-	do {
-		var clamped = num & 31;
-		num >>= 5;
-
-		if ( num > 0 ) {
-			clamped |= 32;
-		}
-
-		result += integerToChar[ clamped ];
-	} while ( num > 0 );
-
-	return result;
+function encodeInteger(num) {
+    var result = '';
+    num = num < 0 ? (-num << 1) | 1 : num << 1;
+    do {
+        var clamped = num & 31;
+        num >>= 5;
+        if (num > 0) {
+            clamped |= 32;
+        }
+        result += chars[clamped];
+    } while (num > 0);
+    return result;
 }
 
 function Chunk ( start, end, content ) {
@@ -6207,7 +6222,7 @@ function SourceMap ( properties ) {
 	this.sources        = properties.sources;
 	this.sourcesContent = properties.sourcesContent;
 	this.names          = properties.names;
-	this.mappings       = properties.mappings;
+	this.mappings       = encode(properties.mappings);
 }
 
 SourceMap.prototype = {
@@ -6273,51 +6288,33 @@ function isObject ( thing ) {
 
 function getLocator ( source ) {
 	var originalLines = source.split( '\n' );
+	var lineOffsets = [];
 
-	var start = 0;
-	var lineRanges = originalLines.map( function ( line, i ) {
-		var end = start + line.length + 1;
-		var range = { start: start, end: end, line: i };
-
-		start = end;
-		return range;
-	});
-
-	var i = 0;
-
-	function rangeContains ( range, index ) {
-		return range.start <= index && index < range.end;
-	}
-
-	function getLocation ( range, index ) {
-		return { line: range.line, column: index - range.start };
+	for ( var i = 0, pos = 0; i < originalLines.length; i++ ) {
+		lineOffsets.push( pos );
+		pos += originalLines[i].length + 1;
 	}
 
 	return function locate ( index ) {
-		var range = lineRanges[i];
-
-		var d = index >= range.end ? 1 : -1;
-
-		while ( range ) {
-			if ( rangeContains( range, index ) ) { return getLocation( range, index ); }
-
-			i += d;
-			range = lineRanges[i];
+		var i = 0;
+		var j = lineOffsets.length;
+		while ( i < j ) {
+			var m = ( i + j ) >> 1;
+			if ( index < lineOffsets[m] ) {
+				j = m;
+			} else {
+				i = m + 1;
+			}
 		}
+		var line = i - 1;
+		var column = index - lineOffsets[line];
+		return { line: line, column: column };
 	};
 }
 
 function Mappings ( hires ) {
 	var this$1 = this;
 
-	var offsets = {
-		generatedCodeColumn: 0,
-		sourceIndex: 0,
-		sourceCodeLine: 0,
-		sourceCodeColumn: 0,
-		sourceCodeName: 0
-	};
-
 	var generatedCodeLine = 0;
 	var generatedCodeColumn = 0;
 
@@ -6326,14 +6323,18 @@ function Mappings ( hires ) {
 
 	var pending = null;
 
-	this.addEdit = function ( sourceIndex, content, original, loc, nameIndex ) {
+	this.addEdit = function ( sourceIndex, content, loc, nameIndex ) {
 		if ( content.length ) {
-			rawSegments.push([
+			var segment = [
 				generatedCodeColumn,
 				sourceIndex,
 				loc.line,
-				loc.column,
-				nameIndex ]);
+				loc.column
+			];
+			if ( nameIndex >= 0 ) {
+				segment.push( nameIndex );
+			}
+			rawSegments.push( segment );
 		} else if ( pending ) {
 			rawSegments.push( pending );
 		}
@@ -6352,8 +6353,7 @@ function Mappings ( hires ) {
 					generatedCodeColumn,
 					sourceIndex,
 					loc.line,
-					loc.column,
-					-1
+					loc.column
 				]);
 			}
 
@@ -6376,50 +6376,24 @@ function Mappings ( hires ) {
 			generatedCodeColumn,
 			sourceIndex,
 			loc.line,
-			loc.column,
-			-1 ];
+			loc.column
+		];
 	};
 
 	this.advance = function (str) {
 		if ( !str ) { return; }
 
 		var lines = str.split( '\n' );
-		var lastLine = lines.pop();
 
-		if ( lines.length ) {
-			generatedCodeLine += lines.length;
-			this$1.raw[ generatedCodeLine ] = rawSegments = [];
-			generatedCodeColumn = lastLine.length;
-		} else {
-			generatedCodeColumn += lastLine.length;
+		if ( lines.length > 1 ) {
+			for ( var i = 0; i < lines.length - 1; i++ ) {
+				generatedCodeLine++;
+				this$1.raw[generatedCodeLine] = rawSegments = [];
+			}
+			generatedCodeColumn = 0;
 		}
-	};
 
-	this.encode = function () {
-		return this$1.raw.map( function (segments) {
-			var generatedCodeColumn = 0;
-
-			return segments.map( function (segment) {
-				var arr = [
-					segment[0] - generatedCodeColumn,
-					segment[1] - offsets.sourceIndex,
-					segment[2] - offsets.sourceCodeLine,
-					segment[3] - offsets.sourceCodeColumn
-				];
-
-				generatedCodeColumn = segment[0];
-				offsets.sourceIndex = segment[1];
-				offsets.sourceCodeLine = segment[2];
-				offsets.sourceCodeColumn = segment[3];
-
-				if ( ~segment[4] ) {
-					arr.push( segment[4] - offsets.sourceCodeName );
-					offsets.sourceCodeName = segment[4];
-				}
-
-				return encode( arr );
-			}).join( ',' );
-		}).join( ';' );
+		generatedCodeColumn += lines[lines.length - 1].length;
 	};
 }
 
@@ -6534,7 +6508,7 @@ MagicString$1.prototype = {
 		return cloned;
 	},
 
-	generateMap: function generateMap ( options ) {
+	generateDecodedMap: function generateDecodedMap ( options ) {
 		var this$1 = this;
 
 		options = options || {};
@@ -6555,7 +6529,7 @@ MagicString$1.prototype = {
 			if ( chunk.intro.length ) { mappings.advance( chunk.intro ); }
 
 			if ( chunk.edited ) {
-				mappings.addEdit( sourceIndex, chunk.content, chunk.original, loc, chunk.storeName ? names.indexOf( chunk.original ) : -1 );
+				mappings.addEdit( sourceIndex, chunk.content, loc, chunk.storeName ? names.indexOf( chunk.original ) : -1 );
 			} else {
 				mappings.addUneditedChunk( sourceIndex, chunk, this$1.original, loc, this$1.sourcemapLocations );
 			}
@@ -6563,14 +6537,17 @@ MagicString$1.prototype = {
 			if ( chunk.outro.length ) { mappings.advance( chunk.outro ); }
 		});
 
-		var map = new SourceMap({
+		return {
 			file: ( options.file ? options.file.split( /[\/\\]/ ).pop() : null ),
 			sources: [ options.source ? getRelativePath( options.file || '', options.source ) : null ],
 			sourcesContent: options.includeContent ? [ this.original ] : [ null ],
 			names: names,
-			mappings: mappings.encode()
-		});
-		return map;
+			mappings: mappings.raw
+		};
+	},
+
+	generateMap: function generateMap ( options ) {
+		return new SourceMap(this.generateDecodedMap( options ));
 	},
 
 	getIndentString: function getIndentString () {
@@ -7110,7 +7087,7 @@ Bundle.prototype = {
 		return bundle;
 	},
 
-	generateMap: function generateMap ( options ) {
+	generateDecodedMap: function generateDecodedMap ( options ) {
 		var this$1 = this;
 		if ( options === void 0 ) options = {};
 
@@ -7147,7 +7124,7 @@ Bundle.prototype = {
 
 				if ( source.filename ) {
 					if ( chunk.edited ) {
-						mappings.addEdit( sourceIndex, chunk.content, chunk.original, loc, chunk.storeName ? names.indexOf( chunk.original ) : -1 );
+						mappings.addEdit( sourceIndex, chunk.content, loc, chunk.storeName ? names.indexOf( chunk.original ) : -1 );
 					} else {
 						mappings.addUneditedChunk( sourceIndex, chunk, magicString.original, loc, magicString.sourcemapLocations );
 					}
@@ -7165,7 +7142,7 @@ Bundle.prototype = {
 			}
 		});
 
-		return new SourceMap({
+		return {
 			file: ( options.file ? options.file.split( /[\/\\]/ ).pop() : null ),
 			sources: this.uniqueSources.map( function (source) {
 				return options.file ? getRelativePath( options.file, source.filename ) : source.filename;
@@ -7174,8 +7151,12 @@ Bundle.prototype = {
 				return options.includeContent ? source.content : null;
 			}),
 			names: names,
-			mappings: mappings.encode()
-		});
+			mappings: mappings.raw
+		};
+	},
+
+	generateMap: function generateMap ( options ) {
+		return new SourceMap(this.generateDecodedMap( options ));
 	},
 
 	getIndentString: function getIndentString () {
@@ -14807,7 +14788,11 @@ var ExportDefaultDeclaration = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     ExportDefaultDeclaration.prototype.bindNode = function () {
-        if (this.declarationName) {
+        if (this.declarationName &&
+            // Do not set it for Class and FunctionExpressions otherwise they get treeshaken away
+            (isFunctionDeclaration(this.declaration) ||
+                isClassDeclaration(this.declaration) ||
+                isIdentifier(this.declaration))) {
             this.variable.setOriginalVariable(this.scope.findVariable(this.declarationName));
         }
     };
@@ -16543,15 +16528,14 @@ var Module = /** @class */ (function () {
         timeEnd('analyse ast', 3);
     };
     Module.prototype.removeExistingSourceMap = function () {
-        var _this = this;
-        this.comments.forEach(function (comment) {
+        for (var _i = 0, _a = this.comments; _i < _a.length; _i++) {
+            var comment = _a[_i];
             if (!comment.block && SOURCEMAPPING_URL_RE.test(comment.text)) {
-                _this.magicString.remove(comment.start, comment.end);
+                this.magicString.remove(comment.start, comment.end);
             }
-        });
+        }
     };
     Module.prototype.addExport = function (node) {
-        var _this = this;
         var source = node.source && node.source.value;
         // export { name } from './other'
         if (source) {
@@ -16563,21 +16547,22 @@ var Module = /** @class */ (function () {
                 this.exportAllSources.push(source);
             }
             else {
-                node.specifiers.forEach(function (specifier) {
+                for (var _i = 0, _a = node.specifiers; _i < _a.length; _i++) {
+                    var specifier = _a[_i];
                     var name = specifier.exported.name;
-                    if (_this.exports[name] || _this.reexports[name]) {
-                        _this.error({
+                    if (this.exports[name] || this.reexports[name]) {
+                        this.error({
                             code: 'DUPLICATE_EXPORT',
                             message: "A module cannot have multiple exports with the same name ('" + name + "')"
                         }, specifier.start);
                     }
-                    _this.reexports[name] = {
+                    this.reexports[name] = {
                         start: specifier.start,
                         source: source,
                         localName: specifier.local.name,
                         module: null // filled in later
                     };
-                });
+                }
             }
         }
         else if (node.type === NodeType.ExportDefaultDeclaration) {
@@ -16605,11 +16590,13 @@ var Module = /** @class */ (function () {
             // export function foo () {}
             var declaration = node.declaration;
             if (declaration.type === NodeType.VariableDeclaration) {
-                declaration.declarations.forEach(function (decl) {
-                    extractNames(decl.id).forEach(function (localName) {
-                        _this.exports[localName] = { localName: localName };
-                    });
-                });
+                for (var _b = 0, _c = declaration.declarations; _b < _c.length; _b++) {
+                    var decl = _c[_b];
+                    for (var _d = 0, _e = extractNames(decl.id); _d < _e.length; _d++) {
+                        var localName = _e[_d];
+                        this.exports[localName] = { localName: localName };
+                    }
+                }
             }
             else {
                 // export function foo () {}
@@ -16619,28 +16606,29 @@ var Module = /** @class */ (function () {
         }
         else {
             // export { foo, bar, baz }
-            node.specifiers.forEach(function (specifier) {
+            for (var _f = 0, _g = node.specifiers; _f < _g.length; _f++) {
+                var specifier = _g[_f];
                 var localName = specifier.local.name;
                 var exportedName = specifier.exported.name;
-                if (_this.exports[exportedName] || _this.reexports[exportedName]) {
-                    _this.error({
+                if (this.exports[exportedName] || this.reexports[exportedName]) {
+                    this.error({
                         code: 'DUPLICATE_EXPORT',
                         message: "A module cannot have multiple exports with the same name ('" + exportedName + "')"
                     }, specifier.start);
                 }
-                _this.exports[exportedName] = { localName: localName };
-            });
+                this.exports[exportedName] = { localName: localName };
+            }
         }
     };
     Module.prototype.addImport = function (node) {
-        var _this = this;
         var source = node.source.value;
         if (this.sources.indexOf(source) === -1)
             this.sources.push(source);
-        node.specifiers.forEach(function (specifier) {
+        for (var _i = 0, _a = node.specifiers; _i < _a.length; _i++) {
+            var specifier = _a[_i];
             var localName = specifier.local.name;
-            if (_this.imports[localName]) {
-                _this.error({
+            if (this.imports[localName]) {
+                this.error({
                     code: 'DUPLICATE_IMPORT',
                     message: "Duplicated import '" + localName + "'"
                 }, specifier.start);
@@ -16650,21 +16638,21 @@ var Module = /** @class */ (function () {
             var name = isDefault
                 ? 'default'
                 : isNamespace ? '*' : specifier.imported.name;
-            _this.imports[localName] = { source: source, specifier: specifier, name: name, module: null };
-        });
+            this.imports[localName] = { source: source, specifier: specifier, name: name, module: null };
+        }
     };
     Module.prototype.analyse = function () {
-        var _this = this;
         enhance(this.ast, this, this.dynamicImports);
-        this.ast.body.forEach(function (node) {
+        for (var _i = 0, _a = this.ast.body; _i < _a.length; _i++) {
+            var node = _a[_i];
             if (node.isImportDeclaration) {
-                _this.addImport(node);
+                this.addImport(node);
             }
             else if (node
                 .isExportDeclaration) {
-                _this.addExport(node);
+                this.addExport(node);
             }
-        });
+        }
     };
     Module.prototype.basename = function () {
         var base = path.basename(this.id);
@@ -16672,17 +16660,18 @@ var Module = /** @class */ (function () {
         return makeLegal(ext ? base.slice(0, -ext.length) : base);
     };
     Module.prototype.markExports = function () {
-        var _this = this;
-        this.getExports().forEach(function (name) {
-            var variable = _this.traceExport(name);
-            variable.exportName = name;
+        for (var _i = 0, _a = this.getExports(); _i < _a.length; _i++) {
+            var exportName = _a[_i];
+            var variable = this.traceExport(exportName);
+            variable.exportName = exportName;
             variable.includeVariable();
             if (variable.isNamespace) {
                 variable.needsNamespaceBlock = true;
             }
-        });
-        this.getReexports().forEach(function (name) {
-            var variable = _this.traceExport(name);
+        }
+        for (var _b = 0, _c = this.getReexports(); _b < _c.length; _b++) {
+            var name = _c[_b];
+            var variable = this.traceExport(name);
             variable.exportName = name;
             if (variable.isExternal) {
                 variable.reexported = variable.module.reexported = true;
@@ -16690,31 +16679,38 @@ var Module = /** @class */ (function () {
             else {
                 variable.includeVariable();
             }
-        });
+        }
     };
     Module.prototype.linkDependencies = function () {
         var _this = this;
-        this.sources.forEach(function (source) {
-            var id = _this.resolvedIds[source];
+        for (var _i = 0, _a = this.sources; _i < _a.length; _i++) {
+            var source = _a[_i];
+            var id = this.resolvedIds[source];
             if (id) {
-                var module = _this.graph.moduleById.get(id);
-                _this.dependencies.push(module);
+                var module = this.graph.moduleById.get(id);
+                this.dependencies.push(module);
             }
-        });
-        [this.imports, this.reexports].forEach(function (specifiers) {
-            Object.keys(specifiers).forEach(function (name) {
+        }
+        var resolveSpecifiers = function (specifiers) {
+            for (var _i = 0, _a = Object.keys(specifiers); _i < _a.length; _i++) {
+                var name = _a[_i];
                 var specifier = specifiers[name];
                 var id = _this.resolvedIds[specifier.source];
                 specifier.module = _this.graph.moduleById.get(id);
-            });
-        });
+            }
+        };
+        resolveSpecifiers(this.imports);
+        resolveSpecifiers(this.reexports);
         this.exportAllModules = this.exportAllSources.map(function (source) {
             var id = _this.resolvedIds[source];
             return _this.graph.moduleById.get(id);
         });
     };
     Module.prototype.bindReferences = function () {
-        this.ast.body.forEach(function (node) { return node.bind(); });
+        for (var _i = 0, _a = this.ast.body; _i < _a.length; _i++) {
+            var node = _a[_i];
+            node.bind();
+        }
     };
     Module.prototype.getDynamicImportExpressions = function () {
         return this.dynamicImports.map(function (node) {
@@ -16798,10 +16794,11 @@ var Module = /** @class */ (function () {
                 allExports["*" + module.id] = true;
                 return;
             }
-            module.getAllExports().forEach(function (name) {
+            for (var _i = 0, _a = module.getAllExports(); _i < _a.length; _i++) {
+                var name = _a[_i];
                 if (name !== 'default')
                     allExports[name] = true;
-            });
+            }
         });
         return Object.keys(allExports);
     };
@@ -16810,36 +16807,38 @@ var Module = /** @class */ (function () {
     };
     Module.prototype.getReexports = function () {
         var reexports = blank();
-        Object.keys(this.reexports).forEach(function (name) {
+        for (var name in this.reexports) {
             reexports[name] = true;
-        });
+        }
         this.exportAllModules.forEach(function (module) {
             if (module.isExternal) {
                 reexports["*" + module.id] = true;
                 return;
             }
-            module
-                .getExports()
-                .concat(module.getReexports())
-                .forEach(function (name) {
+            for (var _i = 0, _a = module.getExports().concat(module.getReexports()); _i < _a.length; _i++) {
+                var name = _a[_i];
                 if (name !== 'default')
                     reexports[name] = true;
-            });
+            }
         });
         return Object.keys(reexports);
     };
     Module.prototype.includeAllInBundle = function () {
-        this.ast.body.forEach(includeFully);
+        for (var _i = 0, _a = this.ast.body; _i < _a.length; _i++) {
+            var node = _a[_i];
+            includeFully(node);
+        }
     };
     Module.prototype.includeInBundle = function () {
         var addedNewNodes = false;
-        this.ast.body.forEach(function (node) {
+        for (var _i = 0, _a = this.ast.body; _i < _a.length; _i++) {
+            var node = _a[_i];
             if (node.shouldBeIncluded()) {
                 if (node.includeInBundle()) {
                     addedNewNodes = true;
                 }
             }
-        });
+        }
         return addedNewNodes;
     };
     Module.prototype.namespace = function () {
@@ -17047,12 +17046,12 @@ function handleMissingExport(exportName, importingModule, importedModule, import
     }, importerStart);
 }
 
-var charToInteger$1 = {};
-var chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
-for (var i = 0; i < chars.length; i++) {
-    charToInteger$1[chars.charCodeAt(i)] = i;
+var charToInteger = {};
+var chars$1 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+for (var i = 0; i < chars$1.length; i++) {
+    charToInteger[chars$1.charCodeAt(i)] = i;
 }
-function decode$1(mappings) {
+function decode(mappings) {
     var generatedCodeColumn = 0; // first field
     var sourceFileIndex = 0; // second field
     var sourceCodeLine = 0; // third field
@@ -17079,7 +17078,7 @@ function decode$1(mappings) {
             generatedCodeColumn = 0;
         }
         else {
-            var integer = charToInteger$1[c];
+            var integer = charToInteger[c];
             if (integer === undefined) {
                 throw new Error('Invalid character (' + String.fromCharCode(c) + ')');
             }
@@ -17123,62 +17122,12 @@ function decode$1(mappings) {
     decoded.push(line);
     return decoded;
 }
-function encode$1(decoded) {
-    var sourceFileIndex = 0; // second field
-    var sourceCodeLine = 0; // third field
-    var sourceCodeColumn = 0; // fourth field
-    var nameIndex = 0; // fifth field
-    var mappings = '';
-    for (var i = 0; i < decoded.length; i++) {
-        var line = decoded[i];
-        if (i > 0)
-            mappings += ';';
-        if (line.length === 0)
-            continue;
-        var generatedCodeColumn = 0; // first field
-        var lineMappings = [];
-        for (var _i = 0, line_1 = line; _i < line_1.length; _i++) {
-            var segment = line_1[_i];
-            var segmentMappings = encodeInteger$1(segment[0] - generatedCodeColumn);
-            generatedCodeColumn = segment[0];
-            if (segment.length > 1) {
-                segmentMappings +=
-                    encodeInteger$1(segment[1] - sourceFileIndex) +
-                        encodeInteger$1(segment[2] - sourceCodeLine) +
-                        encodeInteger$1(segment[3] - sourceCodeColumn);
-                sourceFileIndex = segment[1];
-                sourceCodeLine = segment[2];
-                sourceCodeColumn = segment[3];
-            }
-            if (segment.length === 5) {
-                segmentMappings += encodeInteger$1(segment[4] - nameIndex);
-                nameIndex = segment[4];
-            }
-            lineMappings.push(segmentMappings);
-        }
-        mappings += lineMappings.join(',');
-    }
-    return mappings;
-}
-function encodeInteger$1(num) {
-    var result = '';
-    num = num < 0 ? (-num << 1) | 1 : num << 1;
-    do {
-        var clamped = num & 31;
-        num >>= 5;
-        if (num > 0) {
-            clamped |= 32;
-        }
-        result += chars[clamped];
-    } while (num > 0);
-    return result;
-}
 
 function transform(graph, source, id, plugins) {
     var sourcemapChain = [];
     var originalSourcemap = typeof source.map === 'string' ? JSON.parse(source.map) : source.map;
     if (originalSourcemap && typeof originalSourcemap.mappings === 'string') {
-        originalSourcemap.mappings = decode$1(originalSourcemap.mappings);
+        originalSourcemap.mappings = decode(originalSourcemap.mappings);
     }
     var originalCode = source.code;
     var ast = source.ast;
@@ -17250,7 +17199,7 @@ function transform(graph, source, id, plugins) {
                     result.map = JSON.parse(result.map);
                 }
                 if (result.map && typeof result.map.mappings === 'string') {
-                    result.map.mappings = decode$1(result.map.mappings);
+                    result.map.mappings = decode(result.map.mappings);
                 }
                 // strict null check allows 'null' maps to not be pushed to the chain, while 'undefined' gets the missing map warning
                 if (result.map !== null) {
@@ -18012,9 +17961,7 @@ function transformBundle(code, plugins, sourcemapChain, options) {
             return promise;
         return promise.then(function (code) {
             return Promise.resolve()
-                .then(function () {
-                return plugin.transformBundle(code, options);
-            })
+                .then(function () { return plugin.transformBundle(code, options); })
                 .then(function (result) {
                 if (result == null)
                     return code;
@@ -18026,7 +17973,7 @@ function transformBundle(code, plugins, sourcemapChain, options) {
                 }
                 var map = typeof result.map === 'string' ? JSON.parse(result.map) : result.map;
                 if (map && typeof map.mappings === 'string') {
-                    map.mappings = decode$1(map.mappings);
+                    map.mappings = decode(map.mappings);
                 }
                 // strict null check allows 'null' maps to not be pushed to the chain, while 'undefined' gets the missing map warning
                 if (map !== null) {
@@ -18063,23 +18010,22 @@ var Link = /** @class */ (function () {
         this.mappings = map.mappings;
     }
     Link.prototype.traceMappings = function () {
-        var _this = this;
         var sources = [];
         var sourcesContent = [];
         var names = [];
-        var mappings = this.mappings.map(function (line) {
+        var mappings = [];
+        for (var _i = 0, _a = this.mappings; _i < _a.length; _i++) {
+            var line = _a[_i];
             var tracedLine = [];
-            line.forEach(function (segment) {
-                var source = _this.sources[segment[1]];
+            for (var _b = 0, line_1 = line; _b < line_1.length; _b++) {
+                var segment = line_1[_b];
+                var source = this.sources[segment[1]];
                 if (!source)
-                    return;
-                var traced = source.traceSegment(segment[2], segment[3], _this.names[segment[4]]);
+                    continue;
+                var traced = source.traceSegment(segment[2], segment[3], this.names[segment[4]]);
                 if (traced) {
-                    var sourceIndex = null;
-                    var nameIndex = null;
-                    segment = [segment[0], null, traced.line, traced.column];
                     // newer sources are more likely to be used, so search backwards.
-                    sourceIndex = sources.lastIndexOf(traced.source.filename);
+                    var sourceIndex = sources.lastIndexOf(traced.source.filename);
                     if (sourceIndex === -1) {
                         sourceIndex = sources.length;
                         sources.push(traced.source.filename);
@@ -18094,28 +18040,33 @@ var Link = /** @class */ (function () {
                             message: "Multiple conflicting contents for sourcemap source " + source.filename
                         });
                     }
-                    segment[1] = sourceIndex;
+                    var tracedSegment = [
+                        segment[0],
+                        sourceIndex,
+                        traced.line,
+                        traced.column
+                    ];
                     if (traced.name) {
-                        nameIndex = names.indexOf(traced.name);
+                        var nameIndex = names.indexOf(traced.name);
                         if (nameIndex === -1) {
                             nameIndex = names.length;
                             names.push(traced.name);
                         }
-                        segment[4] = nameIndex;
+                        tracedSegment[4] = nameIndex;
                     }
-                    tracedLine.push(segment);
+                    tracedLine.push(tracedSegment);
                 }
-            });
-            return tracedLine;
-        });
+            }
+            mappings.push(tracedLine);
+        }
         return { sources: sources, sourcesContent: sourcesContent, names: names, mappings: mappings };
     };
     Link.prototype.traceSegment = function (line, column, name) {
         var segments = this.mappings[line];
         if (!segments)
             return null;
-        for (var i = 0; i < segments.length; i += 1) {
-            var segment = segments[i];
+        for (var _i = 0, segments_1 = segments; _i < segments_1.length; _i++) {
+            var segment = segments_1[_i];
             if (segment[0] > column)
                 return null;
             if (segment[0] === column) {
@@ -18179,14 +18130,9 @@ function collapseSourcemaps(bundle, file, map, modules, bundleSourcemapChain) {
     if (file) {
         var directory_2 = path.dirname(file);
         sources = sources.map(function (source) { return path.relative(directory_2, source); });
-        map.file = path.basename(file);
+        file = path.basename(file);
     }
-    // we re-use the `map` object because it has convenient toString/toURL methods
-    map.sources = sources;
-    map.sourcesContent = sourcesContent;
-    map.names = names;
-    map.mappings = encode$1(mappings);
-    return map;
+    return new SourceMap({ file: file, sources: sources, sourcesContent: sourcesContent, names: names, mappings: mappings });
 }
 
 function callIfFunction(thing) {
@@ -18737,7 +18683,7 @@ var Chunk$1 = /** @class */ (function () {
             timeStart('render modules', 3);
             var indentString = getIndentString(_this.orderedModules, options);
             var renderOptions = {
-                legacy: _this.graph.legacy,
+                legacy: options.legacy,
                 freeze: options.freeze !== false,
                 namespaceToStringTag: options.namespaceToStringTag === true,
                 indent: indentString,
@@ -18798,9 +18744,9 @@ var Chunk$1 = /** @class */ (function () {
             if (footer)
                 magicString.append('\n' + footer);
             var prevCode = magicString.toString();
-            var map = null;
             var bundleSourcemapChain = [];
             return transformBundle(prevCode, _this.graph.plugins, bundleSourcemapChain, options).then(function (code) {
+                var map;
                 if (options.sourcemap) {
                     timeStart('sourcemap', 3);
                     var file = options.file ? options.sourcemapFile || options.file : _this.id;
@@ -18810,11 +18756,8 @@ var Chunk$1 = /** @class */ (function () {
                         _this.graph.plugins.find(function (plugin) {
                             return Boolean(plugin.transform || plugin.transformBundle);
                         })) {
-                        map = magicString.generateMap({});
-                        if (typeof map.mappings === 'string') {
-                            map.mappings = decode$1(map.mappings);
-                        }
-                        map = collapseSourcemaps(_this, file, map, usedModules, bundleSourcemapChain);
+                        var decodedMap = magicString.generateDecodedMap({});
+                        map = collapseSourcemaps(_this, file, decodedMap, usedModules, bundleSourcemapChain);
                     }
                     else {
                         map = magicString.generateMap({ file: file, includeContent: true });
@@ -18953,16 +18896,18 @@ var Graph = /** @class */ (function () {
         this.cachedModules = new Map();
         if (options.cache) {
             if (options.cache.modules) {
-                options.cache.modules.forEach(function (module) {
-                    _this.cachedModules.set(module.id, module);
-                });
+                for (var _i = 0, _a = options.cache.modules; _i < _a.length; _i++) {
+                    var module = _a[_i];
+                    this.cachedModules.set(module.id, module);
+                }
             }
             else {
                 var chunks = options.cache.chunks;
                 for (var chunkName in chunks) {
-                    chunks[chunkName].modules.forEach(function (module) {
-                        _this.cachedModules.set(module.id, module);
-                    });
+                    for (var _b = 0, _c = chunks[chunkName].modules; _b < _c.length; _b++) {
+                        var module = _c[_b];
+                        this.cachedModules.set(module.id, module);
+                    }
                 }
             }
         }
@@ -19019,9 +18964,10 @@ var Graph = /** @class */ (function () {
             .concat(handleMissingExport));
         this.scope = new GlobalScope();
         // TODO strictly speaking, this only applies with non-ES6, non-default-only bundles
-        ['module', 'exports', '_interopDefault'].forEach(function (name) {
-            _this.scope.findVariable(name); // creates global variable as side-effect
-        });
+        for (var _d = 0, _e = ['module', 'exports', '_interopDefault']; _d < _e.length; _d++) {
+            var name = _e[_d];
+            this.scope.findVariable(name); // creates global variable as side-effect
+        }
         this.moduleById = new Map();
         this.modules = [];
         this.externalModules = [];
@@ -19032,9 +18978,9 @@ var Graph = /** @class */ (function () {
         }
         else if (typeof optionsModuleContext === 'object') {
             var moduleContext_1 = new Map();
-            Object.keys(optionsModuleContext).forEach(function (key) {
-                return moduleContext_1.set(path.resolve(key), optionsModuleContext[key]);
-            });
+            for (var key in optionsModuleContext) {
+                moduleContext_1.set(path.resolve(key), optionsModuleContext[key]);
+            }
             this.getModuleContext = function (id) { return moduleContext_1.get(id) || _this.context; };
         }
         else {
@@ -19049,7 +18995,6 @@ var Graph = /** @class */ (function () {
         }
         this.onwarn = options.onwarn || makeOnwarn();
         this.varOrConst = options.preferConst ? 'const' : 'var';
-        this.legacy = options.legacy;
         this.acornOptions = options.acorn || {};
         var acornPluginsToInject = [];
         this.dynamicImport =
@@ -19095,26 +19040,36 @@ var Graph = /** @class */ (function () {
         });
     };
     Graph.prototype.link = function () {
-        this.modules.forEach(function (module) { return module.linkDependencies(); });
-        this.modules.forEach(function (module) { return module.bindReferences(); });
+        for (var _i = 0, _a = this.modules; _i < _a.length; _i++) {
+            var module = _a[_i];
+            module.linkDependencies();
+        }
+        for (var _b = 0, _c = this.modules; _b < _c.length; _b++) {
+            var module = _c[_b];
+            module.bindReferences();
+        }
     };
     Graph.prototype.includeMarked = function (modules) {
         if (this.treeshake) {
-            var addedNewNodes_1, treeshakingPass = 1;
+            var addedNewNodes = void 0, treeshakingPass = 1;
             do {
                 timeStart("treeshaking pass " + treeshakingPass, 3);
-                addedNewNodes_1 = false;
-                modules.forEach(function (module) {
+                addedNewNodes = false;
+                for (var _i = 0, modules_1 = modules; _i < modules_1.length; _i++) {
+                    var module = modules_1[_i];
                     if (module.includeInBundle()) {
-                        addedNewNodes_1 = true;
+                        addedNewNodes = true;
                     }
-                });
+                }
                 timeEnd("treeshaking pass " + treeshakingPass++, 3);
-            } while (addedNewNodes_1);
+            } while (addedNewNodes);
         }
         else {
             // Necessary to properly replace namespace imports
-            modules.forEach(function (module) { return module.includeAllInBundle(); });
+            for (var _a = 0, modules_2 = modules; _a < modules_2.length; _a++) {
+                var module = modules_2[_a];
+                module.includeAllInBundle();
+            }
         }
     };
     Graph.prototype.buildSingle = function (entryModuleId) {
@@ -19129,21 +19084,25 @@ var Graph = /** @class */ (function () {
             // determine the topological execution order for the bundle
             timeStart('analyse dependency graph', 2);
             _this.link();
-            var _a = _this.analyseExecution([entryModule]), orderedModules = _a.orderedModules, dynamicImports = _a.dynamicImports;
+            var _a = _this.analyseExecution([entryModule], false), orderedModules = _a.orderedModules, dynamicImports = _a.dynamicImports;
             timeEnd('analyse dependency graph', 2);
             // Phase 3 – marking. We include all statements that should be included
             timeStart('mark included statements', 2);
             entryModule.markExports();
-            dynamicImports.forEach(function (dynamicImportModule) {
+            for (var _i = 0, dynamicImports_1 = dynamicImports; _i < dynamicImports_1.length; _i++) {
+                var dynamicImportModule = dynamicImports_1[_i];
                 if (entryModule !== dynamicImportModule)
                     dynamicImportModule.markExports();
                 // all dynamic import modules inlined for single-file build
                 dynamicImportModule.namespace().includeVariable();
-            });
+            }
             // only include statements that should appear in the bundle
             _this.includeMarked(orderedModules);
             // check for unused external imports
-            _this.externalModules.forEach(function (module) { return module.warnUnusedImports(); });
+            for (var _b = 0, _c = _this.externalModules; _b < _c.length; _b++) {
+                var module = _c[_b];
+                module.warnUnusedImports();
+            }
             timeEnd('mark included statements', 2);
             // Phase 4 – we construct the chunk itself, generating its import and export facades
             timeStart('generate chunks', 2);
@@ -19169,21 +19128,26 @@ var Graph = /** @class */ (function () {
             // determine the topological execution order for the bundle
             timeStart('analyse dependency graph', 2);
             _this.link();
-            var _a = _this.analyseExecution(entryModules, preserveModules), orderedModules = _a.orderedModules, dynamicImports = _a.dynamicImports;
-            dynamicImports.forEach(function (dynamicImportModule) {
+            var _a = _this.analyseExecution(entryModules, !preserveModules), orderedModules = _a.orderedModules, dynamicImports = _a.dynamicImports;
+            for (var _i = 0, dynamicImports_2 = dynamicImports; _i < dynamicImports_2.length; _i++) {
+                var dynamicImportModule = dynamicImports_2[_i];
                 if (entryModules.indexOf(dynamicImportModule) === -1)
                     entryModules.push(dynamicImportModule);
-            });
+            }
             timeEnd('analyse dependency graph', 2);
             // Phase 3 – marking. We include all statements that should be included
             timeStart('mark included statements', 2);
-            entryModules.forEach(function (entryModule) {
+            for (var _b = 0, entryModules_1 = entryModules; _b < entryModules_1.length; _b++) {
+                var entryModule = entryModules_1[_b];
                 entryModule.markExports();
-            });
+            }
             // only include statements that should appear in the bundle
             _this.includeMarked(orderedModules);
             // check for unused external imports
-            _this.externalModules.forEach(function (module) { return module.warnUnusedImports(); });
+            for (var _c = 0, _d = _this.externalModules; _c < _d.length; _c++) {
+                var externalModule = _d[_c];
+                externalModule.warnUnusedImports();
+            }
             timeEnd('mark included statements', 2);
             // Phase 4 – we construct the chunks, working out the optimal chunking using
             // entry point graph colouring, before generating the import and export facades
@@ -19194,43 +19158,47 @@ var Graph = /** @class */ (function () {
             //       should be made to be its own entry point module before chunking
             var chunkList = [];
             if (!preserveModules) {
-                var chunkModules_1 = {};
-                orderedModules.forEach(function (module) {
+                var chunkModules = {};
+                for (var _e = 0, orderedModules_1 = orderedModules; _e < orderedModules_1.length; _e++) {
+                    var module = orderedModules_1[_e];
                     var entryPointsHashStr = Uint8ArrayToHexString(module.entryPointsHash);
-                    var curChunk = chunkModules_1[entryPointsHashStr];
+                    var curChunk = chunkModules[entryPointsHashStr];
                     if (curChunk) {
                         curChunk.push(module);
                     }
                     else {
-                        chunkModules_1[entryPointsHashStr] = [module];
+                        chunkModules[entryPointsHashStr] = [module];
                     }
-                });
+                }
                 // create each chunk
-                Object.keys(chunkModules_1).forEach(function (entryHashSum) {
-                    var chunk = chunkModules_1[entryHashSum];
+                for (var entryHashSum in chunkModules) {
+                    var chunk = chunkModules[entryHashSum];
                     var chunkModulesOrdered = chunk.sort(function (moduleA, moduleB) { return (moduleA.execIndex > moduleB.execIndex ? 1 : -1); });
                     chunkList.push(new Chunk$1(_this, chunkModulesOrdered));
-                });
+                }
             }
             else {
-                orderedModules.forEach(function (module) {
+                for (var _f = 0, orderedModules_2 = orderedModules; _f < orderedModules_2.length; _f++) {
+                    var module = orderedModules_2[_f];
                     var chunkInstance = new Chunk$1(_this, [module]);
                     chunkInstance.entryModule = module;
                     chunkInstance.isEntryModuleFacade = true;
                     chunkList.push(chunkInstance);
-                });
+                }
             }
             // for each entry point module, ensure its exports
             // are exported by the chunk itself, with safe name deduping
-            entryModules.forEach(function (entryModule) {
+            for (var _g = 0, entryModules_2 = entryModules; _g < entryModules_2.length; _g++) {
+                var entryModule = entryModules_2[_g];
                 entryModule.chunk.generateEntryExports(entryModule);
-            });
+            }
             // for each chunk module, set up its imports to other
             // chunks, if those variables are included after treeshaking
-            chunkList.forEach(function (chunk) {
+            for (var _h = 0, chunkList_1 = chunkList; _h < chunkList_1.length; _h++) {
+                var chunk = chunkList_1[_h];
                 chunk.collectDependencies();
                 chunk.generateImports();
-            });
+            }
             // finally prepare output chunks
             var chunks = {};
             var inputRelativeDir;
@@ -19276,66 +19244,69 @@ var Graph = /** @class */ (function () {
             return chunks;
         });
     };
-    Graph.prototype.analyseExecution = function (entryModules, preserveModules) {
+    Graph.prototype.analyseExecution = function (entryModules, graphColouring) {
         var _this = this;
-        if (preserveModules === void 0) { preserveModules = false; }
         var curEntry, curEntryHash;
         var allSeen = {};
         var ordered = [];
         var dynamicImports = [];
-        var visit = function (module, parents) {
-            if (parents === void 0) { parents = (_a = {}, _a[module.id] = null, _a); }
+        var parents;
+        var visit = function (module) {
             if (module.isEntryPoint && module !== curEntry)
                 return;
             // Track entry point graph colouring by tracing all modules loaded by a given
             // entry point and colouring those modules by the hash of its id. Colours are mixed as
             // hash xors, providing the unique colouring of the graph into unique hash chunks.
             // This is really all there is to automated chunking, the rest is chunk wiring.
-            if (!preserveModules) {
+            if (graphColouring) {
                 Uint8ArrayXor(module.entryPointsHash, curEntryHash);
             }
-            module.dependencies.forEach(function (depModule) {
-                if (!depModule.isExternal) {
-                    if (depModule.id in parents) {
-                        if (!allSeen[depModule.id]) {
-                            _this.warnCycle(depModule.id, module.id, parents);
-                        }
-                        return;
+            for (var _i = 0, _a = module.dependencies; _i < _a.length; _i++) {
+                var depModule = _a[_i];
+                if (depModule.isExternal)
+                    continue;
+                if (depModule.id in parents) {
+                    if (!allSeen[depModule.id]) {
+                        _this.warnCycle(depModule.id, module.id, parents);
                     }
-                    parents[depModule.id] = module.id;
-                    visit(depModule, parents);
+                    continue;
                 }
-            });
+                parents[depModule.id] = module.id;
+                visit(depModule);
+            }
             if (_this.dynamicImport) {
-                module.dynamicImportResolutions.forEach(function (module) {
-                    if (module instanceof Module) {
-                        if (dynamicImports.indexOf(module) === -1) {
-                            dynamicImports.push(module);
+                for (var _b = 0, _c = module.dynamicImportResolutions; _b < _c.length; _b++) {
+                    var dynamicModule = _c[_b];
+                    if (dynamicModule instanceof Module) {
+                        if (dynamicImports.indexOf(dynamicModule) === -1) {
+                            dynamicImports.push(dynamicModule);
                         }
                     }
-                });
+                }
             }
             if (allSeen[module.id])
                 return;
             allSeen[module.id] = true;
             module.execIndex = ordered.length;
             ordered.push(module);
-            var _a;
         };
-        for (var i = 0; i < entryModules.length; i++) {
-            curEntry = entryModules[i];
+        for (var _i = 0, entryModules_3 = entryModules; _i < entryModules_3.length; _i++) {
+            curEntry = entryModules_3[_i];
             curEntry.isEntryPoint = true;
             curEntryHash = randomUint8Array(10);
+            parents = (_a = {}, _a[curEntry.id] = null, _a);
             visit(curEntry);
         }
         // new items can be added during this loop
-        for (var i = 0; i < dynamicImports.length; i++) {
-            curEntry = dynamicImports[i];
+        for (var _b = 0, dynamicImports_3 = dynamicImports; _b < dynamicImports_3.length; _b++) {
+            curEntry = dynamicImports_3[_b];
             curEntry.isEntryPoint = true;
             curEntryHash = randomUint8Array(10);
+            parents = (_c = {}, _c[curEntry.id] = null, _c);
             visit(curEntry);
         }
         return { orderedModules: ordered, dynamicImports: dynamicImports };
+        var _a, _c;
     };
     Graph.prototype.warnCycle = function (id, parentId, parents) {
         var path$$1 = [relativeId(id)];
@@ -19405,17 +19376,17 @@ var Graph = /** @class */ (function () {
             _this.modules.push(module);
             _this.moduleById.set(id, module);
             return _this.fetchAllDependencies(module).then(function () {
-                Object.keys(module.exports).forEach(function (name) {
+                for (var name in module.exports) {
                     if (name !== 'default') {
                         module.exportsAll[name] = module.id;
                     }
-                });
+                }
                 module.exportAllSources.forEach(function (source) {
                     var id = module.resolvedIds[source];
                     var exportAllModule = _this.moduleById.get(id);
                     if (exportAllModule.isExternal)
                         return;
-                    Object.keys(exportAllModule.exportsAll).forEach(function (name) {
+                    for (var name in exportAllModule.exportsAll) {
                         if (name in module.exportsAll) {
                             _this.warn({
                                 code: 'NAMESPACE_CONFLICT',
@@ -19428,7 +19399,7 @@ var Graph = /** @class */ (function () {
                         else {
                             module.exportsAll[name] = exportAllModule.exportsAll[name];
                         }
-                    });
+                    }
                 });
                 return module;
             });
@@ -19503,14 +19474,14 @@ var Graph = /** @class */ (function () {
                         _this.externalModules.push(module_1);
                         _this.moduleById.set(externalId, module_1);
                     }
-                    var externalModule_1 = _this.moduleById.get(externalId);
+                    var externalModule = _this.moduleById.get(externalId);
                     // add external declarations so we can detect which are never used
-                    Object.keys(module.imports).forEach(function (name) {
+                    for (var name in module.imports) {
                         var importDeclaration = module.imports[name];
                         if (importDeclaration.source !== source)
                             return;
-                        externalModule_1.traceExport(importDeclaration.name);
-                    });
+                        externalModule.traceExport(importDeclaration.name);
+                    }
                 }
                 else {
                     module.resolvedIds[source] = resolvedId;
@@ -19577,7 +19548,7 @@ function applyOptionHook(inputOptions, plugin) {
         return plugin.options(inputOptions) || inputOptions;
     return inputOptions;
 }
-function getInputOptions(rawInputOptions) {
+function getInputOptions$1(rawInputOptions) {
     if (!rawInputOptions) {
         throw new Error('You must supply an options object to rollup');
     }
@@ -19595,7 +19566,7 @@ function getInputOptions(rawInputOptions) {
 }
 function rollup(rawInputOptions) {
     try {
-        var inputOptions_1 = getInputOptions(rawInputOptions);
+        var inputOptions_1 = getInputOptions$1(rawInputOptions);
         initialiseTimers(inputOptions_1);
         var graph_1 = new Graph(inputOptions_1);
         timeStart('BUILD', 1);
@@ -22282,7 +22253,7 @@ utils.escapeRe = function escapeRe(str) {
 module.exports = utils;
 });
 
-var chars$1 = {}, unesc, temp;
+var chars$2 = {}, unesc, temp;
 
 function reverse(object, prepender) {
   return Object.keys(object).reduce(function(reversed, key) {
@@ -22296,7 +22267,7 @@ function reverse(object, prepender) {
  * Regex for common characters
  */
 
-chars$1.escapeRegex = {
+chars$2.escapeRegex = {
   '?': /\?/g,
   '@': /\@/g,
   '!': /\!/g,
@@ -22312,7 +22283,7 @@ chars$1.escapeRegex = {
  * Escape characters
  */
 
-chars$1.ESC = {
+chars$2.ESC = {
   '?': '__UNESC_QMRK__',
   '@': '__UNESC_AMPE__',
   '!': '__UNESC_EXCL__',
@@ -22329,9 +22300,9 @@ chars$1.ESC = {
  * Unescape characters
  */
 
-chars$1.UNESC = unesc || (unesc = reverse(chars$1.ESC, '\\'));
+chars$2.UNESC = unesc || (unesc = reverse(chars$2.ESC, '\\'));
 
-chars$1.ESC_TEMP = {
+chars$2.ESC_TEMP = {
   '?': '__TEMP_QMRK__',
   '@': '__TEMP_AMPE__',
   '!': '__TEMP_EXCL__',
@@ -22344,9 +22315,9 @@ chars$1.ESC_TEMP = {
   ']': '__TEMP_RTBRACK__'
 };
 
-chars$1.TEMP = temp || (temp = reverse(chars$1.ESC_TEMP));
+chars$2.TEMP = temp || (temp = reverse(chars$2.ESC_TEMP));
 
-var chars_1 = chars$1;
+var chars_1 = chars$2;
 
 var glob = createCommonjsModule(function (module) {
 
@@ -23614,7 +23585,7 @@ function watch(configs) {
     return new Watcher(configs);
 }
 
-var version$1 = "0.57.0";
+var version$1 = "0.57.1";
 
 /// <reference path="../typings/package.json.d.ts" />