From 6cb1cb2804e938d66fe192926e8b92bd52ae13b0 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 7 Jun 2016 11:31:25 -0400
Subject: [PATCH] Merge pull request #56 from rollup/gh-55

typeof
---
 packages/rollup-plugin-babel/package.json              |  4 ++--
 packages/rollup-plugin-babel/rollup.config.js          |  6 +++++-
 .../rollup-plugin-babel/test/samples/typeof/bar.js     |  3 +++
 .../rollup-plugin-babel/test/samples/typeof/foo.js     |  3 +++
 .../rollup-plugin-babel/test/samples/typeof/main.js    |  4 ++++
 packages/rollup-plugin-babel/test/test.js              | 10 ++++++++++
 6 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 packages/rollup-plugin-babel/test/samples/typeof/bar.js
 create mode 100644 packages/rollup-plugin-babel/test/samples/typeof/foo.js
 create mode 100644 packages/rollup-plugin-babel/test/samples/typeof/main.js

diff --git a/packages/rollup-plugin-babel/package.json b/packages/rollup-plugin-babel/package.json
index 28211fe71..e312135b0 100644
--- a/packages/rollup-plugin-babel/package.json
+++ b/packages/rollup-plugin-babel/package.json
@@ -25,7 +25,7 @@
     "test": "mocha",
     "prepublish": "npm run test",
     "pretest": "npm run build",
-    "build": "rollup -c -f cjs -o dist/rollup-plugin-babel.cjs.js && rollup -c -f es6 -o dist/rollup-plugin-babel.es6.js",
+    "build": "rollup -c",
     "prebuild": "rm -rf dist/*"
   },
   "dependencies": {
@@ -42,7 +42,7 @@
     "buble": "^0.10.6",
     "eslint": "^2.11.1",
     "mocha": "^2.5.3",
-    "rollup": "^0.26.7",
+    "rollup": "^0.27.0",
     "rollup-plugin-buble": "^0.10.0",
     "source-map": "^0.5.6"
   },
diff --git a/packages/rollup-plugin-babel/rollup.config.js b/packages/rollup-plugin-babel/rollup.config.js
index 0706e0ca3..5d18afab2 100644
--- a/packages/rollup-plugin-babel/rollup.config.js
+++ b/packages/rollup-plugin-babel/rollup.config.js
@@ -5,5 +5,9 @@ var external = Object.keys( require( './package.json' ).dependencies );
 export default {
 	entry: 'src/index.js',
 	plugins: [ buble() ],
-	external: external
+	external: external,
+	targets: [
+		{ dest: 'dist/rollup-plugin-babel.cjs.js', format: 'cjs' },
+		{ dest: 'dist/rollup-plugin-babel.es6.js', format: 'es6' } 
+	]
 };
diff --git a/packages/rollup-plugin-babel/test/samples/typeof/bar.js b/packages/rollup-plugin-babel/test/samples/typeof/bar.js
new file mode 100644
index 000000000..f8acbcf40
--- /dev/null
+++ b/packages/rollup-plugin-babel/test/samples/typeof/bar.js
@@ -0,0 +1,3 @@
+export default function bar ( a ) {
+	return typeof a;
+}
diff --git a/packages/rollup-plugin-babel/test/samples/typeof/foo.js b/packages/rollup-plugin-babel/test/samples/typeof/foo.js
new file mode 100644
index 000000000..8af5a1117
--- /dev/null
+++ b/packages/rollup-plugin-babel/test/samples/typeof/foo.js
@@ -0,0 +1,3 @@
+export default function foo ( a ) {
+	return typeof a;
+}
diff --git a/packages/rollup-plugin-babel/test/samples/typeof/main.js b/packages/rollup-plugin-babel/test/samples/typeof/main.js
new file mode 100644
index 000000000..2cccadb5a
--- /dev/null
+++ b/packages/rollup-plugin-babel/test/samples/typeof/main.js
@@ -0,0 +1,4 @@
+import foo from './foo.js';
+import bar from './bar.js';
+
+console.log( typeof foo, typeof bar, foo( 1 ), bar( 2 ) );
diff --git a/packages/rollup-plugin-babel/test/test.js b/packages/rollup-plugin-babel/test/test.js
index 6fd7f6451..0f51e3d71 100644
--- a/packages/rollup-plugin-babel/test/test.js
+++ b/packages/rollup-plugin-babel/test/test.js
@@ -201,4 +201,14 @@ describe( 'rollup-plugin-babel', function () {
 			assert.deepEqual( messages, []);
 		});
 	});
+
+	it( 'produces valid code with typeof helper', () => {
+		return rollup.rollup({
+			entry: 'samples/typeof/main.js',
+			plugins: [ babelPlugin() ]
+		}).then( bundle => {
+			var generated = bundle.generate();
+			assert.equal( generated.code.indexOf( 'var typeof' ), -1, generated.code );
+		});
+	});
 });