feat: lazy load load compiler hook paths, expose error loc object

marko-js · Jul 24, 2021 · f49fc19 · f49fc19
1 parent 7573cd1
commit f49fc19
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/packages/compiler/src/babel-plugin/file.js b/packages/compiler/src/babel-plugin/file.js
@@ -35,6 +35,7 @@ export class MarkoFile extends File {
     }: ${msg}\n${frame || ""}`;
 
     const err = new Error();
+    err.loc = loc;
 
     // Prevent babel from changing our error message.
     Object.defineProperty(err, "message", {

diff --git a/packages/compiler/src/taglib/loader/loadTagFromProps.js b/packages/compiler/src/taglib/loader/loadTagFromProps.js
@@ -39,7 +39,12 @@ function hasAttributes(tagProps) {
 function normalizeHook(dirname, value) {
   if (typeof value === "string") {
     value = resolveRelative(dirname, value);
-    return { path: value, hook: markoModules.require(value) };
+    return {
+      path: value,
+      get hook() {
+        return markoModules.require(value);
+      }
+    };
   }
   return { hook: value };
 }

diff --git a/packages/compiler/src/taglib/loader/loadTaglibFromProps.js b/packages/compiler/src/taglib/loader/loadTaglibFromProps.js
@@ -21,7 +21,12 @@ function resolveRelative(dirname, value) {
 function normalizeHook(dirname, value) {
   if (typeof value === "string") {
     value = resolveRelative(dirname, value);
-    return { path: value, hook: markoModules.require(value) };
+    return {
+      path: value,
+      get hook() {
+        return markoModules.require(value);
+      }
+    };
   }
   return { hook: value };
 }