rollup 0.49.0 → 0.50.0

package/bin/rollup

@@ -13,7 +13,7 @@ var rollup = require('../dist/rollup.js');
 var assert = _interopDefault(require('assert'));
 var events = _interopDefault(require('events'));
 
-var index$1 = function (args, opts) {
+var minimist = function (args, opts) {
     if (!opts) { opts = {}; }
     
     var flags = { bools : {}, strings : {}, unknownFn: null };
@@ -250,7 +250,7 @@ function isNumber (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--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--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://github.com/rollup/rollup/wiki\n";
 
-var version = "0.49.0";
+var version = "0.50.0";
 
 var modules = {};
 
@@ -277,11 +277,11 @@ requireRelative.resolve = function(requested, relativeTo) {
   return module$1._resolveFilename(requested, root);
 };
 
-var index$2 = requireRelative;
+var requireRelative_1 = requireRelative;
 
 var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
 
-var index$4 = function (str) {
+var escapeStringRegexp = function (str) {
 	if (typeof str !== 'string') {
 		throw new TypeError('Expected a string');
 	}
@@ -293,7 +293,7 @@ function createCommonjsModule(fn, module) {
 	return module = { exports: {} }, fn(module, module.exports), module.exports;
 }
 
-var index$10 = {
+var colorName = {
 	"aliceblue": [240, 248, 255],
 	"antiquewhite": [250, 235, 215],
 	"aqua": [0, 255, 255],
@@ -453,9 +453,9 @@ var conversions = createCommonjsModule(function (module) {
 //       do not use box values types (i.e. Number(), String(), etc.)
 
 var reverseKeywords = {};
-for (var key in index$10) {
-	if (index$10.hasOwnProperty(key)) {
-		reverseKeywords[index$10[key]] = key;
+for (var key in colorName) {
+	if (colorName.hasOwnProperty(key)) {
+		reverseKeywords[colorName[key]] = key;
 	}
 }
 
@@ -628,9 +628,9 @@ convert.rgb.keyword = function (rgb) {
 	var currentClosestDistance = Infinity;
 	var currentClosestKeyword;
 
-	for (var keyword in index$10) {
-		if (index$10.hasOwnProperty(keyword)) {
-			var value = index$10[keyword];
+	for (var keyword in colorName) {
+		if (colorName.hasOwnProperty(keyword)) {
+			var value = colorName[keyword];
 
 			// Compute comparative distance
 			var distance = comparativeDistance(rgb, value);
@@ -647,7 +647,7 @@ convert.rgb.keyword = function (rgb) {
 };
 
 convert.keyword.rgb = function (keyword) {
-	return index$10[keyword];
+	return colorName[keyword];
 };
 
 convert.rgb.xyz = function (rgb) {
@@ -1478,24 +1478,24 @@ models.forEach(function (fromModel) {
 	});
 });
 
-var index$8 = convert;
+var colorConvert = convert;
 
-var index$6 = createCommonjsModule(function (module) {
+var ansiStyles = createCommonjsModule(function (module) {
 'use strict';
 
 
 const wrapAnsi16 = (fn, offset) => function () {
-	const code = fn.apply(index$8, arguments);
+	const code = fn.apply(colorConvert, arguments);
 	return `\u001B[${code + offset}m`;
 };
 
 const wrapAnsi256 = (fn, offset) => function () {
-	const code = fn.apply(index$8, arguments);
+	const code = fn.apply(colorConvert, arguments);
 	return `\u001B[${38 + offset};5;${code}m`;
 };
 
 const wrapAnsi16m = (fn, offset) => function () {
-	const rgb = fn.apply(index$8, arguments);
+	const rgb = fn.apply(colorConvert, arguments);
 	return `\u001B[${38 + offset};2;${rgb[0]};${rgb[1]};${rgb[2]}m`;
 };
 
@@ -1602,12 +1602,12 @@ function assembleStyles() {
 		rgb: wrapAnsi16m(rgb2rgb, 10)
 	};
 
-	for (const key of Object.keys(index$8)) {
-		if (typeof index$8[key] !== 'object') {
+	for (const key of Object.keys(colorConvert)) {
+		if (typeof colorConvert[key] !== 'object') {
 			continue;
 		}
 
-		const suite = index$8[key];
+		const suite = colorConvert[key];
 
 		if ('ansi16' in suite) {
 			styles.color.ansi[key] = wrapAnsi16(suite.ansi16, 0);
@@ -1635,7 +1635,7 @@ Object.defineProperty(module, 'exports', {
 });
 });
 
-var index$14 = function (flag, argv) {
+var hasFlag = function (flag, argv) {
 	argv = argv || process.argv;
 
 	var terminatorPos = argv.indexOf('--');
@@ -1645,7 +1645,7 @@ var index$14 = function (flag, argv) {
 	return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
 };
 
-var index$12 = createCommonjsModule(function (module) {
+var supportsColor = createCommonjsModule(function (module) {
 'use strict';
 
 
@@ -1666,26 +1666,26 @@ const support = level => {
 };
 
 let supportLevel = (() => {
-	if (index$14('no-color') ||
-		index$14('no-colors') ||
-		index$14('color=false')) {
+	if (hasFlag('no-color') ||
+		hasFlag('no-colors') ||
+		hasFlag('color=false')) {
 		return 0;
 	}
 
-	if (index$14('color=16m') ||
-		index$14('color=full') ||
-		index$14('color=truecolor')) {
+	if (hasFlag('color=16m') ||
+		hasFlag('color=full') ||
+		hasFlag('color=truecolor')) {
 		return 3;
 	}
 
-	if (index$14('color=256')) {
+	if (hasFlag('color=256')) {
 		return 2;
 	}
 
-	if (index$14('color') ||
-		index$14('colors') ||
-		index$14('color=true') ||
-		index$14('color=always')) {
+	if (hasFlag('color') ||
+		hasFlag('colors') ||
+		hasFlag('color=true') ||
+		hasFlag('color=always')) {
 		return 1;
 	}
 
@@ -1712,7 +1712,7 @@ let supportLevel = (() => {
 	}
 
 	if ('CI' in env) {
-		if ('TRAVIS' in env || env.CI === 'Travis' || 'CIRCLECI' in env) {
+		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
 			return 1;
 		}
 
@@ -1737,7 +1737,7 @@ let supportLevel = (() => {
 		}
 	}
 
-	if (/^(screen|xterm)-256(?:color)?/.test(env.TERM)) {
+	if (/-256(color)?$/i.test(env.TERM)) {
 		return 2;
 	}
 
@@ -1908,7 +1908,7 @@ function applyOptions(obj, options) {
 	options = options || {};
 
 	// Detect level if not set manually
-	const scLevel = index$12 ? index$12.level : 0;
+	const scLevel = supportsColor ? supportsColor.level : 0;
 	obj.level = options.level === undefined ? scLevel : options.level;
 	obj.enabled = 'enabled' in options ? options.enabled : obj.level > 0;
 }
@@ -1938,22 +1938,22 @@ function Chalk(options) {
 
 // Use bright blue on Windows as the normal blue color is illegible
 if (isSimpleWindowsTerm) {
-	index$6.blue.open = '\u001B[94m';
+	ansiStyles.blue.open = '\u001B[94m';
 }
 
-for (const key of Object.keys(index$6)) {
-	index$6[key].closeRe = new RegExp(index$4(index$6[key].close), 'g');
+for (const key of Object.keys(ansiStyles)) {
+	ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g');
 
 	styles[key] = {
 		get() {
-			const codes = index$6[key];
+			const codes = ansiStyles[key];
 			return build.call(this, this._styles ? this._styles.concat(codes) : [codes], key);
 		}
 	};
 }
 
-index$6.color.closeRe = new RegExp(index$4(index$6.color.close), 'g');
-for (const model of Object.keys(index$6.color.ansi)) {
+ansiStyles.color.closeRe = new RegExp(escapeStringRegexp(ansiStyles.color.close), 'g');
+for (const model of Object.keys(ansiStyles.color.ansi)) {
 	if (skipModels.has(model)) {
 		continue;
 	}
@@ -1962,11 +1962,11 @@ for (const model of Object.keys(index$6.color.ansi)) {
 		get() {
 			const level = this.level;
 			return function () {
-				const open = index$6.color[levelMapping[level]][model].apply(null, arguments);
+				const open = ansiStyles.color[levelMapping[level]][model].apply(null, arguments);
 				const codes = {
 					open,
-					close: index$6.color.close,
-					closeRe: index$6.color.closeRe
+					close: ansiStyles.color.close,
+					closeRe: ansiStyles.color.closeRe
 				};
 				return build.call(this, this._styles ? this._styles.concat(codes) : [codes], model);
 			};
@@ -1974,8 +1974,8 @@ for (const model of Object.keys(index$6.color.ansi)) {
 	};
 }
 
-index$6.bgColor.closeRe = new RegExp(index$4(index$6.bgColor.close), 'g');
-for (const model of Object.keys(index$6.bgColor.ansi)) {
+ansiStyles.bgColor.closeRe = new RegExp(escapeStringRegexp(ansiStyles.bgColor.close), 'g');
+for (const model of Object.keys(ansiStyles.bgColor.ansi)) {
 	if (skipModels.has(model)) {
 		continue;
 	}
@@ -1985,11 +1985,11 @@ for (const model of Object.keys(index$6.bgColor.ansi)) {
 		get() {
 			const level = this.level;
 			return function () {
-				const open = index$6.bgColor[levelMapping[level]][model].apply(null, arguments);
+				const open = ansiStyles.bgColor[levelMapping[level]][model].apply(null, arguments);
 				const codes = {
 					open,
-					close: index$6.bgColor.close,
-					closeRe: index$6.bgColor.closeRe
+					close: ansiStyles.bgColor.close,
+					closeRe: ansiStyles.bgColor.closeRe
 				};
 				return build.call(this, this._styles ? this._styles.concat(codes) : [codes], model);
 			};
@@ -2062,9 +2062,9 @@ function applyStyle() {
 	// Turns out that on Windows dimmed gray text becomes invisible in cmd.exe,
 	// see https://github.com/chalk/chalk/issues/58
 	// If we're on Windows and we're dealing with a gray color, temporarily make 'dim' a noop.
-	const originalDim = index$6.dim.open;
+	const originalDim = ansiStyles.dim.open;
 	if (isSimpleWindowsTerm && this.hasGrey) {
-		index$6.dim.open = '';
+		ansiStyles.dim.open = '';
 	}
 
 	for (const code of this._styles.slice().reverse()) {
@@ -2080,7 +2080,7 @@ function applyStyle() {
 	}
 
 	// Reset the original `dim` if we changed it to work around the Windows dimmed gray issue
-	index$6.dim.open = originalDim;
+	ansiStyles.dim.open = originalDim;
 
 	return str;
 }
@@ -2105,10 +2105,10 @@ function chalkTag(chalk, strings) {
 
 Object.defineProperties(Chalk.prototype, styles);
 
-var index$3 = Chalk(); // eslint-disable-line new-cap
-var supportsColor_1 = index$12;
+var chalk = Chalk(); // eslint-disable-line new-cap
+var supportsColor_1 = supportsColor;
 
-index$3.supportsColor = supportsColor_1;
+chalk.supportsColor = supportsColor_1;
 
 const absolutePath = /^(?:\/|(?:[A-Za-z]:)?[\\|/])/;
 
@@ -2122,7 +2122,7 @@ function relativeId ( id ) {
 	return path.relative( process.cwd(), id );
 }
 
-if ( !process.stderr.isTTY ) { index$3.enabled = false; }
+if ( !process.stderr.isTTY ) { chalk.enabled = false; }
 
 // log to stderr to keep `rollup main.js > bundle.js` from breaking
 const stderr = console.error.bind( console ); // eslint-disable-line no-console
@@ -2132,11 +2132,11 @@ function handleError ( err, recover ) {
 	if (err.name) { description = `${err.name}: ${description}`; }
 	const message = (err.plugin ? `(${err.plugin} plugin) ${description}` : description) || err;
 
-	stderr( index$3.bold.red( `[!] ${index$3.bold( message )}` ) );
+	stderr( chalk.bold.red( `[!] ${chalk.bold( message )}` ) );
 
 	// TODO should this be "err.url || (err.file && err.loc.file) || err.id"?
 	if ( err.url ) {
-		stderr( index$3.cyan( err.url ) );
+		stderr( chalk.cyan( err.url ) );
 	}
 
 	if ( err.loc ) {
@@ -2146,9 +2146,9 @@ function handleError ( err, recover ) {
 	}
 
 	if ( err.frame ) {
-		stderr( index$3.dim( err.frame ) );
+		stderr( chalk.dim( err.frame ) );
 	} else if ( err.stack ) {
-		stderr( index$3.dim( err.stack ) );
+		stderr( chalk.dim( err.stack ) );
 	}
 
 	stderr( '' );
@@ -2244,7 +2244,8 @@ function mergeOptions ( config, command ) {
 		context: config.context,
 		moduleContext: config.moduleContext,
 		plugins: config.plugins,
-		onwarn: config.onwarn
+		onwarn: config.onwarn,
+		watch: config.watch
 	};
 
 	// legacy, to ensure e.g. commonjs plugin still works
@@ -2300,14 +2301,21 @@ function mergeOptions ( config, command ) {
 		paths: getOption('paths')
 	};
 
-	const outputOptions = (
-		(command.output || config.output) ?
+	let mergedOutputOptions;
+	if (Array.isArray(config.output)) {
+		mergedOutputOptions = config.output.map((output) => 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
-			}]
-	).map(output => {
+			}];
+	}
+
+	const outputOptions = mergedOutputOptions.map(output => {
 		return Object.assign({}, baseOutputOptions, output);
 	});
 
@@ -2394,7 +2402,7 @@ function batchWarnings () {
 					handler.fn( warnings );
 				} else {
 					warnings.forEach( warning => {
-						stderr( `${index$3.bold.yellow('(!)')} ${index$3.bold.yellow( warning.message )}` );
+						stderr( `${chalk.bold.yellow('(!)')} ${chalk.bold.yellow( warning.message )}` );
 
 						if ( warning.url ) { info( warning.url ); }
 
@@ -2404,7 +2412,7 @@ function batchWarnings () {
 								`${relativeId( id )}: (${warning.loc.line}:${warning.loc.column})` :
 								relativeId( id );
 
-							stderr( index$3.bold( relativeId( loc ) ) );
+							stderr( chalk.bold( relativeId( loc ) ) );
 						}
 
 						if ( warning.frame ) { info( warning.frame ); }
@@ -2423,7 +2431,7 @@ const immediateHandlers = {
 		title( `Some options have been renamed` );
 		info( `https://gist.github.com/Rich-Harris/d472c50732dab03efeb37472b08a3f32` );
 		warning.deprecations.forEach(option => {
-			stderr( `${index$3.bold(option.old)} is now ${option.new}` );
+			stderr( `${chalk.bold(option.old)} is now ${option.new}` );
 		});
 	},
 
@@ -2472,7 +2480,7 @@ const deferredHandlers = {
 
 			Array.from( dependencies.keys() ).forEach( dependency => {
 				const importers = dependencies.get( dependency );
-				stderr( `${index$3.bold( dependency )} (imported by ${importers.join( ', ' )})` );
+				stderr( `${chalk.bold( dependency )} (imported by ${importers.join( ', ' )})` );
 			});
 		}
 	},
@@ -2484,9 +2492,9 @@ const deferredHandlers = {
 			info( 'https://github.com/rollup/rollup/wiki/Troubleshooting#name-is-not-exported-by-module' );
 
 			warnings.forEach( warning => {
-				stderr( index$3.bold( warning.importer ) );
+				stderr( chalk.bold( warning.importer ) );
 				stderr( `${warning.missing} is not exported by ${warning.exporter}` );
-				stderr( index$3.grey( warning.frame ) );
+				stderr( chalk.grey( warning.frame ) );
 			});
 		}
 	},
@@ -2522,7 +2530,7 @@ const deferredHandlers = {
 		fn: warnings => {
 			title( `Conflicting re-exports` );
 			warnings.forEach(warning => {
-				stderr( `${index$3.bold(relativeId(warning.reexporter))} re-exports '${warning.name}' from both ${relativeId(warning.sources[0])} and ${relativeId(warning.sources[1])} (will be ignored)` );
+				stderr( `${chalk.bold(relativeId(warning.reexporter))} re-exports '${warning.name}' from both ${relativeId(warning.sources[0])} and ${relativeId(warning.sources[1])} (will be ignored)` );
 			});
 		}
 	},
@@ -2533,7 +2541,7 @@ const deferredHandlers = {
 			title( `Missing global variable ${warnings.length > 1 ? 'names' : 'name'}` );
 			stderr( `Use options.globals to specify browser global variable names corresponding to external modules` );
 			warnings.forEach(warning => {
-				stderr(`${index$3.bold(warning.source)} (guessing '${warning.guess}')`);
+				stderr(`${chalk.bold(warning.source)} (guessing '${warning.guess}')`);
 			});
 		}
 	},
@@ -2578,7 +2586,7 @@ const deferredHandlers = {
 							`${relativeId( warning.id )}: (${warning.loc.line}:${warning.loc.column})` :
 							relativeId( warning.id );
 
-						stderr( index$3.bold( relativeId( loc ) ) );
+						stderr( chalk.bold( relativeId( loc ) ) );
 						if ( warning.frame ) { info( warning.frame ); }
 					});
 				});
@@ -2588,11 +2596,11 @@ const deferredHandlers = {
 };
 
 function title ( str ) {
-	stderr( `${index$3.bold.yellow('(!)')} ${index$3.bold.yellow( str )}` );
+	stderr( `${chalk.bold.yellow('(!)')} ${chalk.bold.yellow( str )}` );
 }
 
 function info ( url ) {
-	stderr( index$3.grey( url ) );
+	stderr( chalk.grey( url ) );
 }
 
 function nest(array, prop) {
@@ -2624,8 +2632,8 @@ function showTruncatedWarnings(warnings) {
 		var id = ref.key;
 		var items = ref.items;
 
-		stderr( index$3.bold( relativeId( id ) ) );
-		stderr( index$3.grey( items[0].frame ) );
+		stderr( chalk.bold( relativeId( id ) ) );
+		stderr( chalk.grey( items[0].frame ) );
 
 		if ( items.length > 1 ) {
 			stderr( `...and ${items.length - 1} other ${items.length > 2 ? 'occurrences' : 'occurrence'}` );
@@ -2649,7 +2657,7 @@ function loadConfigFile (configFile, silent) {
 	})
 		.then( bundle => {
 			if ( !silent && warnings.count > 0 ) {
-				stderr( index$3.bold( `loaded ${relativeId( configFile )} with warnings` ) );
+				stderr( chalk.bold( `loaded ${relativeId( configFile )} with warnings` ) );
 				warnings.flush();
 			}
 
@@ -2701,7 +2709,7 @@ function sequence ( array, fn ) {
 	return promise.then( () => results );
 }
 
-var index$17 = function (ms) {
+var parseMs = function (ms) {
 	if (typeof ms !== 'number') {
 		throw new TypeError('Expected a number');
 	}
@@ -2781,7 +2789,7 @@ var hero = "heroes";
 var hoof = "hooves";
 var hovercraft = "hovercraft";
 var hypothesis = "hypotheses";
-var index$21 = "indices";
+var index = "indices";
 var kakapo = "kakapo";
 var knife = "knives";
 var larva = "larvae";
@@ -2923,7 +2931,7 @@ var irregularPlurals = {
 	hoof: hoof,
 	hovercraft: hovercraft,
 	hypothesis: hypothesis,
-	index: index$21,
+	index: index,
 	kakapo: kakapo,
 	knife: knife,
 	larva: larva,
@@ -3069,7 +3077,7 @@ var irregularPlurals$1 = Object.freeze({
 	hoof: hoof,
 	hovercraft: hovercraft,
 	hypothesis: hypothesis,
-	index: index$21,
+	index: index,
 	kakapo: kakapo,
 	knife: knife,
 	larva: larva,
@@ -3151,7 +3159,7 @@ var irregularPlurals$1 = Object.freeze({
 
 var irregularPlurals$2 = ( irregularPlurals$1 && irregularPlurals ) || irregularPlurals$1;
 
-var index$19 = function (str, plural, count) {
+var plur = function (str, plural, count) {
 	if (typeof plural === 'number') {
 		count = plural;
 	}
@@ -3169,7 +3177,7 @@ var index$19 = function (str, plural, count) {
 	return count === 1 ? str : plural;
 };
 
-var index$16 = createCommonjsModule(function (module) {
+var prettyMs = createCommonjsModule(function (module) {
 'use strict';
 
 
@@ -3183,7 +3191,7 @@ module.exports = (ms, opts) => {
 
 	if (ms < 1000) {
 		const msDecimalDigits = typeof opts.msDecimalDigits === 'number' ? opts.msDecimalDigits : 0;
-		return (msDecimalDigits ? ms.toFixed(msDecimalDigits) : Math.ceil(ms)) + (opts.verbose ? ' ' + index$19('millisecond', Math.ceil(ms)) : 'ms');
+		return (msDecimalDigits ? ms.toFixed(msDecimalDigits) : Math.ceil(ms)) + (opts.verbose ? ' ' + plur('millisecond', Math.ceil(ms)) : 'ms');
 	}
 
 	const ret = [];
@@ -3193,12 +3201,12 @@ module.exports = (ms, opts) => {
 			return;
 		}
 
-		const postfix = opts.verbose ? ' ' + index$19(long, val) : short;
+		const postfix = opts.verbose ? ' ' + plur(long, val) : short;
 
 		ret.push((valStr || val) + postfix);
 	};
 
-	const parsed = index$17(ms);
+	const parsed = parseMs(ms);
 
 	add(Math.trunc(parsed.days / 365), 'year', 'y');
 	add(parsed.days % 365, 'day', 'd');
@@ -3244,7 +3252,7 @@ function build$1 ( inputOptions, outputOptions, warnings, silent ) {
 
 	const start = Date.now();
 	const files = useStdout ? [ 'stdout' ] : outputOptions.map( t => relativeId( t.file ) );
-	if ( !silent ) { stderr( index$3.cyan( `\n${index$3.bold( inputOptions.input )} → ${index$3.bold( files.join( ', ' ) )}...` ) ); }
+	if ( !silent ) { stderr( chalk.cyan( `\n${chalk.bold( inputOptions.input )} → ${chalk.bold( files.join( ', ' ) )}...` ) ); }
 
 	return rollup.rollup( inputOptions )
 		.then( bundle => {
@@ -3275,7 +3283,7 @@ function build$1 ( inputOptions, outputOptions, warnings, silent ) {
 		})
 		.then( () => {
 			warnings.flush();
-			if ( !silent ) { stderr( index$3.green( `created ${index$3.bold( files.join( ', ' ) )} in ${index$3.bold(index$16( Date.now() - start))}` ) ); }
+			if ( !silent ) { stderr( chalk.green( `created ${chalk.bold( files.join( ', ' ) )} in ${chalk.bold(prettyMs( Date.now() - start))}` ) ); }
 		})
 		.catch( handleError );
 }
@@ -3366,7 +3374,7 @@ if (!emitter.infinite) {
   emitter.infinite = true;
 }
 
-var index$22 = function (cb, opts) {
+var signalExit = function (cb, opts) {
   assert.equal(typeof cb, 'function', 'a callback must be provided for exit handler');
 
   if (loaded === false) {
@@ -3494,11 +3502,60 @@ function processEmit (ev, arg) {
   }
 }
 
-index$22.unload = unload_1;
-index$22.signals = signals_1;
-index$22.load = load_1;
+signalExit.unload = unload_1;
+signalExit.signals = signals_1;
+signalExit.load = load_1;
+
+var timeZone = createCommonjsModule(function (module) {
+'use strict';
+module.exports = date => {
+	const offset = (date || new Date()).getTimezoneOffset();
+	const absOffset = Math.abs(offset);
+	const hours = Math.floor(absOffset / 60);
+	const minutes = absOffset % 60;
+	const minutesOut = minutes > 0 ? ':' + ('0' + minutes).slice(-2) : '';
+
+	return (offset < 0 ? '+' : '-') + hours + minutesOut;
+};
+});
+
+var dateTime = createCommonjsModule(function (module) {
+'use strict';
+
+
+module.exports = options => {
+	options = Object.assign({
+		date: new Date(),
+		local: true,
+		showTimeZone: false,
+		showMilliseconds: false
+	}, options);
 
-var index$23 = createCommonjsModule(function (module) {
+	let date = options.date;
+
+	if (options.local) {
+		// Offset the date so it will return the correct value when getting the ISO string
+		date = new Date(date.getTime() - (date.getTimezoneOffset() * 60000));
+	}
+
+	let end = '';
+
+	if (options.showTimeZone) {
+		end = ' UTC' + (options.local ? timeZone(date) : '');
+	}
+
+	if (options.showMilliseconds && date.getUTCMilliseconds() > 0) {
+		end = ` ${date.getUTCMilliseconds()}ms${end}`;
+	}
+
+	return date
+		.toISOString()
+		.replace(/T/, ' ')
+		.replace(/\..+/, end);
+};
+});
+
+var ansiEscapes = createCommonjsModule(function (module) {
 'use strict';
 const x = module.exports;
 const ESC = '\u001B[';
@@ -3625,7 +3682,7 @@ function alternateScreen ( enabled ) {
 			process.stderr.write(HIDE_ALTERNATE_SCREEN);
 		},
 		reset( heading ) {
-			stderr( `${index$23.eraseScreen}${index$23.cursorTo(0, 0)}${heading}` );
+			stderr( `${ansiEscapes.eraseScreen}${ansiEscapes.cursorTo(0, 0)}${heading}` );
 		}
 	};
 }
@@ -3642,7 +3699,7 @@ function watch$1(configFile, configs, command, silent) {
 	let configWatcher;
 
 	function start(configs) {
-		screen.reset( index$3.underline( `rollup v${rollup.VERSION}` ) );
+		screen.reset( chalk.underline( `rollup v${rollup.VERSION}` ) );
 
 		configs = configs.map(options => {
 			const merged = mergeOptions(options, command);
@@ -3683,26 +3740,28 @@ function watch$1(configFile, configs, command, silent) {
 					break;
 
 				case 'START':
-					screen.reset( index$3.underline( `rollup v${rollup.VERSION}` ) );
+					screen.reset( chalk.underline( `rollup v${rollup.VERSION}` ) );
 					break;
 
 				case 'BUNDLE_START':
-					if ( !silent ) { stderr( index$3.cyan( `bundles ${index$3.bold( event.input )} → ${index$3.bold( event.output.map( relativeId ).join( ', ' ) )}...` ) ); }
+					if ( !silent ) { stderr( chalk.cyan( `bundles ${chalk.bold( event.input )} → ${chalk.bold( event.output.map( relativeId ).join( ', ' ) )}...` ) ); }
 					break;
 
 				case 'BUNDLE_END':
 					warnings.flush();
-					if ( !silent ) { stderr( index$3.green( `created ${index$3.bold( event.output.map( relativeId ).join( ', ' ) )} in ${index$3.bold(index$16(event.duration))}` ) ); }
+					if ( !silent ) { stderr( chalk.green( `created ${chalk.bold( event.output.map( relativeId ).join( ', ' ) )} in ${chalk.bold(prettyMs(event.duration))}` ) ); }
 					break;
 
 				case 'END':
-					if ( !silent && isTTY ) { stderr( `\nwaiting for changes...` ); }
+					if ( !silent && isTTY ) {
+						stderr( `\n[${dateTime()}] waiting for changes...` );
+					}
 			}
 		});
 	}
 
 	// catch ctrl+c, kill, and uncaught errors
-	const removeOnExit = index$22(close);
+	const removeOnExit = signalExit(close);
 	process.on('uncaughtException', close);
 
 	// only listen to stdin if it is a pipe
@@ -3800,10 +3859,10 @@ function runRollup ( command ) {
 		if ( configFile.slice( 0, 5 ) === 'node:' ) {
 			const pkgName = configFile.slice( 5 );
 			try {
-				configFile = index$2.resolve( `rollup-config-${pkgName}`, process.cwd() );
+				configFile = requireRelative_1.resolve( `rollup-config-${pkgName}`, process.cwd() );
 			} catch ( err ) {
 				try {
-					configFile = index$2.resolve( pkgName, process.cwd() );
+					configFile = requireRelative_1.resolve( pkgName, process.cwd() );
 				} catch ( err ) {
 					if ( err.code === 'MODULE_NOT_FOUND' ) {
 						handleError({
@@ -3864,7 +3923,7 @@ function execute ( configFile, configs, command ) {
 	}
 }
 
-const command = index$1( process.argv.slice( 2 ), {
+const command = minimist( process.argv.slice( 2 ), {
 	alias: {
 		// Aliases
 		strict: 'useStrict',