github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Be sure to get original CSS contents from appropriate SourceMapConsumer.

Browse Source 
https://github.com/meteor/meteor/pull/7877#issuecomment-252359894
This commit is contained in:
Ben Newman
2016-10-07 18:28:32 -04:00
parent 0996efc750
commit 281a73ddec
1 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
packages/standard-minifier-css/plugin/minify-css.js
View File

@@ -117,15 +117,11 @@ var mergeCss = Profile("mergeCss", function (css) {
return originals[filename].getContentsAsString();
});
var newMap;
// Compose the concatenated file's source map with source maps from the
// previous build step if necessary.
Profile.time("composing source maps", function () {
var concatConsumer;
newMap = new sourcemap.SourceMapGenerator();
concatConsumer = new sourcemap.SourceMapConsumer(stringifiedCss.map);
var newMap = Profile.time("composing source maps", function () {
var newMap = new sourcemap.SourceMapGenerator();
var concatConsumer = new sourcemap.SourceMapConsumer(stringifiedCss.map);
// Create a dictionary of source map consumers for fast access
var consumers = Object.create(null);
@@ -147,6 +143,10 @@ var mergeCss = Profile("mergeCss", function (css) {
}
});
// Maps each original source file name to the SourceMapConsumer that
// can provide its content.
var sourceToConsumerMap = Object.create(null);
// Find mappings from the concatenated file back to the original files
concatConsumer.eachMapping(function (mapping) {
var source = mapping.source;
@@ -170,9 +170,22 @@ var mergeCss = Profile("mergeCss", function (css) {
if (newOriginal.source !== null) {
original = newOriginal;
source = original.source;
if (source) {
// Since the new consumer provided a different
// original.source, we should ask it for the original source
// content instead of asking the concatConsumer.
sourceToConsumerMap[source] = consumer;
}
}
}
if (source && ! sourceToConsumerMap[source]) {
// If we didn't set sourceToConsumerMap[source] = consumer above,
// use the concatConsumer to determine the original content.
sourceToConsumerMap[source] = concatConsumer;
}
// Add a new mapping to the final source map
newMap.addMapping({
generated: {
@@ -182,13 +195,19 @@ var mergeCss = Profile("mergeCss", function (css) {
original: original,
source: source
});
// Set the correct content for the mapping's source
newMap.setSourceContent(
source,
(consumer || concatConsumer).sourceContentFor(source)
);
});
// The consumer.sourceContentFor and newMap.setSourceContent methods
// are relatively fast, but not entirely trivial, so it's better to
// call them only once per source, rather than calling them every time
// we call newMap.addMapping in the loop above.
Object.keys(sourceToConsumerMap).forEach(function (source) {
var consumer = sourceToConsumerMap[source];
var content = consumer.sourceContentFor(source);
newMap.setSourceContent(source, content);
});
return newMap;
});
mergeCache.set(hashOfFiles, merged = {