Fixes #96 - Allow dynamic relative paths

runtime/helpers.js

@@ -117,8 +117,13 @@ module.exports = {
     /**
      * Loads a template
      */
-    l: function(path) {
+    l: function(path, req) {
         if (typeof path === 'string') {
+            if (path.charAt(0) === '.') { // Check if the path is relative
+                // The path is relative so use require.resolve to fully resolve the path
+                path = req.resolve(path);
+            }
+
             if (markoRegExp.test(path)) {
                 return runtime.load(path);
             } else {

taglibs/core/core-tag-transformer.js

@@ -398,6 +398,7 @@ module.exports = function transform(node, compiler, template) {
                                 attr,
                                 'string',
                                 attrDef) +
+                                ', require' + // Include the "require" variable to allow relative paths to be resolved
                             ')');
                     } else {
                         // Resolve the static string to a full path only once

test/fixtures/templates/include-dynamic-relative/expected.html

@@ -0,0 +1 @@
+Hello Frank! You have 20 new messages.

test/fixtures/templates/include-dynamic-relative/include-target.marko

@@ -0,0 +1,4 @@
+<var name="name" value="data.name"/>
+<var name="count" value="data.count"/>
+
+Hello $name! You have $count new messages.

test/fixtures/templates/include-dynamic-relative/template.marko

@@ -0,0 +1,2 @@
+<var name="includePath" value="'./include-target.marko'"/>
+<include template="${includePath}" name="${'Frank'}" count="20"/>

test/fixtures/templates/include-dynamic-relative/test.js

@@ -0,0 +1 @@
+exports.templateData = {};