fixes for sass

bertramdev · Jul 22, 2016 · f463666 · f463666
1 parent 4002547
commit f463666
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/...t-pipeline-core/src/main/groovy/asset/pipeline/processors/ClosureCompilerProcessor.groovy b/...t-pipeline-core/src/main/groovy/asset/pipeline/processors/ClosureCompilerProcessor.groovy
@@ -73,6 +73,9 @@ class ClosureCompilerProcessor {
 			outputWriter.close();
 			output = "//# sourceMappingURL=${baseFileName + '.js.map'}\n" + output
 		}
+		if(!output) {
+			return inputText
+		}
 		return output
 	}
 

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 }
 
 subprojects {
-	version = '2.9.5'
+	version = '2.9.6'
 }
 
 apply plugin: 'groovy'

diff --git a/less-asset-pipeline/src/main/groovy/asset/pipeline/less/AssetPipelineLessSource.groovy b/less-asset-pipeline/src/main/groovy/asset/pipeline/less/AssetPipelineLessSource.groovy
@@ -22,8 +22,10 @@ import asset.pipeline.AssetCompiler
 import asset.pipeline.processors.CssProcessor
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
+import groovy.util.logging.Commons
 
 
+@Commons
 class AssetPipelineLessSource extends LessSource {
 	def sourceFile
 	String contents

diff --git a/less-asset-pipeline/src/main/groovy/asset/pipeline/less/LessProcessor.groovy b/less-asset-pipeline/src/main/groovy/asset/pipeline/less/LessProcessor.groovy
@@ -6,7 +6,6 @@ import asset.pipeline.AbstractProcessor
 import asset.pipeline.AssetCompiler
 import asset.pipeline.AssetFile
 import groovy.util.logging.Commons
-import groovy.util.logging.Log4j
 import asset.pipeline.processors.CssProcessor
 import org.mozilla.javascript.Context
 import org.mozilla.javascript.JavaScriptException

diff --git a/sass-asset-pipeline/src/main/groovy/asset/pipeline/jsass/SassAssetFileImporter.groovy b/sass-asset-pipeline/src/main/groovy/asset/pipeline/jsass/SassAssetFileImporter.groovy
@@ -64,7 +64,7 @@ class SassAssetFileImporter implements Importer {
         if (baseFile && importedAssetFile) {
             CacheManager.addCacheDependency(baseFile.name, importedAssetFile)
             def results = Collections.singletonList(
-                    new Import(importedAssetFile.name, importedAssetFile.path, importedAssetFile.inputStream.text)
+                    new Import(importedAssetFile.name, importedAssetFile.path, importedAssetFile.inputStream.getText('UTF-8'))
                     )
             return results
         }

diff --git a/sass-asset-pipeline/src/main/groovy/asset/pipeline/jsass/SassProcessor.groovy b/sass-asset-pipeline/src/main/groovy/asset/pipeline/jsass/SassProcessor.groovy
@@ -19,12 +19,12 @@ import asset.pipeline.AbstractProcessor
 import asset.pipeline.AssetCompiler
 import asset.pipeline.AssetFile
 import asset.pipeline.AssetPipelineConfigHolder
-import groovy.util.logging.Log4j
+import groovy.util.logging.Commons
 import io.bit3.jsass.Compiler
 import io.bit3.jsass.Options
 import io.bit3.jsass.OutputStyle
 
-@Log4j
+@Commons
 class SassProcessor extends AbstractProcessor {
     final Compiler compiler = new Compiler();
     final Options options = new Options();
@@ -45,7 +45,12 @@ class SassProcessor extends AbstractProcessor {
     String process(String input, AssetFile assetFile) {
         options.getImporters().add(new SassAssetFileImporter(assetFile))
 
-        log.info "Compiling $assetFile.name"
+        log.debug "Compiling $assetFile.name"
+        if(assetFile.name.endsWith('.sass')) {
+            options.setIsIndentedSyntaxSrc(true); 
+        } else {
+            options.setIsIndentedSyntaxSrc(false); 
+        }
         def output = compiler.compileString(input, assetFile.path.toURI(), null, options)
         return output.css
     }