Merge branch 'master' of github.com:rollup/rollup

CHANGELOG.md

@@ -1,5 +1,9 @@
 # rollup changelog
 
+## 0.25.8
+
+* Unixize entry path ([#586](https://github.com/rollup/rollup/pull/586))
+
 ## 0.25.7
 
 * Expand deshadowed shorthand properties ([#575](https://github.com/rollup/rollup/issues/575))

package.json

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

src/Bundle.js

@@ -27,7 +27,7 @@ export default class Bundle {
 			}
 		});
 
-		this.entry = options.entry;
+		this.entry = unixizePath( options.entry );
 		this.entryModule = null;
 
 		this.resolveId = first(

src/rollup.js

@@ -25,7 +25,8 @@ const ALLOWED_KEYS = [
 	'onwarn',
 	'outro',
 	'plugins',
-	'sourceMap'
+	'sourceMap',
+	'useStrict'
 ];
 
 export function rollup ( options ) {

test/test.js

@@ -76,7 +76,7 @@ describe( 'rollup', function () {
 			return rollup.rollup({ entry: 'x', plUgins: [] }).then( function () {
 				throw new Error( 'Missing expected error' );
 			}, function ( err ) {
-				assert.equal( 'Unexpected key \'plUgins\' found, expected one of: banner, dest, entry, exports, external, footer, format, globals, indent, intro, moduleId, moduleName, noConflict, onwarn, outro, plugins, sourceMap', err.message );
+				assert.equal( 'Unexpected key \'plUgins\' found, expected one of: banner, dest, entry, exports, external, footer, format, globals, indent, intro, moduleId, moduleName, noConflict, onwarn, outro, plugins, sourceMap, useStrict', err.message );
 			});
 		});
 	});