Skip to content

Commit 7e9e920

Browse files
committed
Merge pull request microsoft#4079 from RyanCavanaugh/fixJsxSourceMaps
Correctly emit source maps when emitting JSX text under --jsx preserve
2 parents 6c5050c + d4bb353 commit 7e9e920

File tree

8 files changed

+838
-25
lines changed

8 files changed

+838
-25
lines changed

src/compiler/emitter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6479,7 +6479,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
64796479

64806480
case JsxEmit.Preserve:
64816481
default: // Emit JSX-preserve as default when no --jsx flag is specified
6482-
write(getTextOfNode(node, true));
6482+
writer.writeLiteral(getTextOfNode(node, true));
64836483
break;
64846484
}
64856485
}

src/harness/harness.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1451,7 +1451,7 @@ module Harness {
14511451
}
14521452

14531453
export function isJSMap(fileName: string) {
1454-
return stringEndsWith(fileName, '.js.map');
1454+
return stringEndsWith(fileName, '.js.map') || stringEndsWith(fileName, '.jsx.map');
14551455
}
14561456

14571457
/** Contains the code and errors of a compilation and some helper methods to check its status. */

tests/baselines/reference/tsxEmit3.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/baselines/reference/tsxEmit3.js.map

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)