Merge branch 'system-semicolon'

CHANGELOG.md

@@ -11,6 +11,7 @@
 * Fix an issue with namespaces containing reexports ([#2157](https://github.com/rollup/rollup/pull/2157))
 * Fix an issue with wrong paths of relative external imports ([#2160](https://github.com/rollup/rollup/pull/2160))
 * Fix an issue when using default exports and `interop: false` ([#2149](https://github.com/rollup/rollup/pull/2149))
+* Fix in issue with invalid syntax in SystemJS output ([#2187](https://github.com/rollup/rollup/pull/2187))
 * Fix an issue when tree-shaking call expressions and reassigned variables ([#2186](https://github.com/rollup/rollup/pull/2186))
 * Fix file paths in source maps ([#2161](https://github.com/rollup/rollup/pull/2161))
 * Fix wrong file name in error message ([#2137](https://github.com/rollup/rollup/pull/2137))

src/ast/nodes/ExportDefaultDeclaration.ts

@@ -114,7 +114,7 @@ export default class ExportDefaultDeclaration extends NodeBase {
 			}
 			return;
 		}
-		super.render(code, options);
+		this.declaration.render(code, options);
 	}
 
 	private renderNamedDeclaration(
@@ -158,7 +158,7 @@ export default class ExportDefaultDeclaration extends NodeBase {
 			`${this.context.varOrConst} ${this.variable.getName()} = ${systemBinding}`
 		);
 		if (systemBinding) {
-			code.appendRight(code.original[this.end - 1] === ';' ? this.end - 1 : this.end, ')');
+			code.appendLeft(code.original[this.end - 1] === ';' ? this.end - 1 : this.end, ')');
 		}
 	}
 }

test/form/samples/system-semicolon/_config.js

@@ -0,0 +1,8 @@
+module.exports = {
+	description: 'supports asi in system binding output',
+	options: {
+		output: {
+			format: 'system'
+		}
+	}
+};

test/form/samples/system-semicolon/_expected.js

@@ -0,0 +1,12 @@
+System.register([], function (exports, module) {
+  'use strict';
+  return {
+    execute: function () {
+
+      var main = exports('default', typeof global !== "undefined" ? global :
+        typeof self !== "undefined" ? self :
+        typeof window !== "undefined" ? window : {})
+
+    }
+  };
+});

test/form/samples/system-semicolon/main.js

@@ -0,0 +1,3 @@
+export default typeof global !== "undefined" ? global :
+  typeof self !== "undefined" ? self :
+  typeof window !== "undefined" ? window : {}