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.

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

fix: respect map.annotation string #307

Merged
merged 4 commits into from Jan 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion index.js
Expand Up @@ -222,7 +222,7 @@ function css(css, file) {
tasks.push(fs.outputFile(options.to, result.css))

if (result.map) {
const mapfile = getMapfile(options.to)
const mapfile = getMapfile(options)
tasks.push(fs.outputFile(mapfile, result.map))
}
} else process.stdout.write(result.css, 'utf8')
Expand Down
8 changes: 6 additions & 2 deletions lib/getMapfile.js
@@ -1,4 +1,8 @@
'use strict'
module.exports = function getMapfile(p) {
return `${p}.map`
const path = require('path')
module.exports = function getMapfile(options) {
if (options.map && typeof options.map.annotation === 'string') {
return `${path.dirname(options.to)}/${options.map.annotation}`
}
return `${options.to}.map`
}
10 changes: 7 additions & 3 deletions test/map.js
Expand Up @@ -59,16 +59,20 @@ test('--no-map disables internal sourcemaps', async t => {
test('mapFile path is property resolved', async t => {
const paths = [
{
input: '/foo/bar.css/baz/index.css',
input: { to: '/foo/bar.css/baz/index.css' },
want: '/foo/bar.css/baz/index.css.map'
},
{
input: '/foo/bar.sss/baz/index.sss',
input: { to: '/foo/bar.sss/baz/index.sss' },
want: '/foo/bar.sss/baz/index.sss.map'
},
{
input: '/foo/bar.css/baz/bar.css',
input: { to: '/foo/bar.css/baz/bar.css' },
want: '/foo/bar.css/baz/bar.css.map'
},
{
input: { map: { annotation: 'foo.map' }, to: '/foo/bar.css/baz/bar.css' },
want: '/foo/bar.css/baz/foo.map'
}
]

Expand Down