rollup 0.45.1 → 0.45.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # rollup changelog
 
+## 0.45.2
+
+* Fix interop when import is a string ([#1486](https://github.com/rollup/rollup/issues/1486))
+* Separate `resolvedIds` from `resolvedExternalIds` ([#1490](https://github.com/rollup/rollup/pull/1490))
+* Add `--extend` flag to CLI ([#1482](https://github.com/rollup/rollup/pull/1482))
+
 ## 0.45.1
 
 * Remove `weak` from `optionalDependencies` ([#1483](https://github.com/rollup/rollup/issues/1483))

package/LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 [these people](https://github.com/rollup/rollup/graphs/contributors)
+Copyright (c) 2017 [these people](https://github.com/rollup/rollup/graphs/contributors)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/bin/rollup

@@ -247,7 +247,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 <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-u, --id                 ID for AMD module (default is anonymous)\n-m, --sourcemap          Generate sourcemap (`-m inline` for inline map)\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\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.45.1";
+var version = "0.45.2";
 
 var modules = {};
 
@@ -751,6 +751,10 @@ function execute ( options, command ) {
 		external = ( optionsExternal || [] ).concat( commandExternal );
 	}
 
+	if (typeof command.extend !== 'undefined') {
+		options.extend = command.extend;
+	}
+
 	if ( command.silent ) {
 		options.onwarn = function () {};
 	}

package/dist/rollup.browser.js

@@ -1,6 +1,6 @@
 /*
-	Rollup.js v0.45.1
-	Mon Jul 10 2017 19:55:25 GMT-0400 (EDT) - commit 87c4733df2225b0d43712823d29b98e847d371c4
+	Rollup.js v0.45.2
+	Wed Jul 12 2017 22:25:07 GMT-0400 (EDT) - commit b7a4edf2b7c26f58c8201a63c820541d9b37186d
 
 
 	https://github.com/rollup/rollup
@@ -8198,6 +8198,7 @@ var Module = function Module (ref) {
 	var ast = ref.ast;
 	var sourceMapChain = ref.sourceMapChain;
 	var resolvedIds = ref.resolvedIds;
+	var resolvedExternalIds = ref.resolvedExternalIds;
 	var bundle = ref.bundle;
 
 	this.code = code;
@@ -8230,6 +8231,7 @@ var Module = function Module (ref) {
 	this.sources = [];
 	this.dependencies = [];
 	this.resolvedIds = resolvedIds || blank();
+	this.resolvedExternalIds = resolvedExternalIds || blank();
 
 	// imports and exports, indexed by local name
 	this.imports = blank();
@@ -8434,21 +8436,23 @@ Module.prototype.bindImportSpecifiers = function bindImportSpecifiers () {
 		keys( specifiers ).forEach( function (name) {
 			var specifier = specifiers[ name ];
 
-			var id = this$1.resolvedIds[ specifier.source ];
+			var id = this$1.resolvedIds[ specifier.source ] || this$1.resolvedExternalIds[ specifier.source ];
 			specifier.module = this$1.bundle.moduleById.get( id );
 		});
 	});
 
 	this.exportAllModules = this.exportAllSources.map( function (source) {
-		var id = this$1.resolvedIds[ source ];
+		var id = this$1.resolvedIds[ source ] || this$1.resolvedExternalIds[ source ];
 		return this$1.bundle.moduleById.get( id );
 	});
 
 	this.sources.forEach( function (source) {
 		var id = this$1.resolvedIds[ source ];
-		var module = this$1.bundle.moduleById.get( id );
 
-		if ( !module.isExternal ) { this$1.dependencies.push( module ); }
+		if ( id ) {
+			var module = this$1.bundle.moduleById.get( id );
+			this$1.dependencies.push( module );
+		}
 	});
 };
 
@@ -8559,7 +8563,8 @@ Module.prototype.toJSON = function toJSON () {
 		originalSourceMap: this.originalSourceMap,
 		ast: this.astClone,
 		sourceMapChain: this.sourceMapChain,
-		resolvedIds: this.resolvedIds
+		resolvedIds: this.resolvedIds,
+		resolvedExternalIds: this.resolvedExternalIds
 	};
 };
 
@@ -8711,7 +8716,7 @@ function getInteropBlock ( bundle, options ) {
 				return ((bundle.varOrConst) + " " + (module.name) + "__default = 'default' in " + (module.name) + " ? " + (module.name) + "['default'] : " + (module.name) + ";");
 			}
 
-			return ((module.name) + " = " + (module.name) + " && 'default' in " + (module.name) + " ? " + (module.name) + "['default'] : " + (module.name) + ";");
+			return ((module.name) + " = " + (module.name) + " && " + (module.name) + ".hasOwnProperty('default') ? " + (module.name) + "['default'] : " + (module.name) + ";");
 		})
 		.filter( Boolean )
 		.join( '\n' );
@@ -10075,7 +10080,7 @@ Bundle.prototype.fetchModule = function fetchModule ( id, importer ) {
 					}
 				});
 				module.exportAllSources.forEach( function (source) {
-					var id = module.resolvedIds[ source ];
+					var id = module.resolvedIds[ source ] || module.resolvedExternalIds[ source ];
 					var exportAllModule = this$1.moduleById.get( id );
 					if ( exportAllModule.isExternal ) { return; }
 
@@ -10125,7 +10130,7 @@ Bundle.prototype.fetchAllDependencies = function fetchAllDependencies ( module )
 				}
 
 				if ( isExternal ) {
-					module.resolvedIds[ source ] = externalId;
+					module.resolvedExternalIds[ source ] = externalId;
 
 					if ( !this$1.moduleById.has( externalId ) ) {
 						var module$1 = new ExternalModule( externalId, this$1.getPath( externalId ) );
@@ -10397,7 +10402,7 @@ Bundle.prototype.warn = function warn ( warning ) {
 	this.onwarn( warning );
 };
 
-var VERSION = '0.45.1';
+var VERSION = '0.45.2';
 
 var ALLOWED_KEYS = [
 	'acorn',