diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 50399fd5c38..6e5256bafa4 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -265,6 +265,7 @@ namespace ts {
                 "es2015": ScriptTarget.ES2015,
                 "es2016": ScriptTarget.ES2016,
                 "es2017": ScriptTarget.ES2017,
+                "esnext": ScriptTarget.ESNext,
             }),
             description: Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015,
             paramType: Diagnostics.VERSION,
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index b0413b2578e..ce37492f666 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -732,7 +732,7 @@ const _super = (function (geti, seti) {
                     return emitPropertyAssignment(<PropertyAssignment>node);
                 case SyntaxKind.ShorthandPropertyAssignment:
                     return emitShorthandPropertyAssignment(<ShorthandPropertyAssignment>node);
-                case SyntaxKind.ShorthandPropertyAssignment:
+                case SyntaxKind.SpreadAssignment:
                     return emitSpreadAssignment(node as SpreadAssignment);
 
                 // Enum
@@ -2214,7 +2214,10 @@ const _super = (function (geti, seti) {
                 helpersEmitted = true;
             }
 
-            if (compilerOptions.jsx !== JsxEmit.Preserve && !assignEmitted && (node.flags & NodeFlags.HasSpreadAttribute)) {
+            if ((languageVersion < ScriptTarget.ESNext || currentSourceFile.scriptKind === ScriptKind.JSX || currentSourceFile.scriptKind === ScriptKind.TSX) &&
+                compilerOptions.jsx !== JsxEmit.Preserve &&
+                !assignEmitted &&
+                node.flags & NodeFlags.HasSpreadAttribute) {
                 writeLines(assignHelper);
                 assignEmitted = true;
             }
diff --git a/src/compiler/transformer.ts b/src/compiler/transformer.ts
index 069b1e46af5..b005b1906f6 100644
--- a/src/compiler/transformer.ts
+++ b/src/compiler/transformer.ts
@@ -117,7 +117,10 @@ namespace ts {
             transformers.push(transformJsx);
         }
 
-        transformers.push(transformESNext);
+        if (languageVersion < ScriptTarget.ESNext) {
+            transformers.push(transformESNext);
+        }
+
         if (languageVersion < ScriptTarget.ES2017) {
             transformers.push(transformES2017);
         }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 3f40272bd4c..13b66c1c0aa 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -3171,7 +3171,8 @@ namespace ts {
         ES2015 = 2,
         ES2016 = 3,
         ES2017 = 4,
-        Latest = ES2017,
+        ESNext = 5,
+        Latest = ESNext,
     }
 
     export const enum LanguageVariant {