Merge branch 'fix-sourcemap' into 'master'

Output the correct sourcemap object

See merge request IvanSanchez/rollup-plugin-unassert!2

Author: anandthakker

package.json

@@ -11,21 +11,21 @@
   ],
   "dependencies": {
     "acorn": "^4.0.4",
-    "convert-source-map": "^1.3.0",
+    "convert-source-map": "^1.5.1",
     "escodegen": "^1.8.1",
     "multi-stage-sourcemap": "^0.2.1",
     "rollup-pluginutils": "^2.0.1",
     "unassert": "^1.5.1"
   },
   "devDependencies": {
-    "rollup": "^0.41.4",
+    "rollup": "^0.56.2",
     "rollup-plugin-buble": "^0.15.0"
   },
   "peerDependencies": {
-    "rollup": "^0.41.4"
+    "rollup": "^0.56.2"
   },
   "scripts": {
-    "test": "js test/test.js",
+    "test": "node test/test.js",
     "pretest": "npm run build:cjs",
     "build": "npm run build:cjs && npm run build:es",
     "build:cjs": "rollup -c -o dist/rollup-plugin-unassert.cjs.js -f cjs",

src/unassert.js

@@ -77,12 +77,12 @@ export default function unassert ( options = {} ) {
 					const reMap = reconnectSourceMap(inMap, outMap);
 					resolve({
 						code: unassertedAst.code,
-						map: reMap
+						map: reMap.toObject()
 					});
 				} else {
 					resolve({
 						code: unassertedAst.code,
-						map: outMap
+						map: outMap.toObject()
 					});
 				}
 

test/test.js

@@ -7,26 +7,30 @@ var fs = require('fs');
 // This is the example from https://github.com/unassert-js/unassert#example
 
 rollup.rollup({
-	entry: 'test/original.js',
+	input: 'test/original.js',
 	plugins: [
 		rollupUnassert()
 	]
 }).then( function ( bundle ) {
 	// Generate bundle + sourcemap
-	const result = bundle.generate({
+	return bundle.generate({
 		format: 'es',
-	});
-
-	var expected = fs.readFileSync('test/expected.js').toString();
+		sourcemap: 'inline'
+	}).then(result => {
+		var expected = fs.readFileSync('test/expected.js').toString();
 
-	if (expected === result.code) {
-		console.log("rollup-plugin-unassert unit test passed");
-		process.exit(0);
-	} else {
-		console.log("rollup-plugin-unassert unit test failed");
-		console.log("Generated code: \n", result.code);
-		console.log("Expected code: \n", expected);
-		process.exit(-1);
-	}
+		if (expected === result.code) {
+			console.log("rollup-plugin-unassert unit test passed");
+			process.exit(0);
+		} else {
+			console.log("rollup-plugin-unassert unit test failed");
+			console.log("Generated code: \n", result.code);
+			console.log("Expected code: \n", expected);
+			process.exit(-1);
+		}
+	});
 
+}).catch(e => {
+	console.error(e);
+	process.exit(-1);
 });