rollup-plugin-commonjs - npm Package Compare versions

Comparing version 5.0.2 to 5.0.3

CHANGELOG.md

 # rollup-plugin-commonjs changelog
 
+## 5.0.3
+
+* Respect custom `namedExports` in optimised modules ([#35](https://github.com/rollup/rollup-plugin-commonjs/issues/35))
+
 ## 5.0.2
@@ -4,0 +8,0 @@

dist/rollup-plugin-commonjs.cjs.js

@@ -198,3 +198,2 @@ 'use strict';
 	var namedExports = {};
-	if ( customNamedExports ) customNamedExports.forEach( function (name) { return namedExports[ name ] = true; } );
 
@@ -356,7 +355,22 @@ // TODO handle transpiled modules
 
+	var name = getName( id );
+
+	function addExport ( x ) {
+		var declaration;
+
+		if ( x === name ) {
+			var deconflicted = deconflict( scope, globals, name );
+			declaration = "var " + deconflicted + " = " + moduleName + "." + x + ";\nexport { " + deconflicted + " as " + x + " };";
+		} else {
+			declaration = "export var " + x + " = " + moduleName + "." + x + ";";
+		}
+
+		namedExportDeclarations.push( declaration );
+	}
+
+	if ( customNamedExports ) customNamedExports.forEach( addExport );
+
 	if ( shouldWrap ) {
 		var args = "module" + (uses.exports ? ', exports' : '');
 
-		var name = getName( id );
-
 		wrapperStart = "var " + moduleName + " = " + HELPERS_NAME + ".createCommonjsModule(function (" + args + ") {\n";
@@ -367,14 +381,3 @@ wrapperEnd = "\n});";
 			.filter( function (key) { return !blacklistedExports[ key ]; } )
-			.forEach( function (x) {
-				var declaration;
-
-				if ( x === name ) {
-					var deconflicted = deconflict( scope, globals, name );
-					declaration = "var " + deconflicted + " = " + moduleName + "." + x + ";\nexport { " + deconflicted + " as " + x + " };";
-				} else {
-					declaration = "export var " + x + " = " + moduleName + "." + x + ";";
-				}
-
-				namedExportDeclarations.push( declaration );
-			});
+			.forEach( addExport );
 	} else {
@@ -381,0 +384,0 @@ var hasDefaultExport = false;

dist/rollup-plugin-commonjs.es.js

@@ -195,3 +195,2 @@ import { statSync } from 'fs';
 	var namedExports = {};
-	if ( customNamedExports ) customNamedExports.forEach( function (name) { return namedExports[ name ] = true; } );
 
@@ -353,7 +352,22 @@ // TODO handle transpiled modules
 
+	var name = getName( id );
+
+	function addExport ( x ) {
+		var declaration;
+
+		if ( x === name ) {
+			var deconflicted = deconflict( scope, globals, name );
+			declaration = "var " + deconflicted + " = " + moduleName + "." + x + ";\nexport { " + deconflicted + " as " + x + " };";
+		} else {
+			declaration = "export var " + x + " = " + moduleName + "." + x + ";";
+		}
+
+		namedExportDeclarations.push( declaration );
+	}
+
+	if ( customNamedExports ) customNamedExports.forEach( addExport );
+
 	if ( shouldWrap ) {
 		var args = "module" + (uses.exports ? ', exports' : '');
 
-		var name = getName( id );
-
 		wrapperStart = "var " + moduleName + " = " + HELPERS_NAME + ".createCommonjsModule(function (" + args + ") {\n";
@@ -364,14 +378,3 @@ wrapperEnd = "\n});";
 			.filter( function (key) { return !blacklistedExports[ key ]; } )
-			.forEach( function (x) {
-				var declaration;
-
-				if ( x === name ) {
-					var deconflicted = deconflict( scope, globals, name );
-					declaration = "var " + deconflicted + " = " + moduleName + "." + x + ";\nexport { " + deconflicted + " as " + x + " };";
-				} else {
-					declaration = "export var " + x + " = " + moduleName + "." + x + ";";
-				}
-
-				namedExportDeclarations.push( declaration );
-			});
+			.forEach( addExport );
 	} else {
@@ -378,0 +381,0 @@ var hasDefaultExport = false;

package.json

 {
   "name": "rollup-plugin-commonjs",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "description": "Convert CommonJS modules to ES2015",
@@ -5,0 +5,0 @@ "main": "dist/rollup-plugin-commonjs.cjs.js",

src/transform.js

@@ -72,3 +72,2 @@ import acorn from 'acorn';
 	const namedExports = {};
-	if ( customNamedExports ) customNamedExports.forEach( name => namedExports[ name ] = true );
 
@@ -228,7 +227,22 @@ // TODO handle transpiled modules
 
+	const name = getName( id );
+
+	function addExport ( x ) {
+		let declaration;
+
+		if ( x === name ) {
+			const deconflicted = deconflict( scope, globals, name );
+			declaration = `var ${deconflicted} = ${moduleName}.${x};\nexport { ${deconflicted} as ${x} };`;
+		} else {
+			declaration = `export var ${x} = ${moduleName}.${x};`;
+		}
+
+		namedExportDeclarations.push( declaration );
+	}
+
+	if ( customNamedExports ) customNamedExports.forEach( addExport );
+
 	if ( shouldWrap ) {
 		const args = `module${uses.exports ? ', exports' : ''}`;
 
-		const name = getName( id );
-
 		wrapperStart = `var ${moduleName} = ${HELPERS_NAME}.createCommonjsModule(function (${args}) {\n`;
@@ -239,14 +253,3 @@ wrapperEnd = `\n});`;
 			.filter( key => !blacklistedExports[ key ] )
-			.forEach( x => {
-				let declaration;
-
-				if ( x === name ) {
-					const deconflicted = deconflict( scope, globals, name );
-					declaration = `var ${deconflicted} = ${moduleName}.${x};\nexport { ${deconflicted} as ${x} };`;
-				} else {
-					declaration = `export var ${x} = ${moduleName}.${x};`;
-				}
-
-				namedExportDeclarations.push( declaration );
-			});
+			.forEach( addExport );
 	} else {
@@ -253,0 +256,0 @@ let hasDefaultExport = false;

No alert changes

Improved metrics

Number of downloads

421960

increased by36.24%

Lines of code

1371

increased by0.22%

Worsened metrics

Total package byte prevSize

140640

decreased by-0.04%

No dependency changes