@marko/compiler 5.39.5 → 5.39.7

package/dist/babel-utils/tags.js

@@ -319,7 +319,7 @@ function resolveMarkoFile(file, filename) {
 const idCache = new WeakMap();
 const templateIdHashOpts = { outputLength: 5 };
 function getTemplateId(opts, request, child) {
-  const id = (0, _path.relative)(ROOT, request);
+  const id = (0, _path.relative)(ROOT, request).replace(/[^a-zA-Z0-9_$./-]/g, "/");
   const optimize = typeof opts === "object" ? opts.optimize : opts;
 
   if (optimize) {

package/dist/taglib/finder/index.js

@@ -50,7 +50,7 @@ function getAllDependencyNames(pkg) {
   return Object.keys(map);
 }
 
-function find(dirname, registeredTaglibs) {
+function find(dirname, registeredTaglibs, tagDiscoveryDirs) {
   var found = findCache[dirname];
   if (found) {
     return found;
@@ -92,10 +92,14 @@ function find(dirname, registeredTaglibs) {
       }
 
       if (!taglib || taglib.tagsDir === undefined) {
-        const componentsPath = nodePath.join(curDirname, "components");
-
-        if (existsSync(componentsPath) && !excludedDirs[componentsPath]) {
-          helper.addTaglib(taglibLoader.loadTaglibFromDir(curDirname));
+        for (const tagDiscoveryDir of tagDiscoveryDirs) {
+          const componentsPath = nodePath.join(curDirname, tagDiscoveryDir);
+
+          if (existsSync(componentsPath) && !excludedDirs[componentsPath]) {
+            helper.addTaglib(
+              taglibLoader.loadTaglibFromDir(curDirname, tagDiscoveryDir)
+            );
+          }
         }
       }
     }

package/dist/taglib/index.js

@@ -45,7 +45,11 @@ function buildLookup(dirname, requestedTranslator, onError) {
   }
 
   runAndCatchErrors(() => {
-    taglibsForDir = _finder2.default.find(dirname, taglibsForDir);
+    taglibsForDir = _finder2.default.find(
+      dirname,
+      taglibsForDir,
+      translator.tagDiscoveryDirs
+    );
   }, onError);
 
   const cacheKey = taglibsForDir.

package/dist/taglib/loader/index.js

@@ -12,8 +12,8 @@ function loadTaglibFromFile(filePath, isFromPackageJson) {
   return loaders.loadTaglibFromFile(filePath, isFromPackageJson);
 }
 
-function loadTaglibFromDir(filePath) {
-  return loaders.loadTaglibFromDir(filePath);
+function loadTaglibFromDir(filePath, tagDiscoveryDir) {
+  return loaders.loadTaglibFromDir(filePath, tagDiscoveryDir);
 }
 
 function clearCache() {

package/dist/taglib/loader/loadTaglibFromDir.js

@@ -5,10 +5,10 @@ var DependencyChain = require("./DependencyChain");
 var scanTagsDir = require("./scanTagsDir");
 var types = require("./types");
 
-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);
 
   // Only load a taglib once by caching the loaded taglibs using the file
@@ -19,7 +19,7 @@ function loadFromDir(dir) {
     scanTagsDir(
       componentsPath,
       dir,
-      "components",
+      tagDiscoveryDir,
       taglib,
       new DependencyChain([componentsPath])
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/compiler",
-  "version": "5.39.5",
+  "version": "5.39.7",
   "description": "Marko template to JS compiler.",
   "keywords": [
     "babel",
@@ -86,7 +86,7 @@
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
-    "marko": "^5.37.5"
+    "marko": "^5.37.8"
   },
   "publishConfig": {
     "access": "public"