Merge branch 'master' into custom-builder

# Conflicts:
#	package.json

Author: Andarist

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup-plugin-babel",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "Seamless integration between Rollup and Babel.",
   "main": "dist/rollup-plugin-babel.cjs.js",
   "module": "dist/rollup-plugin-babel.esm.js",
@@ -36,7 +36,7 @@
   },
   "peerDependencies": {
     "@babel/core": "7 || ^7.0.0-rc.2",
-    "rollup": ">=0.60.0 <1"
+    "rollup": ">=0.60.0 <2"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0",
@@ -52,7 +52,7 @@
     "lint-staged": "^7.2.2",
     "mocha": "^5.2.0",
     "prettier": "^1.15.3",
-    "rollup": "^0.64.1",
+    "rollup": "^1.0.0",
     "rollup-plugin-buble": "^0.19.2",
     "rollup-plugin-json": "^3.0.0",
     "source-map": "^0.6.1",

package.json

@@ -63,7 +63,8 @@ describe('rollup-plugin-babel', function() {
 			)
 			.then(bundle => {
 				return bundle.generate(Object.assign({ format: 'cjs' }, generateOptions));
-			});
+			})
+			.then(({ output: [generated] }) => generated);
 	}
 
 	it('runs code through babel', () => {
@@ -134,7 +135,7 @@ describe('rollup-plugin-babel', function() {
 				plugins: [babelPlugin()],
 			})
 			.then(bundle => bundle.generate({ output: { format: 'esm' } }))
-			.then(({ code }) => {
+			.then(({ output: [{ code }] }) => {
 				assert.ok(/class Foo/.test(code));
 				assert.ok(/var Bar/.test(code));
 				assert.ok(!/class Bar/.test(code));
@@ -281,7 +282,7 @@ describe('rollup-plugin-babel', function() {
 			.then(bundle => {
 				return bundle.generate({ format: 'cjs' });
 			})
-			.then(({ code }) => {
+			.then(({ output: [{ code }] }) => {
 				assert.ok(code.includes('// Generated by some custom loader'), 'adds the custom comment');
 				assert.ok(code.includes('console.foobaz'), 'runs the plugin');
 			});
@@ -316,7 +317,7 @@ describe('rollup-plugin-babel', function() {
 			.then(bundle => {
 				return bundle.generate({ format: 'cjs' });
 			})
-			.then(({ code }) => {
+			.then(({ output: [{ code }] }) => {
 				assert.ok(!code.includes('// Generated by some custom loader'), 'does not add the comment to ignored file');
 				assert.ok(!code.includes('console.foobaz'), 'does not run the plugin on ignored file');
 			});