Merge pull request #465 from techmatt101/master

fixed sourcemap sources being lost for files with existing mappings #460

Author: ivogabe

lib/output.ts

@@ -80,7 +80,7 @@ export class Output {
 			// since `generator.applySourceMap` has a really bad performance on big inputs.
 			if (inputMap.mappings !== '') {
 				const consumer = new sourceMap.SourceMapConsumer(inputMap);
-				generator.applySourceMap(consumer, sourceFile.fileNameOriginal, sourceFile.gulp.base);
+				generator.applySourceMap(consumer);
 			}
 
 			if (!inputMap.sources || !inputMap.sourcesContent) continue;

test/baselines/existingSourceMaps/2.0/errors.txt

@@ -0,0 +1,11 @@
+
+{
+    "transpileErrors": 0,
+    "optionsErrors": 0,
+    "syntaxErrors": 0,
+    "globalErrors": 0,
+    "semanticErrors": 0,
+    "declarationErrors": 0,
+    "emitErrors": 0,
+    "emitSkipped": false
+}

test/baselines/existingSourceMaps/2.0/js/all.js

@@ -0,0 +1,11 @@
+
+{
+    "transpileErrors": 0,
+    "optionsErrors": 0,
+    "syntaxErrors": 0,
+    "globalErrors": 0,
+    "semanticErrors": 0,
+    "declarationErrors": 0,
+    "emitErrors": 0,
+    "emitSkipped": false
+}

test/baselines/existingSourceMaps/2.0/js/all.js.map

@@ -0,0 +1 @@
+class Apple {}

test/baselines/existingSourceMaps/dev/errors.txt

@@ -0,0 +1 @@
+class Banana {}

test/baselines/existingSourceMaps/dev/js/all.js

@@ -0,0 +1,12 @@
+var gulp = require('gulp');
+var concat = require('gulp-concat');
+var sourcemaps = require('gulp-sourcemaps');
+
+module.exports = function(newTS, lib, output, reporter) {
+	return gulp.src('test/existingSourceMaps/*.ts')
+		.pipe(sourcemaps.init())
+		.pipe(concat('all.ts'))
+		.pipe(newTS({ typescript: lib }, reporter)).js
+		.pipe(sourcemaps.write('.'))
+		.pipe(gulp.dest(output + '/js'));
+};