Merge pull request #731 from rollup/gh-468

Deprecate `es6` format

src/Bundle.js

@@ -277,7 +277,12 @@ export default class Bundle {
 	}
 
 	render ( options = {} ) {
-		const format = options.format || 'es6';
+		if ( options.format === 'es6' ) {
+			this.onwarn( 'The es6 format is deprecated – use `es` instead' );
+			options.format = 'es';
+		}
+
+		const format = options.format || 'es';
 
 		// Determine export mode - 'default', 'named', 'none'
 		const exportMode = getExportMode( this, options.exports, options.moduleName );
@@ -286,7 +291,7 @@ export default class Bundle {
 		let usedModules = [];
 
 		this.orderedModules.forEach( module => {
-			const source = module.render( format === 'es6' );
+			const source = module.render( format === 'es' );
 			if ( source.toString().length ) {
 				magicString.addSource( source );
 				usedModules.push( module );

src/Declaration.js

@@ -42,8 +42,8 @@ export default class Declaration {
 		if ( reference.isReassignment ) this.isReassigned = true;
 	}
 
-	render ( es6 ) {
+	render ( es ) {
-		if ( es6 ) return this.name;
+		if ( es ) return this.name;
 		if ( !this.isReassigned || !this.exportName ) return this.name;
 
 		return `exports.${this.exportName}`;
@@ -280,18 +280,18 @@ export class ExternalDeclaration {
 		}
 	}
 
-	render ( es6 ) {
+	render ( es ) {
 		if ( this.name === '*' ) {
 			return this.module.name;
 		}
 
 		if ( this.name === 'default' ) {
-			return this.module.exportsNamespace || ( !es6 && this.module.exportsNames ) ?
+			return this.module.exportsNamespace || ( !es && this.module.exportsNames ) ?
 				`${this.module.name}__default` :
 				this.module.name;
 		}
 
-		return es6 ? this.safeName : `${this.module.name}.${this.name}`;
+		return es ? this.safeName : `${this.module.name}.${this.name}`;
 	}
 
 	run () {

src/Module.js

@@ -445,7 +445,7 @@ export default class Module {
 		return statements;
 	}
 
-	render ( es6 ) {
+	render ( es ) {
 		let magicString = this.magicString.clone();
 
 		this.statements.forEach( statement => {
@@ -489,7 +489,7 @@ export default class Module {
 						const declaration = this.declarations[ name ];
 
 						if ( declaration.exportName && declaration.isReassigned ) {
-							magicString.insertLeft( statement.end, `;\nexports.${name} = ${declaration.render( es6 )}` );
+							magicString.insertLeft( statement.end, `;\nexports.${name} = ${declaration.render( es )}` );
 						}
 					});
 				}
@@ -514,7 +514,7 @@ export default class Module {
 				const declaration = reference.declaration;
 
 				if ( declaration ) {
-					const name = declaration.render( es6 );
+					const name = declaration.render( es );
 
 					// the second part of this check is necessary because of
 					// namespace optimisation – name of `foo.bar` could be `bar`

src/finalisers/es6.js → src/finalisers/es.js

@@ -4,7 +4,7 @@ function notDefault ( name ) {
 	return name !== 'default';
 }
 
-export default function es6 ( bundle, magicString ) {
+export default function es ( bundle, magicString ) {
 	const importBlock = bundle.externalModules
 		.map( module => {
 			const specifiers = [];

src/finalisers/index.js

@@ -1,7 +1,7 @@
 import amd from './amd.js';
 import cjs from './cjs.js';
-import es6 from './es6.js';
+import es from './es.js';
 import iife from './iife.js';
 import umd from './umd.js';
 
-export default { amd, cjs, es6, iife, umd };
+export default { amd, cjs, es, iife, umd };

test/cli/multiple-targets-shared-config/_expected/es6.js → test/cli/multiple-targets-shared-config/_expected/es.js

@@ -1,4 +1,4 @@
 var main = 0;
 
 export default main;
-//# sourceMappingURL=es6.js.map
+//# sourceMappingURL=es.js.map

test/cli/multiple-targets-shared-config/_expected/es.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"es.js","sources":["../main.js"],"sourcesContent":["export default 0;\n"],"names":[],"mappings":"AAAA,WAAe,CAAC,CAAC,;;"}

test/cli/multiple-targets-shared-config/_expected/es6.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"es6.js","sources":["../main.js"],"sourcesContent":["export default 0;\n"],"names":[],"mappings":"AAAA,WAAe,CAAC,CAAC,;;"}

test/cli/multiple-targets-shared-config/rollup.config.js

@@ -7,8 +7,8 @@ export default {
 			dest: '_actual/cjs.js'
 		},
 		{
-			format: 'es6',
+			format: 'es',
-			dest: '_actual/es6.js'
+			dest: '_actual/es.js'
 		}
 	]
 };

test/cli/multiple-targets/rollup.config.js

@@ -6,8 +6,8 @@ export default {
 			dest: '_actual/cjs.js'
 		},
 		{
-			format: 'es6',
+			format: 'es',
-			dest: '_actual/es6.js'
+			dest: '_actual/es.js'
 		}
 	]
 };

test/form/sourcemaps-external/_expected/es6.js → test/form/sourcemaps-external/_expected/es.js

@@ -10,4 +10,4 @@ console.log( 'hello from main.js' );
 
 foo();
 bar();
-//# sourceMappingURL=es6.js.map
+//# sourceMappingURL=es.js.map

test/form/sourcemaps-external/_expected/es.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"es.js","sources":["../foo.js","../bar.js","../main.js"],"sourcesContent":["export default function foo () {\n\tconsole.log( 'hello from foo.js' );\n}\n","export default function bar () {\n\tconsole.log( 'hello from bar.js' );\n}\n","import foo from './foo';\nimport bar from './bar';\n\nconsole.log( 'hello from main.js' );\n\nfoo();\nbar();\n"],"names":[],"mappings":"AAAe,SAAS,GAAG,IAAI;CAC9B,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,CAAC;CACnC;;ACFc,SAAS,GAAG,IAAI;CAC9B,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,CAAC;CACnC;;ACCD,OAAO,CAAC,GAAG,EAAE,oBAAoB,EAAE,CAAC;;AAEpC,GAAG,EAAE,CAAC;AACN,GAAG,EAAE,CAAC"}

test/form/sourcemaps-external/_expected/es6.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"es6.js","sources":["../foo.js","../bar.js","../main.js"],"sourcesContent":["export default function foo () {\n\tconsole.log( 'hello from foo.js' );\n}\n","export default function bar () {\n\tconsole.log( 'hello from bar.js' );\n}\n","import foo from './foo';\nimport bar from './bar';\n\nconsole.log( 'hello from main.js' );\n\nfoo();\nbar();\n"],"names":[],"mappings":"AAAe,SAAS,GAAG,IAAI;CAC9B,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,CAAC;CACnC;;ACFc,SAAS,GAAG,IAAI;CAC9B,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,CAAC;CACnC;;ACCD,OAAO,CAAC,GAAG,EAAE,oBAAoB,EAAE,CAAC;;AAEpC,GAAG,EAAE,CAAC;AACN,GAAG,EAAE,CAAC"}

test/form/sourcemaps-inline/_expected/es.js

@@ -0,0 +1,13 @@
+function foo () {
+	console.log( 'hello from foo.js' );
+}
+
+function bar () {
+	console.log( 'hello from bar.js' );
+}
+
+console.log( 'hello from main.js' );
+
+foo();
+bar();
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXMuanMiLCJzb3VyY2VzIjpbIi4uL2Zvby5qcyIsIi4uL2Jhci5qcyIsIi4uL21haW4uanMiXSwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gZm9vICgpIHtcblx0Y29uc29sZS5sb2coICdoZWxsbyBmcm9tIGZvby5qcycgKTtcbn1cbiIsImV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIGJhciAoKSB7XG5cdGNvbnNvbGUubG9nKCAnaGVsbG8gZnJvbSBiYXIuanMnICk7XG59XG4iLCJpbXBvcnQgZm9vIGZyb20gJy4vZm9vJztcbmltcG9ydCBiYXIgZnJvbSAnLi9iYXInO1xuXG5jb25zb2xlLmxvZyggJ2hlbGxvIGZyb20gbWFpbi5qcycgKTtcblxuZm9vKCk7XG5iYXIoKTtcbiJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBZSxTQUFTLEdBQUcsSUFBSTtDQUM5QixPQUFPLENBQUMsR0FBRyxFQUFFLG1CQUFtQixFQUFFLENBQUM7Q0FDbkM7O0FDRmMsU0FBUyxHQUFHLElBQUk7Q0FDOUIsT0FBTyxDQUFDLEdBQUcsRUFBRSxtQkFBbUIsRUFBRSxDQUFDO0NBQ25DOztBQ0NELE9BQU8sQ0FBQyxHQUFHLEVBQUUsb0JBQW9CLEVBQUUsQ0FBQzs7QUFFcEMsR0FBRyxFQUFFLENBQUM7QUFDTixHQUFHLEVBQUUsQ0FBQyJ9

test/form/sourcemaps-inline/_expected/es6.js

@@ -1,13 +0,0 @@
-function foo () {
-	console.log( 'hello from foo.js' );
-}
-
-function bar () {
-	console.log( 'hello from bar.js' );
-}
-
-console.log( 'hello from main.js' );
-
-foo();
-bar();
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXM2LmpzIiwic291cmNlcyI6WyIuLi9mb28uanMiLCIuLi9iYXIuanMiLCIuLi9tYWluLmpzIl0sInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIGZvbyAoKSB7XG5cdGNvbnNvbGUubG9nKCAnaGVsbG8gZnJvbSBmb28uanMnICk7XG59XG4iLCJleHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBiYXIgKCkge1xuXHRjb25zb2xlLmxvZyggJ2hlbGxvIGZyb20gYmFyLmpzJyApO1xufVxuIiwiaW1wb3J0IGZvbyBmcm9tICcuL2Zvbyc7XG5pbXBvcnQgYmFyIGZyb20gJy4vYmFyJztcblxuY29uc29sZS5sb2coICdoZWxsbyBmcm9tIG1haW4uanMnICk7XG5cbmZvbygpO1xuYmFyKCk7XG4iXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQWUsU0FBUyxHQUFHLElBQUk7Q0FDOUIsT0FBTyxDQUFDLEdBQUcsRUFBRSxtQkFBbUIsRUFBRSxDQUFDO0NBQ25DOztBQ0ZjLFNBQVMsR0FBRyxJQUFJO0NBQzlCLE9BQU8sQ0FBQyxHQUFHLEVBQUUsbUJBQW1CLEVBQUUsQ0FBQztDQUNuQzs7QUNDRCxPQUFPLENBQUMsR0FBRyxFQUFFLG9CQUFvQixFQUFFLENBQUM7O0FBRXBDLEdBQUcsRUFBRSxDQUFDO0FBQ04sR0FBRyxFQUFFLENBQUMifQ==

test/test.js

@@ -17,7 +17,7 @@ var CLI = path.resolve( __dirname, 'cli' );
 var PROFILES = [
 	{ format: 'amd' },
 	{ format: 'cjs' },
-	{ format: 'es6' },
+	{ format: 'es' },
 	{ format: 'iife' },
 	{ format: 'umd' }
 ];
@@ -125,6 +125,26 @@ describe( 'rollup', function () {
 				}, /You must supply options\.moduleName for IIFE bundles/ );
 			});
 		});
+
+		it( 'warns on es6 format', function () {
+			var warned;
+
+			return rollup.rollup({
+				entry: 'x',
+				plugins: [{
+					resolveId: function () { return 'test'; },
+					load: function () {
+						return '// empty';
+					}
+				}],
+				onwarn: function ( msg ) {
+					if ( /The es6 format is deprecated/.test( msg ) ) warned = true;
+				}
+			}).then( function ( bundle ) {
+				bundle.generate({ format: 'es6' });
+				assert.ok( warned );
+			});
+		});
 	});
 
 	describe( 'function', function () {
@@ -345,15 +365,9 @@ describe( 'rollup', function () {
 				( config.skip ? it.skip : config.solo ? it.only : it )( dir, function ( done ) {
 					process.chdir( path.resolve( CLI, dir ) );
 
-					if (os.platform() === 'win32') {
+					const command = 'node ' + path.resolve( __dirname, '../bin' ) + path.sep + config.command;
-						config.command = "node " + path.resolve( __dirname, '../bin' ) + path.sep + config.command;
-					}
 
-					exec( config.command, {
+					exec( command, {}, function ( err, code, stderr ) {
-						env: {
-							PATH: path.resolve( __dirname, '../bin' ) + path.delimiter + process.env.PATH
-						}
-					}, function ( err, code, stderr ) {
 						if ( err ) {
 							if ( config.error ) {
 								config.error( err );