lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-27 12:29:04 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed bug with missing source maps in SASS transpilation.

Browse Source
This commit is contained in:
Daniel Stolt
2016-07-03 12:59:52 +02:00
parent 83f02b26b6
commit 8ff3ec0ee2
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Gulpfile.js
View File

@@ -10,8 +10,8 @@ var fs = require("fs"),
plumber = require("gulp-plumber"), plumber = require("gulp-plumber"),
sourcemaps = require("gulp-sourcemaps"), sourcemaps = require("gulp-sourcemaps"),
less = require("gulp-less"), less = require("gulp-less"),
cssnano = require("gulp-cssnano"),
sass = require("gulp-sass"), sass = require("gulp-sass"),
cssnano = require("gulp-cssnano"),
typescript = require("gulp-typescript"), typescript = require("gulp-typescript"),
uglify = require("gulp-uglify"), uglify = require("gulp-uglify"),
rename = require("gulp-rename"), rename = require("gulp-rename"),
@@ -136,8 +136,12 @@ function buildCssPipeline(assetGroup, doConcat, doRebuild) {
throw "Input file '" + inputPath + "' is not of a valid type for output file '" + assetGroup.outputPath + "'."; throw "Input file '" + inputPath + "' is not of a valid type for output file '" + assetGroup.outputPath + "'.";
}); });
var generateSourceMaps = assetGroup.hasOwnProperty("generateSourceMaps") ? assetGroup.generateSourceMaps : true; var generateSourceMaps = assetGroup.hasOwnProperty("generateSourceMaps") ? assetGroup.generateSourceMaps : true;
var containsLessOrScss = assetGroup.inputPaths.some(function (inputPath) {
var ext = path.extname(inputPath).toLowerCase();
return ext === ".less" || ext === ".scss";
});
// Source maps are useless if neither concatenating nor transforming. // Source maps are useless if neither concatenating nor transforming.
if ((!doConcat || assetGroup.inputPaths.length < 2) && !assetGroup.inputPaths.some(function (inputPath) { return path.extname(inputPath).toLowerCase() === ".less"; })) if ((!doConcat || assetGroup.inputPaths.length < 2) && !containsLessOrScss)
generateSourceMaps = false; generateSourceMaps = false;
var minifiedStream = gulp.src(assetGroup.inputPaths) // Minified output, source mapping completely disabled. var minifiedStream = gulp.src(assetGroup.inputPaths) // Minified output, source mapping completely disabled.
.pipe(gulpif(!doRebuild, .pipe(gulpif(!doRebuild,
@@ -150,7 +154,7 @@ function buildCssPipeline(assetGroup, doConcat, doRebuild) {
.pipe(plumber()) .pipe(plumber())
.pipe(gulpif("*.less", less())) .pipe(gulpif("*.less", less()))
.pipe(gulpif("*.scss", sass({ .pipe(gulpif("*.scss", sass({
precision: 10 precision: 10
}))) })))
.pipe(gulpif(doConcat, concat(assetGroup.outputFileName))) .pipe(gulpif(doConcat, concat(assetGroup.outputFileName)))
.pipe(cssnano({ .pipe(cssnano({
@@ -178,7 +182,7 @@ function buildCssPipeline(assetGroup, doConcat, doRebuild) {
.pipe(gulpif(generateSourceMaps, sourcemaps.init())) .pipe(gulpif(generateSourceMaps, sourcemaps.init()))
.pipe(gulpif("*.less", less())) .pipe(gulpif("*.less", less()))
.pipe(gulpif("*.scss", sass({ .pipe(gulpif("*.scss", sass({
precision: 10 precision: 10
}))) })))
.pipe(gulpif(doConcat, concat(assetGroup.outputFileName))) .pipe(gulpif(doConcat, concat(assetGroup.outputFileName)))
.pipe(header( .pipe(header(

2
src/Orchard.sln
View File

@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14 # Visual Studio 14
VisualStudioVersion = 14.0.24720.0 VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}"
EndProject EndProject