rollup 0.52.2 → 0.52.3

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # rollup changelog
 
+## 0.52.3
+* Properly hoist default exported functions in more situations ([#1799](https://github.com/rollup/rollup/pull/1799))
+* Allow plugin transformations to not overwrite source maps by returning null ([#1797](https://github.com/rollup/rollup/pull/1797))
+* Provide more parameters to "external" handler ([#1792](https://github.com/rollup/rollup/pull/1792))
+
 ## 0.52.2
 * No longer ignore side-effects in JSON.parse and JSON.stringify ([#1785](https://github.com/rollup/rollup/pull/1785))
 * Updated links in warnings ([#1776](https://github.com/rollup/rollup/pull/1776))

package/bin/rollup

@@ -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-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 version = "0.52.2";
+var version = "0.52.3";
 
 var modules = {};
 

package/dist/rollup.browser.js

@@ -1,6 +1,6 @@
 /*
-	Rollup.js v0.52.2
-	Fri Dec 15 2017 18:33:21 GMT+0100 (CET) - commit 223c5f3b43c7acf048f5dc45761ede86c0995285
+	Rollup.js v0.52.3
+	Tue Dec 19 2017 11:30:33 GMT+0100 (CET) - commit a9c8ae524e61030d22e564e8f02b5c46cd4f353c
 
 
 	https://github.com/rollup/rollup
@@ -12230,6 +12230,19 @@ class ExportAllDeclaration extends Node$1 {
 
 const functionOrClassDeclaration = /^(?:Function|Class)Declaration/;
 
+function buildRegexWithSpaces (re) {
+	const spaceOrComment = "(?:" + [
+		/\s/.source, // Space
+		/\/\/.*[\n\r]/.source, // Single line comment
+		/\/\*[^]*?\*\//.source ].join( "|" ) + ")";
+	return new RegExp( re.source.replace( /\s|\\s/g, spaceOrComment ), re.flags );
+}
+
+const sourceRE = {
+	exportDefault: buildRegexWithSpaces( /^ *export +default */ ),
+	declarationHeader: buildRegexWithSpaces( /^ *export +default +(?:(?:async +)?function(?: *\*)?|class)/ ),
+};
+
 class ExportDefaultDeclaration extends Node$1 {
 	bindNode () {
 		if ( this._declarationName ) {
@@ -12258,13 +12271,13 @@ class ExportDefaultDeclaration extends Node$1 {
 	render ( code, es ) {
 		const remove = () => { code.remove( this.leadingCommentStart || this.start, this.next || this.end ); };
 		const removeExportDefault = () => { code.remove( this.start, declaration_start ); };
-		
+
 		const treeshakeable = this.module.bundle.treeshake && !this.included && !this.declaration.included;
 		const name = this.variable.getName( es );
 		const statementStr = code.original.slice( this.start, this.end );
 
 		// paren workaround: find first non-whitespace character position after `export default`
-		const declaration_start = this.start + statementStr.match( /^\s*export\s+default\s*/ )[ 0 ].length;
+		const declaration_start = this.start + statementStr.match( sourceRE.exportDefault )[ 0 ].length;
 
 		if ( functionOrClassDeclaration.test(this.declaration.type) ) {
 			if ( treeshakeable ) {
@@ -12273,7 +12286,7 @@ class ExportDefaultDeclaration extends Node$1 {
 
 			// Add the id to anonymous declarations
 			if ( !this.declaration.id ) {
-				const id_insertPos = this.start + statementStr.match( /^\s*export\s+default\s*(?:function|class)/ )[ 0 ].length;
+				const id_insertPos = this.start + statementStr.match( sourceRE.declarationHeader )[ 0 ].length;
 				code.appendLeft( id_insertPos, ` ${name}` );
 			}
 
@@ -12296,7 +12309,7 @@ class ExportDefaultDeclaration extends Node$1 {
 				removeExportDefault();
 			}
 		}
-		
+
 		super.render( code, es );
 	}
 }
@@ -17593,8 +17606,8 @@ function transform ( bundle, source, id, plugins ) {
 					if ( typeof result === 'string' ) {
 						result = {
 							code: result,
-							ast: null,
-							map: null
+							ast: undefined,
+							map: undefined
 						};
 					}
 
@@ -17607,7 +17620,11 @@ function transform ( bundle, source, id, plugins ) {
 						result.map.mappings = decode$$1( result.map.mappings );
 					}
 
-					sourcemapChain.push( result.map || { missing: true, plugin: plugin.name }); // lil' bit hacky but it works
+					// strict null check allows 'null' maps to not be pushed to the chain, while 'undefined' gets the missing map warning
+					if ( result.map !== null ) {
+						sourcemapChain.push( result.map || { missing: true, plugin: plugin.name });
+					}
+
 					ast = result.ast;
 
 					return result.code;
@@ -17635,7 +17652,7 @@ function transformBundle ( code, plugins, sourcemapChain, options ) {
 				if ( typeof result === 'string' ) {
 					result = {
 						code: result,
-						map: null
+						map: undefined
 					};
 				}
 
@@ -17644,7 +17661,10 @@ function transformBundle ( code, plugins, sourcemapChain, options ) {
 					map.mappings = decode$$1( map.mappings );
 				}
 
-				sourcemapChain.push( map );
+				// strict null check allows 'null' maps to not be pushed to the chain, while 'undefined' gets the missing map warning
+				if ( map !== null ) {
+					sourcemapChain.push( map || { missing: true, plugin: plugin.name });
+				}
 
 				return result.code;
 			}).catch( err => {
@@ -17967,7 +17987,7 @@ class Bundle$$1 {
 		}
 
 		this.resolveId = first(
-			[ id => this.isExternal( id ) ? false : null ]
+			[ ( id, parentId ) => this.isExternal( id, parentId, false ) ? false : null ]
 				.concat( this.plugins.map( plugin => plugin.resolveId ).filter( Boolean ) )
 				.concat( resolveId )
 		);
@@ -18317,7 +18337,7 @@ class Bundle$$1 {
 			return ( resolvedId ? Promise.resolve( resolvedId ) : this.resolveId( source, module.id ) )
 				.then( resolvedId => {
 					const externalId = resolvedId || (isRelative( source ) ? resolve( module.id, '..', source ) : source);
-					let isExternal = this.isExternal( externalId );
+					let isExternal = this.isExternal( externalId, module.id, true );
 
 					if ( !resolvedId && !isExternal ) {
 						if ( isRelative( source ) ) {
@@ -18825,7 +18845,7 @@ function rollup ( inputOptions ) {
 	}
 }
 
-var version$1 = "0.52.2";
+var version$1 = "0.52.3";
 
 exports.rollup = rollup;
 exports.VERSION = version$1;

package/dist/rollup.es.js

@@ -1,6 +1,6 @@
 /*
-	Rollup.js v0.52.2
-	Fri Dec 15 2017 18:33:21 GMT+0100 (CET) - commit 223c5f3b43c7acf048f5dc45761ede86c0995285
+	Rollup.js v0.52.3
+	Tue Dec 19 2017 11:30:33 GMT+0100 (CET) - commit a9c8ae524e61030d22e564e8f02b5c46cd4f353c
 
 
 	https://github.com/rollup/rollup
@@ -12182,6 +12182,19 @@ class ExportAllDeclaration extends Node$1 {
 
 const functionOrClassDeclaration = /^(?:Function|Class)Declaration/;
 
+function buildRegexWithSpaces (re) {
+	const spaceOrComment = "(?:" + [
+		/\s/.source, // Space
+		/\/\/.*[\n\r]/.source, // Single line comment
+		/\/\*[^]*?\*\//.source ].join( "|" ) + ")";
+	return new RegExp( re.source.replace( /\s|\\s/g, spaceOrComment ), re.flags );
+}
+
+const sourceRE = {
+	exportDefault: buildRegexWithSpaces( /^ *export +default */ ),
+	declarationHeader: buildRegexWithSpaces( /^ *export +default +(?:(?:async +)?function(?: *\*)?|class)/ ),
+};
+
 class ExportDefaultDeclaration extends Node$1 {
 	bindNode () {
 		if ( this._declarationName ) {
@@ -12210,13 +12223,13 @@ class ExportDefaultDeclaration extends Node$1 {
 	render ( code, es ) {
 		const remove = () => { code.remove( this.leadingCommentStart || this.start, this.next || this.end ); };
 		const removeExportDefault = () => { code.remove( this.start, declaration_start ); };
-		
+
 		const treeshakeable = this.module.bundle.treeshake && !this.included && !this.declaration.included;
 		const name = this.variable.getName( es );
 		const statementStr = code.original.slice( this.start, this.end );
 
 		// paren workaround: find first non-whitespace character position after `export default`
-		const declaration_start = this.start + statementStr.match( /^\s*export\s+default\s*/ )[ 0 ].length;
+		const declaration_start = this.start + statementStr.match( sourceRE.exportDefault )[ 0 ].length;
 
 		if ( functionOrClassDeclaration.test(this.declaration.type) ) {
 			if ( treeshakeable ) {
@@ -12225,7 +12238,7 @@ class ExportDefaultDeclaration extends Node$1 {
 
 			// Add the id to anonymous declarations
 			if ( !this.declaration.id ) {
-				const id_insertPos = this.start + statementStr.match( /^\s*export\s+default\s*(?:function|class)/ )[ 0 ].length;
+				const id_insertPos = this.start + statementStr.match( sourceRE.declarationHeader )[ 0 ].length;
 				code.appendLeft( id_insertPos, ` ${name}` );
 			}
 
@@ -12248,7 +12261,7 @@ class ExportDefaultDeclaration extends Node$1 {
 				removeExportDefault();
 			}
 		}
-		
+
 		super.render( code, es );
 	}
 }
@@ -17545,8 +17558,8 @@ function transform ( bundle, source, id, plugins ) {
 					if ( typeof result === 'string' ) {
 						result = {
 							code: result,
-							ast: null,
-							map: null
+							ast: undefined,
+							map: undefined
 						};
 					}
 
@@ -17559,7 +17572,11 @@ function transform ( bundle, source, id, plugins ) {
 						result.map.mappings = decode$$1( result.map.mappings );
 					}
 
-					sourcemapChain.push( result.map || { missing: true, plugin: plugin.name }); // lil' bit hacky but it works
+					// strict null check allows 'null' maps to not be pushed to the chain, while 'undefined' gets the missing map warning
+					if ( result.map !== null ) {
+						sourcemapChain.push( result.map || { missing: true, plugin: plugin.name });
+					}
+
 					ast = result.ast;
 
 					return result.code;
@@ -17587,7 +17604,7 @@ function transformBundle ( code, plugins, sourcemapChain, options ) {
 				if ( typeof result === 'string' ) {
 					result = {
 						code: result,
-						map: null
+						map: undefined
 					};
 				}
 
@@ -17596,7 +17613,10 @@ function transformBundle ( code, plugins, sourcemapChain, options ) {
 					map.mappings = decode$$1( map.mappings );
 				}
 
-				sourcemapChain.push( map );
+				// strict null check allows 'null' maps to not be pushed to the chain, while 'undefined' gets the missing map warning
+				if ( map !== null ) {
+					sourcemapChain.push( map || { missing: true, plugin: plugin.name });
+				}
 
 				return result.code;
 			}).catch( err => {
@@ -17919,7 +17939,7 @@ class Bundle$$1 {
 		}
 
 		this.resolveId = first(
-			[ id => this.isExternal( id ) ? false : null ]
+			[ ( id, parentId ) => this.isExternal( id, parentId, false ) ? false : null ]
 				.concat( this.plugins.map( plugin => plugin.resolveId ).filter( Boolean ) )
 				.concat( resolveId )
 		);
@@ -18269,7 +18289,7 @@ class Bundle$$1 {
 			return ( resolvedId ? Promise.resolve( resolvedId ) : this.resolveId( source, module.id ) )
 				.then( resolvedId => {
 					const externalId = resolvedId || (isRelative( source ) ? resolve( module.id, '..', source ) : source);
-					let isExternal = this.isExternal( externalId );
+					let isExternal = this.isExternal( externalId, module.id, true );
 
 					if ( !resolvedId && !isExternal ) {
 						if ( isRelative( source ) ) {
@@ -22609,7 +22629,7 @@ function watch$1(configs) {
 	return new Watcher(configs);
 }
 
-var version$1 = "0.52.2";
+var version$1 = "0.52.3";
 
 export { rollup, watch$1 as watch, version$1 as VERSION };
 //# sourceMappingURL=rollup.es.js.map

package/dist/rollup.js

@@ -1,6 +1,6 @@
 /*
-	Rollup.js v0.52.2
-	Fri Dec 15 2017 18:33:21 GMT+0100 (CET) - commit 223c5f3b43c7acf048f5dc45761ede86c0995285
+	Rollup.js v0.52.3
+	Tue Dec 19 2017 11:30:33 GMT+0100 (CET) - commit a9c8ae524e61030d22e564e8f02b5c46cd4f353c
 
 
 	https://github.com/rollup/rollup
@@ -12189,6 +12189,19 @@ class ExportAllDeclaration extends Node$1 {
 
 const functionOrClassDeclaration = /^(?:Function|Class)Declaration/;
 
+function buildRegexWithSpaces (re) {
+	const spaceOrComment = "(?:" + [
+		/\s/.source, // Space
+		/\/\/.*[\n\r]/.source, // Single line comment
+		/\/\*[^]*?\*\//.source ].join( "|" ) + ")";
+	return new RegExp( re.source.replace( /\s|\\s/g, spaceOrComment ), re.flags );
+}
+
+const sourceRE = {
+	exportDefault: buildRegexWithSpaces( /^ *export +default */ ),
+	declarationHeader: buildRegexWithSpaces( /^ *export +default +(?:(?:async +)?function(?: *\*)?|class)/ ),
+};
+
 class ExportDefaultDeclaration extends Node$1 {
 	bindNode () {
 		if ( this._declarationName ) {
@@ -12217,13 +12230,13 @@ class ExportDefaultDeclaration extends Node$1 {
 	render ( code, es ) {
 		const remove = () => { code.remove( this.leadingCommentStart || this.start, this.next || this.end ); };
 		const removeExportDefault = () => { code.remove( this.start, declaration_start ); };
-		
+
 		const treeshakeable = this.module.bundle.treeshake && !this.included && !this.declaration.included;
 		const name = this.variable.getName( es );
 		const statementStr = code.original.slice( this.start, this.end );
 
 		// paren workaround: find first non-whitespace character position after `export default`
-		const declaration_start = this.start + statementStr.match( /^\s*export\s+default\s*/ )[ 0 ].length;
+		const declaration_start = this.start + statementStr.match( sourceRE.exportDefault )[ 0 ].length;
 
 		if ( functionOrClassDeclaration.test(this.declaration.type) ) {
 			if ( treeshakeable ) {
@@ -12232,7 +12245,7 @@ class ExportDefaultDeclaration extends Node$1 {
 
 			// Add the id to anonymous declarations
 			if ( !this.declaration.id ) {
-				const id_insertPos = this.start + statementStr.match( /^\s*export\s+default\s*(?:function|class)/ )[ 0 ].length;
+				const id_insertPos = this.start + statementStr.match( sourceRE.declarationHeader )[ 0 ].length;
 				code.appendLeft( id_insertPos, ` ${name}` );
 			}
 
@@ -12255,7 +12268,7 @@ class ExportDefaultDeclaration extends Node$1 {
 				removeExportDefault();
 			}
 		}
-		
+
 		super.render( code, es );
 	}
 }
@@ -17552,8 +17565,8 @@ function transform ( bundle, source, id, plugins ) {
 					if ( typeof result === 'string' ) {
 						result = {
 							code: result,
-							ast: null,
-							map: null
+							ast: undefined,
+							map: undefined
 						};
 					}
 
@@ -17566,7 +17579,11 @@ function transform ( bundle, source, id, plugins ) {
 						result.map.mappings = decode$$1( result.map.mappings );
 					}
 
-					sourcemapChain.push( result.map || { missing: true, plugin: plugin.name }); // lil' bit hacky but it works
+					// strict null check allows 'null' maps to not be pushed to the chain, while 'undefined' gets the missing map warning
+					if ( result.map !== null ) {
+						sourcemapChain.push( result.map || { missing: true, plugin: plugin.name });
+					}
+
 					ast = result.ast;
 
 					return result.code;
@@ -17594,7 +17611,7 @@ function transformBundle ( code, plugins, sourcemapChain, options ) {
 				if ( typeof result === 'string' ) {
 					result = {
 						code: result,
-						map: null
+						map: undefined
 					};
 				}
 
@@ -17603,7 +17620,10 @@ function transformBundle ( code, plugins, sourcemapChain, options ) {
 					map.mappings = decode$$1( map.mappings );
 				}
 
-				sourcemapChain.push( map );
+				// strict null check allows 'null' maps to not be pushed to the chain, while 'undefined' gets the missing map warning
+				if ( map !== null ) {
+					sourcemapChain.push( map || { missing: true, plugin: plugin.name });
+				}
 
 				return result.code;
 			}).catch( err => {
@@ -17926,7 +17946,7 @@ class Bundle$$1 {
 		}
 
 		this.resolveId = first(
-			[ id => this.isExternal( id ) ? false : null ]
+			[ ( id, parentId ) => this.isExternal( id, parentId, false ) ? false : null ]
 				.concat( this.plugins.map( plugin => plugin.resolveId ).filter( Boolean ) )
 				.concat( resolveId )
 		);
@@ -18276,7 +18296,7 @@ class Bundle$$1 {
 			return ( resolvedId ? Promise.resolve( resolvedId ) : this.resolveId( source, module.id ) )
 				.then( resolvedId => {
 					const externalId = resolvedId || (isRelative( source ) ? path.resolve( module.id, '..', source ) : source);
-					let isExternal = this.isExternal( externalId );
+					let isExternal = this.isExternal( externalId, module.id, true );
 
 					if ( !resolvedId && !isExternal ) {
 						if ( isRelative( source ) ) {
@@ -22616,7 +22636,7 @@ function watch$1(configs) {
 	return new Watcher(configs);
 }
 
-var version$1 = "0.52.2";
+var version$1 = "0.52.3";
 
 exports.rollup = rollup;
 exports.watch = watch$1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "0.52.2",
+  "version": "0.52.3",
   "description": "Next-generation ES6 module bundler",
   "main": "dist/rollup.js",
   "module": "dist/rollup.es.js",