Merge 2aa8b944f6 into 9e19e63551
This commit is contained in:
commit
87c33b3995
|
|
@ -111,6 +111,7 @@ function minify(files, options) {
|
||||||
content: null,
|
content: null,
|
||||||
filename: null,
|
filename: null,
|
||||||
includeSources: false,
|
includeSources: false,
|
||||||
|
json: true,
|
||||||
root: null,
|
root: null,
|
||||||
url: null,
|
url: null,
|
||||||
}, true);
|
}, true);
|
||||||
|
|
@ -207,7 +208,13 @@ function minify(files, options) {
|
||||||
toplevel.print(stream);
|
toplevel.print(stream);
|
||||||
result.code = stream.get();
|
result.code = stream.get();
|
||||||
if (options.sourceMap) {
|
if (options.sourceMap) {
|
||||||
result.map = options.output.source_map.toString();
|
result.map = options.output.source_map.get().toJSON();
|
||||||
|
if (Array.isArray(files)) {
|
||||||
|
result.map.sources = [null];
|
||||||
|
}
|
||||||
|
if (options.sourceMap.json !== false) {
|
||||||
|
result.map = JSON.stringify(result.map);
|
||||||
|
}
|
||||||
if (options.sourceMap.url == "inline") {
|
if (options.sourceMap.url == "inline") {
|
||||||
result.code += "\n//# sourceMappingURL=data:application/json;charset=utf-8;base64," + to_base64(result.map);
|
result.code += "\n//# sourceMappingURL=data:application/json;charset=utf-8;base64," + to_base64(result.map);
|
||||||
} else if (options.sourceMap.url) {
|
} else if (options.sourceMap.url) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user