github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-01-10 08:08:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Tolerate \r\n line endings when splitting lines in linker.

Browse Source 
Fixes #6660.
This commit is contained in:
Ben Newman
2016-04-01 14:15:57 -04:00
parent 8248d86fb2
commit 5bde892812
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/isobuild/linker.js
View File

@@ -573,11 +573,9 @@ _.extend(File.prototype, {
var self = this;
var width = options.sourceWidth || 70;
var bannerWidth = width + 3;
var result;
var lines;
var noLineNumbers = options.noLineNumbers;
var preserveLineNumbers = options.preserveLineNumbers;
var result;
if (self.sourceMap) {
// If we have a source map, it is also important to annotate line
@@ -639,7 +637,7 @@ _.extend(File.prototype, {
var padding = bannerPadding(bannerWidth);
// We might have already done this split above.
lines = lines || result.code.split("\n");
const lines = result.code.split(/\r?\n/);
// Use the SourceMapConsumer object to compute the original line
// number for each line of result.code.