Merge pull request #80 from Justinidlerz/master

only ${require('..')} to be translate.

Author: hemanth

README.md

@@ -122,6 +122,22 @@ require("html?interpolate!./file.html");
 ```html
 <img src="${require(`./images/gallery.png`)}">
 
+<div>${require('./components/gallery.html')}</div>
+```
+And if you only want to use `require` in template and any other `${}` are not to be translate you can set `interpolate` flag to `require`, like so:
+
+```js
+require("html?interpolate=require!./file.ftl");
+```
+
+```html
+
+<#list list as list>
+  <a href="${list.href!}" />${list.name}</a>
+</#list>
+
+<img src="${require(`./images/gallery.png`)}">
+
 <div>${require('./components/gallery.html')}</div>
 ```
 

index.js

@@ -65,6 +65,35 @@ module.exports = function(content) {
 	});
 	content.reverse();
 	content = content.join("");
+
+	if (config.interpolate === 'require'){
+
+		var reg = /\$\{require\([^)]*\)\}/g;
+		var result;
+		var reqList = [];
+		while(result = reg.exec(content)){
+			reqList.push({
+				length : result[0].length,
+				start : result.index,
+				value : result[0]
+			})
+		}
+		reqList.reverse();
+		content = [content];
+		reqList.forEach(function(link) {
+			var x = content.pop();
+			do {
+				var ident = randomIdent();
+			} while(data[ident]);
+			data[ident] = link.value.substring(11,link.length - 3)
+			content.push(x.substr(link.start + link.length));
+			content.push(ident);
+			content.push(x.substr(0, link.start));
+		});
+		content.reverse();
+		content = content.join("");
+	}
+
 	if(typeof config.minimize === "boolean" ? config.minimize : this.minimize) {
 		var minimizeOptions = assign({}, config);
 
@@ -90,14 +119,15 @@ module.exports = function(content) {
 		content = htmlMinifier.minify(content, minimizeOptions);
 	}
 
-	if(config.interpolate) {
+	if(config.interpolate && config.interpolate !== 'require') {
 		content = compile('`' + content + '`').code;
 	} else {
 		content = JSON.stringify(content);
 	}
-
-	return "module.exports = " + content.replace(/xxxHTMLLINKxxx[0-9\.]+xxx/g, function(match) {
+	
+ 	return "module.exports = " + content.replace(/xxxHTMLLINKxxx[0-9\.]+xxx/g, function(match) {
 		if(!data[match]) return match;
 		return '" + require(' + JSON.stringify(loaderUtils.urlToRequest(data[match], root)) + ') + "';
 	}) + ";";
+
 }

test/loaderTest.js

@@ -119,4 +119,11 @@ describe("loader", function() {
 			'module.exports = "<img src=\\"" + ("Hello " + (1 + 1)) + "\\">";'
 		);
 	});
+	it("should enable interpolations when using interpolate=require flag and only require function to be translate", function() {
+		loader.call({
+			query: "?interpolate=require"
+		}, '<a href="${list.href}"><img src="${require("./test.jpg")}" /></a>').should.be.eql(
+			'module.exports = "<a href=\\"${list.href}\\"><img src=\\"" + require("./test.jpg") + "\\" /></a>";'
+		);
+	});
 });