rollup 0.25.4 → 0.25.8

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # rollup changelog
 
+## 0.25.8
+
+* Unixize entry path ([#586](https://github.com/rollup/rollup/pull/586))
+
+## 0.25.7
+
+* Expand deshadowed shorthand properties ([#575](https://github.com/rollup/rollup/issues/575))
+* Allow external files to be non-existent ([#532](https://github.com/rollup/rollup/issues/532))
+
+## 0.25.6
+
+* Fix a regression introduced by #566 ([#569](https://github.com/rollup/rollup/issues/569))
+* Prune dead conditional expressions more carefully ([#567](https://github.com/rollup/rollup/issues/567))
+
+## 0.25.5
+
+* Make sure shorthand destructuring assignments don't break ([#528](https://github.com/rollup/rollup/issues/528))
+* Allow 'exports' key ([#542](https://github.com/rollup/rollup/issues/542))
+* Ensure `foo.  bar` where `foo` is a namespace import is rewritten correctly ([#566](https://github.com/rollup/rollup/issues/566))
+* Fix an edge case for exported globals (e.g. `export { document }`) ([#562](https://github.com/rollup/rollup/issues/562))
+
 ## 0.25.4
 
 * Fix misnamed exports of default imports in ES bundles ([#513](https://github.com/rollup/rollup/issues/513))

package/dist/rollup.browser.js

@@ -1,6 +1,6 @@
 /*
-	Rollup.js v0.25.4
-	Sun Feb 14 2016 10:51:33 GMT-0500 (EST) - commit 7c07a77e2e2d09bd72ea36af1cb6adeb41a20804
+	Rollup.js v0.25.8
+	Sun Apr 03 2016 10:31:30 GMT-0400 (EDT) - commit 49e9fac201793b7590f70e8ece9434fb71605ee3
 
 
 	https://github.com/rollup/rollup
@@ -4353,7 +4353,7 @@
 
   	var root = node;
   	while (root.type === 'MemberExpression') {
-  		this.parts.unshift(root.property.name);
+  		this.parts.unshift(root.property);
   		root = root.object;
   	}
 
@@ -4579,9 +4579,9 @@
   		// if we have e.g. `foo.bar`, we can optimise
   		// the reference by pointing directly to `bar`
   		if (reference.parts.length) {
-  			reference.name = reference.parts.shift();
-
-  			reference.end += reference.name.length + 1; // TODO this is brittle
+  			var ref = reference.parts.shift();
+  			reference.name = ref.name;
+  			reference.end = ref.end;
 
   			var original = this.originals[reference.name];
 
@@ -4907,7 +4907,7 @@
   		var readDepth = 0;
 
   		walk(this.node, {
-  			enter: function (node, parent) {
+  			enter: function (node, parent, prop) {
   				// warn about eval
   				if (node.type === 'CallExpression' && node.callee.name === 'eval' && !scope.contains('eval')) {
   					module.bundle.onwarn('Use of `eval` (in ' + module.id + ') is discouraged, as it may cause issues with minification. See https://github.com/rollup/rollup/wiki/Troubleshooting#avoiding-eval for more details');
@@ -4924,15 +4924,6 @@
   				if (node._scope) scope = node._scope;
   				if (/Function/.test(node.type)) readDepth += 1;
 
-  				// special case – shorthand properties. because node.key === node.value,
-  				// we can't differentiate once we've descended into the node
-  				if (node.type === 'Property' && node.shorthand && parent.type !== 'ObjectPattern') {
-  					var reference = new Reference(node.key, scope);
-  					reference.isShorthandProperty = true; // TODO feels a bit kludgy
-  					references.push(reference);
-  					return this.skip();
-  				}
-
   				var isReassignment = undefined;
 
   				if (parent && isModifierNode(parent)) {
@@ -4966,9 +4957,19 @@
   					// with the parent scope
   					var referenceScope = parent.type === 'FunctionDeclaration' && node === parent.id ? scope.parent : scope;
 
+  					var isShorthandProperty = parent.type === 'Property' && parent.shorthand;
+
+  					// Since `node.key` can equal `node.value` for shorthand properties
+  					// we must use the `prop` argument provided by `estree-walker` to determine
+  					// if we're looking at the key or the value.
+  					// If they are equal, we'll return to not create duplicate references.
+  					if (isShorthandProperty && parent.value === parent.key && prop === 'value') {
+  						return;
+  					}
+
   					var reference = new Reference(node, referenceScope, statement);
   					reference.isReassignment = isReassignment;
-
+  					reference.isShorthandProperty = isShorthandProperty;
   					references.push(reference);
 
   					this.skip(); // don't descend from `foo.bar.baz` into `foo.bar`
@@ -5271,7 +5272,7 @@
   			var declaration = _this4.declarations[name];
   			var statement = declaration.statement;
 
-  			if (statement.node.type !== 'VariableDeclaration') return;
+  			if (!statement || statement.node.type !== 'VariableDeclaration') return;
 
   			var init = statement.node.declarations[0].init;
   			if (!init || init.type === 'FunctionExpression') return;
@@ -5393,7 +5394,7 @@
   		}
 
   		walk(ast, {
-  			enter: function (node, parent, prop) {
+  			enter: function (node) {
   				// eliminate dead branches early
   				if (node.type === 'IfStatement') {
   					if (isFalsy(node.test)) {
@@ -5403,7 +5404,15 @@
   						_this7.magicString.overwrite(node.alternate.start, node.alternate.end, '{}');
   						node.alternate = emptyBlockStatement(node.alternate.start, node.alternate.end);
   					}
-  				} else if (node.type === 'ConditionalExpression') {
+  				}
+
+  				_this7.magicString.addSourcemapLocation(node.start);
+  				_this7.magicString.addSourcemapLocation(node.end);
+  			},
+
+  			leave: function (node, parent, prop) {
+  				// eliminate dead branches early
+  				if (node.type === 'ConditionalExpression') {
   					if (isFalsy(node.test)) {
   						_this7.magicString.remove(node.start, node.alternate.start);
   						parent[prop] = node.alternate;
@@ -5413,9 +5422,6 @@
   						parent[prop] = node.consequent;
   					}
   				}
-
-  				_this7.magicString.addSourcemapLocation(node.start);
-  				_this7.magicString.addSourcemapLocation(node.end);
   			}
   		});
 
@@ -5607,7 +5613,8 @@
   			if (keys(toDeshadow).length) {
   				statement.references.forEach(function (reference) {
   					if (!reference.rewritten && reference.name in toDeshadow) {
-  						magicString.overwrite(reference.start, reference.end, toDeshadow[reference.name], true);
+  						var replacement = toDeshadow[reference.name];
+  						magicString.overwrite(reference.start, reference.end, reference.isShorthandProperty ? reference.name + ': ' + replacement : replacement, true);
   					}
   				});
   			}
@@ -6571,7 +6578,7 @@
   			}
   		});
 
-  		this.entry = options.entry;
+  		this.entry = unixizePath(options.entry);
   		this.entryModule = null;
 
   		this.resolveId = first([function (id) {
@@ -6740,8 +6747,15 @@
 
   		return mapSequence(module.sources, function (source) {
   			return _this4.resolveId(source, module.id).then(function (resolvedId) {
-  				// If the `resolvedId` is supposed to be external, make it so.
-  				var forcedExternal = resolvedId && ~_this4.external.indexOf(resolvedId.replace(/[\/\\]/g, '/'));
+  				var externalName = undefined;
+  				if (resolvedId) {
+  					// If the `resolvedId` is supposed to be external, make it so.
+  					externalName = resolvedId.replace(/[\/\\]/g, '/');
+  				} else if (isRelative(source)) {
+  					// This could be an external, relative dependency, based on the current module's parent dir.
+  					externalName = resolve(module.id, '..', source);
+  				}
+  				var forcedExternal = externalName && ~_this4.external.indexOf(externalName);
 
   				if (!resolvedId || forcedExternal) {
   					if (!forcedExternal) {
@@ -6923,9 +6937,9 @@
   	return Bundle;
   })();
 
-  var VERSION = '0.25.4';
+  var VERSION = '0.25.8';
 
-  var ALLOWED_KEYS = ['banner', 'dest', 'entry', 'external', 'footer', 'format', 'globals', 'indent', 'intro', 'moduleId', 'moduleName', 'onwarn', 'outro', 'plugins', 'sourceMap'];
+  var ALLOWED_KEYS = ['banner', 'dest', 'entry', 'exports', 'external', 'footer', 'format', 'globals', 'indent', 'intro', 'moduleId', 'moduleName', 'onwarn', 'outro', 'plugins', 'sourceMap'];
 
   function rollup(options) {
   	if (!options || !options.entry) {