Fixes regressions introduced in previous merges

[mgreter]

Fixes a few issues introduced in recently merged pull requests.

#441: resolve_relative_path would always return lowercase paths on windows, which will not work if one would deploy the files to a linux server (or any other case sensitive filesystem). Implemented a better and IMO correct way to handle this. Also introduced a preprocessor directive FS_CASE_SENSITIVE so that the behaviour could be overruled on compile time.

#440: sourceMappingURL is always added even if source_map_file was not set to anything at all.

[am11]

Thank you @mgreter. I was just about to install everything on my new system to fix this. 👍

[am11]

@mgreter,

There still needs to be few fixes to be made.

The idea really is:

• the primary source file (to be compiled) can be at different location than the output-path.
• the source-map file can be at different location than the output file.

Both of the above assertions aren't complied by libsass at the moment.

For that matter:

First, we need to store initializers.output_path() in class variable and then initialize source_map with resolve_relative_path(output_path, source_map_file, cwd) (in a ctor body -- after initiating cwd).

Secondly, in format_source_mapping_url(), we need to change it to:

"/*# sourceMappingURL=" + resolve_relative_path(source_map_file, source_path, cwd) + " */";

I guess after that the API will be quite flexible and finally browsers will be able to locate correct sources with source maps generated by libsass.

Thoughts?

[mgreter]

@am11: Libsass already resolves sources relative to the source map file. I have added some additonal commits which should do what you have asked for (sourceMappingURL relative to output_path).
You got lucky since I probably need this feature soon :)

@akhleung: With these changes paths are internally always represented with forward slashes. The make_canonical_path function should be used to sanitize paths when they come from outside or the system. It should normalize . references and repeated slashes. The result will always have forward slashes. I also added some more details to the corresponding commit messages.

[am11]

@mgreter, thanks! All these changes are extremely useful. 👍

Regarding the source-map initializer issue, please see the source_map's ctor, and this is how source-map is currently initialized in context.cpp. The problem is with the "file" member of JSON, which should be the output_path relative to source_map_file. Currently it's merely displaying the file name of output_path; implying both map and output will be in same directory (which is not the case).

[am11]

Thanks @mgreter! 😃 👍

[mgreter]

@am11 Can you confirm that your issues are fixed by this pull request? @akhleung Not sure if you missed this one, or are there any objections regarding this?

[akhleung]

Sorry, I just haven't had time to look at it yet. Will try to get it merged soon.

[am11]

@mgreter, yes; all our path-related concerns regarding .map JSON and source maps comments are addressed by this. I have reviewed the code but haven't tried merging the commit (I am running into some PC issues, can't test it until next week). Rest assured, it looks pretty solid than the current state.

Hopefully we get the mapping issue fixed as well. I don't have right insights about the sass-compiler's internals and how it reports sources. If you guys can take a look or point me to the locations in code so I can give it a try, it will truly make a big impact and help many affected out there..

Thanks!

[akhleung]

Looked over the code and it looks good ... I'll test/merge it in the morning when I have access to my work machine.

[HamptonMakes]

Merge o'clock has begun.

On Fri, Aug 8, 2014 at 9:09 PM, Aaron Leung [email protected]
wrote:

Merged #455 #455.

Reply to this email directly or view it on GitHub
#455 (comment).

[am11]

Indeed 😃

I wish if someday node-sass will get blessed with such a thing: "Merge o' clock"... node-sass has been insanely slow lately in adapting changes from libsass, accepting PRs, releases and all those usual things which happen to a repository..

[akhleung]

Unfortunately, it looks like node-sass's maintainer is no longer able to devote time to the project:

https://twitter.com/teabass/status/494993372252495874

[am11]

Can anyone else take the throne and keep the wheel spinning?
That is the only SASS' gateway to the JS world.
All other sass npms are dead in water 🐟