Merge branch 'master' into gh-438-b

CHANGELOG.md

@@ -1,5 +1,14 @@
 # rollup changelog
 
+## 0.25.1
+
+* Throw error if namespace is called ([#446](https://github.com/rollup/rollup/issues/446))
+* Prevent shadowing bug in ES6 output ([#441](https://github.com/rollup/rollup/pull/441))
+* Prevent `var exports.foo` ([#426](https://github.com/rollup/rollup/issues/426))
+* Prevent double export of aliased symbols ([#438](https://github.com/rollup/rollup/issues/438))
+* Provide more informative error if Rollup is used in-browser without appropriate `resolveId`/`load` hooks ([#275](https://github.com/rollup/rollup/issues/275))
+* Use `_interopDefault` function to DRY out code with many external dependencies, in CommonJS output ([#458](https://github.com/rollup/rollup/pull/458))
+
 ## 0.25.0
 
 * **breaking** Module order is determined according to spec, rather than in a way designed to prevent runtime errors. Rollup will warn if it detects runtime errors are likely ([#435](https://github.com/rollup/rollup/issues/435))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "0.25.0",
+  "version": "0.25.1",
   "description": "Next-generation ES6 module bundler",
   "main": "dist/rollup.js",
   "jsnext:main": "src/rollup.js",

src/Bundle.js

@@ -63,7 +63,7 @@ export default class Bundle {
 		this.onwarn = options.onwarn || makeOnwarn();
 
 		// TODO strictly speaking, this only applies with non-ES6, non-default-only bundles
-		[ 'module', 'exports' ].forEach( global => this.assumedGlobals[ global ] = true );
+		[ 'module', 'exports', '_interopDefault' ].forEach( global => this.assumedGlobals[ global ] = true );
 	}
 
 	build () {
@@ -360,7 +360,6 @@ export default class Bundle {
 			});
 		}
 
-
 		return ordered;
 	}
 }

src/Declaration.js

@@ -135,6 +135,7 @@ export class SyntheticDefaultDeclaration {
 
 export class SyntheticNamespaceDeclaration {
 	constructor ( module ) {
+		this.isNamespace = true;
 		this.module = module;
 		this.name = null;
 
@@ -221,9 +222,10 @@ export class ExternalDeclaration {
 	constructor ( module, name ) {
 		this.module = module;
 		this.name = name;
+		this.safeName = null;
 		this.isExternal = true;
 
-		this.safeName = null;
+		this.isNamespace = name === '*';
 	}
 
 	addAlias () {

src/finalisers/cjs.js

@@ -3,17 +3,25 @@ import getExportBlock from './shared/getExportBlock.js';
 export default function cjs ( bundle, magicString, { exportMode }, options ) {
 	let intro = options.useStrict === false ? `` : `'use strict';\n\n`;
 
+	const hasDefaultImport = bundle.externalModules.some( mod => mod.declarations.default);
+
+	if (hasDefaultImport) {
+		intro += `function _interopDefault (ex) { return 'default' in ex ? ex['default'] : ex; }\n\n`;
+	}
+
 	// TODO handle empty imports, once they're supported
 	const importBlock = bundle.externalModules
 		.map( module => {
-			let requireStatement = `var ${module.name} = require('${module.id}');`;
-
 			if ( module.declarations.default ) {
-				requireStatement += '\n' + ( module.exportsNames ? `var ${module.name}__default = ` : `${module.name} = ` ) +
+				if (module.exportsNames) {
-					`'default' in ${module.name} ? ${module.name}['default'] : ${module.name};`;
+					return `var ${module.name} = require('${module.id}');` +
+						`\nvar ${module.name}__default = _interopDefault(${module.name});`;
+				} else {
+					return `var ${module.name} = _interopDefault(require('${module.id}'));`;
+				}
+			} else {
+				return `var ${module.name} = require('${module.id}');`;
 			}
-
-			return requireStatement;
 		})
 		.join( '\n' );
 

src/utils/defaults.js

@@ -16,6 +16,8 @@ function addJsExtensionIfNecessary ( file ) {
 }
 
 export function resolveId ( importee, importer ) {
+	if ( typeof process === 'undefined' ) throw new Error( `It looks like you're using Rollup in a non-Node.js environment. This means you must supply a plugin with custom resolveId and load functions. See https://github.com/rollup/rollup/wiki/Plugins for more information` );
+
 	// absolute paths are left untouched
 	if ( isAbsolute( importee ) ) return addJsExtensionIfNecessary( importee );
 

src/utils/error.js

@@ -0,0 +1,9 @@
+export default function error ( props ) {
+	const err = new Error( props.message );
+
+	Object.keys( props ).forEach( key => {
+		err[ key ] = props[ key ];
+	});
+
+	throw err;
+}

src/utils/run.js

@@ -3,6 +3,8 @@ import modifierNodes, { isModifierNode } from '../ast/modifierNodes.js';
 import isReference from '../ast/isReference.js';
 import flatten from '../ast/flatten';
 import pureFunctions from './pureFunctions.js';
+import getLocation from './getLocation.js';
+import error from './error.js';
 
 function call ( callee, scope, statement, strongDependencies ) {
 	while ( callee.type === 'ParenthesizedExpression' ) callee = callee.expression;
@@ -11,7 +13,19 @@ function call ( callee, scope, statement, strongDependencies ) {
 		const declaration = scope.findDeclaration( callee.name ) ||
 							statement.module.trace( callee.name );
 
-		if ( declaration ) return declaration.run( strongDependencies );
+		if ( declaration ) {
+			if ( declaration.isNamespace ) {
+				error({
+					message: `Cannot call a namespace ('${callee.name}')`,
+					file: statement.module.id,
+					pos: callee.start,
+					loc: getLocation( statement.module.code, callee.start )
+				});
+			}
+
+			return declaration.run( strongDependencies );
+		}
+
 		return !pureFunctions[ callee.name ];
 	}
 

test/form/external-imports-custom-names/_expected/cjs.js

@@ -1,7 +1,8 @@
 'use strict';
 
-var $ = require('jquery');
+function _interopDefault (ex) { return 'default' in ex ? ex['default'] : ex; }
-$ = 'default' in $ ? $['default'] : $;
+
+var $ = _interopDefault(require('jquery'));
 
 $( function () {
 	$( 'body' ).html( '<h1>hello world!</h1>' );

test/form/external-imports/_expected/cjs.js

@@ -1,11 +1,12 @@
 'use strict';
 
-var factory = require('factory');
+function _interopDefault (ex) { return 'default' in ex ? ex['default'] : ex; }
-factory = 'default' in factory ? factory['default'] : factory;
+
+var factory = _interopDefault(require('factory'));
 var baz = require('baz');
 var containers = require('shipping-port');
 var alphabet = require('alphabet');
-var alphabet__default = 'default' in alphabet ? alphabet['default'] : alphabet;
+var alphabet__default = _interopDefault(alphabet);
 
 factory( null );
 baz.foo( baz.bar, containers.port );

test/function/cannot-call-external-namespace/_config.js

@@ -0,0 +1,12 @@
+var path = require( 'path' );
+var assert = require( 'assert' );
+
+module.exports = {
+	description: 'errors if code calls an external namespace',
+	error: function ( err ) {
+		assert.equal( err.message, 'Cannot call a namespace (\'foo\')' );
+		assert.equal( err.file.replace( /\//g, path.sep ), path.resolve( __dirname, 'main.js' ) );
+		assert.equal( err.pos, 28 );
+		assert.deepEqual( err.loc, { line: 2, column: 0 });
+	}
+};

test/function/cannot-call-external-namespace/main.js

@@ -0,0 +1,2 @@
+import * as foo from 'foo';
+foo();

test/function/cannot-call-internal-namespace/_config.js

@@ -0,0 +1,12 @@
+var path = require( 'path' );
+var assert = require( 'assert' );
+
+module.exports = {
+	description: 'errors if code calls an internal namespace',
+	error: function ( err ) {
+		assert.equal( err.message, 'Cannot call a namespace (\'foo\')' );
+		assert.equal( err.file.replace( /\//g, path.sep ), path.resolve( __dirname, 'main.js' ) );
+		assert.equal( err.pos, 33 );
+		assert.deepEqual( err.loc, { line: 2, column: 0 });
+	}
+};

test/function/cannot-call-internal-namespace/foo.js

@@ -0,0 +1 @@
+export const a = 1;

test/function/cannot-call-internal-namespace/main.js

@@ -0,0 +1,2 @@
+import * as foo from './foo.js';
+foo();

test/function/cycles-stack-overflow/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'does not stack overflow on crazy cyclical dependencies'
+};

test/function/cycles-stack-overflow/b.js

@@ -0,0 +1,11 @@
+import { C } from './c.js';
+
+export function B () {};
+
+B.prototype = {
+	c: function () {
+		return function () {
+			new C();
+		};
+	}()
+};

test/function/cycles-stack-overflow/c.js

@@ -0,0 +1,13 @@
+import { D } from './d.js';
+
+export function C () {
+	this.x = 'x';
+}
+
+C.prototype = {
+	d: function () {
+		return function () {
+			new D();
+		};
+	}()
+};

test/function/cycles-stack-overflow/d.js

@@ -0,0 +1,12 @@
+import { B } from './b.js';
+import { C } from './c.js';
+
+export function D () {};
+
+D.prototype = {
+	c: function () {
+		return function () {
+			new C();
+		};
+	}()
+};

test/function/cycles-stack-overflow/main.js

@@ -0,0 +1,3 @@
+import { C } from './c.js';
+
+assert.equal( new C().x, 'x' );