@marko/compiler
Advanced tools
Comparing version
@@ -53,3 +53,3 @@ "use strict"; | ||
function find(dirname, registeredTaglibs) { | ||
function find(dirname, registeredTaglibs, tagDiscoveryDirs) { | ||
var found = findCache[dirname]; | ||
@@ -96,6 +96,10 @@ if (found) { | ||
if (!taglib || taglib.tagsDir === undefined) { | ||
const componentsPath = nodePath.join(curDirname, "components"); | ||
for (const tagDiscoveryDir of tagDiscoveryDirs) { | ||
const componentsPath = nodePath.join(curDirname, tagDiscoveryDir); | ||
if (existsSync(componentsPath) && !excludedDirs[componentsPath]) { | ||
helper.addTaglib(taglibLoader.loadTaglibFromDir(curDirname)); | ||
if (existsSync(componentsPath) && !excludedDirs[componentsPath]) { | ||
helper.addTaglib( | ||
taglibLoader.loadTaglibFromDir(curDirname, tagDiscoveryDir) | ||
); | ||
} | ||
} | ||
@@ -102,0 +106,0 @@ } |
@@ -48,3 +48,7 @@ "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports._loader = exports._finder = void 0;exports.buildLookup = buildLookup;exports.clearCaches = clearCaches;exports.excludePackage = exports.excludeDir = void 0;exports.register = register;exports.resolveOptionalTaglibs = resolveOptionalTaglibs;var _lassoPackageRoot = require("lasso-package-root"); | ||
runAndCatchErrors(() => { | ||
taglibsForDir = _finder2.default.find(dirname, taglibsForDir); | ||
taglibsForDir = _finder2.default.find( | ||
dirname, | ||
taglibsForDir, | ||
translator.tagDiscoveryDirs | ||
); | ||
}, onError); | ||
@@ -51,0 +55,0 @@ |
@@ -15,4 +15,4 @@ "use strict";var cache = require("./cache"); | ||
function loadTaglibFromDir(filePath) { | ||
return loaders.loadTaglibFromDir(filePath); | ||
function loadTaglibFromDir(filePath, tagDiscoveryDir) { | ||
return loaders.loadTaglibFromDir(filePath, tagDiscoveryDir); | ||
} | ||
@@ -19,0 +19,0 @@ |
@@ -8,6 +8,6 @@ "use strict";var ok = require("assert").ok; | ||
function loadFromDir(dir) { | ||
function loadFromDir(dir, tagDiscoveryDir) { | ||
ok(dir, '"dir" is required'); | ||
var componentsPath = nodePath.join(dir, "components"); | ||
var componentsPath = nodePath.join(dir, tagDiscoveryDir); | ||
var taglib = cache.get(componentsPath); | ||
@@ -23,3 +23,3 @@ | ||
dir, | ||
"components", | ||
tagDiscoveryDir, | ||
taglib, | ||
@@ -26,0 +26,0 @@ new DependencyChain([componentsPath]) |
{ | ||
"name": "@marko/compiler", | ||
"version": "5.39.6", | ||
"version": "5.39.7", | ||
"description": "Marko template to JS compiler.", | ||
@@ -89,3 +89,3 @@ "keywords": [ | ||
"devDependencies": { | ||
"marko": "^5.37.7" | ||
"marko": "^5.37.8" | ||
}, | ||
@@ -92,0 +92,0 @@ "publishConfig": { |
520680
0.05%12495
0.06%