bemto

iliakan · iliakan · commit a8c756da9b46 · 2018-06-29T21:04:02.000+03:00
diff --git a/handlers/render.js b/handlers/render.js
@@ -169,6 +169,23 @@ exports.init = function(app) {
 
       let templatePathResolved = resolvePath(templatePath, loc);
       ctx.log.debug("render file " + templatePathResolved);
+
+
+      loc.plugins = [{
+        resolve
+      }];
+
+      function resolve(filename, source, loadOptions) {
+        if (filename[0] === '/') {
+          return path.join(loadOptions.basedir, filename);
+        }
+        if (filename[0] === '~') {
+          return require.resolve(filename.slice(1));
+        }
+
+        return path.join(path.dirname(source), filename);
+      }
+
       return pug.renderFile(templatePathResolved, loc);
     };
 
diff --git a/handlers/tutorial/templates/_map.pug b/handlers/tutorial/templates/_map.pug
@@ -1,4 +1,4 @@
-include /bem/index
+include ~bemto.pug/lib/index
 
 - console.log(roots)
 
diff --git a/handlers/tutorial/test/renderer/taskRenderer.js b/handlers/tutorial/test/renderer/taskRenderer.js
@@ -7,11 +7,11 @@ const Task = require('../../models/task');
 
 describe("TaskRenderer", function() {
 
-  beforeEach(function* () {
+  beforeEach(async function () {
     await Task.destroy();
   });
 
-  it("renderContent", function* () {
+  it("renderContent", async function () {
 
     const task = new Task({
       "content":    "Content",
@@ -29,7 +29,7 @@ describe("TaskRenderer", function() {
   });
 
 
-  it("renderSolution", function* () {
+  it("renderSolution", async function () {
 
     const task = new Task({
       "content":    "# Title\n\nContent",
diff --git a/modules/client/notification/notification-popup.pug b/modules/client/notification/notification-popup.pug
@@ -1,4 +1,4 @@
-include /bem/index
+include ~bemto.pug/lib/index
 
 +b(class="notification notification_popup notification_" + type)
   +e.content= html
diff --git a/modules/lib/serverPug/index.js b/modules/lib/serverPug/index.js
@@ -4,7 +4,7 @@ const config = require('config');
 const pug = require('pug');
 
 /**
- * extension for require('file.jade'),
+ * extension for require('file.pug'),
  * works in libs that are shared between client & server
  */
 require.extensions['.pug'] = function(module, filename) {
@@ -14,13 +14,26 @@ require.extensions['.pug'] = function(module, filename) {
     Object.assign({}, config.pug, {
       pretty:        false,
       compileDebug:  false,
-      filename:      filename
+      filename:      filename,
+      plugins: [{
+        resolve
+      }]
     })
   );
 
+  function resolve(filename, source, loadOptions) {
+    if (filename[0] === '/') {
+      return path.join(loadOptions.basedir, filename);
+    }
+    if (filename[0] === '~') {
+      return require.resolve(filename.slice(1));
+    }
+
+    return path.join(path.dirname(source), filename);
+  }
+
   module.exports = function(locals) {
     locals = locals || {};
-    locals.bem = require('bemPug')();
 
     return compiled(locals);
   };
diff --git a/modules/markit/templates/codeTabs.pug b/modules/markit/templates/codeTabs.pug
@@ -1,4 +1,4 @@
-include /bem/index
+include ~bemto.pug/lib/index
 
 +b.code-tabs._result_on
   +e.tools
diff --git a/templates/bem b/templates/bem
diff --git a/templates/blocks/mdeditor.pug b/templates/blocks/mdeditor.pug
@@ -1,4 +1,4 @@
-include /bem/index
+include ~bemto.pug/lib/index
 
 
 mixin mdeditor(data)
diff --git a/templates/layouts/base.pug b/templates/layouts/base.pug
@@ -1,6 +1,6 @@
 //- bare layout with bem
 doctype html
-include /bem/index
+include ~bemto.pug/lib/index
 
 html(lang=lang)
   block html

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-include /bem/index`
	`1`	`+include ~bemto.pug/lib/index`
`2`	`2`
`3`	`3`	`- console.log(roots)`
`4`	`4`