Merge pull request #884 from rollup/gh-880

ensure intro appears before interop block

src/Bundle.js

@@ -312,21 +312,21 @@ export default class Bundle {
 			}
 		});
 
-		const intro = [ options.intro ]
+		let intro = [ options.intro ]
 			.concat(
 				this.plugins.map( plugin => plugin.intro && plugin.intro() )
 			)
 			.filter( Boolean )
 			.join( '\n\n' );
 
-		if ( intro ) magicString.prepend( intro + '\n' );
+		if ( intro ) intro += '\n';
 
 		const indentString = getIndentString( magicString, options );
 
 		const finalise = finalisers[ format ];
 		if ( !finalise ) throw new Error( `You must specify an output type - valid options are ${keys( finalisers ).join( ', ' )}` );
 
-		magicString = finalise( this, magicString.trim(), { exportMode, indentString }, options );
+		magicString = finalise( this, magicString.trim(), { exportMode, indentString, intro }, options );
 
 		const banner = [ options.banner ]
 			.concat( this.plugins.map( plugin => plugin.banner ) )

src/finalisers/amd.js

@@ -3,7 +3,7 @@ import getInteropBlock from './shared/getInteropBlock.js';
 import getExportBlock from './shared/getExportBlock.js';
 import esModuleExport from './shared/esModuleExport.js';
 
-export default function amd ( bundle, magicString, { exportMode, indentString }, options ) {
+export default function amd ( bundle, magicString, { exportMode, indentString, intro }, options ) {
 	const deps = bundle.externalModules.map( quotePath );
 	const args = bundle.externalModules.map( getName );
 
@@ -17,12 +17,14 @@ export default function amd ( bundle, magicString, { exportMode, indentString },
 		( deps.length ? `[${deps.join( ', ' )}], ` : `` );
 
 	const useStrict = options.useStrict !== false ? ` 'use strict';` : ``;
-	const intro = `define(${params}function (${args.join( ', ' )}) {${useStrict}\n\n`;
+	const wrapperStart = `define(${params}function (${args.join( ', ' )}) {${useStrict}\n\n`;
 
 	// var foo__default = 'default' in foo ? foo['default'] : foo;
 	const interopBlock = getInteropBlock( bundle );
 	if ( interopBlock ) magicString.prepend( interopBlock + '\n\n' );
 
+	if ( intro ) magicString.prepend( intro );
+
 	const exportBlock = getExportBlock( bundle.entryModule, exportMode );
 	if ( exportBlock ) magicString.append( '\n\n' + exportBlock );
 	if ( exportMode === 'named' ) magicString.append( `\n\n${esModuleExport}` );
@@ -31,5 +33,5 @@ export default function amd ( bundle, magicString, { exportMode, indentString },
 	return magicString
 		.indent( indentString )
 		.append( '\n\n});' )
-		.prepend( intro );
+		.prepend( wrapperStart );
 }

src/finalisers/cjs.js

@@ -1,8 +1,8 @@
 import getExportBlock from './shared/getExportBlock.js';
 import esModuleExport from './shared/esModuleExport.js';
 
-export default function cjs ( bundle, magicString, { exportMode }, options ) {
+export default function cjs ( bundle, magicString, { exportMode, intro }, options ) {
-	let intro = ( options.useStrict === false ? `` : `'use strict';\n\n` ) +
+	intro = ( options.useStrict === false ? intro : `'use strict';\n\n${intro}` ) +
 	        ( exportMode === 'named' ? `${esModuleExport}\n\n` : '' );
 
 	let needsInterop = false;

src/finalisers/es.js

@@ -4,7 +4,7 @@ function notDefault ( name ) {
 	return name !== 'default';
 }
 
-export default function es ( bundle, magicString, config, options ) {
+export default function es ( bundle, magicString, { intro }, options ) {
 	const importBlock = bundle.externalModules
 		.map( module => {
 			const specifiers = [];
@@ -49,9 +49,8 @@ export default function es ( bundle, magicString, config, options ) {
 		})
 		.join( '\n' );
 
-	if ( importBlock ) {
+	if ( importBlock ) intro += importBlock + '\n\n';
-		magicString.prepend( importBlock + '\n\n' );
+	if ( intro ) magicString.prepend( intro );
-	}
 
 	const module = bundle.entryModule;
 

src/finalisers/iife.js

@@ -16,7 +16,7 @@ function setupNamespace ( keypath ) {
 		.join( '\n' ) + '\n';
 }
 
-export default function iife ( bundle, magicString, { exportMode, indentString }, options ) {
+export default function iife ( bundle, magicString, { exportMode, indentString, intro }, options ) {
 	const globalNameMaker = getGlobalNameMaker( options.globals || blank(), bundle.onwarn );
 
 	const name = options.moduleName;
@@ -35,29 +35,31 @@ export default function iife ( bundle, magicString, { exportMode, indentString }
 		args.unshift( 'exports' );
 	}
 
-	const useStrict = options.useStrict !== false ? `'use strict';` : ``;
+	const useStrict = options.useStrict !== false ? `${indentString}'use strict';\n\n` : ``;
 
-	let intro = `(function (${args}) {\n`;
+	let wrapperIntro = `(function (${args}) {\n${useStrict}`;
-	const outro = `\n\n}(${dependencies}));`;
+	const wrapperOutro = `\n\n}(${dependencies}));`;
 
 	if ( exportMode === 'default' ) {
-		intro = ( isNamespaced ? `this.` : `${bundle.varOrConst} ` ) + `${name} = ${intro}`;
+		wrapperIntro = ( isNamespaced ? `this.` : `${bundle.varOrConst} ` ) + `${name} = ${wrapperIntro}`;
 	}
 
 	if ( isNamespaced ) {
-		intro = setupNamespace( name ) + intro;
+		wrapperIntro = setupNamespace( name ) + wrapperIntro;
 	}
 
 	// var foo__default = 'default' in foo ? foo['default'] : foo;
 	const interopBlock = getInteropBlock( bundle );
 	if ( interopBlock ) magicString.prepend( interopBlock + '\n\n' );
-	if ( useStrict ) magicString.prepend( useStrict + '\n\n' );
+
+	if ( intro ) magicString.prepend( intro );
+
 	const exportBlock = getExportBlock( bundle.entryModule, exportMode );
 	if ( exportBlock ) magicString.append( '\n\n' + exportBlock );
 	if ( options.outro ) magicString.append( `\n${options.outro}` );
 
 	return magicString
 		.indent( indentString )
-		.prepend( intro )
+		.prepend( wrapperIntro )
-		.append( outro );
+		.append( wrapperOutro );
 }

src/finalisers/umd.js

@@ -16,7 +16,9 @@ function setupNamespace ( name ) {
 		.join( ', ' );
 }
 
-export default function umd ( bundle, magicString, { exportMode, indentString }, options ) {
+const wrapperOutro = '\n\n})));';
+
+export default function umd ( bundle, magicString, { exportMode, indentString, intro }, options ) {
 	if ( exportMode !== 'none' && !options.moduleName ) {
 		throw new Error( 'You must supply options.moduleName for UMD bundles' );
 	}
@@ -54,7 +56,7 @@ export default function umd ( bundle, magicString, { exportMode, indentString },
 				exports.noConflict = function() { global.${options.moduleName} = current; return exports; };
 			})()` : `(${defaultExport}factory(${globalDeps}))`;
 
-	const intro =
+	const wrapperIntro =
 		`(function (global, factory) {
 			typeof exports === 'object' && typeof module !== 'undefined' ? ${cjsExport}factory(${cjsDeps.join( ', ' )}) :
 			typeof define === 'function' && define.amd ? define(${amdParams}factory) :
@@ -67,6 +69,8 @@ export default function umd ( bundle, magicString, { exportMode, indentString },
 	const interopBlock = getInteropBlock( bundle );
 	if ( interopBlock ) magicString.prepend( interopBlock + '\n\n' );
 
+	if ( intro ) magicString.prepend( intro );
+
 	const exportBlock = getExportBlock( bundle.entryModule, exportMode );
 	if ( exportBlock ) magicString.append( '\n\n' + exportBlock );
 	if ( exportMode === 'named' ) magicString.append( `\n\n${esModuleExport}` );
@@ -75,6 +79,6 @@ export default function umd ( bundle, magicString, { exportMode, indentString },
 	return magicString
 		.trim()
 		.indent( indentString )
-		.append( '\n\n})));' )
+		.append( wrapperOutro )
-		.prepend( intro );
+		.prepend( wrapperIntro );
 }

test/form/intro-and-outro/_config.js

@@ -3,6 +3,7 @@ module.exports = {
 	options: {
 		intro: '/* this is an intro */',
 		outro: '/* this is an outro */',
-		moduleName: 'foo'
+		moduleName: 'foo',
+		external: [ 'external' ]
 	}
 };

test/form/intro-and-outro/_expected/amd.js

@@ -1,7 +1,10 @@
-define(function () { 'use strict';
+define(['external'], function (a) { 'use strict';
 
 	/* this is an intro */
-	console.log( 'hello world' );
+	var a__default = 'default' in a ? a['default'] : a;
+
+	console.log( a__default );
+	console.log( a.b );
 
 	var main = 42;
 

test/form/intro-and-outro/_expected/cjs.js

@@ -1,7 +1,13 @@
 'use strict';
 
 /* this is an intro */
-console.log( 'hello world' );
+function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+
+var a = require('external');
+var a__default = _interopDefault(a);
+
+console.log( a__default );
+console.log( a.b );
 
 var main = 42;
 

test/form/intro-and-outro/_expected/es.js

@@ -1,5 +1,8 @@
 /* this is an intro */
-console.log( 'hello world' );
+import a, { b } from 'external';
+
+console.log( a );
+console.log( b );
 
 var main = 42;
 

test/form/intro-and-outro/_expected/iife.js

@@ -1,12 +1,15 @@
-var foo = (function () {
+var foo = (function (a) {
 	'use strict';
 
 	/* this is an intro */
-	console.log( 'hello world' );
+	var a__default = 'default' in a ? a['default'] : a;
+
+	console.log( a__default );
+	console.log( a.b );
 
 	var main = 42;
 
 	return main;
 	/* this is an outro */
 
-}());
+}(a));

test/form/intro-and-outro/_expected/umd.js

@@ -1,11 +1,14 @@
 (function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('external')) :
-	typeof define === 'function' && define.amd ? define(factory) :
+	typeof define === 'function' && define.amd ? define(['external'], factory) :
-	(global.foo = factory());
+	(global.foo = factory(global.a));
-}(this, (function () { 'use strict';
+}(this, (function (a) { 'use strict';
 
 	/* this is an intro */
-	console.log( 'hello world' );
+	var a__default = 'default' in a ? a['default'] : a;
+
+	console.log( a__default );
+	console.log( a.b );
 
 	var main = 42;
 

test/form/intro-and-outro/main.js

@@ -1,3 +1,6 @@
-console.log( 'hello world' );
+import a, { b } from 'external'
+
+console.log( a );
+console.log( b );
 
 export default 42;