Skip to content

Commit

Permalink
Respect map.annotation string (#307)
Browse files Browse the repository at this point in the history
* fix: respect map.annotation string

* test: fix unit tests for getMapFile

* fix: always use posix paths in getMapFile

* style: prettier lib/getMapFile
  • Loading branch information
keithamus authored and RyanZim committed Jan 9, 2020
1 parent 745ad2c commit 568528d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
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

0 comments on commit 568528d

Please sign in to comment.