Fix hot reload and use require hook for compiled server templates if …

…available (#1310)
marko-js · Apr 4, 2019 · c44aa04 · c44aa04
1 parent 3c764ea
commit c44aa04
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/hot-reload.js b/src/hot-reload.js
@@ -34,6 +34,10 @@ function tryReloadTemplate(path) {
     path = path.replace(/\.js$/, "");
 
     try {
+        if (require.extensions[".marko"]) {
+            return require(path);
+        }
+
         return marko.load(path);
     } catch (e) {
         return undefined;

diff --git a/src/node-require/index.js b/src/node-require/index.js
@@ -92,13 +92,11 @@ function install(options) {
         ? options.require.extensions
         : require.extensions;
 
-    var compilerOptions = options.compilerOptions;
-
-    if (compilerOptions) {
-        require("../compiler").configure(compilerOptions);
-    } else {
-        compilerOptions = {};
-    }
+    var compilerOptions = Object.assign(
+        { requireTemplates: true },
+        options.compilerOptions
+    );
+    require("../compiler").configure(compilerOptions);
 
     var extensions = [];