rebase corrections

rollup · May 15, 2018 · 4766e15 · 4766e15
1 parent 00f6410
commit 4766e15
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 21 deletions.
diff --git a/src/ast/nodes/Program.ts b/src/ast/nodes/Program.ts
@@ -1,10 +1,8 @@
 import MagicString from 'magic-string';
 import { NodeBase, StatementNode } from './shared/Node';
 import * as NodeType from './NodeType';
-import { RenderOptions, renderStatementList, findFirstLineBreakOutsideComment } from '../../utils/renderHelpers';
+import { RenderOptions, renderStatementList } from '../../utils/renderHelpers';
 import { ExecutionPathOptions } from '../ExecutionPathOptions';
-import VariableDeclaration from './VariableDeclaration';
-import ExpressionStatement from './ExpressionStatement';
 
 export default class Program extends NodeBase {
 	type: NodeType.tProgram;

diff --git a/src/finalisers/cjs.ts b/src/finalisers/cjs.ts
@@ -39,7 +39,16 @@ export default function cjs(
 		importBlock = '';
 
 		dependencies.forEach(
-			({ id, namedExportsMode, isChunk, name, reexports, imports, exportsNames, exportsDefault }) => {
+			({
+				id,
+				namedExportsMode,
+				isChunk,
+				name,
+				reexports,
+				imports,
+				exportsNames,
+				exportsDefault
+			}) => {
 				if (!reexports && !imports) {
 					importBlock += definingVariable ? ';' : ',';
 					definingVariable = false;
@@ -62,22 +71,33 @@ export default function cjs(
 		if (importBlock.length) importBlock += ';';
 	} else {
 		importBlock = dependencies
-			.map(({ id, isChunk, name, reexports, imports, exportsNames, exportsDefault }) => {
-				if (!reexports && !imports) return `require('${id}');`;
-
-				if (!interop || isChunk || !exportsDefault || !namedExportsMode)
-					return `${varOrConst} ${name} = require('${id}');`;
-
-				needsInterop = true;
-
-				if (exportsNames)
-					return (
-						`${varOrConst} ${name} = require('${id}');` +
-						`\n${varOrConst} ${name}__default = _interopDefault(${name});`
-					);
-
-				return `${varOrConst} ${name} = _interopDefault(require('${id}'));`;
-			})
+			.map(
+				({
+					id,
+					namedExportsMode,
+					isChunk,
+					name,
+					reexports,
+					imports,
+					exportsNames,
+					exportsDefault
+				}) => {
+					if (!reexports && !imports) return `require('${id}');`;
+
+					if (!interop || isChunk || !exportsDefault || !namedExportsMode)
+						return `${varOrConst} ${name} = require('${id}');`;
+
+					needsInterop = true;
+
+					if (exportsNames)
+						return (
+							`${varOrConst} ${name} = require('${id}');` +
+							`\n${varOrConst} ${name}__default = _interopDefault(${name});`
+						);
+
+					return `${varOrConst} ${name} = _interopDefault(require('${id}'));`;
+				}
+			)
 			.join('\n');
 	}
 

diff --git a/test/form/samples/system-semicolon/_expected.js b/test/form/samples/system-semicolon/_expected.js
@@ -5,7 +5,7 @@ System.register([], function (exports, module) {
 
       var main = exports('default', typeof global !== "undefined" ? global :
         typeof self !== "undefined" ? self :
-        typeof window !== "undefined" ? window : {})
+        typeof window !== "undefined" ? window : {});
 
     }
   };