From 015f71b5fd769c2e038a916fca89e490bdd68bad Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Mon, 20 Mar 2017 15:34:06 -0700
Subject: [PATCH] Issue error when use with ES2015

---
 src/compiler/checker.ts              | 4 ++++
 src/compiler/diagnosticMessages.json | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 94b35a36b4c..db2452625c3 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -14863,6 +14863,10 @@ namespace ts {
         }
 
         function checkImportCallExpression(node: ImportCallExpression): Type {
+            if (modulekind === ModuleKind.ES2015) {
+                grammarErrorOnNode(node, Diagnostics.Dynamic_import_cannot_be_used_when_targeting_ECMAScript_2015_modules);
+            }
+
             // resolveExternalModuleName will return undefined if the moduleReferenceExpression is not a string literal
             const moduleSymbol = resolveExternalModuleName(node, node.specifier);
             if (moduleSymbol) {
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 7397f278769..402b1c30920 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -867,6 +867,10 @@
         "category": "Error",
         "code": 1319
     },
+    "Dynamic import cannot be used when targeting ECMAScript 2015 modules.": {
+        "category": "Error",
+        "code": 1320
+    },
     "Duplicate identifier '{0}'.": {
         "category": "Error",
         "code": 2300
@@ -1863,10 +1867,6 @@
         "category": "Error",
         "code": 2649
     },
-    "Cannot emit namespaced JSX elements in React.": {
-        "category": "Error",
-        "code": 2650
-    },
     "A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums.": {
         "category": "Error",
         "code": 2651