archive-gh-me/marko
1
0
Fork 0
mirror of https://github.com/marko-js/marko.git synced 2025-12-08 19:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Add autodiscover of components/ directory. fixes #329

Browse Source
This commit is contained in:
Michael Rawlings 2016-07-18 14:07:44 -07:00 committed by Patrick Steele-Idem
parent 213e652418
commit 8099959355
7 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/taglib-finder/index.js
View File

@ -20,6 +20,9 @@ var nodePath = require('path');
var fs = require('fs'); var fs = require('fs');
var lassoPackageRoot = require('lasso-package-root'); var lassoPackageRoot = require('lasso-package-root');
var resolveFrom = require('resolve-from'); var resolveFrom = require('resolve-from');
var scanTagsDir = require('../taglib-loader/scanTagsDir');
var Taglib = require('../taglib-loader/Taglib');
var DependencyChain = require('../taglib-loader/DependencyChain');
var existsCache = {}; var existsCache = {};
var findCache = {}; var findCache = {};
@ -112,13 +115,20 @@ function find(dirname, registeredTaglibs) {
} }
// First walk up the directory tree looking for marko.json files // First walk up the directory tree looking for marko.json files or components/ directories
let curDirname = dirname; let curDirname = dirname;
while(true) { while(true) {
let taglibPath = nodePath.join(curDirname, 'marko.json'); let taglibPath = nodePath.join(curDirname, 'marko.json');
if (existsCached(taglibPath) && !excludedDirs[curDirname]) { if (existsCached(taglibPath) && !excludedDirs[curDirname]) {
var taglib = taglibLoader.load(taglibPath); let taglib = taglibLoader.load(taglibPath);
helper.addTaglib(taglib); helper.addTaglib(taglib);
} else {
let componentPath = nodePath.join(curDirname, 'components');
if (existsCached(componentPath) && !excludedDirs[curDirname] && !helper.alreadyAdded(componentPath)) {
let taglib = new Taglib(componentPath);
scanTagsDir(componentPath, nodePath.dirname(componentPath), './components', taglib, new DependencyChain([componentPath]));
helper.addTaglib(taglib);
}
} }
if (curDirname === rootDirname) { if (curDirname === rootDirname) {

1
test/autotests/render/custom-tag-autodiscover/components/test-hello/template.marko Normal file
View File

@ -0,0 +1 @@
<div>test-hello</div>

1
test/autotests/render/custom-tag-autodiscover/expected.html Normal file
View File

@ -0,0 +1 @@
<div>test-hello</div><test-home></test-home><div>HOME</div><div>test-home</div>

1
test/autotests/render/custom-tag-autodiscover/pages/home/components/test-home/template.marko Normal file
View File

@ -0,0 +1 @@
<div>test-home</div>

2
test/autotests/render/custom-tag-autodiscover/pages/home/template.marko Normal file
View File

@ -0,0 +1,2 @@
<div>HOME</div>
<test-home/>

3
test/autotests/render/custom-tag-autodiscover/template.marko Normal file
View File

@ -0,0 +1,3 @@
<test-hello/>
<test-home/>
<include("./pages/home/template.marko")></include>

1
test/autotests/render/custom-tag-autodiscover/test.js Normal file
View File

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