From 4cfce9233058119aa385186e39ac0da0a6a30a1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Segersv=C3=A4rd?= <victorystick@gmail.com>
Date: Tue, 29 Dec 2015 15:26:22 +0100
Subject: [PATCH 1/2] Fixes #379

* Add missing `moduleId` key.
* Remove deprecated `transform`, `load`, `resolveId` and `resolveExternal`
---
 src/rollup.js | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/rollup.js b/src/rollup.js
index 11f1c68..d509bd2 100644
--- a/src/rollup.js
+++ b/src/rollup.js
@@ -9,24 +9,21 @@ import Bundle from './Bundle.js';
 export const VERSION = '<@VERSION@>';
 
 const ALLOWED_KEYS = [
-	'entry',
+	'banner',
 	'dest',
-	'plugins',
+	'entry',
 	'external',
-	'onwarn',
-	'indent',
+	'footer',
 	'format',
-	'moduleName',
-	'sourceMap',
+	'globals',
+	'indent',
 	'intro',
+	'moduleId',
+	'moduleName',
+	'onwarn',
 	'outro',
-	'banner',
-	'footer',
-	'globals',
-	'transform',
-	'load',
-	'resolveId',
-	'resolveExternal'
+	'plugins',
+	'sourceMap'
 ];
 
 export function rollup ( options ) {

From 5ba121544ca14ec63c145f5bbeb7b9cb3941e30c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Segersv=C3=A4rd?= <victorystick@gmail.com>
Date: Tue, 29 Dec 2015 15:29:43 +0100
Subject: [PATCH 2/2] Update test

---
 test/test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test.js b/test/test.js
index 5ee72ba..b726ec5 100644
--- a/test/test.js
+++ b/test/test.js
@@ -74,7 +74,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: entry, dest, plugins, external, onwarn, indent, format, moduleName, sourceMap, intro, outro, banner, footer, globals, transform, load, resolveId, resolveExternal', err.message );
+				assert.equal( 'Unexpected key \'plUgins\' found, expected one of: banner, dest, entry, external, footer, format, globals, indent, intro, moduleId, moduleName, onwarn, outro, plugins, sourceMap', err.message );
 			});
 		});
 	});