closes riot#1998

prateekbh · Sep 27, 2016 · dd86621 · dd86621
1 parent 0df48e0
commit dd86621
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/lib/server/index.js b/lib/server/index.js
@@ -12,9 +12,11 @@ riot.parsers = compiler.parsers
 // allow to require('some.tag')
 require.extensions['.tag'] = function(module, filename) {
   var src = riot.compile(require('fs').readFileSync(filename, 'utf8'))
+  var preTag = src.substring(0, src.indexOf('riot.tag'))
+  var tagDefinitaion = src.substring(src.indexOf('riot.tag'))
   module._compile(
-    'var riot = require(process.env.RIOT || "riot/riot.js");module.exports =' + src
-  , filename)
+    'var riot = require(process.env.RIOT || "riot/riot.js");' + preTag + ';module.exports =' + tagDefinitaion
+    , filename)
 }
 
 // simple-dom helper

diff --git a/test/importedtag/imported-tag.tag b/test/importedtag/imported-tag.tag
@@ -0,0 +1,3 @@
+<imported-tag>
+	<span>I am imported</span>
+</imported-tag>
diff --git a/test/specs/server/node.js b/test/specs/server/node.js
@@ -121,4 +121,9 @@ describe('Node/io.js', function() {
     expect($('textarea[name="txta2"]').val()).to.be('')
   })
 
+  it('render subsequent tags, when required from parent tag', function() {
+    var tag = riot.render('import-tag')
+    expect(tag).to.be('<import-tag><imported-tag><span>I am imported</span></imported-tag></import-tag>')
+  })
+
 })
diff --git a/test/tag/import-tag.tag b/test/tag/import-tag.tag
@@ -0,0 +1,5 @@
+var importedTag = require('../importedtag/imported-tag.tag');
+<import-tag>
+	<imported-tag>
+	</imported-tag>
+</import-tag>