- fix bug: pug dependency path resolving incorrect

zbryikt · Feb 6, 2021 · bed6569 · bed6569
1 parent f44742a
commit bed6569
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## 2.2.3
+
+ - fix bug: pug dependency path resolving incorrect
+
+
 ## 2.2.2
 
  - fix bug: pug malformat crashes the whole server

diff --git a/bin/lib/tree/PugTree.js b/bin/lib/tree/PugTree.js
diff --git a/lib/tree/PugTree.ls b/lib/tree/PugTree.ls
@@ -4,13 +4,13 @@ pugbuild = require "../build/pug"
 pugtree = new DocTree do
   parser: (c, f) ->
     /* use pug dependencies tracking */
-    cwd = path.resolve process.cwd!
+    cwd = path.resolve path.join(process.cwd!, @root)
     try
-      ret2 = pug.compileClientWithDependenciesTracked(
+      ret = pug.compileClientWithDependenciesTracked(
         c,
         {basedir: path.join(cwd,path.dirname f), filename: f} <<< pugbuild.extapi
       )
-      return ret2.dependencies.map(-> it.replace cwd, '../..')
+      return ret.dependencies.map(-> it.replace cwd, '/../..')
     catch e
       try
         ret = c

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "license": "MIT",
   "main": "bin/lib/index.js",
   "description": "simple, quick template for bootstrap a page",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "homepage": "https://github.com/zbryikt/template",
   "repository": {
     "type": "git",

diff --git a/src/pug/dir/index.pug b/src/pug/dir/index.pug
@@ -0,0 +1,5 @@
+doctype html
+html
+  head
+  body
+    include module.pug
diff --git a/src/pug/dir/module.pug b/src/pug/dir/module.pug
@@ -0,0 +1,2 @@
+//- module
+div module
diff --git a/src/pug/index.pug b/src/pug/index.pug
@@ -27,3 +27,4 @@ html
     +scope("hi"): div include module pug with #[code @] works.
     include @static/assets/sample.pug
     include module.pug
+    script: include:lsc module.ls
diff --git a/src/pug/module.ls b/src/pug/module.ls
@@ -0,0 +1,3 @@
+div = document.createElement("div")
+div.innerText = "include:lsc module.ls works"
+document.body.appendChild div
diff --git a/static/dir/index.html b/static/dir/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><html><head></head><body><div>module</div></body></html>
diff --git a/static/index.html b/static/index.html
@@ -8,4 +8,7 @@
 div.textContent = "livescript filter test";</script><script type="application/json">{
   "output": "lson test ok"
 }
-</script><div>i18n 翻譯測試 ( 編譯時期, pug filter )</div><div>i18n 翻譯測試 ( 執行時期, pug function )</div><div>i18n 翻譯測試 ( 執行時期, pug function )</div><div>命名域測試成功.</div><div>/intl/zh-TW/</div><div ld-scope="hi"><div>include module pug with <code>@</code> works.</div></div><div>include with <code>@static</code> works.</div><div>hi</div></body></html>
+</script><div>i18n 翻譯測試 ( 編譯時期, pug filter )</div><div>i18n 翻譯測試 ( 執行時期, pug function )</div><div>i18n 翻譯測試 ( 執行時期, pug function )</div><div>命名域測試成功.</div><div>/intl/zh-TW/</div><div ld-scope="hi"><div>include module pug with <code>@</code> works.</div></div><div>include with <code>@static</code> works.</div><div>hi</div><script>var div;
+div = document.createElement("div");
+div.innerText = "include:lsc module.ls works";
+document.body.appendChild(div);</script></body></html>
diff --git a/static/intl/en/dir/index.html b/static/intl/en/dir/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><html><head></head><body><div>module</div></body></html>
diff --git a/static/intl/en/index.html b/static/intl/en/index.html
@@ -8,4 +8,7 @@
 div.textContent = "livescript filter test";</script><script type="application/json">{
   "output": "lson test ok"
 }
-</script><div>i18n translation test ( compile time filter )</div><div>i18n translation test ( runtime function )</div><div>i18n translation test ( runtime function )</div><div>namespace test ok.</div><div>/intl/en/</div><div ld-scope="hi"><div>include module pug with <code>@</code> works.</div></div><div>include with <code>@static</code> works.</div><div>hi</div></body></html>
+</script><div>i18n translation test ( compile time filter )</div><div>i18n translation test ( runtime function )</div><div>i18n translation test ( runtime function )</div><div>namespace test ok.</div><div>/intl/en/</div><div ld-scope="hi"><div>include module pug with <code>@</code> works.</div></div><div>include with <code>@static</code> works.</div><div>hi</div><script>var div;
+div = document.createElement("div");
+div.innerText = "include:lsc module.ls works";
+document.body.appendChild(div);</script></body></html>
diff --git a/static/intl/zh-TW/dir/index.html b/static/intl/zh-TW/dir/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><html><head></head><body><div>module</div></body></html>
diff --git a/static/intl/zh-TW/index.html b/static/intl/zh-TW/index.html
@@ -8,4 +8,7 @@
 div.textContent = "livescript filter test";</script><script type="application/json">{
   "output": "lson test ok"
 }
-</script><div>i18n 翻譯測試 ( 編譯時期, pug filter )</div><div>i18n 翻譯測試 ( 執行時期, pug function )</div><div>i18n 翻譯測試 ( 執行時期, pug function )</div><div>命名域測試成功.</div><div>/intl/zh-TW/</div><div ld-scope="hi"><div>include module pug with <code>@</code> works.</div></div><div>include with <code>@static</code> works.</div><div>hi</div></body></html>
+</script><div>i18n 翻譯測試 ( 編譯時期, pug filter )</div><div>i18n 翻譯測試 ( 執行時期, pug function )</div><div>i18n 翻譯測試 ( 執行時期, pug function )</div><div>命名域測試成功.</div><div>/intl/zh-TW/</div><div ld-scope="hi"><div>include module pug with <code>@</code> works.</div></div><div>include with <code>@static</code> works.</div><div>hi</div><script>var div;
+div = document.createElement("div");
+div.innerText = "include:lsc module.ls works";
+document.body.appendChild(div);</script></body></html>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<!DOCTYPE html><html><head></head><body><div>module</div></body></html>