Supported Stylus and change cache validation

tea3 · Nov 2, 2017 · 5032e13 · 5032e13
1 parent 3aa40ff
commit 5032e13
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/lib/cache.js b/lib/cache.js
@@ -117,6 +117,7 @@ function createCacheFile(inPath, hexoConfig, inPostPath , inDate , inEyeCatchIma
 //---------------------------------------
 module.exports.getCache = function(post, hexoConfig){
   var result = null;
+
   if( existsOption(hexoConfig) && fs.existsSync(getCachePath(hexoConfig)) && !hexoConfig.generator_amp.isCacheUpdate ){
     if(!read_cacheData){
       // console.log("\u001b[31mrefreshed cache: \u001b[0m" + post.path);

diff --git a/lib/filter/write-cache.js b/lib/filter/write-cache.js
@@ -10,7 +10,6 @@ var cache            = require('../cache.js');
 module.exports.write_cache = function(result){
   if(result.tempData.isCacheUse)return Promise.resolve(result);
   return new Promise(function(resolve , reject){
-
     cache.saveCache_amp(result.post, result.data , result.config);
 
     // process.stdout.write('[hexo-generator-amp] Plugin is currently writing the cache now ...           \r');

diff --git a/lib/settingsUpdate.js b/lib/settingsUpdate.js
@@ -24,8 +24,7 @@ module.exports.chkUpdate = function(config) {
         settingsStr += tmplPath;
     }
     if(fs.existsSync( pobj.cssFilePath )){
-        var cssStr = fs.readFileSync( pobj.cssFilePath , "utf-8");
-        settingsStr += cssStr;
+        settingsStr += pobj.cssTxt;
     }
     var shash = hasha(settingsStr , {algorithm: 'md5'} );
     return shash;

diff --git a/lib/templatePath.js b/lib/templatePath.js
@@ -2,6 +2,8 @@
 'use strict';
 var fs             = require('fs');
 var sass           = require('node-sass');
+var stylus         = require('stylus');
+var nib            = require('nib');
 var lg             = require('./log.js');
 var compiler       = require('./compileTemplate');
 var pathFn         = require('path');
@@ -58,6 +60,13 @@ module.exports.getPath = function(inConfig){
         })
         .css
         .toString();
+    } else if( isStylusPath(cssFilePath)){
+      var stylusData = fs.readFileSync(cssFilePath, 'utf8');
+      cssTxt = stylus(stylusData)
+        .use(nib())
+        .set('include css', true)
+        .set('filename', cssFilePath)
+        .render();
     } else {
       cssTxt    = fs.readFileSync(cssFilePath, 'utf8');
     }
@@ -153,3 +162,6 @@ module.exports.getPath = function(inConfig){
 function isScssPath (path) {
   return /\.scss$/.test(path);
 }
+function isStylusPath (path) {
+  return /\.styl$/.test(path);
+}