Skip to content

Commit 229ba43

Browse files
author
Kanchalai Tanglertsampan
committed
Allow export "__esModule" in system
1 parent 6621096 commit 229ba43

File tree

5 files changed

+35
-2
lines changed

5 files changed

+35
-2
lines changed

src/compiler/checker.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// <reference path="moduleNameResolver.ts"/>
1+
/// <reference path="moduleNameResolver.ts"/>
22
/// <reference path="binder.ts"/>
33

44
/* @internal */
@@ -22010,7 +22010,7 @@ namespace ts {
2201022010
}
2201122011
}
2201222012

22013-
if (compilerOptions.module !== ModuleKind.ES2015 && !compilerOptions.noEmit &&
22013+
if (compilerOptions.module !== ModuleKind.ES2015 && compilerOptions.module !== ModuleKind.System && !compilerOptions.noEmit &&
2201422014
!isInAmbientContext(node.parent.parent) && hasModifier(node.parent.parent, ModifierFlags.Export)) {
2201522015
checkESModuleMarker(node.name);
2201622016
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
//// [es5-system2.ts]
2+
3+
export var __esModule = 1;
4+
5+
//// [es5-system2.js]
6+
System.register([], function (exports_1, context_1) {
7+
"use strict";
8+
var __moduleName = context_1 && context_1.id;
9+
var __esModule;
10+
return {
11+
setters: [],
12+
execute: function () {
13+
exports_1("__esModule", __esModule = 1);
14+
}
15+
};
16+
});
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
=== tests/cases/compiler/es5-system2.ts ===
2+
3+
export var __esModule = 1;
4+
>__esModule : Symbol(__esModule, Decl(es5-system2.ts, 1, 10))
5+
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
=== tests/cases/compiler/es5-system2.ts ===
2+
3+
export var __esModule = 1;
4+
>__esModule : number
5+
>1 : 1
6+

tests/cases/compiler/es5-system2.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// @target: ES5
2+
// @sourcemap: false
3+
// @declaration: false
4+
// @module: system
5+
6+
export var __esModule = 1;

0 commit comments

Comments
 (0)