@marko/compiler
Advanced tools
Comparing version 5.33.8 to 5.34.0
@@ -123,3 +123,3 @@ "use strict"; | ||
if (taglibPath) { | ||
var taglib = taglibLoader.loadTaglibFromFile(taglibPath); | ||
var taglib = taglibLoader.loadTaglibFromFile(taglibPath, true); | ||
helper.addTaglib(taglib); | ||
@@ -126,0 +126,0 @@ } |
@@ -11,4 +11,4 @@ "use strict";var cache = require("./cache"); | ||
function loadTaglibFromFile(filePath) { | ||
return loaders.loadTaglibFromFile(filePath); | ||
function loadTaglibFromFile(filePath, isFromPackageJson) { | ||
return loaders.loadTaglibFromFile(filePath, isFromPackageJson); | ||
} | ||
@@ -15,0 +15,0 @@ |
@@ -8,3 +8,3 @@ "use strict";var jsonFileReader = require("./json-file-reader"); | ||
function loadFromFile(filePath) { | ||
function loadFromFile(filePath, isFromPackageJson) { | ||
ok(filePath, '"filePath" is required'); | ||
@@ -17,3 +17,3 @@ | ||
if (!taglib) { | ||
taglib = new types.Taglib(filePath); | ||
taglib = new types.Taglib(filePath, isFromPackageJson); | ||
cache.put(filePath, taglib); | ||
@@ -20,0 +20,0 @@ |
@@ -255,2 +255,20 @@ "use strict"; | ||
exports(dir) { | ||
var taglib = this.taglib; | ||
var path = this.filePath; | ||
var dirname = this.dirname; | ||
if (taglib.isFromPackageJson) { | ||
taglib.tagsDir = false; | ||
scanTagsDir( | ||
path, | ||
dirname, | ||
dir, | ||
taglib, | ||
this.dependencyChain.append(`exports`) | ||
); | ||
} | ||
} | ||
taglibImports(imports) { | ||
@@ -257,0 +275,0 @@ // The "taglib-imports" property allows another taglib to be imported |
@@ -29,5 +29,6 @@ "use strict"; | ||
class Taglib { | ||
constructor(filePath) { | ||
constructor(filePath, isFromPackageJson) { | ||
ok(filePath, '"filePath" expected'); | ||
this.filePath = this.path /* deprecated */ = this.id = filePath; | ||
this.isFromPackageJson = isFromPackageJson === true; | ||
this.dirname = path.dirname(this.filePath); | ||
@@ -34,0 +35,0 @@ this.scriptLang = undefined; |
{ | ||
"name": "@marko/compiler", | ||
"version": "5.33.8", | ||
"version": "5.34.0", | ||
"description": "Marko template to JS compiler.", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
461104
10700