From fe7778cda96dd7325a92730f7fd0b39e9b2176ef Mon Sep 17 00:00:00 2001 From: Mohammad Younes Date: Mon, 23 Feb 2015 22:10:47 +0200 Subject: [PATCH 1/6] Respect Scss.GenerateSourceMaps flag --- EditorExtensions/Resources/server/services/srv-scss.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/EditorExtensions/Resources/server/services/srv-scss.js b/EditorExtensions/Resources/server/services/srv-scss.js index c2c8f27b0..a9e539e92 100644 --- a/EditorExtensions/Resources/server/services/srv-scss.js +++ b/EditorExtensions/Resources/server/services/srv-scss.js @@ -5,6 +5,8 @@ var sass = require("node-sass"), //#region Handler var handleSass = function (writer, params) { + var omitSourceMap = typeof params.sourceMapURL === 'undefined'; + sass.render({ file: params.sourceFileName, outFile: params.targetFileName, @@ -12,10 +14,11 @@ var handleSass = function (writer, params) { precision: parseInt(params.precision, 10), outputStyle: params.outputStyle, sourceMap: params.mapFileName, - omitSourceMapUrl: params.sourceMapURL === undefined, + omitSourceMapUrl: omitSourceMap, success: function (result) { - var css = result.css; - var map = result.map; + var css = result.css, map; + if (!omitSourceMap) + map = result.map; if (params.autoprefixer !== undefined) { var autoprefixedOutput = require("./srv-autoprefixer") From 41fe0f76d698558beb2c46da30818911d75f20c8 Mon Sep 17 00:00:00 2001 From: Mohammad Younes Date: Mon, 23 Feb 2015 22:13:48 +0200 Subject: [PATCH 2/6] Set postcss inline map flag to false --- EditorExtensions/Resources/server/services/srv-autoprefixer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EditorExtensions/Resources/server/services/srv-autoprefixer.js b/EditorExtensions/Resources/server/services/srv-autoprefixer.js index 6030e51f9..bf4acba5d 100644 --- a/EditorExtensions/Resources/server/services/srv-autoprefixer.js +++ b/EditorExtensions/Resources/server/services/srv-autoprefixer.js @@ -27,7 +27,7 @@ var processAutoprefixer = function (cssContent, mapContent, browsers, sourceFile }; result = result.process(cssContent, { - map: { prev: mapContent }, + map: { prev: mapContent, inline: false }, from: sourceFileName, to: targetFileName }); From 85574ff149297c1241870a883d422c2d2ed37415 Mon Sep 17 00:00:00 2001 From: Mohammad Younes Date: Mon, 23 Feb 2015 22:15:06 +0200 Subject: [PATCH 3/6] Respect Css.GenerateRtlSourceMaps flag and set postcss inline flag to false --- .../Misc/RTLCss/Compilers/RtlCssCompiler.cs | 3 +++ .../Resources/server/services/srv-rtlcss.js | 19 +++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/EditorExtensions/Misc/RTLCss/Compilers/RtlCssCompiler.cs b/EditorExtensions/Misc/RTLCss/Compilers/RtlCssCompiler.cs index 0f34afa0c..b0d9faff8 100644 --- a/EditorExtensions/Misc/RTLCss/Compilers/RtlCssCompiler.cs +++ b/EditorExtensions/Misc/RTLCss/Compilers/RtlCssCompiler.cs @@ -26,6 +26,9 @@ protected override string GetPath(string sourceFileName, string targetFileName) parameters.UriComponentsDictionary.Add("targetFileName", targetFileName); parameters.Add("mapFileName", targetFileName + ".map"); + if (GenerateSourceMap) + parameters.Add("sourceMapURL"); + if (WESettings.Instance.Css.RtlCss) parameters.Add("rtlcss"); diff --git a/EditorExtensions/Resources/server/services/srv-rtlcss.js b/EditorExtensions/Resources/server/services/srv-rtlcss.js index d2afe47a1..31676fa22 100644 --- a/EditorExtensions/Resources/server/services/srv-rtlcss.js +++ b/EditorExtensions/Resources/server/services/srv-rtlcss.js @@ -7,22 +7,26 @@ var rtlcss = require("rtlcss"), //#region Process var processRtlCSS = function (cssContent, mapContent, sourceFileName, targetFileName, autoprefixer, autoprefixerBrowsers) { - if (mapContent !== true) { - mapContent = { prev: mapContent }; - } + var result, css, map = false; + //wrap source map. + if (typeof (mapContent) === 'object') + map = { prev: mapContent, inline: false }; + else if (mapContent === true) + map = { inline: false }; - var result, css, map; try { var config = configLoader.load(null, path.dirname(sourceFileName), { options: { minify: false } }); result = rtlcss.configure(config).process(cssContent, { - map: mapContent, + map: map, from: sourceFileName, to: targetFileName }); css = result.css; - map = result.map.toJSON(); + //set map if exists + if (typeof result.map !== 'undefined') + map = result.map.toJSON(); } catch (e) { // Return same css and map back so the upstream compilers can continue. return { @@ -66,9 +70,8 @@ var handleRtlCSS = function (writer, params) { writer.end(); return; } - var output = processRtlCSS(data, - true, + typeof params.sourceMapURL !== 'undefined', params.sourceFileName, params.targetFileName, params.autoprefixer, From ad1d77b107c555f685dc30af796307fc0a0031ec Mon Sep 17 00:00:00 2001 From: Mohammad Younes Date: Mon, 23 Feb 2015 22:10:47 +0200 Subject: [PATCH 4/6] Respect Scss.GenerateSourceMaps flag --- EditorExtensions/Resources/server/services/srv-scss.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/EditorExtensions/Resources/server/services/srv-scss.js b/EditorExtensions/Resources/server/services/srv-scss.js index 253868ae8..844e7ffd4 100644 --- a/EditorExtensions/Resources/server/services/srv-scss.js +++ b/EditorExtensions/Resources/server/services/srv-scss.js @@ -35,8 +35,9 @@ var handleSass = function(writer, params) { writer.end(); } - var css = result.css.toString(); - var map = result.map.toString(); + var map, css = result.css.toString(); + if (!options.omitSourceMapUrl) + map = result.map.toString(); if (params.autoprefixer !== undefined) { var autoprefixedOutput = require("./srv-autoprefixer") From ce5cd649b4bd1a223cca291420edaa52473250eb Mon Sep 17 00:00:00 2001 From: Mohammad Younes Date: Mon, 23 Feb 2015 22:13:48 +0200 Subject: [PATCH 5/6] Set postcss inline map flag to false --- EditorExtensions/Resources/server/services/srv-autoprefixer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EditorExtensions/Resources/server/services/srv-autoprefixer.js b/EditorExtensions/Resources/server/services/srv-autoprefixer.js index 6030e51f9..bf4acba5d 100644 --- a/EditorExtensions/Resources/server/services/srv-autoprefixer.js +++ b/EditorExtensions/Resources/server/services/srv-autoprefixer.js @@ -27,7 +27,7 @@ var processAutoprefixer = function (cssContent, mapContent, browsers, sourceFile }; result = result.process(cssContent, { - map: { prev: mapContent }, + map: { prev: mapContent, inline: false }, from: sourceFileName, to: targetFileName }); From f52358d421b14d9207febcbb250326c9095ae8d4 Mon Sep 17 00:00:00 2001 From: Mohammad Younes Date: Mon, 23 Feb 2015 22:15:06 +0200 Subject: [PATCH 6/6] Respect Css.GenerateRtlSourceMaps flag and set postcss inline flag to false --- .../Misc/RTLCss/Compilers/RtlCssCompiler.cs | 3 +++ .../Resources/server/services/srv-rtlcss.js | 19 +++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/EditorExtensions/Misc/RTLCss/Compilers/RtlCssCompiler.cs b/EditorExtensions/Misc/RTLCss/Compilers/RtlCssCompiler.cs index 0f34afa0c..b0d9faff8 100644 --- a/EditorExtensions/Misc/RTLCss/Compilers/RtlCssCompiler.cs +++ b/EditorExtensions/Misc/RTLCss/Compilers/RtlCssCompiler.cs @@ -26,6 +26,9 @@ protected override string GetPath(string sourceFileName, string targetFileName) parameters.UriComponentsDictionary.Add("targetFileName", targetFileName); parameters.Add("mapFileName", targetFileName + ".map"); + if (GenerateSourceMap) + parameters.Add("sourceMapURL"); + if (WESettings.Instance.Css.RtlCss) parameters.Add("rtlcss"); diff --git a/EditorExtensions/Resources/server/services/srv-rtlcss.js b/EditorExtensions/Resources/server/services/srv-rtlcss.js index d2afe47a1..31676fa22 100644 --- a/EditorExtensions/Resources/server/services/srv-rtlcss.js +++ b/EditorExtensions/Resources/server/services/srv-rtlcss.js @@ -7,22 +7,26 @@ var rtlcss = require("rtlcss"), //#region Process var processRtlCSS = function (cssContent, mapContent, sourceFileName, targetFileName, autoprefixer, autoprefixerBrowsers) { - if (mapContent !== true) { - mapContent = { prev: mapContent }; - } + var result, css, map = false; + //wrap source map. + if (typeof (mapContent) === 'object') + map = { prev: mapContent, inline: false }; + else if (mapContent === true) + map = { inline: false }; - var result, css, map; try { var config = configLoader.load(null, path.dirname(sourceFileName), { options: { minify: false } }); result = rtlcss.configure(config).process(cssContent, { - map: mapContent, + map: map, from: sourceFileName, to: targetFileName }); css = result.css; - map = result.map.toJSON(); + //set map if exists + if (typeof result.map !== 'undefined') + map = result.map.toJSON(); } catch (e) { // Return same css and map back so the upstream compilers can continue. return { @@ -66,9 +70,8 @@ var handleRtlCSS = function (writer, params) { writer.end(); return; } - var output = processRtlCSS(data, - true, + typeof params.sourceMapURL !== 'undefined', params.sourceFileName, params.targetFileName, params.autoprefixer,