Add bundle name placeholder - resolve merge conflicts

package.json

@@ -19,7 +19,7 @@
     "pretest": "npm run build",
     "test": "mocha",
     "build": "rollup -c",
-    "prepublish": "npm run lint && npm test && npm run build"
+    "prepare": "npm run lint && npm test && npm run build"
   },
   "devDependencies": {
     "buble": "^0.15.2",

src/index.js

@@ -31,14 +31,16 @@ function generateManifest(input, output) {
 	return JSON.stringify({[input]: output});
 }
 
-function formatFilename(dest, hash) {
+function formatFilename(dest, hash, name) {
 	const match = pattern.exec(dest);
 	const length = match && match[1];
 	let hashResult = hash;
 	if (length) {
 		hashResult = hash.substr(0, +length);
 	}
-	return dest.replace(pattern, hashResult);
+	return dest
+		.replace(pattern, hashResult)
+		.replace('[name]', name);
 }
 
 function mkdirpath (dest) {
@@ -85,7 +87,7 @@ export default function hash(opts = {}) {
 			}
 
 			const hash = hasha(data.code, options);
-			const fileName = formatFilename(destinationOption, hash);
+			const fileName = formatFilename(destinationOption, hash, path.parse(builtFile).name);
 
 			if(options.replace) {
 				fs.unlinkSync(builtFile);

test/.eslintrc

@@ -7,6 +7,7 @@
 		"beforeEach": true,
 		"afterEach": true,
 		"before": true,
-		"after": true
+		"after": true,
+		"Buffer": true
 	}
 }

test/index.js

@@ -79,6 +79,14 @@ describe('rollup-plugin-hash', () => {
 		});
 	});
 
+	it('should replace dynamic dest filename template with hash and filename of bundle', () => {
+		const res = hashWithOptions({ dest: 'tmp/[name]-[hash].js' });
+		return res.then(() => {
+			const tmp = fs.readdirSync('tmp');
+			expect(tmp).to.contain(`index-${results.sha1}`);
+		});
+	});
+
 	it('should create a sourcemap, if applicable', () => {
 		const res = hashWithOptions({ dest: 'tmp/[hash].js' }, { sourcemap: true });
 		return res.then(() => {