rollup 0.56.3 → 0.57.1

package/bin/rollup

@@ -249,9 +249,9 @@ function isNumber (x) {
     return /^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/.test(x);
 }
 
-var help = "rollup version __VERSION__\n=====================================\n\nUsage: rollup [options] <entry file>\n\nBasic options:\n\n-v, --version               Show version number\n-h, --help                  Show this help message\n-c, --config                Use this config file (if argument is used but value\n                              is unspecified, defaults to rollup.config.js)\n-w, --watch                 Watch files in bundle and rebuild on changes\n-i, --input                 Input (alternative to <entry file>)\n-o, --output.file <output>  Output (if absent, prints to stdout)\n-f, --output.format [es]    Type of output (amd, cjs, es, iife, umd)\n-e, --external              Comma-separate list of module IDs to exclude\n-g, --globals               Comma-separate list of `module ID:Global` pairs\n                              Any module IDs defined here are added to external\n-n, --name                  Name for UMD export\n-m, --sourcemap             Generate sourcemap (`-m inline` for inline map)\n-l, --legacy                Support IE8\n--amd.id                    ID for AMD module (default is anonymous)\n--amd.define                Function to use in place of `define`\n--no-strict                 Don't emit a `\"use strict\";` in the generated modules.\n--no-indent                 Don't indent result\n--environment <values>      Settings passed to config file (see example)\n--no-conflict               Generate a noConflict method for UMD globals\n--no-treeshake              Disable tree-shaking\n--silent                    Don't print warnings\n--intro                     Content to insert at top of bundle (inside wrapper)\n--outro                     Content to insert at end of bundle (inside wrapper)\n--banner                    Content to insert at top of bundle (outside wrapper)\n--footer                    Content to insert at end of bundle (outside wrapper)\n--interop                   Include interop block (true by default)\n\nExamples:\n\n# use settings in config file\nrollup -c\n\n# in config file, process.env.INCLUDE_DEPS === 'true'\n# and process.env.BUILD === 'production'\nrollup -c --environment INCLUDE_DEPS,BUILD:production\n\n# create CommonJS bundle.js from src/main.js\nrollup --format=cjs --output=bundle.js -- src/main.js\n\n# create self-executing IIFE using `window.jQuery`\n# and `window._` as external globals\nrollup -f iife --globals jquery:jQuery,lodash:_ \\\n  -i src/app.js -o build/app.js -m build/app.js.map\n\nNotes:\n\n* When piping to stdout, only inline sourcemaps are permitted\n\nFor more information visit https://rollupjs.org\n";
+var help = "rollup version __VERSION__\n=====================================\n\nUsage: rollup [options] <entry file>\n\nBasic options:\n\n-v, --version               Show version number\n-h, --help                  Show this help message\n-c, --config                Use this config file (if argument is used but value\n                              is unspecified, defaults to rollup.config.js)\n-w, --watch                 Watch files in bundle and rebuild on changes\n-i, --input                 Input (alternative to <entry file>)\n-o, --file <output>         Output (if absent, prints to stdout)\n-f, --format [es]           Type of output (amd, cjs, es, iife, umd)\n-e, --external              Comma-separate list of module IDs to exclude\n-g, --globals               Comma-separate list of `module ID:Global` pairs\n                              Any module IDs defined here are added to external\n-n, --name                  Name for UMD export\n-m, --sourcemap             Generate sourcemap (`-m inline` for inline map)\n-l, --legacy                Support IE8\n--amd.id                    ID for AMD module (default is anonymous)\n--amd.define                Function to use in place of `define`\n--no-strict                 Don't emit a `\"use strict\";` in the generated modules.\n--no-indent                 Don't indent result\n--environment <values>      Settings passed to config file (see example)\n--no-conflict               Generate a noConflict method for UMD globals\n--no-treeshake              Disable tree-shaking\n--silent                    Don't print warnings\n--intro                     Content to insert at top of bundle (inside wrapper)\n--outro                     Content to insert at end of bundle (inside wrapper)\n--banner                    Content to insert at top of bundle (outside wrapper)\n--footer                    Content to insert at end of bundle (outside wrapper)\n--no-interop                Do not include interop block\n\nExamples:\n\n# use settings in config file\nrollup -c\n\n# in config file, process.env.INCLUDE_DEPS === 'true'\n# and process.env.BUILD === 'production'\nrollup -c --environment INCLUDE_DEPS,BUILD:production\n\n# create CommonJS bundle.js from src/main.js\nrollup --format=cjs --file=bundle.js -- src/main.js\n\n# create self-executing IIFE using `window.jQuery`\n# and `window._` as external globals\nrollup -f iife --globals jquery:jQuery,lodash:_ \\\n  -i src/app.js -o build/app.js -m build/app.js.map\n\nNotes:\n\n* When piping to stdout, only inline sourcemaps are permitted\n\nFor more information visit https://rollupjs.org\n";
 
-var version = "0.56.3";
+var version = "0.57.1";
 
 var modules = {};
 
@@ -1599,30 +1599,43 @@ function assembleStyles() {
 		});
 	}
 
+	const ansi2ansi = n => n;
 	const rgb2rgb = (r, g, b) => [r, g, b];
 
 	styles.color.close = '\u001B[39m';
 	styles.bgColor.close = '\u001B[49m';
 
-	styles.color.ansi = {};
-	styles.color.ansi256 = {};
+	styles.color.ansi = {
+		ansi: wrapAnsi16(ansi2ansi, 0)
+	};
+	styles.color.ansi256 = {
+		ansi256: wrapAnsi256(ansi2ansi, 0)
+	};
 	styles.color.ansi16m = {
 		rgb: wrapAnsi16m(rgb2rgb, 0)
 	};
 
-	styles.bgColor.ansi = {};
-	styles.bgColor.ansi256 = {};
+	styles.bgColor.ansi = {
+		ansi: wrapAnsi16(ansi2ansi, 10)
+	};
+	styles.bgColor.ansi256 = {
+		ansi256: wrapAnsi256(ansi2ansi, 10)
+	};
 	styles.bgColor.ansi16m = {
 		rgb: wrapAnsi16m(rgb2rgb, 10)
 	};
 
-	for (const key of Object.keys(colorConvert)) {
+	for (let key of Object.keys(colorConvert)) {
 		if (typeof colorConvert[key] !== 'object') {
 			continue;
 		}
 
 		const suite = colorConvert[key];
 
+		if (key === 'ansi16') {
+			key = 'ansi';
+		}
+
 		if ('ansi16' in suite) {
 			styles.color.ansi[key] = wrapAnsi16(suite.ansi16, 0);
 			styles.bgColor.ansi[key] = wrapAnsi16(suite.ansi16, 10);
@@ -1649,15 +1662,13 @@ Object.defineProperty(module, 'exports', {
 });
 });
 
-var hasFlag = createCommonjsModule(function (module) {
-module.exports = (flag, argv) => {
+var hasFlag = (flag, argv) => {
 	argv = argv || process.argv;
 	const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--');
 	const pos = argv.indexOf(prefix + flag);
 	const terminatorPos = argv.indexOf('--');
 	return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
 };
-});
 
 const env = process.env;
 
@@ -1705,6 +1716,10 @@ function supportsColor(stream) {
 	}
 
 	if (stream && !stream.isTTY && forceColor !== true) {
+		// VS code debugger doesn't have isTTY set
+		if (env.VSCODE_PID) {
+			return 1;
+		}
 		return 0;
 	}
 
@@ -1741,14 +1756,16 @@ function supportsColor(stream) {
 		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
 	}
 
+	if (env.COLORTERM === 'truecolor') {
+		return 3;
+	}
+
 	if ('TERM_PROGRAM' in env) {
 		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
 
 		switch (env.TERM_PROGRAM) {
 			case 'iTerm.app':
 				return version >= 3 ? 3 : 2;
-			case 'Hyper':
-				return 3;
 			case 'Apple_Terminal':
 				return 2;
 			// No default
@@ -1785,7 +1802,6 @@ var supportsColor_1 = {
 	stderr: getSupportLevel(process.stderr)
 };
 
-var templates = createCommonjsModule(function (module) {
 const TEMPLATE_REGEX = /(?:\\(u[a-f\d]{4}|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi;
 const STYLE_REGEX = /(?:^|\.)(\w+)(?:\(([^)]*)\))?/g;
 const STRING_REGEX = /^(['"])((?:\\.|(?!\1)[^\\])*)\1$/;
@@ -1877,7 +1893,7 @@ function buildStyle(chalk, styles) {
 	return current;
 }
 
-module.exports = (chalk, tmp) => {
+var templates = (chalk, tmp) => {
 	const styles = [];
 	const chunks = [];
 	let chunk = [];
@@ -1913,7 +1929,6 @@ module.exports = (chalk, tmp) => {
 
 	return chunks.join('');
 };
-});
 
 var chalk = createCommonjsModule(function (module) {
 
@@ -2166,7 +2181,9 @@ function handleError(err, recover) {
     var description = err.message || err;
     if (err.name)
         description = err.name + ": " + description;
-    var message = (err.plugin ? "(" + err.plugin + " plugin) " + description : description) || err;
+    var message = (err.plugin
+        ? "(" + err.plugin + " plugin) " + description
+        : description) || err;
     stderr(chalk.bold.red("[!] " + chalk.bold(message.toString())));
     // TODO should this be "err.url || (err.file && err.loc.file) || err.id"?
     if (err.url) {
@@ -2251,7 +2268,9 @@ function deprecateOptions(options, deprecateConfig) {
             deprecations.push({ old: 'targets', new: 'output' });
             // as targets is an array and we need to merge other output options
             // like sourcemap etc.
-            options.output = options.targets.map(function (target) { return Object.assign({}, target, options.output); });
+            options.output = options.targets.map(function (target) {
+                return Object.assign({}, target, options.output);
+            });
             delete options.targets;
             var deprecatedDest_1 = false;
             options.output.forEach(function (outputEntry) {
@@ -2274,7 +2293,10 @@ function deprecateOptions(options, deprecateConfig) {
             delete options.dest;
         }
         if (options.pureExternalModules) {
-            deprecations.push({ old: 'pureExternalModules', new: 'treeshake.pureExternalModules' });
+            deprecations.push({
+                old: 'pureExternalModules',
+                new: 'treeshake.pureExternalModules'
+            });
             if (options.treeshake === undefined) {
                 options.treeshake = {};
             }
@@ -2306,7 +2328,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;
     }
@@ -2314,7 +2341,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
@@ -2323,141 +2360,147 @@ var defaultOnWarn = function (warning) {
         console.warn(warning.message); // eslint-disable-line no-console
     }
 };
-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;
+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;
         }
-        return configOption;
-    }
-    var onwarn = config.onwarn;
-    var warn;
-    if (onwarn) {
-        warn = function (warning) { return onwarn(warning, defaultOnWarnHandler); };
+        : (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 _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);
     }
-    else {
-        warn = defaultOnWarnHandler;
+    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 = {
-        input: getInputOption('input'),
-        legacy: getInputOption('legacy'),
-        treeshake: getObjectOption('treeshake'),
         acorn: config.acorn,
         acornInjectPlugins: config.acornInjectPlugins,
+        cache: getOption('cache'),
         context: config.context,
+        experimentalCodeSplitting: getOption('experimentalCodeSplitting'),
+        experimentalDynamicImport: getOption('experimentalDynamicImport'),
+        experimentalPreserveModules: getOption('experimentalPreserveModules'),
+        external: getExternal(config, command),
+        input: getOption('input'),
         moduleContext: config.moduleContext,
+        onwarn: getOnWarn(config, command, defaultOnWarnHandler),
+        perf: getOption('perf', false),
         plugins: config.plugins,
-        onwarn: warn,
-        watch: config.watch,
-        cache: getInputOption('cache'),
-        preferConst: getInputOption('preferConst'),
-        experimentalDynamicImport: getInputOption('experimentalDynamicImport'),
-        experimentalCodeSplitting: getInputOption('experimentalCodeSplitting'),
-        preserveSymlinks: getInputOption('preserveSymlinks')
-    };
-    // 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 () { };
-    }
-    var baseOutputOptions = {
-        extend: getOutputOption('extend'),
-        amd: Object.assign({}, config.amd, command.amd),
-        banner: getOutputOption('banner'),
-        footer: getOutputOption('footer'),
-        intro: getOutputOption('intro'),
-        format: getOutputOption('format'),
-        outro: getOutputOption('outro'),
-        sourcemap: getOutputOption('sourcemap'),
-        sourcemapFile: getOutputOption('sourcemapFile'),
-        name: getOutputOption('name'),
-        globals: getOutputOption('globals'),
-        interop: getOutputOption('interop'),
-        legacy: getOutputOption('legacy'),
-        freeze: getOutputOption('freeze'),
-        indent: getOutputOption('indent'),
-        strict: getOutputOption('strict'),
-        noConflict: getOutputOption('noConflict'),
-        paths: getOutputOption('paths'),
-        exports: getOutputOption('exports'),
-        file: getOutputOption('file'),
-        dir: getOutputOption('dir')
+        preferConst: getOption('preferConst'),
+        preserveSymlinks: getOption('preserveSymlinks'),
+        treeshake: getObjectOption(config, command, 'treeshake'),
+        watch: config.watch
     };
-    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
-                    }
-                ];
+    if (inputOptions.experimentalPreserveModules && !Array.isArray(inputOptions.input)) {
+        inputOptions.input = [inputOptions.input];
     }
-    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) {
@@ -2475,17 +2518,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;
@@ -2745,16 +2781,16 @@ function showTruncatedWarnings(warnings) {
     }
 }
 
-function loadConfigFile(configFile, silent) {
-    if (silent === void 0) { silent = false; }
+function loadConfigFile(configFile, commandOptions) {
+    if (commandOptions === void 0) { commandOptions = {}; }
+    var silent = commandOptions.silent || false;
     var warnings = batchWarnings();
     return rollup.rollup({
         input: configFile,
         external: function (id) {
-            return ((id[0] !== '.' && !path__default.isAbsolute(id)) ||
-                id.slice(-5, id.length) === '.json');
+            return (id[0] !== '.' && !path__default.isAbsolute(id)) || id.slice(-5, id.length) === '.json';
         },
-        onwarn: warnings.add,
+        onwarn: warnings.add
     })
         .then(function (bundle) {
         if (!silent && warnings.count > 0) {
@@ -2769,16 +2805,23 @@ function loadConfigFile(configFile, silent) {
         var code = _a.code;
         // temporarily override require
         var defaultLoader = require.extensions['.js'];
-        require.extensions['.js'] = function (m, filename) {
+        require.extensions['.js'] = function (module, filename) {
             if (filename === configFile) {
-                m._compile(code, filename);
+                module._compile(code, filename);
             }
             else {
-                defaultLoader(m, filename);
+                defaultLoader(module, filename);
             }
         };
         delete require.cache[configFile];
-        return Promise.resolve(require(configFile)).then(function (configs) {
+        return Promise.resolve(require(configFile))
+            .then(function (configFileContent) {
+            if (typeof configFileContent === 'function') {
+                return configFileContent(commandOptions);
+            }
+            return configFileContent;
+        })
+            .then(function (configs) {
             if (Object.keys(configs).length === 0) {
                 handleError({
                     code: 'MISSING_CONFIG',
@@ -3276,11 +3319,7 @@ var plur = function (str, plural, count) {
 	return count === 1 ? str : plural;
 };
 
-var prettyMs = createCommonjsModule(function (module) {
-
-
-
-module.exports = (ms, opts) => {
+var prettyMs = (ms, opts) => {
 	if (!Number.isFinite(ms)) {
 		throw new TypeError('Expected a finite number');
 	}
@@ -3324,7 +3363,6 @@ module.exports = (ms, opts) => {
 
 	return ret.join(' ');
 };
-});
 
 function mapSequence(array, fn) {
     var results = [];
@@ -3345,15 +3383,30 @@ var SOURCEMAPPING_URL = 'sourceMa';
 SOURCEMAPPING_URL += 'ppingURL';
 var SOURCEMAPPING_URL$1 = SOURCEMAPPING_URL;
 
+function printTimings(timings) {
+    Object.keys(timings).forEach(function (label) {
+        var color = chalk;
+        if (label[0] === '#') {
+            color = color.bold;
+            if (label[1] !== '#') {
+                color = color.underline;
+            }
+        }
+        console.info(color(label + ": " + timings[label].toFixed(0) + "ms"));
+    });
+}
+
 function build(inputOptions, outputOptions, warnings, silent) {
     if (silent === void 0) { silent = false; }
-    var useStdout = outputOptions.length === 1 && !outputOptions[0].file && inputOptions.input instanceof Array === false;
+    var useStdout = outputOptions.length === 1 &&
+        !outputOptions[0].file &&
+        inputOptions.input instanceof Array === false;
     var start = Date.now();
-    var files = useStdout
-        ? ['stdout']
-        : outputOptions.map(function (t) { return relativeId(t.file || t.dir); });
+    var files = useStdout ? ['stdout'] : outputOptions.map(function (t) { return relativeId(t.file || t.dir); });
     if (!silent)
-        stderr(chalk.cyan("\n" + chalk.bold(typeof inputOptions.input === 'string' ? inputOptions.input : inputOptions.input && inputOptions.input.join(', ')) + " \u2192 " + chalk.bold(files.join(', ')) + "..."));
+        stderr(chalk.cyan("\n" + chalk.bold(typeof inputOptions.input === 'string'
+            ? inputOptions.input
+            : inputOptions.input && inputOptions.input.join(', ')) + " \u2192 " + chalk.bold(files.join(', ')) + "..."));
     return rollup.rollup(inputOptions)
         .then(function (bundle) {
         if (useStdout) {
@@ -3366,20 +3419,23 @@ function build(inputOptions, outputOptions, warnings, silent) {
             }
             return bundle.generate(output_1).then(function (_a) {
                 var code = _a.code, map = _a.map;
+                if (!code)
+                    return;
                 if (output_1.sourcemap === 'inline') {
                     code += "\n//# " + SOURCEMAPPING_URL$1 + "=" + map.toUrl() + "\n";
                 }
                 process.stdout.write(code);
             });
         }
-        return mapSequence(outputOptions, function (output) {
-            return bundle.write(output);
-        });
+        return mapSequence(outputOptions, function (output) { return bundle.write(output); }).then(function () { return bundle; });
     })
-        .then(function () {
+        .then(function (bundle) {
         warnings.flush();
         if (!silent)
             stderr(chalk.green("created " + chalk.bold(files.join(', ')) + " in " + chalk.bold(prettyMs(Date.now() - start))));
+        if (bundle && bundle.getTimings) {
+            printTimings(bundle.getTimings());
+        }
     })
         .catch(handleError);
 }
@@ -3601,8 +3657,7 @@ signalExit.unload = unload_1;
 signalExit.signals = signals_1;
 signalExit.load = load_1;
 
-var timeZone = createCommonjsModule(function (module) {
-module.exports = date => {
+var timeZone = date => {
 	const offset = (date || new Date()).getTimezoneOffset();
 	const absOffset = Math.abs(offset);
 	const hours = Math.floor(absOffset / 60);
@@ -3611,12 +3666,8 @@ module.exports = date => {
 
 	return (offset < 0 ? '+' : '-') + hours + minutesOut;
 };
-});
 
-var dateTime = createCommonjsModule(function (module) {
-
-
-module.exports = options => {
+var dateTime = options => {
 	options = Object.assign({
 		date: new Date(),
 		local: true,
@@ -3646,7 +3697,6 @@ module.exports = options => {
 		.replace(/T/, ' ')
 		.replace(/\..+/, end);
 };
-});
 
 var ansiEscapes = createCommonjsModule(function (module) {
 const x = module.exports;
@@ -3801,7 +3851,11 @@ function watch(configFile, configs, command, silent) {
         screen.reset(chalk.underline("rollup v" + rollup.VERSION));
         var screenWriter = screen.reset;
         configs = configs.map(function (options) {
-            var merged = mergeOptions({ config: options, command: command, defaultOnWarnHandler: warnings.add });
+            var merged = mergeOptions({
+                config: options,
+                command: command,
+                defaultOnWarnHandler: warnings.add
+            });
             var result = Object.assign({}, merged.inputOptions, {
                 output: merged.outputOptions
             });
@@ -3811,7 +3865,10 @@ function watch(configFile, configs, command, silent) {
                 result.watch._deprecations = merged.deprecations;
             }
             if (merged.optionError)
-                merged.inputOptions.onwarn({ message: merged.optionError, code: 'UNKNOWN_OPTION' });
+                merged.inputOptions.onwarn({
+                    message: merged.optionError,
+                    code: 'UNKNOWN_OPTION'
+                });
             if (merged.inputOptions.watch &&
                 merged.inputOptions.watch.clearScreen === false) {
                 screenWriter = stderr;
@@ -3889,7 +3946,7 @@ function watch(configFile, configs, command, silent) {
                 return;
             }
             restarting_1 = true;
-            loadConfigFile(configFile, silent)
+            loadConfigFile(configFile, command)
                 .then(function (configs) {
                 restarting_1 = false;
                 if (aborted_1) {
@@ -3972,8 +4029,8 @@ function runRollup(command) {
         }
         if (command.watch)
             process.env.ROLLUP_WATCH = 'true';
-        loadConfigFile(configFile, command.silent)
-            .then(function (normalized) { return execute(configFile, normalized, command); })
+        loadConfigFile(configFile, command)
+            .then(function (configs) { return execute(configFile, configs, command); })
             .catch(handleError);
     }
     else {
@@ -3987,7 +4044,11 @@ function execute(configFile, configs, command) {
     else {
         return sequence(configs, function (config) {
             var warnings = batchWarnings();
-            var _a = mergeOptions({ config: config, command: command, defaultOnWarnHandler: warnings.add }), inputOptions = _a.inputOptions, outputOptions = _a.outputOptions, deprecations = _a.deprecations, optionError = _a.optionError;
+            var _a = mergeOptions({
+                config: config,
+                command: command,
+                defaultOnWarnHandler: warnings.add
+            }), inputOptions = _a.inputOptions, outputOptions = _a.outputOptions, deprecations = _a.deprecations, optionError = _a.optionError;
             if (deprecations.length) {
                 inputOptions.onwarn({
                     code: 'DEPRECATED_OPTIONS',
@@ -4005,25 +4066,7 @@ function execute(configFile, configs, command) {
 }
 
 var command = minimist(process.argv.slice(2), {
-    alias: {
-        // Aliases
-        strict: 'useStrict',
-        dir: 'output.dir',
-        // Short options
-        c: 'config',
-        d: 'indent',
-        e: 'external',
-        f: 'output.format',
-        g: 'globals',
-        h: 'help',
-        i: 'input',
-        l: 'legacy',
-        m: 'sourcemap',
-        n: 'name',
-        o: 'output.file',
-        v: 'version',
-        w: 'watch'
-    }
+    alias: commandAliases
 });
 if (command.help || (process.argv.length <= 2 && process.stdin.isTTY)) {
     console.log("\n" + help.replace('__VERSION__', version) + "\n"); // eslint-disable-line no-console