Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use the index of stdin instead of zero #681

Merged
merged 4 commits into from May 7, 2019
Merged

Use the index of stdin instead of zero #681

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
716f879
fix: use the index of stdin instead of zero
FractalBoy May 7, 2019
f597462
style: format with prettier
FractalBoy May 7, 2019
6594306
fix: include all paths containing stdin
FractalBoy May 7, 2019
34f14b8
fix: don't replace any sources if stdin not found
FractalBoy May 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 11 additions & 2 deletions lib/loader.js
View file
Open in desktop
Expand Up @@ -81,12 +81,21 @@ function sassLoader(content) {
// Since we don't know the final filename in the webpack build chain yet, it makes no sense to have it.
// eslint-disable-next-line no-param-reassign
delete result.map.file;
// The first source is 'stdin' according to node-sass because we've used the data input.
// One of the sources is 'stdin' according to dart-sass/node-sass because we've used the data input.
// Now let's override that value with the correct relative path.
// Since we specified options.sourceMap = path.join(process.cwd(), "/sass.map"); in normalizeOptions,
// we know that this path is relative to process.cwd(). This is how node-sass works.
// eslint-disable-next-line no-param-reassign
result.map.sources[0] = path.relative(process.cwd(), resourcePath);
const stdinIndex = result.map.sources.findIndex(
(source) => source.indexOf('stdin') !== -1
);

if (stdinIndex !== -1) {
result.map.sources[stdinIndex] = path.relative(
process.cwd(),
resourcePath
);
}
// node-sass returns POSIX paths, that's why we need to transform them back to native paths.
// This fixes an error on windows where the source-map module cannot resolve the source maps.
// @see https://github.com/webpack-contrib/sass-loader/issues/366#issuecomment-279460722
Expand Down