diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 341358411fe..edb51cc59da 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -1,4 +1,4 @@
-/// <reference path="moduleNameResolver.ts"/>
+/// <reference path="moduleNameResolver.ts"/>
 /// <reference path="binder.ts"/>
 
 /* @internal */
@@ -60,9 +60,9 @@ namespace ts {
 
         const emitResolver = createResolver();
 
-        const undefinedSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "undefined");
+        const undefinedSymbol = createSymbol(SymbolFlags.Property, "undefined");
         undefinedSymbol.declarations = [];
-        const argumentsSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "arguments");
+        const argumentsSymbol = createSymbol(SymbolFlags.Property, "arguments");
 
         const checker: TypeChecker = {
             getNodeCount: () => sum(host.getSourceFiles(), "nodeCount"),
@@ -131,8 +131,8 @@ namespace ts {
         const indexedAccessTypes = createMap<IndexedAccessType>();
         const evolvingArrayTypes: EvolvingArrayType[] = [];
 
-        const unknownSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "unknown");
-        const resolvingSymbol = createSymbol(SymbolFlags.Transient, "__resolving__");
+        const unknownSymbol = createSymbol(SymbolFlags.Property, "unknown");
+        const resolvingSymbol = createSymbol(0, "__resolving__");
 
         const anyType = createIntrinsicType(TypeFlags.Any, "any");
         const autoType = createIntrinsicType(TypeFlags.Any, "any");
@@ -154,7 +154,7 @@ namespace ts {
 
         const emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
 
-        const emptyTypeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral | SymbolFlags.Transient, "__type");
+        const emptyTypeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
         emptyTypeLiteralSymbol.members = createMap<Symbol>();
         const emptyTypeLiteralType = createAnonymousType(emptyTypeLiteralSymbol, emptySymbols, emptyArray, emptyArray, undefined, undefined);
 
@@ -404,9 +404,11 @@ namespace ts {
             diagnostics.add(diagnostic);
         }
 
-        function createSymbol(flags: SymbolFlags, name: string): Symbol {
+        function createSymbol(flags: SymbolFlags, name: string) {
             symbolCount++;
-            return new Symbol(flags, name);
+            const symbol = <TransientSymbol>(new Symbol(flags | SymbolFlags.Transient, name));
+            symbol.checkFlags = 0;
+            return symbol;
         }
 
         function getExcludedSymbolFlags(flags: SymbolFlags): SymbolFlags {
@@ -439,7 +441,7 @@ namespace ts {
         }
 
         function cloneSymbol(symbol: Symbol): Symbol {
-            const result = createSymbol(symbol.flags | SymbolFlags.Merged, symbol.name);
+            const result = createSymbol(symbol.flags, symbol.name);
             result.declarations = symbol.declarations.slice(0);
             result.parent = symbol.parent;
             if (symbol.valueDeclaration) result.valueDeclaration = symbol.valueDeclaration;
@@ -496,7 +498,7 @@ namespace ts {
                     target.set(id, sourceSymbol);
                 }
                 else {
-                    if (!(targetSymbol.flags & SymbolFlags.Merged)) {
+                    if (!(targetSymbol.flags & SymbolFlags.Transient)) {
                         targetSymbol = cloneSymbol(targetSymbol);
                         target.set(id, targetSymbol);
                     }
@@ -533,7 +535,7 @@ namespace ts {
                 if (mainModule.flags & SymbolFlags.Namespace) {
                     // if module symbol has already been merged - it is safe to use it.
                     // otherwise clone it
-                    mainModule = mainModule.flags & SymbolFlags.Merged ? mainModule : cloneSymbol(mainModule);
+                    mainModule = mainModule.flags & SymbolFlags.Transient ? mainModule : cloneSymbol(mainModule);
                     mergeSymbol(mainModule, moduleAugmentation.symbol);
                 }
                 else {
@@ -574,6 +576,10 @@ namespace ts {
             return type.flags & TypeFlags.Object ? (<ObjectType>type).objectFlags : 0;
         }
 
+        function getCheckFlags(symbol: Symbol): CheckFlags {
+            return symbol.flags & SymbolFlags.Transient ? (<TransientSymbol>symbol).checkFlags : 0;
+        }
+
         function isGlobalSourceFile(node: Node) {
             return node.kind === SyntaxKind.SourceFile && !isExternalOrCommonJsModule(<SourceFile>node);
         }
@@ -582,7 +588,7 @@ namespace ts {
             if (meaning) {
                 const symbol = symbols.get(name);
                 if (symbol) {
-                    Debug.assert((symbol.flags & SymbolFlags.Instantiated) === 0, "Should never get an instantiated symbol here.");
+                    Debug.assert((getCheckFlags(symbol) & CheckFlags.Instantiated) === 0, "Should never get an instantiated symbol here.");
                     if (symbol.flags & meaning) {
                         return symbol;
                     }
@@ -1416,7 +1422,7 @@ namespace ts {
             else {
                 Debug.fail("Unknown entity name kind.");
             }
-            Debug.assert((symbol.flags & SymbolFlags.Instantiated) === 0, "Should never get an instantiated symbol here.");
+            Debug.assert((getCheckFlags(symbol) & CheckFlags.Instantiated) === 0, "Should never get an instantiated symbol here.");
             return (symbol.flags & meaning) || dontResolveAlias ? symbol : resolveAlias(symbol);
         }
 
@@ -1660,23 +1666,7 @@ namespace ts {
         }
 
         function symbolIsValue(symbol: Symbol): boolean {
-            // If it is an instantiated symbol, then it is a value if the symbol it is an
-            // instantiation of is a value.
-            if (symbol.flags & SymbolFlags.Instantiated) {
-                return symbolIsValue(getSymbolLinks(symbol).target);
-            }
-
-            // If the symbol has the value flag, it is trivially a value.
-            if (symbol.flags & SymbolFlags.Value) {
-                return true;
-            }
-
-            // If it is an alias, then it is a value if the symbol it resolves to is a value.
-            if (symbol.flags & SymbolFlags.Alias) {
-                return (resolveAlias(symbol).flags & SymbolFlags.Value) !== 0;
-            }
-
-            return false;
+            return !!(symbol.flags & SymbolFlags.Value || symbol.flags & SymbolFlags.Alias && resolveAlias(symbol).flags & SymbolFlags.Value);
         }
 
         function findConstructorDeclaration(node: ClassLikeDeclaration): ConstructorDeclaration {
@@ -2232,7 +2222,7 @@ namespace ts {
                     if (parentSymbol) {
                         // Write type arguments of instantiated class/interface here
                         if (flags & SymbolFormatFlags.WriteTypeParametersOrArguments) {
-                            if (symbol.flags & SymbolFlags.Instantiated) {
+                            if (getCheckFlags(symbol) & CheckFlags.Instantiated) {
                                 buildDisplayForTypeArgumentsAndDelimiters(getTypeParametersOfClassOrInterface(parentSymbol),
                                     (<TransientSymbol>symbol).mapper, writer, enclosingDeclaration);
                             }
@@ -2689,7 +2679,11 @@ namespace ts {
                 writePunctuation(writer, SyntaxKind.ColonToken);
                 writeSpace(writer);
 
-                buildTypeDisplay(getTypeOfSymbol(p), writer, enclosingDeclaration, flags, symbolStack);
+                let type = getTypeOfSymbol(p);
+                if (isRequiredInitializedParameter(parameterNode)) {
+                    type = includeFalsyTypes(type, TypeFlags.Undefined);
+                }
+                buildTypeDisplay(type, writer, enclosingDeclaration, flags, symbolStack);
             }
 
             function buildBindingPatternDisplay(bindingPattern: BindingPattern, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, symbolStack?: Symbol[]) {
@@ -3270,6 +3264,16 @@ namespace ts {
             return strictNullChecks && optional ? includeFalsyTypes(type, TypeFlags.Undefined) : type;
         }
 
+        /** remove undefined from the annotated type of a parameter when there is an initializer (that doesn't include undefined) */
+        function removeOptionalityFromAnnotation(annotatedType: Type, declaration: VariableLikeDeclaration): Type {
+            const annotationIncludesUndefined = strictNullChecks &&
+                declaration.kind === SyntaxKind.Parameter &&
+                declaration.initializer &&
+                getFalsyFlags(annotatedType) & TypeFlags.Undefined &&
+                !(getFalsyFlags(checkExpression(declaration.initializer)) & TypeFlags.Undefined);
+            return annotationIncludesUndefined ? getNonNullableType(annotatedType) : annotatedType;
+        }
+
         // Return the inferred type for a variable, parameter, or property declaration
         function getTypeForVariableLikeDeclaration(declaration: VariableLikeDeclaration, includeOptionality: boolean): Type {
             if (declaration.flags & NodeFlags.JavaScriptFile) {
@@ -3304,7 +3308,8 @@ namespace ts {
 
             // Use type from type annotation if one is present
             if (declaration.type) {
-                return addOptionality(getTypeFromTypeNode(declaration.type), /*optional*/ declaration.questionToken && includeOptionality);
+                const declaredType = removeOptionalityFromAnnotation(getTypeFromTypeNode(declaration.type), declaration);
+                return addOptionality(declaredType, /*optional*/ declaration.questionToken && includeOptionality);
             }
 
             if ((compilerOptions.noImplicitAny || declaration.flags & NodeFlags.JavaScriptFile) &&
@@ -3427,8 +3432,8 @@ namespace ts {
                 }
 
                 const text = getTextOfPropertyName(name);
-                const flags = SymbolFlags.Property | SymbolFlags.Transient | (e.initializer ? SymbolFlags.Optional : 0);
-                const symbol = <TransientSymbol>createSymbol(flags, text);
+                const flags = SymbolFlags.Property | (e.initializer ? SymbolFlags.Optional : 0);
+                const symbol = createSymbol(flags, text);
                 symbol.type = getTypeFromBindingElement(e, includePatternInType, reportErrors);
                 symbol.bindingElement = e;
                 members.set(symbol.name, symbol);
@@ -3726,7 +3731,7 @@ namespace ts {
         }
 
         function getTypeOfSymbol(symbol: Symbol): Type {
-            if (symbol.flags & SymbolFlags.Instantiated) {
+            if (getCheckFlags(symbol) & CheckFlags.Instantiated) {
                 return getTypeOfInstantiatedSymbol(symbol);
             }
             if (symbol.flags & (SymbolFlags.Variable | SymbolFlags.Property)) {
@@ -3758,9 +3763,9 @@ namespace ts {
             return getObjectFlags(type) & ObjectFlags.Reference ? (<TypeReference>type).target : type;
         }
 
-        function hasBaseType(type: BaseType, checkBase: BaseType) {
+        function hasBaseType(type: Type, checkBase: Type) {
             return check(type);
-            function check(type: BaseType): boolean {
+            function check(type: Type): boolean {
                 if (getObjectFlags(type) & (ObjectFlags.ClassOrInterface | ObjectFlags.Reference)) {
                     const target = <InterfaceType>getTargetType(type);
                     return target === checkBase || forEach(getBaseTypes(target), check);
@@ -4531,7 +4536,7 @@ namespace ts {
                                 s = cloneSignature(signature);
                                 if (forEach(unionSignatures, sig => sig.thisParameter)) {
                                     const thisType = getUnionType(map(unionSignatures, sig => getTypeOfSymbol(sig.thisParameter) || anyType), /*subtypeReduction*/ true);
-                                    s.thisParameter = createTransientSymbol(signature.thisParameter, thisType);
+                                    s.thisParameter = createSymbolWithType(signature.thisParameter, thisType);
                                 }
                                 // Clear resolved return type we possibly got from cloneSignature
                                 s.resolvedReturnType = undefined;
@@ -4728,9 +4733,9 @@ namespace ts {
                     const propName = (<LiteralType>t).text;
                     const modifiersProp = getPropertyOfType(modifiersType, propName);
                     const isOptional = templateOptional || !!(modifiersProp && modifiersProp.flags & SymbolFlags.Optional);
-                    const prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | (isOptional ? SymbolFlags.Optional : 0), propName);
+                    const prop = createSymbol(SymbolFlags.Property | (isOptional ? SymbolFlags.Optional : 0), propName);
+                    prop.checkFlags = templateReadonly || modifiersProp && isReadonlySymbol(modifiersProp) ? CheckFlags.Readonly : 0;
                     prop.type = propType;
-                    prop.isReadonly = templateReadonly || modifiersProp && isReadonlySymbol(modifiersProp);
                     if (propertySymbol) {
                         prop.mappedTypeOrigin = propertySymbol;
                     }
@@ -4961,18 +4966,19 @@ namespace ts {
         }
 
         function createUnionOrIntersectionProperty(containingType: UnionOrIntersectionType, name: string): Symbol {
-            const types = containingType.types;
-            const excludeModifiers = containingType.flags & TypeFlags.Union ? ModifierFlags.Private | ModifierFlags.Protected : 0;
             let props: Symbol[];
+            const types = containingType.types;
+            const isUnion = containingType.flags & TypeFlags.Union;
+            const excludeModifiers = isUnion ? ModifierFlags.NonPublicAccessibilityModifier : 0;
             // Flags we want to propagate to the result if they exist in all source symbols
-            let commonFlags = (containingType.flags & TypeFlags.Intersection) ? SymbolFlags.Optional : SymbolFlags.None;
-            let isReadonly = false;
-            let isPartial = false;
+            let commonFlags = isUnion ? SymbolFlags.None : SymbolFlags.Optional;
+            let checkFlags = CheckFlags.SyntheticProperty;
             for (const current of types) {
                 const type = getApparentType(current);
                 if (type !== unknownType) {
                     const prop = getPropertyOfType(type, name);
-                    if (prop && !(getDeclarationModifierFlagsFromSymbol(prop) & excludeModifiers)) {
+                    const modifiers = prop ? getDeclarationModifierFlagsFromSymbol(prop) : 0;
+                    if (prop && !(modifiers & excludeModifiers)) {
                         commonFlags &= prop.flags;
                         if (!props) {
                             props = [prop];
@@ -4980,26 +4986,26 @@ namespace ts {
                         else if (!contains(props, prop)) {
                             props.push(prop);
                         }
-                        if (isReadonlySymbol(prop)) {
-                            isReadonly = true;
-                        }
-
+                        checkFlags |= (isReadonlySymbol(prop) ? CheckFlags.Readonly : 0) |
+                            (!(modifiers & ModifierFlags.NonPublicAccessibilityModifier) ? CheckFlags.ContainsPublic : 0) |
+                            (modifiers & ModifierFlags.Protected ? CheckFlags.ContainsProtected : 0) |
+                            (modifiers & ModifierFlags.Private ? CheckFlags.ContainsPrivate : 0) |
+                            (modifiers & ModifierFlags.Static ? CheckFlags.ContainsStatic : 0);
                     }
-                    else if (containingType.flags & TypeFlags.Union) {
-                        isPartial = true;
+                    else if (isUnion) {
+                        checkFlags |= CheckFlags.Partial;
                     }
                 }
             }
             if (!props) {
                 return undefined;
             }
-            if (props.length === 1 && !isPartial) {
+            if (props.length === 1 && !(checkFlags & CheckFlags.Partial)) {
                 return props[0];
             }
             const propTypes: Type[] = [];
             const declarations: Declaration[] = [];
             let commonType: Type = undefined;
-            let hasNonUniformType = false;
             for (const prop of props) {
                 if (prop.declarations) {
                     addRange(declarations, prop.declarations);
@@ -5009,17 +5015,15 @@ namespace ts {
                     commonType = type;
                 }
                 else if (type !== commonType) {
-                    hasNonUniformType = true;
+                    checkFlags |= CheckFlags.HasNonUniformType;
                 }
                 propTypes.push(type);
             }
-            const result = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | SymbolFlags.SyntheticProperty | commonFlags, name);
+            const result = createSymbol(SymbolFlags.Property | commonFlags, name);
+            result.checkFlags = checkFlags;
             result.containingType = containingType;
-            result.hasNonUniformType = hasNonUniformType;
-            result.isPartial = isPartial;
             result.declarations = declarations;
-            result.isReadonly = isReadonly;
-            result.type = containingType.flags & TypeFlags.Union ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            result.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes);
             return result;
         }
 
@@ -5043,7 +5047,7 @@ namespace ts {
         function getPropertyOfUnionOrIntersectionType(type: UnionOrIntersectionType, name: string): Symbol {
             const property = getUnionOrIntersectionProperty(type, name);
             // We need to filter out partial properties in union types
-            return property && !(property.flags & SymbolFlags.SyntheticProperty && (<TransientSymbol>property).isPartial) ? property : undefined;
+            return property && !(getCheckFlags(property) & CheckFlags.Partial) ? property : undefined;
         }
 
         /**
@@ -5206,6 +5210,12 @@ namespace ts {
                 Debug.assert(parameterIndex >= 0);
                 return parameterIndex >= signature.minArgumentCount;
             }
+            const iife = getImmediatelyInvokedFunctionExpression(node.parent);
+            if (iife) {
+                return !node.type &&
+                    !node.dotDotDotToken &&
+                    indexOf((node.parent as SignatureDeclaration).parameters, node) >= iife.arguments.length;
+            }
 
             return false;
         }
@@ -5906,7 +5916,7 @@ namespace ts {
             for (let i = 0; i < arity; i++) {
                 const typeParameter = <TypeParameter>createType(TypeFlags.TypeParameter);
                 typeParameters.push(typeParameter);
-                const property = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "" + i);
+                const property = createSymbol(SymbolFlags.Property, "" + i);
                 property.type = typeParameter;
                 properties.push(property);
             }
@@ -6152,7 +6162,10 @@ namespace ts {
                 if (type.flags & TypeFlags.Union && typeSet.unionIndex === undefined) {
                     typeSet.unionIndex = typeSet.length;
                 }
-                typeSet.push(type);
+                if (!(type.flags & TypeFlags.Object && (<ObjectType>type).objectFlags & ObjectFlags.Anonymous &&
+                    type.symbol && type.symbol.flags & (SymbolFlags.Function | SymbolFlags.Method) && containsIdenticalType(typeSet, type))) {
+                    typeSet.push(type);
+                }
             }
         }
 
@@ -6490,13 +6503,13 @@ namespace ts {
                     const rightType = getTypeOfSymbol(rightProp);
                     if (maybeTypeOfKind(rightType, TypeFlags.Undefined) || rightProp.flags & SymbolFlags.Optional) {
                         const declarations: Declaration[] = concatenate(leftProp.declarations, rightProp.declarations);
-                        const flags = SymbolFlags.Property | SymbolFlags.Transient | (leftProp.flags & SymbolFlags.Optional);
-                        const result = <TransientSymbol>createSymbol(flags, leftProp.name);
+                        const flags = SymbolFlags.Property | (leftProp.flags & SymbolFlags.Optional);
+                        const result = createSymbol(flags, leftProp.name);
+                        result.checkFlags = isReadonlySymbol(leftProp) || isReadonlySymbol(rightProp) ? CheckFlags.Readonly : 0;
                         result.type = getUnionType([getTypeOfSymbol(leftProp), getTypeWithFacts(rightType, TypeFacts.NEUndefined)]);
                         result.leftSpread = leftProp;
                         result.rightSpread = rightProp;
                         result.declarations = declarations;
-                        result.isReadonly = isReadonlySymbol(leftProp) || isReadonlySymbol(rightProp);
                         members.set(leftProp.name, result);
                     }
                 }
@@ -6823,7 +6836,7 @@ namespace ts {
         }
 
         function instantiateSymbol(symbol: Symbol, mapper: TypeMapper): Symbol {
-            if (symbol.flags & SymbolFlags.Instantiated) {
+            if (getCheckFlags(symbol) & CheckFlags.Instantiated) {
                 const links = getSymbolLinks(symbol);
                 // If symbol being instantiated is itself a instantiation, fetch the original target and combine the
                 // type mappers. This ensures that original type identities are properly preserved and that aliases
@@ -6831,10 +6844,10 @@ namespace ts {
                 symbol = links.target;
                 mapper = combineTypeMappers(links.mapper, mapper);
             }
-
             // Keep the flags from the symbol we're instantiating.  Mark that is instantiated, and
             // also transient so that we can just store data on it directly.
-            const result = <TransientSymbol>createSymbol(SymbolFlags.Instantiated | SymbolFlags.Transient | symbol.flags, symbol.name);
+            const result = createSymbol(symbol.flags, symbol.name);
+            result.checkFlags = CheckFlags.Instantiated;
             result.declarations = symbol.declarations;
             result.parent = symbol.parent;
             result.target = symbol;
@@ -6842,7 +6855,6 @@ namespace ts {
             if (symbol.valueDeclaration) {
                 result.valueDeclaration = symbol.valueDeclaration;
             }
-
             return result;
         }
 
@@ -8037,6 +8049,12 @@ namespace ts {
                             const sourcePropFlags = getDeclarationModifierFlagsFromSymbol(sourceProp);
                             const targetPropFlags = getDeclarationModifierFlagsFromSymbol(targetProp);
                             if (sourcePropFlags & ModifierFlags.Private || targetPropFlags & ModifierFlags.Private) {
+                                if (getCheckFlags(sourceProp) & CheckFlags.ContainsPrivate) {
+                                    if (reportErrors) {
+                                        reportError(Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(sourceProp), typeToString(source));
+                                    }
+                                    return Ternary.False;
+                                }
                                 if (sourceProp.valueDeclaration !== targetProp.valueDeclaration) {
                                     if (reportErrors) {
                                         if (sourcePropFlags & ModifierFlags.Private && targetPropFlags & ModifierFlags.Private) {
@@ -8052,13 +8070,10 @@ namespace ts {
                                 }
                             }
                             else if (targetPropFlags & ModifierFlags.Protected) {
-                                const sourceDeclaredInClass = sourceProp.parent && sourceProp.parent.flags & SymbolFlags.Class;
-                                const sourceClass = sourceDeclaredInClass ? <InterfaceType>getDeclaredTypeOfSymbol(getParentOfSymbol(sourceProp)) : undefined;
-                                const targetClass = <InterfaceType>getDeclaredTypeOfSymbol(getParentOfSymbol(targetProp));
-                                if (!sourceClass || !hasBaseType(sourceClass, targetClass)) {
+                                if (!isValidOverrideOf(sourceProp, targetProp)) {
                                     if (reportErrors) {
-                                        reportError(Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2,
-                                            symbolToString(targetProp), typeToString(sourceClass || source), typeToString(targetClass));
+                                        reportError(Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp),
+                                            typeToString(getDeclaringClass(sourceProp) || source), typeToString(getDeclaringClass(targetProp) || target));
                                     }
                                     return Ternary.False;
                                 }
@@ -8300,6 +8315,49 @@ namespace ts {
             }
         }
 
+        // Invoke the callback for each underlying property symbol of the given symbol and return the first
+        // value that isn't undefined.
+        function forEachProperty<T>(prop: Symbol, callback: (p: Symbol) => T): T {
+            if (getCheckFlags(prop) & CheckFlags.SyntheticProperty) {
+                for (const t of (<TransientSymbol>prop).containingType.types) {
+                    const p = getPropertyOfType(t, prop.name);
+                    const result = p && forEachProperty(p, callback);
+                    if (result) {
+                        return result;
+                    }
+                }
+                return undefined;
+            }
+            return callback(prop);
+        }
+
+        // Return the declaring class type of a property or undefined if property not declared in class
+        function getDeclaringClass(prop: Symbol) {
+            return prop.parent && prop.parent.flags & SymbolFlags.Class ? getDeclaredTypeOfSymbol(getParentOfSymbol(prop)) : undefined;
+        }
+
+        // Return true if some underlying source property is declared in a class that derives
+        // from the given base class.
+        function isPropertyInClassDerivedFrom(prop: Symbol, baseClass: Type) {
+            return forEachProperty(prop, sp => {
+                const sourceClass = getDeclaringClass(sp);
+                return sourceClass ? hasBaseType(sourceClass, baseClass) : false;
+            });
+        }
+
+        // Return true if source property is a valid override of protected parts of target property.
+        function isValidOverrideOf(sourceProp: Symbol, targetProp: Symbol) {
+            return !forEachProperty(targetProp, tp => getDeclarationModifierFlagsFromSymbol(tp) & ModifierFlags.Protected ?
+                !isPropertyInClassDerivedFrom(sourceProp, getDeclaringClass(tp)) : false);
+        }
+
+        // Return true if the given class derives from each of the declaring classes of the protected
+        // constituents of the given property.
+        function isClassDerivedFromDeclaringClasses(checkClass: Type, prop: Symbol) {
+            return forEachProperty(prop, p => getDeclarationModifierFlagsFromSymbol(p) & ModifierFlags.Protected ?
+                !hasBaseType(checkClass, getDeclaringClass(p)) : false) ? undefined : checkClass;
+        }
+
         // Return true if the given type is the constructor type for an abstract class
         function isAbstractConstructorType(type: Type) {
             if (getObjectFlags(type) & ObjectFlags.Anonymous) {
@@ -8609,7 +8667,7 @@ namespace ts {
             if (flags & TypeFlags.Void) types.push(voidType);
             if (flags & TypeFlags.Undefined) types.push(undefinedType);
             if (flags & TypeFlags.Null) types.push(nullType);
-            return getUnionType(types, /*subtypeReduction*/ true);
+            return getUnionType(types);
         }
 
         function removeDefinitelyFalsyTypes(type: Type): Type {
@@ -8632,8 +8690,8 @@ namespace ts {
                 getSignaturesOfType(type, SignatureKind.Construct).length === 0;
         }
 
-        function createTransientSymbol(source: Symbol, type: Type) {
-            const symbol = <TransientSymbol>createSymbol(source.flags | SymbolFlags.Transient, source.name);
+        function createSymbolWithType(source: Symbol, type: Type) {
+            const symbol = createSymbol(source.flags, source.name);
             symbol.declarations = source.declarations;
             symbol.parent = source.parent;
             symbol.type = type;
@@ -8649,7 +8707,7 @@ namespace ts {
             for (const property of getPropertiesOfObjectType(type)) {
                 const original = getTypeOfSymbol(property);
                 const updated = f(original);
-                members.set(property.name, updated === original ? property : createTransientSymbol(property, updated));
+                members.set(property.name, updated === original ? property : createSymbolWithType(property, updated));
             };
             return members;
         }
@@ -8887,10 +8945,10 @@ namespace ts {
                 if (!inferredPropType) {
                     return undefined;
                 }
-                const inferredProp = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | prop.flags & optionalMask, prop.name);
+                const inferredProp = createSymbol(SymbolFlags.Property | prop.flags & optionalMask, prop.name);
+                inferredProp.checkFlags = readonlyMask && isReadonlySymbol(prop) ? CheckFlags.Readonly : 0;
                 inferredProp.declarations = prop.declarations;
                 inferredProp.type = inferredPropType;
-                inferredProp.isReadonly = readonlyMask && isReadonlySymbol(prop);
                 members.set(prop.name, inferredProp);
             }
             if (indexInfo) {
@@ -9372,9 +9430,9 @@ namespace ts {
         function isDiscriminantProperty(type: Type, name: string) {
             if (type && type.flags & TypeFlags.Union) {
                 const prop = getUnionOrIntersectionProperty(<UnionType>type, name);
-                if (prop && prop.flags & SymbolFlags.SyntheticProperty) {
+                if (prop && getCheckFlags(prop) & CheckFlags.SyntheticProperty) {
                     if ((<TransientSymbol>prop).isDiscriminantProperty === undefined) {
-                        (<TransientSymbol>prop).isDiscriminantProperty = (<TransientSymbol>prop).hasNonUniformType && isLiteralType(getTypeOfSymbol(prop));
+                        (<TransientSymbol>prop).isDiscriminantProperty = (<TransientSymbol>prop).checkFlags & CheckFlags.HasNonUniformType && isLiteralType(getTypeOfSymbol(prop));
                     }
                     return (<TransientSymbol>prop).isDiscriminantProperty;
                 }
@@ -11841,7 +11899,7 @@ namespace ts {
                     }
 
                     typeFlags |= type.flags;
-                    const prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | member.flags, member.name);
+                    const prop = createSymbol(SymbolFlags.Property | member.flags, member.name);
                     if (inDestructuringPattern) {
                         // If object literal is an assignment pattern and if the assignment pattern specifies a default value
                         // for the property, make the property optional.
@@ -12466,7 +12524,22 @@ namespace ts {
         }
 
         function getDeclarationModifierFlagsFromSymbol(s: Symbol): ModifierFlags {
-            return s.valueDeclaration ? getCombinedModifierFlags(s.valueDeclaration) : s.flags & SymbolFlags.Prototype ? ModifierFlags.Public | ModifierFlags.Static : 0;
+            if (s.valueDeclaration) {
+                const flags = getCombinedModifierFlags(s.valueDeclaration);
+                return s.parent && s.parent.flags & SymbolFlags.Class ? flags : flags & ~ModifierFlags.AccessibilityModifier;
+            }
+            if (getCheckFlags(s) & CheckFlags.SyntheticProperty) {
+                const checkFlags = (<TransientSymbol>s).checkFlags;
+                const accessModifier = checkFlags & CheckFlags.ContainsPrivate ? ModifierFlags.Private :
+                    checkFlags & CheckFlags.ContainsPublic ? ModifierFlags.Public :
+                    ModifierFlags.Protected;
+                const staticModifier = checkFlags & CheckFlags.ContainsStatic ? ModifierFlags.Static : 0;
+                return accessModifier | staticModifier;
+            }
+            if (s.flags & SymbolFlags.Prototype) {
+                return ModifierFlags.Public | ModifierFlags.Static;
+            }
+            return 0;
         }
 
         function getDeclarationNodeFlagsFromSymbol(s: Symbol): NodeFlags {
@@ -12481,12 +12554,18 @@ namespace ts {
          * @param type The type of left.
          * @param prop The symbol for the right hand side of the property access.
          */
-        function checkClassPropertyAccess(node: PropertyAccessExpression | QualifiedName | VariableLikeDeclaration, left: Expression | QualifiedName, type: Type, prop: Symbol): boolean {
+        function checkPropertyAccessibility(node: PropertyAccessExpression | QualifiedName | VariableLikeDeclaration, left: Expression | QualifiedName, type: Type, prop: Symbol): boolean {
             const flags = getDeclarationModifierFlagsFromSymbol(prop);
-            const declaringClass = <InterfaceType>getDeclaredTypeOfSymbol(getParentOfSymbol(prop));
             const errorNode = node.kind === SyntaxKind.PropertyAccessExpression || node.kind === SyntaxKind.VariableDeclaration ?
                 (<PropertyAccessExpression | VariableDeclaration>node).name :
                 (<QualifiedName>node).right;
+
+            if (getCheckFlags(prop) & CheckFlags.ContainsPrivate) {
+                // Synthetic property with private constituent property
+                error(errorNode, Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(prop), typeToString(type));
+                return false;
+            }
+
             if (left.kind === SyntaxKind.SuperKeyword) {
                 // TS 1.0 spec (April 2014): 4.8.2
                 // - In a constructor, instance member function, instance member accessor, or
@@ -12505,14 +12584,12 @@ namespace ts {
                         return false;
                     }
                 }
-
                 if (flags & ModifierFlags.Abstract) {
                     // A method cannot be accessed in a super property access if the method is abstract.
                     // This error could mask a private property access error. But, a member
                     // cannot simultaneously be private and abstract, so this will trigger an
                     // additional error elsewhere.
-
-                    error(errorNode, Diagnostics.Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression, symbolToString(prop), typeToString(declaringClass));
+                    error(errorNode, Diagnostics.Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression, symbolToString(prop), typeToString(getDeclaringClass(prop)));
                     return false;
                 }
             }
@@ -12528,7 +12605,7 @@ namespace ts {
             if (flags & ModifierFlags.Private) {
                 const declaringClassDeclaration = <ClassLikeDeclaration>getClassLikeDeclarationOfSymbol(getParentOfSymbol(prop));
                 if (!isNodeWithinClass(node, declaringClassDeclaration)) {
-                    error(errorNode, Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(declaringClass));
+                    error(errorNode, Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(getDeclaringClass(prop)));
                     return false;
                 }
                 return true;
@@ -12541,15 +12618,15 @@ namespace ts {
                 return true;
             }
 
-            // Get the enclosing class that has the declaring class as its base type
+            // Find the first enclosing class that has the declaring classes of the protected constituents
+            // of the property as base classes
             const enclosingClass = forEachEnclosingClass(node, enclosingDeclaration => {
                 const enclosingClass = <InterfaceType>getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingDeclaration));
-                return hasBaseType(enclosingClass, declaringClass) ? enclosingClass : undefined;
+                return isClassDerivedFromDeclaringClasses(enclosingClass, prop) ? enclosingClass : undefined;
             });
-
             // A protected property is accessible if the property is within the declaring class or classes derived from it
             if (!enclosingClass) {
-                error(errorNode, Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(declaringClass));
+                error(errorNode, Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(getDeclaringClass(prop) || type));
                 return false;
             }
             // No further restrictions for static properties
@@ -12561,9 +12638,7 @@ namespace ts {
                 // get the original type -- represented as the type constraint of the 'this' type
                 type = getConstraintOfTypeParameter(<TypeParameter>type);
             }
-
-            // TODO: why is the first part of this check here?
-            if (!(getObjectFlags(getTargetType(type)) & ObjectFlags.ClassOrInterface && hasBaseType(<InterfaceType>type, enclosingClass))) {
+            if (!(getObjectFlags(getTargetType(type)) & ObjectFlags.ClassOrInterface && hasBaseType(type, enclosingClass))) {
                 error(errorNode, Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1, symbolToString(prop), typeToString(enclosingClass));
                 return false;
             }
@@ -12614,9 +12689,8 @@ namespace ts {
                 noUnusedIdentifiers &&
                 (prop.flags & SymbolFlags.ClassMember) &&
                 prop.valueDeclaration && (getModifierFlags(prop.valueDeclaration) & ModifierFlags.Private)) {
-                if (prop.flags & SymbolFlags.Instantiated) {
+                if (getCheckFlags(prop) & CheckFlags.Instantiated) {
                     getSymbolLinks(prop).target.isReferenced = true;
-
                 }
                 else {
                     prop.isReferenced = true;
@@ -12666,9 +12740,7 @@ namespace ts {
 
             getNodeLinks(node).resolvedSymbol = prop;
 
-            if (prop.parent && prop.parent.flags & SymbolFlags.Class) {
-                checkClassPropertyAccess(node, left, apparentType, prop);
-            }
+            checkPropertyAccessibility(node, left, apparentType, prop);
 
             const propType = getTypeOfSymbol(prop);
             const assignmentKind = getAssignmentTargetKind(node);
@@ -12700,8 +12772,8 @@ namespace ts {
             const type = checkExpression(left);
             if (type !== unknownType && !isTypeAny(type)) {
                 const prop = getPropertyOfType(getWidenedType(type), propertyName);
-                if (prop && prop.parent && prop.parent.flags & SymbolFlags.Class) {
-                    return checkClassPropertyAccess(node, left, type, prop);
+                if (prop) {
+                    return checkPropertyAccessibility(node, left, type, prop);
                 }
             }
             return true;
@@ -14199,7 +14271,7 @@ namespace ts {
                 const parameter = signature.thisParameter;
                 if (!parameter || parameter.valueDeclaration && !(<ParameterDeclaration>parameter.valueDeclaration).type) {
                     if (!parameter) {
-                        signature.thisParameter = createTransientSymbol(context.thisParameter, undefined);
+                        signature.thisParameter = createSymbolWithType(context.thisParameter, undefined);
                     }
                     assignTypeToParameterAndFixTypeParameters(signature.thisParameter, getTypeOfSymbol(context.thisParameter), mapper);
                 }
@@ -14654,11 +14726,11 @@ namespace ts {
             // Get accessors without matching set accessors
             // Enum members
             // Unions and intersections of the above (unions and intersections eagerly set isReadonly on creation)
-            return symbol.isReadonly ||
-                symbol.flags & SymbolFlags.Property && (getDeclarationModifierFlagsFromSymbol(symbol) & ModifierFlags.Readonly) !== 0 ||
-                symbol.flags & SymbolFlags.Variable && (getDeclarationNodeFlagsFromSymbol(symbol) & NodeFlags.Const) !== 0 ||
+            return !!(getCheckFlags(symbol) & CheckFlags.Readonly ||
+                symbol.flags & SymbolFlags.Property && getDeclarationModifierFlagsFromSymbol(symbol) & ModifierFlags.Readonly ||
+                symbol.flags & SymbolFlags.Variable && getDeclarationNodeFlagsFromSymbol(symbol) & NodeFlags.Const ||
                 symbol.flags & SymbolFlags.Accessor && !(symbol.flags & SymbolFlags.SetAccessor) ||
-                (symbol.flags & SymbolFlags.EnumMember) !== 0;
+                symbol.flags & SymbolFlags.EnumMember);
         }
 
         function isReferenceToReadonlyEntity(expr: Expression, symbol: Symbol): boolean {
@@ -17680,8 +17752,8 @@ namespace ts {
                 const name = node.propertyName || <Identifier>node.name;
                 const property = getPropertyOfType(parentType, getTextOfPropertyName(name));
                 markPropertyAsReferenced(property);
-                if (parent.initializer && property && getParentOfSymbol(property)) {
-                    checkClassPropertyAccess(parent, parent.initializer, parentType, property);
+                if (parent.initializer && property) {
+                    checkPropertyAccessibility(parent, parent.initializer, parentType, property);
                 }
             }
 
@@ -18777,7 +18849,7 @@ namespace ts {
         function getTargetSymbol(s: Symbol) {
             // if symbol is instantiated its flags are not copied from the 'target'
             // so we'll need to get back original 'target' symbol to work with correct set of flags
-            return s.flags & SymbolFlags.Instantiated ? getSymbolLinks(s).target : s;
+            return getCheckFlags(s) & CheckFlags.Instantiated ? (<TransientSymbol>s).target : s;
         }
 
         function getClassLikeDeclarationOfSymbol(symbol: Symbol): Declaration {
@@ -19355,7 +19427,7 @@ namespace ts {
                         // We can detect if augmentation was applied using following rules:
                         // - augmentation for a global scope is always applied
                         // - augmentation for some external module is applied if symbol for augmentation is merged (it was combined with target module).
-                        const checkBody = isGlobalAugmentation || (getSymbolOfNode(node).flags & SymbolFlags.Merged);
+                        const checkBody = isGlobalAugmentation || (getSymbolOfNode(node).flags & SymbolFlags.Transient);
                         if (checkBody && node.body) {
                             // body of ambient external module is always a module block
                             for (const statement of (<ModuleBlock>node.body).statements) {
@@ -19434,7 +19506,7 @@ namespace ts {
                         // this is done it two steps
                         // 1. quick check - if symbol for node is not merged - this is local symbol to this augmentation - report error
                         // 2. main check - report error if value declaration of the parent symbol is module augmentation)
-                        let reportError = !(symbol.flags & SymbolFlags.Merged);
+                        let reportError = !(symbol.flags & SymbolFlags.Transient);
                         if (!reportError) {
                             // symbol should not originate in augmentation
                             reportError = isExternalModuleAugmentation(symbol.parent.declarations[0]);
@@ -20536,7 +20608,7 @@ namespace ts {
         }
 
         function getRootSymbols(symbol: Symbol): Symbol[] {
-            if (symbol.flags & SymbolFlags.SyntheticProperty) {
+            if (getCheckFlags(symbol) & CheckFlags.SyntheticProperty) {
                 const symbols: Symbol[] = [];
                 const name = symbol.name;
                 forEach(getSymbolLinks(symbol).containingType.types, t => {
@@ -20837,6 +20909,13 @@ namespace ts {
             return false;
         }
 
+        function isRequiredInitializedParameter(parameter: ParameterDeclaration) {
+            return strictNullChecks &&
+                !isOptionalParameter(parameter) &&
+                parameter.initializer &&
+                !(getModifierFlags(parameter) & ModifierFlags.ParameterPropertyModifier);
+        }
+
         function getNodeCheckFlags(node: Node): NodeCheckFlags {
             node = getParseTreeNode(node);
             return node ? getNodeLinks(node).flags : undefined;
@@ -20928,10 +21007,12 @@ namespace ts {
         function writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter) {
             // Get type of the symbol if this is the valid symbol otherwise get type at location
             const symbol = getSymbolOfNode(declaration);
-            const type = symbol && !(symbol.flags & (SymbolFlags.TypeLiteral | SymbolFlags.Signature))
+            let type = symbol && !(symbol.flags & (SymbolFlags.TypeLiteral | SymbolFlags.Signature))
                 ? getWidenedLiteralType(getTypeOfSymbol(symbol))
                 : unknownType;
-
+            if (flags & TypeFormatFlags.AddUndefined) {
+                type = includeFalsyTypes(type, TypeFlags.Undefined);
+            }
             getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);
         }
 
@@ -21030,6 +21111,7 @@ namespace ts {
                 isTopLevelValueImportEqualsWithEntityName,
                 isDeclarationVisible,
                 isImplementationOfOverload,
+                isRequiredInitializedParameter,
                 writeTypeOfDeclaration,
                 writeReturnTypeOfSignatureDeclaration,
                 writeTypeOfExpression,
@@ -22172,6 +22254,11 @@ namespace ts {
                 }
             }
 
+            if (compilerOptions.module !== ModuleKind.ES2015 && compilerOptions.module !== ModuleKind.System && !compilerOptions.noEmit &&
+                !isInAmbientContext(node.parent.parent) && hasModifier(node.parent.parent, ModifierFlags.Export)) {
+                checkESModuleMarker(node.name);
+            }
+
             const checkLetConstNames = (isLet(node) || isConst(node));
 
             // 1. LexicalDeclaration : LetOrConst BindingList ;
@@ -22184,6 +22271,22 @@ namespace ts {
             return checkLetConstNames && checkGrammarNameInLetOrConstDeclarations(node.name);
         }
 
+        function checkESModuleMarker(name: Identifier | BindingPattern): boolean {
+            if (name.kind === SyntaxKind.Identifier) {
+                if (unescapeIdentifier(name.text) === "__esModule") {
+                    return grammarErrorOnNode(name, Diagnostics.Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules);
+                }
+            }
+            else {
+                const elements = (<BindingPattern>name).elements;
+                for (const element of elements) {
+                    if (!isOmittedExpression(element)) {
+                        return checkESModuleMarker(element.name);
+                    }
+                }
+            }
+        }
+
         function checkGrammarNameInLetOrConstDeclarations(name: Identifier | BindingPattern): boolean {
             if (name.kind === SyntaxKind.Identifier) {
                 if ((<Identifier>name).originalKeywordKind === SyntaxKind.LetKeyword) {
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index b98158f71ff..93614b66abb 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -847,7 +847,7 @@ namespace ts {
       * @param basePath A root directory to resolve relative path entries in the config
       *    file to. e.g. outDir
       */
-    export function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions: CompilerOptions = {}, configFileName?: string, resolutionStack: Path[] = [], extraFileExtensions: FileExtensionInfo[] = []): ParsedCommandLine {
+    export function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions: CompilerOptions = {}, configFileName?: string, resolutionStack: Path[] = [], extraFileExtensions: JsFileExtensionInfo[] = []): ParsedCommandLine {
         const errors: Diagnostic[] = [];
         basePath = normalizeSlashes(basePath);
         const getCanonicalFileName = createGetCanonicalFileName(host.useCaseSensitiveFileNames);
@@ -1193,7 +1193,7 @@ namespace ts {
      * @param host The host used to resolve files and directories.
      * @param errors An array for diagnostic reporting.
      */
-    function matchFileNames(fileNames: string[], include: string[], exclude: string[], basePath: string, options: CompilerOptions, host: ParseConfigHost, errors: Diagnostic[], extraFileExtensions: FileExtensionInfo[]): ExpandResult {
+    function matchFileNames(fileNames: string[], include: string[], exclude: string[], basePath: string, options: CompilerOptions, host: ParseConfigHost, errors: Diagnostic[], extraFileExtensions: JsFileExtensionInfo[]): ExpandResult {
         basePath = normalizePath(basePath);
 
         // The exclude spec list is converted into a regular expression, which allows us to quickly
@@ -1368,7 +1368,7 @@ namespace ts {
      */
     function hasFileWithHigherPriorityExtension(file: string, literalFiles: Map<string>, wildcardFiles: Map<string>, extensions: string[], keyMapper: (value: string) => string) {
         const extensionPriority = getExtensionPriority(file, extensions);
-        const adjustedExtensionPriority = adjustExtensionPriority(extensionPriority);
+        const adjustedExtensionPriority = adjustExtensionPriority(extensionPriority, extensions);
         for (let i = ExtensionPriority.Highest; i < adjustedExtensionPriority; i++) {
             const higherPriorityExtension = extensions[i];
             const higherPriorityPath = keyMapper(changeExtension(file, higherPriorityExtension));
@@ -1390,7 +1390,7 @@ namespace ts {
      */
     function removeWildcardFilesWithLowerPriorityExtension(file: string, wildcardFiles: Map<string>, extensions: string[], keyMapper: (value: string) => string) {
         const extensionPriority = getExtensionPriority(file, extensions);
-        const nextExtensionPriority = getNextLowestExtensionPriority(extensionPriority);
+        const nextExtensionPriority = getNextLowestExtensionPriority(extensionPriority, extensions);
         for (let i = nextExtensionPriority; i < extensions.length; i++) {
             const lowerPriorityExtension = extensions[i];
             const lowerPriorityPath = keyMapper(changeExtension(file, lowerPriorityExtension));
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 94e32dfdbb3..43bbf86509e 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -2020,14 +2020,14 @@ namespace ts {
     export const supportedJavascriptExtensions = [".js", ".jsx"];
     const allSupportedExtensions = supportedTypeScriptExtensions.concat(supportedJavascriptExtensions);
 
-    export function getSupportedExtensions(options?: CompilerOptions, extraFileExtensions?: FileExtensionInfo[]): string[] {
+    export function getSupportedExtensions(options?: CompilerOptions, extraFileExtensions?: JsFileExtensionInfo[]): string[] {
         const needAllExtensions = options && options.allowJs;
-        if (!extraFileExtensions || extraFileExtensions.length === 0) {
+        if (!extraFileExtensions || extraFileExtensions.length === 0 || !needAllExtensions) {
             return needAllExtensions ? allSupportedExtensions : supportedTypeScriptExtensions;
         }
-        const extensions = (needAllExtensions ? allSupportedExtensions : supportedTypeScriptExtensions).slice(0);
+        const extensions = allSupportedExtensions.slice(0);
         for (const extInfo of extraFileExtensions) {
-            if (needAllExtensions || extInfo.scriptKind === ScriptKind.TS) {
+            if (extensions.indexOf(extInfo.extension) === -1) {
                 extensions.push(extInfo.extension);
             }
         }
@@ -2042,7 +2042,7 @@ namespace ts {
         return forEach(supportedTypeScriptExtensions, extension => fileExtensionIs(fileName, extension));
     }
 
-    export function isSupportedSourceFileName(fileName: string, compilerOptions?: CompilerOptions, extraFileExtensions?: FileExtensionInfo[]) {
+    export function isSupportedSourceFileName(fileName: string, compilerOptions?: CompilerOptions, extraFileExtensions?: JsFileExtensionInfo[]) {
         if (!fileName) { return false; }
 
         for (const extension of getSupportedExtensions(compilerOptions, extraFileExtensions)) {
@@ -2061,7 +2061,6 @@ namespace ts {
     export const enum ExtensionPriority {
         TypeScriptFiles = 0,
         DeclarationAndJavaScriptFiles = 2,
-        Limit = 5,
 
         Highest = TypeScriptFiles,
         Lowest = DeclarationAndJavaScriptFiles,
@@ -2070,7 +2069,7 @@ namespace ts {
     export function getExtensionPriority(path: string, supportedExtensions: string[]): ExtensionPriority {
         for (let i = supportedExtensions.length - 1; i >= 0; i--) {
             if (fileExtensionIs(path, supportedExtensions[i])) {
-                return adjustExtensionPriority(<ExtensionPriority>i);
+                return adjustExtensionPriority(<ExtensionPriority>i, supportedExtensions);
             }
         }
 
@@ -2082,27 +2081,26 @@ namespace ts {
     /**
      * Adjusts an extension priority to be the highest priority within the same range.
      */
-    export function adjustExtensionPriority(extensionPriority: ExtensionPriority): ExtensionPriority {
+    export function adjustExtensionPriority(extensionPriority: ExtensionPriority, supportedExtensions: string[]): ExtensionPriority {
         if (extensionPriority < ExtensionPriority.DeclarationAndJavaScriptFiles) {
             return ExtensionPriority.TypeScriptFiles;
         }
-        else if (extensionPriority < ExtensionPriority.Limit) {
+        else if (extensionPriority < supportedExtensions.length) {
             return ExtensionPriority.DeclarationAndJavaScriptFiles;
         }
         else {
-            return ExtensionPriority.Limit;
-        }
-    }
+            return supportedExtensions.length;
+        }    }
 
     /**
      * Gets the next lowest extension priority for a given priority.
      */
-    export function getNextLowestExtensionPriority(extensionPriority: ExtensionPriority): ExtensionPriority {
+    export function getNextLowestExtensionPriority(extensionPriority: ExtensionPriority, supportedExtensions: string[]): ExtensionPriority {
         if (extensionPriority < ExtensionPriority.DeclarationAndJavaScriptFiles) {
             return ExtensionPriority.DeclarationAndJavaScriptFiles;
         }
         else {
-            return ExtensionPriority.Limit;
+            return supportedExtensions.length;
         }
     }
 
diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
index 4b878adaff5..f737c5e086d 100644
--- a/src/compiler/declarationEmitter.ts
+++ b/src/compiler/declarationEmitter.ts
@@ -324,13 +324,20 @@ namespace ts {
         function writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, type: TypeNode, getSymbolAccessibilityDiagnostic: GetSymbolAccessibilityDiagnostic) {
             writer.getSymbolAccessibilityDiagnostic = getSymbolAccessibilityDiagnostic;
             write(": ");
-            if (type) {
+
+            // use the checker's type, not the declared type,
+            // for non-optional initialized parameters that aren't a parameter property
+            const shouldUseResolverType = declaration.kind === SyntaxKind.Parameter &&
+                resolver.isRequiredInitializedParameter(declaration as ParameterDeclaration);
+            if (type && !shouldUseResolverType) {
                 // Write the type
                 emitType(type);
             }
             else {
                 errorNameNode = declaration.name;
-                resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, TypeFormatFlags.UseTypeOfFunction | TypeFormatFlags.UseTypeAliasValue, writer);
+                const format = TypeFormatFlags.UseTypeOfFunction | TypeFormatFlags.UseTypeAliasValue |
+                    (shouldUseResolverType ? TypeFormatFlags.AddUndefined : 0);
+                resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, format, writer);
                 errorNameNode = undefined;
             }
         }
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index c9d387ab15c..aac4df9a41c 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -675,6 +675,10 @@
         "category": "Error",
         "code": 1215
     },
+    "Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules.": {
+        "category": "Error",
+        "code": 1216
+    },
     "Export assignment is not supported when '--module' flag is 'system'.": {
         "category": "Error",
         "code": 1218
@@ -1799,18 +1803,22 @@
         "category": "Error",
         "code": 2545
     },
-    "The type returned by the 'next()' method of an async iterator must be a promise for a type with a 'value' property.": {
+    "Property '{0}' has conflicting declarations and is inaccessible in type '{1}'.": {
         "category": "Error",
         "code": 2546
     },
-    "Type '{0}' is not an array type or does not have a '[Symbol.iterator]()' method that returns an iterator.": {
+    "The type returned by the 'next()' method of an async iterator must be a promise for a type with a 'value' property.": {
         "category": "Error",
         "code": 2547
     },
-    "Type '{0}' is not an array type or a string type or does not have a '[Symbol.iterator]()' method that returns an iterator.": {
+    "Type '{0}' is not an array type or does not have a '[Symbol.iterator]()' method that returns an iterator.": {
         "category": "Error",
         "code": 2548
     },
+    "Type '{0}' is not an array type or a string type or does not have a '[Symbol.iterator]()' method that returns an iterator.": {
+        "category": "Error",
+        "code": 2549
+    },
     "JSX element attributes type '{0}' may not be a union type.": {
         "category": "Error",
         "code": 2600
@@ -2825,7 +2833,7 @@
         "category": "Message",
         "code": 6099
     },
-    "'package.json' does not have a 'types' or 'main' field.": {
+    "'package.json' does not have a '{0}' field.": {
         "category": "Message",
         "code": 6100
     },
@@ -2973,10 +2981,6 @@
         "category": "Message",
         "code": 6136
     },
-    "No types specified in 'package.json', so returning 'main' value of '{0}'": {
-        "category": "Message",
-        "code": 6137
-    },
     "Property '{0}' is declared but never used.": {
         "category": "Error",
         "code": 6138
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
index 0300ff71ec5..68b043f1439 100644
--- a/src/compiler/moduleNameResolver.ts
+++ b/src/compiler/moduleNameResolver.ts
@@ -67,40 +67,31 @@ namespace ts {
     }
 
     /** Reads from "main" or "types"/"typings" depending on `extensions`. */
-    function tryReadPackageJsonMainOrTypes(extensions: Extensions, packageJsonPath: string, baseDirectory: string, state: ModuleResolutionState): string {
+    function tryReadPackageJsonFields(readTypes: boolean, packageJsonPath: string, baseDirectory: string, state: ModuleResolutionState): string | undefined {
         const jsonContent = readJson(packageJsonPath, state.host);
+        return readTypes ? tryReadFromField("typings") || tryReadFromField("types") : tryReadFromField("main");
 
-        switch (extensions) {
-            case Extensions.DtsOnly:
-            case Extensions.TypeScript:
-                return tryReadFromField("typings") || tryReadFromField("types");
-
-            case Extensions.JavaScript:
-                if (typeof jsonContent.main === "string") {
-                    if (state.traceEnabled) {
-                        trace(state.host, Diagnostics.No_types_specified_in_package_json_so_returning_main_value_of_0, jsonContent.main);
-                    }
-                    return normalizePath(combinePaths(baseDirectory, jsonContent.main));
-                }
-                return undefined;
-        }
-
-        function tryReadFromField(fieldName: string) {
-            if (hasProperty(jsonContent, fieldName)) {
-                const typesFile = (<any>jsonContent)[fieldName];
-                if (typeof typesFile === "string") {
-                    const typesFilePath = normalizePath(combinePaths(baseDirectory, typesFile));
-                    if (state.traceEnabled) {
-                        trace(state.host, Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, typesFile, typesFilePath);
-                    }
-                    return typesFilePath;
-                }
-                else {
-                    if (state.traceEnabled) {
-                        trace(state.host, Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, fieldName, typeof typesFile);
-                    }
+        function tryReadFromField(fieldName: "typings" | "types" | "main"): string | undefined {
+            if (!hasProperty(jsonContent, fieldName)) {
+                if (state.traceEnabled) {
+                    trace(state.host, Diagnostics.package_json_does_not_have_a_0_field, fieldName);
                 }
+                return;
             }
+
+            const fileName = jsonContent[fieldName];
+            if (typeof fileName !== "string") {
+                if (state.traceEnabled) {
+                    trace(state.host, Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, fieldName, typeof fileName);
+                }
+                return;
+            }
+
+            const path = normalizePath(combinePaths(baseDirectory, fileName));
+            if (state.traceEnabled) {
+                trace(state.host, Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, fileName, path);
+            }
+            return path;
         }
     }
 
@@ -698,7 +689,8 @@ namespace ts {
         return { resolvedModule: undefined, failedLookupLocations };
 
         function tryResolve(extensions: Extensions): SearchResult<{ resolved: Resolved, isExternalLibraryImport: boolean }> {
-            const resolved = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, state);
+            const loader: ResolutionKindSpecificLoader = (extensions, candidate, failedLookupLocations, onlyRecordFailures, state) => nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, /*considerPackageJson*/true);
+            const resolved = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state);
             if (resolved) {
                 return toSearchResult({ resolved, isExternalLibraryImport: false });
             }
@@ -713,7 +705,7 @@ namespace ts {
             }
             else {
                 const candidate = normalizePath(combinePaths(containingDirectory, moduleName));
-                const resolved = nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, state);
+                const resolved = nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, state, /*considerPackageJson*/true);
                 return resolved && toSearchResult({ resolved, isExternalLibraryImport: false });
             }
         }
@@ -731,7 +723,7 @@ namespace ts {
         return real;
     }
 
-    function nodeLoadModuleByRelativeName(extensions: Extensions, candidate: string, failedLookupLocations: Push<string>, onlyRecordFailures: boolean, state: ModuleResolutionState): Resolved | undefined {
+    function nodeLoadModuleByRelativeName(extensions: Extensions, candidate: string, failedLookupLocations: Push<string>, onlyRecordFailures: boolean, state: ModuleResolutionState, considerPackageJson: boolean): Resolved | undefined {
         if (state.traceEnabled) {
             trace(state.host, Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0_target_file_type_1, candidate, Extensions[extensions]);
         }
@@ -759,7 +751,7 @@ namespace ts {
                 onlyRecordFailures = true;
             }
         }
-        return loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state);
+        return loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, considerPackageJson);
     }
 
     /* @internal */
@@ -835,50 +827,57 @@ namespace ts {
         return undefined;
     }
 
-    function loadNodeModuleFromDirectory(extensions: Extensions, candidate: string, failedLookupLocations: Push<string>, onlyRecordFailures: boolean, state: ModuleResolutionState): Resolved | undefined {
-        const packageJsonPath = pathToPackageJson(candidate);
+    function loadNodeModuleFromDirectory(extensions: Extensions, candidate: string, failedLookupLocations: Push<string>, onlyRecordFailures: boolean, state: ModuleResolutionState, considerPackageJson = true): Resolved | undefined {
         const directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host);
 
-        if (directoryExists && state.host.fileExists(packageJsonPath)) {
-            if (state.traceEnabled) {
-                trace(state.host, Diagnostics.Found_package_json_at_0, packageJsonPath);
-            }
-            const mainOrTypesFile = tryReadPackageJsonMainOrTypes(extensions, packageJsonPath, candidate, state);
-            if (mainOrTypesFile) {
-                const onlyRecordFailures = !directoryProbablyExists(getDirectoryPath(mainOrTypesFile), state.host);
-                // A package.json "typings" may specify an exact filename, or may choose to omit an extension.
-                const fromExactFile = tryFile(mainOrTypesFile, failedLookupLocations, onlyRecordFailures, state);
-                if (fromExactFile) {
-                    const resolved = fromExactFile && resolvedIfExtensionMatches(extensions, fromExactFile);
-                    if (resolved) {
-                        return resolved;
-                    }
-                    if (state.traceEnabled) {
-                        trace(state.host, Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromExactFile);
-                    }
-                }
-                const resolved = tryAddingExtensions(mainOrTypesFile, Extensions.TypeScript, failedLookupLocations, onlyRecordFailures, state);
-                if (resolved) {
-                    return resolved;
+        if (considerPackageJson) {
+            const packageJsonPath = pathToPackageJson(candidate);
+            if (directoryExists && state.host.fileExists(packageJsonPath)) {
+                const fromPackageJson = loadModuleFromPackageJson(packageJsonPath, extensions, candidate, failedLookupLocations, state);
+                if (fromPackageJson) {
+                    return fromPackageJson;
                 }
             }
             else {
-                if (state.traceEnabled) {
-                    trace(state.host, Diagnostics.package_json_does_not_have_a_types_or_main_field);
+                if (directoryExists && state.traceEnabled) {
+                    trace(state.host, Diagnostics.File_0_does_not_exist, packageJsonPath);
                 }
+                // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results
+                failedLookupLocations.push(packageJsonPath);
             }
         }
-        else {
-            if (directoryExists && state.traceEnabled) {
-                trace(state.host, Diagnostics.File_0_does_not_exist, packageJsonPath);
-            }
-            // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results
-            failedLookupLocations.push(packageJsonPath);
-        }
 
         return loadModuleFromFile(extensions, combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state);
     }
 
+    function loadModuleFromPackageJson(packageJsonPath: string, extensions: Extensions, candidate: string, failedLookupLocations: Push<string>, state: ModuleResolutionState): Resolved | undefined {
+        if (state.traceEnabled) {
+            trace(state.host, Diagnostics.Found_package_json_at_0, packageJsonPath);
+        }
+
+        const file = tryReadPackageJsonFields(extensions !== Extensions.JavaScript, packageJsonPath, candidate, state);
+        if (!file) {
+            return undefined;
+        }
+
+        const onlyRecordFailures = !directoryProbablyExists(getDirectoryPath(file), state.host);
+        const fromFile = tryFile(file, failedLookupLocations, onlyRecordFailures, state);
+        if (fromFile) {
+            const resolved = fromFile && resolvedIfExtensionMatches(extensions, fromFile);
+            if (resolved) {
+                return resolved;
+            }
+            if (state.traceEnabled) {
+                trace(state.host, Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromFile);
+            }
+        }
+
+        // Even if extensions is DtsOnly, we can still look up a .ts file as a result of package.json "types"
+        const nextExtensions = extensions === Extensions.DtsOnly ? Extensions.TypeScript : extensions;
+        // Don't do package.json lookup recursively, because Node.js' package lookup doesn't.
+        return nodeLoadModuleByRelativeName(nextExtensions, file, failedLookupLocations, onlyRecordFailures, state, /*considerPackageJson*/ false);
+    }
+
     /** Resolve from an arbitrarily specified file. Return `undefined` if it has an unsupported extension. */
     function resolvedIfExtensionMatches(extensions: Extensions, path: string): Resolved | undefined {
         const extension = tryGetExtensionFromPath(path);
@@ -1040,7 +1039,6 @@ namespace ts {
         return value !== undefined ? { value } : undefined;
     }
 
-
     /** Calls `callback` on `directory` and every ancestor directory it has, returning the first defined result. */
     function forEachAncestorDirectory<T>(directory: string, callback: (directory: string) => SearchResult<T>): SearchResult<T> {
         while (true) {
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index 82b3e12716b..421bb0d5030 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/src/compiler/transformers/module/module.ts
@@ -84,6 +84,11 @@ namespace ts {
 
             const statements: Statement[] = [];
             const statementOffset = addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
+
+            if (!currentModuleInfo.exportEquals) {
+                append(statements, createUnderscoreUnderscoreESModule());
+            }
+
             append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement, /*optional*/ true));
             addRange(statements, visitNodes(node.statements, sourceElementVisitor, isStatement, statementOffset));
             addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false);
@@ -95,7 +100,6 @@ namespace ts {
                 // we need to inform the emitter to add the __export helper.
                 addEmitHelper(updated, exportStarHelper);
             }
-
             return updated;
         }
 
@@ -374,6 +378,10 @@ namespace ts {
             const statements: Statement[] = [];
             const statementOffset = addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
 
+            if (!currentModuleInfo.exportEquals) {
+                append(statements, createUnderscoreUnderscoreESModule());
+            }
+
             // Visit each statement of the module body.
             append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement, /*optional*/ true));
             addRange(statements, visitNodes(node.statements, sourceElementVisitor, isStatement, statementOffset));
@@ -668,6 +676,7 @@ namespace ts {
             }
 
             const generatedName = getGeneratedNameForNode(node);
+
             if (node.exportClause) {
                 const statements: Statement[] = [];
                 // export { x, y } from "mod";
@@ -841,6 +850,7 @@ namespace ts {
             let statements: Statement[];
             let variables: VariableDeclaration[];
             let expressions: Expression[];
+
             if (hasModifier(node, ModifierFlags.Export)) {
                 let modifiers: NodeArray<Modifier>;
 
@@ -1130,43 +1140,39 @@ namespace ts {
          * @param allowComments Whether to allow comments on the export.
          */
         function appendExportStatement(statements: Statement[] | undefined, exportName: Identifier, expression: Expression, location?: TextRange, allowComments?: boolean): Statement[] | undefined {
-            if (exportName.text === "default") {
-                const sourceFile = getOriginalNode(currentSourceFile, isSourceFile);
-                if (sourceFile && !sourceFile.symbol.exports.get("___esModule")) {
-                    if (languageVersion === ScriptTarget.ES3) {
-                        statements = append(statements,
-                            createStatement(
-                                createExportExpression(
-                                    createIdentifier("__esModule"),
-                                    createTrue()
-                                )
-                            )
-                        );
-                    }
-                    else {
-                        statements = append(statements,
-                            createStatement(
-                                createCall(
-                                    createPropertyAccess(createIdentifier("Object"), "defineProperty"),
-                                    /*typeArguments*/ undefined,
-                                    [
-                                        createIdentifier("exports"),
-                                        createLiteral("__esModule"),
-                                        createObjectLiteral([
-                                            createPropertyAssignment("value", createTrue())
-                                        ])
-                                    ]
-                                )
-                            )
-                        );
-                    }
-                }
-            }
-
             statements = append(statements, createExportStatement(exportName, expression, location, allowComments));
             return statements;
         }
 
+        function createUnderscoreUnderscoreESModule() {
+            let statement: Statement;
+            if (languageVersion === ScriptTarget.ES3) {
+                statement = createStatement(
+                    createExportExpression(
+                        createIdentifier("__esModule"),
+                        createLiteral(true)
+                    )
+                )
+            }
+            else {
+                statement = createStatement(
+                    createCall(
+                        createPropertyAccess(createIdentifier("Object"), "defineProperty"),
+                        /*typeArguments*/ undefined,
+                        [
+                            createIdentifier("exports"),
+                            createLiteral("__esModule"),
+                            createObjectLiteral([
+                                createPropertyAssignment("value", createLiteral(true))
+                            ])
+                        ]
+                    )
+                );
+            }
+            setEmitFlags(statement, EmitFlags.CustomPrologue);
+            return statement;
+        }
+
         /**
          * Creates a call to the current file's export function to export a value.
          *
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 7e24c32fa41..9113ea70e94 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2482,7 +2482,8 @@
         InFirstTypeArgument             = 0x00000100,  // Writing first type argument of the instantiated type
         InTypeAlias                     = 0x00000200,  // Writing type in type alias declaration
         UseTypeAliasValue               = 0x00000400,  // Serialize the type instead of using type-alias. This is needed when we emit declaration file.
-        SuppressAnyReturnType            = 0x00000800,  // If the return type is any-like, don't offer a return type.
+        SuppressAnyReturnType           = 0x00000800,  // If the return type is any-like, don't offer a return type.
+        AddUndefined                    = 0x00001000,  // Add undefined to types of initialized, non-optional parameters
     }
 
     export const enum SymbolFormatFlags {
@@ -2587,6 +2588,7 @@
         isDeclarationVisible(node: Declaration): boolean;
         collectLinkedAliases(node: Identifier): Node[];
         isImplementationOfOverload(node: FunctionLikeDeclaration): boolean;
+        isRequiredInitializedParameter(node: ParameterDeclaration): boolean;
         writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;
         writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;
         writeTypeOfExpression(expr: Expression, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;
@@ -2610,37 +2612,34 @@
 
     export const enum SymbolFlags {
         None                    = 0,
-        FunctionScopedVariable  = 0x00000001,  // Variable (var) or parameter
-        BlockScopedVariable     = 0x00000002,  // A block-scoped variable (let or const)
-        Property                = 0x00000004,  // Property or enum member
-        EnumMember              = 0x00000008,  // Enum member
-        Function                = 0x00000010,  // Function
-        Class                   = 0x00000020,  // Class
-        Interface               = 0x00000040,  // Interface
-        ConstEnum               = 0x00000080,  // Const enum
-        RegularEnum             = 0x00000100,  // Enum
-        ValueModule             = 0x00000200,  // Instantiated module
-        NamespaceModule         = 0x00000400,  // Uninstantiated module
-        TypeLiteral             = 0x00000800,  // Type Literal or mapped type
-        ObjectLiteral           = 0x00001000,  // Object Literal
-        Method                  = 0x00002000,  // Method
-        Constructor             = 0x00004000,  // Constructor
-        GetAccessor             = 0x00008000,  // Get accessor
-        SetAccessor             = 0x00010000,  // Set accessor
-        Signature               = 0x00020000,  // Call, construct, or index signature
-        TypeParameter           = 0x00040000,  // Type parameter
-        TypeAlias               = 0x00080000,  // Type alias
-        ExportValue             = 0x00100000,  // Exported value marker (see comment in declareModuleMember in binder)
-        ExportType              = 0x00200000,  // Exported type marker (see comment in declareModuleMember in binder)
-        ExportNamespace         = 0x00400000,  // Exported namespace marker (see comment in declareModuleMember in binder)
-        Alias                   = 0x00800000,  // An alias for another symbol (see comment in isAliasSymbolDeclaration in checker)
-        Instantiated            = 0x01000000,  // Instantiated symbol
-        Merged                  = 0x02000000,  // Merged symbol (created during program binding)
-        Transient               = 0x04000000,  // Transient symbol (created during type check)
-        Prototype               = 0x08000000,  // Prototype property (no source representation)
-        SyntheticProperty       = 0x10000000,  // Property in union or intersection type
-        Optional                = 0x20000000,  // Optional property
-        ExportStar              = 0x40000000,  // Export * declaration
+        FunctionScopedVariable  = 1 << 0,   // Variable (var) or parameter
+        BlockScopedVariable     = 1 << 1,   // A block-scoped variable (let or const)
+        Property                = 1 << 2,   // Property or enum member
+        EnumMember              = 1 << 3,   // Enum member
+        Function                = 1 << 4,   // Function
+        Class                   = 1 << 5,   // Class
+        Interface               = 1 << 6,   // Interface
+        ConstEnum               = 1 << 7,   // Const enum
+        RegularEnum             = 1 << 8,   // Enum
+        ValueModule             = 1 << 9,   // Instantiated module
+        NamespaceModule         = 1 << 10,  // Uninstantiated module
+        TypeLiteral             = 1 << 11,  // Type Literal or mapped type
+        ObjectLiteral           = 1 << 12,  // Object Literal
+        Method                  = 1 << 13,  // Method
+        Constructor             = 1 << 14,  // Constructor
+        GetAccessor             = 1 << 15,  // Get accessor
+        SetAccessor             = 1 << 16,  // Set accessor
+        Signature               = 1 << 17,  // Call, construct, or index signature
+        TypeParameter           = 1 << 18,  // Type parameter
+        TypeAlias               = 1 << 19,  // Type alias
+        ExportValue             = 1 << 20,  // Exported value marker (see comment in declareModuleMember in binder)
+        ExportType              = 1 << 21,  // Exported type marker (see comment in declareModuleMember in binder)
+        ExportNamespace         = 1 << 22,  // Exported namespace marker (see comment in declareModuleMember in binder)
+        Alias                   = 1 << 23,  // An alias for another symbol (see comment in isAliasSymbolDeclaration in checker)
+        Prototype               = 1 << 24,  // Prototype property (no source representation)
+        ExportStar              = 1 << 25,  // Export * declaration
+        Optional                = 1 << 26,  // Optional property
+        Transient               = 1 << 27,  // Transient symbol (created during type check)
 
         Enum = RegularEnum | ConstEnum,
         Variable = FunctionScopedVariable | BlockScopedVariable,
@@ -2700,11 +2699,9 @@
         name: string;                           // Name of symbol
         declarations?: Declaration[];           // Declarations associated with this symbol
         valueDeclaration?: Declaration;         // First value declaration of the symbol
-
         members?: SymbolTable;                  // Class, interface or literal instance members
         exports?: SymbolTable;                  // Module exports
         globalExports?: SymbolTable;            // Conditional global UMD exports
-        /* @internal */ isReadonly?: boolean;   // readonly? (set only for intersections and unions)
         /* @internal */ id?: number;            // Unique id (used to look up SymbolLinks)
         /* @internal */ mergeId?: number;       // Merge id (used to look up merged symbol)
         /* @internal */ parent?: Symbol;        // Parent symbol
@@ -2729,8 +2726,6 @@
         leftSpread?: Symbol;                // Left source for synthetic spread property
         rightSpread?: Symbol;               // Right source for synthetic spread property
         mappedTypeOrigin?: Symbol;          // For a property on a mapped type, points back to the orignal 'T' from 'keyof T'.
-        hasNonUniformType?: boolean;        // True if constituents have non-uniform types
-        isPartial?: boolean;                // True if syntheric property of union type occurs in some but not all constituents
         isDiscriminantProperty?: boolean;   // True if discriminant synthetic property
         resolvedExports?: SymbolTable;      // Resolved exports of module
         exportsChecked?: boolean;           // True if exports of external module have been checked
@@ -2740,7 +2735,22 @@
     }
 
     /* @internal */
-    export interface TransientSymbol extends Symbol, SymbolLinks { }
+    export const enum CheckFlags {
+        Instantiated      = 1 << 0,         // Instantiated symbol
+        SyntheticProperty = 1 << 1,         // Property in union or intersection type
+        Readonly          = 1 << 2,         // Readonly transient symbol
+        Partial           = 1 << 3,         // Synthetic property present in some but not all constituents
+        HasNonUniformType = 1 << 4,         // Synthetic property with non-uniform type in constituents
+        ContainsPublic    = 1 << 5,         // Synthetic property with public constituent(s)
+        ContainsProtected = 1 << 6,         // Synthetic property with protected constituent(s)
+        ContainsPrivate   = 1 << 7,         // Synthetic property with private constituent(s)
+        ContainsStatic    = 1 << 8,         // Synthetic property with static constituent(s)
+    }
+
+    /* @internal */
+    export interface TransientSymbol extends Symbol, SymbolLinks {
+        checkFlags: CheckFlags;
+    }
 
     export type SymbolTable = Map<Symbol>;
 
@@ -3162,9 +3172,8 @@
         ThisProperty
     }
 
-    export interface FileExtensionInfo {
+    export interface JsFileExtensionInfo {
         extension: string;
-        scriptKind: ScriptKind;
         isMixedContent: boolean;
     }
 
diff --git a/src/harness/unittests/compileOnSave.ts b/src/harness/unittests/compileOnSave.ts
index c8deb9e7554..b2c46c5a18c 100644
--- a/src/harness/unittests/compileOnSave.ts
+++ b/src/harness/unittests/compileOnSave.ts
@@ -520,7 +520,7 @@ namespace ts.projectSystem {
 
             const expectedEmittedFileName = "/a/b/f1.js";
             assert.isTrue(host.fileExists(expectedEmittedFileName));
-            assert.equal(host.readFile(expectedEmittedFileName), `"use strict";\r\nfunction Foo() { return 10; }\r\nexports.Foo = Foo;\r\n`);
+            assert.equal(host.readFile(expectedEmittedFileName), `"use strict";\r\nexports.__esModule = true;\r\nfunction Foo() { return 10; }\r\nexports.Foo = Foo;\r\n`);
         });
 
         it("shoud not emit js files in external projects", () => {
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index e6f4abde382..40a6c933242 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -1589,6 +1589,41 @@ namespace ts.projectSystem {
             checkProjectActualFiles(projectService.inferredProjects[1], [file2.path]);
         });
 
+        it ("loading files with correct priority", () => {
+            const f1 = {
+                path: "/a/main.ts",
+                content: "let x = 1"
+            };
+            const f2 = {
+                path: "/a/main.js",
+                content: "var y = 1"
+            };
+            const config = {
+                path: "/a/tsconfig.json",
+                content: JSON.stringify({
+                    compilerOptions: { allowJs: true }
+                })
+            };
+            const host = createServerHost([f1, f2, config]);
+            const projectService = createProjectService(host);
+            projectService.setHostConfiguration({
+                extraFileExtensions: [
+                    { extension: ".js", isMixedContent: false },
+                    { extension: ".html", isMixedContent: true }
+                ]
+            });
+            projectService.openClientFile(f1.path);
+            projectService.checkNumberOfProjects({ configuredProjects: 1 });
+            checkProjectActualFiles(projectService.configuredProjects[0], [ f1.path ]);
+
+            projectService.closeClientFile(f1.path);
+
+            projectService.openClientFile(f2.path);
+            projectService.checkNumberOfProjects({ configuredProjects: 1, inferredProjects: 1 });
+            checkProjectActualFiles(projectService.configuredProjects[0], [ f1.path ]);
+            checkProjectActualFiles(projectService.inferredProjects[0], [ f2.path ]);
+        });
+
         it("tsconfig script block support", () => {
             const file1 = {
                 path: "/a/b/f1.ts",
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index edc4fab9a19..36aa3939c83 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -107,7 +107,7 @@ namespace ts.server {
     export interface HostConfiguration {
         formatCodeOptions: FormatCodeSettings;
         hostInfo: string;
-        extraFileExtensions?: FileExtensionInfo[];
+        extraFileExtensions?: JsFileExtensionInfo[];
     }
 
     interface ConfigFileConversionResult {
@@ -132,7 +132,7 @@ namespace ts.server {
     interface FilePropertyReader<T> {
         getFileName(f: T): string;
         getScriptKind(f: T): ScriptKind;
-        hasMixedContent(f: T, extraFileExtensions: FileExtensionInfo[]): boolean;
+        hasMixedContent(f: T, extraFileExtensions: JsFileExtensionInfo[]): boolean;
     }
 
     const fileNamePropertyReader: FilePropertyReader<string> = {
diff --git a/src/server/protocol.ts b/src/server/protocol.ts
index c1b78e9dbaa..e82eca86ba9 100644
--- a/src/server/protocol.ts
+++ b/src/server/protocol.ts
@@ -1001,9 +1001,9 @@ namespace ts.server.protocol {
         formatOptions?: FormatCodeSettings;
 
         /**
-         * The host's additional supported file extensions
+         * The host's additional supported .js file extensions
          */
-        extraFileExtensions?: FileExtensionInfo[];
+        extraFileExtensions?: JsFileExtensionInfo[];
     }
 
     /**
diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts
index cd1477c4448..2d33ca7b651 100644
--- a/src/services/findAllReferences.ts
+++ b/src/services/findAllReferences.ts
@@ -281,7 +281,7 @@ namespace ts.FindAllReferences {
 
         // if this symbol is visible from its parent container, e.g. exported, then bail out
         // if symbol correspond to the union property - bail out
-        if (symbol.parent || (symbol.flags & SymbolFlags.SyntheticProperty)) {
+        if (symbol.parent || (symbol.flags & SymbolFlags.Transient && (<TransientSymbol>symbol).checkFlags & CheckFlags.SyntheticProperty)) {
             return undefined;
         }
 
diff --git a/src/services/symbolDisplay.ts b/src/services/symbolDisplay.ts
index b32bd8f331d..58c83de8509 100644
--- a/src/services/symbolDisplay.ts
+++ b/src/services/symbolDisplay.ts
@@ -51,7 +51,7 @@ namespace ts.SymbolDisplay {
         if (flags & SymbolFlags.Constructor) return ScriptElementKind.constructorImplementationElement;
 
         if (flags & SymbolFlags.Property) {
-            if (flags & SymbolFlags.SyntheticProperty) {
+            if (flags & SymbolFlags.Transient && (<TransientSymbol>symbol).checkFlags & CheckFlags.SyntheticProperty) {
                 // If union property is result of union of non method (property/accessors/variables), it is labeled as property
                 const unionPropertyKind = forEach(typeChecker.getRootSymbols(symbol), rootSymbol => {
                     const rootSymbolFlags = rootSymbol.getFlags();
diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js
index 5f55c04c9f9..0315fd516b5 100644
--- a/tests/baselines/reference/APISample_compile.js
+++ b/tests/baselines/reference/APISample_compile.js
@@ -41,6 +41,7 @@ compile(process.argv.slice(2), {
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
 "use strict";
+exports.__esModule = true;
 var ts = require("typescript");
 function compile(fileNames, options) {
     var program = ts.createProgram(fileNames, options);
diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js
index 1421b53a00c..57ebd64c4e2 100644
--- a/tests/baselines/reference/APISample_linter.js
+++ b/tests/baselines/reference/APISample_linter.js
@@ -71,6 +71,7 @@ fileNames.forEach(fileName => {
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
 "use strict";
+exports.__esModule = true;
 var ts = require("typescript");
 function delint(sourceFile) {
     delintNode(sourceFile);
diff --git a/tests/baselines/reference/APISample_parseConfig.js b/tests/baselines/reference/APISample_parseConfig.js
index 75ab80d3f23..77f0a07c1df 100644
--- a/tests/baselines/reference/APISample_parseConfig.js
+++ b/tests/baselines/reference/APISample_parseConfig.js
@@ -43,6 +43,7 @@ export function createProgram(rootFiles: string[], compilerOptionsJson: string):
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
 "use strict";
+exports.__esModule = true;
 var ts = require("typescript");
 function printError(error) {
     if (!error) {
diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js
index b0783d42a06..0716e59edb7 100644
--- a/tests/baselines/reference/APISample_transform.js
+++ b/tests/baselines/reference/APISample_transform.js
@@ -23,6 +23,7 @@ console.log(JSON.stringify(result));
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
 "use strict";
+exports.__esModule = true;
 var ts = require("typescript");
 var source = "let x: string  = 'string'";
 var result = ts.transpile(source, { module: ts.ModuleKind.CommonJS });
diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js
index cb7fc3a4c5c..f4400ccda4c 100644
--- a/tests/baselines/reference/APISample_watcher.js
+++ b/tests/baselines/reference/APISample_watcher.js
@@ -116,6 +116,7 @@ watch(currentDirectoryFiles, { module: ts.ModuleKind.CommonJS });
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
 "use strict";
+exports.__esModule = true;
 var ts = require("typescript");
 function watch(rootFileNames, options) {
     var files = {};
diff --git a/tests/baselines/reference/ES5For-of36.errors.txt b/tests/baselines/reference/ES5For-of36.errors.txt
index b1cf3e1e3b2..86a40dcffa5 100644
--- a/tests/baselines/reference/ES5For-of36.errors.txt
+++ b/tests/baselines/reference/ES5For-of36.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/statements/for-ofStatements/ES5For-of36.ts(1,10): error TS2547: Type 'number' is not an array type or does not have a '[Symbol.iterator]()' method that returns an iterator.
+tests/cases/conformance/statements/for-ofStatements/ES5For-of36.ts(1,10): error TS2548: Type 'number' is not an array type or does not have a '[Symbol.iterator]()' method that returns an iterator.
 
 
 ==== tests/cases/conformance/statements/for-ofStatements/ES5For-of36.ts (1 errors) ====
     for (let [a = 0, b = 1] of [2, 3]) {
              ~~~~~~~~~~~~~~
-!!! error TS2547: Type 'number' is not an array type or does not have a '[Symbol.iterator]()' method that returns an iterator.
+!!! error TS2548: Type 'number' is not an array type or does not have a '[Symbol.iterator]()' method that returns an iterator.
         a;
         b;
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js
index 03a504a888a..a68614c0ed4 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js
@@ -31,6 +31,7 @@ export module A {
 
 //// [part1.js]
 "use strict";
+exports.__esModule = true;
 var A;
 (function (A) {
     var Utils;
@@ -44,6 +45,7 @@ var A;
 })(A = exports.A || (exports.A = {}));
 //// [part2.js]
 "use strict";
+exports.__esModule = true;
 var A;
 (function (A) {
     // collision with 'Origin' var in other part of merged module
diff --git a/tests/baselines/reference/aliasAssignments.js b/tests/baselines/reference/aliasAssignments.js
index 7aef6de22e6..c21fe575e76 100644
--- a/tests/baselines/reference/aliasAssignments.js
+++ b/tests/baselines/reference/aliasAssignments.js
@@ -15,6 +15,7 @@ y = moduleA; // should be error
 
 //// [aliasAssignments_moduleA.js]
 "use strict";
+exports.__esModule = true;
 var someClass = (function () {
     function someClass() {
     }
@@ -23,6 +24,7 @@ var someClass = (function () {
 exports.someClass = someClass;
 //// [aliasAssignments_1.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./aliasAssignments_moduleA");
 var x = moduleA;
 x = 1; // Should be error
diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.js b/tests/baselines/reference/aliasOnMergedModuleInterface.js
index ee9562e7b77..d3d312e53bb 100644
--- a/tests/baselines/reference/aliasOnMergedModuleInterface.js
+++ b/tests/baselines/reference/aliasOnMergedModuleInterface.js
@@ -24,6 +24,7 @@ var x: foo.A = foo.bar("hello"); // foo.A should be ok but foo.bar should be err
 //// [aliasOnMergedModuleInterface_0.js]
 //// [aliasOnMergedModuleInterface_1.js]
 "use strict";
+exports.__esModule = true;
 var z;
 z.bar("hello"); // This should be ok
 var x = foo.bar("hello"); // foo.A should be ok but foo.bar should be error
diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
index 41a2bb06664..883cbb84ee3 100644
--- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
+++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
@@ -29,6 +29,7 @@ class C2 {
 
 //// [aliasUsage1_backbone.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Model = (function () {
     function Model() {
     }
@@ -47,6 +48,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+Object.defineProperty(exports, "__esModule", { value: true });
 var Backbone = require("./aliasUsage1_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -58,6 +60,7 @@ var VisualizationModel = (function (_super) {
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsage1_main.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var moduleA = require("./aliasUsage1_moduleA");
 var C2 = (function () {
     function C2() {
diff --git a/tests/baselines/reference/aliasUsageInArray.js b/tests/baselines/reference/aliasUsageInArray.js
index 1f3e1490332..1ccbc958aec 100644
--- a/tests/baselines/reference/aliasUsageInArray.js
+++ b/tests/baselines/reference/aliasUsageInArray.js
@@ -23,6 +23,7 @@ var xs2: typeof moduleA[] = [moduleA];
 
 //// [aliasUsageInArray_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
@@ -41,6 +42,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInArray_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -52,6 +54,7 @@ var VisualizationModel = (function (_super) {
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInArray_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./aliasUsageInArray_moduleA");
 var xs = [moduleA];
 var xs2 = [moduleA];
diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.js b/tests/baselines/reference/aliasUsageInFunctionExpression.js
index a6fc0e97f68..de661ae803e 100644
--- a/tests/baselines/reference/aliasUsageInFunctionExpression.js
+++ b/tests/baselines/reference/aliasUsageInFunctionExpression.js
@@ -22,6 +22,7 @@ f = (x) => moduleA;
 
 //// [aliasUsageInFunctionExpression_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
@@ -40,6 +41,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInFunctionExpression_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -51,6 +53,7 @@ var VisualizationModel = (function (_super) {
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInFunctionExpression_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./aliasUsageInFunctionExpression_moduleA");
 var f = function (x) { return x; };
 f = function (x) { return moduleA; };
diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.js b/tests/baselines/reference/aliasUsageInGenericFunction.js
index a991207971c..2ca49ea8dfc 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.js
+++ b/tests/baselines/reference/aliasUsageInGenericFunction.js
@@ -26,6 +26,7 @@ var r2 = foo({ a: <IHasVisualizationModel>null });
 
 //// [aliasUsageInGenericFunction_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
@@ -44,6 +45,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInGenericFunction_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -55,6 +57,7 @@ var VisualizationModel = (function (_super) {
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInGenericFunction_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./aliasUsageInGenericFunction_moduleA");
 function foo(x) {
     return x;
diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.js b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
index d57b2f6379d..81084b8b92f 100644
--- a/tests/baselines/reference/aliasUsageInIndexerOfClass.js
+++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
@@ -28,6 +28,7 @@ class N2 {
 
 //// [aliasUsageInIndexerOfClass_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
@@ -46,6 +47,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInIndexerOfClass_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -57,6 +59,7 @@ var VisualizationModel = (function (_super) {
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInIndexerOfClass_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./aliasUsageInIndexerOfClass_moduleA");
 var N = (function () {
     function N() {
diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.js b/tests/baselines/reference/aliasUsageInObjectLiteral.js
index 15818c82cb9..6f4adfae58c 100644
--- a/tests/baselines/reference/aliasUsageInObjectLiteral.js
+++ b/tests/baselines/reference/aliasUsageInObjectLiteral.js
@@ -23,6 +23,7 @@ var c: { y: { z: IHasVisualizationModel } } = { y: { z: moduleA } };
 
 //// [aliasUsageInObjectLiteral_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
@@ -41,6 +42,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInObjectLiteral_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -52,6 +54,7 @@ var VisualizationModel = (function (_super) {
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInObjectLiteral_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./aliasUsageInObjectLiteral_moduleA");
 var a = { x: moduleA };
 var b = { x: moduleA };
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.js b/tests/baselines/reference/aliasUsageInOrExpression.js
index 99360ea648d..178ccaaee23 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.js
+++ b/tests/baselines/reference/aliasUsageInOrExpression.js
@@ -26,6 +26,7 @@ var f: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null ? { x
 
 //// [aliasUsageInOrExpression_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
@@ -44,6 +45,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInOrExpression_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -55,6 +57,7 @@ var VisualizationModel = (function (_super) {
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInOrExpression_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./aliasUsageInOrExpression_moduleA");
 var i;
 var d1 = i || moduleA;
diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
index 47f0c30d28b..5ac28396fba 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
+++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
@@ -26,6 +26,7 @@ class D extends C<IHasVisualizationModel> {
 
 //// [aliasUsageInTypeArgumentOfExtendsClause_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
@@ -44,6 +45,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -65,6 +67,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var moduleA = require("./aliasUsageInTypeArgumentOfExtendsClause_moduleA");
 var C = (function () {
     function C() {
diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.js b/tests/baselines/reference/aliasUsageInVarAssignment.js
index 666e32e1546..a85d61fd34c 100644
--- a/tests/baselines/reference/aliasUsageInVarAssignment.js
+++ b/tests/baselines/reference/aliasUsageInVarAssignment.js
@@ -22,6 +22,7 @@ var m: typeof moduleA = i;
 
 //// [aliasUsageInVarAssignment_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
@@ -40,6 +41,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInVarAssignment_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -51,5 +53,6 @@ var VisualizationModel = (function (_super) {
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInVarAssignment_main.js]
 "use strict";
+exports.__esModule = true;
 var i;
 var m = i;
diff --git a/tests/baselines/reference/aliasUsedAsNameValue.js b/tests/baselines/reference/aliasUsedAsNameValue.js
index 9495f8890b6..168567eb80f 100644
--- a/tests/baselines/reference/aliasUsedAsNameValue.js
+++ b/tests/baselines/reference/aliasUsedAsNameValue.js
@@ -20,12 +20,15 @@ export var a = function () {
 
 //// [aliasUsedAsNameValue_0.js]
 "use strict";
+exports.__esModule = true;
 //// [aliasUsedAsNameValue_1.js]
 "use strict";
+exports.__esModule = true;
 function b(a) { return null; }
 exports.b = b;
 //// [aliasUsedAsNameValue_2.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='aliasUsedAsNameValue_0.ts' />
 ///<reference path='aliasUsedAsNameValue_1.ts' />
 var mod = require("./aliasUsedAsNameValue_0");
diff --git a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js
index 8304be3a036..58565bbb916 100644
--- a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js
+++ b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js
@@ -12,6 +12,8 @@ var d = b.q3;
 
 //// [aliasWithInterfaceExportAssignmentUsedInVarInitializer_0.js]
 "use strict";
+exports.__esModule = true;
 //// [aliasWithInterfaceExportAssignmentUsedInVarInitializer_1.js]
 "use strict";
+exports.__esModule = true;
 var d = b.q3;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports1.js b/tests/baselines/reference/allowSyntheticDefaultImports1.js
index 3789410a54b..a659eb60151 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports1.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports1.js
@@ -12,6 +12,7 @@ export class Foo {
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
@@ -20,5 +21,6 @@ var Foo = (function () {
 exports.Foo = Foo;
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var b_1 = require("./b");
 exports.x = new b_1["default"].Foo();
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports10.js b/tests/baselines/reference/allowSyntheticDefaultImports10.js
index 396cd75b574..ad3ed5715c0 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports10.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports10.js
@@ -12,6 +12,7 @@ Foo.default.default.foo();
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var Foo = require("./b");
 Foo["default"].bar();
 Foo["default"]["default"].foo();
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports4.js b/tests/baselines/reference/allowSyntheticDefaultImports4.js
index 747f59dc904..762c032b812 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports4.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports4.js
@@ -13,5 +13,6 @@ export var x = new Foo();
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var b_1 = require("./b");
 exports.x = new b_1["default"]();
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports9.js b/tests/baselines/reference/allowSyntheticDefaultImports9.js
index 15810ccaaf7..2d8ab463d83 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports9.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports9.js
@@ -12,6 +12,7 @@ Foo.foo();
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var b_1 = require("./b");
 b_1["default"].bar();
 b_1["default"].foo();
diff --git a/tests/baselines/reference/alwaysStrictModule4.js b/tests/baselines/reference/alwaysStrictModule4.js
index 1444f351bbd..dcaafdfeee6 100644
--- a/tests/baselines/reference/alwaysStrictModule4.js
+++ b/tests/baselines/reference/alwaysStrictModule4.js
@@ -5,5 +5,6 @@ export const a = 1
 
 //// [alwaysStrictModule4.js]
 "use strict";
+exports.__esModule = true;
 // Module commonjs
 exports.a = 1;
diff --git a/tests/baselines/reference/alwaysStrictModule6.js b/tests/baselines/reference/alwaysStrictModule6.js
index 9a603926169..cd97b55b67b 100644
--- a/tests/baselines/reference/alwaysStrictModule6.js
+++ b/tests/baselines/reference/alwaysStrictModule6.js
@@ -5,5 +5,6 @@ export const a = 1;
 
 //// [alwaysStrictModule6.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 // Targeting ES5
 exports.a = 1;
diff --git a/tests/baselines/reference/ambientDeclarationsExternal.js b/tests/baselines/reference/ambientDeclarationsExternal.js
index b92993128ab..dfff030b78f 100644
--- a/tests/baselines/reference/ambientDeclarationsExternal.js
+++ b/tests/baselines/reference/ambientDeclarationsExternal.js
@@ -28,6 +28,7 @@ var n: number;
 // Ambient external import declaration referencing ambient external module using top level module name 
 //// [consumer.js]
 "use strict";
+exports.__esModule = true;
 // Ambient external module members are always exported with or without export keyword when module lacks export assignment
 var imp3 = require("equ2");
 var n = imp3.x;
diff --git a/tests/baselines/reference/ambientDeclarationsPatterns.js b/tests/baselines/reference/ambientDeclarationsPatterns.js
index 143f26550e9..84088d11d4e 100644
--- a/tests/baselines/reference/ambientDeclarationsPatterns.js
+++ b/tests/baselines/reference/ambientDeclarationsPatterns.js
@@ -34,6 +34,7 @@ foo(fileText);
 
 //// [user.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path="declarations.d.ts" />
 var foobarbaz_1 = require("foobarbaz");
 foobarbaz_1.foo(foobarbaz_1.baz);
diff --git a/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js b/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js
index bb0d3a907ae..401af4b5214 100644
--- a/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js
+++ b/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js
@@ -4,4 +4,5 @@ export declare module "M" { }
 //// [ambientExternalModuleInsideNonAmbientExternalModule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/ambientExternalModuleMerging.js b/tests/baselines/reference/ambientExternalModuleMerging.js
index 217d7cb90c1..6c2de62c90a 100644
--- a/tests/baselines/reference/ambientExternalModuleMerging.js
+++ b/tests/baselines/reference/ambientExternalModuleMerging.js
@@ -19,6 +19,7 @@ declare module "M" {
 //// [ambientExternalModuleMerging_use.js]
 define(["require", "exports", "M"], function (require, exports, M) {
     "use strict";
+    exports.__esModule = true;
     // Should be strings
     var x = M.x;
     var y = M.y;
diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js
index c91adaff864..9efd9e4ada9 100644
--- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js
+++ b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js
@@ -22,5 +22,6 @@ var c = new A();
 //// [ambientExternalModuleWithInternalImportDeclaration_1.js]
 define(["require", "exports", "M"], function (require, exports, A) {
     "use strict";
+    exports.__esModule = true;
     var c = new A();
 });
diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js
index 4c70a338bc3..98d3d46912a 100644
--- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js
+++ b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js
@@ -21,5 +21,6 @@ var c = new A();
 //// [ambientExternalModuleWithoutInternalImportDeclaration_1.js]
 define(["require", "exports", "M"], function (require, exports, A) {
     "use strict";
+    exports.__esModule = true;
     var c = new A();
 });
diff --git a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.js b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.js
index 0e2d08ae07b..689cd6a1242 100644
--- a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.js
+++ b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.js
@@ -8,4 +8,5 @@ export declare module M { }
 //// [ambientInsideNonAmbientExternalModule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/ambientNameRestrictions.js b/tests/baselines/reference/ambientNameRestrictions.js
index cd4fbf29371..b35f1241b2d 100644
--- a/tests/baselines/reference/ambientNameRestrictions.js
+++ b/tests/baselines/reference/ambientNameRestrictions.js
@@ -6,3 +6,4 @@ export declare namespace Foo {
 
 //// [ambientNameRestrictions.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/ambientShorthand.js b/tests/baselines/reference/ambientShorthand.js
index 109264fc91b..a7513e7eb58 100644
--- a/tests/baselines/reference/ambientShorthand.js
+++ b/tests/baselines/reference/ambientShorthand.js
@@ -15,6 +15,7 @@ foo(bar, baz, boom);
 
 //// [user.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path="declarations.d.ts"/>
 var jquery_1 = require("jquery");
 var baz = require("fs");
diff --git a/tests/baselines/reference/ambientShorthand_duplicate.js b/tests/baselines/reference/ambientShorthand_duplicate.js
index d99eb3d27dc..08d03c83ed0 100644
--- a/tests/baselines/reference/ambientShorthand_duplicate.js
+++ b/tests/baselines/reference/ambientShorthand_duplicate.js
@@ -14,3 +14,4 @@ import foo from "foo";
 
 //// [user.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/ambientShorthand_merging.js b/tests/baselines/reference/ambientShorthand_merging.js
index f0aaefc6366..15714a48997 100644
--- a/tests/baselines/reference/ambientShorthand_merging.js
+++ b/tests/baselines/reference/ambientShorthand_merging.js
@@ -16,3 +16,4 @@ import foo, {bar} from "foo";
 
 //// [user.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/ambientShorthand_reExport.js b/tests/baselines/reference/ambientShorthand_reExport.js
index bdfc0ee0821..6842d0f7554 100644
--- a/tests/baselines/reference/ambientShorthand_reExport.js
+++ b/tests/baselines/reference/ambientShorthand_reExport.js
@@ -18,6 +18,7 @@ x($);
 
 //// [reExportX.js]
 "use strict";
+exports.__esModule = true;
 var jquery_1 = require("jquery");
 exports.x = jquery_1.x;
 //// [reExportAll.js]
@@ -25,9 +26,11 @@ exports.x = jquery_1.x;
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+exports.__esModule = true;
 __export(require("jquery"));
 //// [reExportUser.js]
 "use strict";
+exports.__esModule = true;
 var reExportX_1 = require("./reExportX");
 var $ = require("./reExportAll");
 // '$' is not callable, it is an object.
diff --git a/tests/baselines/reference/amdDependencyComment1.js b/tests/baselines/reference/amdDependencyComment1.js
index 2c0bdd551fa..6be26909f3a 100644
--- a/tests/baselines/reference/amdDependencyComment1.js
+++ b/tests/baselines/reference/amdDependencyComment1.js
@@ -7,5 +7,6 @@ m1.f();
 //// [amdDependencyComment1.js]
 ///<amd-dependency path='bar'/>
 "use strict";
+exports.__esModule = true;
 var m1 = require("m2");
 m1.f();
diff --git a/tests/baselines/reference/amdDependencyComment2.js b/tests/baselines/reference/amdDependencyComment2.js
index 6867b03f606..222093cf159 100644
--- a/tests/baselines/reference/amdDependencyComment2.js
+++ b/tests/baselines/reference/amdDependencyComment2.js
@@ -8,5 +8,6 @@ m1.f();
 ///<amd-dependency path='bar'/>
 define(["require", "exports", "m2", "bar"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     m1.f();
 });
diff --git a/tests/baselines/reference/amdDependencyCommentName1.js b/tests/baselines/reference/amdDependencyCommentName1.js
index 19024a09f3c..d0e4d73fb7a 100644
--- a/tests/baselines/reference/amdDependencyCommentName1.js
+++ b/tests/baselines/reference/amdDependencyCommentName1.js
@@ -7,5 +7,6 @@ m1.f();
 //// [amdDependencyCommentName1.js]
 ///<amd-dependency path='bar' name='b'/>
 "use strict";
+exports.__esModule = true;
 var m1 = require("m2");
 m1.f();
diff --git a/tests/baselines/reference/amdDependencyCommentName2.js b/tests/baselines/reference/amdDependencyCommentName2.js
index d60207e2bec..c39902371a0 100644
--- a/tests/baselines/reference/amdDependencyCommentName2.js
+++ b/tests/baselines/reference/amdDependencyCommentName2.js
@@ -8,5 +8,6 @@ m1.f();
 ///<amd-dependency path='bar' name='b'/>
 define(["require", "exports", "bar", "m2"], function (require, exports, b, m1) {
     "use strict";
+    exports.__esModule = true;
     m1.f();
 });
diff --git a/tests/baselines/reference/amdDependencyCommentName3.js b/tests/baselines/reference/amdDependencyCommentName3.js
index 1792c0c2aa0..f842ad0cbf8 100644
--- a/tests/baselines/reference/amdDependencyCommentName3.js
+++ b/tests/baselines/reference/amdDependencyCommentName3.js
@@ -12,5 +12,6 @@ m1.f();
 ///<amd-dependency path='goo' name='c'/>
 define(["require", "exports", "bar", "goo", "m2", "foo"], function (require, exports, b, c, m1) {
     "use strict";
+    exports.__esModule = true;
     m1.f();
 });
diff --git a/tests/baselines/reference/amdDependencyCommentName4.js b/tests/baselines/reference/amdDependencyCommentName4.js
index 52b10100365..6542aa14fa2 100644
--- a/tests/baselines/reference/amdDependencyCommentName4.js
+++ b/tests/baselines/reference/amdDependencyCommentName4.js
@@ -27,6 +27,7 @@ import "unaliasedModule2";
 ///<amd-dependency path='unaliasedModule4'/>
 define(["require", "exports", "aliasedModule5", "aliasedModule6", "aliasedModule1", "aliasedModule2", "aliasedModule3", "aliasedModule4", "unaliasedModule3", "unaliasedModule4", "unaliasedModule1", "unaliasedModule2"], function (require, exports, n1, n2, r1, aliasedModule2_1, aliasedModule3_1, ns) {
     "use strict";
+    exports.__esModule = true;
     r1;
     aliasedModule2_1.p1;
     aliasedModule3_1["default"];
diff --git a/tests/baselines/reference/amdImportAsPrimaryExpression.js b/tests/baselines/reference/amdImportAsPrimaryExpression.js
index 6ff3216fb58..69d3e095dc7 100644
--- a/tests/baselines/reference/amdImportAsPrimaryExpression.js
+++ b/tests/baselines/reference/amdImportAsPrimaryExpression.js
@@ -15,6 +15,7 @@ if(foo.E1.A === 0){
 //// [foo_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var E1;
     (function (E1) {
         E1[E1["A"] = 0] = "A";
@@ -25,6 +26,7 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     if (foo.E1.A === 0) {
         // Should cause runtime import - interesting optimization possibility, as gets inlined to 0.
     }
diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
index a0bd7c83d64..651ae7a6d39 100644
--- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
+++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
@@ -34,6 +34,7 @@ var e: number = <foo.E1>0;
 //// [foo_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C1 = (function () {
         function C1() {
             this.m1 = 42;
@@ -52,6 +53,7 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var i;
     var x = {};
     var y = false;
diff --git a/tests/baselines/reference/anonymousDefaultExportsAmd.js b/tests/baselines/reference/anonymousDefaultExportsAmd.js
index bb5cd587a83..24e833b7542 100644
--- a/tests/baselines/reference/anonymousDefaultExportsAmd.js
+++ b/tests/baselines/reference/anonymousDefaultExportsAmd.js
@@ -9,15 +9,15 @@ export default function() {}
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class default_1 {
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = default_1;
 });
 //// [b.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    function default_1() { }
     Object.defineProperty(exports, "__esModule", { value: true });
+    function default_1() { }
     exports.default = default_1;
 });
diff --git a/tests/baselines/reference/anonymousDefaultExportsCommonjs.js b/tests/baselines/reference/anonymousDefaultExportsCommonjs.js
index 754ffdb7c9b..e22000856d6 100644
--- a/tests/baselines/reference/anonymousDefaultExportsCommonjs.js
+++ b/tests/baselines/reference/anonymousDefaultExportsCommonjs.js
@@ -8,12 +8,12 @@ export default function() {}
 
 //// [a.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class default_1 {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 //// [b.js]
 "use strict";
-function default_1() { }
 Object.defineProperty(exports, "__esModule", { value: true });
+function default_1() { }
 exports.default = default_1;
diff --git a/tests/baselines/reference/anonymousDefaultExportsUmd.js b/tests/baselines/reference/anonymousDefaultExportsUmd.js
index 85ed1d30444..484238b8722 100644
--- a/tests/baselines/reference/anonymousDefaultExportsUmd.js
+++ b/tests/baselines/reference/anonymousDefaultExportsUmd.js
@@ -17,9 +17,9 @@ export default function() {}
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class default_1 {
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = default_1;
 });
 //// [b.js]
@@ -33,7 +33,7 @@ export default function() {}
     }
 })(function (require, exports) {
     "use strict";
-    function default_1() { }
     Object.defineProperty(exports, "__esModule", { value: true });
+    function default_1() { }
     exports.default = default_1;
 });
diff --git a/tests/baselines/reference/asOperator4.js b/tests/baselines/reference/asOperator4.js
index 41edf92416b..3a43f328f35 100644
--- a/tests/baselines/reference/asOperator4.js
+++ b/tests/baselines/reference/asOperator4.js
@@ -14,10 +14,12 @@ import { foo } from './foo';
 
 //// [foo.js]
 "use strict";
+exports.__esModule = true;
 function foo() { }
 exports.foo = foo;
 //// [bar.js]
 "use strict";
+exports.__esModule = true;
 var foo_1 = require("./foo");
 // These should emit identically
 foo_1.foo;
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
index e4cfcad5443..335bd8a340e 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
@@ -77,6 +77,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 var _this = this;
+Object.defineProperty(exports, "__esModule", { value: true });
 var missing_1 = require("missing");
 function f0() {
     return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
diff --git a/tests/baselines/reference/asyncImportedPromise_es5.js b/tests/baselines/reference/asyncImportedPromise_es5.js
index d541c6f3fc6..8a6ec4240ca 100644
--- a/tests/baselines/reference/asyncImportedPromise_es5.js
+++ b/tests/baselines/reference/asyncImportedPromise_es5.js
@@ -21,6 +21,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+Object.defineProperty(exports, "__esModule", { value: true });
 var Task = (function (_super) {
     __extends(Task, _super);
     function Task() {
@@ -66,6 +67,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var task_1 = require("./task");
 var Test = (function () {
     function Test() {
diff --git a/tests/baselines/reference/asyncImportedPromise_es6.js b/tests/baselines/reference/asyncImportedPromise_es6.js
index 6c6e34e7b1d..6b84f5615b3 100644
--- a/tests/baselines/reference/asyncImportedPromise_es6.js
+++ b/tests/baselines/reference/asyncImportedPromise_es6.js
@@ -11,6 +11,7 @@ class Test {
 
 //// [task.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class Task extends Promise {
 }
 exports.Task = Task;
@@ -24,6 +25,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 class Test {
     example() {
         return __awaiter(this, void 0, void 0, function* () { return; });
diff --git a/tests/baselines/reference/augmentExportEquals1.js b/tests/baselines/reference/augmentExportEquals1.js
index 98322c01a34..7b0bfcf7335 100644
--- a/tests/baselines/reference/augmentExportEquals1.js
+++ b/tests/baselines/reference/augmentExportEquals1.js
@@ -28,9 +28,11 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports", "./file2"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a; // should not work
 });
diff --git a/tests/baselines/reference/augmentExportEquals1_1.js b/tests/baselines/reference/augmentExportEquals1_1.js
index 08f032ff33f..51bc67e7fa4 100644
--- a/tests/baselines/reference/augmentExportEquals1_1.js
+++ b/tests/baselines/reference/augmentExportEquals1_1.js
@@ -25,9 +25,11 @@ let a: x.A; // should not work
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a; // should not work
 });
diff --git a/tests/baselines/reference/augmentExportEquals2.js b/tests/baselines/reference/augmentExportEquals2.js
index fc373173e3c..efdce1bc0cf 100644
--- a/tests/baselines/reference/augmentExportEquals2.js
+++ b/tests/baselines/reference/augmentExportEquals2.js
@@ -27,9 +27,11 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports", "./file2"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a; // should not work
 });
diff --git a/tests/baselines/reference/augmentExportEquals2_1.js b/tests/baselines/reference/augmentExportEquals2_1.js
index 9046157bb26..322ab3b36bf 100644
--- a/tests/baselines/reference/augmentExportEquals2_1.js
+++ b/tests/baselines/reference/augmentExportEquals2_1.js
@@ -25,9 +25,11 @@ let a: x.A; // should not work
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a; // should not work
 });
diff --git a/tests/baselines/reference/augmentExportEquals3.js b/tests/baselines/reference/augmentExportEquals3.js
index 94cb0f8ce95..387ef86ff79 100644
--- a/tests/baselines/reference/augmentExportEquals3.js
+++ b/tests/baselines/reference/augmentExportEquals3.js
@@ -36,11 +36,13 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports", "./file1"], function (require, exports, x) {
     "use strict";
+    exports.__esModule = true;
     x.b = 1;
 });
 //// [file3.js]
 define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = x.b;
 });
diff --git a/tests/baselines/reference/augmentExportEquals3_1.js b/tests/baselines/reference/augmentExportEquals3_1.js
index fc6b7b1cec3..e91ca4498dd 100644
--- a/tests/baselines/reference/augmentExportEquals3_1.js
+++ b/tests/baselines/reference/augmentExportEquals3_1.js
@@ -30,11 +30,13 @@ let b = x.b;
 //// [file2.js]
 define(["require", "exports", "file1"], function (require, exports, x) {
     "use strict";
+    exports.__esModule = true;
     x.b = 1;
 });
 //// [file3.js]
 define(["require", "exports", "file1", "file2"], function (require, exports, x) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = x.b;
 });
diff --git a/tests/baselines/reference/augmentExportEquals4.js b/tests/baselines/reference/augmentExportEquals4.js
index ff0cbd44e0b..37be30731de 100644
--- a/tests/baselines/reference/augmentExportEquals4.js
+++ b/tests/baselines/reference/augmentExportEquals4.js
@@ -40,11 +40,13 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports", "./file1"], function (require, exports, x) {
     "use strict";
+    exports.__esModule = true;
     x.b = 1;
 });
 //// [file3.js]
 define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = x.b;
 });
diff --git a/tests/baselines/reference/augmentExportEquals4_1.js b/tests/baselines/reference/augmentExportEquals4_1.js
index b4ba932d44b..71d39aedb1f 100644
--- a/tests/baselines/reference/augmentExportEquals4_1.js
+++ b/tests/baselines/reference/augmentExportEquals4_1.js
@@ -31,11 +31,13 @@ let b = x.b;
 //// [file2.js]
 define(["require", "exports", "file1"], function (require, exports, x) {
     "use strict";
+    exports.__esModule = true;
     x.b = 1;
 });
 //// [file3.js]
 define(["require", "exports", "file1", "file2"], function (require, exports, x) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = x.b;
 });
diff --git a/tests/baselines/reference/augmentExportEquals5.js b/tests/baselines/reference/augmentExportEquals5.js
index 49b6c3fed56..7bc5102ca9d 100644
--- a/tests/baselines/reference/augmentExportEquals5.js
+++ b/tests/baselines/reference/augmentExportEquals5.js
@@ -85,10 +85,12 @@ const y = x.id;
 //// [augmentation.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [consumer.js]
 define(["require", "exports", "./augmentation"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x;
     var y = x.id;
 });
diff --git a/tests/baselines/reference/augmentExportEquals6.js b/tests/baselines/reference/augmentExportEquals6.js
index 3f9cbbb0af8..4299f8653dd 100644
--- a/tests/baselines/reference/augmentExportEquals6.js
+++ b/tests/baselines/reference/augmentExportEquals6.js
@@ -52,11 +52,13 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports", "./file1"], function (require, exports, x) {
     "use strict";
+    exports.__esModule = true;
     x.B.b = 1;
 });
 //// [file3.js]
 define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.a;
     var c = x.B.b;
diff --git a/tests/baselines/reference/augmentExportEquals6_1.js b/tests/baselines/reference/augmentExportEquals6_1.js
index c7c560183cc..e69728a766b 100644
--- a/tests/baselines/reference/augmentExportEquals6_1.js
+++ b/tests/baselines/reference/augmentExportEquals6_1.js
@@ -29,10 +29,12 @@ let b = a.a;
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.a;
 });
diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.js b/tests/baselines/reference/augmentedTypesExternalModule1.js
index 65525e8187e..0a8b7404bd1 100644
--- a/tests/baselines/reference/augmentedTypesExternalModule1.js
+++ b/tests/baselines/reference/augmentedTypesExternalModule1.js
@@ -6,6 +6,7 @@ module c5 { } // should be ok everywhere
 //// [augmentedTypesExternalModule1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = 1;
     var c5 = (function () {
         function c5() {
diff --git a/tests/baselines/reference/badExternalModuleReference.js b/tests/baselines/reference/badExternalModuleReference.js
index 4f9e1aae507..c1608b4c57e 100644
--- a/tests/baselines/reference/badExternalModuleReference.js
+++ b/tests/baselines/reference/badExternalModuleReference.js
@@ -9,4 +9,5 @@ export declare var a: {
 //// [badExternalModuleReference.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/bangInModuleName.js b/tests/baselines/reference/bangInModuleName.js
index 2fe13e00cf0..f58827e1ae5 100644
--- a/tests/baselines/reference/bangInModuleName.js
+++ b/tests/baselines/reference/bangInModuleName.js
@@ -21,4 +21,5 @@ import * as http from 'intern/dojo/node!http';
 /// <reference path="a.d.ts"/>
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/cacheResolutions.js b/tests/baselines/reference/cacheResolutions.js
index 1d0f918bf98..6b28c90e321 100644
--- a/tests/baselines/reference/cacheResolutions.js
+++ b/tests/baselines/reference/cacheResolutions.js
@@ -13,15 +13,18 @@ export let x = 1;
 //// [app.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.x = 1;
 });
 //// [lib1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.x = 1;
 });
 //// [lib2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.x = 1;
 });
diff --git a/tests/baselines/reference/cachedModuleResolution1.js b/tests/baselines/reference/cachedModuleResolution1.js
index 9071b60d6c1..d93133cca40 100644
--- a/tests/baselines/reference/cachedModuleResolution1.js
+++ b/tests/baselines/reference/cachedModuleResolution1.js
@@ -12,5 +12,7 @@ import {x} from "foo";
 
 //// [app.js]
 "use strict";
+exports.__esModule = true;
 //// [lib.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/cachedModuleResolution2.js b/tests/baselines/reference/cachedModuleResolution2.js
index 7c84a92abaf..c5c3357f65a 100644
--- a/tests/baselines/reference/cachedModuleResolution2.js
+++ b/tests/baselines/reference/cachedModuleResolution2.js
@@ -13,5 +13,7 @@ import {x} from "foo";
 
 //// [lib.js]
 "use strict";
+exports.__esModule = true;
 //// [app.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/cachedModuleResolution3.js b/tests/baselines/reference/cachedModuleResolution3.js
index 032c1afee0e..d476eafd2e8 100644
--- a/tests/baselines/reference/cachedModuleResolution3.js
+++ b/tests/baselines/reference/cachedModuleResolution3.js
@@ -12,5 +12,7 @@ import {x} from "foo";
 
 //// [app.js]
 "use strict";
+exports.__esModule = true;
 //// [lib.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/cachedModuleResolution4.js b/tests/baselines/reference/cachedModuleResolution4.js
index 6089de9706b..4cc656d73d3 100644
--- a/tests/baselines/reference/cachedModuleResolution4.js
+++ b/tests/baselines/reference/cachedModuleResolution4.js
@@ -13,5 +13,7 @@ import {x} from "foo";
 
 //// [lib.js]
 "use strict";
+exports.__esModule = true;
 //// [app.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/cachedModuleResolution5.js b/tests/baselines/reference/cachedModuleResolution5.js
index 33561e8eae2..35fad11d90e 100644
--- a/tests/baselines/reference/cachedModuleResolution5.js
+++ b/tests/baselines/reference/cachedModuleResolution5.js
@@ -12,5 +12,7 @@ import {x} from "foo";
 
 //// [app.js]
 "use strict";
+exports.__esModule = true;
 //// [lib.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/cachedModuleResolution6.js b/tests/baselines/reference/cachedModuleResolution6.js
index f21f491a921..1e6803b115c 100644
--- a/tests/baselines/reference/cachedModuleResolution6.js
+++ b/tests/baselines/reference/cachedModuleResolution6.js
@@ -9,5 +9,7 @@ import {x} from "foo";
 
 //// [app.js]
 "use strict";
+exports.__esModule = true;
 //// [lib.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/cachedModuleResolution7.js b/tests/baselines/reference/cachedModuleResolution7.js
index 8b86dcd55af..044eefff73a 100644
--- a/tests/baselines/reference/cachedModuleResolution7.js
+++ b/tests/baselines/reference/cachedModuleResolution7.js
@@ -10,5 +10,7 @@ import {x} from "foo";
 
 //// [lib.js]
 "use strict";
+exports.__esModule = true;
 //// [app.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/cachedModuleResolution8.js b/tests/baselines/reference/cachedModuleResolution8.js
index 1c00b171f21..fe89a8f288f 100644
--- a/tests/baselines/reference/cachedModuleResolution8.js
+++ b/tests/baselines/reference/cachedModuleResolution8.js
@@ -9,5 +9,7 @@ import {x} from "foo";
 
 //// [app.js]
 "use strict";
+exports.__esModule = true;
 //// [lib.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/cachedModuleResolution9.js b/tests/baselines/reference/cachedModuleResolution9.js
index 32f8848736c..c27ababcb95 100644
--- a/tests/baselines/reference/cachedModuleResolution9.js
+++ b/tests/baselines/reference/cachedModuleResolution9.js
@@ -11,5 +11,7 @@ import {x} from "foo";
 
 //// [lib.js]
 "use strict";
+exports.__esModule = true;
 //// [app.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/chainedImportAlias.js b/tests/baselines/reference/chainedImportAlias.js
index a6113d5f241..8fcdd501707 100644
--- a/tests/baselines/reference/chainedImportAlias.js
+++ b/tests/baselines/reference/chainedImportAlias.js
@@ -13,6 +13,7 @@ y.m.foo();
 
 //// [chainedImportAlias_file0.js]
 "use strict";
+exports.__esModule = true;
 var m;
 (function (m) {
     function foo() { }
@@ -20,6 +21,7 @@ var m;
 })(m = exports.m || (exports.m = {}));
 //// [chainedImportAlias_file1.js]
 "use strict";
+exports.__esModule = true;
 var x = require("./chainedImportAlias_file0");
 var y = x;
 y.m.foo();
diff --git a/tests/baselines/reference/circularReference.js b/tests/baselines/reference/circularReference.js
index 193b3e1da07..198a886f026 100644
--- a/tests/baselines/reference/circularReference.js
+++ b/tests/baselines/reference/circularReference.js
@@ -35,6 +35,7 @@ export module M1 {
 
 //// [foo1.js]
 "use strict";
+exports.__esModule = true;
 var foo2 = require("./foo2");
 var M1;
 (function (M1) {
@@ -50,6 +51,7 @@ var M1;
 })(M1 = exports.M1 || (exports.M1 = {}));
 //// [foo2.js]
 "use strict";
+exports.__esModule = true;
 var foo1 = require("./foo1");
 var M1;
 (function (M1) {
diff --git a/tests/baselines/reference/circularReferenceInImport.js b/tests/baselines/reference/circularReferenceInImport.js
index a9cf0925c34..8b49f45dbd2 100644
--- a/tests/baselines/reference/circularReferenceInImport.js
+++ b/tests/baselines/reference/circularReferenceInImport.js
@@ -17,6 +17,7 @@ export function foo() {
 
 //// [app.js]
 "use strict";
+exports.__esModule = true;
 function foo() {
     return new Object();
 }
diff --git a/tests/baselines/reference/classExtendsAcrossFiles.js b/tests/baselines/reference/classExtendsAcrossFiles.js
index 6fcce5c5982..933f92cad64 100644
--- a/tests/baselines/reference/classExtendsAcrossFiles.js
+++ b/tests/baselines/reference/classExtendsAcrossFiles.js
@@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+Object.defineProperty(exports, "__esModule", { value: true });
 var a_1 = require("./a");
 exports.b = {
     f: function () {
@@ -61,6 +62,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+Object.defineProperty(exports, "__esModule", { value: true });
 var b_1 = require("./b");
 exports.a = {
     f: function () {
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js
index d310ccd53bc..d4df05f2ea3 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js
@@ -21,6 +21,7 @@ export class Test1 {
 var field1;
 //// [classMemberInitializerWithLamdaScoping3_1.js]
 "use strict";
+exports.__esModule = true;
 var Test1 = (function () {
     function Test1(field1) {
         this.field1 = field1;
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
index 161bceca04d..76835e757e0 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
@@ -17,8 +17,10 @@ export class Test1 {
 
 //// [classMemberInitializerWithLamdaScoping3_0.js]
 "use strict";
+exports.__esModule = true;
 //// [classMemberInitializerWithLamdaScoping3_1.js]
 "use strict";
+exports.__esModule = true;
 var Test1 = (function () {
     function Test1(field1) {
         this.field1 = field1;
diff --git a/tests/baselines/reference/collisionExportsRequireAndAlias.js b/tests/baselines/reference/collisionExportsRequireAndAlias.js
index d7785dc73cf..487553bb004 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAlias.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAlias.js
@@ -20,6 +20,7 @@ export function foo2() {
 //// [collisionExportsRequireAndAlias_file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function bar() {
     }
     exports.bar = bar;
@@ -27,6 +28,7 @@ define(["require", "exports"], function (require, exports) {
 //// [collisionExportsRequireAndAlias_file3333.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function bar2() {
     }
     exports.bar2 = bar2;
@@ -34,6 +36,7 @@ define(["require", "exports"], function (require, exports) {
 //// [collisionExportsRequireAndAlias_file2.js]
 define(["require", "exports", "collisionExportsRequireAndAlias_file1", "collisionExportsRequireAndAlias_file3333"], function (require, exports, require, exports) {
     "use strict";
+    exports.__esModule = true;
     function foo() {
         require.bar();
     }
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js
index 3083e9c586b..1a16f4a2d5f 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js
@@ -40,6 +40,7 @@ module m4 {
 //// [collisionExportsRequireAndAmbientClass_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var m2;
     (function (m2) {
     })(m2 || (m2 = {}));
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js
index 7f0f76381a3..0e717b01d3b 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js
@@ -63,6 +63,7 @@ module m4 {
 //// [collisionExportsRequireAndAmbientEnum_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var m2;
     (function (m2) {
     })(m2 || (m2 = {}));
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js
index 37b1a724c28..050799d4c2b 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js
@@ -16,6 +16,7 @@ module m2 {
 //// [collisionExportsRequireAndAmbientFunction.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var m2;
     (function (m2) {
         var a = 10;
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js
index 7f0a5c82d9a..2eb5ea74f92 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js
@@ -97,6 +97,7 @@ module m4 {
 //// [collisionExportsRequireAndAmbientModule_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function foo() {
         return null;
     }
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js
index 1e63364a396..8454248845a 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js
@@ -29,6 +29,7 @@ module m4 {
 //// [collisionExportsRequireAndAmbientVar_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var m2;
     (function (m2) {
         var a = 10;
diff --git a/tests/baselines/reference/collisionExportsRequireAndClass.js b/tests/baselines/reference/collisionExportsRequireAndClass.js
index 962df0344ed..0bc56b97cf1 100644
--- a/tests/baselines/reference/collisionExportsRequireAndClass.js
+++ b/tests/baselines/reference/collisionExportsRequireAndClass.js
@@ -39,6 +39,7 @@ module m4 {
 //// [collisionExportsRequireAndClass_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var require = (function () {
         function require() {
         }
diff --git a/tests/baselines/reference/collisionExportsRequireAndEnum.js b/tests/baselines/reference/collisionExportsRequireAndEnum.js
index 47d127e8a67..4bb6614ffe7 100644
--- a/tests/baselines/reference/collisionExportsRequireAndEnum.js
+++ b/tests/baselines/reference/collisionExportsRequireAndEnum.js
@@ -63,6 +63,7 @@ module m4 {
 //// [collisionExportsRequireAndEnum_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var require;
     (function (require) {
         require[require["_thisVal1"] = 0] = "_thisVal1";
diff --git a/tests/baselines/reference/collisionExportsRequireAndFunction.js b/tests/baselines/reference/collisionExportsRequireAndFunction.js
index 0fe5405cfb3..1da8cf29d66 100644
--- a/tests/baselines/reference/collisionExportsRequireAndFunction.js
+++ b/tests/baselines/reference/collisionExportsRequireAndFunction.js
@@ -25,6 +25,7 @@ module m2 {
 //// [collisionExportsRequireAndFunction.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function exports() {
         return 1;
     }
diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js
index 1842e415d88..9cb3c4e797e 100644
--- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js
+++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js
@@ -25,6 +25,7 @@ module m2 {
 //// [collisionExportsRequireAndInternalModuleAlias.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var m;
     (function (m) {
         var c = (function () {
diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.js b/tests/baselines/reference/collisionExportsRequireAndModule.js
index b29364aebe3..42820955004 100644
--- a/tests/baselines/reference/collisionExportsRequireAndModule.js
+++ b/tests/baselines/reference/collisionExportsRequireAndModule.js
@@ -94,6 +94,7 @@ module m4 {
 //// [collisionExportsRequireAndModule_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var require;
     (function (require) {
         var C = (function () {
diff --git a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js
index 6270cf65c02..b9552c16223 100644
--- a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js
+++ b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js
@@ -17,6 +17,7 @@ export function foo2(): exports.I {
 //// [collisionExportsRequireAndUninstantiatedModule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function foo() {
         return null;
     }
diff --git a/tests/baselines/reference/collisionExportsRequireAndVar.js b/tests/baselines/reference/collisionExportsRequireAndVar.js
index 0686b932921..9a20472ea68 100644
--- a/tests/baselines/reference/collisionExportsRequireAndVar.js
+++ b/tests/baselines/reference/collisionExportsRequireAndVar.js
@@ -29,6 +29,7 @@ module m4 {
 //// [collisionExportsRequireAndVar_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function foo() {
     }
     exports.foo = foo;
diff --git a/tests/baselines/reference/commentOnExportEnumDeclaration.js b/tests/baselines/reference/commentOnExportEnumDeclaration.js
index 61307b95b1c..353b70f4d3c 100644
--- a/tests/baselines/reference/commentOnExportEnumDeclaration.js
+++ b/tests/baselines/reference/commentOnExportEnumDeclaration.js
@@ -8,6 +8,7 @@ export enum Color {
 
 //// [commentOnExportEnumDeclaration.js]
 "use strict";
+exports.__esModule = true;
 /**
  * comment
  */
diff --git a/tests/baselines/reference/commentOnImportStatement1.js b/tests/baselines/reference/commentOnImportStatement1.js
index d9506e00724..a9d68d299ce 100644
--- a/tests/baselines/reference/commentOnImportStatement1.js
+++ b/tests/baselines/reference/commentOnImportStatement1.js
@@ -8,4 +8,5 @@ import foo = require('./foo');
 /* Copyright */
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/commentOnImportStatement2.js b/tests/baselines/reference/commentOnImportStatement2.js
index e7550582dfe..5156fcdd0d1 100644
--- a/tests/baselines/reference/commentOnImportStatement2.js
+++ b/tests/baselines/reference/commentOnImportStatement2.js
@@ -4,3 +4,4 @@ import foo = require('./foo');
 
 //// [commentOnImportStatement2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/commentOnImportStatement3.js b/tests/baselines/reference/commentOnImportStatement3.js
index f716fa32baa..c33088408e8 100644
--- a/tests/baselines/reference/commentOnImportStatement3.js
+++ b/tests/baselines/reference/commentOnImportStatement3.js
@@ -7,3 +7,4 @@ import foo = require('./foo');
 //// [commentOnImportStatement3.js]
 /* copyright */
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/commentsBeforeVariableStatement1.js b/tests/baselines/reference/commentsBeforeVariableStatement1.js
index f172c40cc0d..9a06a3e7c22 100644
--- a/tests/baselines/reference/commentsBeforeVariableStatement1.js
+++ b/tests/baselines/reference/commentsBeforeVariableStatement1.js
@@ -6,4 +6,5 @@ export var b: number;
 //// [commentsBeforeVariableStatement1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/commentsDottedModuleName.js b/tests/baselines/reference/commentsDottedModuleName.js
index b4819ce9ca3..1c1df104039 100644
--- a/tests/baselines/reference/commentsDottedModuleName.js
+++ b/tests/baselines/reference/commentsDottedModuleName.js
@@ -10,6 +10,7 @@ export module outerModule.InnerModule {
 //// [commentsDottedModuleName.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     /** this is multi declare module*/
     var outerModule;
     (function (outerModule) {
diff --git a/tests/baselines/reference/commentsExternalModules.js b/tests/baselines/reference/commentsExternalModules.js
index 1fe24c676a7..39002f90d91 100644
--- a/tests/baselines/reference/commentsExternalModules.js
+++ b/tests/baselines/reference/commentsExternalModules.js
@@ -64,6 +64,7 @@ var newVar2 = new extMod.m4.m2.c();
 //// [commentsExternalModules_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     /** Module comment*/
     var m1;
     (function (m1) {
@@ -128,6 +129,7 @@ define(["require", "exports"], function (require, exports) {
 //// [commentsExternalModules_1.js]
 define(["require", "exports", "commentsExternalModules_0"], function (require, exports, extMod) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     extMod.m1.fooExport();
     var newVar = new extMod.m1.m2.c();
     extMod.m4.fooExport();
diff --git a/tests/baselines/reference/commentsExternalModules2.js b/tests/baselines/reference/commentsExternalModules2.js
index 18f3564ec7f..d06c588425f 100644
--- a/tests/baselines/reference/commentsExternalModules2.js
+++ b/tests/baselines/reference/commentsExternalModules2.js
@@ -64,6 +64,7 @@ export var newVar2 = new extMod.m4.m2.c();
 //// [commentsExternalModules2_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     /** Module comment*/
     var m1;
     (function (m1) {
@@ -128,6 +129,7 @@ define(["require", "exports"], function (require, exports) {
 //// [commentsExternalModules_1.js]
 define(["require", "exports", "commentsExternalModules2_0"], function (require, exports, extMod) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     extMod.m1.fooExport();
     exports.newVar = new extMod.m1.m2.c();
     extMod.m4.fooExport();
diff --git a/tests/baselines/reference/commentsExternalModules3.js b/tests/baselines/reference/commentsExternalModules3.js
index 85fbcfe019f..81e90a159d5 100644
--- a/tests/baselines/reference/commentsExternalModules3.js
+++ b/tests/baselines/reference/commentsExternalModules3.js
@@ -63,6 +63,7 @@ export var newVar2 = new extMod.m4.m2.c();
 
 //// [commentsExternalModules2_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /** Module comment*/
 var m1;
 (function (m1) {
@@ -125,6 +126,7 @@ m4.fooExport();
 var myvar2 = new m4.m2.c();
 //// [commentsExternalModules_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /**This is on import declaration*/
 var extMod = require("./commentsExternalModules2_0"); // trailing comment 1
 extMod.m1.fooExport();
diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.js b/tests/baselines/reference/commentsMultiModuleMultiFile.js
index 67794577226..25dd8a90780 100644
--- a/tests/baselines/reference/commentsMultiModuleMultiFile.js
+++ b/tests/baselines/reference/commentsMultiModuleMultiFile.js
@@ -39,6 +39,7 @@ new multiM.d();
 //// [commentsMultiModuleMultiFile_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     /** this is multi declare module*/
     var multiM;
     (function (multiM) {
@@ -73,6 +74,7 @@ define(["require", "exports"], function (require, exports) {
 //// [commentsMultiModuleMultiFile_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     /** this is multi module 3 comment*/
     var multiM;
     (function (multiM) {
diff --git a/tests/baselines/reference/commentsOnRequireStatement.js b/tests/baselines/reference/commentsOnRequireStatement.js
index 9cfd75c0211..eee05c80493 100644
--- a/tests/baselines/reference/commentsOnRequireStatement.js
+++ b/tests/baselines/reference/commentsOnRequireStatement.js
@@ -19,12 +19,15 @@ export {subject1} from './1';
 
 //// [0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.subject = 10;
 //// [1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.subject1 = 10;
 //// [2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /* blah0 */
 // blah 
 // blah 
diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
index 0cbb7470dfc..cd62c1583bc 100644
--- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
+++ b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
@@ -15,6 +15,7 @@ if(foo.C1.s1){
 
 //// [foo_0.js]
 "use strict";
+exports.__esModule = true;
 var C1 = (function () {
     function C1() {
         this.m1 = 42;
@@ -25,6 +26,7 @@ C1.s1 = true;
 exports.C1 = C1;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0");
 if (foo.C1.s1) {
     // Should cause runtime import
diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
index eb77d1baa3c..5ac0e3fcc64 100644
--- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
+++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
@@ -33,6 +33,7 @@ var e: number = <foo.E1>0;
 
 //// [foo_0.js]
 "use strict";
+exports.__esModule = true;
 var C1 = (function () {
     function C1() {
         this.m1 = 42;
@@ -49,6 +50,7 @@ var E1;
 })(E1 = exports.E1 || (exports.E1 = {}));
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var i;
 var x = {};
 var y = false;
diff --git a/tests/baselines/reference/commonSourceDir5.js b/tests/baselines/reference/commonSourceDir5.js
index 1e404b26e13..ef6e97f4d5e 100644
--- a/tests/baselines/reference/commonSourceDir5.js
+++ b/tests/baselines/reference/commonSourceDir5.js
@@ -19,15 +19,18 @@ export var y = x * i;
 //// [concat.js]
 define("B:/baz", ["require", "exports", "A:/bar", "A:/foo"], function (require, exports, bar_1, foo_1) {
     "use strict";
+    exports.__esModule = true;
     exports.pi = Math.PI;
     exports.y = bar_1.x * foo_1.i;
 });
 define("A:/foo", ["require", "exports", "B:/baz"], function (require, exports, baz_1) {
     "use strict";
+    exports.__esModule = true;
     exports.i = Math.sqrt(-1);
     exports.z = baz_1.pi * baz_1.pi;
 });
 define("A:/bar", ["require", "exports", "A:/foo"], function (require, exports, foo_2) {
     "use strict";
+    exports.__esModule = true;
     exports.x = foo_2.z + foo_2.z;
 });
diff --git a/tests/baselines/reference/commonSourceDir6.js b/tests/baselines/reference/commonSourceDir6.js
index 88f5828a500..071953afcdc 100644
--- a/tests/baselines/reference/commonSourceDir6.js
+++ b/tests/baselines/reference/commonSourceDir6.js
@@ -18,15 +18,18 @@ export var y = x * i;
 //// [concat.js]
 define("baz", ["require", "exports", "a/bar", "a/foo"], function (require, exports, bar_1, foo_1) {
     "use strict";
+    exports.__esModule = true;
     exports.pi = Math.PI;
     exports.y = bar_1.x * foo_1.i;
 });
 define("a/foo", ["require", "exports", "baz"], function (require, exports, baz_1) {
     "use strict";
+    exports.__esModule = true;
     exports.i = Math.sqrt(-1);
     exports.z = baz_1.pi * baz_1.pi;
 });
 define("a/bar", ["require", "exports", "a/foo"], function (require, exports, foo_2) {
     "use strict";
+    exports.__esModule = true;
     exports.x = foo_2.z + foo_2.z;
 });
diff --git a/tests/baselines/reference/commonSourceDirectory.js b/tests/baselines/reference/commonSourceDirectory.js
index 1a863dbecbd..5569ae6d52b 100644
--- a/tests/baselines/reference/commonSourceDirectory.js
+++ b/tests/baselines/reference/commonSourceDirectory.js
@@ -19,6 +19,7 @@ x + y;
 
 //// [/app/bin/index.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="../types/bar.d.ts"/>
 var foo_1 = require("foo");
 var bar_1 = require("bar");
diff --git a/tests/baselines/reference/commonSourceDirectory.js.map b/tests/baselines/reference/commonSourceDirectory.js.map
index 8e3f925eee9..fd88719859b 100644
--- a/tests/baselines/reference/commonSourceDirectory.js.map
+++ b/tests/baselines/reference/commonSourceDirectory.js.map
@@ -1,2 +1,2 @@
 //// [/app/bin/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";AAAA,yCAAyC;AACzC,2BAAwB;AACxB,2BAAwB;AACxB,OAAC,GAAG,OAAC,CAAC"}
\ No newline at end of file
+{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";;AAAA,yCAAyC;AACzC,2BAAwB;AACxB,2BAAwB;AACxB,OAAC,GAAG,OAAC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/commonSourceDirectory.sourcemap.txt b/tests/baselines/reference/commonSourceDirectory.sourcemap.txt
index ac198eaf02c..c880d2d0059 100644
--- a/tests/baselines/reference/commonSourceDirectory.sourcemap.txt
+++ b/tests/baselines/reference/commonSourceDirectory.sourcemap.txt
@@ -9,13 +9,14 @@ emittedFile:/app/bin/index.js
 sourceFile:index.ts
 -------------------------------------------------------------------
 >>>"use strict";
+>>>exports.__esModule = true;
 >>>/// <reference path="../types/bar.d.ts"/>
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
 2 >/// <reference path="../types/bar.d.ts"/>
-1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(2, 42) Source(1, 42) + SourceIndex(0)
+1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(3, 42) Source(1, 42) + SourceIndex(0)
 ---
 >>>var foo_1 = require("foo");
 1 >
@@ -24,8 +25,8 @@ sourceFile:index.ts
 1 >
   >
 2 >import { x } from "foo";
-1 >Emitted(3, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(3, 28) Source(2, 25) + SourceIndex(0)
+1 >Emitted(4, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(4, 28) Source(2, 25) + SourceIndex(0)
 ---
 >>>var bar_1 = require("bar");
 1->
@@ -33,8 +34,8 @@ sourceFile:index.ts
 1->
   >
 2 >import { y } from "bar";
-1->Emitted(4, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(4, 28) Source(3, 25) + SourceIndex(0)
+1->Emitted(5, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(5, 28) Source(3, 25) + SourceIndex(0)
 ---
 >>>foo_1.x + bar_1.y;
 1 >
@@ -49,10 +50,10 @@ sourceFile:index.ts
 3 >        + 
 4 >          y
 5 >                 ;
-1 >Emitted(5, 1) Source(4, 1) + SourceIndex(0)
-2 >Emitted(5, 8) Source(4, 2) + SourceIndex(0)
-3 >Emitted(5, 11) Source(4, 5) + SourceIndex(0)
-4 >Emitted(5, 18) Source(4, 6) + SourceIndex(0)
-5 >Emitted(5, 19) Source(4, 7) + SourceIndex(0)
+1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 8) Source(4, 2) + SourceIndex(0)
+3 >Emitted(6, 11) Source(4, 5) + SourceIndex(0)
+4 >Emitted(6, 18) Source(4, 6) + SourceIndex(0)
+5 >Emitted(6, 19) Source(4, 7) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=/app/myMapRoot/index.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.js b/tests/baselines/reference/commonSourceDirectory_dts.js
index 8aa0bd04e11..249edeceddd 100644
--- a/tests/baselines/reference/commonSourceDirectory_dts.js
+++ b/tests/baselines/reference/commonSourceDirectory_dts.js
@@ -12,6 +12,7 @@ export const x = y;
 
 //// [/app/bin/index.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="../lib/bar.d.ts" />
 exports.x = y;
 //# sourceMappingURL=/app/myMapRoot/index.js.map
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.js.map b/tests/baselines/reference/commonSourceDirectory_dts.js.map
index b33518dd04c..552da577884 100644
--- a/tests/baselines/reference/commonSourceDirectory_dts.js.map
+++ b/tests/baselines/reference/commonSourceDirectory_dts.js.map
@@ -1,2 +1,2 @@
 //// [/app/bin/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";AAAA,wCAAwC;AAC3B,QAAA,CAAC,GAAG,CAAC,CAAC"}
\ No newline at end of file
+{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";;AAAA,wCAAwC;AAC3B,QAAA,CAAC,GAAG,CAAC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt b/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
index 90603ae3652..925a3d30ed4 100644
--- a/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
+++ b/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
@@ -9,13 +9,14 @@ emittedFile:/app/bin/index.js
 sourceFile:index.ts
 -------------------------------------------------------------------
 >>>"use strict";
+>>>exports.__esModule = true;
 >>>/// <reference path="../lib/bar.d.ts" />
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
 2 >/// <reference path="../lib/bar.d.ts" />
-1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(2, 41) Source(1, 41) + SourceIndex(0)
+1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(3, 41) Source(1, 41) + SourceIndex(0)
 ---
 >>>exports.x = y;
 1 >
@@ -32,11 +33,11 @@ sourceFile:index.ts
 4 >          = 
 5 >            y
 6 >             ;
-1 >Emitted(3, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0)
-3 >Emitted(3, 10) Source(2, 15) + SourceIndex(0)
-4 >Emitted(3, 13) Source(2, 18) + SourceIndex(0)
-5 >Emitted(3, 14) Source(2, 19) + SourceIndex(0)
-6 >Emitted(3, 15) Source(2, 20) + SourceIndex(0)
+1 >Emitted(4, 1) Source(2, 14) + SourceIndex(0)
+2 >Emitted(4, 9) Source(2, 14) + SourceIndex(0)
+3 >Emitted(4, 10) Source(2, 15) + SourceIndex(0)
+4 >Emitted(4, 13) Source(2, 18) + SourceIndex(0)
+5 >Emitted(4, 14) Source(2, 19) + SourceIndex(0)
+6 >Emitted(4, 15) Source(2, 20) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=/app/myMapRoot/index.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/commonjsSafeImport.js b/tests/baselines/reference/commonjsSafeImport.js
index 93439a418f6..e7a251e9cee 100644
--- a/tests/baselines/reference/commonjsSafeImport.js
+++ b/tests/baselines/reference/commonjsSafeImport.js
@@ -12,10 +12,12 @@ Foo();
 
 //// [10_lib.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function Foo() { }
 exports.Foo = Foo;
 //// [main.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var _10_lib_1 = require("./10_lib");
 _10_lib_1.Foo();
 
diff --git a/tests/baselines/reference/complexNarrowingWithAny.js b/tests/baselines/reference/complexNarrowingWithAny.js
index 0a137f5d793..4408d64acbf 100644
--- a/tests/baselines/reference/complexNarrowingWithAny.js
+++ b/tests/baselines/reference/complexNarrowingWithAny.js
@@ -562,6 +562,7 @@ export function viewFactory_AppComponent0(viewUtils:any,parentInjector:any,decla
 //// [complexNarrowingWithAny.js]
 // Repro from #10869
 "use strict";
+exports.__esModule = true;
 /**
  * This file is generated by the Angular 2 template compiler.
  * Do not edit.
diff --git a/tests/baselines/reference/constDeclarations-access5.js b/tests/baselines/reference/constDeclarations-access5.js
index 1da0cf40fcd..f02b9611541 100644
--- a/tests/baselines/reference/constDeclarations-access5.js
+++ b/tests/baselines/reference/constDeclarations-access5.js
@@ -51,11 +51,13 @@ m.x.toString();
 //// [constDeclarations_access_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = 0;
 });
 //// [constDeclarations_access_2.js]
 define(["require", "exports", "constDeclarations_access_1"], function (require, exports, m) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     // Errors
     m.x = 1;
     m.x += 2;
diff --git a/tests/baselines/reference/constEnumExternalModule.js b/tests/baselines/reference/constEnumExternalModule.js
index e0a3f46ee89..8ea5625ac07 100644
--- a/tests/baselines/reference/constEnumExternalModule.js
+++ b/tests/baselines/reference/constEnumExternalModule.js
@@ -13,9 +13,11 @@ var v = A.V;
 //// [m1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [m2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var v = 100 /* V */;
 });
diff --git a/tests/baselines/reference/contextuallyTypedIife.types b/tests/baselines/reference/contextuallyTypedIife.types
index 15038e7dd26..676755fb341 100644
--- a/tests/baselines/reference/contextuallyTypedIife.types
+++ b/tests/baselines/reference/contextuallyTypedIife.types
@@ -253,8 +253,8 @@ let eleven = (o => o.a(11))({ a: function(n) { return n; } });
 // missing arguments
 (function(x, undefined) { return x; })(42);
 >(function(x, undefined) { return x; })(42) : number
->(function(x, undefined) { return x; }) : (x: number, undefined: any) => number
->function(x, undefined) { return x; } : (x: number, undefined: any) => number
+>(function(x, undefined) { return x; }) : (x: number, undefined?: any) => number
+>function(x, undefined) { return x; } : (x: number, undefined?: any) => number
 >x : number
 >undefined : any
 >x : number
@@ -262,8 +262,8 @@ let eleven = (o => o.a(11))({ a: function(n) { return n; } });
 
 ((x, y, z) => 42)();
 >((x, y, z) => 42)() : number
->((x, y, z) => 42) : (x: any, y: any, z: any) => number
->(x, y, z) => 42 : (x: any, y: any, z: any) => number
+>((x, y, z) => 42) : (x?: any, y?: any, z?: any) => number
+>(x, y, z) => 42 : (x?: any, y?: any, z?: any) => number
 >x : any
 >y : any
 >z : any
diff --git a/tests/baselines/reference/controlFlowBinaryOrExpression.js b/tests/baselines/reference/controlFlowBinaryOrExpression.js
index fb48c5a23e0..752479cf4e9 100644
--- a/tests/baselines/reference/controlFlowBinaryOrExpression.js
+++ b/tests/baselines/reference/controlFlowBinaryOrExpression.js
@@ -38,6 +38,7 @@ if (isNodeList(sourceObj) || isHTMLCollection(sourceObj)) {
 
 //// [controlFlowBinaryOrExpression.js]
 "use strict";
+exports.__esModule = true;
 var x;
 var cond;
 (x = "") || (x = 0);
diff --git a/tests/baselines/reference/controlFlowPropertyDeclarations.js b/tests/baselines/reference/controlFlowPropertyDeclarations.js
index 748f63ea858..27fce9a9a12 100644
--- a/tests/baselines/reference/controlFlowPropertyDeclarations.js
+++ b/tests/baselines/reference/controlFlowPropertyDeclarations.js
@@ -151,6 +151,7 @@ export class StyleParser {
 //// [controlFlowPropertyDeclarations.js]
 // Repro from ##8913
 "use strict";
+exports.__esModule = true;
 var HTMLDOMPropertyConfig = require('react/lib/HTMLDOMPropertyConfig');
 // Populate property map with ReactJS's attribute and property mappings
 // TODO handle/use .Properties value eg: MUST_USE_PROPERTY is not HTML attr
diff --git a/tests/baselines/reference/controlFlowSelfReferentialLoop.js b/tests/baselines/reference/controlFlowSelfReferentialLoop.js
index f7dbc0a2324..0a7eff198ff 100644
--- a/tests/baselines/reference/controlFlowSelfReferentialLoop.js
+++ b/tests/baselines/reference/controlFlowSelfReferentialLoop.js
@@ -104,6 +104,7 @@ export default md5;
 //// [controlFlowSelfReferentialLoop.js]
 // Repro from #12319
 "use strict";
+exports.__esModule = true;
 function md5(string) {
     function FF(a, b, c, d, x, s, ac) {
         return 0;
@@ -203,5 +204,4 @@ function md5(string) {
         b = II(b, c, d, a, x[k + 9], S44, 0xEB86D391);
     }
 }
-exports.__esModule = true;
 exports["default"] = md5;
diff --git a/tests/baselines/reference/copyrightWithNewLine1.js b/tests/baselines/reference/copyrightWithNewLine1.js
index 006c29597b9..f7c1ac602dd 100644
--- a/tests/baselines/reference/copyrightWithNewLine1.js
+++ b/tests/baselines/reference/copyrightWithNewLine1.js
@@ -15,6 +15,7 @@ greeter.start();
 ****************************/
 define(["require", "exports", "./greeter"], function (require, exports, model) {
     "use strict";
+    exports.__esModule = true;
     var el = document.getElementById('content');
     var greeter = new model.Greeter(el);
     /** things */
diff --git a/tests/baselines/reference/copyrightWithoutNewLine1.js b/tests/baselines/reference/copyrightWithoutNewLine1.js
index 15e3c9f79be..0f479c3db7f 100644
--- a/tests/baselines/reference/copyrightWithoutNewLine1.js
+++ b/tests/baselines/reference/copyrightWithoutNewLine1.js
@@ -11,6 +11,7 @@ greeter.start();
 //// [copyrightWithoutNewLine1.js]
 define(["require", "exports", "./greeter"], function (require, exports, model) {
     "use strict";
+    exports.__esModule = true;
     var el = document.getElementById('content');
     var greeter = new model.Greeter(el);
     /** things */
diff --git a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
index 549d7948fcb..d555d3f3bca 100644
--- a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
+++ b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
@@ -15,6 +15,7 @@ export var compileServer = task<number, number, any>(<P0, P1, P2>() => {
 //// [crashIntypeCheckInvocationExpression.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var nake;
     function doCompile(fileset, moduleType) {
         return undefined;
diff --git a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js
index 00f4dbdc377..a115e7ab0a3 100644
--- a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js
+++ b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js
@@ -11,6 +11,7 @@ export class BuildWorkspaceService {
 //// [crashIntypeCheckObjectCreationExpression.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var BuildWorkspaceService = (function () {
         function BuildWorkspaceService() {
         }
diff --git a/tests/baselines/reference/declFileAccessors.js b/tests/baselines/reference/declFileAccessors.js
index 2bd51bfbfb2..64a99bb8438 100644
--- a/tests/baselines/reference/declFileAccessors.js
+++ b/tests/baselines/reference/declFileAccessors.js
@@ -103,6 +103,7 @@ class c2 {
 
 //// [declFileAccessors_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /** This is comment for c1*/
 var c1 = (function () {
     function c1() {
diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
index e5219508329..56b8992811b 100644
--- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
+++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
@@ -10,6 +10,7 @@ import foo = require("./declFileAliasUseBeforeDeclaration_foo");
 
 //// [declFileAliasUseBeforeDeclaration_foo.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
@@ -18,6 +19,7 @@ var Foo = (function () {
 exports.Foo = Foo;
 //// [declFileAliasUseBeforeDeclaration_test.js]
 "use strict";
+exports.__esModule = true;
 function bar(a) { }
 exports.bar = bar;
 
diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js
index f98e2f6aafb..6d626e2963d 100644
--- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js
+++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js
@@ -21,6 +21,7 @@ export var x: SubModule.m.m3.c;
 //// [declFileAmbientExternalModuleWithSingleExportedModule_0.js]
 //// [declFileAmbientExternalModuleWithSingleExportedModule_1.js]
 "use strict";
+exports.__esModule = true;
 
 
 //// [declFileAmbientExternalModuleWithSingleExportedModule_0.d.ts]
diff --git a/tests/baselines/reference/declFileCallSignatures.js b/tests/baselines/reference/declFileCallSignatures.js
index 10b87d4e777..8f79ae6341e 100644
--- a/tests/baselines/reference/declFileCallSignatures.js
+++ b/tests/baselines/reference/declFileCallSignatures.js
@@ -67,6 +67,7 @@ interface IGlobalCallSignatureWithOwnTypeParametes {
 
 //// [declFileCallSignatures_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileCallSignatures_1.js]
 
 
diff --git a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js
index 844559232e4..ee1964415c9 100644
--- a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js
+++ b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js
@@ -8,6 +8,7 @@ export class Enhancement {
 
 //// [declFileClassWithStaticMethodReturningConstructor.js]
 "use strict";
+exports.__esModule = true;
 var Enhancement = (function () {
     function Enhancement() {
     }
diff --git a/tests/baselines/reference/declFileConstructSignatures.js b/tests/baselines/reference/declFileConstructSignatures.js
index 993c8ea4637..309f7133873 100644
--- a/tests/baselines/reference/declFileConstructSignatures.js
+++ b/tests/baselines/reference/declFileConstructSignatures.js
@@ -67,6 +67,7 @@ interface IGlobalConstructSignatureWithOwnTypeParametes {
 
 //// [declFileConstructSignatures_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileConstructSignatures_1.js]
 
 
diff --git a/tests/baselines/reference/declFileConstructors.js b/tests/baselines/reference/declFileConstructors.js
index 44e816712fb..214620193b7 100644
--- a/tests/baselines/reference/declFileConstructors.js
+++ b/tests/baselines/reference/declFileConstructors.js
@@ -99,6 +99,7 @@ class GlobalConstructorWithParameterInitializer {
 
 //// [declFileConstructors_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var SimpleConstructor = (function () {
     /** This comment should appear for foo*/
     function SimpleConstructor() {
diff --git a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
index c54c3c7e731..1caa9207193 100644
--- a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
+++ b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
@@ -15,10 +15,12 @@ x.a;
 //// [declFileExportAssignmentOfGenericInterface_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [declFileExportAssignmentOfGenericInterface_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.x.a;
 });
 
diff --git a/tests/baselines/reference/declFileExportImportChain.js b/tests/baselines/reference/declFileExportImportChain.js
index 99affd5eb4d..2af2103b62a 100644
--- a/tests/baselines/reference/declFileExportImportChain.js
+++ b/tests/baselines/reference/declFileExportImportChain.js
@@ -44,6 +44,7 @@ define(["require", "exports"], function (require, exports) {
 //// [declFileExportImportChain_b.js]
 define(["require", "exports", "declFileExportImportChain_a"], function (require, exports, a) {
     "use strict";
+    exports.__esModule = true;
     exports.a = a;
 });
 //// [declFileExportImportChain_b1.js]
@@ -54,11 +55,13 @@ define(["require", "exports", "declFileExportImportChain_b"], function (require,
 //// [declFileExportImportChain_c.js]
 define(["require", "exports", "declFileExportImportChain_b1"], function (require, exports, b1) {
     "use strict";
+    exports.__esModule = true;
     exports.b1 = b1;
 });
 //// [declFileExportImportChain_d.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/declFileExportImportChain2.js b/tests/baselines/reference/declFileExportImportChain2.js
index 27c61e9e43d..70478fdf430 100644
--- a/tests/baselines/reference/declFileExportImportChain2.js
+++ b/tests/baselines/reference/declFileExportImportChain2.js
@@ -46,11 +46,13 @@ define(["require", "exports", "declFileExportImportChain2_a"], function (require
 //// [declFileExportImportChain2_c.js]
 define(["require", "exports", "declFileExportImportChain2_b"], function (require, exports, b) {
     "use strict";
+    exports.__esModule = true;
     exports.b = b;
 });
 //// [declFileExportImportChain2_d.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/declFileForExportedImport.js b/tests/baselines/reference/declFileForExportedImport.js
index 6870e16f941..809f01878d4 100644
--- a/tests/baselines/reference/declFileForExportedImport.js
+++ b/tests/baselines/reference/declFileForExportedImport.js
@@ -13,8 +13,10 @@ var z = b.x;
 
 //// [declFileForExportedImport_0.js]
 "use strict";
+exports.__esModule = true;
 //// [declFileForExportedImport_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='declFileForExportedImport_0.ts'/>
 exports.a = require("./declFileForExportedImport_0");
 var y = exports.a.x;
diff --git a/tests/baselines/reference/declFileFunctions.js b/tests/baselines/reference/declFileFunctions.js
index e4f674d43c0..f62b7772b41 100644
--- a/tests/baselines/reference/declFileFunctions.js
+++ b/tests/baselines/reference/declFileFunctions.js
@@ -79,6 +79,7 @@ function globalfooWithOverloads(a: any): any {
 
 //// [declFileFunctions_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /** This comment should appear for foo*/
 function foo() {
 }
diff --git a/tests/baselines/reference/declFileGenericType.js b/tests/baselines/reference/declFileGenericType.js
index c17463a6d15..f56abaf6b97 100644
--- a/tests/baselines/reference/declFileGenericType.js
+++ b/tests/baselines/reference/declFileGenericType.js
@@ -51,6 +51,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var C;
 (function (C) {
     var A = (function () {
diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
index a733e1332a7..110539774df 100644
--- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
+++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
@@ -32,6 +32,7 @@ var m2;
 module.exports = m2;
 //// [declFileImportModuleWithExportAssignment_1.js]
 "use strict";
+exports.__esModule = true;
 /**This is on import declaration*/
 var a1 = require("./declFileImportModuleWithExportAssignment_0");
 exports.a = a1;
diff --git a/tests/baselines/reference/declFileIndexSignatures.js b/tests/baselines/reference/declFileIndexSignatures.js
index 4d3f3847ca1..b7b2698b11b 100644
--- a/tests/baselines/reference/declFileIndexSignatures.js
+++ b/tests/baselines/reference/declFileIndexSignatures.js
@@ -37,6 +37,7 @@ interface IGlobalIndexSignatureWithTypeParameter<T> {
 
 //// [declFileIndexSignatures_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileIndexSignatures_1.js]
 
 
diff --git a/tests/baselines/reference/declFileMethods.js b/tests/baselines/reference/declFileMethods.js
index 4a317a4e720..61e2bfab700 100644
--- a/tests/baselines/reference/declFileMethods.js
+++ b/tests/baselines/reference/declFileMethods.js
@@ -192,6 +192,7 @@ interface I2 {
 
 //// [declFileMethods_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var c1 = (function () {
     function c1() {
     }
diff --git a/tests/baselines/reference/declarationEmitClassMemberNameConflict.js b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js
index 23c83276201..698622a8650 100644
--- a/tests/baselines/reference/declarationEmitClassMemberNameConflict.js
+++ b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js
@@ -38,6 +38,7 @@ export class C4 {
 
 //// [declarationEmitClassMemberNameConflict.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var C1 = (function () {
     function C1() {
     }
diff --git a/tests/baselines/reference/declarationEmitExportAssignment.js b/tests/baselines/reference/declarationEmitExportAssignment.js
index 8c97ef8eb07..223376ef8ff 100644
--- a/tests/baselines/reference/declarationEmitExportAssignment.js
+++ b/tests/baselines/reference/declarationEmitExportAssignment.js
@@ -12,6 +12,7 @@ export = foo;
 
 //// [utils.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function foo() { }
 exports.foo = foo;
 function bar() { }
diff --git a/tests/baselines/reference/declarationEmitExportDeclaration.js b/tests/baselines/reference/declarationEmitExportDeclaration.js
index dfbed90742d..57c39b95e64 100644
--- a/tests/baselines/reference/declarationEmitExportDeclaration.js
+++ b/tests/baselines/reference/declarationEmitExportDeclaration.js
@@ -15,12 +15,14 @@ export {bar};
 
 //// [utils.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function foo() { }
 exports.foo = foo;
 function bar() { }
 exports.bar = bar;
 //// [index.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var utils_1 = require("./utils");
 exports.bar = utils_1.bar;
 utils_1.foo();
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends3.js b/tests/baselines/reference/declarationEmitExpressionInExtends3.js
index 960a7af6780..a02eac46dba 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends3.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends3.js
@@ -55,6 +55,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var ExportedClass = (function () {
     function ExportedClass() {
     }
diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicates01.js b/tests/baselines/reference/declarationEmitIdentifierPredicates01.js
index 73141eb9af9..08208c2435d 100644
--- a/tests/baselines/reference/declarationEmitIdentifierPredicates01.js
+++ b/tests/baselines/reference/declarationEmitIdentifierPredicates01.js
@@ -6,6 +6,7 @@ export function f(x: any): x is number {
 
 //// [declarationEmitIdentifierPredicates01.js]
 "use strict";
+exports.__esModule = true;
 function f(x) {
     return typeof x === "number";
 }
diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
index 234542d8d99..5829e9b4427 100644
--- a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
+++ b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
@@ -10,6 +10,7 @@ export function f(x: any): x is I {
 
 //// [declarationEmitIdentifierPredicatesWithPrivateName01.js]
 "use strict";
+exports.__esModule = true;
 function f(x) {
     return typeof x.a === "number";
 }
diff --git a/tests/baselines/reference/declarationEmitIndexTypeNotFound.js b/tests/baselines/reference/declarationEmitIndexTypeNotFound.js
index 22100e5cb72..b1fac7c3cc2 100644
--- a/tests/baselines/reference/declarationEmitIndexTypeNotFound.js
+++ b/tests/baselines/reference/declarationEmitIndexTypeNotFound.js
@@ -7,3 +7,4 @@ export interface Test {
 
 //// [declarationEmitIndexTypeNotFound.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js
index 05ce74e3bad..4e41c8558c6 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js
@@ -14,11 +14,13 @@ export { v }
 
 //// [0.js]
 "use strict";
+exports.__esModule = true;
 {
     var obj = true;
 }
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 var v = "str" || true;
 exports.v = v;
 
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js
index 307a9b82d67..601026ab6f3 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js
@@ -17,11 +17,13 @@ export { v, bar }
 
 //// [0.js]
 "use strict";
+exports.__esModule = true;
 {
     var obj = true;
 }
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 var v = "str" || true;
 exports.v = v;
 function bar() {
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js
index c99e5c429dd..30df7e38b01 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js
@@ -14,13 +14,14 @@ export default x;
 
 //// [0.js]
 "use strict";
+exports.__esModule = true;
 {
     var obj = true;
 }
 //// [1.js]
 "use strict";
-var x = "hi" || 5;
 exports.__esModule = true;
+var x = "hi" || 5;
 exports["default"] = x;
 
 
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js
index 79d28d3d181..24f2a52c5d8 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js
@@ -13,9 +13,11 @@ export { v }
 
 //// [0.js]
 "use strict";
+exports.__esModule = true;
 var obj = true;
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 //let v2: Z.Data;
 var v = "str" || true;
 exports.v = v;
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js
index 924f73d0ed9..5b14a3738e4 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js
@@ -14,11 +14,13 @@ export { v }
 
 //// [0.js]
 "use strict";
+exports.__esModule = true;
 {
     var obj = true;
 }
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 var v = "str" || true;
 exports.v = v;
 
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js
index 2fba057fc91..9a9b1247e24 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js
@@ -11,9 +11,11 @@ export { v }
 
 //// [0.js]
 "use strict";
+exports.__esModule = true;
 var obj = true;
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 var v = "str" || true;
 exports.v = v;
 
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias9.js b/tests/baselines/reference/declarationEmitInferedTypeAlias9.js
index 667acdff49c..cddb4630740 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias9.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias9.js
@@ -9,6 +9,7 @@ export function returnSomeGlobalValue() {
 
 //// [declarationEmitInferedTypeAlias9.js]
 "use strict";
+exports.__esModule = true;
 var x;
 function returnSomeGlobalValue() {
     return x;
diff --git a/tests/baselines/reference/declarationEmitInvalidExport.js b/tests/baselines/reference/declarationEmitInvalidExport.js
index 18ed73b0a5a..d4280cd00c6 100644
--- a/tests/baselines/reference/declarationEmitInvalidExport.js
+++ b/tests/baselines/reference/declarationEmitInvalidExport.js
@@ -9,6 +9,7 @@ export type MyClass = typeof myClass;
 
 //// [declarationEmitInvalidExport.js]
 "use strict";
+exports.__esModule = true;
 if (false) {
     export var myClass = 0;
 }
diff --git a/tests/baselines/reference/declarationEmitNameConflicts.js b/tests/baselines/reference/declarationEmitNameConflicts.js
index 6d848b42869..5440f3d3584 100644
--- a/tests/baselines/reference/declarationEmitNameConflicts.js
+++ b/tests/baselines/reference/declarationEmitNameConflicts.js
@@ -63,6 +63,7 @@ var f;
 module.exports = f;
 //// [declarationEmit_nameConflicts_0.js]
 "use strict";
+exports.__esModule = true;
 var im = require("./declarationEmit_nameConflicts_1");
 var M;
 (function (M) {
diff --git a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js
index b49e3ad314d..4b4aca4f4b2 100644
--- a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js
+++ b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js
@@ -8,6 +8,7 @@ export module M {
 
 //// [declarationEmitNameConflictsWithAlias.js]
 "use strict";
+exports.__esModule = true;
 var M;
 (function (M) {
 })(M = exports.M || (exports.M = {}));
diff --git a/tests/baselines/reference/declarationEmitPromise.js b/tests/baselines/reference/declarationEmitPromise.js
index 9e820a789c9..7444a956a2a 100644
--- a/tests/baselines/reference/declarationEmitPromise.js
+++ b/tests/baselines/reference/declarationEmitPromise.js
@@ -32,6 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 class bluebird {
 }
 exports.bluebird = bluebird;
diff --git a/tests/baselines/reference/declarationEmitThisPredicates01.js b/tests/baselines/reference/declarationEmitThisPredicates01.js
index 04c49422c5c..e95a7db05ed 100644
--- a/tests/baselines/reference/declarationEmitThisPredicates01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicates01.js
@@ -21,6 +21,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
diff --git a/tests/baselines/reference/declarationEmitThisPredicates02.js b/tests/baselines/reference/declarationEmitThisPredicates02.js
index e938a615b6d..0e7c99df1f3 100644
--- a/tests/baselines/reference/declarationEmitThisPredicates02.js
+++ b/tests/baselines/reference/declarationEmitThisPredicates02.js
@@ -15,6 +15,7 @@ export const obj = {
 
 //// [declarationEmitThisPredicates02.js]
 "use strict";
+exports.__esModule = true;
 exports.obj = {
     m: function () {
         var dis = this;
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
index 79156f795ea..a0f611d2d29 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
@@ -21,6 +21,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
index df0d5b7903a..7ec7ba5dec8 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
@@ -15,6 +15,7 @@ export const obj = {
 
 //// [declarationEmitThisPredicatesWithPrivateName02.js]
 "use strict";
+exports.__esModule = true;
 exports.obj = {
     m: function () {
         var dis = this;
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
index 6079de35964..84b55a9792f 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
@@ -6,6 +6,7 @@ export const y = (x: Foo<string>) => 1
 
 //// [declarationEmitTypeAliasWithTypeParameters1.js]
 "use strict";
+exports.__esModule = true;
 exports.y = function (x) { return 1; };
 
 
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
index d5bf31bd755..1bb6beac9e1 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
@@ -7,6 +7,7 @@ export const y = (x: Baa<number>) => 1
 
 //// [declarationEmitTypeAliasWithTypeParameters2.js]
 "use strict";
+exports.__esModule = true;
 exports.y = function (x) { return 1; };
 
 
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
index 2f4fff7d72c..28997a75496 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
@@ -12,6 +12,7 @@ function foo() {
 
 //// [declarationEmitTypeAliasWithTypeParameters5.js]
 "use strict";
+exports.__esModule = true;
 function foo() {
     return {};
 }
diff --git a/tests/baselines/reference/declarationEmitUnknownImport.js b/tests/baselines/reference/declarationEmitUnknownImport.js
index bccf2337e08..1ac1e934578 100644
--- a/tests/baselines/reference/declarationEmitUnknownImport.js
+++ b/tests/baselines/reference/declarationEmitUnknownImport.js
@@ -5,5 +5,6 @@ export {Foo}
 
 //// [declarationEmitUnknownImport.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Foo = SomeNonExistingName;
 exports.Foo = Foo;
diff --git a/tests/baselines/reference/declarationEmitUnknownImport2.js b/tests/baselines/reference/declarationEmitUnknownImport2.js
index 08afa34f8c8..1f291312913 100644
--- a/tests/baselines/reference/declarationEmitUnknownImport2.js
+++ b/tests/baselines/reference/declarationEmitUnknownImport2.js
@@ -5,7 +5,7 @@ export default Foo
 
 //// [declarationEmitUnknownImport2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Foo = From;
 './Foo'; // Syntax error
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Foo;
diff --git a/tests/baselines/reference/declarationMerging2.js b/tests/baselines/reference/declarationMerging2.js
index 3157445fa36..64a6cf2d849 100644
--- a/tests/baselines/reference/declarationMerging2.js
+++ b/tests/baselines/reference/declarationMerging2.js
@@ -18,6 +18,7 @@ declare module "./a" {
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
@@ -29,4 +30,5 @@ define(["require", "exports"], function (require, exports) {
 //// [b.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS1.js b/tests/baselines/reference/decoratedClassExportsCommonJS1.js
index 7ef4369f975..b624c11e79d 100644
--- a/tests/baselines/reference/decoratedClassExportsCommonJS1.js
+++ b/tests/baselines/reference/decoratedClassExportsCommonJS1.js
@@ -14,6 +14,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 let Testing123 = Testing123_1 = class Testing123 {
 };
 Testing123.prop1 = Testing123_1.prop0;
diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS2.js b/tests/baselines/reference/decoratedClassExportsCommonJS2.js
index 994178cbb79..978d8f18402 100644
--- a/tests/baselines/reference/decoratedClassExportsCommonJS2.js
+++ b/tests/baselines/reference/decoratedClassExportsCommonJS2.js
@@ -13,6 +13,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 let Testing123 = Testing123_1 = class Testing123 {
 };
 Testing123 = Testing123_1 = __decorate([
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js
index 14ede865a2f..dadaa5ed6df 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js
@@ -22,13 +22,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var decorator;
     let Foo = class Foo {
     };
     Foo = __decorate([
         decorator
     ], Foo);
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = Foo;
 });
 //// [b.js]
@@ -40,12 +40,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var decorator;
     let default_1 = class {
     };
     default_1 = __decorate([
         decorator
     ], default_1);
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = default_1;
 });
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js
index ecc04859234..f6c7b7cbc8b 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js
@@ -21,13 +21,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var decorator;
 let Foo = class Foo {
 };
 Foo = __decorate([
     decorator
 ], Foo);
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Foo;
 //// [b.js]
 "use strict";
@@ -37,11 +37,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var decorator;
 let default_1 = class {
 };
 default_1 = __decorate([
     decorator
 ], default_1);
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
index 47f9a524432..beb5fa26755 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
@@ -30,13 +30,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var decorator;
     let Foo = class Foo {
     };
     Foo = __decorate([
         decorator
     ], Foo);
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = Foo;
 });
 //// [b.js]
@@ -56,12 +56,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var decorator;
     let default_1 = class {
     };
     default_1 = __decorate([
         decorator
     ], default_1);
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = default_1;
 });
diff --git a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
index fc8dc1c5515..22e4a448f1e 100644
--- a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
+++ b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
@@ -23,6 +23,7 @@ class Wat {
 
 //// [a.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 // from #3108
 exports.test = 'abc';
 //// [b.js]
@@ -33,6 +34,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var a_1 = require("./a");
 function filter(handler) {
     return function (target, propertyKey) {
diff --git a/tests/baselines/reference/decoratorMetadata.js b/tests/baselines/reference/decoratorMetadata.js
index cb253d43c16..9998ae3d08a 100644
--- a/tests/baselines/reference/decoratorMetadata.js
+++ b/tests/baselines/reference/decoratorMetadata.js
@@ -20,12 +20,12 @@ class MyComponent {
 
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Service = (function () {
     function Service() {
     }
     return Service;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Service;
 //// [component.js]
 "use strict";
@@ -38,6 +38,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var service_1 = require("./service");
 var MyComponent = (function () {
     function MyComponent(Service) {
diff --git a/tests/baselines/reference/decoratorMetadataOnInferredType.js b/tests/baselines/reference/decoratorMetadataOnInferredType.js
index 43cdaa79ab8..6f247637729 100644
--- a/tests/baselines/reference/decoratorMetadataOnInferredType.js
+++ b/tests/baselines/reference/decoratorMetadataOnInferredType.js
@@ -19,6 +19,7 @@ export class B {
 
 //// [decoratorMetadataOnInferredType.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
         console.log('new A');
diff --git a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js
index be249800d57..a65ba5b2f73 100644
--- a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js
+++ b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js
@@ -42,6 +42,7 @@ export class ClassA {
 
 //// [aux.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var SomeClass = (function () {
     function SomeClass() {
     }
@@ -50,6 +51,7 @@ var SomeClass = (function () {
 exports.SomeClass = SomeClass;
 //// [aux1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var SomeClass1 = (function () {
     function SomeClass1() {
     }
@@ -58,6 +60,7 @@ var SomeClass1 = (function () {
 exports.SomeClass1 = SomeClass1;
 //// [aux2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var SomeClass2 = (function () {
     function SomeClass2() {
     }
@@ -75,6 +78,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var aux_1 = require("./aux");
 var aux1_1 = require("./aux1");
 function annotation() {
diff --git a/tests/baselines/reference/decoratorMetadataWithConstructorType.js b/tests/baselines/reference/decoratorMetadataWithConstructorType.js
index 2c14c9b5bda..10aa42ddce7 100644
--- a/tests/baselines/reference/decoratorMetadataWithConstructorType.js
+++ b/tests/baselines/reference/decoratorMetadataWithConstructorType.js
@@ -19,6 +19,7 @@ export class B {
 
 //// [decoratorMetadataWithConstructorType.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
         console.log('new A');
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
index 258635a5f3a..b0e23a78971 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -35,6 +36,7 @@ var db = (function () {
 exports.db = db;
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
index 104e449bc0c..f03190cff0c 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -35,6 +36,7 @@ var db = (function () {
 exports.db = db;
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
index 2925cad6afe..c1eca081527 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -35,6 +36,7 @@ var db = (function () {
 exports.db = db;
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = require("./db");
 function someDecorator(target) {
     return target;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
index 33eb93f380f..7d78cf7adbe 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -35,6 +36,7 @@ var db = (function () {
 exports.db = db;
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db"); // error no default export
 function someDecorator(target) {
     return target;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
index b99621fd7e2..3f7069902ce 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -32,10 +33,10 @@ var db = (function () {
     };
     return db;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = db;
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
index 4970dca3201..66eb30dc710 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -32,10 +33,10 @@ var db = (function () {
     };
     return db;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = db;
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
index 28d403044bb..1dd09c3a177 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -32,10 +33,10 @@ var db = (function () {
     };
     return db;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = db;
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
index dd5cee66f8b..830e6bc80ee 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -35,6 +36,7 @@ var db = (function () {
 exports.db = db;
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var database = require("./db");
 function someDecorator(target) {
     return target;
diff --git a/tests/baselines/reference/decoratorOnClass2.js b/tests/baselines/reference/decoratorOnClass2.js
index 4d9c2007ad0..77020e7cb77 100644
--- a/tests/baselines/reference/decoratorOnClass2.js
+++ b/tests/baselines/reference/decoratorOnClass2.js
@@ -13,6 +13,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var C = (function () {
     function C() {
     }
diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.js b/tests/baselines/reference/decoratorOnClassConstructor2.js
index dd6209b6d64..2af3b0426dc 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor2.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor2.js
@@ -16,6 +16,7 @@ export class C  extends base{
 
 //// [0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var base = (function () {
     function base() {
     }
@@ -45,6 +46,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var _0_ts_1 = require("./0.ts");
 var _0_ts_2 = require("./0.ts");
 var C = (function (_super) {
diff --git a/tests/baselines/reference/decoratorOnClassConstructor3.js b/tests/baselines/reference/decoratorOnClassConstructor3.js
index a1a3e331f36..4ed401284a9 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor3.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor3.js
@@ -18,6 +18,7 @@ export class C  extends base{
 
 //// [0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var base = (function () {
     function base() {
     }
@@ -47,6 +48,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var _0_1 = require("./0");
 var _0_2 = require("./0");
 /* Comment on the Class Declaration */
diff --git a/tests/baselines/reference/decoratorOnImportEquals2.js b/tests/baselines/reference/decoratorOnImportEquals2.js
index 5e6b6b4a623..aa8273699e3 100644
--- a/tests/baselines/reference/decoratorOnImportEquals2.js
+++ b/tests/baselines/reference/decoratorOnImportEquals2.js
@@ -11,5 +11,7 @@ declare function dec<T>(target: T): T;
 
 //// [decoratorOnImportEquals2_0.js]
 "use strict";
+exports.__esModule = true;
 //// [decoratorOnImportEquals2_1.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression01.js b/tests/baselines/reference/defaultExportInAwaitExpression01.js
index 66d100ad07d..6a31461fe3c 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression01.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression01.js
@@ -23,8 +23,8 @@ import x from './a';
     }
 })(function (require, exports) {
     "use strict";
-    const x = new Promise((resolve, reject) => { resolve({}); });
     Object.defineProperty(exports, "__esModule", { value: true });
+    const x = new Promise((resolve, reject) => { resolve({}); });
     exports.default = x;
 });
 //// [b.js]
@@ -46,6 +46,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     const a_1 = require("./a");
     (function () {
         return __awaiter(this, void 0, void 0, function* () {
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression02.js b/tests/baselines/reference/defaultExportInAwaitExpression02.js
index 8499164f675..565cfb41617 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression02.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression02.js
@@ -14,8 +14,8 @@ import x from './a';
 
 //// [a.js]
 "use strict";
-const x = new Promise((resolve, reject) => { resolve({}); });
 Object.defineProperty(exports, "__esModule", { value: true });
+const x = new Promise((resolve, reject) => { resolve({}); });
 exports.default = x;
 //// [b.js]
 "use strict";
@@ -27,6 +27,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 const a_1 = require("./a");
 (function () {
     return __awaiter(this, void 0, void 0, function* () {
diff --git a/tests/baselines/reference/defaultExportWithOverloads01.js b/tests/baselines/reference/defaultExportWithOverloads01.js
index 770b685378d..a273b891679 100644
--- a/tests/baselines/reference/defaultExportWithOverloads01.js
+++ b/tests/baselines/reference/defaultExportWithOverloads01.js
@@ -7,11 +7,11 @@ export default function f(...args: any[]) {
 
 //// [defaultExportWithOverloads01.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function f() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
         args[_i] = arguments[_i];
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f;
diff --git a/tests/baselines/reference/defaultExportsCannotMerge01.js b/tests/baselines/reference/defaultExportsCannotMerge01.js
index 24a37cad2c3..aaadfaefebb 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge01.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge01.js
@@ -32,10 +32,10 @@ Entity.y;
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function Decl() {
     return 0;
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Decl;
 var Decl;
 (function (Decl) {
@@ -44,6 +44,7 @@ var Decl;
 })(Decl = exports.Decl || (exports.Decl = {}));
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("m1");
 m1_1.default();
 var x;
diff --git a/tests/baselines/reference/defaultExportsCannotMerge02.js b/tests/baselines/reference/defaultExportsCannotMerge02.js
index f327c62e571..b83d54548ca 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge02.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge02.js
@@ -27,15 +27,16 @@ var sum = z.p1 + z.p2
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Decl = (function () {
     function Decl() {
     }
     return Decl;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Decl;
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("m1");
 m1_1.default();
 var x;
diff --git a/tests/baselines/reference/defaultExportsCannotMerge03.js b/tests/baselines/reference/defaultExportsCannotMerge03.js
index 4369392c6e9..254723ec5f1 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge03.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge03.js
@@ -27,15 +27,16 @@ var sum = z.p1 + z.p2
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Decl = (function () {
     function Decl() {
     }
     return Decl;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Decl;
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("m1");
 m1_1.default();
 var x;
diff --git a/tests/baselines/reference/defaultExportsCannotMerge04.js b/tests/baselines/reference/defaultExportsCannotMerge04.js
index 7c9bd88bc16..38ab4861c62 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge04.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge04.js
@@ -15,9 +15,9 @@ export interface Foo {
 
 //// [defaultExportsCannotMerge04.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function Foo() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Foo;
 var Foo;
 (function (Foo) {
diff --git a/tests/baselines/reference/defaultExportsGetExportedAmd.js b/tests/baselines/reference/defaultExportsGetExportedAmd.js
index fc0385254c0..c5037364b00 100644
--- a/tests/baselines/reference/defaultExportsGetExportedAmd.js
+++ b/tests/baselines/reference/defaultExportsGetExportedAmd.js
@@ -10,15 +10,15 @@ export default function foo() {}
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class Foo {
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = Foo;
 });
 //// [b.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    function foo() { }
     Object.defineProperty(exports, "__esModule", { value: true });
+    function foo() { }
     exports.default = foo;
 });
diff --git a/tests/baselines/reference/defaultExportsGetExportedCommonjs.js b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js
index 1290404099d..051ab7bbf03 100644
--- a/tests/baselines/reference/defaultExportsGetExportedCommonjs.js
+++ b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js
@@ -9,12 +9,12 @@ export default function foo() {}
 
 //// [a.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class Foo {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Foo;
 //// [b.js]
 "use strict";
-function foo() { }
 Object.defineProperty(exports, "__esModule", { value: true });
+function foo() { }
 exports.default = foo;
diff --git a/tests/baselines/reference/defaultExportsGetExportedUmd.js b/tests/baselines/reference/defaultExportsGetExportedUmd.js
index 71aa347ce32..5417b9b9a96 100644
--- a/tests/baselines/reference/defaultExportsGetExportedUmd.js
+++ b/tests/baselines/reference/defaultExportsGetExportedUmd.js
@@ -18,9 +18,9 @@ export default function foo() {}
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class Foo {
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = Foo;
 });
 //// [b.js]
@@ -34,7 +34,7 @@ export default function foo() {}
     }
 })(function (require, exports) {
     "use strict";
-    function foo() { }
     Object.defineProperty(exports, "__esModule", { value: true });
+    function foo() { }
     exports.default = foo;
 });
diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js
new file mode 100644
index 00000000000..329c2fb19ce
--- /dev/null
+++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js
@@ -0,0 +1,112 @@
+//// [defaultParameterAddsUndefinedWithStrictNullChecks.ts]
+function f(addUndefined1 = "J", addUndefined2?: number) {
+    return addUndefined1.length + (addUndefined2 || 0);
+}
+function g(addUndefined = "J", addDefined: number) {
+    return addUndefined.length + addDefined;
+}
+let total = f() + f('a', 1) + f('b') + f(undefined, 2);
+total = g('c', 3) + g(undefined, 4);
+
+function foo1(x: string = "string", b: number) {
+    x.length;
+}
+
+function foo2(x = "string", b: number) {
+    x.length; // ok, should be string
+}
+
+function foo3(x: string | undefined = "string", b: number) {
+    x.length; // ok, should be string
+}
+
+function foo4(x: string | undefined = undefined, b: number) {
+    x; // should be string | undefined
+}
+
+
+
+// .d.ts should have `string | undefined` for foo1, foo2, foo3 and foo4
+foo1(undefined, 1);
+foo2(undefined, 1);
+foo3(undefined, 1);
+foo4(undefined, 1);
+
+
+function removeUndefinedButNotFalse(x = true) {
+    if (x === false) {
+        return x;
+    }
+}
+
+declare const cond: boolean;
+function removeNothing(y = cond ? true : undefined) {
+    if (y !== undefined) {
+        if (y === false) {
+            return y;
+        }
+    }
+    return true;
+}
+
+
+//// [defaultParameterAddsUndefinedWithStrictNullChecks.js]
+function f(addUndefined1, addUndefined2) {
+    if (addUndefined1 === void 0) { addUndefined1 = "J"; }
+    return addUndefined1.length + (addUndefined2 || 0);
+}
+function g(addUndefined, addDefined) {
+    if (addUndefined === void 0) { addUndefined = "J"; }
+    return addUndefined.length + addDefined;
+}
+var total = f() + f('a', 1) + f('b') + f(undefined, 2);
+total = g('c', 3) + g(undefined, 4);
+function foo1(x, b) {
+    if (x === void 0) { x = "string"; }
+    x.length;
+}
+function foo2(x, b) {
+    if (x === void 0) { x = "string"; }
+    x.length; // ok, should be string
+}
+function foo3(x, b) {
+    if (x === void 0) { x = "string"; }
+    x.length; // ok, should be string
+}
+function foo4(x, b) {
+    if (x === void 0) { x = undefined; }
+    x; // should be string | undefined
+}
+// .d.ts should have `string | undefined` for foo1, foo2, foo3 and foo4
+foo1(undefined, 1);
+foo2(undefined, 1);
+foo3(undefined, 1);
+foo4(undefined, 1);
+function removeUndefinedButNotFalse(x) {
+    if (x === void 0) { x = true; }
+    if (x === false) {
+        return x;
+    }
+}
+function removeNothing(y) {
+    if (y === void 0) { y = cond ? true : undefined; }
+    if (y !== undefined) {
+        if (y === false) {
+            return y;
+        }
+    }
+    return true;
+}
+
+
+//// [defaultParameterAddsUndefinedWithStrictNullChecks.d.ts]
+declare function f(addUndefined1?: string, addUndefined2?: number): number;
+declare function g(addUndefined: string | undefined, addDefined: number): number;
+declare let total: number;
+declare function foo1(x: string | undefined, b: number): void;
+declare function foo2(x: string | undefined, b: number): void;
+declare function foo3(x: string | undefined, b: number): void;
+declare function foo4(x: string | undefined, b: number): void;
+declare function removeUndefinedButNotFalse(x?: boolean): false | undefined;
+declare const cond: boolean;
+declare function removeNothing(y?: boolean | undefined): boolean;
diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols
new file mode 100644
index 00000000000..fb0fce7dc7f
--- /dev/null
+++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols
@@ -0,0 +1,135 @@
+=== tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts ===
+function f(addUndefined1 = "J", addUndefined2?: number) {
+>f : Symbol(f, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 0))
+>addUndefined1 : Symbol(addUndefined1, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 11))
+>addUndefined2 : Symbol(addUndefined2, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 31))
+
+    return addUndefined1.length + (addUndefined2 || 0);
+>addUndefined1.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>addUndefined1 : Symbol(addUndefined1, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 11))
+>length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>addUndefined2 : Symbol(addUndefined2, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 31))
+}
+function g(addUndefined = "J", addDefined: number) {
+>g : Symbol(g, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 2, 1))
+>addUndefined : Symbol(addUndefined, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 3, 11))
+>addDefined : Symbol(addDefined, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 3, 30))
+
+    return addUndefined.length + addDefined;
+>addUndefined.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>addUndefined : Symbol(addUndefined, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 3, 11))
+>length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>addDefined : Symbol(addDefined, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 3, 30))
+}
+let total = f() + f('a', 1) + f('b') + f(undefined, 2);
+>total : Symbol(total, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 6, 3))
+>f : Symbol(f, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 0))
+>f : Symbol(f, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 0))
+>f : Symbol(f, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 0))
+>f : Symbol(f, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 0))
+>undefined : Symbol(undefined)
+
+total = g('c', 3) + g(undefined, 4);
+>total : Symbol(total, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 6, 3))
+>g : Symbol(g, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 2, 1))
+>g : Symbol(g, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 2, 1))
+>undefined : Symbol(undefined)
+
+function foo1(x: string = "string", b: number) {
+>foo1 : Symbol(foo1, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 7, 36))
+>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 9, 14))
+>b : Symbol(b, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 9, 35))
+
+    x.length;
+>x.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 9, 14))
+>length : Symbol(String.length, Decl(lib.d.ts, --, --))
+}
+
+function foo2(x = "string", b: number) {
+>foo2 : Symbol(foo2, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 11, 1))
+>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 13, 14))
+>b : Symbol(b, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 13, 27))
+
+    x.length; // ok, should be string
+>x.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 13, 14))
+>length : Symbol(String.length, Decl(lib.d.ts, --, --))
+}
+
+function foo3(x: string | undefined = "string", b: number) {
+>foo3 : Symbol(foo3, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 15, 1))
+>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 17, 14))
+>b : Symbol(b, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 17, 47))
+
+    x.length; // ok, should be string
+>x.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 17, 14))
+>length : Symbol(String.length, Decl(lib.d.ts, --, --))
+}
+
+function foo4(x: string | undefined = undefined, b: number) {
+>foo4 : Symbol(foo4, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 19, 1))
+>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 21, 14))
+>undefined : Symbol(undefined)
+>b : Symbol(b, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 21, 48))
+
+    x; // should be string | undefined
+>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 21, 14))
+}
+
+
+
+// .d.ts should have `string | undefined` for foo1, foo2, foo3 and foo4
+foo1(undefined, 1);
+>foo1 : Symbol(foo1, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 7, 36))
+>undefined : Symbol(undefined)
+
+foo2(undefined, 1);
+>foo2 : Symbol(foo2, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 11, 1))
+>undefined : Symbol(undefined)
+
+foo3(undefined, 1);
+>foo3 : Symbol(foo3, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 15, 1))
+>undefined : Symbol(undefined)
+
+foo4(undefined, 1);
+>foo4 : Symbol(foo4, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 19, 1))
+>undefined : Symbol(undefined)
+
+
+function removeUndefinedButNotFalse(x = true) {
+>removeUndefinedButNotFalse : Symbol(removeUndefinedButNotFalse, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 31, 19))
+>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 34, 36))
+
+    if (x === false) {
+>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 34, 36))
+
+        return x;
+>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 34, 36))
+    }
+}
+
+declare const cond: boolean;
+>cond : Symbol(cond, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 40, 13))
+
+function removeNothing(y = cond ? true : undefined) {
+>removeNothing : Symbol(removeNothing, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 40, 28))
+>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 41, 23))
+>cond : Symbol(cond, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 40, 13))
+>undefined : Symbol(undefined)
+
+    if (y !== undefined) {
+>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 41, 23))
+>undefined : Symbol(undefined)
+
+        if (y === false) {
+>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 41, 23))
+
+            return y;
+>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 41, 23))
+        }
+    }
+    return true;
+}
+
diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types
new file mode 100644
index 00000000000..d95f9259891
--- /dev/null
+++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types
@@ -0,0 +1,180 @@
+=== tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts ===
+function f(addUndefined1 = "J", addUndefined2?: number) {
+>f : (addUndefined1?: string, addUndefined2?: number | undefined) => number
+>addUndefined1 : string
+>"J" : "J"
+>addUndefined2 : number | undefined
+
+    return addUndefined1.length + (addUndefined2 || 0);
+>addUndefined1.length + (addUndefined2 || 0) : number
+>addUndefined1.length : number
+>addUndefined1 : string
+>length : number
+>(addUndefined2 || 0) : number
+>addUndefined2 || 0 : number
+>addUndefined2 : number | undefined
+>0 : 0
+}
+function g(addUndefined = "J", addDefined: number) {
+>g : (addUndefined: string | undefined, addDefined: number) => number
+>addUndefined : string
+>"J" : "J"
+>addDefined : number
+
+    return addUndefined.length + addDefined;
+>addUndefined.length + addDefined : number
+>addUndefined.length : number
+>addUndefined : string
+>length : number
+>addDefined : number
+}
+let total = f() + f('a', 1) + f('b') + f(undefined, 2);
+>total : number
+>f() + f('a', 1) + f('b') + f(undefined, 2) : number
+>f() + f('a', 1) + f('b') : number
+>f() + f('a', 1) : number
+>f() : number
+>f : (addUndefined1?: string, addUndefined2?: number | undefined) => number
+>f('a', 1) : number
+>f : (addUndefined1?: string, addUndefined2?: number | undefined) => number
+>'a' : "a"
+>1 : 1
+>f('b') : number
+>f : (addUndefined1?: string, addUndefined2?: number | undefined) => number
+>'b' : "b"
+>f(undefined, 2) : number
+>f : (addUndefined1?: string, addUndefined2?: number | undefined) => number
+>undefined : undefined
+>2 : 2
+
+total = g('c', 3) + g(undefined, 4);
+>total = g('c', 3) + g(undefined, 4) : number
+>total : number
+>g('c', 3) + g(undefined, 4) : number
+>g('c', 3) : number
+>g : (addUndefined: string | undefined, addDefined: number) => number
+>'c' : "c"
+>3 : 3
+>g(undefined, 4) : number
+>g : (addUndefined: string | undefined, addDefined: number) => number
+>undefined : undefined
+>4 : 4
+
+function foo1(x: string = "string", b: number) {
+>foo1 : (x: string | undefined, b: number) => void
+>x : string
+>"string" : "string"
+>b : number
+
+    x.length;
+>x.length : number
+>x : string
+>length : number
+}
+
+function foo2(x = "string", b: number) {
+>foo2 : (x: string | undefined, b: number) => void
+>x : string
+>"string" : "string"
+>b : number
+
+    x.length; // ok, should be string
+>x.length : number
+>x : string
+>length : number
+}
+
+function foo3(x: string | undefined = "string", b: number) {
+>foo3 : (x: string | undefined, b: number) => void
+>x : string
+>"string" : "string"
+>b : number
+
+    x.length; // ok, should be string
+>x.length : number
+>x : string
+>length : number
+}
+
+function foo4(x: string | undefined = undefined, b: number) {
+>foo4 : (x: string | undefined, b: number) => void
+>x : string | undefined
+>undefined : undefined
+>b : number
+
+    x; // should be string | undefined
+>x : string | undefined
+}
+
+
+
+// .d.ts should have `string | undefined` for foo1, foo2, foo3 and foo4
+foo1(undefined, 1);
+>foo1(undefined, 1) : void
+>foo1 : (x: string | undefined, b: number) => void
+>undefined : undefined
+>1 : 1
+
+foo2(undefined, 1);
+>foo2(undefined, 1) : void
+>foo2 : (x: string | undefined, b: number) => void
+>undefined : undefined
+>1 : 1
+
+foo3(undefined, 1);
+>foo3(undefined, 1) : void
+>foo3 : (x: string | undefined, b: number) => void
+>undefined : undefined
+>1 : 1
+
+foo4(undefined, 1);
+>foo4(undefined, 1) : void
+>foo4 : (x: string | undefined, b: number) => void
+>undefined : undefined
+>1 : 1
+
+
+function removeUndefinedButNotFalse(x = true) {
+>removeUndefinedButNotFalse : (x?: boolean) => false | undefined
+>x : boolean
+>true : true
+
+    if (x === false) {
+>x === false : boolean
+>x : boolean
+>false : false
+
+        return x;
+>x : false
+    }
+}
+
+declare const cond: boolean;
+>cond : boolean
+
+function removeNothing(y = cond ? true : undefined) {
+>removeNothing : (y?: boolean | undefined) => boolean
+>y : boolean | undefined
+>cond ? true : undefined : true | undefined
+>cond : boolean
+>true : true
+>undefined : undefined
+
+    if (y !== undefined) {
+>y !== undefined : boolean
+>y : boolean | undefined
+>undefined : undefined
+
+        if (y === false) {
+>y === false : boolean
+>y : boolean
+>false : false
+
+            return y;
+>y : false
+        }
+    }
+    return true;
+>true : true
+}
+
diff --git a/tests/baselines/reference/dependencyViaImportAlias.js b/tests/baselines/reference/dependencyViaImportAlias.js
index 8e12bb9bd2c..285cfbcda16 100644
--- a/tests/baselines/reference/dependencyViaImportAlias.js
+++ b/tests/baselines/reference/dependencyViaImportAlias.js
@@ -13,6 +13,7 @@ export = A;
 //// [A.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations1.js b/tests/baselines/reference/destructuringInVariableDeclarations1.js
index 707218b41e2..a7645ceabe9 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations1.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations1.js
@@ -7,6 +7,7 @@ export let { toString } = 1;
 
 //// [destructuringInVariableDeclarations1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.toString = (1).toString;
 {
     let { toFixed } = 1;
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations2.js b/tests/baselines/reference/destructuringInVariableDeclarations2.js
index 9c1366bd8e0..43a2f740c94 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations2.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations2.js
@@ -8,6 +8,7 @@ export {};
 
 //// [destructuringInVariableDeclarations2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 let { toString } = 1;
 {
     let { toFixed } = 1;
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations3.js b/tests/baselines/reference/destructuringInVariableDeclarations3.js
index 8da039fe98e..2522a704e18 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations3.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations3.js
@@ -8,6 +8,7 @@ export let { toString } = 1;
 //// [destructuringInVariableDeclarations3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.toString = (1).toString;
     {
         let { toFixed } = 1;
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations4.js b/tests/baselines/reference/destructuringInVariableDeclarations4.js
index d4b30405143..867417cf01f 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations4.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations4.js
@@ -9,6 +9,7 @@ export {};
 //// [destructuringInVariableDeclarations4.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     let { toString } = 1;
     {
         let { toFixed } = 1;
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations5.js b/tests/baselines/reference/destructuringInVariableDeclarations5.js
index 94530d8d258..20a094a0375 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations5.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations5.js
@@ -16,6 +16,7 @@ export let { toString } = 1;
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.toString = (1).toString;
     {
         let { toFixed } = 1;
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations6.js b/tests/baselines/reference/destructuringInVariableDeclarations6.js
index c16a0a7d0a2..583a2cd1f1d 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations6.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations6.js
@@ -17,6 +17,7 @@ export {};
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     let { toString } = 1;
     {
         let { toFixed } = 1;
diff --git a/tests/baselines/reference/downlevelLetConst13.js b/tests/baselines/reference/downlevelLetConst13.js
index b6baf850800..324c0cd9293 100644
--- a/tests/baselines/reference/downlevelLetConst13.js
+++ b/tests/baselines/reference/downlevelLetConst13.js
@@ -21,6 +21,7 @@ export module M {
 
 //// [downlevelLetConst13.js]
 'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
 // exported let\const bindings should not be renamed
 exports.foo = 10;
 exports.bar = "123";
diff --git a/tests/baselines/reference/duplicateLocalVariable1.js b/tests/baselines/reference/duplicateLocalVariable1.js
index 39848b3bb6a..c1417de9dfe 100644
--- a/tests/baselines/reference/duplicateLocalVariable1.js
+++ b/tests/baselines/reference/duplicateLocalVariable1.js
@@ -347,6 +347,7 @@ export var tests: TestRunner = (function () {
 
 //// [duplicateLocalVariable1.js]
 "use strict";
+exports.__esModule = true;
 / /;
 commonjs;
 var TestFileDir = ".\\TempTestFiles";
diff --git a/tests/baselines/reference/duplicateLocalVariable2.js b/tests/baselines/reference/duplicateLocalVariable2.js
index d6f5c26d628..2962e544b9b 100644
--- a/tests/baselines/reference/duplicateLocalVariable2.js
+++ b/tests/baselines/reference/duplicateLocalVariable2.js
@@ -38,6 +38,7 @@ export var tests: TestRunner = (function () {
 //// [duplicateLocalVariable2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var TestCase = (function () {
         function TestCase(name, test, errorMessageRegEx) {
             this.name = name;
diff --git a/tests/baselines/reference/duplicateStringNamedProperty1.js b/tests/baselines/reference/duplicateStringNamedProperty1.js
index 102fba9c3d6..5a6d5d7a8db 100644
--- a/tests/baselines/reference/duplicateStringNamedProperty1.js
+++ b/tests/baselines/reference/duplicateStringNamedProperty1.js
@@ -6,3 +6,4 @@ export interface Album {
 
 //// [duplicateStringNamedProperty1.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.js b/tests/baselines/reference/duplicateSymbolsExportMatching.js
index 9f977f5fd58..5f5590e2b41 100644
--- a/tests/baselines/reference/duplicateSymbolsExportMatching.js
+++ b/tests/baselines/reference/duplicateSymbolsExportMatching.js
@@ -68,6 +68,7 @@ export interface D { }
 //// [duplicateSymbolsExportMatching.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     // Should report error only once for instantiated module
     var M;
     (function (M) {
diff --git a/tests/baselines/reference/dynamicModuleTypecheckError.js b/tests/baselines/reference/dynamicModuleTypecheckError.js
index ef39270c9d1..2c94e692dd0 100644
--- a/tests/baselines/reference/dynamicModuleTypecheckError.js
+++ b/tests/baselines/reference/dynamicModuleTypecheckError.js
@@ -10,6 +10,7 @@ for(var i = 0; i < 30; i++) {
 
 //// [dynamicModuleTypecheckError.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 1;
 for (var i = 0; i < 30; i++) {
     exports.x = i * 1000; // should not be an error here
diff --git a/tests/baselines/reference/elidingImportNames.js b/tests/baselines/reference/elidingImportNames.js
index 94fa1f7e852..f878c5044ea 100644
--- a/tests/baselines/reference/elidingImportNames.js
+++ b/tests/baselines/reference/elidingImportNames.js
@@ -17,12 +17,15 @@ export var main = 10;
 
 //// [elidingImportNames_main.js]
 "use strict";
+exports.__esModule = true;
 exports.main = 10;
 //// [elidingImportNames_main1.js]
 "use strict";
+exports.__esModule = true;
 exports.main = 10;
 //// [elidingImportNames_test.js]
 "use strict";
+exports.__esModule = true;
 var a = require("./elidingImportNames_main"); // alias used in typeof
 var b = a;
 var x;
diff --git a/tests/baselines/reference/emptyModuleName.js b/tests/baselines/reference/emptyModuleName.js
index 1d8401803a7..d98359d94bb 100644
--- a/tests/baselines/reference/emptyModuleName.js
+++ b/tests/baselines/reference/emptyModuleName.js
@@ -15,6 +15,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var A = require("");
 var B = (function (_super) {
     __extends(B, _super);
diff --git a/tests/baselines/reference/enumFromExternalModule.js b/tests/baselines/reference/enumFromExternalModule.js
index a6e9f6b6076..2a1865d3ccd 100644
--- a/tests/baselines/reference/enumFromExternalModule.js
+++ b/tests/baselines/reference/enumFromExternalModule.js
@@ -12,12 +12,14 @@ var x = f.Mode.Open;
 
 //// [enumFromExternalModule_0.js]
 "use strict";
+exports.__esModule = true;
 var Mode;
 (function (Mode) {
     Mode[Mode["Open"] = 0] = "Open";
 })(Mode = exports.Mode || (exports.Mode = {}));
 //// [enumFromExternalModule_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='enumFromExternalModule_0.ts'/>
 var f = require("./enumFromExternalModule_0");
 var x = f.Mode.Open;
diff --git a/tests/baselines/reference/errorsOnImportedSymbol.js b/tests/baselines/reference/errorsOnImportedSymbol.js
index 4c7dca8274e..15ae0c90bd1 100644
--- a/tests/baselines/reference/errorsOnImportedSymbol.js
+++ b/tests/baselines/reference/errorsOnImportedSymbol.js
@@ -17,7 +17,9 @@ var y = Sammy.Sammy();
 
 //// [errorsOnImportedSymbol_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [errorsOnImportedSymbol_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var x = new Sammy.Sammy();
 var y = Sammy.Sammy();
diff --git a/tests/baselines/reference/es3defaultAliasIsQuoted.js b/tests/baselines/reference/es3defaultAliasIsQuoted.js
index 89fd0c47a7e..d3bb3d006e5 100644
--- a/tests/baselines/reference/es3defaultAliasIsQuoted.js
+++ b/tests/baselines/reference/es3defaultAliasIsQuoted.js
@@ -16,6 +16,7 @@ assert(Foo.CONSTANT === "Foo");
 
 //// [es3defaultAliasQuoted_file0.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
@@ -27,9 +28,9 @@ function assert(value) {
     if (!value)
         throw new Error("Assertion failed!");
 }
-exports.__esModule = true;
 exports["default"] = assert;
 //// [es3defaultAliasQuoted_file1.js]
 "use strict";
+exports.__esModule = true;
 var es3defaultAliasQuoted_file0_1 = require("./es3defaultAliasQuoted_file0");
 es3defaultAliasQuoted_file0_1["default"](es3defaultAliasQuoted_file0_1.Foo.CONSTANT === "Foo");
diff --git a/tests/baselines/reference/es5-commonjs.js b/tests/baselines/reference/es5-commonjs.js
index 6a301f9a2ac..8ebcfb01be6 100644
--- a/tests/baselines/reference/es5-commonjs.js
+++ b/tests/baselines/reference/es5-commonjs.js
@@ -16,6 +16,7 @@ export default class A
 
 //// [es5-commonjs.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
     }
@@ -24,5 +25,4 @@ var A = (function () {
     };
     return A;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = A;
diff --git a/tests/baselines/reference/es5-commonjs3.errors.txt b/tests/baselines/reference/es5-commonjs3.errors.txt
new file mode 100644
index 00000000000..fddabf56fac
--- /dev/null
+++ b/tests/baselines/reference/es5-commonjs3.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/compiler/es5-commonjs3.ts(3,12): error TS1216: Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules.
+
+
+==== tests/cases/compiler/es5-commonjs3.ts (1 errors) ====
+    
+    export default "test";
+    export var __esModule = 1;
+               ~~~~~~~~~~
+!!! error TS1216: Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/es5-commonjs3.js b/tests/baselines/reference/es5-commonjs3.js
index b2c1c5d6890..15c11b189a3 100644
--- a/tests/baselines/reference/es5-commonjs3.js
+++ b/tests/baselines/reference/es5-commonjs3.js
@@ -6,5 +6,6 @@ export var __esModule = 1;
 
 //// [es5-commonjs3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "test";
 exports.__esModule = 1;
diff --git a/tests/baselines/reference/es5-commonjs4.errors.txt b/tests/baselines/reference/es5-commonjs4.errors.txt
new file mode 100644
index 00000000000..9a901728cfb
--- /dev/null
+++ b/tests/baselines/reference/es5-commonjs4.errors.txt
@@ -0,0 +1,21 @@
+tests/cases/compiler/es5-commonjs4.ts(14,12): error TS1216: Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules.
+
+
+==== tests/cases/compiler/es5-commonjs4.ts (1 errors) ====
+    
+    export default class A
+    {
+        constructor ()
+        {
+    
+        }
+    
+        public B()
+        {
+            return 42;
+        }
+    }
+    export var __esModule = 1;
+               ~~~~~~~~~~
+!!! error TS1216: Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/es5-commonjs4.js b/tests/baselines/reference/es5-commonjs4.js
index b67c771df3c..d2530d1bdf2 100644
--- a/tests/baselines/reference/es5-commonjs4.js
+++ b/tests/baselines/reference/es5-commonjs4.js
@@ -17,6 +17,7 @@ export var __esModule = 1;
 
 //// [es5-commonjs4.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
     }
diff --git a/tests/baselines/reference/es5-commonjs5.js b/tests/baselines/reference/es5-commonjs5.js
index 73c859bb778..bbc9bbba7c2 100644
--- a/tests/baselines/reference/es5-commonjs5.js
+++ b/tests/baselines/reference/es5-commonjs5.js
@@ -7,8 +7,8 @@ export default function () {
 
 //// [es5-commonjs5.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function default_1() {
     return "test";
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
diff --git a/tests/baselines/reference/es5-commonjs7.symbols b/tests/baselines/reference/es5-commonjs7.symbols
new file mode 100644
index 00000000000..14c4cc71376
--- /dev/null
+++ b/tests/baselines/reference/es5-commonjs7.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/test.d.ts ===
+
+export default "test";
+export var __esModule;
+>__esModule : Symbol(__esModule, Decl(test.d.ts, 2, 10))
+
diff --git a/tests/baselines/reference/es5-commonjs7.types b/tests/baselines/reference/es5-commonjs7.types
new file mode 100644
index 00000000000..e2236a61c7b
--- /dev/null
+++ b/tests/baselines/reference/es5-commonjs7.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/test.d.ts ===
+
+export default "test";
+export var __esModule;
+>__esModule : any
+
diff --git a/tests/baselines/reference/es5-commonjs8.symbols b/tests/baselines/reference/es5-commonjs8.symbols
new file mode 100644
index 00000000000..93041cc8b7f
--- /dev/null
+++ b/tests/baselines/reference/es5-commonjs8.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/es5-commonjs8.ts ===
+
+export default "test";
+export var __esModule = 1;
+>__esModule : Symbol(__esModule, Decl(es5-commonjs8.ts, 2, 10))
+
diff --git a/tests/baselines/reference/es5-commonjs8.types b/tests/baselines/reference/es5-commonjs8.types
new file mode 100644
index 00000000000..be206bf5162
--- /dev/null
+++ b/tests/baselines/reference/es5-commonjs8.types
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/es5-commonjs8.ts ===
+
+export default "test";
+export var __esModule = 1;
+>__esModule : number
+>1 : 1
+
diff --git a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
index 4255ca74053..9e5b63b23e9 100644
--- a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
+++ b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
@@ -19,6 +19,7 @@ export declare function __generator(body: Function): any;
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 function foo() {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
diff --git a/tests/baselines/reference/es5-system2.js b/tests/baselines/reference/es5-system2.js
new file mode 100644
index 00000000000..39b5e5daca2
--- /dev/null
+++ b/tests/baselines/reference/es5-system2.js
@@ -0,0 +1,16 @@
+//// [es5-system2.ts]
+
+export var __esModule = 1;
+
+//// [es5-system2.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var __moduleName = context_1 && context_1.id;
+    var __esModule;
+    return {
+        setters: [],
+        execute: function () {
+            exports_1("__esModule", __esModule = 1);
+        }
+    };
+});
diff --git a/tests/baselines/reference/es5-system2.symbols b/tests/baselines/reference/es5-system2.symbols
new file mode 100644
index 00000000000..2c8779b730b
--- /dev/null
+++ b/tests/baselines/reference/es5-system2.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/es5-system2.ts ===
+
+export var __esModule = 1;
+>__esModule : Symbol(__esModule, Decl(es5-system2.ts, 1, 10))
+
diff --git a/tests/baselines/reference/es5-system2.types b/tests/baselines/reference/es5-system2.types
new file mode 100644
index 00000000000..e67258a8732
--- /dev/null
+++ b/tests/baselines/reference/es5-system2.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/es5-system2.ts ===
+
+export var __esModule = 1;
+>__esModule : number
+>1 : 1
+
diff --git a/tests/baselines/reference/es5-umd2.js b/tests/baselines/reference/es5-umd2.js
index 76333572abe..b55422ca7b1 100644
--- a/tests/baselines/reference/es5-umd2.js
+++ b/tests/baselines/reference/es5-umd2.js
@@ -25,6 +25,7 @@ export class A
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
diff --git a/tests/baselines/reference/es5-umd3.js b/tests/baselines/reference/es5-umd3.js
index 0689ef19da3..37b19ece1ac 100644
--- a/tests/baselines/reference/es5-umd3.js
+++ b/tests/baselines/reference/es5-umd3.js
@@ -25,6 +25,7 @@ export default class A
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
@@ -33,6 +34,5 @@ export default class A
         };
         return A;
     }());
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = A;
 });
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js
index fc8acfb95ea..25a1db0a25f 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js
@@ -7,13 +7,13 @@ export default class C {
 
 //// [es5ExportDefaultClassDeclaration.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var C = (function () {
     function C() {
     }
     C.prototype.method = function () { };
     return C;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = C;
 
 
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
index 0f60a104a7e..931eab75c72 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
@@ -7,13 +7,13 @@ export default class {
 
 //// [es5ExportDefaultClassDeclaration2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var default_1 = (function () {
     function default_1() {
     }
     default_1.prototype.method = function () { };
     return default_1;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 
 
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js
index 00af2676a0d..927536114ef 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js
@@ -16,6 +16,7 @@ var t: typeof C = C;
 
 //// [es5ExportDefaultClassDeclaration3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var before = new C();
 var C = (function () {
     function C() {
@@ -25,7 +26,6 @@ var C = (function () {
     };
     return C;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = C;
 var after = new C();
 var t = C;
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js
index 55de6b62b83..068a966faa2 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js
@@ -5,8 +5,8 @@ export default function f() { }
 
 //// [es5ExportDefaultFunctionDeclaration.js]
 "use strict";
-function f() { }
 Object.defineProperty(exports, "__esModule", { value: true });
+function f() { }
 exports.default = f;
 
 
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
index e6007cc9147..ab44c4cb584 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
@@ -5,8 +5,8 @@ export default function () { }
 
 //// [es5ExportDefaultFunctionDeclaration2.js]
 "use strict";
-function default_1() { }
 Object.defineProperty(exports, "__esModule", { value: true });
+function default_1() { }
 exports.default = default_1;
 
 
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js
index 54a2658470e..c4bbcd4373e 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js
@@ -10,11 +10,11 @@ var after: typeof func = func();
 
 //// [es5ExportDefaultFunctionDeclaration3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var before = func();
 function func() {
     return func;
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = func;
 var after = func();
 
diff --git a/tests/baselines/reference/es5ExportDefaultIdentifier.js b/tests/baselines/reference/es5ExportDefaultIdentifier.js
index b3840caf145..d60fba590ac 100644
--- a/tests/baselines/reference/es5ExportDefaultIdentifier.js
+++ b/tests/baselines/reference/es5ExportDefaultIdentifier.js
@@ -7,9 +7,9 @@ export default f;
 
 //// [es5ExportDefaultIdentifier.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function f() { }
 exports.f = f;
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f;
 
 
diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.js b/tests/baselines/reference/es5ModuleInternalNamedImports.js
index cc596980889..abc81b3dc94 100644
--- a/tests/baselines/reference/es5ModuleInternalNamedImports.js
+++ b/tests/baselines/reference/es5ModuleInternalNamedImports.js
@@ -39,6 +39,7 @@ import M3 from "M3";
 //// [es5ModuleInternalNamedImports.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var M;
     (function (M) {
         // variable
diff --git a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js
index 7060153f0d0..dc55545617d 100644
--- a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js
+++ b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js
@@ -14,6 +14,7 @@ export class A
 //// [es5ModuleWithModuleGenAmd.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
diff --git a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js
index e5f995fb5e0..93056203f9b 100644
--- a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js
+++ b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js
@@ -13,6 +13,7 @@ export class A
 
 //// [es5ModuleWithModuleGenCommonjs.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
     }
diff --git a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js
index 34ad74818b2..89d11045dda 100644
--- a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js
+++ b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js
@@ -13,6 +13,7 @@ export class A
 
 //// [es5ModuleWithoutModuleGenTarget.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
     }
diff --git a/tests/baselines/reference/es6-umd2.js b/tests/baselines/reference/es6-umd2.js
index dc094122d9d..c0707b869cc 100644
--- a/tests/baselines/reference/es6-umd2.js
+++ b/tests/baselines/reference/es6-umd2.js
@@ -24,6 +24,7 @@ export class A
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class A {
         constructor() {
         }
diff --git a/tests/baselines/reference/es6ExportAllInEs5.js b/tests/baselines/reference/es6ExportAllInEs5.js
index 73de2e7cce3..91910ba2616 100644
--- a/tests/baselines/reference/es6ExportAllInEs5.js
+++ b/tests/baselines/reference/es6ExportAllInEs5.js
@@ -18,6 +18,7 @@ export * from "./server";
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var c = (function () {
     function c() {
     }
@@ -34,6 +35,7 @@ exports.x = 10;
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./server"));
 
 
diff --git a/tests/baselines/reference/es6ExportClauseInEs5.js b/tests/baselines/reference/es6ExportClauseInEs5.js
index f602f1ff609..3d3625aad18 100644
--- a/tests/baselines/reference/es6ExportClauseInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseInEs5.js
@@ -18,6 +18,7 @@ export { x };
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var c = (function () {
     function c() {
     }
diff --git a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
index 5add71a06f2..d8aa8e607e3 100644
--- a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
@@ -19,6 +19,7 @@ export { foo, baz, baz as quux, buzz, bizz };
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var foo = 2;
 exports.foo = foo;
 exports.foo = foo = 3;
diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
index ab9bd3d98c8..ecfccd5d843 100644
--- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
@@ -22,6 +22,7 @@ export { x } from "./server";
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var c = (function () {
     function c() {
     }
@@ -35,6 +36,7 @@ var m;
 exports.x = 10;
 //// [client.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var server_1 = require("./server");
 exports.c = server_1.c;
 var server_2 = require("./server");
diff --git a/tests/baselines/reference/es6ExportEqualsInterop.js b/tests/baselines/reference/es6ExportEqualsInterop.js
index 49a8a7e435a..d1f8de5faa7 100644
--- a/tests/baselines/reference/es6ExportEqualsInterop.js
+++ b/tests/baselines/reference/es6ExportEqualsInterop.js
@@ -213,6 +213,7 @@ export * from "class-module";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+exports.__esModule = true;
 var z2 = require("variable");
 var z3 = require("interface-variable");
 var z4 = require("module");
diff --git a/tests/baselines/reference/es6ImportDefaultBindingAmd.js b/tests/baselines/reference/es6ImportDefaultBindingAmd.js
index 9de16453c6e..977b94f8790 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingAmd.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingAmd.js
@@ -14,13 +14,14 @@ import defaultBinding2 from "es6ImportDefaultBindingAmd_0"; // elide this import
 //// [es6ImportDefaultBindingAmd_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var a = 10;
     Object.defineProperty(exports, "__esModule", { value: true });
+    var a = 10;
     exports.default = a;
 });
 //// [es6ImportDefaultBindingAmd_1.js]
 define(["require", "exports", "es6ImportDefaultBindingAmd_0"], function (require, exports, es6ImportDefaultBindingAmd_0_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var x = es6ImportDefaultBindingAmd_0_1.default;
 });
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingDts.js
index dbc90cb80a3..94b824a3766 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingDts.js
@@ -13,15 +13,16 @@ import defaultBinding2 from "./server"; // elide this import since defaultBindin
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var c = (function () {
     function c() {
     }
     return c;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = c;
 //// [client.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var server_1 = require("./server");
 exports.x = new server_1.default();
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
index 4bff2abf82d..8335a1953de 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
@@ -24,13 +24,14 @@ var x1: number = m;
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {};
 //// [es6ImportDefaultBindingFollowedWithNamedImport_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const es6ImportDefaultBindingFollowedWithNamedImport_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0");
 var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_1.a;
 const es6ImportDefaultBindingFollowedWithNamedImport_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0");
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
index fde7556edea..8eb76b487f8 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
@@ -22,11 +22,12 @@ var x: number = defaultBinding6;
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.js]
 "use strict";
-var a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+var a = 10;
 exports.default = a;
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1.default;
 var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
index 6131ff40624..d72751c7610 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
@@ -22,11 +22,12 @@ export var x1: number = defaultBinding6;
 
 //// [server.js]
 "use strict";
-var a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+var a = 10;
 exports.default = a;
 //// [client.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var server_1 = require("./server");
 exports.x1 = server_1.default;
 var server_2 = require("./server");
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
index a0916932d4c..5bf268709d3 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
@@ -26,6 +26,7 @@ export var x6 = new m();
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 var a = (function () {
     function a() {
     }
@@ -64,6 +65,7 @@ var x11 = (function () {
 exports.x11 = x11;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var server_1 = require("./server");
 exports.x1 = new server_1.a();
 var server_2 = require("./server");
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
index b588c9516e9..307dcc92f46 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
@@ -21,15 +21,16 @@ export var x6 = new defaultBinding6();
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var a = (function () {
     function a() {
     }
     return a;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
 //// [client.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var server_1 = require("./server");
 exports.x1 = new server_1.default();
 var server_2 = require("./server");
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
index c075c5c934f..2e9d8104a39 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
@@ -23,11 +23,13 @@ var x1: number = m;
 
 //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
 //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
 var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1.a;
 var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
index aa89c8d4380..77266084bda 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
@@ -25,15 +25,16 @@ export var x1: number = m;
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.a = 10;
     exports.x = exports.a;
     exports.m = exports.a;
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = {};
 });
 //// [client.js]
 define(["require", "exports", "server", "server", "server", "server", "server"], function (require, exports, server_1, server_2, server_3, server_4, server_5) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.x1 = server_1.a;
     exports.x1 = server_2.a;
     exports.x1 = server_3.x;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
index 0a0e028b696..c1c41968934 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
@@ -11,11 +11,12 @@ var x: number = defaultBinding;
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js]
 "use strict";
-var a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+var a = 10;
 exports.default = a;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1.default;
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
index 5f2cb4e97e0..b82fb9aeee9 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
@@ -12,13 +12,14 @@ export var x: number = defaultBinding;
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var a = 10;
     Object.defineProperty(exports, "__esModule", { value: true });
+    var a = 10;
     exports.default = a;
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = server_1.default;
 });
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
index 60bdc654842..8d033c69536 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
@@ -10,6 +10,7 @@ export var x = new nameSpaceBinding.a();
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 var a = (function () {
     function a() {
     }
@@ -18,6 +19,7 @@ var a = (function () {
 exports.a = a;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var nameSpaceBinding = require("./server");
 exports.x = new nameSpaceBinding.a();
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
index 8752157eddd..c488db3e88e 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
@@ -12,17 +12,18 @@ export var x = new defaultBinding();
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var a = (function () {
         function a() {
         }
         return a;
     }());
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = a;
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = new server_1.default();
 });
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
index 9d11e154755..0db21dfd064 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
@@ -10,9 +10,11 @@ var x: number = nameSpaceBinding.a;
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var nameSpaceBinding = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0");
 var x = nameSpaceBinding.a;
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
index e16ebf99957..96720294a8a 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
@@ -10,9 +10,11 @@ export var x: number = nameSpaceBinding.a;
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 exports.a = 10;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var nameSpaceBinding = require("./server");
 exports.x = nameSpaceBinding.a;
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingInEs5.js
index 257e76bfe02..f6ea8348118 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingInEs5.js
@@ -14,6 +14,7 @@ var a = 10;
 module.exports = a;
 //// [es6ImportDefaultBindingInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
index e686c3f33c9..4c51a54462d 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
@@ -18,11 +18,12 @@ import defaultBinding3 from "./es6ImportDefaultBindingMergeErrors_0"; // SHould
 
 //// [es6ImportDefaultBindingMergeErrors_0.js]
 "use strict";
-var a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+var a = 10;
 exports.default = a;
 //// [es6ImportDefaultBindingMergeErrors_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var es6ImportDefaultBindingMergeErrors_0_1 = require("./es6ImportDefaultBindingMergeErrors_0");
 var x = es6ImportDefaultBindingMergeErrors_0_1.default;
 var defaultBinding2 = "hello world";
diff --git a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
index 5513ae565f2..e294c08befa 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
@@ -10,6 +10,8 @@ import defaultBinding from "./es6ImportDefaultBindingNoDefaultProperty_0";
 
 //// [es6ImportDefaultBindingNoDefaultProperty_0.js]
 "use strict";
+exports.__esModule = true;
 exports.a = 10;
 //// [es6ImportDefaultBindingNoDefaultProperty_1.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
index cc90d280914..a9f760f1278 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
@@ -13,13 +13,14 @@ export import defaultBinding2 from "server"; // non referenced
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var a = 10;
     Object.defineProperty(exports, "__esModule", { value: true });
+    var a = 10;
     exports.default = a;
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = server_1.default;
 });
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImport.js b/tests/baselines/reference/es6ImportNameSpaceImport.js
index 8e109779f45..b5296d15f9b 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImport.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImport.js
@@ -12,9 +12,11 @@ import * as nameSpaceBinding2 from "./es6ImportNameSpaceImport_0"; // elide this
 
 //// [es6ImportNameSpaceImport_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 //// [es6ImportNameSpaceImport_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const nameSpaceBinding = require("./es6ImportNameSpaceImport_0");
 var x = nameSpaceBinding.a;
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
index 093e8385bae..200f49a2986 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
@@ -13,11 +13,13 @@ import * as nameSpaceBinding2 from "es6ImportNameSpaceImportAmd_0"; // elide thi
 //// [es6ImportNameSpaceImportAmd_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = 10;
 });
 //// [es6ImportNameSpaceImportAmd_1.js]
 define(["require", "exports", "es6ImportNameSpaceImportAmd_0"], function (require, exports, nameSpaceBinding) {
     "use strict";
+    exports.__esModule = true;
     var x = nameSpaceBinding.a;
 });
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportDts.js b/tests/baselines/reference/es6ImportNameSpaceImportDts.js
index cf66c08331e..cae90885ce2 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportDts.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportDts.js
@@ -11,6 +11,7 @@ import * as nameSpaceBinding2 from "./server"; // unreferenced
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 var c = (function () {
     function c() {
     }
@@ -20,6 +21,7 @@ exports.c = c;
 ;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var nameSpaceBinding = require("./server");
 exports.x = new nameSpaceBinding.c();
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
index 252d131f824..ee00df9a2cc 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
@@ -12,9 +12,11 @@ import * as nameSpaceBinding2 from "./es6ImportNameSpaceImportInEs5_0"; // elide
 
 //// [es6ImportNameSpaceImportInEs5_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 //// [es6ImportNameSpaceImportInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var nameSpaceBinding = require("./es6ImportNameSpaceImportInEs5_0");
 var x = nameSpaceBinding.a;
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
index 9bdd0318310..39594102007 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
@@ -17,7 +17,9 @@ var nameSpaceBinding3 = 10;
 
 //// [es6ImportNameSpaceImportMergeErrors_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 //// [es6ImportNameSpaceImportMergeErrors_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var nameSpaceBinding3 = 10;
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js b/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js
index 8ece816fd3b..0276c44f8ab 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js
@@ -14,3 +14,4 @@ var a = 10;
 module.exports = a;
 //// [es6ImportNameSpaceImportNoNamedExports_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
index e21ab603f82..3c8b40f550e 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
@@ -13,11 +13,13 @@ export import * as nameSpaceBinding2 from "server"; // Not referenced imports
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = 10;
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, nameSpaceBinding) {
     "use strict";
+    exports.__esModule = true;
     exports.x = nameSpaceBinding.a;
 });
 
diff --git a/tests/baselines/reference/es6ImportNamedImport.js b/tests/baselines/reference/es6ImportNamedImport.js
index 8dbdf7ce6f1..a9fcb861ec5 100644
--- a/tests/baselines/reference/es6ImportNamedImport.js
+++ b/tests/baselines/reference/es6ImportNamedImport.js
@@ -43,6 +43,7 @@ import { aaaa as bbbb } from "./es6ImportNamedImport_0";
 
 //// [es6ImportNamedImport_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
@@ -53,6 +54,7 @@ exports.z2 = 10;
 exports.aaaa = 10;
 //// [es6ImportNamedImport_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const es6ImportNamedImport_0_1 = require("./es6ImportNamedImport_0");
 var xxxx = es6ImportNamedImport_0_1.a;
 const es6ImportNamedImport_0_2 = require("./es6ImportNamedImport_0");
diff --git a/tests/baselines/reference/es6ImportNamedImportAmd.js b/tests/baselines/reference/es6ImportNamedImportAmd.js
index 278e4ee07d2..bd6213f259f 100644
--- a/tests/baselines/reference/es6ImportNamedImportAmd.js
+++ b/tests/baselines/reference/es6ImportNamedImportAmd.js
@@ -44,6 +44,7 @@ import { aaaa as bbbb } from "es6ImportNamedImportAmd_0";
 //// [es6ImportNamedImportAmd_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = 10;
     exports.x = exports.a;
     exports.m = exports.a;
@@ -56,6 +57,7 @@ define(["require", "exports"], function (require, exports) {
 //// [es6ImportNamedImportAmd_1.js]
 define(["require", "exports", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0"], function (require, exports, es6ImportNamedImportAmd_0_1, es6ImportNamedImportAmd_0_2, es6ImportNamedImportAmd_0_3, es6ImportNamedImportAmd_0_4, es6ImportNamedImportAmd_0_5, es6ImportNamedImportAmd_0_6, es6ImportNamedImportAmd_0_7, es6ImportNamedImportAmd_0_8, es6ImportNamedImportAmd_0_9) {
     "use strict";
+    exports.__esModule = true;
     var xxxx = es6ImportNamedImportAmd_0_1.a;
     var xxxx = es6ImportNamedImportAmd_0_2.a;
     var xxxx = es6ImportNamedImportAmd_0_3.x;
diff --git a/tests/baselines/reference/es6ImportNamedImportDts.js b/tests/baselines/reference/es6ImportNamedImportDts.js
index 7fdf620164b..d68ffd794a7 100644
--- a/tests/baselines/reference/es6ImportNamedImportDts.js
+++ b/tests/baselines/reference/es6ImportNamedImportDts.js
@@ -48,6 +48,7 @@ import { aaaa1 as bbbb } from "./server";
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 var a = (function () {
     function a() {
     }
@@ -134,6 +135,7 @@ var aaaa1 = (function () {
 exports.aaaa1 = aaaa1;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var server_1 = require("./server");
 exports.xxxx = new server_1.a();
 var server_2 = require("./server");
diff --git a/tests/baselines/reference/es6ImportNamedImportInEs5.js b/tests/baselines/reference/es6ImportNamedImportInEs5.js
index 3f3e4694758..9e025dca61b 100644
--- a/tests/baselines/reference/es6ImportNamedImportInEs5.js
+++ b/tests/baselines/reference/es6ImportNamedImportInEs5.js
@@ -43,6 +43,7 @@ import { aaaa as bbbb } from "./es6ImportNamedImportInEs5_0";
 
 //// [es6ImportNamedImportInEs5_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
@@ -53,6 +54,7 @@ exports.z2 = 10;
 exports.aaaa = 10;
 //// [es6ImportNamedImportInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var es6ImportNamedImportInEs5_0_1 = require("./es6ImportNamedImportInEs5_0");
 var xxxx = es6ImportNamedImportInEs5_0_1.a;
 var es6ImportNamedImportInEs5_0_2 = require("./es6ImportNamedImportInEs5_0");
diff --git a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
index 38766d32cd9..d64b517c50f 100644
--- a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
+++ b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
@@ -10,6 +10,7 @@ export = a;
 
 //// [es6ImportNamedImportInExportAssignment_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 //// [es6ImportNamedImportInExportAssignment_1.js]
 "use strict";
diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
index 3e85778de58..38cda17bd7e 100644
--- a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
+++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
@@ -14,6 +14,7 @@ export = x;
 
 //// [es6ImportNamedImportInIndirectExportAssignment_0.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var c = (function () {
diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
index 002aa5a49ce..261039bcc10 100644
--- a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
+++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
@@ -22,11 +22,13 @@ import { z1 as z } from "./es6ImportNamedImportMergeErrors_0"; // should be erro
 
 //// [es6ImportNamedImportMergeErrors_0.js]
 "use strict";
+exports.__esModule = true;
 exports.a = 10;
 exports.x = exports.a;
 exports.z = exports.a;
 exports.z1 = exports.a;
 //// [es6ImportNamedImportMergeErrors_1.js]
 "use strict";
+exports.__esModule = true;
 var x = 10;
 var x44 = 10;
diff --git a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
index 71159983b9a..4e78df34b6d 100644
--- a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
+++ b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
@@ -11,7 +11,9 @@ import { x1 as x } from "./es6ImportNamedImportNoExportMember_0";
 
 //// [es6ImportNamedImportNoExportMember_0.js]
 "use strict";
+exports.__esModule = true;
 exports.a = 10;
 exports.x = exports.a;
 //// [es6ImportNamedImport_1.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js b/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js
index 2198df11f78..a02116b314d 100644
--- a/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js
+++ b/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js
@@ -15,3 +15,4 @@ var a = 10;
 module.exports = a;
 //// [es6ImportNamedImportNoNamedExports_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es6ImportNamedImportWithExport.js b/tests/baselines/reference/es6ImportNamedImportWithExport.js
index 21ccb29a57b..13e2d40144b 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithExport.js
+++ b/tests/baselines/reference/es6ImportNamedImportWithExport.js
@@ -42,6 +42,7 @@ export import { aaaa as bbbb } from "./server";
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
@@ -52,6 +53,7 @@ exports.z2 = 10;
 exports.aaaa = 10;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var server_1 = require("./server");
 exports.xxxx = server_1.a;
 var server_2 = require("./server");
diff --git a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
index 583a008f0ac..0aa3214e5d7 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
+++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
@@ -22,6 +22,7 @@ export var cVal = new C();
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
         this.prop = "hello";
@@ -38,6 +39,7 @@ var C2 = (function () {
 exports.C2 = C2;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var server_1 = require("./server"); // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file
 exports.cVal = new server_1.C();
 
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
index ea533a9a963..d83ba9370ee 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
@@ -16,16 +16,19 @@ var _b = 10;
 //// [es6ImportWithoutFromClauseAmd_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = 10;
 });
 //// [es6ImportWithoutFromClauseAmd_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.b = 10;
 });
 //// [es6ImportWithoutFromClauseAmd_2.js]
 define(["require", "exports", "es6ImportWithoutFromClauseAmd_0", "es6ImportWithoutFromClauseAmd_2"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var _a = 10;
     var _b = 10;
 });
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
index d0f7c9fbe65..b11e2ea9a07 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
@@ -9,9 +9,11 @@ import "es6ImportWithoutFromClauseInEs5_0";
 
 //// [es6ImportWithoutFromClauseInEs5_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 //// [es6ImportWithoutFromClauseInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 require("es6ImportWithoutFromClauseInEs5_0");
 
 
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js
index 5ff5b62d8ec..99214d2a2c6 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js
@@ -9,9 +9,11 @@ export import "server";
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 exports.a = 10;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 require("server");
 
 
diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js
index 172ce2a8729..4ced3a35ab2 100644
--- a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js
+++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js
@@ -14,6 +14,7 @@ export class A
 //// [es6ModuleWithModuleGenTargetAmd.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class A {
         constructor() {
         }
diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js
index f932bb7072f..187ece7e718 100644
--- a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js
+++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js
@@ -13,6 +13,7 @@ export class A
 
 //// [es6ModuleWithModuleGenTargetCommonjs.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class A {
     constructor() {
     }
diff --git a/tests/baselines/reference/exportAndImport-es3-amd.js b/tests/baselines/reference/exportAndImport-es3-amd.js
index 5f37f0f0220..d19de0c78b0 100644
--- a/tests/baselines/reference/exportAndImport-es3-amd.js
+++ b/tests/baselines/reference/exportAndImport-es3-amd.js
@@ -15,17 +15,17 @@ export default function f2() {
 //// [m1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function f1() {
     }
-    exports.__esModule = true;
     exports["default"] = f1;
 });
 //// [m2.js]
 define(["require", "exports", "./m1"], function (require, exports, m1_1) {
     "use strict";
+    exports.__esModule = true;
     function f2() {
         m1_1["default"]();
     }
-    exports.__esModule = true;
     exports["default"] = f2;
 });
diff --git a/tests/baselines/reference/exportAndImport-es3.js b/tests/baselines/reference/exportAndImport-es3.js
index ee1f562258f..13b6f1eaf48 100644
--- a/tests/baselines/reference/exportAndImport-es3.js
+++ b/tests/baselines/reference/exportAndImport-es3.js
@@ -14,15 +14,15 @@ export default function f2() {
 
 //// [m1.js]
 "use strict";
+exports.__esModule = true;
 function f1() {
 }
-exports.__esModule = true;
 exports["default"] = f1;
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m1_1 = require("./m1");
 function f2() {
     m1_1["default"]();
 }
-exports.__esModule = true;
 exports["default"] = f2;
diff --git a/tests/baselines/reference/exportAndImport-es5-amd.js b/tests/baselines/reference/exportAndImport-es5-amd.js
index 0e2cb890d2a..60b1246b616 100644
--- a/tests/baselines/reference/exportAndImport-es5-amd.js
+++ b/tests/baselines/reference/exportAndImport-es5-amd.js
@@ -15,17 +15,17 @@ export default function f2() {
 //// [m1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function f1() {
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = f1;
 });
 //// [m2.js]
 define(["require", "exports", "./m1"], function (require, exports, m1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function f2() {
         m1_1.default();
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = f2;
 });
diff --git a/tests/baselines/reference/exportAndImport-es5.js b/tests/baselines/reference/exportAndImport-es5.js
index 1d2511735c7..f4bc496e6b2 100644
--- a/tests/baselines/reference/exportAndImport-es5.js
+++ b/tests/baselines/reference/exportAndImport-es5.js
@@ -14,15 +14,15 @@ export default function f2() {
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function f1() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f1;
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("./m1");
 function f2() {
     m1_1.default();
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f2;
diff --git a/tests/baselines/reference/exportArrayBindingPattern.js b/tests/baselines/reference/exportArrayBindingPattern.js
index 386419e5725..b5568109763 100644
--- a/tests/baselines/reference/exportArrayBindingPattern.js
+++ b/tests/baselines/reference/exportArrayBindingPattern.js
@@ -5,6 +5,7 @@ export { a, b };
 
 //// [exportArrayBindingPattern.js]
 "use strict";
+exports.__esModule = true;
 // issue: https://github.com/Microsoft/TypeScript/issues/10778
 var _a = [1, 2, 3], a = _a[0], b = _a[2];
 exports.a = a;
diff --git a/tests/baselines/reference/exportAssignClassAndModule.js b/tests/baselines/reference/exportAssignClassAndModule.js
index bdfceef6b80..9f3eaf78480 100644
--- a/tests/baselines/reference/exportAssignClassAndModule.js
+++ b/tests/baselines/reference/exportAssignClassAndModule.js
@@ -28,6 +28,7 @@ var Foo = (function () {
 module.exports = Foo;
 //// [exportAssignClassAndModule_1.js]
 "use strict";
+exports.__esModule = true;
 var z;
 var zz;
 zz.x;
diff --git a/tests/baselines/reference/exportAssignDottedName.js b/tests/baselines/reference/exportAssignDottedName.js
index c9c3ffa80c4..592d97dbaa0 100644
--- a/tests/baselines/reference/exportAssignDottedName.js
+++ b/tests/baselines/reference/exportAssignDottedName.js
@@ -12,6 +12,7 @@ export = foo1.x; // Ok
 
 //// [foo1.js]
 "use strict";
+exports.__esModule = true;
 function x() {
     return true;
 }
diff --git a/tests/baselines/reference/exportAssignImportedIdentifier.js b/tests/baselines/reference/exportAssignImportedIdentifier.js
index a469e90b619..208df4eff63 100644
--- a/tests/baselines/reference/exportAssignImportedIdentifier.js
+++ b/tests/baselines/reference/exportAssignImportedIdentifier.js
@@ -16,6 +16,7 @@ var x = foo2(); // should be boolean
 
 //// [foo1.js]
 "use strict";
+exports.__esModule = true;
 function x() {
     return true;
 }
@@ -27,5 +28,6 @@ var x = foo1.x;
 module.exports = x;
 //// [foo3.js]
 "use strict";
+exports.__esModule = true;
 var foo2 = require("./foo2");
 var x = foo2(); // should be boolean
diff --git a/tests/baselines/reference/exportAssignTypes.js b/tests/baselines/reference/exportAssignTypes.js
index 02b34715483..bed4480f393 100644
--- a/tests/baselines/reference/exportAssignTypes.js
+++ b/tests/baselines/reference/exportAssignTypes.js
@@ -85,6 +85,7 @@ function x(a) {
 module.exports = x;
 //// [consumer.js]
 "use strict";
+exports.__esModule = true;
 var iString = require("./expString");
 var v1 = iString;
 var iNumber = require("./expNumber");
diff --git a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js
index 26a43e10c6c..d4b6961cfe9 100644
--- a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js
+++ b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js
@@ -17,9 +17,11 @@ var t2: test; // should not raise a 'container type' error
 //// [exportAssignedTypeAsTypeAnnotation_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [exportAssignedTypeAsTypeAnnotation_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var t2; // should not raise a 'container type' error
 });
diff --git a/tests/baselines/reference/exportAssignmentClass.js b/tests/baselines/reference/exportAssignmentClass.js
index 02c74fe1f39..549ad5bbd4d 100644
--- a/tests/baselines/reference/exportAssignmentClass.js
+++ b/tests/baselines/reference/exportAssignmentClass.js
@@ -25,6 +25,7 @@ define(["require", "exports"], function (require, exports) {
 //// [exportAssignmentClass_B.js]
 define(["require", "exports", "exportAssignmentClass_A"], function (require, exports, D) {
     "use strict";
+    exports.__esModule = true;
     var d = new D();
     var x = d.p;
 });
diff --git a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js
index c0b8f2b50c1..eddbddf8d6d 100644
--- a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js
+++ b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js
@@ -24,6 +24,7 @@ var Foo = (function () {
 module.exports = Foo;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0");
 var x = new foo(true); // Should error
 var y = new foo({ a: "test", b: 42 }); // Should be OK
diff --git a/tests/baselines/reference/exportAssignmentEnum.js b/tests/baselines/reference/exportAssignmentEnum.js
index a4ae6898bce..a32da0a2e3f 100644
--- a/tests/baselines/reference/exportAssignmentEnum.js
+++ b/tests/baselines/reference/exportAssignmentEnum.js
@@ -27,6 +27,7 @@ var E;
 module.exports = E;
 //// [exportAssignmentEnum_B.js]
 "use strict";
+exports.__esModule = true;
 var EnumE = require("./exportAssignmentEnum_A");
 var a = EnumE.A;
 var b = EnumE.B;
diff --git a/tests/baselines/reference/exportAssignmentFunction.js b/tests/baselines/reference/exportAssignmentFunction.js
index c8e90571cdb..775bb6b1af1 100644
--- a/tests/baselines/reference/exportAssignmentFunction.js
+++ b/tests/baselines/reference/exportAssignmentFunction.js
@@ -19,5 +19,6 @@ define(["require", "exports"], function (require, exports) {
 //// [exportAssignmentFunction_B.js]
 define(["require", "exports", "exportAssignmentFunction_A"], function (require, exports, fooFunc) {
     "use strict";
+    exports.__esModule = true;
     var n = fooFunc();
 });
diff --git a/tests/baselines/reference/exportAssignmentGenericType.js b/tests/baselines/reference/exportAssignmentGenericType.js
index 390a929ce35..95563aa36a9 100644
--- a/tests/baselines/reference/exportAssignmentGenericType.js
+++ b/tests/baselines/reference/exportAssignmentGenericType.js
@@ -22,6 +22,7 @@ var Foo = (function () {
 module.exports = Foo;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0");
 var x = new foo();
 var y = x.test;
diff --git a/tests/baselines/reference/exportAssignmentInterface.js b/tests/baselines/reference/exportAssignmentInterface.js
index be3f696b19b..f3cc9ae9bbe 100644
--- a/tests/baselines/reference/exportAssignmentInterface.js
+++ b/tests/baselines/reference/exportAssignmentInterface.js
@@ -17,10 +17,12 @@ var n: number = i.p1;
 //// [exportAssignmentInterface_A.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [exportAssignmentInterface_B.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var i;
     var n = i.p1;
 });
diff --git a/tests/baselines/reference/exportAssignmentInternalModule.js b/tests/baselines/reference/exportAssignmentInternalModule.js
index 7b2443fc26d..b5c45785f8f 100644
--- a/tests/baselines/reference/exportAssignmentInternalModule.js
+++ b/tests/baselines/reference/exportAssignmentInternalModule.js
@@ -23,5 +23,6 @@ define(["require", "exports"], function (require, exports) {
 //// [exportAssignmentInternalModule_B.js]
 define(["require", "exports", "exportAssignmentInternalModule_A"], function (require, exports, modM) {
     "use strict";
+    exports.__esModule = true;
     var n = modM.x;
 });
diff --git a/tests/baselines/reference/exportAssignmentMergedInterface.js b/tests/baselines/reference/exportAssignmentMergedInterface.js
index 97c6941cc33..3ee760dedfa 100644
--- a/tests/baselines/reference/exportAssignmentMergedInterface.js
+++ b/tests/baselines/reference/exportAssignmentMergedInterface.js
@@ -25,10 +25,12 @@ z = x.d;
 //// [foo_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [foo_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x;
     x("test");
     x(42);
diff --git a/tests/baselines/reference/exportAssignmentMergedModule.js b/tests/baselines/reference/exportAssignmentMergedModule.js
index aa2a7082f76..ef48895b5cb 100644
--- a/tests/baselines/reference/exportAssignmentMergedModule.js
+++ b/tests/baselines/reference/exportAssignmentMergedModule.js
@@ -47,6 +47,7 @@ var Foo;
 module.exports = Foo;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0");
 var a = foo.a();
 if (!!foo.b) {
diff --git a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js
index a2ddd50511c..6c61eeedfc1 100644
--- a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js
+++ b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js
@@ -18,8 +18,10 @@ var b = z(); // call signature - no error
 
 //// [exportAssignmentOfDeclaredExternalModule_0.js]
 "use strict";
+exports.__esModule = true;
 //// [exportAssignmentOfDeclaredExternalModule_1.js]
 "use strict";
+exports.__esModule = true;
 var x = new Sammy(); // error to use as constructor as there is not constructor symbol
 var y = Sammy(); // error to use interface name as call target
 var z; // no error - z is of type interface Sammy from module 'M'
diff --git a/tests/baselines/reference/exportAssignmentOfGenericType1.js b/tests/baselines/reference/exportAssignmentOfGenericType1.js
index bab7c815f19..9cd15ec01a4 100644
--- a/tests/baselines/reference/exportAssignmentOfGenericType1.js
+++ b/tests/baselines/reference/exportAssignmentOfGenericType1.js
@@ -36,6 +36,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 define(["require", "exports", "exportAssignmentOfGenericType1_0"], function (require, exports, q) {
     "use strict";
+    exports.__esModule = true;
     var M = (function (_super) {
         __extends(M, _super);
         function M() {
diff --git a/tests/baselines/reference/exportAssignmentTopLevelClodule.js b/tests/baselines/reference/exportAssignmentTopLevelClodule.js
index 9e073462aac..f4001e5ab15 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelClodule.js
+++ b/tests/baselines/reference/exportAssignmentTopLevelClodule.js
@@ -33,6 +33,7 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     if (foo.answer === 42) {
         var x = new foo();
     }
diff --git a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js
index 5043a684326..7ba5a655c20 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js
+++ b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js
@@ -34,6 +34,7 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     var color;
     if (color === foo.green) {
         color = foo.answer;
diff --git a/tests/baselines/reference/exportAssignmentTopLevelFundule.js b/tests/baselines/reference/exportAssignmentTopLevelFundule.js
index 0549700e464..f122b8fbe8b 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelFundule.js
+++ b/tests/baselines/reference/exportAssignmentTopLevelFundule.js
@@ -30,6 +30,7 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     if (foo.answer === 42) {
         var x = foo();
     }
diff --git a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js
index 03b4ae26af9..a7acbaf3496 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js
+++ b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js
@@ -25,6 +25,7 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     if (foo.answer === 42) {
     }
 });
diff --git a/tests/baselines/reference/exportAssignmentVariable.js b/tests/baselines/reference/exportAssignmentVariable.js
index 68a195230df..e6ccdb46f9a 100644
--- a/tests/baselines/reference/exportAssignmentVariable.js
+++ b/tests/baselines/reference/exportAssignmentVariable.js
@@ -16,5 +16,6 @@ var x = 0;
 module.exports = x;
 //// [exportAssignmentVariable_B.js]
 "use strict";
+exports.__esModule = true;
 var y = require("./exportAssignmentVariable_A");
 var n = y;
diff --git a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
index 19f872bad27..e0165098b20 100644
--- a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
+++ b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
@@ -22,18 +22,23 @@ export { x as a, } from
 
 //// [t1.js]
 "use strict";
+exports.__esModule = true;
 exports.x = "x";
 //// [t2.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.x = t1_1.x;
 //// [t3.js]
 "use strict";
+exports.__esModule = true;
 //// [t4.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.a = t1_1.x;
 //// [t5.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.a = t1_1.x;
diff --git a/tests/baselines/reference/exportDeclareClass1.js b/tests/baselines/reference/exportDeclareClass1.js
index 18ced8df9d6..950b3db26e5 100644
--- a/tests/baselines/reference/exportDeclareClass1.js
+++ b/tests/baselines/reference/exportDeclareClass1.js
@@ -12,6 +12,7 @@
 //// [exportDeclareClass1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     ;
     ;
 });
diff --git a/tests/baselines/reference/exportDeclaredModule.js b/tests/baselines/reference/exportDeclaredModule.js
index 419fecf42e0..473ebaa0492 100644
--- a/tests/baselines/reference/exportDeclaredModule.js
+++ b/tests/baselines/reference/exportDeclaredModule.js
@@ -17,5 +17,6 @@ var x: number = foo1.b();
 module.exports = M1;
 //// [foo2.js]
 "use strict";
+exports.__esModule = true;
 var foo1 = require("./foo1");
 var x = foo1.b();
diff --git a/tests/baselines/reference/exportDefaultProperty.js b/tests/baselines/reference/exportDefaultProperty.js
index 2dcef41d761..dddea6a6b73 100644
--- a/tests/baselines/reference/exportDefaultProperty.js
+++ b/tests/baselines/reference/exportDefaultProperty.js
@@ -43,6 +43,7 @@ fooLength + 1;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var A;
 (function (A) {
     var B = (function () {
@@ -55,7 +56,6 @@ var A;
         B.b = 0;
     })(B = A.B || (A.B = {}));
 })(A || (A = {}));
-exports.__esModule = true;
 exports["default"] = A.B;
 //// [b.js]
 "use strict";
@@ -63,6 +63,7 @@ exports.__esModule = true;
 exports["default"] = "foo".length;
 //// [index.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="declarations.d.ts" />
 var foobar_1 = require("foobar");
 var X = foobar_1["default"].X;
diff --git a/tests/baselines/reference/exportDefaultProperty2.js b/tests/baselines/reference/exportDefaultProperty2.js
index 2b0a5dce526..4922738430a 100644
--- a/tests/baselines/reference/exportDefaultProperty2.js
+++ b/tests/baselines/reference/exportDefaultProperty2.js
@@ -20,14 +20,15 @@ const x: B = { c: B };
 //// [a.js]
 // This test is just like exportEqualsProperty2, but with `export default`.
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
     return C;
 }());
-exports.__esModule = true;
 exports["default"] = C.B;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var a_1 = require("./a");
 var x = { c: a_1["default"] };
diff --git a/tests/baselines/reference/exportEqualCallable.js b/tests/baselines/reference/exportEqualCallable.js
index 9138da0d33d..177e3943ac7 100644
--- a/tests/baselines/reference/exportEqualCallable.js
+++ b/tests/baselines/reference/exportEqualCallable.js
@@ -22,5 +22,6 @@ define(["require", "exports"], function (require, exports) {
 //// [exportEqualCallable_1.js]
 define(["require", "exports", "exportEqualCallable_0"], function (require, exports, connect) {
     "use strict";
+    exports.__esModule = true;
     connect();
 });
diff --git a/tests/baselines/reference/exportEqualErrorType.js b/tests/baselines/reference/exportEqualErrorType.js
index aa715b7d9f2..4a65ce5fd49 100644
--- a/tests/baselines/reference/exportEqualErrorType.js
+++ b/tests/baselines/reference/exportEqualErrorType.js
@@ -30,5 +30,6 @@ define(["require", "exports"], function (require, exports) {
 //// [exportEqualErrorType_1.js]
 define(["require", "exports", "exportEqualErrorType_0"], function (require, exports, connect) {
     "use strict";
+    exports.__esModule = true;
     connect().use(connect.static('foo')); // Error  1      The property 'static' does not exist on value of type ''.
 });
diff --git a/tests/baselines/reference/exportEqualMemberMissing.js b/tests/baselines/reference/exportEqualMemberMissing.js
index 39074e10372..68ac9485f5f 100644
--- a/tests/baselines/reference/exportEqualMemberMissing.js
+++ b/tests/baselines/reference/exportEqualMemberMissing.js
@@ -27,6 +27,7 @@ var server;
 module.exports = server;
 //// [exportEqualMemberMissing_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='exportEqualMemberMissing_0.ts'/>
 var connect = require("./exportEqualMemberMissing_0");
 connect().use(connect.static('foo')); // Error	1	The property 'static' does not exist on value of type ''.
diff --git a/tests/baselines/reference/exportEqualsDefaultProperty.js b/tests/baselines/reference/exportEqualsDefaultProperty.js
index 6d75ef5d95d..9cf7a7b2ee8 100644
--- a/tests/baselines/reference/exportEqualsDefaultProperty.js
+++ b/tests/baselines/reference/exportEqualsDefaultProperty.js
@@ -23,5 +23,6 @@ var x = {
 module.exports = x;
 //// [imp.js]
 "use strict";
+exports.__esModule = true;
 var exp_1 = require("./exp");
 exp_1["default"].toExponential(2);
diff --git a/tests/baselines/reference/exportEqualsProperty.js b/tests/baselines/reference/exportEqualsProperty.js
index 9acb1ee49b7..e6bd09d5367 100644
--- a/tests/baselines/reference/exportEqualsProperty.js
+++ b/tests/baselines/reference/exportEqualsProperty.js
@@ -60,6 +60,7 @@ module.exports = A.B;
 module.exports = "foo".length;
 //// [index.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="declarations.d.ts" />
 var foobar_1 = require("foobar");
 var X2 = require("foobarx");
diff --git a/tests/baselines/reference/exportEqualsProperty2.js b/tests/baselines/reference/exportEqualsProperty2.js
index b5d91431722..36fcbdf3446 100644
--- a/tests/baselines/reference/exportEqualsProperty2.js
+++ b/tests/baselines/reference/exportEqualsProperty2.js
@@ -28,5 +28,6 @@ var C = (function () {
 module.exports = C.B;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var B = require("./a");
 var x = { c: B };
diff --git a/tests/baselines/reference/exportImport.js b/tests/baselines/reference/exportImport.js
index 8f785282080..615f3d266ab 100644
--- a/tests/baselines/reference/exportImport.js
+++ b/tests/baselines/reference/exportImport.js
@@ -29,11 +29,13 @@ define(["require", "exports"], function (require, exports) {
 //// [exporter.js]
 define(["require", "exports", "./w1"], function (require, exports, w) {
     "use strict";
+    exports.__esModule = true;
     exports.w = w;
 });
 //// [consumer.js]
 define(["require", "exports", "./exporter"], function (require, exports, e) {
     "use strict";
+    exports.__esModule = true;
     function w() {
         return new e.w();
     }
diff --git a/tests/baselines/reference/exportImportMultipleFiles.js b/tests/baselines/reference/exportImportMultipleFiles.js
index 345d2a6885a..31f5f218d65 100644
--- a/tests/baselines/reference/exportImportMultipleFiles.js
+++ b/tests/baselines/reference/exportImportMultipleFiles.js
@@ -15,17 +15,20 @@ lib.math.add(3, 4); // Shouldnt be error
 //// [exportImportMultipleFiles_math.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function add(a, b) { return a + b; }
     exports.add = add;
 });
 //// [exportImportMultipleFiles_library.js]
 define(["require", "exports", "exportImportMultipleFiles_math"], function (require, exports, math) {
     "use strict";
+    exports.__esModule = true;
     exports.math = math;
     exports.math.add(3, 4); // OK
 });
 //// [exportImportMultipleFiles_userCode.js]
 define(["require", "exports", "./exportImportMultipleFiles_library"], function (require, exports, lib) {
     "use strict";
+    exports.__esModule = true;
     lib.math.add(3, 4); // Shouldnt be error
 });
diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.js b/tests/baselines/reference/exportImportNonInstantiatedModule2.js
index 401183a5ead..1394d7492dd 100644
--- a/tests/baselines/reference/exportImportNonInstantiatedModule2.js
+++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.js
@@ -18,14 +18,17 @@ export function w(): e.w { // Should be OK
 //// [w1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [exporter.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [consumer.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function w() {
         return { name: 'value' };
     }
diff --git a/tests/baselines/reference/exportNonInitializedVariablesAMD.js b/tests/baselines/reference/exportNonInitializedVariablesAMD.js
index d8dd17a562c..f7ee0b8d4d8 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesAMD.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesAMD.js
@@ -37,6 +37,7 @@ export let h1: D = new D;
 //// [exportNonInitializedVariablesAMD.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var ;
     let;
     var ;
diff --git a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js
index f986ef7f36b..7623127aee8 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js
@@ -36,6 +36,7 @@ export let h1: D = new D;
 
 //// [exportNonInitializedVariablesCommonJS.js]
 "use strict";
+exports.__esModule = true;
 var ;
 let;
 var ;
diff --git a/tests/baselines/reference/exportNonInitializedVariablesUMD.js b/tests/baselines/reference/exportNonInitializedVariablesUMD.js
index 796818c650c..504c6e70084 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesUMD.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.js
@@ -45,6 +45,7 @@ export let h1: D = new D;
     }
 })(function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var ;
     let;
     var ;
diff --git a/tests/baselines/reference/exportRedeclarationTypeAliases.js b/tests/baselines/reference/exportRedeclarationTypeAliases.js
index b1e2e200634..c3e97cf3e10 100644
--- a/tests/baselines/reference/exportRedeclarationTypeAliases.js
+++ b/tests/baselines/reference/exportRedeclarationTypeAliases.js
@@ -5,5 +5,6 @@ export function Foo(): any {}
 
 //// [exportRedeclarationTypeAliases.js]
 "use strict";
+exports.__esModule = true;
 function Foo() { }
 exports.Foo = Foo;
diff --git a/tests/baselines/reference/exportSameNameFuncVar.js b/tests/baselines/reference/exportSameNameFuncVar.js
index 2bc77e079fb..dc0b24b98c3 100644
--- a/tests/baselines/reference/exportSameNameFuncVar.js
+++ b/tests/baselines/reference/exportSameNameFuncVar.js
@@ -6,6 +6,7 @@ export function a() {
 //// [exportSameNameFuncVar.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = 10;
     function a() {
     }
diff --git a/tests/baselines/reference/exportSpecifierForAGlobal.js b/tests/baselines/reference/exportSpecifierForAGlobal.js
index ac79a9bf69d..fe59f5071f2 100644
--- a/tests/baselines/reference/exportSpecifierForAGlobal.js
+++ b/tests/baselines/reference/exportSpecifierForAGlobal.js
@@ -14,6 +14,7 @@ export function f() {
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 function f() {
     var x;
     return x;
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.js b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.js
index cb06a818b08..0a8ebd10ee4 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.js
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.js
@@ -10,3 +10,4 @@ export declare function foo(): X.bar;
 //// [exportSpecifierReferencingOuterDeclaration2_A.js]
 //// [exportSpecifierReferencingOuterDeclaration2_B.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js
index 1badf469996..f0c6dd55984 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js
@@ -12,3 +12,4 @@ export declare function bar(): X.bar; // error
 //// [exportSpecifierReferencingOuterDeclaration2_A.js]
 //// [exportSpecifierReferencingOuterDeclaration2_B.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportStar-amd.js b/tests/baselines/reference/exportStar-amd.js
index bd4c112ff2e..f25a68a5aa6 100644
--- a/tests/baselines/reference/exportStar-amd.js
+++ b/tests/baselines/reference/exportStar-amd.js
@@ -32,6 +32,7 @@ foo;
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = 1;
     exports.y = 2;
 });
@@ -46,6 +47,7 @@ define(["require", "exports"], function (require, exports) {
 //// [t3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var x = "x";
     exports.x = x;
     var y = "y";
@@ -59,6 +61,7 @@ define(["require", "exports", "./t1", "./t2", "./t3"], function (require, export
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    Object.defineProperty(exports, "__esModule", { value: true });
     __export(t1_1);
     __export(t2_1);
     __export(t3_1);
@@ -66,6 +69,7 @@ define(["require", "exports", "./t1", "./t2", "./t3"], function (require, export
 //// [main.js]
 define(["require", "exports", "./t4"], function (require, exports, t4_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     t4_1.default;
     t4_1.x;
     t4_1.y;
diff --git a/tests/baselines/reference/exportStar.js b/tests/baselines/reference/exportStar.js
index a2bc44720fb..a188cefd8b6 100644
--- a/tests/baselines/reference/exportStar.js
+++ b/tests/baselines/reference/exportStar.js
@@ -31,6 +31,7 @@ foo;
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.x = 1;
 exports.y = 2;
 //// [t2.js]
@@ -41,6 +42,7 @@ function foo() { }
 exports.foo = foo;
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var x = "x";
 exports.x = x;
 var y = "y";
@@ -52,11 +54,13 @@ exports.z = z;
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./t1"));
 __export(require("./t2"));
 __export(require("./t3"));
 //// [main.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var t4_1 = require("./t4");
 t4_1.default;
 t4_1.x;
diff --git a/tests/baselines/reference/exportStarForValues.js b/tests/baselines/reference/exportStarForValues.js
index dd432ecc1d3..8376ec1927e 100644
--- a/tests/baselines/reference/exportStarForValues.js
+++ b/tests/baselines/reference/exportStarForValues.js
@@ -11,9 +11,11 @@ var x;
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x;
 });
diff --git a/tests/baselines/reference/exportStarForValues2.js b/tests/baselines/reference/exportStarForValues2.js
index e45d5bdd3ba..f18f9f1c587 100644
--- a/tests/baselines/reference/exportStarForValues2.js
+++ b/tests/baselines/reference/exportStarForValues2.js
@@ -15,14 +15,17 @@ var x = 1;
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x = 1;
 });
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x = 1;
 });
diff --git a/tests/baselines/reference/exportStarForValues3.js b/tests/baselines/reference/exportStarForValues3.js
index 9efe5ccf8e5..5ccd12f8a37 100644
--- a/tests/baselines/reference/exportStarForValues3.js
+++ b/tests/baselines/reference/exportStarForValues3.js
@@ -27,24 +27,29 @@ var x = 1;
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x = 1;
 });
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x = 1;
 });
 //// [file4.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x = 1;
 });
 //// [file5.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x = 1;
 });
diff --git a/tests/baselines/reference/exportStarForValues4.js b/tests/baselines/reference/exportStarForValues4.js
index 34b13bb00f3..e06b5e26207 100644
--- a/tests/baselines/reference/exportStarForValues4.js
+++ b/tests/baselines/reference/exportStarForValues4.js
@@ -19,14 +19,17 @@ var x = 1;
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x = 1;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x = 1;
 });
diff --git a/tests/baselines/reference/exportStarForValues5.js b/tests/baselines/reference/exportStarForValues5.js
index dc4d4c8b68e..37c8d59c91a 100644
--- a/tests/baselines/reference/exportStarForValues5.js
+++ b/tests/baselines/reference/exportStarForValues5.js
@@ -11,8 +11,10 @@ export var x;
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarForValues7.js b/tests/baselines/reference/exportStarForValues7.js
index 39a152fdc89..1f5163dd9cd 100644
--- a/tests/baselines/reference/exportStarForValues7.js
+++ b/tests/baselines/reference/exportStarForValues7.js
@@ -15,10 +15,12 @@ export var x = 1;
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.x = 1;
 });
 //// [file3.js]
@@ -27,6 +29,7 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) {
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    exports.__esModule = true;
     __export(file2_1);
     exports.x = 1;
 });
diff --git a/tests/baselines/reference/exportStarForValues8.js b/tests/baselines/reference/exportStarForValues8.js
index f8e7678a40c..6f52bce89f9 100644
--- a/tests/baselines/reference/exportStarForValues8.js
+++ b/tests/baselines/reference/exportStarForValues8.js
@@ -27,15 +27,18 @@ export var x = 1;
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.x = 1;
 });
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.x = 1;
 });
 //// [file4.js]
@@ -44,6 +47,7 @@ define(["require", "exports", "file2", "file3"], function (require, exports, fil
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    exports.__esModule = true;
     __export(file2_1);
     __export(file3_1);
     exports.x = 1;
@@ -54,6 +58,7 @@ define(["require", "exports", "file4"], function (require, exports, file4_1) {
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    exports.__esModule = true;
     __export(file4_1);
     exports.x = 1;
 });
diff --git a/tests/baselines/reference/exportStarForValues9.js b/tests/baselines/reference/exportStarForValues9.js
index e057e4d4027..3c34bb1afdb 100644
--- a/tests/baselines/reference/exportStarForValues9.js
+++ b/tests/baselines/reference/exportStarForValues9.js
@@ -19,6 +19,7 @@ export var x = 1;
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports, file2_1) {
@@ -26,6 +27,7 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) {
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    exports.__esModule = true;
     __export(file2_1);
     exports.x = 1;
 });
@@ -35,6 +37,7 @@ define(["require", "exports", "file3"], function (require, exports, file3_1) {
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    exports.__esModule = true;
     __export(file3_1);
     exports.x = 1;
 });
diff --git a/tests/baselines/reference/exportStarFromEmptyModule.js b/tests/baselines/reference/exportStarFromEmptyModule.js
index afb4d2f10c1..4fcac9312b9 100644
--- a/tests/baselines/reference/exportStarFromEmptyModule.js
+++ b/tests/baselines/reference/exportStarFromEmptyModule.js
@@ -25,6 +25,7 @@ X.A.r; // Error
 
 //// [exportStarFromEmptyModule_module1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
     }
@@ -38,6 +39,7 @@ exports.A = A;
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./exportStarFromEmptyModule_module2"));
 __export(require("./exportStarFromEmptyModule_module1"));
 var A = (function () {
@@ -48,6 +50,7 @@ var A = (function () {
 exports.A = A;
 //// [exportStarFromEmptyModule_module4.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var X = require("./exportStarFromEmptyModule_module3");
 var s;
 X.A.q;
diff --git a/tests/baselines/reference/exportToString.js b/tests/baselines/reference/exportToString.js
index 190d1693c24..d527a02741c 100644
--- a/tests/baselines/reference/exportToString.js
+++ b/tests/baselines/reference/exportToString.js
@@ -5,5 +5,6 @@ export { toString };
 
 //// [exportToString.js]
 "use strict";
+exports.__esModule = true;
 var toString = 0;
 exports.toString = toString;
diff --git a/tests/baselines/reference/exportVisibility.js b/tests/baselines/reference/exportVisibility.js
index a49cd744441..fbb2555d54b 100644
--- a/tests/baselines/reference/exportVisibility.js
+++ b/tests/baselines/reference/exportVisibility.js
@@ -11,6 +11,7 @@ export function test(foo: Foo) {
 
 //// [exportVisibility.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
diff --git a/tests/baselines/reference/exportedBlockScopedDeclarations.js b/tests/baselines/reference/exportedBlockScopedDeclarations.js
index 3e77c3c684b..068ac5db23b 100644
--- a/tests/baselines/reference/exportedBlockScopedDeclarations.js
+++ b/tests/baselines/reference/exportedBlockScopedDeclarations.js
@@ -20,6 +20,7 @@ namespace NS1 {
 //// [exportedBlockScopedDeclarations.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var foo = foo; // compile error
     exports.bar = exports.bar; // should be compile error
     function f() {
diff --git a/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.js b/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.js
index 6c39978e37d..75b9378c3f4 100644
--- a/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.js
+++ b/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.js
@@ -15,4 +15,5 @@ export declare class TPromise<V> {
 //// [exportedInterfaceInaccessibleInCallbackInModule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportedVariable1.js b/tests/baselines/reference/exportedVariable1.js
index da472fc8790..80a7fc6a391 100644
--- a/tests/baselines/reference/exportedVariable1.js
+++ b/tests/baselines/reference/exportedVariable1.js
@@ -6,6 +6,7 @@ var upper = foo.name.toUpperCase();
 //// [exportedVariable1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.foo = { name: "Bill" };
     var upper = exports.foo.name.toUpperCase();
 });
diff --git a/tests/baselines/reference/exportingContainingVisibleType.js b/tests/baselines/reference/exportingContainingVisibleType.js
index f2d78fe9a88..d50a2a35f06 100644
--- a/tests/baselines/reference/exportingContainingVisibleType.js
+++ b/tests/baselines/reference/exportingContainingVisibleType.js
@@ -13,6 +13,7 @@ export var x = 5;
 //// [exportingContainingVisibleType.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Foo = (function () {
         function Foo() {
         }
diff --git a/tests/baselines/reference/exportsAndImports1-amd.js b/tests/baselines/reference/exportsAndImports1-amd.js
index 9e04b3485d2..87761c779fa 100644
--- a/tests/baselines/reference/exportsAndImports1-amd.js
+++ b/tests/baselines/reference/exportsAndImports1-amd.js
@@ -37,6 +37,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var v = 1;
     exports.v = v;
     function f() { }
@@ -64,6 +65,7 @@ define(["require", "exports"], function (require, exports) {
 //// [t2.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.v = t1_1.v;
     exports.f = t1_1.f;
     exports.C = t1_1.C;
@@ -74,6 +76,7 @@ define(["require", "exports", "./t1"], function (require, exports, t1_1) {
 //// [t3.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.v = t1_1.v;
     exports.f = t1_1.f;
     exports.C = t1_1.C;
diff --git a/tests/baselines/reference/exportsAndImports1-es6.js b/tests/baselines/reference/exportsAndImports1-es6.js
index 3ac5aeb0dc5..6b9a40f0ea2 100644
--- a/tests/baselines/reference/exportsAndImports1-es6.js
+++ b/tests/baselines/reference/exportsAndImports1-es6.js
@@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var v = 1;
 exports.v = v;
 function f() { }
@@ -58,6 +59,7 @@ var a = M.x;
 exports.a = a;
 //// [t2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var t1_1 = require("./t1");
 exports.v = t1_1.v;
 exports.f = t1_1.f;
@@ -67,6 +69,7 @@ exports.M = t1_1.M;
 exports.a = t1_1.a;
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const t1_1 = require("./t1");
 exports.v = t1_1.v;
 exports.f = t1_1.f;
diff --git a/tests/baselines/reference/exportsAndImports1.js b/tests/baselines/reference/exportsAndImports1.js
index 46eda0656ad..56f74d27473 100644
--- a/tests/baselines/reference/exportsAndImports1.js
+++ b/tests/baselines/reference/exportsAndImports1.js
@@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 
 //// [t1.js]
 "use strict";
+exports.__esModule = true;
 var v = 1;
 exports.v = v;
 function f() { }
@@ -61,6 +62,7 @@ var a = M.x;
 exports.a = a;
 //// [t2.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.v = t1_1.v;
 exports.f = t1_1.f;
@@ -70,6 +72,7 @@ exports.M = t1_1.M;
 exports.a = t1_1.a;
 //// [t3.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.v = t1_1.v;
 exports.f = t1_1.f;
diff --git a/tests/baselines/reference/exportsAndImports2-amd.js b/tests/baselines/reference/exportsAndImports2-amd.js
index 18803de4004..5154751b21e 100644
--- a/tests/baselines/reference/exportsAndImports2-amd.js
+++ b/tests/baselines/reference/exportsAndImports2-amd.js
@@ -16,18 +16,21 @@ export { x as y, y as x };
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = "x";
     exports.y = "y";
 });
 //// [t2.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.y = t1_1.x;
     exports.x = t1_1.y;
 });
 //// [t3.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.y = t1_1.x;
     exports.x = t1_1.y;
 });
diff --git a/tests/baselines/reference/exportsAndImports2-es6.js b/tests/baselines/reference/exportsAndImports2-es6.js
index 56639bdbecf..b0714b83c39 100644
--- a/tests/baselines/reference/exportsAndImports2-es6.js
+++ b/tests/baselines/reference/exportsAndImports2-es6.js
@@ -15,15 +15,18 @@ export { x as y, y as x };
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.x = "x";
 exports.y = "y";
 //// [t2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
diff --git a/tests/baselines/reference/exportsAndImports2.js b/tests/baselines/reference/exportsAndImports2.js
index 3790510979c..5b3fe689d90 100644
--- a/tests/baselines/reference/exportsAndImports2.js
+++ b/tests/baselines/reference/exportsAndImports2.js
@@ -15,15 +15,18 @@ export { x as y, y as x };
 
 //// [t1.js]
 "use strict";
+exports.__esModule = true;
 exports.x = "x";
 exports.y = "y";
 //// [t2.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
 //// [t3.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
diff --git a/tests/baselines/reference/exportsAndImports3-amd.js b/tests/baselines/reference/exportsAndImports3-amd.js
index cbf30735182..a6af4adb5f4 100644
--- a/tests/baselines/reference/exportsAndImports3-amd.js
+++ b/tests/baselines/reference/exportsAndImports3-amd.js
@@ -37,6 +37,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.v = 1;
     exports.v1 = exports.v;
     function f() { }
@@ -66,6 +67,7 @@ define(["require", "exports"], function (require, exports) {
 //// [t2.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.v = t1_1.v1;
     exports.f = t1_1.f1;
     exports.C = t1_1.C1;
@@ -76,6 +78,7 @@ define(["require", "exports", "./t1"], function (require, exports, t1_1) {
 //// [t3.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.v = t1_1.v1;
     exports.f = t1_1.f1;
     exports.C = t1_1.C1;
diff --git a/tests/baselines/reference/exportsAndImports3-es6.js b/tests/baselines/reference/exportsAndImports3-es6.js
index 85daa3f0f5c..1ac23446807 100644
--- a/tests/baselines/reference/exportsAndImports3-es6.js
+++ b/tests/baselines/reference/exportsAndImports3-es6.js
@@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.v = 1;
 exports.v1 = exports.v;
 function f() { }
@@ -60,6 +61,7 @@ exports.a = M.x;
 exports.a1 = exports.a;
 //// [t2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var t1_1 = require("./t1");
 exports.v = t1_1.v1;
 exports.f = t1_1.f1;
@@ -69,6 +71,7 @@ exports.M = t1_1.M1;
 exports.a = t1_1.a1;
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const t1_1 = require("./t1");
 exports.v = t1_1.v1;
 exports.f = t1_1.f1;
diff --git a/tests/baselines/reference/exportsAndImports3.js b/tests/baselines/reference/exportsAndImports3.js
index dbcd9486215..4dfa0411946 100644
--- a/tests/baselines/reference/exportsAndImports3.js
+++ b/tests/baselines/reference/exportsAndImports3.js
@@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 
 //// [t1.js]
 "use strict";
+exports.__esModule = true;
 exports.v = 1;
 exports.v1 = exports.v;
 function f() { }
@@ -63,6 +64,7 @@ exports.a = M.x;
 exports.a1 = exports.a;
 //// [t2.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.v = t1_1.v1;
 exports.f = t1_1.f1;
@@ -72,6 +74,7 @@ exports.M = t1_1.M1;
 exports.a = t1_1.a1;
 //// [t3.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.v = t1_1.v1;
 exports.f = t1_1.f1;
diff --git a/tests/baselines/reference/exportsAndImports4-amd.js b/tests/baselines/reference/exportsAndImports4-amd.js
index 3ed3f9bf910..ed31f42ebc7 100644
--- a/tests/baselines/reference/exportsAndImports4-amd.js
+++ b/tests/baselines/reference/exportsAndImports4-amd.js
@@ -48,6 +48,7 @@ define(["require", "exports"], function (require, exports) {
 //// [t3.js]
 define(["require", "exports", "./t1", "./t1", "./t1", "./t1", "./t1", "./t1"], function (require, exports, a, t1_1, c, t1_2, t1_3, t1_4) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.a = a;
     a.default;
     exports.b = t1_1.default;
diff --git a/tests/baselines/reference/exportsAndImports4-es6.js b/tests/baselines/reference/exportsAndImports4-es6.js
index 8a8d4f81225..d8c51d03bb1 100644
--- a/tests/baselines/reference/exportsAndImports4-es6.js
+++ b/tests/baselines/reference/exportsAndImports4-es6.js
@@ -45,6 +45,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "hello";
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const a = require("./t1");
 exports.a = a;
 a.default;
diff --git a/tests/baselines/reference/exportsAndImports4.js b/tests/baselines/reference/exportsAndImports4.js
index 361d1305bda..99f81a6b875 100644
--- a/tests/baselines/reference/exportsAndImports4.js
+++ b/tests/baselines/reference/exportsAndImports4.js
@@ -45,6 +45,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "hello";
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var a = require("./t1");
 exports.a = a;
 a.default;
diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
index fb6946ce928..068afdc346b 100644
--- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
+++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
@@ -21,6 +21,7 @@ import { get } from "./t1";
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var set = {
     set foo(x) {
     }
@@ -30,7 +31,10 @@ var get = 10;
 exports.get = get;
 //// [t2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t4.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
index 219916b3047..8b1deff064f 100644
--- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
+++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
@@ -19,15 +19,19 @@ import { as } from "./t1";
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var as = 100;
 exports.return = as;
 exports.as = as;
 //// [t2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var as = require("./t1");
 var x = as.as;
 var y = as.return;
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t4.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
index d14eab3c251..207d2948fa4 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
@@ -16,8 +16,8 @@ const { __, _, ___ } = R;
 
 //// [m1.js]
 "use strict";
-var R;
 exports.__esModule = true;
+var R;
 exports["default"] = R = {
     "__": 20,
     "_": 10,
@@ -25,5 +25,6 @@ exports["default"] = R = {
 };
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m1_1 = require("./m1");
 var __ = m1_1["default"].__, _ = m1_1["default"]._, ___ = m1_1["default"].___;
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
index 5d1dcbb9322..a53d4662e97 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
@@ -15,13 +15,14 @@ const { __esmodule, __proto__ } = R;
 
 //// [m1.js]
 "use strict";
-var R;
 exports.__esModule = true;
+var R;
 exports["default"] = R = {
     "__esmodule": true,
     "__proto__": {}
 };
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m1_1 = require("./m1");
 var __esmodule = m1_1["default"].__esmodule, __proto__ = m1_1["default"].__proto__;
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
index 477f870742d..3a5bba1deed 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
@@ -16,8 +16,8 @@ const { ___, ___hello, _hi } = R;
 
 //// [m1.js]
 "use strict";
-var R;
 exports.__esModule = true;
+var R;
 exports["default"] = R = {
     "___": 30,
     "___hello": 21,
@@ -25,5 +25,6 @@ exports["default"] = R = {
 };
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m1_1 = require("./m1");
 var ___ = m1_1["default"].___, ___hello = m1_1["default"].___hello, _hi = m1_1["default"]._hi;
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js
index 22cd7c2e71a..718d048b9a2 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js
@@ -36,6 +36,7 @@ _hi();
 
 //// [m1.js]
 "use strict";
+exports.__esModule = true;
 function _() {
     console.log("_");
 }
@@ -66,6 +67,7 @@ function ___hello() {
 exports.___hello = ___hello;
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m1_1 = require("./m1");
 m1_1._();
 m1_1.__();
diff --git a/tests/baselines/reference/extendClassExpressionFromModule.js b/tests/baselines/reference/extendClassExpressionFromModule.js
index 7353c6970e8..28c9488f7fa 100644
--- a/tests/baselines/reference/extendClassExpressionFromModule.js
+++ b/tests/baselines/reference/extendClassExpressionFromModule.js
@@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var foo1 = require("./foo1");
 var x = foo1;
 var y = (function (_super) {
diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
index 2d1add18ae0..c8f7719faf0 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
@@ -34,6 +34,7 @@ var visModel = new moduleMap[moduleName].VisualizationModel();
 
 //// [extendingClassFromAliasAndUsageInIndexer_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
@@ -52,6 +53,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -73,6 +75,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -84,6 +87,7 @@ var VisualizationModel = (function (_super) {
 exports.VisualizationModel = VisualizationModel;
 //// [extendingClassFromAliasAndUsageInIndexer_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./extendingClassFromAliasAndUsageInIndexer_moduleA");
 var moduleB = require("./extendingClassFromAliasAndUsageInIndexer_moduleB");
 var moduleATyped = moduleA;
diff --git a/tests/baselines/reference/externalModuleAssignToVar.js b/tests/baselines/reference/externalModuleAssignToVar.js
index 47958ddd2ff..70ce2281ad3 100644
--- a/tests/baselines/reference/externalModuleAssignToVar.js
+++ b/tests/baselines/reference/externalModuleAssignToVar.js
@@ -29,6 +29,7 @@ y3 = ext3; // ok
 //// [externalModuleAssignToVar_core_require.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C = (function () {
         function C() {
         }
@@ -59,6 +60,7 @@ define(["require", "exports"], function (require, exports) {
 //// [externalModuleAssignToVar_core.js]
 define(["require", "exports", "externalModuleAssignToVar_core_require", "externalModuleAssignToVar_core_require2", "externalModuleAssignToVar_ext"], function (require, exports, ext, ext2, ext3) {
     "use strict";
+    exports.__esModule = true;
     var y1 = ext;
     y1 = ext; // ok
     var y2 = ext2;
diff --git a/tests/baselines/reference/externalModuleExportingGenericClass.js b/tests/baselines/reference/externalModuleExportingGenericClass.js
index e327e17160e..33aa1776e94 100644
--- a/tests/baselines/reference/externalModuleExportingGenericClass.js
+++ b/tests/baselines/reference/externalModuleExportingGenericClass.js
@@ -25,6 +25,7 @@ var C = (function () {
 module.exports = C;
 //// [externalModuleExportingGenericClass_file1.js]
 "use strict";
+exports.__esModule = true;
 var a = require("./externalModuleExportingGenericClass_file0");
 var v; // this should report error
 var v2 = (new a()).foo;
diff --git a/tests/baselines/reference/externalModuleImmutableBindings.js b/tests/baselines/reference/externalModuleImmutableBindings.js
index b50845024f4..7e2a78a4728 100644
--- a/tests/baselines/reference/externalModuleImmutableBindings.js
+++ b/tests/baselines/reference/externalModuleImmutableBindings.js
@@ -53,9 +53,11 @@ for ((stuff[n]) of []) {}
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 1;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 // all mutations below are illegal and should be fixed
 var stuff = require("./f1");
 var n = 'baz';
diff --git a/tests/baselines/reference/externalModuleQualification.js b/tests/baselines/reference/externalModuleQualification.js
index 26255ac3fcd..0402847a13a 100644
--- a/tests/baselines/reference/externalModuleQualification.js
+++ b/tests/baselines/reference/externalModuleQualification.js
@@ -13,6 +13,7 @@ class NavigateAction {
 
 //// [externalModuleQualification.js]
 "use strict";
+exports.__esModule = true;
 exports.ID = "test";
 var DiffEditor = (function () {
     function DiffEditor(id) {
diff --git a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js
index 8a25c3711b2..e5a854077c5 100644
--- a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js
+++ b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js
@@ -11,6 +11,7 @@ file1.foo();
 //// [externalModuleReferenceOfImportDeclarationWithExportModifier_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function foo() { }
     exports.foo = foo;
     ;
@@ -18,6 +19,7 @@ define(["require", "exports"], function (require, exports) {
 //// [externalModuleReferenceOfImportDeclarationWithExportModifier_1.js]
 define(["require", "exports", "externalModuleReferenceOfImportDeclarationWithExportModifier_0"], function (require, exports, file1) {
     "use strict";
+    exports.__esModule = true;
     exports.file1 = file1;
     exports.file1.foo();
 });
diff --git a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
index 5b0de7324ac..3a930d8e03a 100644
--- a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
+++ b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
@@ -20,11 +20,13 @@ file1.bar();
 //// [externalModuleRefernceResolutionOrderInImportDeclaration_file2.js]
 //// [externalModuleRefernceResolutionOrderInImportDeclaration_file1.js]
 "use strict";
+exports.__esModule = true;
 function foo() { }
 exports.foo = foo;
 ;
 //// [externalModuleRefernceResolutionOrderInImportDeclaration_file3.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='externalModuleRefernceResolutionOrderInImportDeclaration_file2.ts'/>
 var file1 = require("./externalModuleRefernceResolutionOrderInImportDeclaration_file1");
 file1.foo();
diff --git a/tests/baselines/reference/externalModuleResolution.js b/tests/baselines/reference/externalModuleResolution.js
index 40b320ee37e..1ef5be53883 100644
--- a/tests/baselines/reference/externalModuleResolution.js
+++ b/tests/baselines/reference/externalModuleResolution.js
@@ -25,5 +25,6 @@ var M2;
 module.exports = M2;
 //// [consumer.js]
 "use strict";
+exports.__esModule = true;
 var x = require("./foo");
 x.Y; // .ts should be picked
diff --git a/tests/baselines/reference/externalModuleResolution2.js b/tests/baselines/reference/externalModuleResolution2.js
index 44753c9f16d..2c3c9facff1 100644
--- a/tests/baselines/reference/externalModuleResolution2.js
+++ b/tests/baselines/reference/externalModuleResolution2.js
@@ -26,5 +26,6 @@ var M2;
 module.exports = M2;
 //// [consumer.js]
 "use strict";
+exports.__esModule = true;
 var x = require("./foo");
 x.X; // .ts should be picked
diff --git a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.js b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.js
index 0b1f17612b0..fa98fbe2223 100644
--- a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.js
+++ b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.js
@@ -6,3 +6,4 @@
 
 //// [externalModuleWithoutCompilerFlag1.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/fieldAndGetterWithSameName.js b/tests/baselines/reference/fieldAndGetterWithSameName.js
index eb5171acd75..673a0372f05 100644
--- a/tests/baselines/reference/fieldAndGetterWithSameName.js
+++ b/tests/baselines/reference/fieldAndGetterWithSameName.js
@@ -7,6 +7,7 @@ export class C {
 //// [fieldAndGetterWithSameName.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C = (function () {
         function C() {
         }
diff --git a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js
index 0c6f1c8034d..9b48439ad56 100644
--- a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js
+++ b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js
@@ -12,6 +12,7 @@ function foo() {
 //// [a.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c = (function () {
         function c() {
         }
diff --git a/tests/baselines/reference/functionAndImportNameConflict.js b/tests/baselines/reference/functionAndImportNameConflict.js
index 8391823aa3a..2bc6d91b2c3 100644
--- a/tests/baselines/reference/functionAndImportNameConflict.js
+++ b/tests/baselines/reference/functionAndImportNameConflict.js
@@ -11,11 +11,13 @@ export function f() {
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 function f() {
 }
 exports.f = f;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 function f() {
 }
 exports.f = f;
diff --git a/tests/baselines/reference/functionLikeInParameterInitializer.js b/tests/baselines/reference/functionLikeInParameterInitializer.js
index bf1d887b435..9bf71aff1ea 100644
--- a/tests/baselines/reference/functionLikeInParameterInitializer.js
+++ b/tests/baselines/reference/functionLikeInParameterInitializer.js
@@ -21,6 +21,7 @@ export function baz3(func = class { x = foo }) {
 
 //// [functionLikeInParameterInitializer.js]
 "use strict";
+exports.__esModule = true;
 // error
 function bar(func) {
     if (func === void 0) { func = function () { return foo; }; }
diff --git a/tests/baselines/reference/generatorES6InAMDModule.js b/tests/baselines/reference/generatorES6InAMDModule.js
index 594d2c3263c..b7e460af9b1 100644
--- a/tests/baselines/reference/generatorES6InAMDModule.js
+++ b/tests/baselines/reference/generatorES6InAMDModule.js
@@ -6,6 +6,7 @@ export function* foo() {
 //// [generatorES6InAMDModule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function* foo() {
         yield;
     }
diff --git a/tests/baselines/reference/genericArrayExtenstions.js b/tests/baselines/reference/genericArrayExtenstions.js
index 63c67a13760..87a7fba25c1 100644
--- a/tests/baselines/reference/genericArrayExtenstions.js
+++ b/tests/baselines/reference/genericArrayExtenstions.js
@@ -7,3 +7,4 @@ concat(...items: T[]): T[];
 
 //// [genericArrayExtenstions.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/genericClassesInModule2.js b/tests/baselines/reference/genericClassesInModule2.js
index a17d9272c5b..738fa996cf7 100644
--- a/tests/baselines/reference/genericClassesInModule2.js
+++ b/tests/baselines/reference/genericClassesInModule2.js
@@ -23,6 +23,7 @@ export class B<T2> {
 //// [genericClassesInModule2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A(callback) {
             this.callback = callback;
diff --git a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js
index 4f3895a33b8..83b100f4837 100644
--- a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js
+++ b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js
@@ -10,6 +10,7 @@ export function foo<A>(fn: (ifoo: IFoo<A>) => void) {
 //// [genericInterfaceFunctionTypeParameter.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function foo(fn) {
         foo(fn); // Invocation is necessary to repro (!)
     }
diff --git a/tests/baselines/reference/genericMemberFunction.js b/tests/baselines/reference/genericMemberFunction.js
index c15868e20c4..61a9298eb7f 100644
--- a/tests/baselines/reference/genericMemberFunction.js
+++ b/tests/baselines/reference/genericMemberFunction.js
@@ -25,6 +25,7 @@ export class BuildResult<A, B, C>{
 //// [genericMemberFunction.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var BuildError = (function () {
         function BuildError() {
         }
diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.js b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.js
index f9bcc86194c..49debc2ca84 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.js
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.js
@@ -16,4 +16,5 @@ export declare module TypeScript {
 //// [genericRecursiveImplicitConstructorErrors1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericReturnTypeFromGetter1.js b/tests/baselines/reference/genericReturnTypeFromGetter1.js
index 56367ca9c5e..728d81dd147 100644
--- a/tests/baselines/reference/genericReturnTypeFromGetter1.js
+++ b/tests/baselines/reference/genericReturnTypeFromGetter1.js
@@ -11,6 +11,7 @@ export class DbSet<T> {
 //// [genericReturnTypeFromGetter1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var DbSet = (function () {
         function DbSet() {
         }
diff --git a/tests/baselines/reference/genericTypeWithMultipleBases1.js b/tests/baselines/reference/genericTypeWithMultipleBases1.js
index 2ee085ef07e..a958516dfa0 100644
--- a/tests/baselines/reference/genericTypeWithMultipleBases1.js
+++ b/tests/baselines/reference/genericTypeWithMultipleBases1.js
@@ -21,6 +21,7 @@ x.m2();
 
 //// [genericTypeWithMultipleBases1.js]
 "use strict";
+exports.__esModule = true;
 var x;
 x.p1;
 x.m1();
diff --git a/tests/baselines/reference/genericTypeWithMultipleBases2.js b/tests/baselines/reference/genericTypeWithMultipleBases2.js
index 4a31e354de6..43651ec8278 100644
--- a/tests/baselines/reference/genericTypeWithMultipleBases2.js
+++ b/tests/baselines/reference/genericTypeWithMultipleBases2.js
@@ -21,6 +21,7 @@ x.m2();
 //// [genericTypeWithMultipleBases2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x;
     x.p1;
     x.m1();
diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
index 5498d3d1fad..3f5e3dcfe8e 100644
--- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
+++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
@@ -27,6 +27,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Collection = (function () {
         function Collection() {
         }
diff --git a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
index 5c865321691..5739596a8f0 100644
--- a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
+++ b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
@@ -3,6 +3,7 @@ EmitSkipped: false
 EmitSkipped: false
 FileName : /tests/cases/fourslash/inputFile2.js
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Foo = (function () {
     function Foo() {
     }
diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
index a181526eb27..50e80f94831 100644
--- a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
+++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
@@ -4,6 +4,7 @@ Diagnostics:
 FileName : /tests/cases/fourslash/inputFile.js
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var C = (function () {
         function C() {
         }
diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js
index 149a975d413..ce4df039932 100644
--- a/tests/baselines/reference/giant.js
+++ b/tests/baselines/reference/giant.js
@@ -684,6 +684,7 @@ export declare module eaM {
 //// [giant.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     /*
         Prefixes
         p -> public
diff --git a/tests/baselines/reference/globalAugmentationModuleResolution.js b/tests/baselines/reference/globalAugmentationModuleResolution.js
index e1a4ebce8c5..6dd87de81fd 100644
--- a/tests/baselines/reference/globalAugmentationModuleResolution.js
+++ b/tests/baselines/reference/globalAugmentationModuleResolution.js
@@ -8,3 +8,4 @@ declare global {
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js
index c7dd59f9ab7..60bea32e305 100644
--- a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js
+++ b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js
@@ -16,6 +16,7 @@ module m_private {
 
 //// [importAliasAnExternalModuleInsideAnInternalModule_file0.js]
 "use strict";
+exports.__esModule = true;
 var m;
 (function (m) {
     function foo() { }
@@ -23,6 +24,7 @@ var m;
 })(m = exports.m || (exports.m = {}));
 //// [importAliasAnExternalModuleInsideAnInternalModule_file1.js]
 "use strict";
+exports.__esModule = true;
 var r = require("./importAliasAnExternalModuleInsideAnInternalModule_file0");
 var m_private;
 (function (m_private) {
diff --git a/tests/baselines/reference/importAsBaseClass.js b/tests/baselines/reference/importAsBaseClass.js
index 75d6e68d4c5..725390825c6 100644
--- a/tests/baselines/reference/importAsBaseClass.js
+++ b/tests/baselines/reference/importAsBaseClass.js
@@ -12,6 +12,7 @@ class Hello extends Greeter { }
 
 //// [importAsBaseClass_0.js]
 "use strict";
+exports.__esModule = true;
 var Greeter = (function () {
     function Greeter() {
     }
@@ -31,6 +32,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Greeter = require("./importAsBaseClass_0");
 var Hello = (function (_super) {
     __extends(Hello, _super);
diff --git a/tests/baselines/reference/importDecl.js b/tests/baselines/reference/importDecl.js
index 47bf5a1b2a1..1e5e5d0ec71 100644
--- a/tests/baselines/reference/importDecl.js
+++ b/tests/baselines/reference/importDecl.js
@@ -83,6 +83,7 @@ export var useMultiImport_m4_f4 = multiImport_m4.foo();
 
 //// [importDecl_require.js]
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -93,6 +94,7 @@ function foo() { return null; }
 exports.foo = foo;
 //// [importDecl_require1.js]
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -104,6 +106,7 @@ function foo() { return null; }
 exports.foo = foo;
 //// [importDecl_require2.js]
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -114,6 +117,7 @@ function foo() { return null; }
 exports.foo = foo;
 //// [importDecl_require3.js]
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -124,10 +128,12 @@ function foo() { return null; }
 exports.foo = foo;
 //// [importDecl_require4.js]
 "use strict";
+exports.__esModule = true;
 function foo2() { return null; }
 exports.foo2 = foo2;
 //// [importDecl_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='importDecl_require.ts'/>
 ///<reference path='importDecl_require1.ts'/>
 ///<reference path='importDecl_require2.ts'/>
diff --git a/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.js b/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.js
index 383c6629ed1..1aadcb875f0 100644
--- a/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.js
+++ b/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.js
@@ -7,3 +7,4 @@ declare module "m1" {
 
 //// [importDeclRefereingExternalModuleWithNoResolve.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/importDeclWithClassModifiers.js b/tests/baselines/reference/importDeclWithClassModifiers.js
index 0af92b1976a..00e5dae1f95 100644
--- a/tests/baselines/reference/importDeclWithClassModifiers.js
+++ b/tests/baselines/reference/importDeclWithClassModifiers.js
@@ -12,6 +12,7 @@ var b: a;
 //// [importDeclWithClassModifiers.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = x.c;
     exports.b = x.c;
     exports.c = x.c;
diff --git a/tests/baselines/reference/importDeclWithDeclareModifier.js b/tests/baselines/reference/importDeclWithDeclareModifier.js
index 7c3d3782934..e7929ac27fc 100644
--- a/tests/baselines/reference/importDeclWithDeclareModifier.js
+++ b/tests/baselines/reference/importDeclWithDeclareModifier.js
@@ -9,5 +9,6 @@ var b: a;
 
 //// [importDeclWithDeclareModifier.js]
 "use strict";
+exports.__esModule = true;
 exports.a = x.c;
 var b;
diff --git a/tests/baselines/reference/importDeclWithExportModifier.js b/tests/baselines/reference/importDeclWithExportModifier.js
index c04bf542b58..26076c2630e 100644
--- a/tests/baselines/reference/importDeclWithExportModifier.js
+++ b/tests/baselines/reference/importDeclWithExportModifier.js
@@ -10,6 +10,7 @@ var b: a;
 //// [importDeclWithExportModifier.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = x.c;
     var b;
 });
diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js
index da41309d56b..ce5069c335e 100644
--- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js
+++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js
@@ -8,4 +8,5 @@ export = x;
 
 //// [importDeclWithExportModifierAndExportAssignment.js]
 "use strict";
+exports.__esModule = true;
 exports.a = x.c;
diff --git a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
index c2cc0b8ea7a..cce30fd8b85 100644
--- a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
+++ b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
@@ -13,6 +13,7 @@ export var x: typeof a;
 
 //// [importDeclarationUsedAsTypeQuery_require.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
@@ -21,6 +22,7 @@ var B = (function () {
 exports.B = B;
 //// [importDeclarationUsedAsTypeQuery_1.js]
 "use strict";
+exports.__esModule = true;
 
 
 //// [importDeclarationUsedAsTypeQuery_require.d.ts]
diff --git a/tests/baselines/reference/importHelpers.js b/tests/baselines/reference/importHelpers.js
index fea4ee2db27..bf66829a435 100644
--- a/tests/baselines/reference/importHelpers.js
+++ b/tests/baselines/reference/importHelpers.js
@@ -35,6 +35,7 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var A = (function () {
     function A() {
diff --git a/tests/baselines/reference/importHelpersAmd.js b/tests/baselines/reference/importHelpersAmd.js
index 6054e147386..b756355921d 100644
--- a/tests/baselines/reference/importHelpersAmd.js
+++ b/tests/baselines/reference/importHelpersAmd.js
@@ -19,6 +19,7 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
@@ -29,6 +30,7 @@ define(["require", "exports"], function (require, exports) {
 //// [b.js]
 define(["require", "exports", "tslib", "./a"], function (require, exports, tslib_1, a_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var B = (function (_super) {
         tslib_1.__extends(B, _super);
         function B() {
diff --git a/tests/baselines/reference/importHelpersInAmbientContext.js b/tests/baselines/reference/importHelpersInAmbientContext.js
index b9db8c4751f..d91daa19a90 100644
--- a/tests/baselines/reference/importHelpersInAmbientContext.js
+++ b/tests/baselines/reference/importHelpersInAmbientContext.js
@@ -57,3 +57,4 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 
 //// [b.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/importHelpersInIsolatedModules.js b/tests/baselines/reference/importHelpersInIsolatedModules.js
index 429a71c1ab8..72a91ac365e 100644
--- a/tests/baselines/reference/importHelpersInIsolatedModules.js
+++ b/tests/baselines/reference/importHelpersInIsolatedModules.js
@@ -35,6 +35,7 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var A = (function () {
     function A() {
@@ -68,6 +69,7 @@ C = tslib_1.__decorate([
 ], C);
 //// [script.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var A = (function () {
     function A() {
diff --git a/tests/baselines/reference/importHelpersInTsx.js b/tests/baselines/reference/importHelpersInTsx.js
index 29e43e191e8..330b8623f69 100644
--- a/tests/baselines/reference/importHelpersInTsx.js
+++ b/tests/baselines/reference/importHelpersInTsx.js
@@ -21,6 +21,7 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 exports.x = React.createElement("span", tslib_1.__assign({}, o));
 //// [script.js]
diff --git a/tests/baselines/reference/importHelpersNoHelpers.js b/tests/baselines/reference/importHelpersNoHelpers.js
index 53b4b326819..5b98b61da20 100644
--- a/tests/baselines/reference/importHelpersNoHelpers.js
+++ b/tests/baselines/reference/importHelpersNoHelpers.js
@@ -34,6 +34,7 @@ export {}
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var A = (function () {
     function A() {
diff --git a/tests/baselines/reference/importHelpersNoModule.js b/tests/baselines/reference/importHelpersNoModule.js
index f84666ae198..36a326e124d 100644
--- a/tests/baselines/reference/importHelpersNoModule.js
+++ b/tests/baselines/reference/importHelpersNoModule.js
@@ -27,6 +27,7 @@ class C {
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var A = (function () {
     function A() {
diff --git a/tests/baselines/reference/importHelpersOutFile.js b/tests/baselines/reference/importHelpersOutFile.js
index 572115ba4bb..55bf2ea9d46 100644
--- a/tests/baselines/reference/importHelpersOutFile.js
+++ b/tests/baselines/reference/importHelpersOutFile.js
@@ -23,6 +23,7 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 //// [out.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
@@ -32,6 +33,7 @@ define("a", ["require", "exports"], function (require, exports) {
 });
 define("b", ["require", "exports", "tslib", "a"], function (require, exports, tslib_1, a_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var B = (function (_super) {
         tslib_1.__extends(B, _super);
         function B() {
@@ -43,6 +45,7 @@ define("b", ["require", "exports", "tslib", "a"], function (require, exports, ts
 });
 define("c", ["require", "exports", "tslib", "a"], function (require, exports, tslib_2, a_2) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var C = (function (_super) {
         tslib_2.__extends(C, _super);
         function C() {
diff --git a/tests/baselines/reference/importImportOnlyModule.js b/tests/baselines/reference/importImportOnlyModule.js
index 013999321f9..0c6f0540354 100644
--- a/tests/baselines/reference/importImportOnlyModule.js
+++ b/tests/baselines/reference/importImportOnlyModule.js
@@ -18,6 +18,7 @@ var x = foo; // Cause a runtime dependency
 //// [foo_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C1 = (function () {
         function C1() {
             this.m1 = 42;
@@ -30,10 +31,12 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var answer = 42; // No exports
 });
 //// [foo_2.js]
 define(["require", "exports", "./foo_1"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     var x = foo; // Cause a runtime dependency
 });
diff --git a/tests/baselines/reference/importInsideModule.js b/tests/baselines/reference/importInsideModule.js
index d4f12d0c1b6..da492a7103d 100644
--- a/tests/baselines/reference/importInsideModule.js
+++ b/tests/baselines/reference/importInsideModule.js
@@ -11,6 +11,7 @@ export module myModule {
 
 //// [importInsideModule_file2.js]
 "use strict";
+exports.__esModule = true;
 var myModule;
 (function (myModule) {
     var a = foo.x;
diff --git a/tests/baselines/reference/importNonExternalModule.js b/tests/baselines/reference/importNonExternalModule.js
index 2a8e6792860..0340bcd35cb 100644
--- a/tests/baselines/reference/importNonExternalModule.js
+++ b/tests/baselines/reference/importNonExternalModule.js
@@ -21,6 +21,7 @@ var foo;
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     // Import should fail.  foo_0 not an external module
     if (foo.answer === 42) {
     }
diff --git a/tests/baselines/reference/importNonStringLiteral.js b/tests/baselines/reference/importNonStringLiteral.js
index 002092d8162..eb76621f7c0 100644
--- a/tests/baselines/reference/importNonStringLiteral.js
+++ b/tests/baselines/reference/importNonStringLiteral.js
@@ -5,4 +5,5 @@ import foo = require(x); // invalid
 
 //// [foo_0.js]
 "use strict";
+exports.__esModule = true;
 var x = "filename";
diff --git a/tests/baselines/reference/importTsBeforeDTs.js b/tests/baselines/reference/importTsBeforeDTs.js
index b57df504993..40213ce9968 100644
--- a/tests/baselines/reference/importTsBeforeDTs.js
+++ b/tests/baselines/reference/importTsBeforeDTs.js
@@ -15,9 +15,11 @@ var z2 = foo.y + 10; // Should resolve
 
 //// [foo_0.js]
 "use strict";
+exports.__esModule = true;
 exports.y = 42;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0");
 var z1 = foo.x + 10; // Should error, as .ts preferred over .d.ts
 var z2 = foo.y + 10; // Should resolve
diff --git a/tests/baselines/reference/importUsedInExtendsList1.js b/tests/baselines/reference/importUsedInExtendsList1.js
index 4075719c9c5..15bf907ddd5 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.js
+++ b/tests/baselines/reference/importUsedInExtendsList1.js
@@ -13,6 +13,7 @@ var r: string = s.foo;
 
 //// [importUsedInExtendsList1_require.js]
 "use strict";
+exports.__esModule = true;
 var Super = (function () {
     function Super() {
     }
@@ -31,6 +32,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 ///<reference path='importUsedInExtendsList1_require.ts'/>
 var foo = require("./importUsedInExtendsList1_require");
 var Sub = (function (_super) {
diff --git a/tests/baselines/reference/importWithTrailingSlash.js b/tests/baselines/reference/importWithTrailingSlash.js
index 7118dd95bb8..9450fc5d7b2 100644
--- a/tests/baselines/reference/importWithTrailingSlash.js
+++ b/tests/baselines/reference/importWithTrailingSlash.js
@@ -30,12 +30,14 @@ exports.__esModule = true;
 exports["default"] = { aIndex: 0 };
 //// [test.js]
 "use strict";
+exports.__esModule = true;
 var _1 = require(".");
 var _2 = require("./");
 _1["default"].a;
 _2["default"].aIndex;
 //// [test.js]
 "use strict";
+exports.__esModule = true;
 var __1 = require("..");
 var _1 = require("../");
 __1["default"].a;
diff --git a/tests/baselines/reference/importWithTrailingSlash_noResolve.js b/tests/baselines/reference/importWithTrailingSlash_noResolve.js
index b523c76af3b..16a4838ba62 100644
--- a/tests/baselines/reference/importWithTrailingSlash_noResolve.js
+++ b/tests/baselines/reference/importWithTrailingSlash_noResolve.js
@@ -5,3 +5,4 @@ import foo from "./foo/";
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/import_reference-exported-alias.js b/tests/baselines/reference/import_reference-exported-alias.js
index ffc4491e50a..b3d607a6943 100644
--- a/tests/baselines/reference/import_reference-exported-alias.js
+++ b/tests/baselines/reference/import_reference-exported-alias.js
@@ -45,6 +45,7 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports", "file1"], function (require, exports, appJs) {
     "use strict";
+    exports.__esModule = true;
     var Services = appJs.Services;
     var UserServices = Services.UserServices;
     var x = new UserServices().getUserName();
diff --git a/tests/baselines/reference/import_reference-to-type-alias.js b/tests/baselines/reference/import_reference-to-type-alias.js
index 1d91f10f672..c6771d47bae 100644
--- a/tests/baselines/reference/import_reference-to-type-alias.js
+++ b/tests/baselines/reference/import_reference-to-type-alias.js
@@ -20,6 +20,7 @@ var x = new Services.UserServices().getUserName();
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var App;
     (function (App) {
         var Services;
@@ -39,6 +40,7 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports", "file1"], function (require, exports, appJs) {
     "use strict";
+    exports.__esModule = true;
     var Services = appJs.App.Services;
     var x = new Services.UserServices().getUserName();
 });
diff --git a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js
index 157702acd1e..1cd0376dded 100644
--- a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js
+++ b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js
@@ -19,6 +19,7 @@ var p = testData[0].name;
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var testData;
     var p = testData[0].name;
 });
diff --git a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
index d67c53c6349..9b5e518804c 100644
--- a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
+++ b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
@@ -13,6 +13,7 @@ var v = new hostVar.Host();
 //// [host.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Host = (function () {
         function Host() {
         }
@@ -23,6 +24,7 @@ define(["require", "exports"], function (require, exports) {
 //// [consumer.js]
 define(["require", "exports", "host"], function (require, exports, host) {
     "use strict";
+    exports.__esModule = true;
     var hostVar = host;
     var v = new hostVar.Host();
 });
diff --git a/tests/baselines/reference/importedAliasesInTypePositions.js b/tests/baselines/reference/importedAliasesInTypePositions.js
index 754bac96c2c..b82ac22f4ed 100644
--- a/tests/baselines/reference/importedAliasesInTypePositions.js
+++ b/tests/baselines/reference/importedAliasesInTypePositions.js
@@ -21,6 +21,7 @@ export module ImportingModule {
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var elaborate;
     (function (elaborate) {
         var nested;
@@ -45,6 +46,7 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var ImportingModule;
     (function (ImportingModule) {
         var UsesReferredType = (function () {
diff --git a/tests/baselines/reference/importedModuleClassNameClash.js b/tests/baselines/reference/importedModuleClassNameClash.js
index 8f9649c6768..5f4f9677dcd 100644
--- a/tests/baselines/reference/importedModuleClassNameClash.js
+++ b/tests/baselines/reference/importedModuleClassNameClash.js
@@ -9,6 +9,7 @@ class foo { }
 //// [importedModuleClassNameClash.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var foo = (function () {
         function foo() {
         }
diff --git a/tests/baselines/reference/importsImplicitlyReadonly.js b/tests/baselines/reference/importsImplicitlyReadonly.js
index 4630de598cc..dd45d4db89c 100644
--- a/tests/baselines/reference/importsImplicitlyReadonly.js
+++ b/tests/baselines/reference/importsImplicitlyReadonly.js
@@ -23,11 +23,13 @@ a3.y = 1;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 1;
 var y = 1;
 exports.y = y;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var a_1 = require("./a");
 var a1 = require("./a");
 var a2 = require("./a");
diff --git a/tests/baselines/reference/inferenceLimit.js b/tests/baselines/reference/inferenceLimit.js
index 84f0989e987..997cbcd5b79 100644
--- a/tests/baselines/reference/inferenceLimit.js
+++ b/tests/baselines/reference/inferenceLimit.js
@@ -42,6 +42,7 @@ export interface MyModel {
 
 //// [mymodule.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [file1.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -52,6 +53,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 class BrokenClass {
     constructor() { }
     brokenMethod(field, value) {
diff --git a/tests/baselines/reference/instanceOfInExternalModules.js b/tests/baselines/reference/instanceOfInExternalModules.js
index 540549aef52..293be662a4d 100644
--- a/tests/baselines/reference/instanceOfInExternalModules.js
+++ b/tests/baselines/reference/instanceOfInExternalModules.js
@@ -14,6 +14,7 @@ function IsFoo(value: any): boolean {
 //// [instanceOfInExternalModules_require.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Foo = (function () {
         function Foo() {
         }
@@ -24,6 +25,7 @@ define(["require", "exports"], function (require, exports) {
 //// [instanceOfInExternalModules_1.js]
 define(["require", "exports", "instanceOfInExternalModules_require"], function (require, exports, Bar) {
     "use strict";
+    exports.__esModule = true;
     function IsFoo(value) {
         return value instanceof Bar.Foo;
     }
diff --git a/tests/baselines/reference/interfaceContextualType.js b/tests/baselines/reference/interfaceContextualType.js
index 653579c81eb..ec502725925 100644
--- a/tests/baselines/reference/interfaceContextualType.js
+++ b/tests/baselines/reference/interfaceContextualType.js
@@ -23,6 +23,7 @@ class Bug {
 
 //// [interfaceContextualType.js]
 "use strict";
+exports.__esModule = true;
 var Bug = (function () {
     function Bug() {
     }
diff --git a/tests/baselines/reference/interfaceDeclaration3.js b/tests/baselines/reference/interfaceDeclaration3.js
index a4df8926fba..41f12dbac05 100644
--- a/tests/baselines/reference/interfaceDeclaration3.js
+++ b/tests/baselines/reference/interfaceDeclaration3.js
@@ -58,6 +58,7 @@ interface I2 extends I1 { item:string; }
 //// [interfaceDeclaration3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var M1;
     (function (M1) {
         var C1 = (function () {
diff --git a/tests/baselines/reference/interfaceDeclaration5.js b/tests/baselines/reference/interfaceDeclaration5.js
index 6726971d208..318e8903c36 100644
--- a/tests/baselines/reference/interfaceDeclaration5.js
+++ b/tests/baselines/reference/interfaceDeclaration5.js
@@ -6,6 +6,7 @@ export class C1 { }
 //// [interfaceDeclaration5.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C1 = (function () {
         function C1() {
         }
diff --git a/tests/baselines/reference/interfaceImplementation6.js b/tests/baselines/reference/interfaceImplementation6.js
index 642300d9160..0bc759f6cda 100644
--- a/tests/baselines/reference/interfaceImplementation6.js
+++ b/tests/baselines/reference/interfaceImplementation6.js
@@ -27,6 +27,7 @@ export class Test {
 //// [interfaceImplementation6.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C1 = (function () {
         function C1() {
         }
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
index aa274838529..0b333ac1830 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
@@ -19,6 +19,7 @@ export var d = new m2.m3.c();
 
 //// [internalAliasClassInsideLocalModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var x;
 (function (x) {
     var c = (function () {
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
index 03b3542eca4..cf2eb41662b 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
@@ -17,6 +17,7 @@ export module m2 {
 
 //// [internalAliasClassInsideLocalModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var x;
 (function (x) {
     var c = (function () {
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js
index c15ca69e13f..1de7fe25407 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js
@@ -19,6 +19,7 @@ export var d = new m2.m3.c();
 
 //// [internalAliasClassInsideLocalModuleWithoutExportAccessError.js]
 "use strict";
+exports.__esModule = true;
 var x;
 (function (x) {
     var c = (function () {
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
index f881032fa1e..e224b40c9f3 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
@@ -13,6 +13,7 @@ var cReturnVal = cProp.foo(10);
 
 //// [internalAliasClassInsideTopLevelModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var x;
 (function (x) {
     var c = (function () {
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
index ac5004a7606..16f53fe3e8b 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
@@ -13,6 +13,7 @@ var cReturnVal = cProp.foo(10);
 
 //// [internalAliasClassInsideTopLevelModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var x;
 (function (x) {
     var c = (function () {
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js
index c7b8bf2cacc..c387fa6e2c4 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js
@@ -15,6 +15,7 @@ export module c {
 
 //// [internalAliasEnumInsideLocalModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var weekend;
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js
index 267fffc7b70..717652283cf 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js
@@ -15,6 +15,7 @@ export module c {
 
 //// [internalAliasEnumInsideLocalModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var weekend;
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js
index a44298b6864..a84ebf0b9ad 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js
@@ -16,6 +16,7 @@ var happyFriday = c.b.Friday;
 
 //// [internalAliasEnumInsideLocalModuleWithoutExportAccessError.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var weekend;
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
index 8e11f60dcc7..ad07b9bd33f 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
@@ -14,6 +14,7 @@ export var bVal: b = b.Sunday;
 //// [internalAliasEnumInsideTopLevelModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         var weekend;
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
index 8ec0dcea815..6b5f5b17a26 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
@@ -14,6 +14,7 @@ export var bVal: b = b.Sunday;
 //// [internalAliasEnumInsideTopLevelModuleWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         var weekend;
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js
index b96586dfa8e..95bb936bc75 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js
@@ -14,6 +14,7 @@ export module c {
 
 //// [internalAliasFunctionInsideLocalModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     function foo(x) {
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js
index dca42878157..50de6b470ee 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js
@@ -14,6 +14,7 @@ export module c {
 
 //// [internalAliasFunctionInsideLocalModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     function foo(x) {
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js
index 62e5f622ae7..543e9952f23 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js
@@ -14,6 +14,7 @@ var d = c.b(11);
 
 //// [internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     function foo(x) {
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js
index be096720e5e..267045b625d 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js
@@ -13,6 +13,7 @@ export var bVal2 = b;
 //// [internalAliasFunctionInsideTopLevelModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         function foo(x) {
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js
index ec702b7e021..bb3b0e244d2 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js
@@ -12,6 +12,7 @@ export var bVal2 = b;
 
 //// [internalAliasFunctionInsideTopLevelModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     function foo(x) {
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
index 3bd4c7c2fbc..85335a0fb7f 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
@@ -14,6 +14,7 @@ export module c {
 //// [internalAliasInitializedModuleInsideLocalModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         var b;
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
index 910319be5e8..c39e6cfd168 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
@@ -13,6 +13,7 @@ export module c {
 
 //// [internalAliasInitializedModuleInsideLocalModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var b;
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js
index 02181f04f8d..6e66118f5b9 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js
@@ -15,6 +15,7 @@ export var d = new c.b.c();
 
 //// [internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var b;
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
index 26915043496..86d9f88cee3 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
@@ -11,6 +11,7 @@ export var x: b.c = new b.c();
 
 //// [internalAliasInitializedModuleInsideTopLevelModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var b;
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
index a8a1d9ee047..79185fed228 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
@@ -12,6 +12,7 @@ export var x: b.c = new b.c();
 //// [internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         var b;
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js
index 044b393b367..bd50cd8bbc2 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js
@@ -13,6 +13,7 @@ export module c {
 //// [internalAliasInterfaceInsideLocalModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c;
     (function (c) {
     })(c = exports.c || (exports.c = {}));
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js
index 78bfc72a789..f7b08e6c170 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js
@@ -13,6 +13,7 @@ export module c {
 //// [internalAliasInterfaceInsideLocalModuleWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c;
     (function (c) {
     })(c = exports.c || (exports.c = {}));
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
index d0c4543c194..19163ff1f66 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
@@ -14,6 +14,7 @@ var x: c.b;
 //// [internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c;
     (function (c) {
     })(c = exports.c || (exports.c = {}));
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js
index 1d6cb8c07e9..4434670366c 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js
@@ -10,6 +10,7 @@ export var x: b;
 
 //// [internalAliasInterfaceInsideTopLevelModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 
 
 //// [internalAliasInterfaceInsideTopLevelModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js
index fb666a9cad2..5645c76ed2a 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js
@@ -11,6 +11,7 @@ export var x: b;
 //// [internalAliasInterfaceInsideTopLevelModuleWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js
index 38e0c387286..7ca966e90b2 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js
@@ -15,6 +15,7 @@ export module c {
 
 //// [internalAliasUninitializedModuleInsideLocalModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var c;
 (function (c) {
     c.x.foo();
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js
index 4912293d48c..22793f8aef5 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js
@@ -15,6 +15,7 @@ export module c {
 
 //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var c;
 (function (c) {
     c.x.foo();
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
index 1015e2a1d63..a6b4f83de8e 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
@@ -19,6 +19,7 @@ export var z: c.b.I;
 //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c;
     (function (c) {
         c.x.foo();
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
index dac3821a30d..eccbd9a45bd 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
@@ -15,6 +15,7 @@ x.foo();
 //// [internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.x.foo();
 });
 
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
index dc1029c6664..27de6bbfd98 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
@@ -14,6 +14,7 @@ x.foo();
 
 //// [internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 exports.x.foo();
 
 
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js
index a2921311e53..34f044721c4 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js
@@ -12,6 +12,7 @@ export module c {
 //// [internalAliasVarInsideLocalModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         a.x = 10;
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js
index 8718dc18fdd..161dc0bf973 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js
@@ -12,6 +12,7 @@ export module c {
 //// [internalAliasVarInsideLocalModuleWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         a.x = 10;
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js
index aa61fc77216..a0192fc9daa 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js
@@ -12,6 +12,7 @@ export var z = c.b;
 
 //// [internalAliasVarInsideLocalModuleWithoutExportAccessError.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     a.x = 10;
diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js
index 5427dbf026f..d27b4e3188d 100644
--- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js
@@ -11,6 +11,7 @@ export var bVal = b;
 //// [internalAliasVarInsideTopLevelModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         a.x = 10;
diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js
index 7c7c2cd327e..65c9204ed3c 100644
--- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js
@@ -10,6 +10,7 @@ export var bVal = b;
 
 //// [internalAliasVarInsideTopLevelModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     a.x = 10;
diff --git a/tests/baselines/reference/intersectionTypeInference1.js b/tests/baselines/reference/intersectionTypeInference1.js
index f4ad4da608b..32ddedae2b3 100644
--- a/tests/baselines/reference/intersectionTypeInference1.js
+++ b/tests/baselines/reference/intersectionTypeInference1.js
@@ -11,6 +11,7 @@ export const Form3 = brokenFunction(parameterFn)({store: "hello"})
 //// [intersectionTypeInference1.js]
 // Repro from #8801
 "use strict";
+exports.__esModule = true;
 function alert(s) { }
 var parameterFn = function (props) { return alert(props.store); };
 var brokenFunction = function (f) { return function (o) { return o; }; };
diff --git a/tests/baselines/reference/isolatedModulesImportExportElision.js b/tests/baselines/reference/isolatedModulesImportExportElision.js
index 80f47941e60..5aac4a64186 100644
--- a/tests/baselines/reference/isolatedModulesImportExportElision.js
+++ b/tests/baselines/reference/isolatedModulesImportExportElision.js
@@ -25,6 +25,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+Object.defineProperty(exports, "__esModule", { value: true });
 var module_1 = require("module");
 var module_2 = require("module");
 var ns = require("module");
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-AMD.js b/tests/baselines/reference/isolatedModulesPlainFile-AMD.js
index 1e45ee159d6..4ed1fdf2c77 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-AMD.js
+++ b/tests/baselines/reference/isolatedModulesPlainFile-AMD.js
@@ -7,5 +7,6 @@ run(1);
 //// [isolatedModulesPlainFile-AMD.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     run(1);
 });
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js b/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js
index f40d2173685..38739a700ef 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js
+++ b/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js
@@ -6,4 +6,5 @@ run(1);
 
 //// [isolatedModulesPlainFile-CommonJS.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 run(1);
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js
index ece949b9100..f37962a84ab 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js
+++ b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js
@@ -15,5 +15,6 @@ run(1);
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     run(1);
 });
diff --git a/tests/baselines/reference/isolatedModulesSpecifiedModule.js b/tests/baselines/reference/isolatedModulesSpecifiedModule.js
index 89547811855..895c47e2504 100644
--- a/tests/baselines/reference/isolatedModulesSpecifiedModule.js
+++ b/tests/baselines/reference/isolatedModulesSpecifiedModule.js
@@ -3,3 +3,4 @@ export var x;
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/isolatedModulesUnspecifiedModule.js b/tests/baselines/reference/isolatedModulesUnspecifiedModule.js
index 89547811855..895c47e2504 100644
--- a/tests/baselines/reference/isolatedModulesUnspecifiedModule.js
+++ b/tests/baselines/reference/isolatedModulesUnspecifiedModule.js
@@ -3,3 +3,4 @@ export var x;
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
index e1675ff7131..088b40e97ad 100644
--- a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
+++ b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
@@ -26,6 +26,7 @@ export default apply;
 //// [apply.js]
 define("_apply", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     /**
      * A faster alternative to `Function#apply`, this function invokes `func`
      * with the `this` binding of `thisArg` and the arguments of `args`.
@@ -46,6 +47,5 @@ define("_apply", ["require", "exports"], function (require, exports) {
         }
         return func.apply(thisArg, args);
     }
-    exports.__esModule = true;
     exports["default"] = apply;
 });
diff --git a/tests/baselines/reference/jsxEmitWithAttributes.js b/tests/baselines/reference/jsxEmitWithAttributes.js
index 1acead2801d..dd4d326268b 100644
--- a/tests/baselines/reference/jsxEmitWithAttributes.js
+++ b/tests/baselines/reference/jsxEmitWithAttributes.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -69,6 +70,7 @@ function toCamelCase(text) {
 }
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const Element_1 = require("./Element");
 let c;
 class A {
diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.js b/tests/baselines/reference/jsxFactoryAndReactNamespace.js
index 0a6402ca70c..a864da65dbb 100644
--- a/tests/baselines/reference/jsxFactoryAndReactNamespace.js
+++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -69,6 +70,7 @@ function toCamelCase(text) {
 }
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const Element_1 = require("./Element");
 let c;
 class A {
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js b/tests/baselines/reference/jsxFactoryIdentifier.js
index 82c8f6410e6..9beff01d707 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.js
+++ b/tests/baselines/reference/jsxFactoryIdentifier.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -69,6 +70,7 @@ function toCamelCase(text) {
 }
 //# sourceMappingURL=Element.js.map//// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const Element_1 = require("./Element");
 let createElement = Element_1.Element.createElement;
 let c;
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js.map b/tests/baselines/reference/jsxFactoryIdentifier.js.map
index cad196b8ba5..57ff760b8a8 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.js.map
+++ b/tests/baselines/reference/jsxFactoryIdentifier.js.map
@@ -1,3 +1,3 @@
 //// [Element.js.map]
-{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map]
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAAA,uCAAmC;AACnC,IAAI,aAAa,GAAG,iBAAO,CAAC,aAAa,CAAC;AAC1C,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,wBAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,wBAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"}
\ No newline at end of file
+{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";;AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map]
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAAA,uCAAmC;AACnC,IAAI,aAAa,GAAG,iBAAO,CAAC,aAAa,CAAC;AAC1C,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,wBAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,wBAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
index a4ddc8c050b..6101ee1d5e7 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/Element.js
 sourceFile:Element.ts
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>var Element;
 1 >
 2 >^^^^
@@ -42,10 +43,10 @@ sourceFile:Element.ts
   >                   }
   >               }
   >           }
-1 >Emitted(2, 1) Source(14, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(14, 18) + SourceIndex(0)
-3 >Emitted(2, 12) Source(14, 25) + SourceIndex(0)
-4 >Emitted(2, 13) Source(24, 2) + SourceIndex(0)
+1 >Emitted(3, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(14, 18) + SourceIndex(0)
+3 >Emitted(3, 12) Source(14, 25) + SourceIndex(0)
+4 >Emitted(3, 13) Source(24, 2) + SourceIndex(0)
 ---
 >>>(function (Element) {
 1->
@@ -55,9 +56,9 @@ sourceFile:Element.ts
 1->
 2 >export namespace 
 3 >           Element
-1->Emitted(3, 1) Source(14, 1) + SourceIndex(0)
-2 >Emitted(3, 12) Source(14, 18) + SourceIndex(0)
-3 >Emitted(3, 19) Source(14, 25) + SourceIndex(0)
+1->Emitted(4, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(4, 12) Source(14, 18) + SourceIndex(0)
+3 >Emitted(4, 19) Source(14, 25) + SourceIndex(0)
 ---
 >>>    function isElement(el) {
 1->^^^^
@@ -68,9 +69,9 @@ sourceFile:Element.ts
   >    
 2 >    export function isElement(
 3 >                       el: any
-1->Emitted(4, 5) Source(15, 5) + SourceIndex(0)
-2 >Emitted(4, 24) Source(15, 31) + SourceIndex(0)
-3 >Emitted(4, 26) Source(15, 38) + SourceIndex(0)
+1->Emitted(5, 5) Source(15, 5) + SourceIndex(0)
+2 >Emitted(5, 24) Source(15, 31) + SourceIndex(0)
+3 >Emitted(5, 26) Source(15, 38) + SourceIndex(0)
 ---
 >>>        return el.markAsChildOfRootElement !== undefined;
 1->^^^^^^^^
@@ -92,15 +93,15 @@ sourceFile:Element.ts
 7 >                                           !== 
 8 >                                               undefined
 9 >                                                        ;
-1->Emitted(5, 9) Source(16, 9) + SourceIndex(0)
-2 >Emitted(5, 15) Source(16, 15) + SourceIndex(0)
-3 >Emitted(5, 16) Source(16, 16) + SourceIndex(0)
-4 >Emitted(5, 18) Source(16, 18) + SourceIndex(0)
-5 >Emitted(5, 19) Source(16, 19) + SourceIndex(0)
-6 >Emitted(5, 43) Source(16, 43) + SourceIndex(0)
-7 >Emitted(5, 48) Source(16, 48) + SourceIndex(0)
-8 >Emitted(5, 57) Source(16, 57) + SourceIndex(0)
-9 >Emitted(5, 58) Source(16, 58) + SourceIndex(0)
+1->Emitted(6, 9) Source(16, 9) + SourceIndex(0)
+2 >Emitted(6, 15) Source(16, 15) + SourceIndex(0)
+3 >Emitted(6, 16) Source(16, 16) + SourceIndex(0)
+4 >Emitted(6, 18) Source(16, 18) + SourceIndex(0)
+5 >Emitted(6, 19) Source(16, 19) + SourceIndex(0)
+6 >Emitted(6, 43) Source(16, 43) + SourceIndex(0)
+7 >Emitted(6, 48) Source(16, 48) + SourceIndex(0)
+8 >Emitted(6, 57) Source(16, 57) + SourceIndex(0)
+9 >Emitted(6, 58) Source(16, 58) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -109,8 +110,8 @@ sourceFile:Element.ts
 1 >
   >    
 2 >    }
-1 >Emitted(6, 5) Source(17, 5) + SourceIndex(0)
-2 >Emitted(6, 6) Source(17, 6) + SourceIndex(0)
+1 >Emitted(7, 5) Source(17, 5) + SourceIndex(0)
+2 >Emitted(7, 6) Source(17, 6) + SourceIndex(0)
 ---
 >>>    Element.isElement = isElement;
 1->^^^^
@@ -124,10 +125,10 @@ sourceFile:Element.ts
   >                             return el.markAsChildOfRootElement !== undefined;
   >                         }
 4 >                                 
-1->Emitted(7, 5) Source(15, 21) + SourceIndex(0)
-2 >Emitted(7, 22) Source(15, 30) + SourceIndex(0)
-3 >Emitted(7, 34) Source(17, 6) + SourceIndex(0)
-4 >Emitted(7, 35) Source(17, 6) + SourceIndex(0)
+1->Emitted(8, 5) Source(15, 21) + SourceIndex(0)
+2 >Emitted(8, 22) Source(15, 30) + SourceIndex(0)
+3 >Emitted(8, 34) Source(17, 6) + SourceIndex(0)
+4 >Emitted(8, 35) Source(17, 6) + SourceIndex(0)
 ---
 >>>    function createElement(args) {
 1->^^^^
@@ -138,9 +139,9 @@ sourceFile:Element.ts
   >    
 2 >    export function createElement(
 3 >                           args: any[]
-1->Emitted(8, 5) Source(19, 5) + SourceIndex(0)
-2 >Emitted(8, 28) Source(19, 35) + SourceIndex(0)
-3 >Emitted(8, 32) Source(19, 46) + SourceIndex(0)
+1->Emitted(9, 5) Source(19, 5) + SourceIndex(0)
+2 >Emitted(9, 28) Source(19, 35) + SourceIndex(0)
+3 >Emitted(9, 32) Source(19, 46) + SourceIndex(0)
 ---
 >>>        return {};
 1 >^^^^^^^^
@@ -156,11 +157,11 @@ sourceFile:Element.ts
 4 >               {
   >                       }
 5 >                 
-1 >Emitted(9, 9) Source(21, 9) + SourceIndex(0)
-2 >Emitted(9, 15) Source(21, 15) + SourceIndex(0)
-3 >Emitted(9, 16) Source(21, 16) + SourceIndex(0)
-4 >Emitted(9, 18) Source(22, 10) + SourceIndex(0)
-5 >Emitted(9, 19) Source(22, 10) + SourceIndex(0)
+1 >Emitted(10, 9) Source(21, 9) + SourceIndex(0)
+2 >Emitted(10, 15) Source(21, 15) + SourceIndex(0)
+3 >Emitted(10, 16) Source(21, 16) + SourceIndex(0)
+4 >Emitted(10, 18) Source(22, 10) + SourceIndex(0)
+5 >Emitted(10, 19) Source(22, 10) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -169,8 +170,8 @@ sourceFile:Element.ts
 1 >
   >    
 2 >    }
-1 >Emitted(10, 5) Source(23, 5) + SourceIndex(0)
-2 >Emitted(10, 6) Source(23, 6) + SourceIndex(0)
+1 >Emitted(11, 5) Source(23, 5) + SourceIndex(0)
+2 >Emitted(11, 6) Source(23, 6) + SourceIndex(0)
 ---
 >>>    Element.createElement = createElement;
 1->^^^^
@@ -186,10 +187,10 @@ sourceFile:Element.ts
   >                                 }
   >                             }
 4 >                                         
-1->Emitted(11, 5) Source(19, 21) + SourceIndex(0)
-2 >Emitted(11, 26) Source(19, 34) + SourceIndex(0)
-3 >Emitted(11, 42) Source(23, 6) + SourceIndex(0)
-4 >Emitted(11, 43) Source(23, 6) + SourceIndex(0)
+1->Emitted(12, 5) Source(19, 21) + SourceIndex(0)
+2 >Emitted(12, 26) Source(19, 34) + SourceIndex(0)
+3 >Emitted(12, 42) Source(23, 6) + SourceIndex(0)
+4 >Emitted(12, 43) Source(23, 6) + SourceIndex(0)
 ---
 >>>})(Element = exports.Element || (exports.Element = {}));
 1->
@@ -221,15 +222,15 @@ sourceFile:Element.ts
   >                                                        }
   >                                                    }
   >                                                }
-1->Emitted(12, 1) Source(24, 1) + SourceIndex(0)
-2 >Emitted(12, 2) Source(24, 2) + SourceIndex(0)
-3 >Emitted(12, 4) Source(14, 18) + SourceIndex(0)
-4 >Emitted(12, 11) Source(14, 25) + SourceIndex(0)
-5 >Emitted(12, 14) Source(14, 18) + SourceIndex(0)
-6 >Emitted(12, 29) Source(14, 25) + SourceIndex(0)
-7 >Emitted(12, 34) Source(14, 18) + SourceIndex(0)
-8 >Emitted(12, 49) Source(14, 25) + SourceIndex(0)
-9 >Emitted(12, 57) Source(24, 2) + SourceIndex(0)
+1->Emitted(13, 1) Source(24, 1) + SourceIndex(0)
+2 >Emitted(13, 2) Source(24, 2) + SourceIndex(0)
+3 >Emitted(13, 4) Source(14, 18) + SourceIndex(0)
+4 >Emitted(13, 11) Source(14, 25) + SourceIndex(0)
+5 >Emitted(13, 14) Source(14, 18) + SourceIndex(0)
+6 >Emitted(13, 29) Source(14, 25) + SourceIndex(0)
+7 >Emitted(13, 34) Source(14, 18) + SourceIndex(0)
+8 >Emitted(13, 49) Source(14, 25) + SourceIndex(0)
+9 >Emitted(13, 57) Source(24, 2) + SourceIndex(0)
 ---
 >>>exports.createElement = Element.createElement;
 1 >
@@ -250,14 +251,14 @@ sourceFile:Element.ts
 6 >                               .
 7 >                                createElement
 8 >                                             ;
-1 >Emitted(13, 1) Source(26, 12) + SourceIndex(0)
-2 >Emitted(13, 9) Source(26, 12) + SourceIndex(0)
-3 >Emitted(13, 22) Source(26, 25) + SourceIndex(0)
-4 >Emitted(13, 25) Source(26, 28) + SourceIndex(0)
-5 >Emitted(13, 32) Source(26, 35) + SourceIndex(0)
-6 >Emitted(13, 33) Source(26, 36) + SourceIndex(0)
-7 >Emitted(13, 46) Source(26, 49) + SourceIndex(0)
-8 >Emitted(13, 47) Source(26, 50) + SourceIndex(0)
+1 >Emitted(14, 1) Source(26, 12) + SourceIndex(0)
+2 >Emitted(14, 9) Source(26, 12) + SourceIndex(0)
+3 >Emitted(14, 22) Source(26, 25) + SourceIndex(0)
+4 >Emitted(14, 25) Source(26, 28) + SourceIndex(0)
+5 >Emitted(14, 32) Source(26, 35) + SourceIndex(0)
+6 >Emitted(14, 33) Source(26, 36) + SourceIndex(0)
+7 >Emitted(14, 46) Source(26, 49) + SourceIndex(0)
+8 >Emitted(14, 47) Source(26, 50) + SourceIndex(0)
 ---
 >>>function toCamelCase(text) {
 1 >
@@ -269,9 +270,9 @@ sourceFile:Element.ts
   >
 2 >function toCamelCase(
 3 >                     text: string
-1 >Emitted(14, 1) Source(28, 1) + SourceIndex(0)
-2 >Emitted(14, 22) Source(28, 22) + SourceIndex(0)
-3 >Emitted(14, 26) Source(28, 34) + SourceIndex(0)
+1 >Emitted(15, 1) Source(28, 1) + SourceIndex(0)
+2 >Emitted(15, 22) Source(28, 22) + SourceIndex(0)
+3 >Emitted(15, 26) Source(28, 34) + SourceIndex(0)
 ---
 >>>    return text[0].toLowerCase() + text.substring(1);
 1->^^^^
@@ -311,24 +312,24 @@ sourceFile:Element.ts
 16>                                                  1
 17>                                                   )
 18>                                                    ;
-1->Emitted(15, 5) Source(29, 5) + SourceIndex(0)
-2 >Emitted(15, 11) Source(29, 11) + SourceIndex(0)
-3 >Emitted(15, 12) Source(29, 12) + SourceIndex(0)
-4 >Emitted(15, 16) Source(29, 16) + SourceIndex(0)
-5 >Emitted(15, 17) Source(29, 17) + SourceIndex(0)
-6 >Emitted(15, 18) Source(29, 18) + SourceIndex(0)
-7 >Emitted(15, 19) Source(29, 19) + SourceIndex(0)
-8 >Emitted(15, 20) Source(29, 20) + SourceIndex(0)
-9 >Emitted(15, 31) Source(29, 31) + SourceIndex(0)
-10>Emitted(15, 33) Source(29, 33) + SourceIndex(0)
-11>Emitted(15, 36) Source(29, 36) + SourceIndex(0)
-12>Emitted(15, 40) Source(29, 40) + SourceIndex(0)
-13>Emitted(15, 41) Source(29, 41) + SourceIndex(0)
-14>Emitted(15, 50) Source(29, 50) + SourceIndex(0)
-15>Emitted(15, 51) Source(29, 51) + SourceIndex(0)
-16>Emitted(15, 52) Source(29, 52) + SourceIndex(0)
-17>Emitted(15, 53) Source(29, 53) + SourceIndex(0)
-18>Emitted(15, 54) Source(29, 54) + SourceIndex(0)
+1->Emitted(16, 5) Source(29, 5) + SourceIndex(0)
+2 >Emitted(16, 11) Source(29, 11) + SourceIndex(0)
+3 >Emitted(16, 12) Source(29, 12) + SourceIndex(0)
+4 >Emitted(16, 16) Source(29, 16) + SourceIndex(0)
+5 >Emitted(16, 17) Source(29, 17) + SourceIndex(0)
+6 >Emitted(16, 18) Source(29, 18) + SourceIndex(0)
+7 >Emitted(16, 19) Source(29, 19) + SourceIndex(0)
+8 >Emitted(16, 20) Source(29, 20) + SourceIndex(0)
+9 >Emitted(16, 31) Source(29, 31) + SourceIndex(0)
+10>Emitted(16, 33) Source(29, 33) + SourceIndex(0)
+11>Emitted(16, 36) Source(29, 36) + SourceIndex(0)
+12>Emitted(16, 40) Source(29, 40) + SourceIndex(0)
+13>Emitted(16, 41) Source(29, 41) + SourceIndex(0)
+14>Emitted(16, 50) Source(29, 50) + SourceIndex(0)
+15>Emitted(16, 51) Source(29, 51) + SourceIndex(0)
+16>Emitted(16, 52) Source(29, 52) + SourceIndex(0)
+17>Emitted(16, 53) Source(29, 53) + SourceIndex(0)
+18>Emitted(16, 54) Source(29, 54) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -337,8 +338,8 @@ sourceFile:Element.ts
 1 >
   >
 2 >}
-1 >Emitted(16, 1) Source(30, 1) + SourceIndex(0)
-2 >Emitted(16, 2) Source(30, 2) + SourceIndex(0)
+1 >Emitted(17, 1) Source(30, 1) + SourceIndex(0)
+2 >Emitted(17, 2) Source(30, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=Element.js.map===================================================================
 JsFile: test.js
@@ -351,14 +352,15 @@ emittedFile:tests/cases/compiler/test.js
 sourceFile:test.tsx
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>const Element_1 = require("./Element");
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 3 >                                       ^^^^^^^^^^^^^^->
 1 >
 2 >import { Element} from './Element';
-1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(2, 40) Source(1, 36) + SourceIndex(0)
+1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(3, 40) Source(1, 36) + SourceIndex(0)
 ---
 >>>let createElement = Element_1.Element.createElement;
 1->
@@ -378,14 +380,14 @@ sourceFile:test.tsx
 6 >                                     .
 7 >                                      createElement
 8 >                                                   ;
-1->Emitted(3, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(3, 5) Source(2, 5) + SourceIndex(0)
-3 >Emitted(3, 18) Source(2, 18) + SourceIndex(0)
-4 >Emitted(3, 21) Source(2, 21) + SourceIndex(0)
-5 >Emitted(3, 38) Source(2, 28) + SourceIndex(0)
-6 >Emitted(3, 39) Source(2, 29) + SourceIndex(0)
-7 >Emitted(3, 52) Source(2, 42) + SourceIndex(0)
-8 >Emitted(3, 53) Source(2, 43) + SourceIndex(0)
+1->Emitted(4, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(4, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(4, 18) Source(2, 18) + SourceIndex(0)
+4 >Emitted(4, 21) Source(2, 21) + SourceIndex(0)
+5 >Emitted(4, 38) Source(2, 28) + SourceIndex(0)
+6 >Emitted(4, 39) Source(2, 29) + SourceIndex(0)
+7 >Emitted(4, 52) Source(2, 42) + SourceIndex(0)
+8 >Emitted(4, 53) Source(2, 43) + SourceIndex(0)
 ---
 >>>let c;
 1 >
@@ -402,10 +404,10 @@ sourceFile:test.tsx
   >    	}
   >    }
 4 >     ;
-1 >Emitted(4, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(4, 5) Source(3, 5) + SourceIndex(0)
-3 >Emitted(4, 6) Source(7, 2) + SourceIndex(0)
-4 >Emitted(4, 7) Source(7, 3) + SourceIndex(0)
+1 >Emitted(5, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(5, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(5, 6) Source(7, 2) + SourceIndex(0)
+4 >Emitted(5, 7) Source(7, 3) + SourceIndex(0)
 ---
 >>>class A {
 1->
@@ -413,7 +415,7 @@ sourceFile:test.tsx
 1->
   >
   >
-1->Emitted(5, 1) Source(9, 1) + SourceIndex(0)
+1->Emitted(6, 1) Source(9, 1) + SourceIndex(0)
 ---
 >>>    view() {
 1->^^^^
@@ -422,8 +424,8 @@ sourceFile:test.tsx
 1->class A {
   >	
 2 >    view
-1->Emitted(6, 5) Source(10, 2) + SourceIndex(0)
-2 >Emitted(6, 9) Source(10, 6) + SourceIndex(0)
+1->Emitted(7, 5) Source(10, 2) + SourceIndex(0)
+2 >Emitted(7, 9) Source(10, 6) + SourceIndex(0)
 ---
 >>>        return [
 1->^^^^^^^^
@@ -434,9 +436,9 @@ sourceFile:test.tsx
   >		
 2 >        return
 3 >               
-1->Emitted(7, 9) Source(11, 3) + SourceIndex(0)
-2 >Emitted(7, 15) Source(11, 9) + SourceIndex(0)
-3 >Emitted(7, 16) Source(11, 10) + SourceIndex(0)
+1->Emitted(8, 9) Source(11, 3) + SourceIndex(0)
+2 >Emitted(8, 15) Source(11, 9) + SourceIndex(0)
+3 >Emitted(8, 16) Source(11, 10) + SourceIndex(0)
 ---
 >>>            createElement("meta", { content: "helloworld" }),
 1->^^^^^^^^^^^^
@@ -452,12 +454,12 @@ sourceFile:test.tsx
 4 >                                           =
 5 >                                             "helloworld"
 6 >                                                         ></meta>
-1->Emitted(8, 13) Source(12, 4) + SourceIndex(0)
-2 >Emitted(8, 37) Source(12, 10) + SourceIndex(0)
-3 >Emitted(8, 44) Source(12, 17) + SourceIndex(0)
-4 >Emitted(8, 46) Source(12, 18) + SourceIndex(0)
-5 >Emitted(8, 58) Source(12, 30) + SourceIndex(0)
-6 >Emitted(8, 61) Source(12, 38) + SourceIndex(0)
+1->Emitted(9, 13) Source(12, 4) + SourceIndex(0)
+2 >Emitted(9, 37) Source(12, 10) + SourceIndex(0)
+3 >Emitted(9, 44) Source(12, 17) + SourceIndex(0)
+4 >Emitted(9, 46) Source(12, 18) + SourceIndex(0)
+5 >Emitted(9, 58) Source(12, 30) + SourceIndex(0)
+6 >Emitted(9, 61) Source(12, 38) + SourceIndex(0)
 ---
 >>>            createElement("meta", { content: c.a.b })
 1 >^^^^^^^^^^^^
@@ -481,16 +483,16 @@ sourceFile:test.tsx
 8 >                                                .
 9 >                                                 b
 10>                                                  }></meta>
-1 >Emitted(9, 13) Source(13, 4) + SourceIndex(0)
-2 >Emitted(9, 37) Source(13, 10) + SourceIndex(0)
-3 >Emitted(9, 44) Source(13, 17) + SourceIndex(0)
-4 >Emitted(9, 46) Source(13, 19) + SourceIndex(0)
-5 >Emitted(9, 47) Source(13, 20) + SourceIndex(0)
-6 >Emitted(9, 48) Source(13, 21) + SourceIndex(0)
-7 >Emitted(9, 49) Source(13, 23) + SourceIndex(0)
-8 >Emitted(9, 50) Source(13, 24) + SourceIndex(0)
-9 >Emitted(9, 51) Source(13, 25) + SourceIndex(0)
-10>Emitted(9, 54) Source(13, 34) + SourceIndex(0)
+1 >Emitted(10, 13) Source(13, 4) + SourceIndex(0)
+2 >Emitted(10, 37) Source(13, 10) + SourceIndex(0)
+3 >Emitted(10, 44) Source(13, 17) + SourceIndex(0)
+4 >Emitted(10, 46) Source(13, 19) + SourceIndex(0)
+5 >Emitted(10, 47) Source(13, 20) + SourceIndex(0)
+6 >Emitted(10, 48) Source(13, 21) + SourceIndex(0)
+7 >Emitted(10, 49) Source(13, 23) + SourceIndex(0)
+8 >Emitted(10, 50) Source(13, 24) + SourceIndex(0)
+9 >Emitted(10, 51) Source(13, 25) + SourceIndex(0)
+10>Emitted(10, 54) Source(13, 34) + SourceIndex(0)
 ---
 >>>        ];
 1 >^^^^^^^^^
@@ -498,8 +500,8 @@ sourceFile:test.tsx
 1 >
   >		]
 2 >         ;
-1 >Emitted(10, 10) Source(14, 4) + SourceIndex(0)
-2 >Emitted(10, 11) Source(14, 5) + SourceIndex(0)
+1 >Emitted(11, 10) Source(14, 4) + SourceIndex(0)
+2 >Emitted(11, 11) Source(14, 5) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -507,14 +509,14 @@ sourceFile:test.tsx
 1 >
   >	
 2 >    }
-1 >Emitted(11, 5) Source(15, 2) + SourceIndex(0)
-2 >Emitted(11, 6) Source(15, 3) + SourceIndex(0)
+1 >Emitted(12, 5) Source(15, 2) + SourceIndex(0)
+2 >Emitted(12, 6) Source(15, 3) + SourceIndex(0)
 ---
 >>>}
 1 >^
 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
-1 >Emitted(12, 2) Source(16, 2) + SourceIndex(0)
+1 >Emitted(13, 2) Source(16, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js
index ffec40ff7b6..05da89d0d85 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js
@@ -15,6 +15,7 @@ export class AppComponent {
 
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class AppComponent {
     render(createElement) {
         return createElement("div", null);
diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map
index c108b93a913..c72e1bf8057 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map
@@ -1,2 +1,2 @@
 //// [test.js.map]
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt
index c7867fc54e0..b2d30177b1d 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/test.js
 sourceFile:test.tsx
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>class AppComponent {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
@@ -20,7 +21,7 @@ sourceFile:test.tsx
   >}
   >
   >
-1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0)
+1 >Emitted(3, 1) Source(8, 1) + SourceIndex(0)
 ---
 >>>    render(createElement) {
 1->^^^^
@@ -33,10 +34,10 @@ sourceFile:test.tsx
 2 >    render
 3 >          (
 4 >           createElement
-1->Emitted(3, 5) Source(9, 5) + SourceIndex(0)
-2 >Emitted(3, 11) Source(9, 11) + SourceIndex(0)
-3 >Emitted(3, 12) Source(9, 12) + SourceIndex(0)
-4 >Emitted(3, 25) Source(9, 25) + SourceIndex(0)
+1->Emitted(4, 5) Source(9, 5) + SourceIndex(0)
+2 >Emitted(4, 11) Source(9, 11) + SourceIndex(0)
+3 >Emitted(4, 12) Source(9, 12) + SourceIndex(0)
+4 >Emitted(4, 25) Source(9, 25) + SourceIndex(0)
 ---
 >>>        return createElement("div", null);
 1->^^^^^^^^
@@ -50,11 +51,11 @@ sourceFile:test.tsx
 3 >               
 4 >               <div />
 5 >                                         ;
-1->Emitted(4, 9) Source(10, 9) + SourceIndex(0)
-2 >Emitted(4, 15) Source(10, 15) + SourceIndex(0)
-3 >Emitted(4, 16) Source(10, 16) + SourceIndex(0)
-4 >Emitted(4, 42) Source(10, 23) + SourceIndex(0)
-5 >Emitted(4, 43) Source(10, 24) + SourceIndex(0)
+1->Emitted(5, 9) Source(10, 9) + SourceIndex(0)
+2 >Emitted(5, 15) Source(10, 15) + SourceIndex(0)
+3 >Emitted(5, 16) Source(10, 16) + SourceIndex(0)
+4 >Emitted(5, 42) Source(10, 23) + SourceIndex(0)
+5 >Emitted(5, 43) Source(10, 24) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -62,15 +63,15 @@ sourceFile:test.tsx
 1 >
   >    
 2 >    }
-1 >Emitted(5, 5) Source(11, 5) + SourceIndex(0)
-2 >Emitted(5, 6) Source(11, 6) + SourceIndex(0)
+1 >Emitted(6, 5) Source(11, 5) + SourceIndex(0)
+2 >Emitted(6, 6) Source(11, 6) + SourceIndex(0)
 ---
 >>>}
 1 >^
 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
-1 >Emitted(6, 2) Source(12, 2) + SourceIndex(0)
+1 >Emitted(7, 2) Source(12, 2) + SourceIndex(0)
 ---
 >>>exports.AppComponent = AppComponent;
 1->
@@ -81,7 +82,7 @@ sourceFile:test.tsx
   >        return <div />;
   >    }
   >}
-1->Emitted(7, 1) Source(8, 1) + SourceIndex(0)
-2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0)
+1->Emitted(8, 1) Source(8, 1) + SourceIndex(0)
+2 >Emitted(8, 37) Source(12, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js
index 23f6f44e0c7..c9f5f3465e3 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js
@@ -15,6 +15,7 @@ export class AppComponent {
 
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class AppComponent {
     render() {
         return createElement("div", null);
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map
index 715014ff53f..66666a526d6 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map
@@ -1,2 +1,2 @@
 //// [test.js.map]
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAOA;IACI,MAAM;QACF,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAOA;IACI,MAAM;QACF,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt
index f1ebaf49870..1a77ab3eae1 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/test.js
 sourceFile:test.tsx
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>class AppComponent {
 1 >
 2 >^^^^^^^^^^^^^^^->
@@ -20,7 +21,7 @@ sourceFile:test.tsx
   >}
   >
   >
-1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0)
+1 >Emitted(3, 1) Source(8, 1) + SourceIndex(0)
 ---
 >>>    render() {
 1->^^^^
@@ -29,8 +30,8 @@ sourceFile:test.tsx
 1->export class AppComponent {
   >    
 2 >    render
-1->Emitted(3, 5) Source(9, 5) + SourceIndex(0)
-2 >Emitted(3, 11) Source(9, 11) + SourceIndex(0)
+1->Emitted(4, 5) Source(9, 5) + SourceIndex(0)
+2 >Emitted(4, 11) Source(9, 11) + SourceIndex(0)
 ---
 >>>        return createElement("div", null);
 1->^^^^^^^^
@@ -44,11 +45,11 @@ sourceFile:test.tsx
 3 >               
 4 >               <div />
 5 >                                         ;
-1->Emitted(4, 9) Source(10, 9) + SourceIndex(0)
-2 >Emitted(4, 15) Source(10, 15) + SourceIndex(0)
-3 >Emitted(4, 16) Source(10, 16) + SourceIndex(0)
-4 >Emitted(4, 42) Source(10, 23) + SourceIndex(0)
-5 >Emitted(4, 43) Source(10, 24) + SourceIndex(0)
+1->Emitted(5, 9) Source(10, 9) + SourceIndex(0)
+2 >Emitted(5, 15) Source(10, 15) + SourceIndex(0)
+3 >Emitted(5, 16) Source(10, 16) + SourceIndex(0)
+4 >Emitted(5, 42) Source(10, 23) + SourceIndex(0)
+5 >Emitted(5, 43) Source(10, 24) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -56,15 +57,15 @@ sourceFile:test.tsx
 1 >
   >    
 2 >    }
-1 >Emitted(5, 5) Source(11, 5) + SourceIndex(0)
-2 >Emitted(5, 6) Source(11, 6) + SourceIndex(0)
+1 >Emitted(6, 5) Source(11, 5) + SourceIndex(0)
+2 >Emitted(6, 6) Source(11, 6) + SourceIndex(0)
 ---
 >>>}
 1 >^
 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
-1 >Emitted(6, 2) Source(12, 2) + SourceIndex(0)
+1 >Emitted(7, 2) Source(12, 2) + SourceIndex(0)
 ---
 >>>exports.AppComponent = AppComponent;
 1->
@@ -75,7 +76,7 @@ sourceFile:test.tsx
   >        return <div />;
   >    }
   >}
-1->Emitted(7, 1) Source(8, 1) + SourceIndex(0)
-2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0)
+1->Emitted(8, 1) Source(8, 1) + SourceIndex(0)
+2 >Emitted(8, 37) Source(12, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
index 90bb675442a..9fc5799b11d 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -69,6 +70,7 @@ function toCamelCase(text) {
 }
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 let c;
 class A {
     view() {
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
index 0bc0c6e57c5..aa90c74cce5 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -69,6 +70,7 @@ function toCamelCase(text) {
 }
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 let c;
 class A {
     view() {
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js b/tests/baselines/reference/jsxFactoryQualifiedName.js
index 80a77d35302..ee747733799 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.js
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -69,6 +70,7 @@ function toCamelCase(text) {
 }
 //# sourceMappingURL=Element.js.map//// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const Element_1 = require("./Element");
 let c;
 class A {
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js.map b/tests/baselines/reference/jsxFactoryQualifiedName.js.map
index f8cef24a0f0..6c5dd8abf56 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.js.map
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.js.map
@@ -1,3 +1,3 @@
 //// [Element.js.map]
-{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map]
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAAA,uCAAmC;AAEnC,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,0CAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,0CAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"}
\ No newline at end of file
+{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";;AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map]
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAAA,uCAAmC;AAEnC,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,0CAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,0CAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
index 98517620c73..9831a9ab5fd 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/Element.js
 sourceFile:Element.ts
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>var Element;
 1 >
 2 >^^^^
@@ -42,10 +43,10 @@ sourceFile:Element.ts
   >                   }
   >               }
   >           }
-1 >Emitted(2, 1) Source(14, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(14, 18) + SourceIndex(0)
-3 >Emitted(2, 12) Source(14, 25) + SourceIndex(0)
-4 >Emitted(2, 13) Source(24, 2) + SourceIndex(0)
+1 >Emitted(3, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(14, 18) + SourceIndex(0)
+3 >Emitted(3, 12) Source(14, 25) + SourceIndex(0)
+4 >Emitted(3, 13) Source(24, 2) + SourceIndex(0)
 ---
 >>>(function (Element) {
 1->
@@ -55,9 +56,9 @@ sourceFile:Element.ts
 1->
 2 >export namespace 
 3 >           Element
-1->Emitted(3, 1) Source(14, 1) + SourceIndex(0)
-2 >Emitted(3, 12) Source(14, 18) + SourceIndex(0)
-3 >Emitted(3, 19) Source(14, 25) + SourceIndex(0)
+1->Emitted(4, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(4, 12) Source(14, 18) + SourceIndex(0)
+3 >Emitted(4, 19) Source(14, 25) + SourceIndex(0)
 ---
 >>>    function isElement(el) {
 1->^^^^
@@ -68,9 +69,9 @@ sourceFile:Element.ts
   >    
 2 >    export function isElement(
 3 >                       el: any
-1->Emitted(4, 5) Source(15, 5) + SourceIndex(0)
-2 >Emitted(4, 24) Source(15, 31) + SourceIndex(0)
-3 >Emitted(4, 26) Source(15, 38) + SourceIndex(0)
+1->Emitted(5, 5) Source(15, 5) + SourceIndex(0)
+2 >Emitted(5, 24) Source(15, 31) + SourceIndex(0)
+3 >Emitted(5, 26) Source(15, 38) + SourceIndex(0)
 ---
 >>>        return el.markAsChildOfRootElement !== undefined;
 1->^^^^^^^^
@@ -92,15 +93,15 @@ sourceFile:Element.ts
 7 >                                           !== 
 8 >                                               undefined
 9 >                                                        ;
-1->Emitted(5, 9) Source(16, 9) + SourceIndex(0)
-2 >Emitted(5, 15) Source(16, 15) + SourceIndex(0)
-3 >Emitted(5, 16) Source(16, 16) + SourceIndex(0)
-4 >Emitted(5, 18) Source(16, 18) + SourceIndex(0)
-5 >Emitted(5, 19) Source(16, 19) + SourceIndex(0)
-6 >Emitted(5, 43) Source(16, 43) + SourceIndex(0)
-7 >Emitted(5, 48) Source(16, 48) + SourceIndex(0)
-8 >Emitted(5, 57) Source(16, 57) + SourceIndex(0)
-9 >Emitted(5, 58) Source(16, 58) + SourceIndex(0)
+1->Emitted(6, 9) Source(16, 9) + SourceIndex(0)
+2 >Emitted(6, 15) Source(16, 15) + SourceIndex(0)
+3 >Emitted(6, 16) Source(16, 16) + SourceIndex(0)
+4 >Emitted(6, 18) Source(16, 18) + SourceIndex(0)
+5 >Emitted(6, 19) Source(16, 19) + SourceIndex(0)
+6 >Emitted(6, 43) Source(16, 43) + SourceIndex(0)
+7 >Emitted(6, 48) Source(16, 48) + SourceIndex(0)
+8 >Emitted(6, 57) Source(16, 57) + SourceIndex(0)
+9 >Emitted(6, 58) Source(16, 58) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -109,8 +110,8 @@ sourceFile:Element.ts
 1 >
   >    
 2 >    }
-1 >Emitted(6, 5) Source(17, 5) + SourceIndex(0)
-2 >Emitted(6, 6) Source(17, 6) + SourceIndex(0)
+1 >Emitted(7, 5) Source(17, 5) + SourceIndex(0)
+2 >Emitted(7, 6) Source(17, 6) + SourceIndex(0)
 ---
 >>>    Element.isElement = isElement;
 1->^^^^
@@ -124,10 +125,10 @@ sourceFile:Element.ts
   >                             return el.markAsChildOfRootElement !== undefined;
   >                         }
 4 >                                 
-1->Emitted(7, 5) Source(15, 21) + SourceIndex(0)
-2 >Emitted(7, 22) Source(15, 30) + SourceIndex(0)
-3 >Emitted(7, 34) Source(17, 6) + SourceIndex(0)
-4 >Emitted(7, 35) Source(17, 6) + SourceIndex(0)
+1->Emitted(8, 5) Source(15, 21) + SourceIndex(0)
+2 >Emitted(8, 22) Source(15, 30) + SourceIndex(0)
+3 >Emitted(8, 34) Source(17, 6) + SourceIndex(0)
+4 >Emitted(8, 35) Source(17, 6) + SourceIndex(0)
 ---
 >>>    function createElement(args) {
 1->^^^^
@@ -138,9 +139,9 @@ sourceFile:Element.ts
   >    
 2 >    export function createElement(
 3 >                           args: any[]
-1->Emitted(8, 5) Source(19, 5) + SourceIndex(0)
-2 >Emitted(8, 28) Source(19, 35) + SourceIndex(0)
-3 >Emitted(8, 32) Source(19, 46) + SourceIndex(0)
+1->Emitted(9, 5) Source(19, 5) + SourceIndex(0)
+2 >Emitted(9, 28) Source(19, 35) + SourceIndex(0)
+3 >Emitted(9, 32) Source(19, 46) + SourceIndex(0)
 ---
 >>>        return {};
 1 >^^^^^^^^
@@ -156,11 +157,11 @@ sourceFile:Element.ts
 4 >               {
   >                       }
 5 >                 
-1 >Emitted(9, 9) Source(21, 9) + SourceIndex(0)
-2 >Emitted(9, 15) Source(21, 15) + SourceIndex(0)
-3 >Emitted(9, 16) Source(21, 16) + SourceIndex(0)
-4 >Emitted(9, 18) Source(22, 10) + SourceIndex(0)
-5 >Emitted(9, 19) Source(22, 10) + SourceIndex(0)
+1 >Emitted(10, 9) Source(21, 9) + SourceIndex(0)
+2 >Emitted(10, 15) Source(21, 15) + SourceIndex(0)
+3 >Emitted(10, 16) Source(21, 16) + SourceIndex(0)
+4 >Emitted(10, 18) Source(22, 10) + SourceIndex(0)
+5 >Emitted(10, 19) Source(22, 10) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -169,8 +170,8 @@ sourceFile:Element.ts
 1 >
   >    
 2 >    }
-1 >Emitted(10, 5) Source(23, 5) + SourceIndex(0)
-2 >Emitted(10, 6) Source(23, 6) + SourceIndex(0)
+1 >Emitted(11, 5) Source(23, 5) + SourceIndex(0)
+2 >Emitted(11, 6) Source(23, 6) + SourceIndex(0)
 ---
 >>>    Element.createElement = createElement;
 1->^^^^
@@ -186,10 +187,10 @@ sourceFile:Element.ts
   >                                 }
   >                             }
 4 >                                         
-1->Emitted(11, 5) Source(19, 21) + SourceIndex(0)
-2 >Emitted(11, 26) Source(19, 34) + SourceIndex(0)
-3 >Emitted(11, 42) Source(23, 6) + SourceIndex(0)
-4 >Emitted(11, 43) Source(23, 6) + SourceIndex(0)
+1->Emitted(12, 5) Source(19, 21) + SourceIndex(0)
+2 >Emitted(12, 26) Source(19, 34) + SourceIndex(0)
+3 >Emitted(12, 42) Source(23, 6) + SourceIndex(0)
+4 >Emitted(12, 43) Source(23, 6) + SourceIndex(0)
 ---
 >>>})(Element = exports.Element || (exports.Element = {}));
 1->
@@ -221,15 +222,15 @@ sourceFile:Element.ts
   >                                                        }
   >                                                    }
   >                                                }
-1->Emitted(12, 1) Source(24, 1) + SourceIndex(0)
-2 >Emitted(12, 2) Source(24, 2) + SourceIndex(0)
-3 >Emitted(12, 4) Source(14, 18) + SourceIndex(0)
-4 >Emitted(12, 11) Source(14, 25) + SourceIndex(0)
-5 >Emitted(12, 14) Source(14, 18) + SourceIndex(0)
-6 >Emitted(12, 29) Source(14, 25) + SourceIndex(0)
-7 >Emitted(12, 34) Source(14, 18) + SourceIndex(0)
-8 >Emitted(12, 49) Source(14, 25) + SourceIndex(0)
-9 >Emitted(12, 57) Source(24, 2) + SourceIndex(0)
+1->Emitted(13, 1) Source(24, 1) + SourceIndex(0)
+2 >Emitted(13, 2) Source(24, 2) + SourceIndex(0)
+3 >Emitted(13, 4) Source(14, 18) + SourceIndex(0)
+4 >Emitted(13, 11) Source(14, 25) + SourceIndex(0)
+5 >Emitted(13, 14) Source(14, 18) + SourceIndex(0)
+6 >Emitted(13, 29) Source(14, 25) + SourceIndex(0)
+7 >Emitted(13, 34) Source(14, 18) + SourceIndex(0)
+8 >Emitted(13, 49) Source(14, 25) + SourceIndex(0)
+9 >Emitted(13, 57) Source(24, 2) + SourceIndex(0)
 ---
 >>>exports.createElement = Element.createElement;
 1 >
@@ -250,14 +251,14 @@ sourceFile:Element.ts
 6 >                               .
 7 >                                createElement
 8 >                                             ;
-1 >Emitted(13, 1) Source(26, 12) + SourceIndex(0)
-2 >Emitted(13, 9) Source(26, 12) + SourceIndex(0)
-3 >Emitted(13, 22) Source(26, 25) + SourceIndex(0)
-4 >Emitted(13, 25) Source(26, 28) + SourceIndex(0)
-5 >Emitted(13, 32) Source(26, 35) + SourceIndex(0)
-6 >Emitted(13, 33) Source(26, 36) + SourceIndex(0)
-7 >Emitted(13, 46) Source(26, 49) + SourceIndex(0)
-8 >Emitted(13, 47) Source(26, 50) + SourceIndex(0)
+1 >Emitted(14, 1) Source(26, 12) + SourceIndex(0)
+2 >Emitted(14, 9) Source(26, 12) + SourceIndex(0)
+3 >Emitted(14, 22) Source(26, 25) + SourceIndex(0)
+4 >Emitted(14, 25) Source(26, 28) + SourceIndex(0)
+5 >Emitted(14, 32) Source(26, 35) + SourceIndex(0)
+6 >Emitted(14, 33) Source(26, 36) + SourceIndex(0)
+7 >Emitted(14, 46) Source(26, 49) + SourceIndex(0)
+8 >Emitted(14, 47) Source(26, 50) + SourceIndex(0)
 ---
 >>>function toCamelCase(text) {
 1 >
@@ -269,9 +270,9 @@ sourceFile:Element.ts
   >
 2 >function toCamelCase(
 3 >                     text: string
-1 >Emitted(14, 1) Source(28, 1) + SourceIndex(0)
-2 >Emitted(14, 22) Source(28, 22) + SourceIndex(0)
-3 >Emitted(14, 26) Source(28, 34) + SourceIndex(0)
+1 >Emitted(15, 1) Source(28, 1) + SourceIndex(0)
+2 >Emitted(15, 22) Source(28, 22) + SourceIndex(0)
+3 >Emitted(15, 26) Source(28, 34) + SourceIndex(0)
 ---
 >>>    return text[0].toLowerCase() + text.substring(1);
 1->^^^^
@@ -311,24 +312,24 @@ sourceFile:Element.ts
 16>                                                  1
 17>                                                   )
 18>                                                    ;
-1->Emitted(15, 5) Source(29, 5) + SourceIndex(0)
-2 >Emitted(15, 11) Source(29, 11) + SourceIndex(0)
-3 >Emitted(15, 12) Source(29, 12) + SourceIndex(0)
-4 >Emitted(15, 16) Source(29, 16) + SourceIndex(0)
-5 >Emitted(15, 17) Source(29, 17) + SourceIndex(0)
-6 >Emitted(15, 18) Source(29, 18) + SourceIndex(0)
-7 >Emitted(15, 19) Source(29, 19) + SourceIndex(0)
-8 >Emitted(15, 20) Source(29, 20) + SourceIndex(0)
-9 >Emitted(15, 31) Source(29, 31) + SourceIndex(0)
-10>Emitted(15, 33) Source(29, 33) + SourceIndex(0)
-11>Emitted(15, 36) Source(29, 36) + SourceIndex(0)
-12>Emitted(15, 40) Source(29, 40) + SourceIndex(0)
-13>Emitted(15, 41) Source(29, 41) + SourceIndex(0)
-14>Emitted(15, 50) Source(29, 50) + SourceIndex(0)
-15>Emitted(15, 51) Source(29, 51) + SourceIndex(0)
-16>Emitted(15, 52) Source(29, 52) + SourceIndex(0)
-17>Emitted(15, 53) Source(29, 53) + SourceIndex(0)
-18>Emitted(15, 54) Source(29, 54) + SourceIndex(0)
+1->Emitted(16, 5) Source(29, 5) + SourceIndex(0)
+2 >Emitted(16, 11) Source(29, 11) + SourceIndex(0)
+3 >Emitted(16, 12) Source(29, 12) + SourceIndex(0)
+4 >Emitted(16, 16) Source(29, 16) + SourceIndex(0)
+5 >Emitted(16, 17) Source(29, 17) + SourceIndex(0)
+6 >Emitted(16, 18) Source(29, 18) + SourceIndex(0)
+7 >Emitted(16, 19) Source(29, 19) + SourceIndex(0)
+8 >Emitted(16, 20) Source(29, 20) + SourceIndex(0)
+9 >Emitted(16, 31) Source(29, 31) + SourceIndex(0)
+10>Emitted(16, 33) Source(29, 33) + SourceIndex(0)
+11>Emitted(16, 36) Source(29, 36) + SourceIndex(0)
+12>Emitted(16, 40) Source(29, 40) + SourceIndex(0)
+13>Emitted(16, 41) Source(29, 41) + SourceIndex(0)
+14>Emitted(16, 50) Source(29, 50) + SourceIndex(0)
+15>Emitted(16, 51) Source(29, 51) + SourceIndex(0)
+16>Emitted(16, 52) Source(29, 52) + SourceIndex(0)
+17>Emitted(16, 53) Source(29, 53) + SourceIndex(0)
+18>Emitted(16, 54) Source(29, 54) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -337,8 +338,8 @@ sourceFile:Element.ts
 1 >
   >
 2 >}
-1 >Emitted(16, 1) Source(30, 1) + SourceIndex(0)
-2 >Emitted(16, 2) Source(30, 2) + SourceIndex(0)
+1 >Emitted(17, 1) Source(30, 1) + SourceIndex(0)
+2 >Emitted(17, 2) Source(30, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=Element.js.map===================================================================
 JsFile: test.js
@@ -351,13 +352,14 @@ emittedFile:tests/cases/compiler/test.js
 sourceFile:test.tsx
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>const Element_1 = require("./Element");
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
 2 >import { Element} from './Element';
-1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(2, 40) Source(1, 36) + SourceIndex(0)
+1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(3, 40) Source(1, 36) + SourceIndex(0)
 ---
 >>>let c;
 1 >
@@ -375,10 +377,10 @@ sourceFile:test.tsx
   >    	}
   >    }
 4 >     ;
-1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-3 >Emitted(3, 6) Source(7, 2) + SourceIndex(0)
-4 >Emitted(3, 7) Source(7, 3) + SourceIndex(0)
+1 >Emitted(4, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(4, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(4, 6) Source(7, 2) + SourceIndex(0)
+4 >Emitted(4, 7) Source(7, 3) + SourceIndex(0)
 ---
 >>>class A {
 1->
@@ -386,7 +388,7 @@ sourceFile:test.tsx
 1->
   >
   >
-1->Emitted(4, 1) Source(9, 1) + SourceIndex(0)
+1->Emitted(5, 1) Source(9, 1) + SourceIndex(0)
 ---
 >>>    view() {
 1->^^^^
@@ -395,8 +397,8 @@ sourceFile:test.tsx
 1->class A {
   >	
 2 >    view
-1->Emitted(5, 5) Source(10, 2) + SourceIndex(0)
-2 >Emitted(5, 9) Source(10, 6) + SourceIndex(0)
+1->Emitted(6, 5) Source(10, 2) + SourceIndex(0)
+2 >Emitted(6, 9) Source(10, 6) + SourceIndex(0)
 ---
 >>>        return [
 1->^^^^^^^^
@@ -407,9 +409,9 @@ sourceFile:test.tsx
   >		
 2 >        return
 3 >               
-1->Emitted(6, 9) Source(11, 3) + SourceIndex(0)
-2 >Emitted(6, 15) Source(11, 9) + SourceIndex(0)
-3 >Emitted(6, 16) Source(11, 10) + SourceIndex(0)
+1->Emitted(7, 9) Source(11, 3) + SourceIndex(0)
+2 >Emitted(7, 15) Source(11, 9) + SourceIndex(0)
+3 >Emitted(7, 16) Source(11, 10) + SourceIndex(0)
 ---
 >>>            Element_1.Element.createElement("meta", { content: "helloworld" }),
 1->^^^^^^^^^^^^
@@ -425,12 +427,12 @@ sourceFile:test.tsx
 4 >                                                             =
 5 >                                                               "helloworld"
 6 >                                                                           ></meta>
-1->Emitted(7, 13) Source(12, 4) + SourceIndex(0)
-2 >Emitted(7, 55) Source(12, 10) + SourceIndex(0)
-3 >Emitted(7, 62) Source(12, 17) + SourceIndex(0)
-4 >Emitted(7, 64) Source(12, 18) + SourceIndex(0)
-5 >Emitted(7, 76) Source(12, 30) + SourceIndex(0)
-6 >Emitted(7, 79) Source(12, 38) + SourceIndex(0)
+1->Emitted(8, 13) Source(12, 4) + SourceIndex(0)
+2 >Emitted(8, 55) Source(12, 10) + SourceIndex(0)
+3 >Emitted(8, 62) Source(12, 17) + SourceIndex(0)
+4 >Emitted(8, 64) Source(12, 18) + SourceIndex(0)
+5 >Emitted(8, 76) Source(12, 30) + SourceIndex(0)
+6 >Emitted(8, 79) Source(12, 38) + SourceIndex(0)
 ---
 >>>            Element_1.Element.createElement("meta", { content: c.a.b })
 1 >^^^^^^^^^^^^
@@ -454,16 +456,16 @@ sourceFile:test.tsx
 8 >                                                                  .
 9 >                                                                   b
 10>                                                                    }></meta>
-1 >Emitted(8, 13) Source(13, 4) + SourceIndex(0)
-2 >Emitted(8, 55) Source(13, 10) + SourceIndex(0)
-3 >Emitted(8, 62) Source(13, 17) + SourceIndex(0)
-4 >Emitted(8, 64) Source(13, 19) + SourceIndex(0)
-5 >Emitted(8, 65) Source(13, 20) + SourceIndex(0)
-6 >Emitted(8, 66) Source(13, 21) + SourceIndex(0)
-7 >Emitted(8, 67) Source(13, 23) + SourceIndex(0)
-8 >Emitted(8, 68) Source(13, 24) + SourceIndex(0)
-9 >Emitted(8, 69) Source(13, 25) + SourceIndex(0)
-10>Emitted(8, 72) Source(13, 34) + SourceIndex(0)
+1 >Emitted(9, 13) Source(13, 4) + SourceIndex(0)
+2 >Emitted(9, 55) Source(13, 10) + SourceIndex(0)
+3 >Emitted(9, 62) Source(13, 17) + SourceIndex(0)
+4 >Emitted(9, 64) Source(13, 19) + SourceIndex(0)
+5 >Emitted(9, 65) Source(13, 20) + SourceIndex(0)
+6 >Emitted(9, 66) Source(13, 21) + SourceIndex(0)
+7 >Emitted(9, 67) Source(13, 23) + SourceIndex(0)
+8 >Emitted(9, 68) Source(13, 24) + SourceIndex(0)
+9 >Emitted(9, 69) Source(13, 25) + SourceIndex(0)
+10>Emitted(9, 72) Source(13, 34) + SourceIndex(0)
 ---
 >>>        ];
 1 >^^^^^^^^^
@@ -471,8 +473,8 @@ sourceFile:test.tsx
 1 >
   >		]
 2 >         ;
-1 >Emitted(9, 10) Source(14, 4) + SourceIndex(0)
-2 >Emitted(9, 11) Source(14, 5) + SourceIndex(0)
+1 >Emitted(10, 10) Source(14, 4) + SourceIndex(0)
+2 >Emitted(10, 11) Source(14, 5) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -480,14 +482,14 @@ sourceFile:test.tsx
 1 >
   >	
 2 >    }
-1 >Emitted(10, 5) Source(15, 2) + SourceIndex(0)
-2 >Emitted(10, 6) Source(15, 3) + SourceIndex(0)
+1 >Emitted(11, 5) Source(15, 2) + SourceIndex(0)
+2 >Emitted(11, 6) Source(15, 3) + SourceIndex(0)
 ---
 >>>}
 1 >^
 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
-1 >Emitted(11, 2) Source(16, 2) + SourceIndex(0)
+1 >Emitted(12, 2) Source(16, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js
index 6714b68a093..510efc97f4a 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js
@@ -14,6 +14,7 @@ export class AppComponent {
 
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class AppComponent {
     render(createElement) {
         return MyElement.createElement("div", null);
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map
index ac54c9638cd..1af641eb351 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map
@@ -1,2 +1,2 @@
 //// [test.js.map]
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,oCAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,oCAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt
index 2616efcf63b..2f5270f3705 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/test.js
 sourceFile:test.tsx
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>class AppComponent {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
@@ -20,7 +21,7 @@ sourceFile:test.tsx
   >}
   >
   >
-1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0)
+1 >Emitted(3, 1) Source(8, 1) + SourceIndex(0)
 ---
 >>>    render(createElement) {
 1->^^^^
@@ -33,10 +34,10 @@ sourceFile:test.tsx
 2 >    render
 3 >          (
 4 >           createElement
-1->Emitted(3, 5) Source(9, 5) + SourceIndex(0)
-2 >Emitted(3, 11) Source(9, 11) + SourceIndex(0)
-3 >Emitted(3, 12) Source(9, 12) + SourceIndex(0)
-4 >Emitted(3, 25) Source(9, 25) + SourceIndex(0)
+1->Emitted(4, 5) Source(9, 5) + SourceIndex(0)
+2 >Emitted(4, 11) Source(9, 11) + SourceIndex(0)
+3 >Emitted(4, 12) Source(9, 12) + SourceIndex(0)
+4 >Emitted(4, 25) Source(9, 25) + SourceIndex(0)
 ---
 >>>        return MyElement.createElement("div", null);
 1->^^^^^^^^
@@ -50,11 +51,11 @@ sourceFile:test.tsx
 3 >               
 4 >               <div />
 5 >                                                   ;
-1->Emitted(4, 9) Source(10, 9) + SourceIndex(0)
-2 >Emitted(4, 15) Source(10, 15) + SourceIndex(0)
-3 >Emitted(4, 16) Source(10, 16) + SourceIndex(0)
-4 >Emitted(4, 52) Source(10, 23) + SourceIndex(0)
-5 >Emitted(4, 53) Source(10, 24) + SourceIndex(0)
+1->Emitted(5, 9) Source(10, 9) + SourceIndex(0)
+2 >Emitted(5, 15) Source(10, 15) + SourceIndex(0)
+3 >Emitted(5, 16) Source(10, 16) + SourceIndex(0)
+4 >Emitted(5, 52) Source(10, 23) + SourceIndex(0)
+5 >Emitted(5, 53) Source(10, 24) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -62,15 +63,15 @@ sourceFile:test.tsx
 1 >
   >    
 2 >    }
-1 >Emitted(5, 5) Source(11, 5) + SourceIndex(0)
-2 >Emitted(5, 6) Source(11, 6) + SourceIndex(0)
+1 >Emitted(6, 5) Source(11, 5) + SourceIndex(0)
+2 >Emitted(6, 6) Source(11, 6) + SourceIndex(0)
 ---
 >>>}
 1 >^
 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
-1 >Emitted(6, 2) Source(12, 2) + SourceIndex(0)
+1 >Emitted(7, 2) Source(12, 2) + SourceIndex(0)
 ---
 >>>exports.AppComponent = AppComponent;
 1->
@@ -81,7 +82,7 @@ sourceFile:test.tsx
   >        return <div />;
   >    }
   >}
-1->Emitted(7, 1) Source(8, 1) + SourceIndex(0)
-2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0)
+1->Emitted(8, 1) Source(8, 1) + SourceIndex(0)
+2 >Emitted(8, 37) Source(12, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
index ecf7d13d89d..267f3eaee50 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
@@ -13,6 +13,7 @@ class Component {
 
 //// [index.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 require("./jsx");
 var skate;
 var React = { createElement: skate.h };
diff --git a/tests/baselines/reference/jsxImportInAttribute.js b/tests/baselines/reference/jsxImportInAttribute.js
index c204ea7880d..4b42ebe812d 100644
--- a/tests/baselines/reference/jsxImportInAttribute.js
+++ b/tests/baselines/reference/jsxImportInAttribute.js
@@ -16,6 +16,7 @@ let x = Test; // emit test_1.default
 
 //// [consumer.jsx]
 "use strict";
+exports.__esModule = true;
 /// <reference path="component.d.ts" />
 var Test_1 = require("Test");
 var x = Test_1["default"]; // emit test_1.default
diff --git a/tests/baselines/reference/jsxViaImport.2.js b/tests/baselines/reference/jsxViaImport.2.js
index 7310da92e92..187ba545fb3 100644
--- a/tests/baselines/reference/jsxViaImport.2.js
+++ b/tests/baselines/reference/jsxViaImport.2.js
@@ -35,6 +35,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 /// <reference path="component.d.ts" />
 var BaseComponent_1 = require("BaseComponent");
 var TestComponent = (function (_super) {
diff --git a/tests/baselines/reference/jsxViaImport.js b/tests/baselines/reference/jsxViaImport.js
index cee60d848ab..3b291a34774 100644
--- a/tests/baselines/reference/jsxViaImport.js
+++ b/tests/baselines/reference/jsxViaImport.js
@@ -35,6 +35,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 /// <reference path="component.d.ts" />
 var BaseComponent = require("BaseComponent");
 var TestComponent = (function (_super) {
diff --git a/tests/baselines/reference/keepImportsInDts1.js b/tests/baselines/reference/keepImportsInDts1.js
index 8189ce43088..3f945a5ebc3 100644
--- a/tests/baselines/reference/keepImportsInDts1.js
+++ b/tests/baselines/reference/keepImportsInDts1.js
@@ -9,6 +9,7 @@ import "test"
 //// [main.js]
 define(["require", "exports", "test"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/keepImportsInDts2.js b/tests/baselines/reference/keepImportsInDts2.js
index 559b4814526..acd75a00c87 100644
--- a/tests/baselines/reference/keepImportsInDts2.js
+++ b/tests/baselines/reference/keepImportsInDts2.js
@@ -9,10 +9,12 @@ import "./folder/test"
 //// [test.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [main.js]
 define(["require", "exports", "./folder/test"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/keepImportsInDts3.js b/tests/baselines/reference/keepImportsInDts3.js
index e48ba693726..aec2e544e2f 100644
--- a/tests/baselines/reference/keepImportsInDts3.js
+++ b/tests/baselines/reference/keepImportsInDts3.js
@@ -9,9 +9,11 @@ import "test"
 //// [outputfile.js]
 define("test", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 define("app/main", ["require", "exports", "test"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/keepImportsInDts4.js b/tests/baselines/reference/keepImportsInDts4.js
index badec87984e..3a959bcbbac 100644
--- a/tests/baselines/reference/keepImportsInDts4.js
+++ b/tests/baselines/reference/keepImportsInDts4.js
@@ -9,9 +9,11 @@ import "./folder/test"
 //// [outputfile.js]
 define("folder/test", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 define("main", ["require", "exports", "folder/test"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/library-reference-12.trace.json b/tests/baselines/reference/library-reference-12.trace.json
index 14e46647d6d..75b53d589ee 100644
--- a/tests/baselines/reference/library-reference-12.trace.json
+++ b/tests/baselines/reference/library-reference-12.trace.json
@@ -5,6 +5,7 @@
     "Directory '/a/b/node_modules' does not exist, skipping all lookups in it.",
     "File '/a/node_modules/jquery.d.ts' does not exist.",
     "Found 'package.json' at '/a/node_modules/jquery/package.json'.",
+    "'package.json' does not have a 'typings' field.",
     "'package.json' has 'types' field 'dist/jquery.d.ts' that references '/a/node_modules/jquery/dist/jquery.d.ts'.",
     "File '/a/node_modules/jquery/dist/jquery.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/a/node_modules/jquery/dist/jquery.d.ts', result '/a/node_modules/jquery/dist/jquery.d.ts'",
diff --git a/tests/baselines/reference/library-reference-2.trace.json b/tests/baselines/reference/library-reference-2.trace.json
index 8837f2c9cb1..ef0936a35a2 100644
--- a/tests/baselines/reference/library-reference-2.trace.json
+++ b/tests/baselines/reference/library-reference-2.trace.json
@@ -2,6 +2,7 @@
     "======== Resolving type reference directive 'jquery', containing file '/consumer.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "Found 'package.json' at '/types/jquery/package.json'.",
+    "'package.json' does not have a 'typings' field.",
     "'package.json' has 'types' field 'jquery.d.ts' that references '/types/jquery/jquery.d.ts'.",
     "File '/types/jquery/jquery.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/types/jquery/jquery.d.ts', result '/types/jquery/jquery.d.ts'",
@@ -9,6 +10,7 @@
     "======== Resolving type reference directive 'jquery', containing file 'test/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "Found 'package.json' at '/types/jquery/package.json'.",
+    "'package.json' does not have a 'typings' field.",
     "'package.json' has 'types' field 'jquery.d.ts' that references '/types/jquery/jquery.d.ts'.",
     "File '/types/jquery/jquery.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/types/jquery/jquery.d.ts', result '/types/jquery/jquery.d.ts'",
diff --git a/tests/baselines/reference/localAliasExportAssignment.js b/tests/baselines/reference/localAliasExportAssignment.js
index 46ca09c2caa..f198c0f9ea7 100644
--- a/tests/baselines/reference/localAliasExportAssignment.js
+++ b/tests/baselines/reference/localAliasExportAssignment.js
@@ -22,6 +22,7 @@ var server;
 module.exports = server;
 //// [localAliasExportAssignment_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='localAliasExportAssignment_0.ts'/>
 var connect = require("./localAliasExportAssignment_0");
 connect();
diff --git a/tests/baselines/reference/mapOnTupleTypes01.js b/tests/baselines/reference/mapOnTupleTypes01.js
index cb1de5fdc61..9f22aa63753 100644
--- a/tests/baselines/reference/mapOnTupleTypes01.js
+++ b/tests/baselines/reference/mapOnTupleTypes01.js
@@ -44,6 +44,7 @@ export let h = numNumNumNumNum.map(n => n * n);
 
 //// [mapOnTupleTypes01.js]
 "use strict";
+exports.__esModule = true;
 exports.mapOnLooseArrayLiteral = [1, 2, 3, 4].map(function (n) { return n * n; });
 // Length 1
 var numTuple = [1];
diff --git a/tests/baselines/reference/mapOnTupleTypes02.js b/tests/baselines/reference/mapOnTupleTypes02.js
index 97ffc9510db..ca835751a7a 100644
--- a/tests/baselines/reference/mapOnTupleTypes02.js
+++ b/tests/baselines/reference/mapOnTupleTypes02.js
@@ -8,6 +8,7 @@ export function increment(point: Point) {
 
 //// [mapOnTupleTypes02.js]
 "use strict";
+exports.__esModule = true;
 function increment(point) {
     return point.map(function (d) { return d + 1; });
 }
diff --git a/tests/baselines/reference/memberAccessMustUseModuleInstances.js b/tests/baselines/reference/memberAccessMustUseModuleInstances.js
index 00f913219a4..2ba05b016be 100644
--- a/tests/baselines/reference/memberAccessMustUseModuleInstances.js
+++ b/tests/baselines/reference/memberAccessMustUseModuleInstances.js
@@ -17,6 +17,7 @@ WinJS.Promise.timeout(10);
 //// [memberAccessMustUseModuleInstances_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Promise = (function () {
         function Promise() {
         }
@@ -30,5 +31,6 @@ define(["require", "exports"], function (require, exports) {
 //// [memberAccessMustUseModuleInstances_1.js]
 define(["require", "exports", "memberAccessMustUseModuleInstances_0"], function (require, exports, WinJS) {
     "use strict";
+    exports.__esModule = true;
     WinJS.Promise.timeout(10);
 });
diff --git a/tests/baselines/reference/mergeWithImportedNamespace.js b/tests/baselines/reference/mergeWithImportedNamespace.js
index 60f6fedd3f2..ec2eb4a1087 100644
--- a/tests/baselines/reference/mergeWithImportedNamespace.js
+++ b/tests/baselines/reference/mergeWithImportedNamespace.js
@@ -12,9 +12,11 @@ export namespace N {
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var N;
 (function (N) {
     N.x = 1;
 })(N = exports.N || (exports.N = {}));
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/mergeWithImportedType.js b/tests/baselines/reference/mergeWithImportedType.js
index e8dc5a3c2f3..efa95d77630 100644
--- a/tests/baselines/reference/mergeWithImportedType.js
+++ b/tests/baselines/reference/mergeWithImportedType.js
@@ -10,9 +10,11 @@ export type E = E;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var E;
 (function (E) {
     E[E["X"] = 0] = "X";
 })(E = exports.E || (exports.E = {}));
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/mergedDeclarations6.js b/tests/baselines/reference/mergedDeclarations6.js
index 4452165c3e6..83173f35752 100644
--- a/tests/baselines/reference/mergedDeclarations6.js
+++ b/tests/baselines/reference/mergedDeclarations6.js
@@ -26,6 +26,7 @@ export class B extends A {
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
@@ -49,6 +50,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 define(["require", "exports", "./a"], function (require, exports, a_1) {
     "use strict";
+    exports.__esModule = true;
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
diff --git a/tests/baselines/reference/mergedDeclarations7.js b/tests/baselines/reference/mergedDeclarations7.js
index e3d1ddc6e0e..8fa3f2d0731 100644
--- a/tests/baselines/reference/mergedDeclarations7.js
+++ b/tests/baselines/reference/mergedDeclarations7.js
@@ -24,5 +24,6 @@ let p: Passport = passport.use();
 
 //// [test.js]
 "use strict";
+exports.__esModule = true;
 var passport = require("passport");
 var p = passport.use();
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js
index 573701d407b..8d5f55b6801 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js
@@ -17,6 +17,7 @@ export module X {
 
 //// [mergedModuleDeclarationCodeGen.js]
 "use strict";
+exports.__esModule = true;
 var X;
 (function (X) {
     var Y;
diff --git a/tests/baselines/reference/metadataOfEventAlias.js b/tests/baselines/reference/metadataOfEventAlias.js
index 8a22a90bc2e..40cbc87cdcb 100644
--- a/tests/baselines/reference/metadataOfEventAlias.js
+++ b/tests/baselines/reference/metadataOfEventAlias.js
@@ -13,6 +13,7 @@ export class SomeClass {
 
 //// [event.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 ;
 //// [test.js]
 "use strict";
@@ -25,6 +26,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 function Input(target, key) { }
 var SomeClass = (function () {
     function SomeClass() {
diff --git a/tests/baselines/reference/missingFunctionImplementation.js b/tests/baselines/reference/missingFunctionImplementation.js
index d9ab942cfc8..23bb2356640 100644
--- a/tests/baselines/reference/missingFunctionImplementation.js
+++ b/tests/baselines/reference/missingFunctionImplementation.js
@@ -82,6 +82,7 @@ namespace N12 {
 
 //// [missingFunctionImplementation.js]
 "use strict";
+exports.__esModule = true;
 var C1 = (function () {
     function C1() {
     }
diff --git a/tests/baselines/reference/missingFunctionImplementation2.js b/tests/baselines/reference/missingFunctionImplementation2.js
index 7b3456015c8..dde60611657 100644
--- a/tests/baselines/reference/missingFunctionImplementation2.js
+++ b/tests/baselines/reference/missingFunctionImplementation2.js
@@ -11,5 +11,7 @@ export function f(a?, b?);
 
 //// [missingFunctionImplementation2_a.js]
 "use strict";
+exports.__esModule = true;
 //// [missingFunctionImplementation2_b.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js
index 069849ffb83..d4a8b12d2a6 100644
--- a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js
+++ b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js
@@ -10,7 +10,9 @@ import {x} from "./a"
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 1;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 (function () { return 1; }());
diff --git a/tests/baselines/reference/mixinAccessModifiers.errors.txt b/tests/baselines/reference/mixinAccessModifiers.errors.txt
new file mode 100644
index 00000000000..a161a855881
--- /dev/null
+++ b/tests/baselines/reference/mixinAccessModifiers.errors.txt
@@ -0,0 +1,156 @@
+tests/cases/conformance/classes/mixinAccessModifiers.ts(39,4): error TS2546: Property 'p' has conflicting declarations and is inaccessible in type 'Private & Private2'.
+tests/cases/conformance/classes/mixinAccessModifiers.ts(43,4): error TS2546: Property 'p' has conflicting declarations and is inaccessible in type 'Private & Protected'.
+tests/cases/conformance/classes/mixinAccessModifiers.ts(47,4): error TS2546: Property 'p' has conflicting declarations and is inaccessible in type 'Private & Public'.
+tests/cases/conformance/classes/mixinAccessModifiers.ts(51,4): error TS2445: Property 'p' is protected and only accessible within class 'Protected & Protected2' and its subclasses.
+tests/cases/conformance/classes/mixinAccessModifiers.ts(66,7): error TS2415: Class 'C1' incorrectly extends base class 'Private & Private2'.
+  Type 'C1' is not assignable to type 'Private'.
+    Property 'p' has conflicting declarations and is inaccessible in type 'C1'.
+tests/cases/conformance/classes/mixinAccessModifiers.ts(67,7): error TS2415: Class 'C2' incorrectly extends base class 'Private & Protected'.
+  Type 'C2' is not assignable to type 'Private'.
+    Property 'p' has conflicting declarations and is inaccessible in type 'C2'.
+tests/cases/conformance/classes/mixinAccessModifiers.ts(68,7): error TS2415: Class 'C3' incorrectly extends base class 'Private & Public'.
+  Type 'C3' is not assignable to type 'Private'.
+    Property 'p' has conflicting declarations and is inaccessible in type 'C3'.
+tests/cases/conformance/classes/mixinAccessModifiers.ts(85,6): error TS2445: Property 'p' is protected and only accessible within class 'C4' and its subclasses.
+tests/cases/conformance/classes/mixinAccessModifiers.ts(90,6): error TS2445: Property 's' is protected and only accessible within class 'typeof C4' and its subclasses.
+tests/cases/conformance/classes/mixinAccessModifiers.ts(98,6): error TS2445: Property 'p' is protected and only accessible within class 'C4' and its subclasses.
+tests/cases/conformance/classes/mixinAccessModifiers.ts(103,6): error TS2445: Property 's' is protected and only accessible within class 'typeof C4' and its subclasses.
+
+
+==== tests/cases/conformance/classes/mixinAccessModifiers.ts (11 errors) ====
+    
+    type Constructable = new (...args: any[]) => object;
+    
+    class Private {
+    	constructor (...args: any[]) {}
+    	private p: string;
+    }
+    
+    class Private2 {
+    	constructor (...args: any[]) {}
+    	private p: string;
+    }
+    
+    class Protected {
+    	constructor (...args: any[]) {}
+    	protected p: string;
+    	protected static s: string;
+    }
+    
+    class Protected2 {
+    	constructor (...args: any[]) {}
+    	protected p: string;
+    	protected static s: string;
+    }
+    
+    class Public {
+    	constructor (...args: any[]) {}
+    	public p: string;
+    	public static s: string;
+    }
+    
+    class Public2 {
+    	constructor (...args: any[]) {}
+    	public p: string;
+    	public static s: string;
+    }
+    
+    function f1(x: Private & Private2) {
+    	x.p;  // Error, private constituent makes property inaccessible
+    	  ~
+!!! error TS2546: Property 'p' has conflicting declarations and is inaccessible in type 'Private & Private2'.
+    }
+    
+    function f2(x: Private & Protected) {
+    	x.p;  // Error, private constituent makes property inaccessible
+    	  ~
+!!! error TS2546: Property 'p' has conflicting declarations and is inaccessible in type 'Private & Protected'.
+    }
+    
+    function f3(x: Private & Public) {
+    	x.p;  // Error, private constituent makes property inaccessible
+    	  ~
+!!! error TS2546: Property 'p' has conflicting declarations and is inaccessible in type 'Private & Public'.
+    }
+    
+    function f4(x: Protected & Protected2) {
+    	x.p;  // Error, protected when all constituents are protected
+    	  ~
+!!! error TS2445: Property 'p' is protected and only accessible within class 'Protected & Protected2' and its subclasses.
+    }
+    
+    function f5(x: Protected & Public) {
+    	x.p;  // Ok, public if any constituent is public
+    }
+    
+    function f6(x: Public & Public2) {
+    	x.p;  // Ok, public if any constituent is public
+    }
+    
+    declare function Mix<T, U>(c1: T, c2: U): T & U;
+    
+    // Can't derive from type with inaccessible properties
+    
+    class C1 extends Mix(Private, Private2) {}
+          ~~
+!!! error TS2415: Class 'C1' incorrectly extends base class 'Private & Private2'.
+!!! error TS2415:   Type 'C1' is not assignable to type 'Private'.
+!!! error TS2415:     Property 'p' has conflicting declarations and is inaccessible in type 'C1'.
+    class C2 extends Mix(Private, Protected) {}
+          ~~
+!!! error TS2415: Class 'C2' incorrectly extends base class 'Private & Protected'.
+!!! error TS2415:   Type 'C2' is not assignable to type 'Private'.
+!!! error TS2415:     Property 'p' has conflicting declarations and is inaccessible in type 'C2'.
+    class C3 extends Mix(Private, Public) {}
+          ~~
+!!! error TS2415: Class 'C3' incorrectly extends base class 'Private & Public'.
+!!! error TS2415:   Type 'C3' is not assignable to type 'Private'.
+!!! error TS2415:     Property 'p' has conflicting declarations and is inaccessible in type 'C3'.
+    
+    class C4 extends Mix(Protected, Protected2) {
+    	f(c4: C4, c5: C5, c6: C6) {
+    		c4.p;
+    		c5.p;
+    		c6.p;
+    	}
+    	static g() {
+    		C4.s;
+    		C5.s;
+    		C6.s
+    	}
+    }
+    
+    class C5 extends Mix(Protected, Public) {
+    	f(c4: C4, c5: C5, c6: C6) {
+    		c4.p;  // Error, not in class deriving from Protected2
+    		   ~
+!!! error TS2445: Property 'p' is protected and only accessible within class 'C4' and its subclasses.
+    		c5.p;
+    		c6.p;
+    	}
+    	static g() {
+    		C4.s;  // Error, not in class deriving from Protected2
+    		   ~
+!!! error TS2445: Property 's' is protected and only accessible within class 'typeof C4' and its subclasses.
+    		C5.s;
+    		C6.s
+    	}
+    }
+    
+    class C6 extends Mix(Public, Public2) {
+    	f(c4: C4, c5: C5, c6: C6) {
+    		c4.p;  // Error, not in class deriving from Protected2
+    		   ~
+!!! error TS2445: Property 'p' is protected and only accessible within class 'C4' and its subclasses.
+    		c5.p;
+    		c6.p;
+    	}
+    	static g() {
+    		C4.s;  // Error, not in class deriving from Protected2
+    		   ~
+!!! error TS2445: Property 's' is protected and only accessible within class 'typeof C4' and its subclasses.
+    		C5.s;
+    		C6.s
+    	}
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/mixinAccessModifiers.js b/tests/baselines/reference/mixinAccessModifiers.js
new file mode 100644
index 00000000000..5bf42f480fb
--- /dev/null
+++ b/tests/baselines/reference/mixinAccessModifiers.js
@@ -0,0 +1,323 @@
+//// [mixinAccessModifiers.ts]
+
+type Constructable = new (...args: any[]) => object;
+
+class Private {
+	constructor (...args: any[]) {}
+	private p: string;
+}
+
+class Private2 {
+	constructor (...args: any[]) {}
+	private p: string;
+}
+
+class Protected {
+	constructor (...args: any[]) {}
+	protected p: string;
+	protected static s: string;
+}
+
+class Protected2 {
+	constructor (...args: any[]) {}
+	protected p: string;
+	protected static s: string;
+}
+
+class Public {
+	constructor (...args: any[]) {}
+	public p: string;
+	public static s: string;
+}
+
+class Public2 {
+	constructor (...args: any[]) {}
+	public p: string;
+	public static s: string;
+}
+
+function f1(x: Private & Private2) {
+	x.p;  // Error, private constituent makes property inaccessible
+}
+
+function f2(x: Private & Protected) {
+	x.p;  // Error, private constituent makes property inaccessible
+}
+
+function f3(x: Private & Public) {
+	x.p;  // Error, private constituent makes property inaccessible
+}
+
+function f4(x: Protected & Protected2) {
+	x.p;  // Error, protected when all constituents are protected
+}
+
+function f5(x: Protected & Public) {
+	x.p;  // Ok, public if any constituent is public
+}
+
+function f6(x: Public & Public2) {
+	x.p;  // Ok, public if any constituent is public
+}
+
+declare function Mix<T, U>(c1: T, c2: U): T & U;
+
+// Can't derive from type with inaccessible properties
+
+class C1 extends Mix(Private, Private2) {}
+class C2 extends Mix(Private, Protected) {}
+class C3 extends Mix(Private, Public) {}
+
+class C4 extends Mix(Protected, Protected2) {
+	f(c4: C4, c5: C5, c6: C6) {
+		c4.p;
+		c5.p;
+		c6.p;
+	}
+	static g() {
+		C4.s;
+		C5.s;
+		C6.s
+	}
+}
+
+class C5 extends Mix(Protected, Public) {
+	f(c4: C4, c5: C5, c6: C6) {
+		c4.p;  // Error, not in class deriving from Protected2
+		c5.p;
+		c6.p;
+	}
+	static g() {
+		C4.s;  // Error, not in class deriving from Protected2
+		C5.s;
+		C6.s
+	}
+}
+
+class C6 extends Mix(Public, Public2) {
+	f(c4: C4, c5: C5, c6: C6) {
+		c4.p;  // Error, not in class deriving from Protected2
+		c5.p;
+		c6.p;
+	}
+	static g() {
+		C4.s;  // Error, not in class deriving from Protected2
+		C5.s;
+		C6.s
+	}
+}
+
+
+//// [mixinAccessModifiers.js]
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var Private = (function () {
+    function Private() {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+    }
+    return Private;
+}());
+var Private2 = (function () {
+    function Private2() {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+    }
+    return Private2;
+}());
+var Protected = (function () {
+    function Protected() {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+    }
+    return Protected;
+}());
+var Protected2 = (function () {
+    function Protected2() {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+    }
+    return Protected2;
+}());
+var Public = (function () {
+    function Public() {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+    }
+    return Public;
+}());
+var Public2 = (function () {
+    function Public2() {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+    }
+    return Public2;
+}());
+function f1(x) {
+    x.p; // Error, private constituent makes property inaccessible
+}
+function f2(x) {
+    x.p; // Error, private constituent makes property inaccessible
+}
+function f3(x) {
+    x.p; // Error, private constituent makes property inaccessible
+}
+function f4(x) {
+    x.p; // Error, protected when all constituents are protected
+}
+function f5(x) {
+    x.p; // Ok, public if any constituent is public
+}
+function f6(x) {
+    x.p; // Ok, public if any constituent is public
+}
+// Can't derive from type with inaccessible properties
+var C1 = (function (_super) {
+    __extends(C1, _super);
+    function C1() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return C1;
+}(Mix(Private, Private2)));
+var C2 = (function (_super) {
+    __extends(C2, _super);
+    function C2() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return C2;
+}(Mix(Private, Protected)));
+var C3 = (function (_super) {
+    __extends(C3, _super);
+    function C3() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return C3;
+}(Mix(Private, Public)));
+var C4 = (function (_super) {
+    __extends(C4, _super);
+    function C4() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    C4.prototype.f = function (c4, c5, c6) {
+        c4.p;
+        c5.p;
+        c6.p;
+    };
+    C4.g = function () {
+        C4.s;
+        C5.s;
+        C6.s;
+    };
+    return C4;
+}(Mix(Protected, Protected2)));
+var C5 = (function (_super) {
+    __extends(C5, _super);
+    function C5() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    C5.prototype.f = function (c4, c5, c6) {
+        c4.p; // Error, not in class deriving from Protected2
+        c5.p;
+        c6.p;
+    };
+    C5.g = function () {
+        C4.s; // Error, not in class deriving from Protected2
+        C5.s;
+        C6.s;
+    };
+    return C5;
+}(Mix(Protected, Public)));
+var C6 = (function (_super) {
+    __extends(C6, _super);
+    function C6() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    C6.prototype.f = function (c4, c5, c6) {
+        c4.p; // Error, not in class deriving from Protected2
+        c5.p;
+        c6.p;
+    };
+    C6.g = function () {
+        C4.s; // Error, not in class deriving from Protected2
+        C5.s;
+        C6.s;
+    };
+    return C6;
+}(Mix(Public, Public2)));
+
+
+//// [mixinAccessModifiers.d.ts]
+declare type Constructable = new (...args: any[]) => object;
+declare class Private {
+    constructor(...args: any[]);
+    private p;
+}
+declare class Private2 {
+    constructor(...args: any[]);
+    private p;
+}
+declare class Protected {
+    constructor(...args: any[]);
+    protected p: string;
+    protected static s: string;
+}
+declare class Protected2 {
+    constructor(...args: any[]);
+    protected p: string;
+    protected static s: string;
+}
+declare class Public {
+    constructor(...args: any[]);
+    p: string;
+    static s: string;
+}
+declare class Public2 {
+    constructor(...args: any[]);
+    p: string;
+    static s: string;
+}
+declare function f1(x: Private & Private2): void;
+declare function f2(x: Private & Protected): void;
+declare function f3(x: Private & Public): void;
+declare function f4(x: Protected & Protected2): void;
+declare function f5(x: Protected & Public): void;
+declare function f6(x: Public & Public2): void;
+declare function Mix<T, U>(c1: T, c2: U): T & U;
+declare class C1 extends Private & Private2 {
+}
+declare class C2 extends Private & Protected {
+}
+declare class C3 extends Private & Public {
+}
+declare class C4 extends Protected & Protected2 {
+    f(c4: C4, c5: C5, c6: C6): void;
+    static g(): void;
+}
+declare class C5 extends Protected & Public {
+    f(c4: C4, c5: C5, c6: C6): void;
+    static g(): void;
+}
+declare class C6 extends Public & Public2 {
+    f(c4: C4, c5: C5, c6: C6): void;
+    static g(): void;
+}
diff --git a/tests/baselines/reference/mixinPrivateAndProtected.errors.txt b/tests/baselines/reference/mixinPrivateAndProtected.errors.txt
new file mode 100644
index 00000000000..131aff967d9
--- /dev/null
+++ b/tests/baselines/reference/mixinPrivateAndProtected.errors.txt
@@ -0,0 +1,116 @@
+tests/cases/compiler/mixinPrivateAndProtected.ts(46,3): error TS2445: Property 'ptd' is protected and only accessible within class 'A' and its subclasses.
+tests/cases/compiler/mixinPrivateAndProtected.ts(47,3): error TS2341: Property 'pvt' is private and only accessible within class 'A'.
+tests/cases/compiler/mixinPrivateAndProtected.ts(50,4): error TS2445: Property 'ptd' is protected and only accessible within class 'mixB<typeof A>.(Anonymous class) & A' and its subclasses.
+tests/cases/compiler/mixinPrivateAndProtected.ts(51,4): error TS2546: Property 'pvt' has conflicting declarations and is inaccessible in type 'mixB<typeof A>.(Anonymous class) & A'.
+tests/cases/compiler/mixinPrivateAndProtected.ts(54,5): error TS2445: Property 'ptd' is protected and only accessible within class 'mixC<{ new (...args: any[]): mixB<typeof A>.(Anonymous class); prototype: mixB<any>.(Anonymous class); } & typeof A>.(Anonymous class) & mixB<typeof A>.(Anonymous class) & A' and its subclasses.
+tests/cases/compiler/mixinPrivateAndProtected.ts(55,5): error TS2546: Property 'pvt' has conflicting declarations and is inaccessible in type 'mixC<{ new (...args: any[]): mixB<typeof A>.(Anonymous class); prototype: mixB<any>.(Anonymous class); } & typeof A>.(Anonymous class) & mixB<typeof A>.(Anonymous class) & A'.
+tests/cases/compiler/mixinPrivateAndProtected.ts(58,6): error TS2445: Property 'ptd' is protected and only accessible within class 'mixC<{ new (...args: any[]): mixB2<typeof A>.(Anonymous class); prototype: mixB2<any>.(Anonymous class); } & typeof A>.(Anonymous class) & mixB2<typeof A>.(Anonymous class) & A' and its subclasses.
+tests/cases/compiler/mixinPrivateAndProtected.ts(59,6): error TS2546: Property 'pvt' has conflicting declarations and is inaccessible in type 'mixC<{ new (...args: any[]): mixB2<typeof A>.(Anonymous class); prototype: mixB2<any>.(Anonymous class); } & typeof A>.(Anonymous class) & mixB2<typeof A>.(Anonymous class) & A'.
+
+
+==== tests/cases/compiler/mixinPrivateAndProtected.ts (8 errors) ====
+    // Repro from #13830
+    
+    type Constructor<T> = new(...args: any[]) => T;
+    
+    class A {
+        public pb: number = 2;
+        protected ptd: number = 1;
+        private pvt: number = 0;
+    }
+    
+    function mixB<T extends Constructor<{}>>(Cls: T) {
+        return class extends Cls {
+            protected ptd: number = 10;
+            private pvt: number = 0;
+        };
+    }
+    
+    function mixB2<T extends Constructor<A>>(Cls: T) {
+        return class extends Cls {
+            protected ptd: number = 10;
+        };
+    }
+    
+    const
+        AB = mixB(A),
+        AB2 = mixB2(A);
+    
+    function mixC<T extends Constructor<{}>>(Cls: T) {
+        return class extends Cls {
+            protected ptd: number = 100;
+            private pvt: number = 0;
+        };
+    }
+    
+    const
+        AB2C = mixC(AB2),
+        ABC = mixC(AB);
+    
+    const
+        a = new A(),
+        ab = new AB(),
+        abc = new ABC(),
+        ab2c = new AB2C();
+    
+    a.pb.toFixed();
+    a.ptd.toFixed();    // Error
+      ~~~
+!!! error TS2445: Property 'ptd' is protected and only accessible within class 'A' and its subclasses.
+    a.pvt.toFixed();    // Error
+      ~~~
+!!! error TS2341: Property 'pvt' is private and only accessible within class 'A'.
+    
+    ab.pb.toFixed();
+    ab.ptd.toFixed();   // Error
+       ~~~
+!!! error TS2445: Property 'ptd' is protected and only accessible within class 'mixB<typeof A>.(Anonymous class) & A' and its subclasses.
+    ab.pvt.toFixed();   // Error
+       ~~~
+!!! error TS2546: Property 'pvt' has conflicting declarations and is inaccessible in type 'mixB<typeof A>.(Anonymous class) & A'.
+    
+    abc.pb.toFixed();
+    abc.ptd.toFixed();  // Error
+        ~~~
+!!! error TS2445: Property 'ptd' is protected and only accessible within class 'mixC<{ new (...args: any[]): mixB<typeof A>.(Anonymous class); prototype: mixB<any>.(Anonymous class); } & typeof A>.(Anonymous class) & mixB<typeof A>.(Anonymous class) & A' and its subclasses.
+    abc.pvt.toFixed();  // Error
+        ~~~
+!!! error TS2546: Property 'pvt' has conflicting declarations and is inaccessible in type 'mixC<{ new (...args: any[]): mixB<typeof A>.(Anonymous class); prototype: mixB<any>.(Anonymous class); } & typeof A>.(Anonymous class) & mixB<typeof A>.(Anonymous class) & A'.
+    
+    ab2c.pb.toFixed();
+    ab2c.ptd.toFixed(); // Error
+         ~~~
+!!! error TS2445: Property 'ptd' is protected and only accessible within class 'mixC<{ new (...args: any[]): mixB2<typeof A>.(Anonymous class); prototype: mixB2<any>.(Anonymous class); } & typeof A>.(Anonymous class) & mixB2<typeof A>.(Anonymous class) & A' and its subclasses.
+    ab2c.pvt.toFixed(); // Error
+         ~~~
+!!! error TS2546: Property 'pvt' has conflicting declarations and is inaccessible in type 'mixC<{ new (...args: any[]): mixB2<typeof A>.(Anonymous class); prototype: mixB2<any>.(Anonymous class); } & typeof A>.(Anonymous class) & mixB2<typeof A>.(Anonymous class) & A'.
+    
+    // Repro from #13924
+    
+    class Person {
+    	constructor(public name: string) {}
+    
+    	protected myProtectedFunction() {
+    		// do something
+    	}
+    }
+    
+    function PersonMixin<T extends Constructor<Person>>(Base: T) {
+    	return class extends Base {
+    		constructor(...args: any[]) {
+    			super(...args);
+    		}
+    
+    		myProtectedFunction() {
+    			super.myProtectedFunction();
+    			// do more things
+    		}
+    	};
+    }
+    
+    class Customer extends PersonMixin(Person) {
+    	accountBalance: number;
+        f() {
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/mixinPrivateAndProtected.js b/tests/baselines/reference/mixinPrivateAndProtected.js
new file mode 100644
index 00000000000..9b8f3ee0c12
--- /dev/null
+++ b/tests/baselines/reference/mixinPrivateAndProtected.js
@@ -0,0 +1,197 @@
+//// [mixinPrivateAndProtected.ts]
+// Repro from #13830
+
+type Constructor<T> = new(...args: any[]) => T;
+
+class A {
+    public pb: number = 2;
+    protected ptd: number = 1;
+    private pvt: number = 0;
+}
+
+function mixB<T extends Constructor<{}>>(Cls: T) {
+    return class extends Cls {
+        protected ptd: number = 10;
+        private pvt: number = 0;
+    };
+}
+
+function mixB2<T extends Constructor<A>>(Cls: T) {
+    return class extends Cls {
+        protected ptd: number = 10;
+    };
+}
+
+const
+    AB = mixB(A),
+    AB2 = mixB2(A);
+
+function mixC<T extends Constructor<{}>>(Cls: T) {
+    return class extends Cls {
+        protected ptd: number = 100;
+        private pvt: number = 0;
+    };
+}
+
+const
+    AB2C = mixC(AB2),
+    ABC = mixC(AB);
+
+const
+    a = new A(),
+    ab = new AB(),
+    abc = new ABC(),
+    ab2c = new AB2C();
+
+a.pb.toFixed();
+a.ptd.toFixed();    // Error
+a.pvt.toFixed();    // Error
+
+ab.pb.toFixed();
+ab.ptd.toFixed();   // Error
+ab.pvt.toFixed();   // Error
+
+abc.pb.toFixed();
+abc.ptd.toFixed();  // Error
+abc.pvt.toFixed();  // Error
+
+ab2c.pb.toFixed();
+ab2c.ptd.toFixed(); // Error
+ab2c.pvt.toFixed(); // Error
+
+// Repro from #13924
+
+class Person {
+	constructor(public name: string) {}
+
+	protected myProtectedFunction() {
+		// do something
+	}
+}
+
+function PersonMixin<T extends Constructor<Person>>(Base: T) {
+	return class extends Base {
+		constructor(...args: any[]) {
+			super(...args);
+		}
+
+		myProtectedFunction() {
+			super.myProtectedFunction();
+			// do more things
+		}
+	};
+}
+
+class Customer extends PersonMixin(Person) {
+	accountBalance: number;
+    f() {
+    }
+}
+
+
+//// [mixinPrivateAndProtected.js]
+// Repro from #13830
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var A = (function () {
+    function A() {
+        this.pb = 2;
+        this.ptd = 1;
+        this.pvt = 0;
+    }
+    return A;
+}());
+function mixB(Cls) {
+    return (function (_super) {
+        __extends(class_1, _super);
+        function class_1() {
+            var _this = _super !== null && _super.apply(this, arguments) || this;
+            _this.ptd = 10;
+            _this.pvt = 0;
+            return _this;
+        }
+        return class_1;
+    }(Cls));
+}
+function mixB2(Cls) {
+    return (function (_super) {
+        __extends(class_2, _super);
+        function class_2() {
+            var _this = _super !== null && _super.apply(this, arguments) || this;
+            _this.ptd = 10;
+            return _this;
+        }
+        return class_2;
+    }(Cls));
+}
+var AB = mixB(A), AB2 = mixB2(A);
+function mixC(Cls) {
+    return (function (_super) {
+        __extends(class_3, _super);
+        function class_3() {
+            var _this = _super !== null && _super.apply(this, arguments) || this;
+            _this.ptd = 100;
+            _this.pvt = 0;
+            return _this;
+        }
+        return class_3;
+    }(Cls));
+}
+var AB2C = mixC(AB2), ABC = mixC(AB);
+var a = new A(), ab = new AB(), abc = new ABC(), ab2c = new AB2C();
+a.pb.toFixed();
+a.ptd.toFixed(); // Error
+a.pvt.toFixed(); // Error
+ab.pb.toFixed();
+ab.ptd.toFixed(); // Error
+ab.pvt.toFixed(); // Error
+abc.pb.toFixed();
+abc.ptd.toFixed(); // Error
+abc.pvt.toFixed(); // Error
+ab2c.pb.toFixed();
+ab2c.ptd.toFixed(); // Error
+ab2c.pvt.toFixed(); // Error
+// Repro from #13924
+var Person = (function () {
+    function Person(name) {
+        this.name = name;
+    }
+    Person.prototype.myProtectedFunction = function () {
+        // do something
+    };
+    return Person;
+}());
+function PersonMixin(Base) {
+    return (function (_super) {
+        __extends(class_4, _super);
+        function class_4() {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return _super.apply(this, args) || this;
+        }
+        class_4.prototype.myProtectedFunction = function () {
+            _super.prototype.myProtectedFunction.call(this);
+            // do more things
+        };
+        return class_4;
+    }(Base));
+}
+var Customer = (function (_super) {
+    __extends(Customer, _super);
+    function Customer() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Customer.prototype.f = function () {
+    };
+    return Customer;
+}(PersonMixin(Person)));
diff --git a/tests/baselines/reference/moduleAliasAsFunctionArgument.js b/tests/baselines/reference/moduleAliasAsFunctionArgument.js
index b75161da458..16eb962a863 100644
--- a/tests/baselines/reference/moduleAliasAsFunctionArgument.js
+++ b/tests/baselines/reference/moduleAliasAsFunctionArgument.js
@@ -17,10 +17,12 @@ fn(a); // Error: property 'x' is missing from 'a'
 //// [moduleAliasAsFunctionArgument_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [moduleAliasAsFunctionArgument_1.js]
 define(["require", "exports", "moduleAliasAsFunctionArgument_0"], function (require, exports, a) {
     "use strict";
+    exports.__esModule = true;
     function fn(arg) {
     }
     a.x; // OK
diff --git a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js
index 2e84e1492be..a92cf5093e3 100644
--- a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js
+++ b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js
@@ -36,20 +36,24 @@ let x: Observable<number>;
 //// [observable.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [map1.js]
 define(["require", "exports", "./observable"], function (require, exports, observable_1) {
     "use strict";
+    exports.__esModule = true;
     observable_1.Observable.prototype.map = function () { };
 });
 //// [map2.js]
 define(["require", "exports", "./observable"], function (require, exports, observable_1) {
     "use strict";
+    exports.__esModule = true;
     observable_1.Observable.prototype.map = function () { };
 });
 //// [main.js]
 define(["require", "exports", "./map1", "./map2"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x;
 });
 
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js
index 7b44fb7a637..77759306845 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js
@@ -34,16 +34,19 @@ let y = x.map(x => x + 1);
 
 //// [observable.js]
 "use strict";
+exports.__esModule = true;
 var Observable;
 (function (Observable) {
     var someValue;
 })(Observable = exports.Observable || (exports.Observable = {}));
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js
index 547d017c502..15ca6aaf806 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js
@@ -36,15 +36,18 @@ let z2 = Observable.someAnotherValue.toLowerCase();
 
 //// [observable.js]
 "use strict";
+exports.__esModule = true;
 var Observable;
 (function (Observable) {
 })(Observable = exports.Observable || (exports.Observable = {}));
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 require("./map");
 var x;
diff --git a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js
index 8c497d63c42..c29bed68e51 100644
--- a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js
+++ b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js
@@ -49,19 +49,24 @@ import "./x";
 
 //// [x0.js]
 "use strict";
+exports.__esModule = true;
 exports.a = 1;
 //// [x.js]
 "use strict";
+exports.__esModule = true;
 var N1;
 (function (N1) {
     N1.x = 1;
 })(N1 || (N1 = {}));
 //// [observable.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 1;
 //// [test.js]
 "use strict";
+exports.__esModule = true;
 exports.b = 1;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 require("./x");
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js
index 0a8b1b0b4b5..d6857a28ef1 100644
--- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js
+++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js
@@ -36,10 +36,12 @@ let y = x.map(x => x + 1);
 
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("observable");
 observable_1.Observable.prototype.map = function () { };
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js
index 2d65953e2a3..eee03576336 100644
--- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js
+++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js
@@ -38,10 +38,12 @@ let z2 = Observable.someAnotherValue.toLowerCase();
 
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("observable");
 observable_1.Observable.prototype.map = function () { };
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="observable.d.ts"/>
 var observable_1 = require("observable");
 require("./map");
diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule1.js b/tests/baselines/reference/moduleAugmentationExtendFileModule1.js
index a539100c2ed..9d15f3fe387 100644
--- a/tests/baselines/reference/moduleAugmentationExtendFileModule1.js
+++ b/tests/baselines/reference/moduleAugmentationExtendFileModule1.js
@@ -34,16 +34,19 @@ let y = x.map(x => x + 1);
 
 //// [observable.js]
 "use strict";
+exports.__esModule = true;
 var Observable;
 (function (Observable) {
     var someValue;
 })(Observable = exports.Observable || (exports.Observable = {}));
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule2.js b/tests/baselines/reference/moduleAugmentationExtendFileModule2.js
index 389f2119aba..072c62862e3 100644
--- a/tests/baselines/reference/moduleAugmentationExtendFileModule2.js
+++ b/tests/baselines/reference/moduleAugmentationExtendFileModule2.js
@@ -36,15 +36,18 @@ let z2 = Observable.someAnotherValue.toLowerCase();
 
 //// [observable.js]
 "use strict";
+exports.__esModule = true;
 var Observable;
 (function (Observable) {
 })(Observable = exports.Observable || (exports.Observable = {}));
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 require("./map");
 var x;
diff --git a/tests/baselines/reference/moduleAugmentationGlobal1.js b/tests/baselines/reference/moduleAugmentationGlobal1.js
index 99351642a18..2ef6441692f 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal1.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal1.js
@@ -20,6 +20,7 @@ let y = x.getA().x;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
@@ -28,6 +29,7 @@ var A = (function () {
 exports.A = A;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var x = [1];
 var y = x.getA().x;
 
diff --git a/tests/baselines/reference/moduleAugmentationGlobal2.js b/tests/baselines/reference/moduleAugmentationGlobal2.js
index 90e8373302e..1806ceae9a1 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal2.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal2.js
@@ -20,6 +20,7 @@ let y = x.getCountAsString().toLowerCase();
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
@@ -29,6 +30,7 @@ exports.A = A;
 ;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var x = [1];
 var y = x.getCountAsString().toLowerCase();
 
diff --git a/tests/baselines/reference/moduleAugmentationGlobal3.js b/tests/baselines/reference/moduleAugmentationGlobal3.js
index caa080a558c..9cb08f2b866 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal3.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal3.js
@@ -23,6 +23,7 @@ let y = x.getCountAsString().toLowerCase();
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
@@ -32,8 +33,10 @@ exports.A = A;
 ;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 require("./f2");
 var x = [1];
 var y = x.getCountAsString().toLowerCase();
diff --git a/tests/baselines/reference/moduleAugmentationGlobal4.js b/tests/baselines/reference/moduleAugmentationGlobal4.js
index 38f186d0e05..194d06aeb80 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal4.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal4.js
@@ -20,10 +20,13 @@ import "./f2";
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 require("./f1");
 require("./f2");
 
diff --git a/tests/baselines/reference/moduleAugmentationGlobal5.js b/tests/baselines/reference/moduleAugmentationGlobal5.js
index 70c81893bd8..43d8c6b958b 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal5.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal5.js
@@ -23,6 +23,7 @@ import "B";
 
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="f1.d.ts"/>
 /// <reference path="f2.d.ts"/>
 require("A");
diff --git a/tests/baselines/reference/moduleAugmentationGlobal8.js b/tests/baselines/reference/moduleAugmentationGlobal8.js
index 261dfd21b58..77b467f9e4d 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal8.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal8.js
@@ -10,4 +10,5 @@ export {}
 //// [moduleAugmentationGlobal8.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/moduleAugmentationGlobal8_1.js b/tests/baselines/reference/moduleAugmentationGlobal8_1.js
index 2ac585a711b..70e9c336e7c 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal8_1.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal8_1.js
@@ -10,4 +10,5 @@ export {}
 //// [moduleAugmentationGlobal8_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
index 8e0b7dad19d..66ce39e8d84 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
@@ -29,6 +29,7 @@ let b = a.foo().n;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
@@ -37,6 +38,7 @@ var A = (function () {
 exports.A = A;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
@@ -45,10 +47,12 @@ var B = (function () {
 exports.B = B;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
index 498df8ab90e..e79f2e58484 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
@@ -41,6 +41,7 @@ let b = a.foo().n;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
@@ -49,6 +50,7 @@ var A = (function () {
 exports.A = A;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
@@ -57,10 +59,12 @@ var B = (function () {
 exports.B = B;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
index 8d9e69c5076..c7c13ea7861 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
@@ -39,6 +39,7 @@ let b = a.foo().n;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
@@ -47,6 +48,7 @@ var A = (function () {
 exports.A = A;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
@@ -55,10 +57,12 @@ var B = (function () {
 exports.B = B;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js
index 53095555815..9cdf76b90a5 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js
@@ -41,6 +41,7 @@ let d = a.baz().b;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
@@ -49,6 +50,7 @@ var A = (function () {
 exports.A = A;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
@@ -57,10 +59,12 @@ var B = (function () {
 exports.B = B;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
index c3cba4c01f8..c7f7990608e 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
@@ -41,6 +41,7 @@ let d = a.baz().b;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
@@ -49,6 +50,7 @@ var A = (function () {
 exports.A = A;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
@@ -57,10 +59,12 @@ var B = (function () {
 exports.B = B;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
index f5aff705eb4..0f19e737ec5 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
@@ -41,6 +41,7 @@ let d = a.baz().b;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
@@ -49,6 +50,7 @@ var A = (function () {
 exports.A = A;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
@@ -57,10 +59,12 @@ var B = (function () {
 exports.B = B;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule1.js b/tests/baselines/reference/moduleAugmentationInAmbientModule1.js
index aecb8954d53..4cdef37a4f7 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule1.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule1.js
@@ -31,6 +31,7 @@ x.foo().x;
 //// [main.js]
 /// <reference path="O.d.ts" />
 "use strict";
+exports.__esModule = true;
 var x;
 x.foo().x;
 
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule2.js b/tests/baselines/reference/moduleAugmentationInAmbientModule2.js
index 5529afc674f..536931ee61f 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule2.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule2.js
@@ -31,6 +31,7 @@ x.foo().x;
 //// [main.js]
 /// <reference path="O.d.ts" />
 "use strict";
+exports.__esModule = true;
 require("Map");
 var x;
 x.foo().x;
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule3.js b/tests/baselines/reference/moduleAugmentationInAmbientModule3.js
index 3a94c50ef1f..37253ab7e5b 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule3.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule3.js
@@ -41,6 +41,7 @@ x.foo2().x2;
 //// [main.js]
 /// <reference path="O.d.ts" />
 "use strict";
+exports.__esModule = true;
 require("Map");
 var x;
 x.foo().x;
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule4.js b/tests/baselines/reference/moduleAugmentationInAmbientModule4.js
index bf0339d3107..0c861447b46 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule4.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule4.js
@@ -44,6 +44,7 @@ x.foo2().x2;
 /// <reference path="O.d.ts" />
 /// <reference path="O2.d.ts" />
 "use strict";
+exports.__esModule = true;
 require("Map");
 var x;
 x.foo().x;
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule5.js b/tests/baselines/reference/moduleAugmentationInAmbientModule5.js
index 2e6503c4774..ac202784f43 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule5.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule5.js
@@ -25,6 +25,7 @@ let y = x.getA().x;
 
 //// [f.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="array.d.ts"/>
 require("array");
 var x = [1];
diff --git a/tests/baselines/reference/moduleAugmentationInDependency.js b/tests/baselines/reference/moduleAugmentationInDependency.js
index 1c5995339c3..31c82ad18e8 100644
--- a/tests/baselines/reference/moduleAugmentationInDependency.js
+++ b/tests/baselines/reference/moduleAugmentationInDependency.js
@@ -10,4 +10,5 @@ import "A"
 
 //// [app.js]
 "use strict";
+exports.__esModule = true;
 require("A");
diff --git a/tests/baselines/reference/moduleAugmentationInDependency2.js b/tests/baselines/reference/moduleAugmentationInDependency2.js
index 381f1e72d8f..e7a964650bd 100644
--- a/tests/baselines/reference/moduleAugmentationInDependency2.js
+++ b/tests/baselines/reference/moduleAugmentationInDependency2.js
@@ -10,6 +10,8 @@ import "A"
 
 //// [index.js]
 "use strict";
+exports.__esModule = true;
 //// [app.js]
 "use strict";
+exports.__esModule = true;
 require("A");
diff --git a/tests/baselines/reference/moduleAugmentationNoNewNames.js b/tests/baselines/reference/moduleAugmentationNoNewNames.js
index ccd4a668497..4376c23a7f8 100644
--- a/tests/baselines/reference/moduleAugmentationNoNewNames.js
+++ b/tests/baselines/reference/moduleAugmentationNoNewNames.js
@@ -30,12 +30,15 @@ let y = x.map(x => x + 1);
 
 //// [observable.js]
 "use strict";
+exports.__esModule = true;
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
index 504c015bcb8..9ad2aa842d0 100644
--- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
+++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
@@ -58,6 +58,7 @@ c.baz2().x.toLowerCase();
 //// [out.js]
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var Cls = (function () {
         function Cls() {
         }
@@ -67,11 +68,13 @@ define("m1", ["require", "exports"], function (require, exports) {
 });
 define("m2", ["require", "exports", "m1"], function (require, exports, m1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     m1_1.Cls.prototype.foo = function () { return 1; };
     m1_1.Cls.prototype.bar = function () { return "1"; };
 });
 define("m3", ["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var C1 = (function () {
         function C1() {
         }
@@ -87,11 +90,13 @@ define("m3", ["require", "exports"], function (require, exports) {
 });
 define("m4", ["require", "exports", "m1"], function (require, exports, m1_2) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     m1_2.Cls.prototype.baz1 = function () { return undefined; };
     m1_2.Cls.prototype.baz2 = function () { return undefined; };
 });
 define("test", ["require", "exports", "m2", "m4"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var c;
     c.foo().toExponential();
     c.bar().toLowerCase();
diff --git a/tests/baselines/reference/moduleAugmentationsImports1.js b/tests/baselines/reference/moduleAugmentationsImports1.js
index 922bb61d952..116c5c5e830 100644
--- a/tests/baselines/reference/moduleAugmentationsImports1.js
+++ b/tests/baselines/reference/moduleAugmentationsImports1.js
@@ -45,6 +45,7 @@ let c = a.getCls().y.toLowerCase();
 //// [f.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
@@ -54,6 +55,7 @@ define("a", ["require", "exports"], function (require, exports) {
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
@@ -64,11 +66,13 @@ define("b", ["require", "exports"], function (require, exports) {
 /// <reference path="c.d.ts"/>
 define("d", ["require", "exports", "a"], function (require, exports, a_1) {
     "use strict";
+    exports.__esModule = true;
     a_1.A.prototype.getB = function () { return undefined; };
     a_1.A.prototype.getCls = function () { return undefined; };
 });
 define("main", ["require", "exports", "d"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.getB().x.toFixed();
     var c = a.getCls().y.toLowerCase();
diff --git a/tests/baselines/reference/moduleAugmentationsImports2.js b/tests/baselines/reference/moduleAugmentationsImports2.js
index 605a07e29e1..e13cbd8f3dd 100644
--- a/tests/baselines/reference/moduleAugmentationsImports2.js
+++ b/tests/baselines/reference/moduleAugmentationsImports2.js
@@ -50,6 +50,7 @@ let c = a.getCls().y.toLowerCase();
 //// [f.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
@@ -59,6 +60,7 @@ define("a", ["require", "exports"], function (require, exports) {
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
@@ -69,14 +71,17 @@ define("b", ["require", "exports"], function (require, exports) {
 /// <reference path="c.d.ts"/>
 define("d", ["require", "exports", "a"], function (require, exports, a_1) {
     "use strict";
+    exports.__esModule = true;
     a_1.A.prototype.getB = function () { return undefined; };
 });
 define("e", ["require", "exports", "a"], function (require, exports, a_2) {
     "use strict";
+    exports.__esModule = true;
     a_2.A.prototype.getCls = function () { return undefined; };
 });
 define("main", ["require", "exports", "d", "e"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.getB().x.toFixed();
     var c = a.getCls().y.toLowerCase();
diff --git a/tests/baselines/reference/moduleAugmentationsImports3.js b/tests/baselines/reference/moduleAugmentationsImports3.js
index 0a946f42be3..a4a6ccea849 100644
--- a/tests/baselines/reference/moduleAugmentationsImports3.js
+++ b/tests/baselines/reference/moduleAugmentationsImports3.js
@@ -49,6 +49,7 @@ let c = a.getCls().y.toLowerCase();
 //// [f.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
@@ -58,6 +59,7 @@ define("a", ["require", "exports"], function (require, exports) {
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
@@ -67,10 +69,12 @@ define("b", ["require", "exports"], function (require, exports) {
 });
 define("e", ["require", "exports", "a"], function (require, exports, a_1) {
     "use strict";
+    exports.__esModule = true;
     a_1.A.prototype.getCls = function () { return undefined; };
 });
 define("main", ["require", "exports", "D", "e"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.getB().x.toFixed();
     var c = a.getCls().y.toLowerCase();
diff --git a/tests/baselines/reference/moduleAugmentationsImports4.js b/tests/baselines/reference/moduleAugmentationsImports4.js
index a48bbb04631..4be17a61edb 100644
--- a/tests/baselines/reference/moduleAugmentationsImports4.js
+++ b/tests/baselines/reference/moduleAugmentationsImports4.js
@@ -50,6 +50,7 @@ let c = a.getCls().y.toLowerCase();
 //// [f.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
@@ -59,6 +60,7 @@ define("a", ["require", "exports"], function (require, exports) {
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
@@ -68,6 +70,7 @@ define("b", ["require", "exports"], function (require, exports) {
 });
 define("main", ["require", "exports", "D", "E"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.getB().x.toFixed();
     var c = a.getCls().y.toLowerCase();
diff --git a/tests/baselines/reference/moduleCodeGenTest5.js b/tests/baselines/reference/moduleCodeGenTest5.js
index 6a7113c0368..ee6fd2ab317 100644
--- a/tests/baselines/reference/moduleCodeGenTest5.js
+++ b/tests/baselines/reference/moduleCodeGenTest5.js
@@ -23,6 +23,7 @@ var v = E2.B;
 
 //// [moduleCodeGenTest5.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 0;
 var y = 0;
 function f1() { }
diff --git a/tests/baselines/reference/moduleCodegenTest4.js b/tests/baselines/reference/moduleCodegenTest4.js
index 362785a5d68..f877ad74bc3 100644
--- a/tests/baselines/reference/moduleCodegenTest4.js
+++ b/tests/baselines/reference/moduleCodegenTest4.js
@@ -6,6 +6,7 @@ void 0;
 
 //// [moduleCodegenTest4.js]
 "use strict";
+exports.__esModule = true;
 var Baz;
 (function (Baz) {
     Baz.x = "hello";
diff --git a/tests/baselines/reference/moduleDuplicateIdentifiers.js b/tests/baselines/reference/moduleDuplicateIdentifiers.js
index 64b82f82500..a2a099fca1d 100644
--- a/tests/baselines/reference/moduleDuplicateIdentifiers.js
+++ b/tests/baselines/reference/moduleDuplicateIdentifiers.js
@@ -42,6 +42,7 @@ export enum Utensils { // Shouldn't error
 
 //// [moduleDuplicateIdentifiers.js]
 "use strict";
+exports.__esModule = true;
 exports.Foo = 2;
 exports.Foo = 42; // Should error
 var FooBar;
diff --git a/tests/baselines/reference/moduleExports1.js b/tests/baselines/reference/moduleExports1.js
index 130091cd61c..66c746c5f51 100644
--- a/tests/baselines/reference/moduleExports1.js
+++ b/tests/baselines/reference/moduleExports1.js
@@ -16,6 +16,7 @@ if (!module.exports) module.exports = "";
 //// [moduleExports1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var TypeScript;
     (function (TypeScript) {
         var Strasse;
diff --git a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
index 26d262a76fe..2ed22cfa4f0 100644
--- a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
+++ b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
@@ -14,6 +14,7 @@ class Test1 extends C1<M2.M2C> {
 //// [moduleImportedForTypeArgumentPosition_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [moduleImportedForTypeArgumentPosition_1.js]
 var __extends = (this && this.__extends) || (function () {
@@ -28,6 +29,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C1 = (function () {
         function C1() {
         }
diff --git a/tests/baselines/reference/moduleInTypePosition1.js b/tests/baselines/reference/moduleInTypePosition1.js
index a590e23f71e..7408db5c291 100644
--- a/tests/baselines/reference/moduleInTypePosition1.js
+++ b/tests/baselines/reference/moduleInTypePosition1.js
@@ -13,6 +13,7 @@ var x = (w1: WinJS) => { };
 
 //// [moduleInTypePosition1_0.js]
 "use strict";
+exports.__esModule = true;
 var Promise = (function () {
     function Promise() {
     }
@@ -21,4 +22,5 @@ var Promise = (function () {
 exports.Promise = Promise;
 //// [moduleInTypePosition1_1.js]
 "use strict";
+exports.__esModule = true;
 var x = function (w1) { };
diff --git a/tests/baselines/reference/moduleMergeConstructor.js b/tests/baselines/reference/moduleMergeConstructor.js
index 5ab4ab381e0..88531532acc 100644
--- a/tests/baselines/reference/moduleMergeConstructor.js
+++ b/tests/baselines/reference/moduleMergeConstructor.js
@@ -30,6 +30,7 @@ class Test {
 //// [index.js]
 define(["require", "exports", "foo"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     var Test = (function () {
         function Test() {
             this.bar = new foo.Foo();
diff --git a/tests/baselines/reference/moduleNoneErrors.js b/tests/baselines/reference/moduleNoneErrors.js
index c18f11d24b3..7be89f236be 100644
--- a/tests/baselines/reference/moduleNoneErrors.js
+++ b/tests/baselines/reference/moduleNoneErrors.js
@@ -6,6 +6,7 @@ export class Foo {
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
diff --git a/tests/baselines/reference/modulePrologueAMD.js b/tests/baselines/reference/modulePrologueAMD.js
index c3512734f94..b38e5d95f2c 100644
--- a/tests/baselines/reference/modulePrologueAMD.js
+++ b/tests/baselines/reference/modulePrologueAMD.js
@@ -6,6 +6,7 @@ export class Foo {}
 //// [modulePrologueAMD.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Foo = (function () {
         function Foo() {
         }
diff --git a/tests/baselines/reference/modulePrologueCommonjs.js b/tests/baselines/reference/modulePrologueCommonjs.js
index 4a9594d254b..4f465a2ae2f 100644
--- a/tests/baselines/reference/modulePrologueCommonjs.js
+++ b/tests/baselines/reference/modulePrologueCommonjs.js
@@ -5,6 +5,7 @@ export class Foo {}
 
 //// [modulePrologueCommonjs.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
diff --git a/tests/baselines/reference/modulePrologueUmd.js b/tests/baselines/reference/modulePrologueUmd.js
index 18edf1ef4af..c9b8c331bcf 100644
--- a/tests/baselines/reference/modulePrologueUmd.js
+++ b/tests/baselines/reference/modulePrologueUmd.js
@@ -14,6 +14,7 @@ export class Foo {}
     }
 })(function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Foo = (function () {
         function Foo() {
         }
diff --git a/tests/baselines/reference/moduleResolutionNoResolve.js b/tests/baselines/reference/moduleResolutionNoResolve.js
index c73be6b6981..86f681fa27a 100644
--- a/tests/baselines/reference/moduleResolutionNoResolve.js
+++ b/tests/baselines/reference/moduleResolutionNoResolve.js
@@ -10,6 +10,8 @@ export var c = '';
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 exports.c = '';
diff --git a/tests/baselines/reference/moduleResolutionNoTs.js b/tests/baselines/reference/moduleResolutionNoTs.js
index a17f108d872..33f692396fa 100644
--- a/tests/baselines/reference/moduleResolutionNoTs.js
+++ b/tests/baselines/reference/moduleResolutionNoTs.js
@@ -31,3 +31,4 @@ exports.__esModule = true;
 exports["default"] = 0;
 //// [user.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions.js b/tests/baselines/reference/moduleResolutionWithExtensions.js
index 16d176872ca..b9a644a7209 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions.js
@@ -32,8 +32,11 @@ exports["default"] = 0;
 // No extension: '.ts' added 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 // '.js' extension: stripped and replaced with '.ts' 
 //// [d.js]
 "use strict";
+exports.__esModule = true;
 //// [jquery_user_1.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported.js b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported.js
index 2e5297bdf65..6bce8b8d3c5 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported.js
@@ -15,3 +15,4 @@ import js from "./js";
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported2.js b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported2.js
index c340f65f251..a11d43d56df 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported2.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported2.js
@@ -10,3 +10,4 @@ import jsx from "./jsx";
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported3.js b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported3.js
index f362701bbda..ca0fa6ca402 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported3.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported3.js
@@ -10,3 +10,4 @@ import jsx from "./jsx";
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js
index 177321c7d08..a9dc91d9a55 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js
@@ -16,3 +16,4 @@ exports.__esModule = true;
 exports["default"] = 0;
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js
index b5d4ae20a4d..7d67bde6509 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js
@@ -14,4 +14,5 @@ import "normalize.css";
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 require("normalize.css");
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json
index e1b1673b32a..8c820e07e48 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json
@@ -6,7 +6,8 @@
     "File '/node_modules/normalize.css.tsx' does not exist.",
     "File '/node_modules/normalize.css.d.ts' does not exist.",
     "Found 'package.json' at '/node_modules/normalize.css/package.json'.",
-    "'package.json' does not have a 'types' or 'main' field.",
+    "'package.json' does not have a 'typings' field.",
+    "'package.json' does not have a 'types' field.",
     "File '/node_modules/normalize.css/index.ts' does not exist.",
     "File '/node_modules/normalize.css/index.tsx' does not exist.",
     "File '/node_modules/normalize.css/index.d.ts' does not exist.",
@@ -15,12 +16,13 @@
     "File '/node_modules/normalize.css.js' does not exist.",
     "File '/node_modules/normalize.css.jsx' does not exist.",
     "Found 'package.json' at '/node_modules/normalize.css/package.json'.",
-    "No types specified in 'package.json', so returning 'main' value of 'normalize.css'",
+    "'package.json' has 'main' field 'normalize.css' that references '/node_modules/normalize.css/normalize.css'.",
     "File '/node_modules/normalize.css/normalize.css' exist - use it as a name resolution result.",
     "File '/node_modules/normalize.css/normalize.css' has an unsupported extension, so skipping it.",
-    "File '/node_modules/normalize.css/normalize.css.ts' does not exist.",
-    "File '/node_modules/normalize.css/normalize.css.tsx' does not exist.",
-    "File '/node_modules/normalize.css/normalize.css.d.ts' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/normalize.css/normalize.css', target file type 'JavaScript'.",
+    "File '/node_modules/normalize.css/normalize.css.js' does not exist.",
+    "File '/node_modules/normalize.css/normalize.css.jsx' does not exist.",
+    "Directory '/node_modules/normalize.css/normalize.css' does not exist, skipping all lookups in it.",
     "File '/node_modules/normalize.css/index.js' does not exist.",
     "File '/node_modules/normalize.css/index.jsx' does not exist.",
     "======== Module name 'normalize.css' was not resolved. ========"
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js
index dc9df79e4df..0a04d8a9077 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js
@@ -14,4 +14,5 @@ import "foo";
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 require("foo");
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json
index 11dd95ebe45..e550bb41eab 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json
@@ -6,12 +6,19 @@
     "File '/node_modules/foo.tsx' does not exist.",
     "File '/node_modules/foo.d.ts' does not exist.",
     "Found 'package.json' at '/node_modules/foo/package.json'.",
+    "'package.json' does not have a 'typings' field.",
     "'package.json' has 'types' field 'foo.js' that references '/node_modules/foo/foo.js'.",
     "File '/node_modules/foo/foo.js' exist - use it as a name resolution result.",
     "File '/node_modules/foo/foo.js' has an unsupported extension, so skipping it.",
+    "Loading module as file / folder, candidate module location '/node_modules/foo/foo.js', target file type 'TypeScript'.",
     "File '/node_modules/foo/foo.js.ts' does not exist.",
     "File '/node_modules/foo/foo.js.tsx' does not exist.",
     "File '/node_modules/foo/foo.js.d.ts' does not exist.",
+    "File name '/node_modules/foo/foo.js' has a '.js' extension - stripping it",
+    "File '/node_modules/foo/foo.ts' does not exist.",
+    "File '/node_modules/foo/foo.tsx' does not exist.",
+    "File '/node_modules/foo/foo.d.ts' does not exist.",
+    "Directory '/node_modules/foo/foo.js' does not exist, skipping all lookups in it.",
     "File '/node_modules/foo/index.ts' does not exist.",
     "File '/node_modules/foo/index.tsx' does not exist.",
     "File '/node_modules/foo/index.d.ts' does not exist.",
@@ -20,7 +27,7 @@
     "File '/node_modules/foo.js' does not exist.",
     "File '/node_modules/foo.jsx' does not exist.",
     "Found 'package.json' at '/node_modules/foo/package.json'.",
-    "'package.json' does not have a 'types' or 'main' field.",
+    "'package.json' does not have a 'main' field.",
     "File '/node_modules/foo/index.js' does not exist.",
     "File '/node_modules/foo/index.jsx' does not exist.",
     "======== Module name 'foo' was not resolved. ========"
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.js b/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.js
index 51d476338c0..3563f7db251 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.js
@@ -16,3 +16,4 @@ import { x } from "js";
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks.js b/tests/baselines/reference/moduleResolutionWithSymlinks.js
index fbf97fa3ba0..520324cb222 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks.js
@@ -43,6 +43,7 @@ tsc app.ts # Should write to library-a/index.js, library-b/index.js, and app.js
 // When symlinked files are in node_modules, they are resolved with realpath;
 // so a linked file does not create a duplicate SourceFile of the real one.
 "use strict";
+exports.__esModule = true;
 var MyClass = (function () {
     function MyClass() {
     }
@@ -51,10 +52,12 @@ var MyClass = (function () {
 exports.MyClass = MyClass;
 //// [/src/library-b/index.js]
 "use strict";
+exports.__esModule = true;
 var library_a_1 = require("library-a");
 exports.MyClass2 = library_a_1.MyClass;
 //// [/src/app.js]
 "use strict";
+exports.__esModule = true;
 var x;
 var y;
 x = y;
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
index a927a496a96..cde63e0604d 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
@@ -18,15 +18,18 @@ x + x2;
 // A symlink file acts like the real thing. So, 2 symlinks act like 2 different files.
 // See GH#10364. 
 "use strict";
+exports.__esModule = true;
 exports.x = 0;
 //// [/src/bin/shared2/abc.js]
 // When symlinked files are not in node_modules, realpath is not used.
 // A symlink file acts like the real thing. So, 2 symlinks act like 2 different files.
 // See GH#10364. 
 "use strict";
+exports.__esModule = true;
 exports.x = 0;
 //// [/src/bin/app.js]
 "use strict";
+exports.__esModule = true;
 var abc_1 = require("./shared/abc");
 var abc_2 = require("./shared2/abc");
 abc_1.x + abc_2.x;
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
index 312bcf4c174..0bd77a1dcc7 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
@@ -22,6 +22,7 @@ y = x;
 //// [/src/bin/library-a/index.js]
 // Same as moduleResolutionWithSymlinks.ts, but with outDir
 "use strict";
+exports.__esModule = true;
 var MyClass = (function () {
     function MyClass() {
     }
@@ -30,10 +31,12 @@ var MyClass = (function () {
 exports.MyClass = MyClass;
 //// [/src/bin/library-b/index.js]
 "use strict";
+exports.__esModule = true;
 var library_a_1 = require("library-a");
 exports.MyClass2 = library_a_1.MyClass;
 //// [/src/bin/app.js]
 "use strict";
+exports.__esModule = true;
 var x;
 var y;
 x = y;
diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js
index 4061a32b49f..c4d451ba9f9 100644
--- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js
+++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js
@@ -12,17 +12,20 @@ export var foo = 42;
 
 //// [c.js]
 "use strict";
+exports.__esModule = true;
 exports.foo = 42;
 //// [b.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+exports.__esModule = true;
 __export(require("./c"));
 //// [a.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+exports.__esModule = true;
 __export(require("./b"));
 __export(require("./c"));
diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
index 208e90c69d8..d1f6dc7abc7 100644
--- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
+++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
@@ -15,6 +15,7 @@ export enum Animals {
 
 //// [c.js]
 "use strict";
+exports.__esModule = true;
 var Animals;
 (function (Animals) {
     Animals[Animals["Cat"] = 0] = "Cat";
@@ -23,6 +24,7 @@ var Animals;
 ;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var c_1 = require("./c");
 exports.Animals = c_1.Animals;
 //// [a.js]
@@ -30,5 +32,6 @@ exports.Animals = c_1.Animals;
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+exports.__esModule = true;
 __export(require("./b"));
 __export(require("./c"));
diff --git a/tests/baselines/reference/moduleScoping.js b/tests/baselines/reference/moduleScoping.js
index f987c0c652d..601d7e41fcd 100644
--- a/tests/baselines/reference/moduleScoping.js
+++ b/tests/baselines/reference/moduleScoping.js
@@ -29,10 +29,12 @@ var v2 = 42; // Global scope
 var v4 = function () { return 5; };
 //// [file3.js]
 "use strict";
+exports.__esModule = true;
 exports.v3 = true;
 var v2 = [1, 2, 3]; // Module scope. Should not appear in global scope
 //// [file4.js]
 "use strict";
+exports.__esModule = true;
 var file3 = require("./file3");
 var t1 = v1;
 var t2 = v2;
diff --git a/tests/baselines/reference/multiImportExport.js b/tests/baselines/reference/multiImportExport.js
index 2cd5440ce6e..07e353cb301 100644
--- a/tests/baselines/reference/multiImportExport.js
+++ b/tests/baselines/reference/multiImportExport.js
@@ -44,9 +44,11 @@ var Math = {
 module.exports = Math;
 //// [Drawing.js]
 "use strict";
+exports.__esModule = true;
 exports.Math = require("./Math/Math");
 //// [consumer.js]
 "use strict";
+exports.__esModule = true;
 var Drawing = require("./Drawing");
 var addr = new Drawing.Math.Adder();
 
diff --git a/tests/baselines/reference/multipleDefaultExports01.js b/tests/baselines/reference/multipleDefaultExports01.js
index e15f8fc879c..98c17051809 100644
--- a/tests/baselines/reference/multipleDefaultExports01.js
+++ b/tests/baselines/reference/multipleDefaultExports01.js
@@ -20,21 +20,20 @@ Entity();
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var foo = (function () {
     function foo() {
     }
     return foo;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = foo;
 function bar() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = bar;
 var x = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = x;
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("./m1");
 m1_1.default();
diff --git a/tests/baselines/reference/multipleDefaultExports02.js b/tests/baselines/reference/multipleDefaultExports02.js
index 0e9fed272cd..b129dba0392 100644
--- a/tests/baselines/reference/multipleDefaultExports02.js
+++ b/tests/baselines/reference/multipleDefaultExports02.js
@@ -17,15 +17,15 @@ Entity();
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function foo() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = foo;
 function bar() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = bar;
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("./m1");
 m1_1.default();
diff --git a/tests/baselines/reference/multipleDefaultExports03.js b/tests/baselines/reference/multipleDefaultExports03.js
index 748837baceb..897a3f00eb4 100644
--- a/tests/baselines/reference/multipleDefaultExports03.js
+++ b/tests/baselines/reference/multipleDefaultExports03.js
@@ -8,17 +8,16 @@ export default class C {
 
 //// [multipleDefaultExports03.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var C = (function () {
     function C() {
     }
     return C;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = C;
 var C = (function () {
     function C() {
     }
     return C;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = C;
diff --git a/tests/baselines/reference/multipleDefaultExports04.js b/tests/baselines/reference/multipleDefaultExports04.js
index 020f9b758bb..341f6f41c62 100644
--- a/tests/baselines/reference/multipleDefaultExports04.js
+++ b/tests/baselines/reference/multipleDefaultExports04.js
@@ -8,11 +8,10 @@ export default function f() {
 
 //// [multipleDefaultExports04.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function f() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f;
 function f() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f;
diff --git a/tests/baselines/reference/multipleExportDefault1.js b/tests/baselines/reference/multipleExportDefault1.js
index bec4fb48969..8375c2f9e6f 100644
--- a/tests/baselines/reference/multipleExportDefault1.js
+++ b/tests/baselines/reference/multipleExportDefault1.js
@@ -10,11 +10,10 @@ export default {
 
 //// [multipleExportDefault1.js]
 "use strict";
+exports.__esModule = true;
 function Foo() {
 }
-exports.__esModule = true;
 exports["default"] = Foo;
-exports.__esModule = true;
 exports["default"] = {
     uhoh: "another default"
 };
diff --git a/tests/baselines/reference/multipleExportDefault2.js b/tests/baselines/reference/multipleExportDefault2.js
index dc82500a1d9..0c06385f9af 100644
--- a/tests/baselines/reference/multipleExportDefault2.js
+++ b/tests/baselines/reference/multipleExportDefault2.js
@@ -14,5 +14,4 @@ exports["default"] = {
     uhoh: "another default"
 };
 function Foo() { }
-exports.__esModule = true;
 exports["default"] = Foo;
diff --git a/tests/baselines/reference/multipleExportDefault3.js b/tests/baselines/reference/multipleExportDefault3.js
index 5d7ad48e0ca..1091af16301 100644
--- a/tests/baselines/reference/multipleExportDefault3.js
+++ b/tests/baselines/reference/multipleExportDefault3.js
@@ -18,5 +18,4 @@ var C = (function () {
     }
     return C;
 }());
-exports.__esModule = true;
 exports["default"] = C;
diff --git a/tests/baselines/reference/multipleExportDefault4.js b/tests/baselines/reference/multipleExportDefault4.js
index 1199fa91c9c..b3e0ef3e870 100644
--- a/tests/baselines/reference/multipleExportDefault4.js
+++ b/tests/baselines/reference/multipleExportDefault4.js
@@ -7,14 +7,13 @@ export default {
 
 //// [multipleExportDefault4.js]
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
     return C;
 }());
-exports.__esModule = true;
 exports["default"] = C;
-exports.__esModule = true;
 exports["default"] = {
     uhoh: "another default"
 };
diff --git a/tests/baselines/reference/multipleExportDefault5.js b/tests/baselines/reference/multipleExportDefault5.js
index 7ae33aee9f4..a5032e45244 100644
--- a/tests/baselines/reference/multipleExportDefault5.js
+++ b/tests/baselines/reference/multipleExportDefault5.js
@@ -4,13 +4,12 @@ export default class C {}
 
 //// [multipleExportDefault5.js]
 "use strict";
-function bar() { }
 exports.__esModule = true;
+function bar() { }
 exports["default"] = bar;
 var C = (function () {
     function C() {
     }
     return C;
 }());
-exports.__esModule = true;
 exports["default"] = C;
diff --git a/tests/baselines/reference/multipleExportDefault6.js b/tests/baselines/reference/multipleExportDefault6.js
index a8b93459e4e..aa372e4d410 100644
--- a/tests/baselines/reference/multipleExportDefault6.js
+++ b/tests/baselines/reference/multipleExportDefault6.js
@@ -13,7 +13,6 @@ exports.__esModule = true;
 exports["default"] = {
     lol: 1
 };
-exports.__esModule = true;
 exports["default"] = {
     lol: 2
 };
diff --git a/tests/baselines/reference/multipleExports.js b/tests/baselines/reference/multipleExports.js
index fd6ac67e82a..05276591447 100644
--- a/tests/baselines/reference/multipleExports.js
+++ b/tests/baselines/reference/multipleExports.js
@@ -14,6 +14,7 @@ export module M {
 
 //// [multipleExports.js]
 "use strict";
+exports.__esModule = true;
 var M;
 (function (M) {
     M.v = 0;
diff --git a/tests/baselines/reference/nameDelimitedBySlashes.js b/tests/baselines/reference/nameDelimitedBySlashes.js
index 93cf4e29d49..149b6a0d59f 100644
--- a/tests/baselines/reference/nameDelimitedBySlashes.js
+++ b/tests/baselines/reference/nameDelimitedBySlashes.js
@@ -10,8 +10,10 @@ var x = foo.foo + 42;
 
 //// [foo_0.js]
 "use strict";
+exports.__esModule = true;
 exports.foo = 42;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./test/foo_0");
 var x = foo.foo + 42;
diff --git a/tests/baselines/reference/nameWithFileExtension.js b/tests/baselines/reference/nameWithFileExtension.js
index 156d1b03a1a..3c1cf8dce66 100644
--- a/tests/baselines/reference/nameWithFileExtension.js
+++ b/tests/baselines/reference/nameWithFileExtension.js
@@ -10,8 +10,10 @@ var x = foo.foo + 42;
 
 //// [foo_0.js]
 "use strict";
+exports.__esModule = true;
 exports.foo = 42;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0.js");
 var x = foo.foo + 42;
diff --git a/tests/baselines/reference/nameWithRelativePaths.js b/tests/baselines/reference/nameWithRelativePaths.js
index d8b0eed43cf..d070638417b 100644
--- a/tests/baselines/reference/nameWithRelativePaths.js
+++ b/tests/baselines/reference/nameWithRelativePaths.js
@@ -25,21 +25,25 @@ if(foo2.M2.x){
 
 //// [foo_0.js]
 "use strict";
+exports.__esModule = true;
 exports.foo = 42;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 function f() {
     return 42;
 }
 exports.f = f;
 //// [foo_2.js]
 "use strict";
+exports.__esModule = true;
 var M2;
 (function (M2) {
     M2.x = true;
 })(M2 = exports.M2 || (exports.M2 = {}));
 //// [foo_3.js]
 "use strict";
+exports.__esModule = true;
 var foo0 = require("../foo_0");
 var foo1 = require("./test/foo_1");
 var foo2 = require("./.././test/foo_2");
diff --git a/tests/baselines/reference/narrowingConstrainedTypeParameter.js b/tests/baselines/reference/narrowingConstrainedTypeParameter.js
index 3107585d941..4663e706d1b 100644
--- a/tests/baselines/reference/narrowingConstrainedTypeParameter.js
+++ b/tests/baselines/reference/narrowingConstrainedTypeParameter.js
@@ -20,6 +20,7 @@ export function speak<TPet extends Pet>(pet: TPet, voice: (pet: TPet) => string)
 //// [narrowingConstrainedTypeParameter.js]
 // Repro from #10811
 "use strict";
+exports.__esModule = true;
 function isPet(pet) {
     return typeof pet.name === "string";
 }
diff --git a/tests/baselines/reference/nestedLoops.js b/tests/baselines/reference/nestedLoops.js
index c29311c38de..6b01eae55cd 100644
--- a/tests/baselines/reference/nestedLoops.js
+++ b/tests/baselines/reference/nestedLoops.js
@@ -19,6 +19,7 @@ export class Test  {
 
 //// [nestedLoops.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Test = (function () {
     function Test() {
         var outerArray = [1, 2, 3];
diff --git a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js
index b56988de44c..1e2231868a8 100644
--- a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js
+++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js
@@ -10,4 +10,5 @@ declare var a: number;
 
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 exports.j = "hello"; // error
diff --git a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js
index 8c75af24034..f651d4f5b18 100644
--- a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js
+++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js
@@ -11,4 +11,5 @@ export var j = "hello";  // error
 
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 exports.j = "hello"; // error
diff --git a/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js b/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js
index 2d7d930703c..63788fd860f 100644
--- a/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js
+++ b/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js
@@ -13,6 +13,7 @@ export declare class Bar2 {
 
 //// [noImplicitAnyDestructuringInPrivateMethod.js]
 "use strict";
+exports.__esModule = true;
 var Bar = (function () {
     function Bar() {
     }
diff --git a/tests/baselines/reference/noImplicitUseStrict_amd.js b/tests/baselines/reference/noImplicitUseStrict_amd.js
index ac15f548c47..387d5b9497b 100644
--- a/tests/baselines/reference/noImplicitUseStrict_amd.js
+++ b/tests/baselines/reference/noImplicitUseStrict_amd.js
@@ -4,5 +4,6 @@ export var x = 0;
 
 //// [noImplicitUseStrict_amd.js]
 define(["require", "exports"], function (require, exports) {
+    exports.__esModule = true;
     exports.x = 0;
 });
diff --git a/tests/baselines/reference/noImplicitUseStrict_commonjs.js b/tests/baselines/reference/noImplicitUseStrict_commonjs.js
index 9c726938f04..4b6fd2db6cd 100644
--- a/tests/baselines/reference/noImplicitUseStrict_commonjs.js
+++ b/tests/baselines/reference/noImplicitUseStrict_commonjs.js
@@ -3,4 +3,5 @@
 export var x = 0;
 
 //// [noImplicitUseStrict_commonjs.js]
+exports.__esModule = true;
 exports.x = 0;
diff --git a/tests/baselines/reference/noImplicitUseStrict_umd.js b/tests/baselines/reference/noImplicitUseStrict_umd.js
index eafb8246bf7..484909c51fc 100644
--- a/tests/baselines/reference/noImplicitUseStrict_umd.js
+++ b/tests/baselines/reference/noImplicitUseStrict_umd.js
@@ -12,5 +12,6 @@ export var x = 0;
         define(["require", "exports"], factory);
     }
 })(function (require, exports) {
+    exports.__esModule = true;
     exports.x = 0;
 });
diff --git a/tests/baselines/reference/nodeResolution1.js b/tests/baselines/reference/nodeResolution1.js
index deda55cef0f..d3dad3355e6 100644
--- a/tests/baselines/reference/nodeResolution1.js
+++ b/tests/baselines/reference/nodeResolution1.js
@@ -9,6 +9,8 @@ import y = require("./a");
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 1;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/nodeResolution2.js b/tests/baselines/reference/nodeResolution2.js
index a139eaf62cf..6d0963c6acb 100644
--- a/tests/baselines/reference/nodeResolution2.js
+++ b/tests/baselines/reference/nodeResolution2.js
@@ -9,3 +9,4 @@ import y = require("a");
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/nodeResolution3.js b/tests/baselines/reference/nodeResolution3.js
index 99b6a692819..8750e3ff07d 100644
--- a/tests/baselines/reference/nodeResolution3.js
+++ b/tests/baselines/reference/nodeResolution3.js
@@ -9,3 +9,4 @@ import y = require("b");
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/nodeResolution4.js b/tests/baselines/reference/nodeResolution4.js
index 7678b7c1c5c..0591dc5a299 100644
--- a/tests/baselines/reference/nodeResolution4.js
+++ b/tests/baselines/reference/nodeResolution4.js
@@ -15,5 +15,7 @@ import y = require("./a");
 var x = 1;
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/nodeResolution5.js b/tests/baselines/reference/nodeResolution5.js
index 766d4118e97..f5a6165906f 100644
--- a/tests/baselines/reference/nodeResolution5.js
+++ b/tests/baselines/reference/nodeResolution5.js
@@ -12,3 +12,4 @@ import y = require("a");
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/nodeResolution6.js b/tests/baselines/reference/nodeResolution6.js
index 196e8ae57cf..cda821991d0 100644
--- a/tests/baselines/reference/nodeResolution6.js
+++ b/tests/baselines/reference/nodeResolution6.js
@@ -15,3 +15,4 @@ import y = require("a");
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/nodeResolution7.js b/tests/baselines/reference/nodeResolution7.js
index 028d7ed2e81..f8cbff14726 100644
--- a/tests/baselines/reference/nodeResolution7.js
+++ b/tests/baselines/reference/nodeResolution7.js
@@ -12,3 +12,4 @@ import y = require("a");
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/nodeResolution8.js b/tests/baselines/reference/nodeResolution8.js
index 1d90399ff70..5facd2edc39 100644
--- a/tests/baselines/reference/nodeResolution8.js
+++ b/tests/baselines/reference/nodeResolution8.js
@@ -14,3 +14,4 @@ import y = require("a");
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/nonMergedOverloads.js b/tests/baselines/reference/nonMergedOverloads.js
index a577329f1cf..515792feb70 100644
--- a/tests/baselines/reference/nonMergedOverloads.js
+++ b/tests/baselines/reference/nonMergedOverloads.js
@@ -7,6 +7,7 @@ export function f() {
 
 //// [nonMergedOverloads.js]
 "use strict";
+exports.__esModule = true;
 var f = 10;
 function f() {
 }
diff --git a/tests/baselines/reference/nounusedTypeParameterConstraint.js b/tests/baselines/reference/nounusedTypeParameterConstraint.js
index aa403187f7a..f8881e6d0a0 100644
--- a/tests/baselines/reference/nounusedTypeParameterConstraint.js
+++ b/tests/baselines/reference/nounusedTypeParameterConstraint.js
@@ -10,5 +10,7 @@ export type DomainEntityConstructor<TEntity extends IEventSourcedEntity> = { new
 
 //// [bar.js]
 "use strict";
+exports.__esModule = true;
 //// [test.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/objectIndexer.js b/tests/baselines/reference/objectIndexer.js
index f5bf47e3475..c93172951e9 100644
--- a/tests/baselines/reference/objectIndexer.js
+++ b/tests/baselines/reference/objectIndexer.js
@@ -18,6 +18,7 @@ class Emitter {
 //// [objectIndexer.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Emitter = (function () {
         function Emitter() {
             this.listeners = {};
diff --git a/tests/baselines/reference/optionalParameterRetainsNull.js b/tests/baselines/reference/optionalParameterRetainsNull.js
new file mode 100644
index 00000000000..b8fb2c12350
--- /dev/null
+++ b/tests/baselines/reference/optionalParameterRetainsNull.js
@@ -0,0 +1,14 @@
+//// [optionalParameterRetainsNull.ts]
+interface Bar {  bar: number; foo: object | null;  }
+
+let a = {
+  test<K extends keyof Bar> (a: K,  b?: Bar[K]  |  null)  { }
+};
+a.test("bar", null); // ok, null is assignable to number | null | undefined
+
+
+//// [optionalParameterRetainsNull.js]
+var a = {
+    test: function (a, b) { }
+};
+a.test("bar", null); // ok, null is assignable to number | null | undefined
diff --git a/tests/baselines/reference/optionalParameterRetainsNull.symbols b/tests/baselines/reference/optionalParameterRetainsNull.symbols
new file mode 100644
index 00000000000..95786c1bdca
--- /dev/null
+++ b/tests/baselines/reference/optionalParameterRetainsNull.symbols
@@ -0,0 +1,25 @@
+=== tests/cases/compiler/optionalParameterRetainsNull.ts ===
+interface Bar {  bar: number; foo: object | null;  }
+>Bar : Symbol(Bar, Decl(optionalParameterRetainsNull.ts, 0, 0))
+>bar : Symbol(Bar.bar, Decl(optionalParameterRetainsNull.ts, 0, 15))
+>foo : Symbol(Bar.foo, Decl(optionalParameterRetainsNull.ts, 0, 29))
+
+let a = {
+>a : Symbol(a, Decl(optionalParameterRetainsNull.ts, 2, 3))
+
+  test<K extends keyof Bar> (a: K,  b?: Bar[K]  |  null)  { }
+>test : Symbol(test, Decl(optionalParameterRetainsNull.ts, 2, 9))
+>K : Symbol(K, Decl(optionalParameterRetainsNull.ts, 3, 7))
+>Bar : Symbol(Bar, Decl(optionalParameterRetainsNull.ts, 0, 0))
+>a : Symbol(a, Decl(optionalParameterRetainsNull.ts, 3, 29))
+>K : Symbol(K, Decl(optionalParameterRetainsNull.ts, 3, 7))
+>b : Symbol(b, Decl(optionalParameterRetainsNull.ts, 3, 34))
+>Bar : Symbol(Bar, Decl(optionalParameterRetainsNull.ts, 0, 0))
+>K : Symbol(K, Decl(optionalParameterRetainsNull.ts, 3, 7))
+
+};
+a.test("bar", null); // ok, null is assignable to number | null | undefined
+>a.test : Symbol(test, Decl(optionalParameterRetainsNull.ts, 2, 9))
+>a : Symbol(a, Decl(optionalParameterRetainsNull.ts, 2, 3))
+>test : Symbol(test, Decl(optionalParameterRetainsNull.ts, 2, 9))
+
diff --git a/tests/baselines/reference/optionalParameterRetainsNull.types b/tests/baselines/reference/optionalParameterRetainsNull.types
new file mode 100644
index 00000000000..30b7d61f76c
--- /dev/null
+++ b/tests/baselines/reference/optionalParameterRetainsNull.types
@@ -0,0 +1,31 @@
+=== tests/cases/compiler/optionalParameterRetainsNull.ts ===
+interface Bar {  bar: number; foo: object | null;  }
+>Bar : Bar
+>bar : number
+>foo : object | null
+>null : null
+
+let a = {
+>a : { test<K extends "bar" | "foo">(a: K, b?: Bar[K] | null | undefined): void; }
+>{  test<K extends keyof Bar> (a: K,  b?: Bar[K]  |  null)  { }} : { test<K extends "bar" | "foo">(a: K, b?: Bar[K] | null | undefined): void; }
+
+  test<K extends keyof Bar> (a: K,  b?: Bar[K]  |  null)  { }
+>test : <K extends "bar" | "foo">(a: K, b?: Bar[K] | null | undefined) => void
+>K : K
+>Bar : Bar
+>a : K
+>K : K
+>b : Bar[K] | null | undefined
+>Bar : Bar
+>K : K
+>null : null
+
+};
+a.test("bar", null); // ok, null is assignable to number | null | undefined
+>a.test("bar", null) : void
+>a.test : <K extends "bar" | "foo">(a: K, b?: Bar[K] | null | undefined) => void
+>a : { test<K extends "bar" | "foo">(a: K, b?: Bar[K] | null | undefined): void; }
+>test : <K extends "bar" | "foo">(a: K, b?: Bar[K] | null | undefined) => void
+>"bar" : "bar"
+>null : null
+
diff --git a/tests/baselines/reference/outFilerootDirModuleNamesAmd.js b/tests/baselines/reference/outFilerootDirModuleNamesAmd.js
index 5b99f76a5b9..91665513153 100644
--- a/tests/baselines/reference/outFilerootDirModuleNamesAmd.js
+++ b/tests/baselines/reference/outFilerootDirModuleNamesAmd.js
@@ -13,15 +13,15 @@ export default function foo() { new Foo(); }
 //// [output.js]
 define("b", ["require", "exports", "a"], function (require, exports, a_1) {
     "use strict";
-    function foo() { new a_1.default(); }
     Object.defineProperty(exports, "__esModule", { value: true });
+    function foo() { new a_1.default(); }
     exports.default = foo;
 });
 define("a", ["require", "exports", "b"], function (require, exports, b_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class Foo {
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = Foo;
     b_1.default();
 });
diff --git a/tests/baselines/reference/outModuleConcatAmd.js b/tests/baselines/reference/outModuleConcatAmd.js
index b30cf93786c..fd3a4003ddf 100644
--- a/tests/baselines/reference/outModuleConcatAmd.js
+++ b/tests/baselines/reference/outModuleConcatAmd.js
@@ -21,6 +21,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 define("ref/a", ["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
@@ -30,6 +31,7 @@ define("ref/a", ["require", "exports"], function (require, exports) {
 });
 define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
diff --git a/tests/baselines/reference/outModuleConcatAmd.js.map b/tests/baselines/reference/outModuleConcatAmd.js.map
index a95ca740a61..0e1c7d24100 100644
--- a/tests/baselines/reference/outModuleConcatAmd.js.map
+++ b/tests/baselines/reference/outModuleConcatAmd.js.map
@@ -1,2 +1,2 @@
 //// [all.js.map]
-{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;;;IACA;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,cAAC;;;;ICAd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"}
\ No newline at end of file
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;;;;IACA;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,cAAC;;;;;ICAd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
index a8a11fcadc0..c18f4e42252 100644
--- a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
+++ b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
@@ -20,18 +20,19 @@ sourceFile:tests/cases/compiler/ref/a.ts
 >>>})();
 >>>define("ref/a", ["require", "exports"], function (require, exports) {
 >>>    "use strict";
+>>>    Object.defineProperty(exports, "__esModule", { value: true });
 >>>    var A = (function () {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(13, 5) Source(2, 1) + SourceIndex(0)
+1 >Emitted(14, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>        function A() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(14, 9) Source(2, 1) + SourceIndex(0)
+1->Emitted(15, 9) Source(2, 1) + SourceIndex(0)
 ---
 >>>        }
 1->^^^^^^^^
@@ -39,16 +40,16 @@ sourceFile:tests/cases/compiler/ref/a.ts
 3 >         ^^^^^^^^^->
 1->export class A { 
 2 >        }
-1->Emitted(15, 9) Source(2, 18) + SourceIndex(0)
-2 >Emitted(15, 10) Source(2, 19) + SourceIndex(0)
+1->Emitted(16, 9) Source(2, 18) + SourceIndex(0)
+2 >Emitted(16, 10) Source(2, 19) + SourceIndex(0)
 ---
 >>>        return A;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(16, 9) Source(2, 18) + SourceIndex(0)
-2 >Emitted(16, 17) Source(2, 19) + SourceIndex(0)
+1->Emitted(17, 9) Source(2, 18) + SourceIndex(0)
+2 >Emitted(17, 17) Source(2, 19) + SourceIndex(0)
 ---
 >>>    }());
 1 >^^^^
@@ -60,18 +61,18 @@ sourceFile:tests/cases/compiler/ref/a.ts
 2 >    }
 3 >     
 4 >     export class A { }
-1 >Emitted(17, 5) Source(2, 18) + SourceIndex(0)
-2 >Emitted(17, 6) Source(2, 19) + SourceIndex(0)
-3 >Emitted(17, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(17, 10) Source(2, 19) + SourceIndex(0)
+1 >Emitted(18, 5) Source(2, 18) + SourceIndex(0)
+2 >Emitted(18, 6) Source(2, 19) + SourceIndex(0)
+3 >Emitted(18, 6) Source(2, 1) + SourceIndex(0)
+4 >Emitted(18, 10) Source(2, 19) + SourceIndex(0)
 ---
 >>>    exports.A = A;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
 1->
 2 >    A
-1->Emitted(18, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(18, 19) Source(2, 15) + SourceIndex(0)
+1->Emitted(19, 5) Source(2, 14) + SourceIndex(0)
+2 >Emitted(19, 19) Source(2, 15) + SourceIndex(0)
 ---
 -------------------------------------------------------------------
 emittedFile:all.js
@@ -80,26 +81,27 @@ sourceFile:tests/cases/compiler/b.ts
 >>>});
 >>>define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
 >>>    "use strict";
+>>>    Object.defineProperty(exports, "__esModule", { value: true });
 >>>    var B = (function (_super) {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >import {A} from "./ref/a";
   >
-1 >Emitted(22, 5) Source(2, 1) + SourceIndex(1)
+1 >Emitted(24, 5) Source(2, 1) + SourceIndex(1)
 ---
 >>>        __extends(B, _super);
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >        A
-1->Emitted(23, 9) Source(2, 24) + SourceIndex(1)
-2 >Emitted(23, 30) Source(2, 25) + SourceIndex(1)
+1->Emitted(25, 9) Source(2, 24) + SourceIndex(1)
+2 >Emitted(25, 30) Source(2, 25) + SourceIndex(1)
 ---
 >>>        function B() {
 1 >^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(24, 9) Source(2, 1) + SourceIndex(1)
+1 >Emitted(26, 9) Source(2, 1) + SourceIndex(1)
 ---
 >>>            return _super !== null && _super.apply(this, arguments) || this;
 >>>        }
@@ -108,16 +110,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >         ^^^^^^^^^->
 1->export class B extends A { 
 2 >        }
-1->Emitted(26, 9) Source(2, 28) + SourceIndex(1)
-2 >Emitted(26, 10) Source(2, 29) + SourceIndex(1)
+1->Emitted(28, 9) Source(2, 28) + SourceIndex(1)
+2 >Emitted(28, 10) Source(2, 29) + SourceIndex(1)
 ---
 >>>        return B;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(27, 9) Source(2, 28) + SourceIndex(1)
-2 >Emitted(27, 17) Source(2, 29) + SourceIndex(1)
+1->Emitted(29, 9) Source(2, 28) + SourceIndex(1)
+2 >Emitted(29, 17) Source(2, 29) + SourceIndex(1)
 ---
 >>>    }(a_1.A));
 1 >^^^^
@@ -133,20 +135,20 @@ sourceFile:tests/cases/compiler/b.ts
 4 >     export class B extends 
 5 >      A
 6 >            { }
-1 >Emitted(28, 5) Source(2, 28) + SourceIndex(1)
-2 >Emitted(28, 6) Source(2, 29) + SourceIndex(1)
-3 >Emitted(28, 6) Source(2, 1) + SourceIndex(1)
-4 >Emitted(28, 7) Source(2, 24) + SourceIndex(1)
-5 >Emitted(28, 12) Source(2, 25) + SourceIndex(1)
-6 >Emitted(28, 15) Source(2, 29) + SourceIndex(1)
+1 >Emitted(30, 5) Source(2, 28) + SourceIndex(1)
+2 >Emitted(30, 6) Source(2, 29) + SourceIndex(1)
+3 >Emitted(30, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(30, 7) Source(2, 24) + SourceIndex(1)
+5 >Emitted(30, 12) Source(2, 25) + SourceIndex(1)
+6 >Emitted(30, 15) Source(2, 29) + SourceIndex(1)
 ---
 >>>    exports.B = B;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
 1->
 2 >    B
-1->Emitted(29, 5) Source(2, 14) + SourceIndex(1)
-2 >Emitted(29, 19) Source(2, 15) + SourceIndex(1)
+1->Emitted(31, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(31, 19) Source(2, 15) + SourceIndex(1)
 ---
 >>>});
 >>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js b/tests/baselines/reference/outModuleTripleSlashRefs.js
index 33e970af54b..c45414b5e62 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.js
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.js
@@ -49,6 +49,7 @@ var Foo = (function () {
 }());
 define("ref/a", ["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     /// <reference path="./b.ts" />
     var A = (function () {
         function A() {
@@ -59,6 +60,7 @@ define("ref/a", ["require", "exports"], function (require, exports) {
 });
 define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js.map b/tests/baselines/reference/outModuleTripleSlashRefs.js.map
index e91088c249c..8b552ec3fb3 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.js.map
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.js.map
@@ -1,2 +1,2 @@
 //// [all.js.map]
-{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/b.ts","tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,iCAAiC;AACjC;IAAA;IAEA,CAAC;IAAD,UAAC;AAAD,CAAC,AAFD,IAEC;;;ICFD,+BAA+B;IAC/B;QAAA;QAEA,CAAC;QAAD,QAAC;IAAD,CAAC,AAFD,IAEC;IAFY,cAAC;;;;ICDd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"}
\ No newline at end of file
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/b.ts","tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,iCAAiC;AACjC;IAAA;IAEA,CAAC;IAAD,UAAC;AAAD,CAAC,AAFD,IAEC;;;;ICFD,+BAA+B;IAC/B;QAAA;QAEA,CAAC;QAAD,QAAC;IAAD,CAAC,AAFD,IAEC;IAFY,cAAC;;;;;ICDd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
index f2076c34482..231da040f11 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
@@ -81,27 +81,28 @@ sourceFile:tests/cases/compiler/ref/a.ts
 -------------------------------------------------------------------
 >>>define("ref/a", ["require", "exports"], function (require, exports) {
 >>>    "use strict";
+>>>    Object.defineProperty(exports, "__esModule", { value: true });
 >>>    /// <reference path="./b.ts" />
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >    /// <reference path="./b.ts" />
-1->Emitted(19, 5) Source(2, 1) + SourceIndex(1)
-2 >Emitted(19, 36) Source(2, 32) + SourceIndex(1)
+1->Emitted(20, 5) Source(2, 1) + SourceIndex(1)
+2 >Emitted(20, 36) Source(2, 32) + SourceIndex(1)
 ---
 >>>    var A = (function () {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 5) Source(3, 1) + SourceIndex(1)
+1 >Emitted(21, 5) Source(3, 1) + SourceIndex(1)
 ---
 >>>        function A() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(21, 9) Source(3, 1) + SourceIndex(1)
+1->Emitted(22, 9) Source(3, 1) + SourceIndex(1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -111,16 +112,16 @@ sourceFile:tests/cases/compiler/ref/a.ts
   >	member: typeof GlobalFoo;
   >
 2 >        }
-1->Emitted(22, 9) Source(5, 1) + SourceIndex(1)
-2 >Emitted(22, 10) Source(5, 2) + SourceIndex(1)
+1->Emitted(23, 9) Source(5, 1) + SourceIndex(1)
+2 >Emitted(23, 10) Source(5, 2) + SourceIndex(1)
 ---
 >>>        return A;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(23, 9) Source(5, 1) + SourceIndex(1)
-2 >Emitted(23, 17) Source(5, 2) + SourceIndex(1)
+1->Emitted(24, 9) Source(5, 1) + SourceIndex(1)
+2 >Emitted(24, 17) Source(5, 2) + SourceIndex(1)
 ---
 >>>    }());
 1 >^^^^
@@ -134,18 +135,18 @@ sourceFile:tests/cases/compiler/ref/a.ts
 4 >     export class A {
   >     	member: typeof GlobalFoo;
   >     }
-1 >Emitted(24, 5) Source(5, 1) + SourceIndex(1)
-2 >Emitted(24, 6) Source(5, 2) + SourceIndex(1)
-3 >Emitted(24, 6) Source(3, 1) + SourceIndex(1)
-4 >Emitted(24, 10) Source(5, 2) + SourceIndex(1)
+1 >Emitted(25, 5) Source(5, 1) + SourceIndex(1)
+2 >Emitted(25, 6) Source(5, 2) + SourceIndex(1)
+3 >Emitted(25, 6) Source(3, 1) + SourceIndex(1)
+4 >Emitted(25, 10) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.A = A;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
 1->
 2 >    A
-1->Emitted(25, 5) Source(3, 14) + SourceIndex(1)
-2 >Emitted(25, 19) Source(3, 15) + SourceIndex(1)
+1->Emitted(26, 5) Source(3, 14) + SourceIndex(1)
+2 >Emitted(26, 19) Source(3, 15) + SourceIndex(1)
 ---
 -------------------------------------------------------------------
 emittedFile:all.js
@@ -154,26 +155,27 @@ sourceFile:tests/cases/compiler/b.ts
 >>>});
 >>>define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
 >>>    "use strict";
+>>>    Object.defineProperty(exports, "__esModule", { value: true });
 >>>    var B = (function (_super) {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >import {A} from "./ref/a";
   >
-1 >Emitted(29, 5) Source(2, 1) + SourceIndex(2)
+1 >Emitted(31, 5) Source(2, 1) + SourceIndex(2)
 ---
 >>>        __extends(B, _super);
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >        A
-1->Emitted(30, 9) Source(2, 24) + SourceIndex(2)
-2 >Emitted(30, 30) Source(2, 25) + SourceIndex(2)
+1->Emitted(32, 9) Source(2, 24) + SourceIndex(2)
+2 >Emitted(32, 30) Source(2, 25) + SourceIndex(2)
 ---
 >>>        function B() {
 1 >^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(31, 9) Source(2, 1) + SourceIndex(2)
+1 >Emitted(33, 9) Source(2, 1) + SourceIndex(2)
 ---
 >>>            return _super !== null && _super.apply(this, arguments) || this;
 >>>        }
@@ -182,16 +184,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >         ^^^^^^^^^->
 1->export class B extends A { 
 2 >        }
-1->Emitted(33, 9) Source(2, 28) + SourceIndex(2)
-2 >Emitted(33, 10) Source(2, 29) + SourceIndex(2)
+1->Emitted(35, 9) Source(2, 28) + SourceIndex(2)
+2 >Emitted(35, 10) Source(2, 29) + SourceIndex(2)
 ---
 >>>        return B;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(34, 9) Source(2, 28) + SourceIndex(2)
-2 >Emitted(34, 17) Source(2, 29) + SourceIndex(2)
+1->Emitted(36, 9) Source(2, 28) + SourceIndex(2)
+2 >Emitted(36, 17) Source(2, 29) + SourceIndex(2)
 ---
 >>>    }(a_1.A));
 1 >^^^^
@@ -207,20 +209,20 @@ sourceFile:tests/cases/compiler/b.ts
 4 >     export class B extends 
 5 >      A
 6 >            { }
-1 >Emitted(35, 5) Source(2, 28) + SourceIndex(2)
-2 >Emitted(35, 6) Source(2, 29) + SourceIndex(2)
-3 >Emitted(35, 6) Source(2, 1) + SourceIndex(2)
-4 >Emitted(35, 7) Source(2, 24) + SourceIndex(2)
-5 >Emitted(35, 12) Source(2, 25) + SourceIndex(2)
-6 >Emitted(35, 15) Source(2, 29) + SourceIndex(2)
+1 >Emitted(37, 5) Source(2, 28) + SourceIndex(2)
+2 >Emitted(37, 6) Source(2, 29) + SourceIndex(2)
+3 >Emitted(37, 6) Source(2, 1) + SourceIndex(2)
+4 >Emitted(37, 7) Source(2, 24) + SourceIndex(2)
+5 >Emitted(37, 12) Source(2, 25) + SourceIndex(2)
+6 >Emitted(37, 15) Source(2, 29) + SourceIndex(2)
 ---
 >>>    exports.B = B;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
 1->
 2 >    B
-1->Emitted(36, 5) Source(2, 14) + SourceIndex(2)
-2 >Emitted(36, 19) Source(2, 15) + SourceIndex(2)
+1->Emitted(38, 5) Source(2, 14) + SourceIndex(2)
+2 >Emitted(38, 19) Source(2, 15) + SourceIndex(2)
 ---
 >>>});
 >>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/overloadModifiersMustAgree.js b/tests/baselines/reference/overloadModifiersMustAgree.js
index e7256562e76..783bf854a84 100644
--- a/tests/baselines/reference/overloadModifiersMustAgree.js
+++ b/tests/baselines/reference/overloadModifiersMustAgree.js
@@ -17,6 +17,7 @@ interface I {
 
 //// [overloadModifiersMustAgree.js]
 "use strict";
+exports.__esModule = true;
 var baz = (function () {
     function baz() {
     }
diff --git a/tests/baselines/reference/packageJsonMain.js b/tests/baselines/reference/packageJsonMain.js
new file mode 100644
index 00000000000..96509ab639e
--- /dev/null
+++ b/tests/baselines/reference/packageJsonMain.js
@@ -0,0 +1,35 @@
+//// [tests/cases/conformance/moduleResolution/packageJsonMain.ts] ////
+
+//// [package.json]
+
+{ "main": "oof" }
+
+//// [oof.js]
+module.exports = 0;
+
+//// [package.json]
+{ "main": "rab.js" }
+
+//// [rab.js]
+module.exports = 0;
+
+//// [package.json]
+{ "main": "zab" }
+
+//// [index.js]
+module.exports = 0;
+
+//// [a.ts]
+import foo = require("foo");
+import bar = require("bar");
+import baz = require("baz");
+foo + bar + baz;
+
+
+//// [a.js]
+"use strict";
+exports.__esModule = true;
+var foo = require("foo");
+var bar = require("bar");
+var baz = require("baz");
+foo + bar + baz;
diff --git a/tests/baselines/reference/packageJsonMain.symbols b/tests/baselines/reference/packageJsonMain.symbols
new file mode 100644
index 00000000000..c34c36e8901
--- /dev/null
+++ b/tests/baselines/reference/packageJsonMain.symbols
@@ -0,0 +1,15 @@
+=== /a.ts ===
+import foo = require("foo");
+>foo : Symbol(foo, Decl(a.ts, 0, 0))
+
+import bar = require("bar");
+>bar : Symbol(bar, Decl(a.ts, 0, 28))
+
+import baz = require("baz");
+>baz : Symbol(baz, Decl(a.ts, 1, 28))
+
+foo + bar + baz;
+>foo : Symbol(foo, Decl(a.ts, 0, 0))
+>bar : Symbol(bar, Decl(a.ts, 0, 28))
+>baz : Symbol(baz, Decl(a.ts, 1, 28))
+
diff --git a/tests/baselines/reference/packageJsonMain.trace.json b/tests/baselines/reference/packageJsonMain.trace.json
new file mode 100644
index 00000000000..a167e8dfec6
--- /dev/null
+++ b/tests/baselines/reference/packageJsonMain.trace.json
@@ -0,0 +1,71 @@
+[
+    "======== Resolving module 'foo' from '/a.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module 'foo' from 'node_modules' folder, target file type 'TypeScript'.",
+    "File '/node_modules/foo.ts' does not exist.",
+    "File '/node_modules/foo.tsx' does not exist.",
+    "File '/node_modules/foo.d.ts' does not exist.",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
+    "'package.json' does not have a 'typings' field.",
+    "'package.json' does not have a 'types' field.",
+    "File '/node_modules/foo/index.ts' does not exist.",
+    "File '/node_modules/foo/index.tsx' does not exist.",
+    "File '/node_modules/foo/index.d.ts' does not exist.",
+    "Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
+    "Loading module 'foo' from 'node_modules' folder, target file type 'JavaScript'.",
+    "File '/node_modules/foo.js' does not exist.",
+    "File '/node_modules/foo.jsx' does not exist.",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
+    "'package.json' has 'main' field 'oof' that references '/node_modules/foo/oof'.",
+    "File '/node_modules/foo/oof' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/foo/oof', target file type 'JavaScript'.",
+    "File '/node_modules/foo/oof.js' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/foo/oof.js', result '/node_modules/foo/oof.js'",
+    "======== Module name 'foo' was successfully resolved to '/node_modules/foo/oof.js'. ========",
+    "======== Resolving module 'bar' from '/a.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module 'bar' from 'node_modules' folder, target file type 'TypeScript'.",
+    "File '/node_modules/bar.ts' does not exist.",
+    "File '/node_modules/bar.tsx' does not exist.",
+    "File '/node_modules/bar.d.ts' does not exist.",
+    "Found 'package.json' at '/node_modules/bar/package.json'.",
+    "'package.json' does not have a 'typings' field.",
+    "'package.json' does not have a 'types' field.",
+    "File '/node_modules/bar/index.ts' does not exist.",
+    "File '/node_modules/bar/index.tsx' does not exist.",
+    "File '/node_modules/bar/index.d.ts' does not exist.",
+    "Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
+    "Loading module 'bar' from 'node_modules' folder, target file type 'JavaScript'.",
+    "File '/node_modules/bar.js' does not exist.",
+    "File '/node_modules/bar.jsx' does not exist.",
+    "Found 'package.json' at '/node_modules/bar/package.json'.",
+    "'package.json' has 'main' field 'rab.js' that references '/node_modules/bar/rab.js'.",
+    "File '/node_modules/bar/rab.js' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/bar/rab.js', result '/node_modules/bar/rab.js'",
+    "======== Module name 'bar' was successfully resolved to '/node_modules/bar/rab.js'. ========",
+    "======== Resolving module 'baz' from '/a.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module 'baz' from 'node_modules' folder, target file type 'TypeScript'.",
+    "File '/node_modules/baz.ts' does not exist.",
+    "File '/node_modules/baz.tsx' does not exist.",
+    "File '/node_modules/baz.d.ts' does not exist.",
+    "Found 'package.json' at '/node_modules/baz/package.json'.",
+    "'package.json' does not have a 'typings' field.",
+    "'package.json' does not have a 'types' field.",
+    "File '/node_modules/baz/index.ts' does not exist.",
+    "File '/node_modules/baz/index.tsx' does not exist.",
+    "File '/node_modules/baz/index.d.ts' does not exist.",
+    "Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
+    "Loading module 'baz' from 'node_modules' folder, target file type 'JavaScript'.",
+    "File '/node_modules/baz.js' does not exist.",
+    "File '/node_modules/baz.jsx' does not exist.",
+    "Found 'package.json' at '/node_modules/baz/package.json'.",
+    "'package.json' has 'main' field 'zab' that references '/node_modules/baz/zab'.",
+    "File '/node_modules/baz/zab' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/baz/zab', target file type 'JavaScript'.",
+    "File '/node_modules/baz/zab.js' does not exist.",
+    "File '/node_modules/baz/zab.jsx' does not exist.",
+    "File '/node_modules/baz/zab/index.js' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/baz/zab/index.js', result '/node_modules/baz/zab/index.js'",
+    "======== Module name 'baz' was successfully resolved to '/node_modules/baz/zab/index.js'. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/packageJsonMain.types b/tests/baselines/reference/packageJsonMain.types
new file mode 100644
index 00000000000..f30bd95f0e5
--- /dev/null
+++ b/tests/baselines/reference/packageJsonMain.types
@@ -0,0 +1,17 @@
+=== /a.ts ===
+import foo = require("foo");
+>foo : any
+
+import bar = require("bar");
+>bar : any
+
+import baz = require("baz");
+>baz : any
+
+foo + bar + baz;
+>foo + bar + baz : any
+>foo + bar : any
+>foo : any
+>bar : any
+>baz : any
+
diff --git a/tests/baselines/reference/packageJsonMain_isNonRecursive.errors.txt b/tests/baselines/reference/packageJsonMain_isNonRecursive.errors.txt
new file mode 100644
index 00000000000..a886fe3dca5
--- /dev/null
+++ b/tests/baselines/reference/packageJsonMain_isNonRecursive.errors.txt
@@ -0,0 +1,18 @@
+/a.ts(1,22): error TS2307: Cannot find module 'foo'.
+
+
+==== /a.ts (1 errors) ====
+    import foo = require("foo");
+                         ~~~~~
+!!! error TS2307: Cannot find module 'foo'.
+    
+==== /node_modules/foo/package.json (0 errors) ====
+    
+    { "main": "oof" }
+    
+==== /node_modules/foo/oof/package.json (0 errors) ====
+    { "main": "ofo" }
+    
+==== /node_modules/foo/oof/ofo.js (0 errors) ====
+    module.exports = 0;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/packageJsonMain_isNonRecursive.js b/tests/baselines/reference/packageJsonMain_isNonRecursive.js
new file mode 100644
index 00000000000..97d7bbdf05b
--- /dev/null
+++ b/tests/baselines/reference/packageJsonMain_isNonRecursive.js
@@ -0,0 +1,19 @@
+//// [tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts] ////
+
+//// [package.json]
+
+{ "main": "oof" }
+
+//// [package.json]
+{ "main": "ofo" }
+
+//// [ofo.js]
+module.exports = 0;
+
+//// [a.ts]
+import foo = require("foo");
+
+
+//// [a.js]
+"use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json b/tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json
new file mode 100644
index 00000000000..53e1ad25605
--- /dev/null
+++ b/tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json
@@ -0,0 +1,29 @@
+[
+    "======== Resolving module 'foo' from '/a.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module 'foo' from 'node_modules' folder, target file type 'TypeScript'.",
+    "File '/node_modules/foo.ts' does not exist.",
+    "File '/node_modules/foo.tsx' does not exist.",
+    "File '/node_modules/foo.d.ts' does not exist.",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
+    "'package.json' does not have a 'typings' field.",
+    "'package.json' does not have a 'types' field.",
+    "File '/node_modules/foo/index.ts' does not exist.",
+    "File '/node_modules/foo/index.tsx' does not exist.",
+    "File '/node_modules/foo/index.d.ts' does not exist.",
+    "Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
+    "Loading module 'foo' from 'node_modules' folder, target file type 'JavaScript'.",
+    "File '/node_modules/foo.js' does not exist.",
+    "File '/node_modules/foo.jsx' does not exist.",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
+    "'package.json' has 'main' field 'oof' that references '/node_modules/foo/oof'.",
+    "File '/node_modules/foo/oof' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/foo/oof', target file type 'JavaScript'.",
+    "File '/node_modules/foo/oof.js' does not exist.",
+    "File '/node_modules/foo/oof.jsx' does not exist.",
+    "File '/node_modules/foo/oof/index.js' does not exist.",
+    "File '/node_modules/foo/oof/index.jsx' does not exist.",
+    "File '/node_modules/foo/index.js' does not exist.",
+    "File '/node_modules/foo/index.jsx' does not exist.",
+    "======== Module name 'foo' was not resolved. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/parser0_004152.js b/tests/baselines/reference/parser0_004152.js
index 333b64811c8..b4443e04136 100644
--- a/tests/baselines/reference/parser0_004152.js
+++ b/tests/baselines/reference/parser0_004152.js
@@ -6,6 +6,7 @@ export class Game {
 
 //// [parser0_004152.js]
 "use strict";
+exports.__esModule = true;
 var Game = (function () {
     function Game() {
         this.position = new DisplayPosition([]);
diff --git a/tests/baselines/reference/parser509546.js b/tests/baselines/reference/parser509546.js
index ceaf9b3572c..e99d1d1764d 100644
--- a/tests/baselines/reference/parser509546.js
+++ b/tests/baselines/reference/parser509546.js
@@ -6,6 +6,7 @@ export class Logger {
 
 //// [parser509546.js]
 "use strict";
+exports.__esModule = true;
 var Logger = (function () {
     function Logger() {
     }
diff --git a/tests/baselines/reference/parser509546_1.js b/tests/baselines/reference/parser509546_1.js
index 9d07172c509..3fc82755fbf 100644
--- a/tests/baselines/reference/parser509546_1.js
+++ b/tests/baselines/reference/parser509546_1.js
@@ -6,6 +6,7 @@ export class Logger {
 
 //// [parser509546_1.js]
 "use strict";
+exports.__esModule = true;
 var Logger = (function () {
     function Logger() {
     }
diff --git a/tests/baselines/reference/parser509546_2.js b/tests/baselines/reference/parser509546_2.js
index b8822b52541..c16f041b2db 100644
--- a/tests/baselines/reference/parser509546_2.js
+++ b/tests/baselines/reference/parser509546_2.js
@@ -8,6 +8,7 @@ export class Logger {
 
 //// [parser509546_2.js]
 "use strict";
+exports.__esModule = true;
 var Logger = (function () {
     function Logger() {
     }
diff --git a/tests/baselines/reference/parser618973.js b/tests/baselines/reference/parser618973.js
index df9b2e4433a..bfef06b061f 100644
--- a/tests/baselines/reference/parser618973.js
+++ b/tests/baselines/reference/parser618973.js
@@ -6,6 +6,7 @@ export export class Foo {
 
 //// [parser618973.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
diff --git a/tests/baselines/reference/parserArgumentList1.js b/tests/baselines/reference/parserArgumentList1.js
index 222b2c5ac89..36c8f619235 100644
--- a/tests/baselines/reference/parserArgumentList1.js
+++ b/tests/baselines/reference/parserArgumentList1.js
@@ -7,6 +7,7 @@ export function removeClass (node:HTMLElement, className:string) {
 
 //// [parserArgumentList1.js]
 "use strict";
+exports.__esModule = true;
 function removeClass(node, className) {
     node.className = node.className.replace(_classNameRegexp(className), function (everything, leftDelimiter, name, rightDelimiter) {
         return leftDelimiter.length + rightDelimiter.length === 2 ? ' ' : '';
diff --git a/tests/baselines/reference/parserClass1.js b/tests/baselines/reference/parserClass1.js
index 50d2fb179dc..7fcbf29f242 100644
--- a/tests/baselines/reference/parserClass1.js
+++ b/tests/baselines/reference/parserClass1.js
@@ -11,6 +11,7 @@
 
 //// [parserClass1.js]
 "use strict";
+exports.__esModule = true;
 var NullLogger = (function () {
     function NullLogger() {
     }
diff --git a/tests/baselines/reference/parserClass2.js b/tests/baselines/reference/parserClass2.js
index c1d3b87e892..0d47a388acc 100644
--- a/tests/baselines/reference/parserClass2.js
+++ b/tests/baselines/reference/parserClass2.js
@@ -9,6 +9,7 @@
 
 //// [parserClass2.js]
 "use strict";
+exports.__esModule = true;
 var LoggerAdapter = (function () {
     function LoggerAdapter(logger) {
         this.logger = logger;
diff --git a/tests/baselines/reference/parserEnum1.js b/tests/baselines/reference/parserEnum1.js
index d2c29d847cd..43cdc626ab8 100644
--- a/tests/baselines/reference/parserEnum1.js
+++ b/tests/baselines/reference/parserEnum1.js
@@ -10,6 +10,7 @@
 
 //// [parserEnum1.js]
 "use strict";
+exports.__esModule = true;
 var SignatureFlags;
 (function (SignatureFlags) {
     SignatureFlags[SignatureFlags["None"] = 0] = "None";
diff --git a/tests/baselines/reference/parserEnum2.js b/tests/baselines/reference/parserEnum2.js
index f5888addf75..0fa0633d280 100644
--- a/tests/baselines/reference/parserEnum2.js
+++ b/tests/baselines/reference/parserEnum2.js
@@ -10,6 +10,7 @@
 
 //// [parserEnum2.js]
 "use strict";
+exports.__esModule = true;
 var SignatureFlags;
 (function (SignatureFlags) {
     SignatureFlags[SignatureFlags["None"] = 0] = "None";
diff --git a/tests/baselines/reference/parserEnum3.js b/tests/baselines/reference/parserEnum3.js
index 602171e8d94..b9b9e743e4b 100644
--- a/tests/baselines/reference/parserEnum3.js
+++ b/tests/baselines/reference/parserEnum3.js
@@ -6,6 +6,7 @@
 
 //// [parserEnum3.js]
 "use strict";
+exports.__esModule = true;
 var SignatureFlags;
 (function (SignatureFlags) {
 })(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {}));
diff --git a/tests/baselines/reference/parserEnum4.js b/tests/baselines/reference/parserEnum4.js
index 6af07b0a1c7..96d3c8757ed 100644
--- a/tests/baselines/reference/parserEnum4.js
+++ b/tests/baselines/reference/parserEnum4.js
@@ -7,6 +7,7 @@
 
 //// [parserEnum4.js]
 "use strict";
+exports.__esModule = true;
 var SignatureFlags;
 (function (SignatureFlags) {
 })(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {}));
diff --git a/tests/baselines/reference/parserInterfaceDeclaration6.js b/tests/baselines/reference/parserInterfaceDeclaration6.js
index 1ec3325de34..cbc734b534c 100644
--- a/tests/baselines/reference/parserInterfaceDeclaration6.js
+++ b/tests/baselines/reference/parserInterfaceDeclaration6.js
@@ -4,3 +4,4 @@ export export interface I {
 
 //// [parserInterfaceDeclaration6.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/parserInterfaceDeclaration7.js b/tests/baselines/reference/parserInterfaceDeclaration7.js
index eed874db143..0c52f4639ce 100644
--- a/tests/baselines/reference/parserInterfaceDeclaration7.js
+++ b/tests/baselines/reference/parserInterfaceDeclaration7.js
@@ -4,3 +4,4 @@ export interface I {
 
 //// [parserInterfaceDeclaration7.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock1.js b/tests/baselines/reference/parserModifierOnStatementInBlock1.js
index 352ee0cc511..43c1e4bf845 100644
--- a/tests/baselines/reference/parserModifierOnStatementInBlock1.js
+++ b/tests/baselines/reference/parserModifierOnStatementInBlock1.js
@@ -6,6 +6,7 @@ export function foo() {
 
 //// [parserModifierOnStatementInBlock1.js]
 "use strict";
+exports.__esModule = true;
 function foo() {
     export var x = this;
 }
diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock3.js b/tests/baselines/reference/parserModifierOnStatementInBlock3.js
index 9f2cdf6850f..85c3d6da0a4 100644
--- a/tests/baselines/reference/parserModifierOnStatementInBlock3.js
+++ b/tests/baselines/reference/parserModifierOnStatementInBlock3.js
@@ -7,6 +7,7 @@ export function foo() {
 
 //// [parserModifierOnStatementInBlock3.js]
 "use strict";
+exports.__esModule = true;
 function foo() {
     export function bar() {
     }
diff --git a/tests/baselines/reference/parserModule1.js b/tests/baselines/reference/parserModule1.js
index 749715a39d1..484c74f721c 100644
--- a/tests/baselines/reference/parserModule1.js
+++ b/tests/baselines/reference/parserModule1.js
@@ -33,6 +33,7 @@
 
 //// [parserModule1.js]
 "use strict";
+exports.__esModule = true;
 var CompilerDiagnostics;
 (function (CompilerDiagnostics) {
     CompilerDiagnostics.debug = false;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js
index 1a1bd387dce..e8c026429f1 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js
@@ -5,5 +5,6 @@ export var x = 1;
 //// [f1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.x = 1;
 });
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js
index 5fcaa23b976..6439d35aadf 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js
@@ -4,4 +4,5 @@ export var x = 1;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 1;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js
index 52dab845bb2..df5115d5360 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js
@@ -4,5 +4,6 @@ export var x = 1;
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.x = 1;
 });
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution2_node.js
index 8c8b5c9a926..a0c8d5df7de 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution2_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution2_node.js
@@ -3,4 +3,5 @@ export var x = 1;
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 1;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js
index 15867b085ea..8809efa963a 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js
@@ -22,21 +22,25 @@ export var y = 100;
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.x = 1;
 });
 //// [file4.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.y = 100;
 });
 //// [file2.js]
 define(["require", "exports", "./file3", "file4"], function (require, exports, file3_1, file4_1) {
     "use strict";
+    exports.__esModule = true;
     exports.x = file3_1.x + file4_1.y;
 });
 //// [file1.js]
 // baseUrl set via command line
 define(["require", "exports", "folder2/file2"], function (require, exports, file2_1) {
     "use strict";
+    exports.__esModule = true;
     use(file2_1.x.toExponential());
 });
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js
index cbff6087530..cd0eb7d7794 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js
@@ -21,14 +21,17 @@ export var y: number;
 
 //// [file3.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 1;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
 var file3_1 = require("./file3"); // found with baseurl
 var file4_1 = require("file4"); // found with fallback
 exports.x = file3_1.x + file4_1.y;
 //// [file1.js]
 // baseUrl set via command line
 "use strict";
+exports.__esModule = true;
 var file2_1 = require("folder2/file2");
 use(file2_1.x.toExponential());
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js
index c1de8cea6c9..2a8254fb696 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js
@@ -19,20 +19,24 @@ export var y = 100;
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.x = 1;
 });
 //// [file4.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.y = 100;
 });
 //// [file2.js]
 define(["require", "exports", "./file3", "file4"], function (require, exports, file3_1, file4_1) {
     "use strict";
+    exports.__esModule = true;
     exports.x = file3_1.x + file4_1.y;
 });
 //// [file1.js]
 define(["require", "exports", "folder2/file2"], function (require, exports, file2_1) {
     "use strict";
+    exports.__esModule = true;
     use(file2_1.x.toExponential());
 });
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js
index c5a08d55d8b..ff1a51662b0 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js
@@ -18,13 +18,16 @@ export var y: number;
 
 //// [file3.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 1;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
 var file3_1 = require("./file3"); // found with baseurl
 var file4_1 = require("file4"); // found with fallback
 exports.x = file3_1.x + file4_1.y;
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var file2_1 = require("folder2/file2");
 use(file2_1.x.toExponential());
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js
index 24297f85e35..1b9782660d8 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js
@@ -28,26 +28,31 @@ export var z1 = 1;
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.x = 1;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.y = 1;
 });
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.z = 1;
 });
 //// [file4.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.z1 = 1;
 });
 //// [file1.js]
 define(["require", "exports", "folder2/file1", "folder3/file2", "components/file3", "file4"], function (require, exports, file1_1, file2_1, file3_1, file4_1) {
     "use strict";
+    exports.__esModule = true;
     use(file1_1.x.toExponential());
     use(file2_1.y.toExponential());
     use(file3_1.z.toExponential());
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js
index 1958800f918..7d10c4d4a8b 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js
@@ -27,15 +27,19 @@ export var z1 = 1;
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 1;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
 exports.y = 1;
 //// [file4.js]
 "use strict";
+exports.__esModule = true;
 exports.z1 = 1;
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var file1_1 = require("folder2/file1");
 var file2_1 = require("folder3/file2");
 var file3_1 = require("components/file3");
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js
index 1e8f8807e2c..3289efd0209 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js
@@ -14,10 +14,12 @@ export {x} from "../file2";
 //// [file3.js]
 define(["require", "exports", "../file2"], function (require, exports, file2_1) {
     "use strict";
+    exports.__esModule = true;
     exports.x = file2_1.x;
 });
 //// [file1.js]
 define(["require", "exports", "./project/file3"], function (require, exports, file3_1) {
     "use strict";
+    exports.__esModule = true;
     use(file3_1.x.toExponential());
 });
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js
index 6db3fecf83f..74c0f40758a 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js
@@ -13,9 +13,11 @@ export {x} from "../file2";
 
 //// [file3.js]
 "use strict";
+exports.__esModule = true;
 var file2_1 = require("../file2");
 exports.x = file2_1.x;
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var file3_1 = require("./project/file3");
 use(file3_1.x.toFixed());
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js
index 5670f41be0f..55aca054e82 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js
@@ -31,15 +31,18 @@ export let y: number;
 //// [module2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports", "module1", "templates/module2", "../file3"], function (require, exports, module1_1, module2_1, file3_1) {
     "use strict";
+    exports.__esModule = true;
     exports.x = module1_1.a + module2_1.b + file3_1.x;
 });
 //// [file1.js]
 define(["require", "exports", "./project/file2", "module3"], function (require, exports, file2_1, module3_1) {
     "use strict";
+    exports.__esModule = true;
     use(file2_1.x.toFixed());
     use(module3_1.y.toFixed());
 });
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js
index 3be48cfc85c..303b98f4d83 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js
@@ -30,14 +30,17 @@ export let y: number;
 
 //// [module2.js]
 "use strict";
+exports.__esModule = true;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
 var module1_1 = require("module1");
 var module2_1 = require("templates/module2");
 var file3_1 = require("../file3");
 exports.x = module1_1.a + module2_1.b + file3_1.x;
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var file2_1 = require("./project/file2");
 var module3_1 = require("module3");
 use(file2_1.x.toFixed());
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js
index 06f6b50e4a0..a91cc9d8d5a 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js
@@ -14,11 +14,14 @@ import { bar } from "bar";
 
 //// [foo.js]
 "use strict";
+exports.__esModule = true;
 function foo() { }
 exports.foo = foo;
 //// [bar.js]
 "use strict";
+exports.__esModule = true;
 function bar() { }
 exports.bar = bar;
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.js b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.js
index 1774876911f..4fded4a78ad 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.js
@@ -5,3 +5,4 @@ import { foo } from "foo";
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/prespecializedGenericMembers1.js b/tests/baselines/reference/prespecializedGenericMembers1.js
index dd6bd2a2dc6..f7e41263237 100644
--- a/tests/baselines/reference/prespecializedGenericMembers1.js
+++ b/tests/baselines/reference/prespecializedGenericMembers1.js
@@ -22,6 +22,7 @@ var catBag = new CatBag(catThing);
 
 //// [prespecializedGenericMembers1.js]
 "use strict";
+exports.__esModule = true;
 var Cat = (function () {
     function Cat() {
     }
diff --git a/tests/baselines/reference/privacyAccessorDeclFile.js b/tests/baselines/reference/privacyAccessorDeclFile.js
index 6fed8b8f082..9d077d19e06 100644
--- a/tests/baselines/reference/privacyAccessorDeclFile.js
+++ b/tests/baselines/reference/privacyAccessorDeclFile.js
@@ -1061,6 +1061,7 @@ module publicModuleInGlobal {
 
 //// [privacyAccessorDeclFile_externalModule.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var privateClass = (function () {
     function privateClass() {
     }
diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js
index 4121dbdd51d..d19869b0f03 100644
--- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js
+++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js
@@ -139,6 +139,7 @@ class privateClassWithPrivateModuleGetAccessorTypes {
 //// [privacyCannotNameAccessorDeclFile_GlobalWidgets.js]
 //// [privacyCannotNameAccessorDeclFile_Widgets.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Widget1 = (function () {
     function Widget1() {
         this.name = 'one';
@@ -166,6 +167,7 @@ var SpecializedWidget;
 })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {}));
 //// [privacyCannotNameAccessorDeclFile_exporter.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 ///<reference path='privacyCannotNameAccessorDeclFile_GlobalWidgets.ts'/>
 var Widgets = require("./privacyCannotNameAccessorDeclFile_Widgets");
 var Widgets1 = require("GlobalWidgets");
@@ -187,6 +189,7 @@ function createExportedWidget4() {
 exports.createExportedWidget4 = createExportedWidget4;
 //// [privacyCannotNameAccessorDeclFile_consumer.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var exporter = require("./privacyCannotNameAccessorDeclFile_exporter");
 var publicClassWithWithPrivateGetAccessorTypes = (function () {
     function publicClassWithWithPrivateGetAccessorTypes() {
diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
index c139b6279fd..df24bf70259 100644
--- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
+++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
@@ -103,6 +103,7 @@ var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4()
 //// [privacyCannotNameVarTypeDeclFile_GlobalWidgets.js]
 //// [privacyCannotNameVarTypeDeclFile_Widgets.js]
 "use strict";
+exports.__esModule = true;
 var Widget1 = (function () {
     function Widget1() {
         this.name = 'one';
@@ -130,6 +131,7 @@ var SpecializedWidget;
 })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {}));
 //// [privacyCannotNameVarTypeDeclFile_exporter.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts'/>
 var Widgets = require("./privacyCannotNameVarTypeDeclFile_Widgets");
 var Widgets1 = require("GlobalWidgets");
@@ -151,6 +153,7 @@ function createExportedWidget4() {
 exports.createExportedWidget4 = createExportedWidget4;
 //// [privacyCannotNameVarTypeDeclFile_consumer.js]
 "use strict";
+exports.__esModule = true;
 var exporter = require("./privacyCannotNameVarTypeDeclFile_exporter");
 var publicClassWithWithPrivatePropertyTypes = (function () {
     function publicClassWithWithPrivatePropertyTypes() {
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js
index 92be6f737cc..8ddcc60a8ff 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js
@@ -18,6 +18,7 @@ module Query {
 
 //// [privacyCheckAnonymousFunctionParameter.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 1; // Makes this an external module
 var Query;
 (function (Query) {
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js
index 1da2ec03ed7..f18f47c20c3 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js
@@ -17,6 +17,7 @@ module Q {
 //// [privacyCheckAnonymousFunctionParameter2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.x = 1; // Makes this an external module 
     var Q;
     (function (Q) {
diff --git a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js
index 54ad8acd2f1..98e87342287 100644
--- a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js
+++ b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js
@@ -10,6 +10,7 @@ export interface B<T> extends A<T> {
 //// [privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js
index ff241a726bf..b8e8139675b 100644
--- a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js
+++ b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js
@@ -24,6 +24,7 @@ var Foo = (function () {
 module.exports = Foo;
 //// [privacyCheckExternalModuleExportAssignmentOfGenericClass_1.js]
 "use strict";
+exports.__esModule = true;
 
 
 //// [privacyCheckExternalModuleExportAssignmentOfGenericClass_0.d.ts]
diff --git a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js
index 7d4db36ee99..dc868d86bff 100644
--- a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js
+++ b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js
@@ -13,6 +13,7 @@ export class B<T2> {
 //// [privacyCheckOnTypeParameterReferenceInConstructorParameter.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A(callback) {
             var child = new B(this);
diff --git a/tests/baselines/reference/privacyCheckTypeOfFunction.js b/tests/baselines/reference/privacyCheckTypeOfFunction.js
index b810dafcca7..614bcedebe0 100644
--- a/tests/baselines/reference/privacyCheckTypeOfFunction.js
+++ b/tests/baselines/reference/privacyCheckTypeOfFunction.js
@@ -7,6 +7,7 @@ export var b = foo;
 
 //// [privacyCheckTypeOfFunction.js]
 "use strict";
+exports.__esModule = true;
 function foo() {
 }
 exports.b = foo;
diff --git a/tests/baselines/reference/privacyClass.js b/tests/baselines/reference/privacyClass.js
index 4e79f019e5d..95b12f4e2fa 100644
--- a/tests/baselines/reference/privacyClass.js
+++ b/tests/baselines/reference/privacyClass.js
@@ -139,6 +139,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var m1;
 (function (m1) {
     var m1_c_public = (function () {
diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
index 3e5b20923df..2803006c5b5 100644
--- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
+++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
@@ -109,6 +109,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var publicModule;
 (function (publicModule) {
     var publicClassInPublicModule = (function () {
diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js
index 15de9a16674..3d78f2a8048 100644
--- a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js
+++ b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js
@@ -96,6 +96,7 @@ class publicClassImplementingPublicInterfaceInGlobal implements publicInterfaceI
 
 //// [privacyClassImplementsClauseDeclFile_externalModule.js]
 "use strict";
+exports.__esModule = true;
 var publicModule;
 (function (publicModule) {
     var privateClassImplementingPublicInterfaceInModule = (function () {
diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js
index d8bfef7060e..00314bdceab 100644
--- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js
+++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js
@@ -159,6 +159,7 @@ function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createE
 //// [privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.js]
 //// [privacyFunctionCannotNameParameterTypeDeclFile_Widgets.js]
 "use strict";
+exports.__esModule = true;
 var Widget1 = (function () {
     function Widget1() {
         this.name = 'one';
@@ -186,6 +187,7 @@ var SpecializedWidget;
 })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {}));
 //// [privacyFunctionCannotNameParameterTypeDeclFile_exporter.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts'/>
 var Widgets = require("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
 var Widgets1 = require("GlobalWidgets");
@@ -207,6 +209,7 @@ function createExportedWidget4() {
 exports.createExportedWidget4 = createExportedWidget4;
 //// [privacyFunctionCannotNameParameterTypeDeclFile_consumer.js]
 "use strict";
+exports.__esModule = true;
 var exporter = require("./privacyFunctionCannotNameParameterTypeDeclFile_exporter");
 var publicClassWithWithPrivateParmeterTypes = (function () {
     function publicClassWithWithPrivateParmeterTypes(param, param1, param2) {
diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js
index 3b1ffb487ff..2124f8fbb24 100644
--- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js
+++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js
@@ -166,6 +166,7 @@ function privateFunctionWithPrivateModuleReturnTypes1() {
 //// [privacyFunctionReturnTypeDeclFile_GlobalWidgets.js]
 //// [privacyFunctionReturnTypeDeclFile_Widgets.js]
 "use strict";
+exports.__esModule = true;
 var Widget1 = (function () {
     function Widget1() {
         this.name = 'one';
@@ -193,6 +194,7 @@ var SpecializedWidget;
 })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {}));
 //// [privacyFunctionReturnTypeDeclFile_exporter.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts'/>
 var Widgets = require("./privacyFunctionReturnTypeDeclFile_Widgets");
 var Widgets1 = require("GlobalWidgets");
@@ -214,6 +216,7 @@ function createExportedWidget4() {
 exports.createExportedWidget4 = createExportedWidget4;
 //// [privacyFunctionReturnTypeDeclFile_consumer.js]
 "use strict";
+exports.__esModule = true;
 var exporter = require("./privacyFunctionReturnTypeDeclFile_exporter");
 var publicClassWithWithPrivateParmeterTypes = (function () {
     function publicClassWithWithPrivateParmeterTypes() {
diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.js b/tests/baselines/reference/privacyFunctionParameterDeclFile.js
index e8fff791a0e..255b8d68db6 100644
--- a/tests/baselines/reference/privacyFunctionParameterDeclFile.js
+++ b/tests/baselines/reference/privacyFunctionParameterDeclFile.js
@@ -688,6 +688,7 @@ module publicModuleInGlobal {
 
 //// [privacyFunctionParameterDeclFile_externalModule.js]
 "use strict";
+exports.__esModule = true;
 var privateClass = (function () {
     function privateClass() {
     }
diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js
index d4265b1c352..1aba74efaa4 100644
--- a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js
+++ b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js
@@ -1195,6 +1195,7 @@ module publicModuleInGlobal {
 
 //// [privacyFunctionReturnTypeDeclFile_externalModule.js]
 "use strict";
+exports.__esModule = true;
 var privateClass = (function () {
     function privateClass() {
     }
diff --git a/tests/baselines/reference/privacyGetter.js b/tests/baselines/reference/privacyGetter.js
index 37d89442e62..255d21edcdb 100644
--- a/tests/baselines/reference/privacyGetter.js
+++ b/tests/baselines/reference/privacyGetter.js
@@ -210,6 +210,7 @@ class C8_private {
 //// [privacyGetter.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var m1;
     (function (m1) {
         var C1_public = (function () {
diff --git a/tests/baselines/reference/privacyGloFunc.js b/tests/baselines/reference/privacyGloFunc.js
index 153fa57e3d3..6bc17794680 100644
--- a/tests/baselines/reference/privacyGloFunc.js
+++ b/tests/baselines/reference/privacyGloFunc.js
@@ -533,6 +533,7 @@ export function f12_public(): C5_private { //error
 //// [privacyGloFunc.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var m1;
     (function (m1) {
         var C1_public = (function () {
diff --git a/tests/baselines/reference/privacyImport.js b/tests/baselines/reference/privacyImport.js
index 2915b6e5f24..1a3dc9d9b18 100644
--- a/tests/baselines/reference/privacyImport.js
+++ b/tests/baselines/reference/privacyImport.js
@@ -358,6 +358,7 @@ export module m3 {
 
 //// [privacyImport.js]
 "use strict";
+exports.__esModule = true;
 var m1;
 (function (m1) {
     var m1_M1_public;
diff --git a/tests/baselines/reference/privacyImportParseErrors.js b/tests/baselines/reference/privacyImportParseErrors.js
index b705bbe1170..5a15a7280ec 100644
--- a/tests/baselines/reference/privacyImportParseErrors.js
+++ b/tests/baselines/reference/privacyImportParseErrors.js
@@ -358,6 +358,7 @@ export module m3 {
 
 //// [privacyImportParseErrors.js]
 "use strict";
+exports.__esModule = true;
 var m1;
 (function (m1) {
     var m1_M1_public;
diff --git a/tests/baselines/reference/privacyInterface.js b/tests/baselines/reference/privacyInterface.js
index 59e10aca7ff..360f1683b6a 100644
--- a/tests/baselines/reference/privacyInterface.js
+++ b/tests/baselines/reference/privacyInterface.js
@@ -266,6 +266,7 @@ export interface glo_C6_public extends  glo_i_private, glo_i_public {
 
 //// [privacyInterface.js]
 "use strict";
+exports.__esModule = true;
 var m1;
 (function (m1) {
     var C1_public = (function () {
diff --git a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js
index 8b2c4de8bf3..6d2748dd8dc 100644
--- a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js
+++ b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js
@@ -96,4 +96,5 @@ interface publicInterfaceImplementingPublicInterfaceInGlobal extends publicInter
 
 //// [privacyInterfaceExtendsClauseDeclFile_externalModule.js]
 "use strict";
+exports.__esModule = true;
 //// [privacyInterfaceExtendsClauseDeclFile_GlobalFile.js]
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js
index b328e8b3036..408abc04940 100644
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js
+++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js
@@ -154,6 +154,7 @@ module import_private {
 
 //// [privacyLocalInternalReferenceImportWithExport.js]
 "use strict";
+exports.__esModule = true;
 // private elements
 var m_private;
 (function (m_private) {
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js
index 7d4a80a0d29..8b158d7cc3d 100644
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js
+++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js
@@ -155,6 +155,7 @@ module import_private {
 //// [privacyLocalInternalReferenceImportWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     // private elements
     var m_private;
     (function (m_private) {
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
index d8bf7c85d12..312d682669c 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
@@ -52,6 +52,7 @@ export var publicUse_im_public_mi_public = new im_public_mi_public.c_private();
 //// [privacyTopLevelAmbientExternalModuleImportWithExport_require3.js]
 //// [privacyTopLevelAmbientExternalModuleImportWithExport_require.js]
 "use strict";
+exports.__esModule = true;
 // Public elements
 var c_public = (function () {
     function c_public() {
@@ -61,6 +62,7 @@ var c_public = (function () {
 exports.c_public = c_public;
 //// [privacyTopLevelAmbientExternalModuleImportWithExport_require1.js]
 "use strict";
+exports.__esModule = true;
 var c_public = (function () {
     function c_public() {
     }
@@ -69,6 +71,7 @@ var c_public = (function () {
 exports.c_public = c_public;
 //// [privacyTopLevelAmbientExternalModuleImportWithExport_core.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts'/>
 ///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts'/>
 // Privacy errors - importing private elements
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
index 7f44dbe6257..13b7de58ecf 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
@@ -53,6 +53,7 @@ export var publicUse_im_private_mi_public = new im_private_mi_public.c_public();
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     // Public elements
     var c_public = (function () {
         function c_public() {
@@ -64,6 +65,7 @@ define(["require", "exports"], function (require, exports) {
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c_public = (function () {
         function c_public() {
         }
@@ -74,6 +76,7 @@ define(["require", "exports"], function (require, exports) {
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_core.js]
 define(["require", "exports", "m", "m2", "privacyTopLevelAmbientExternalModuleImportWithoutExport_require"], function (require, exports, im_private_mi_private, im_private_mu_private, im_private_mi_public) {
     "use strict";
+    exports.__esModule = true;
     // Usage of privacy error imports
     var privateUse_im_private_mi_private = new im_private_mi_private.c_private();
     exports.publicUse_im_private_mi_private = new im_private_mi_private.c_private();
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js
index a01f1ef611f..a89d49609e9 100644
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js
@@ -102,6 +102,7 @@ export var publicUse_im_public_mu_public: im_public_mu_public.i;
 //// [privacyTopLevelInternalReferenceImportWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     // private elements
     var m_private;
     (function (m_private) {
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js
index 2554085b94b..85a6cc3691a 100644
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js
@@ -103,6 +103,7 @@ export var publicUse_im_private_mu_public: im_private_mu_public.i;
 //// [privacyTopLevelInternalReferenceImportWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     // private elements
     var m_private;
     (function (m_private) {
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunction.js b/tests/baselines/reference/privacyTypeParameterOfFunction.js
index 84034362fac..98e0a57d59e 100644
--- a/tests/baselines/reference/privacyTypeParameterOfFunction.js
+++ b/tests/baselines/reference/privacyTypeParameterOfFunction.js
@@ -134,6 +134,7 @@ function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
 
 //// [privacyTypeParameterOfFunction.js]
 "use strict";
+exports.__esModule = true;
 var privateClass = (function () {
     function privateClass() {
     }
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js
index 3eb6027b050..f5fdf6dfff8 100644
--- a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js
+++ b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js
@@ -440,6 +440,7 @@ module privateModule {
 
 //// [privacyTypeParameterOfFunctionDeclFile.js]
 "use strict";
+exports.__esModule = true;
 var privateClass = (function () {
     function privateClass() {
     }
diff --git a/tests/baselines/reference/privacyTypeParametersOfClass.js b/tests/baselines/reference/privacyTypeParametersOfClass.js
index 3d28e145b32..ba1a9bd10e0 100644
--- a/tests/baselines/reference/privacyTypeParametersOfClass.js
+++ b/tests/baselines/reference/privacyTypeParametersOfClass.js
@@ -45,6 +45,7 @@ class privateClassWithPublicTypeParametersWithoutExtends<T> {
 
 //// [privacyTypeParametersOfClass.js]
 "use strict";
+exports.__esModule = true;
 var privateClass = (function () {
     function privateClass() {
     }
diff --git a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js
index 3ccdec46d7c..8e21589de42 100644
--- a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js
+++ b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js
@@ -156,6 +156,7 @@ module privateModule {
 
 //// [privacyTypeParametersOfClassDeclFile.js]
 "use strict";
+exports.__esModule = true;
 var privateClass = (function () {
     function privateClass() {
     }
diff --git a/tests/baselines/reference/privacyTypeParametersOfInterface.js b/tests/baselines/reference/privacyTypeParametersOfInterface.js
index a330ea76e13..0b511a01f06 100644
--- a/tests/baselines/reference/privacyTypeParametersOfInterface.js
+++ b/tests/baselines/reference/privacyTypeParametersOfInterface.js
@@ -60,6 +60,7 @@ interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
 
 //// [privacyTypeParametersOfInterface.js]
 "use strict";
+exports.__esModule = true;
 var privateClass = (function () {
     function privateClass() {
     }
diff --git a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js
index 7c92ed701d9..f7d107b5855 100644
--- a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js
+++ b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js
@@ -192,6 +192,7 @@ module privateModule {
 
 //// [privacyTypeParametersOfInterfaceDeclFile.js]
 "use strict";
+exports.__esModule = true;
 var privateClass = (function () {
     function privateClass() {
     }
diff --git a/tests/baselines/reference/privacyVar.js b/tests/baselines/reference/privacyVar.js
index 0d133743709..4c97d273c3e 100644
--- a/tests/baselines/reference/privacyVar.js
+++ b/tests/baselines/reference/privacyVar.js
@@ -176,6 +176,7 @@ export var glo_v24_public: glo_C2_private = new glo_C2_private(); // error
 
 //// [privacyVar.js]
 "use strict";
+exports.__esModule = true;
 var m1;
 (function (m1) {
     var C1_public = (function () {
diff --git a/tests/baselines/reference/privacyVarDeclFile.js b/tests/baselines/reference/privacyVarDeclFile.js
index 102aeea58a4..eab99747849 100644
--- a/tests/baselines/reference/privacyVarDeclFile.js
+++ b/tests/baselines/reference/privacyVarDeclFile.js
@@ -427,6 +427,7 @@ module publicModuleInGlobal {
 
 //// [privacyVarDeclFile_externalModule.js]
 "use strict";
+exports.__esModule = true;
 var privateClass = (function () {
     function privateClass() {
     }
diff --git a/tests/baselines/reference/privatePropertyUsingObjectType.js b/tests/baselines/reference/privatePropertyUsingObjectType.js
index 0c16d8bafff..65e2129a5fc 100644
--- a/tests/baselines/reference/privatePropertyUsingObjectType.js
+++ b/tests/baselines/reference/privatePropertyUsingObjectType.js
@@ -12,6 +12,7 @@ export interface IFilterProvider {
 //// [privatePropertyUsingObjectType.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var FilterManager = (function () {
         function FilterManager() {
         }
diff --git a/tests/baselines/reference/project/baseline/amd/decl.js b/tests/baselines/reference/project/baseline/amd/decl.js
index 2586bbb23bd..1e03f7745d2 100644
--- a/tests/baselines/reference/project/baseline/amd/decl.js
+++ b/tests/baselines/reference/project/baseline/amd/decl.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     ;
     function point(x, y) {
         return { x: x, y: y };
diff --git a/tests/baselines/reference/project/baseline/amd/emit.js b/tests/baselines/reference/project/baseline/amd/emit.js
index b66e5b6e6ba..b4d6d12445b 100644
--- a/tests/baselines/reference/project/baseline/amd/emit.js
+++ b/tests/baselines/reference/project/baseline/amd/emit.js
@@ -1,4 +1,5 @@
 define(["require", "exports", "./decl"], function (require, exports, g) {
     "use strict";
+    exports.__esModule = true;
     var p = g.point(10, 20);
 });
diff --git a/tests/baselines/reference/project/baseline/node/decl.js b/tests/baselines/reference/project/baseline/node/decl.js
index f6c19174e54..b7047c3f047 100644
--- a/tests/baselines/reference/project/baseline/node/decl.js
+++ b/tests/baselines/reference/project/baseline/node/decl.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 ;
 function point(x, y) {
     return { x: x, y: y };
diff --git a/tests/baselines/reference/project/baseline/node/emit.js b/tests/baselines/reference/project/baseline/node/emit.js
index b33f5d1b198..9410f82bc32 100644
--- a/tests/baselines/reference/project/baseline/node/emit.js
+++ b/tests/baselines/reference/project/baseline/node/emit.js
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 var g = require("./decl");
 var p = g.point(10, 20);
diff --git a/tests/baselines/reference/project/baseline2/amd/decl.js b/tests/baselines/reference/project/baseline2/amd/decl.js
index 2586bbb23bd..1e03f7745d2 100644
--- a/tests/baselines/reference/project/baseline2/amd/decl.js
+++ b/tests/baselines/reference/project/baseline2/amd/decl.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     ;
     function point(x, y) {
         return { x: x, y: y };
diff --git a/tests/baselines/reference/project/baseline2/amd/dont_emit.js b/tests/baselines/reference/project/baseline2/amd/dont_emit.js
index 523d596dca1..18dae0f6420 100644
--- a/tests/baselines/reference/project/baseline2/amd/dont_emit.js
+++ b/tests/baselines/reference/project/baseline2/amd/dont_emit.js
@@ -1,4 +1,5 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var p = { x: 10, y: 20 };
 });
diff --git a/tests/baselines/reference/project/baseline2/node/decl.js b/tests/baselines/reference/project/baseline2/node/decl.js
index f6c19174e54..b7047c3f047 100644
--- a/tests/baselines/reference/project/baseline2/node/decl.js
+++ b/tests/baselines/reference/project/baseline2/node/decl.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 ;
 function point(x, y) {
     return { x: x, y: y };
diff --git a/tests/baselines/reference/project/baseline2/node/dont_emit.js b/tests/baselines/reference/project/baseline2/node/dont_emit.js
index e5a1637efb1..ce766eee086 100644
--- a/tests/baselines/reference/project/baseline2/node/dont_emit.js
+++ b/tests/baselines/reference/project/baseline2/node/dont_emit.js
@@ -1,2 +1,3 @@
 "use strict";
+exports.__esModule = true;
 var p = { x: 10, y: 20 };
diff --git a/tests/baselines/reference/project/baseline3/amd/nestedModule.js b/tests/baselines/reference/project/baseline3/amd/nestedModule.js
index 36eb17665d6..c4f4e37489d 100644
--- a/tests/baselines/reference/project/baseline3/amd/nestedModule.js
+++ b/tests/baselines/reference/project/baseline3/amd/nestedModule.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var outer;
     (function (outer) {
         var inner;
diff --git a/tests/baselines/reference/project/baseline3/node/nestedModule.js b/tests/baselines/reference/project/baseline3/node/nestedModule.js
index 1d5c5c9d534..345fd8914cc 100644
--- a/tests/baselines/reference/project/baseline3/node/nestedModule.js
+++ b/tests/baselines/reference/project/baseline3/node/nestedModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var outer;
 (function (outer) {
     var inner;
diff --git a/tests/baselines/reference/project/declarationDir/amd/a.js b/tests/baselines/reference/project/declarationDir/amd/a.js
index 331c004bd67..4db463a7966 100644
--- a/tests/baselines/reference/project/declarationDir/amd/a.js
+++ b/tests/baselines/reference/project/declarationDir/amd/a.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
diff --git a/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js b/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js
index e2cdda8530b..bdae3c44b0a 100644
--- a/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js
+++ b/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
diff --git a/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js b/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js
index 212511f2bf5..ff657652a4a 100644
--- a/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js
+++ b/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C = (function () {
         function C() {
         }
diff --git a/tests/baselines/reference/project/declarationDir/node/a.js b/tests/baselines/reference/project/declarationDir/node/a.js
index 35f5adf27f0..2139e86c811 100644
--- a/tests/baselines/reference/project/declarationDir/node/a.js
+++ b/tests/baselines/reference/project/declarationDir/node/a.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
diff --git a/tests/baselines/reference/project/declarationDir/node/subfolder/b.js b/tests/baselines/reference/project/declarationDir/node/subfolder/b.js
index 7b46df97ac3..df27fec56d1 100644
--- a/tests/baselines/reference/project/declarationDir/node/subfolder/b.js
+++ b/tests/baselines/reference/project/declarationDir/node/subfolder/b.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
diff --git a/tests/baselines/reference/project/declarationDir/node/subfolder/c.js b/tests/baselines/reference/project/declarationDir/node/subfolder/c.js
index 65238579edc..385b6df7591 100644
--- a/tests/baselines/reference/project/declarationDir/node/subfolder/c.js
+++ b/tests/baselines/reference/project/declarationDir/node/subfolder/c.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/a.js b/tests/baselines/reference/project/declarationDir2/amd/out/a.js
index 331c004bd67..4db463a7966 100644
--- a/tests/baselines/reference/project/declarationDir2/amd/out/a.js
+++ b/tests/baselines/reference/project/declarationDir2/amd/out/a.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js
index e2cdda8530b..bdae3c44b0a 100644
--- a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js
+++ b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js
index 212511f2bf5..ff657652a4a 100644
--- a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js
+++ b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C = (function () {
         function C() {
         }
diff --git a/tests/baselines/reference/project/declarationDir2/node/out/a.js b/tests/baselines/reference/project/declarationDir2/node/out/a.js
index 35f5adf27f0..2139e86c811 100644
--- a/tests/baselines/reference/project/declarationDir2/node/out/a.js
+++ b/tests/baselines/reference/project/declarationDir2/node/out/a.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
diff --git a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js
index 7b46df97ac3..df27fec56d1 100644
--- a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js
+++ b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
diff --git a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js
index 65238579edc..385b6df7591 100644
--- a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js
+++ b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
diff --git a/tests/baselines/reference/project/declarationDir3/amd/out.js b/tests/baselines/reference/project/declarationDir3/amd/out.js
index 6c49867c908..b90d4415806 100644
--- a/tests/baselines/reference/project/declarationDir3/amd/out.js
+++ b/tests/baselines/reference/project/declarationDir3/amd/out.js
@@ -1,5 +1,6 @@
 define("subfolder/b", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
@@ -9,6 +10,7 @@ define("subfolder/b", ["require", "exports"], function (require, exports) {
 });
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
@@ -18,6 +20,7 @@ define("a", ["require", "exports"], function (require, exports) {
 });
 define("subfolder/c", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C = (function () {
         function C() {
         }
diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js
index bb607f4b5b0..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js
index 52ecf390373..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js
+++ b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js
index bb607f4b5b0..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js
index b9390ddc239..1610052986d 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "glo_m4"], function (require, exports, glo_m4) {
     "use strict";
+    exports.__esModule = true;
     exports.useGlo_m4_x4 = glo_m4.x;
     exports.useGlo_m4_d4 = glo_m4.d;
     exports.useGlo_m4_f4 = glo_m4.foo();
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js
index 52ecf390373..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js
index d9219f20148..b7ddd253b1a 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var glo_m4 = require("glo_m4");
 exports.useGlo_m4_x4 = glo_m4.x;
 exports.useGlo_m4_d4 = glo_m4.d;
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js
index bb607f4b5b0..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js
index a5da0ab9314..6ecb0c59793 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "private_m4"], function (require, exports, private_m4) {
     "use strict";
+    exports.__esModule = true;
     var usePrivate_m4_m1;
     (function (usePrivate_m4_m1) {
         var x3 = private_m4.x;
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js
index 52ecf390373..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js
index 3cc7f82feb7..79310d89c02 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 // only used privately no need to emit
 var private_m4 = require("private_m4");
 var usePrivate_m4_m1;
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js
index bb607f4b5b0..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js
index 7485d0fb229..c6c57dabc81 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js
@@ -1,4 +1,5 @@
 define(["require", "exports", "fncOnly_m4"], function (require, exports, fncOnly_m4) {
     "use strict";
+    exports.__esModule = true;
     exports.useFncOnly_m4_f4 = fncOnly_m4.foo();
 });
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js
index 52ecf390373..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js
index 095acfb7fc9..991afa567cf 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 var fncOnly_m4 = require("fncOnly_m4");
 exports.useFncOnly_m4_f4 = fncOnly_m4.foo();
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js
index bb607f4b5b0..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js
index 9e8ba0f7ade..1a0305591cc 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m4"], function (require, exports, m4) {
     "use strict";
+    exports.__esModule = true;
     function foo2() {
         return new m4.d();
     }
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js
index db9e68fbed9..6f962bd42e5 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m5"], function (require, exports, m5) {
     "use strict";
+    exports.__esModule = true;
     exports.d = m5.foo2();
     exports.x = m5.foo2;
     function n() {
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js
index 52ecf390373..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js
index a7e34c60fe3..db280e7fd8e 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m4 = require("m4"); // Emit used
 function foo2() {
     return new m4.d();
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js
index 2bde79432f7..7cc88b54ff3 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 // Do not emit unused import
 var m5 = require("m5");
 exports.d = m5.foo2();
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js
index bb607f4b5b0..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js
index 0ec3a0d8331..5375f44c013 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m4", "m4"], function (require, exports, m4, multiImport_m4) {
     "use strict";
+    exports.__esModule = true;
     exports.x4 = m4.x;
     exports.d4 = m4.d;
     exports.f4 = m4.foo();
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js
index 52ecf390373..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js
index 64b9438d96e..395cbeee966 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m4 = require("m4"); // Emit used
 exports.x4 = m4.x;
 exports.d4 = m4.d;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js
index bb607f4b5b0..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js
index 9e8ba0f7ade..1a0305591cc 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m4"], function (require, exports, m4) {
     "use strict";
+    exports.__esModule = true;
     function foo2() {
         return new m4.d();
     }
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js
index cc2eecd2208..b8a22cfdc1f 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m4", "m5"], function (require, exports, m4, m5) {
     "use strict";
+    exports.__esModule = true;
     exports.x4 = m4.x;
     exports.d4 = m4.d;
     exports.f4 = m4.foo();
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js
index 52ecf390373..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js
index a7e34c60fe3..db280e7fd8e 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m4 = require("m4"); // Emit used
 function foo2() {
     return new m4.d();
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js
index b4132f79b1f..49958bb9814 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m4 = require("m4"); // Emit used
 exports.x4 = m4.x;
 exports.d4 = m4.d;
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js
index bb607f4b5b0..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js
index 634a988c1b8..af5fcb7d874 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m4"], function (require, exports, m4) {
     "use strict";
+    exports.__esModule = true;
     exports.x4 = m4.x;
     exports.d4 = m4.d;
     exports.f4 = m4.foo();
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js
index 52ecf390373..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js
index 40df471507c..3a5602a2166 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m4 = require("m4"); // Emit used
 exports.x4 = m4.x;
 exports.d4 = m4.d;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
index 8b73fc550cf..6ec26abec8e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 define(["require", "exports", "angular2/core"], function (require, exports, ng) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var MyClass1 = (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
index 3c1d2cd6da6..274520bc752 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
index 8b73fc550cf..6ec26abec8e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 define(["require", "exports", "angular2/core"], function (require, exports, ng) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var MyClass1 = (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
index 3c1d2cd6da6..274520bc752 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
index 8b73fc550cf..6ec26abec8e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 define(["require", "exports", "angular2/core"], function (require, exports, ng) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var MyClass1 = (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
index 3c1d2cd6da6..274520bc752 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
index 8b73fc550cf..6ec26abec8e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 define(["require", "exports", "angular2/core"], function (require, exports, ng) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var MyClass1 = (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
index 3c1d2cd6da6..274520bc752 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
index 8b73fc550cf..6ec26abec8e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 define(["require", "exports", "angular2/core"], function (require, exports, ng) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var MyClass1 = (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
index 3c1d2cd6da6..274520bc752 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
index 2ccb7d6f77a..7eeee43049b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
index 891c03b13f2..c44e24a081e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
index b991eda4382..d393dda0c57 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
index 30f6e242bc8..436eab5db94 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 2ccb7d6f77a..7eeee43049b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index 891c03b13f2..c44e24a081e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index b991eda4382..d393dda0c57 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 30f6e242bc8..436eab5db94 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 3dd9960df14..1c199b7384a 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index dce282ee37f..df6d2c811c0 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index ccf78301cb1..749fbd732a5 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 1316ec74659..0c75dbb2b00 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 5db5f8f1bfb..b49f0a04b53 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
index d77e78e3751..c67e35d1b89 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
index b663057aeff..1935dadfdb3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 28136d8ffc3..8f88c077a44 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
index 550fa7b9564..fa9c5691047 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
index dd409b9f2c3..b3b4c42289f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
index 78b4b9fcfe1..80d6ba438ba 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
index 76a761b602d..dabe72d2787 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
index 7ad78d4877d..d28465d805e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
index f5f5dfcd793..6c7d26906a4 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
index 033b046cfe0..46d82346a37 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
index 6ba04afda9e..3813e4b2cca 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index b663057aeff..1935dadfdb3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 28136d8ffc3..8f88c077a44 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index 550fa7b9564..fa9c5691047 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index dd409b9f2c3..b3b4c42289f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index d77e78e3751..c67e35d1b89 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 5db5f8f1bfb..b49f0a04b53 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 7ad78d4877d..d28465d805e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index f5f5dfcd793..6c7d26906a4 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 033b046cfe0..46d82346a37 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index 6ba04afda9e..3813e4b2cca 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 76a761b602d..dabe72d2787 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 78b4b9fcfe1..80d6ba438ba 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 29bc22bd61c..371d873f345 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -30,6 +32,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index d9151baabe4..783691c52ed 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
index 3017cac2b88..1f3b6d7a6dc 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
index 43b1caa625e..16e1f512923 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
index 81972e29958..a112cba6d0e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
index ba491a3c6fa..f1777998477 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
index efdf4bd9a30..a6a299a8a7e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
index 02f7bbcbb67..d16575e8a97 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js
index 5bc656a7470..94e4facb645 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
index 766ff607b54..47915c9660b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 3017cac2b88..1f3b6d7a6dc 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 43b1caa625e..16e1f512923 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index 81972e29958..a112cba6d0e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index ba491a3c6fa..f1777998477 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index efdf4bd9a30..a6a299a8a7e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 02f7bbcbb67..d16575e8a97 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 5bc656a7470..94e4facb645 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 766ff607b54..47915c9660b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index d3a752a0ee4..c5e2f0c04bf 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("m1", ["require", "exports"], function (require, exports) {
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index a910ecda80e..293a1478989 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
index 13158547401..8359b4472ee 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
index a6d24f0f020..9cef03b0711 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
index cc32d33f88f..32cd3e8915e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
index ba491a3c6fa..f1777998477 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
index 80d76037a7f..39f0b136568 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
index a23c1871126..de654530492 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
index 69051eba247..61925246a0e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
index a758d2a1cd0..4a1329681e8 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 13158547401..8359b4472ee 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index a6d24f0f020..9cef03b0711 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index cc32d33f88f..32cd3e8915e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index ba491a3c6fa..f1777998477 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 80d76037a7f..39f0b136568 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index a23c1871126..de654530492 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 69051eba247..61925246a0e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index a758d2a1cd0..4a1329681e8 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index d20feb624ba..11d40e4d23b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index a3532b9e4ce..61dfeeeb8d3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
index d0a6c1f583f..c467f0b8be0 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
index 0dab1514706..7c959ab9408 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
index b5c226692a0..d43267b1c9a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
index 14104ec68b9..15c5c91190e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 961737d6acf..9a46a37deb8 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index 0dab1514706..7c959ab9408 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index d078a80e31c..727afdc29fd 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 14104ec68b9..15c5c91190e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 043adb3dd6f..2a89c0fc929 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index d8fff48f73e..0b7f01fdec5 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index b40b056b6d9..62af54d3700 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index bb9e992d471..d4bfc447280 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 4f51d470c82..59de6353786 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
index bbbb972580d..6cf63b567ba 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
index 7ecd677009d..2a191801c43 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
index ee8a26cafcf..301f83dab55 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js
index b40eb0dad12..2dcea15d050 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
index e60e0fbfa7a..6c74ce312be 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
index 3c653ded700..97b03befa22 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
index 338d724fe93..28edf754650 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
index 112ae7e7062..9a8f5b77498 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
index 5f97087307d..bd9b5d0051a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js
index 2786dcd54f3..603b29da7fa 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
index 8c64bacf533..3821a46478a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 4d721e1be5d..4090486a730 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index ee8a26cafcf..301f83dab55 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index 6c23883b7ab..f637a581e13 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index e60e0fbfa7a..6c74ce312be 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index a654db8e087..fa97d15a89a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 4f51d470c82..59de6353786 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index a1d86ff1857..8de8d6f84b6 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 5f97087307d..bd9b5d0051a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 76f1ae7fa80..ca070c2062f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index 8c64bacf533..3821a46478a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index a98ecd6f1c3..6ce6e73202e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 3c653ded700..97b03befa22 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 01c28031d8a..e4a7bb40897 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -30,6 +32,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index ae1d6457599..83050ce43fe 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_module_multifolder/ref/m1.ts","../projects/outputdir_module_multifolder_ref/m2.ts","../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_module_multifolder/ref/m1.ts","../projects/outputdir_module_multifolder_ref/m2.ts","../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js
index 826510699a7..b890ae8232a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
index 611b73c5c7d..df737e96f26 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js
index f6ab0afdc94..2cbff5fc156 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
index a6d5cebe7f1..84f19710abc 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js
index 123e89b6c81..a0cc81f5af9 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
index 733fa0fc069..ea360554f92 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js
index d96b6cae463..2cce36f74c2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map
index 86cfbeb5b63..e395bf8648f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 415eb731ee6..f5001a6551e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 611b73c5c7d..df737e96f26 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index 88661b25d1d..2fb4fbfd5c3 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index a6d5cebe7f1..84f19710abc 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 4c96696726b..0110f9dce16 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 733fa0fc069..ea360554f92 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 2e487817c4e..4849c53d0c4 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 86cfbeb5b63..e395bf8648f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 1e43585f281..587721fb87a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("m1", ["require", "exports"], function (require, exports) {
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 3542da2fe04..5e9e5c8593d 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts","../outputdir_module_simple/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts","../outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
index d7fc22ee9b3..b99a41c8c3c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
index dbfe0b5d927..dcfdb34145e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js
index a9c2e2c5462..c4c2a04f642 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
index a8d6293492c..2df46e6835c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
index 4423220831b..9574bd33b83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
index 172c4d4804a..44556b78663 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js
index 291a3630b3e..4ac58aea856 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
index ef62267d957..47558364d4b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 447f2cb756d..2885a499091 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index dbfe0b5d927..dcfdb34145e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index bd2c181d29e..0ee63c42070 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index a8d6293492c..2df46e6835c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index b4b9b2dc7e0..fa9502d4d64 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index 172c4d4804a..44556b78663 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index c162eaa3671..cabfd9f98d6 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index ef62267d957..47558364d4b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 23442cdbfa6..d6d12689721 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 3096c610237..aa198a56dbe 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/ref/m1.ts","../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/ref/m1.ts","../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
index 70911579465..f373c246d48 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
index c657ed8edce..4d37c4456a3 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js
index e4c76ba72e2..9557c3a613c 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
index 56f12c22903..6ba684e3841 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 70911579465..f373c246d48 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index c657ed8edce..4d37c4456a3 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index e4c76ba72e2..9557c3a613c 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 56f12c22903..6ba684e3841 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index b1f7d5f7329..d9f0f5b1531 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index eececdeabfd..e84545ade77 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 2cf202bd871..cc3f604524f 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 4bdde308824..e115b1ebd64 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 3c1c9b64dc2..0b4d12cead1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
index 1e006b165b9..f6057bf162a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
index 2141ed5cbb8..196a531920b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 9bdc7ad5504..fa0bcf94a5d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js
index 149e213901a..b4a0aa2d25d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map
index 3a4d618044a..6a2bfc777e9 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
index 4103e499cbd..29b98b193fb 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js
index 2e93a073415..9324632b44a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js
index 651782fa421..f5901795832 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
index 49f97b88a38..f4de6b06e49 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js
index 99135b7b275..e8734ca6d27 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map
index 830a0ddd3e5..842d34fe73d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 2141ed5cbb8..196a531920b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 9bdc7ad5504..fa0bcf94a5d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index 149e213901a..b4a0aa2d25d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 3a4d618044a..6a2bfc777e9 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1e006b165b9..f6057bf162a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 3c1c9b64dc2..0b4d12cead1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 651782fa421..f5901795832 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 49f97b88a38..f4de6b06e49 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 99135b7b275..e8734ca6d27 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index 830a0ddd3e5..842d34fe73d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 2e93a073415..9324632b44a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 4103e499cbd..29b98b193fb 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 99da107dfa8..1ea95ed9ba0 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -30,6 +32,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index 6b934e00e04..cd6a7fab377 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js
index b85ad9ab5b1..fc2d3408b2b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map
index eceec7b450a..f0cb61b0632 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js
index c3300bc7998..1e0dea14dc8 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map
index d68dbf6eb9e..ed2f67c585b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js
index 9e79b0167c6..8a7e9f1069e 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map
index b9de639cb1d..da3b77ba146 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js
index 29b6fee1d66..d7e6d673340 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map
index 826729aba87..f4d0ecfe24b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index b85ad9ab5b1..fc2d3408b2b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index eceec7b450a..f0cb61b0632 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index c3300bc7998..1e0dea14dc8 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index d68dbf6eb9e..ed2f67c585b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 9e79b0167c6..8a7e9f1069e 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index b9de639cb1d..da3b77ba146 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 29b6fee1d66..d7e6d673340 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 826729aba87..f4d0ecfe24b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 4b21632bd6c..d19b9195685 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("m1", ["require", "exports"], function (require, exports) {
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 5396cab1d7c..ba2950b1a5e 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts","file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts","file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
index c3d36f22356..5aa59f6dc92 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 755cc1d0aaf..2f6470b65ff 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js
index 5ec4a043557..d56cdf72bf2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map
index 957a73c648a..a88a706d9b1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js
index 8fe6d174601..b4abab78e9a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
index f7e43883048..5b58a2ee571 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js
index 0b258a0b620..6bc25238dac 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map
index 8baefdad92b..d4034d62c4a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index c3d36f22356..5aa59f6dc92 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 755cc1d0aaf..2f6470b65ff 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 5ec4a043557..d56cdf72bf2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 957a73c648a..a88a706d9b1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 8fe6d174601..b4abab78e9a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index f7e43883048..5b58a2ee571 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 0b258a0b620..6bc25238dac 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 8baefdad92b..d4034d62c4a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index a58fc69531f..63e58be27dc 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 308dbbfaa67..12f2439e6f5 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
index 70911579465..f373c246d48 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
index a1c9985be48..85be78ed9b4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
index e4c76ba72e2..9557c3a613c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
index 9ccd44f3a01..e7ecba5fc92 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 70911579465..f373c246d48 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index a1c9985be48..85be78ed9b4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index e4c76ba72e2..9557c3a613c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 9ccd44f3a01..e7ecba5fc92 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index b1f7d5f7329..d9f0f5b1531 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 26353fdf396..92315bfcacc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 2cf202bd871..cc3f604524f 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index ec57587014d..c98b66faded 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 59ebd34cfe3..e8fba0d4b55 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
index 1e006b165b9..f6057bf162a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
index 2141ed5cbb8..196a531920b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 9afdf343f77..8087b94c0c3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js
index 149e213901a..b4a0aa2d25d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
index 5000f3a49b9..a8f0695ded3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
index 866e1007e24..50a28887d0b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
index 2e93a073415..9324632b44a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
index 651782fa421..f5901795832 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
index 0f5e28ddbf7..56a4f46ae00 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js
index 99135b7b275..e8734ca6d27 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
index a39cd29ba77..6ad9ecad595 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 2141ed5cbb8..196a531920b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 9afdf343f77..8087b94c0c3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index 149e213901a..b4a0aa2d25d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 5000f3a49b9..a8f0695ded3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1e006b165b9..f6057bf162a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 59ebd34cfe3..e8fba0d4b55 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 651782fa421..f5901795832 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 0f5e28ddbf7..56a4f46ae00 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 99135b7b275..e8734ca6d27 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index a39cd29ba77..6ad9ecad595 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 2e93a073415..9324632b44a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 866e1007e24..50a28887d0b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 99da107dfa8..1ea95ed9ba0 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -30,6 +32,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index c4facdba936..5d14898713d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js
index b85ad9ab5b1..fc2d3408b2b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
index 1706ba76817..caee4b20553 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js
index c3300bc7998..1e0dea14dc8 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js
index 9e79b0167c6..8a7e9f1069e 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
index d134ab774af..fa989919301 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js
index 29b6fee1d66..d7e6d673340 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map
index d07c1aa0678..1ec67278ba3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index b85ad9ab5b1..fc2d3408b2b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 1706ba76817..caee4b20553 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index c3300bc7998..1e0dea14dc8 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 9e79b0167c6..8a7e9f1069e 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index d134ab774af..fa989919301 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 29b6fee1d66..d7e6d673340 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index d07c1aa0678..1ec67278ba3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 4b21632bd6c..d19b9195685 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("m1", ["require", "exports"], function (require, exports) {
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 64c90d05e88..f5849debd83 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
index c3d36f22356..5aa59f6dc92 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 7e2762b41a4..15b12e3a189 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js
index 5ec4a043557..d56cdf72bf2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
index 8fe6d174601..b4abab78e9a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
index eb883275568..6e97669732b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js
index 0b258a0b620..6bc25238dac 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
index 4f024886c03..badcd2b1b9c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index c3d36f22356..5aa59f6dc92 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 7e2762b41a4..15b12e3a189 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 5ec4a043557..d56cdf72bf2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 8fe6d174601..b4abab78e9a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index eb883275568..6e97669732b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 0b258a0b620..6bc25238dac 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 4f024886c03..badcd2b1b9c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index a58fc69531f..63e58be27dc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 6d26d850e19..6f4defc3e4c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
index 5b8a451c781..65e3b33be1a 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     m1.f1("test");
     m1.f2.a = 10;
     m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). 
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
index 59944c663e9..4fc36cd0222 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 m1.f1("test");
 m1.f2.a = 10;
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js
index 5a3916f07d1..493e1b9636e 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     m1.f1("test");
     m1.f2.a = "10"; // Error: Should be number
     m1.rel = 42; // Error: Should be boolean
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js
index fb4faf236b2..51370836837 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 m1.f1("test");
 m1.f2.a = "10"; // Error: Should be number
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
index 9ef3915c851..948a6d68b83 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1", "m4"], function (require, exports, m1, m4) {
     "use strict";
+    exports.__esModule = true;
     m1.f1("test");
     m1.f2.a = 10;
     m1.f2.person.age = "10"; // Should error if loaded the .js files correctly
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
index f6783cda79b..50feab5d27f 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 var m4 = require("m4");
 m1.f1("test");
diff --git a/tests/baselines/reference/project/nonRelative/amd/consume.js b/tests/baselines/reference/project/nonRelative/amd/consume.js
index 08e0b38c7df..a6bce0ab2c6 100644
--- a/tests/baselines/reference/project/nonRelative/amd/consume.js
+++ b/tests/baselines/reference/project/nonRelative/amd/consume.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "decl", "lib/foo/a", "lib/bar/a"], function (require, exports, mod, x, y) {
     "use strict";
+    exports.__esModule = true;
     x.hello();
     y.hello();
     var str = mod.call();
diff --git a/tests/baselines/reference/project/nonRelative/amd/decl.js b/tests/baselines/reference/project/nonRelative/amd/decl.js
index f2dbc101a52..d22c3ced24e 100644
--- a/tests/baselines/reference/project/nonRelative/amd/decl.js
+++ b/tests/baselines/reference/project/nonRelative/amd/decl.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function call() {
         return "success";
     }
diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js
index a8619f88260..b92af88609d 100644
--- a/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js
+++ b/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function hello() { }
     exports.hello = hello;
 });
diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js
index a8619f88260..b92af88609d 100644
--- a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js
+++ b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function hello() { }
     exports.hello = hello;
 });
diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js
index a8619f88260..b92af88609d 100644
--- a/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js
+++ b/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function hello() { }
     exports.hello = hello;
 });
diff --git a/tests/baselines/reference/project/nonRelative/node/consume.js b/tests/baselines/reference/project/nonRelative/node/consume.js
index 35d658abb62..51d811bb72a 100644
--- a/tests/baselines/reference/project/nonRelative/node/consume.js
+++ b/tests/baselines/reference/project/nonRelative/node/consume.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var mod = require("decl");
 var x = require("lib/foo/a");
 var y = require("lib/bar/a");
diff --git a/tests/baselines/reference/project/nonRelative/node/decl.js b/tests/baselines/reference/project/nonRelative/node/decl.js
index e2d4b03d1c1..7cde1400c60 100644
--- a/tests/baselines/reference/project/nonRelative/node/decl.js
+++ b/tests/baselines/reference/project/nonRelative/node/decl.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 function call() {
     return "success";
 }
diff --git a/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js
index 182e381bcde..c83848543b2 100644
--- a/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js
+++ b/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 function hello() { }
 exports.hello = hello;
diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js
index 182e381bcde..c83848543b2 100644
--- a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js
+++ b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 function hello() { }
 exports.hello = hello;
diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js
index 182e381bcde..c83848543b2 100644
--- a/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js
+++ b/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 function hello() { }
 exports.hello = hello;
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js
index 125abe99f0e..257b2bbaa8f 100644
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js
index 9fdf5b0ad0f..7a90183baf3 100644
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 125abe99f0e..257b2bbaa8f 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 9fdf5b0ad0f..7a90183baf3 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 7898180c050..ef652b9e929 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 7898180c050..ef652b9e929 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js
index 125abe99f0e..257b2bbaa8f 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js
index 34936dca125..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js
index ddda2e19133..fb9329a59b4 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js
index 9fdf5b0ad0f..7a90183baf3 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js
index 5854acba9e2..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js
index 77e6fbe68c1..18fccdca8bb 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 34936dca125..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index ddda2e19133..fb9329a59b4 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 125abe99f0e..257b2bbaa8f 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 5854acba9e2..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 77e6fbe68c1..18fccdca8bb 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 9fdf5b0ad0f..7a90183baf3 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index ea6ae0a3cd7..adb1b5061b5 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -30,6 +32,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js
index 34936dca125..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js
index cd107bb32f2..c062c0ac6d4 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js
index 5854acba9e2..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js
index 912480b74ce..2e50e0b7989 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 34936dca125..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index cd107bb32f2..c062c0ac6d4 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 5854acba9e2..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 912480b74ce..2e50e0b7989 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 04f9d32831e..0a1f6b523c9 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("m1", ["require", "exports"], function (require, exports) {
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js
index 34936dca125..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js
index 67c8fedf898..0fdf8d91b32 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js
index 5854acba9e2..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js
index 0dea10818b9..33f201ce9d5 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 34936dca125..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 67c8fedf898..0fdf8d91b32 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 5854acba9e2..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 0dea10818b9..33f201ce9d5 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 05ee275fc15..2ddfb9277a3 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
index 41f4a4e2521..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
index e9a80c428b2..67693560dfc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
index eae1115846a..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
index 9f1206b5b14..d188f8a16bd 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 41f4a4e2521..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index e9a80c428b2..67693560dfc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index eae1115846a..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 9f1206b5b14..d188f8a16bd 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 25cfe0fccb5..f070fff6f1c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 650c9d1e5d5..3520f3c0a5f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index de21b030c35..3e02cc09fcb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 6113c44d85d..ed2de159383 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
index ab7082a2e8e..bed0bf9b3e2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
index 41f4a4e2521..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 6bebdd113b6..616307fc2aa 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
index efa0bc948ed..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
index 21c996978fd..ac1540d3d7c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
index 06c30f32eaf..4281eb94fe5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
index eae1115846a..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
index b757263c866..20f34963221 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
index 84731dff566..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
index b123ccf13c8..e794023608c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 6bebdd113b6..616307fc2aa 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index efa0bc948ed..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 21c996978fd..ac1540d3d7c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 41f4a4e2521..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index ab7082a2e8e..bed0bf9b3e2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index b757263c866..20f34963221 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 84731dff566..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index b123ccf13c8..e794023608c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index eae1115846a..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 06c30f32eaf..4281eb94fe5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 37064fb583b..b77e0a462a7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -30,6 +32,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index baeea1e93dc..5970dfad43e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
index ffc39be8044..101e0b07546 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
index c4b7f56d76a..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
index 6366b8c2d85..5194b89b4a5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
index 04bd4e10a3b..6316b37945c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js
index fea4b619aa2..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
index 9dc457a0167..ec26fbe336a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index ffc39be8044..101e0b07546 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index c4b7f56d76a..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 6366b8c2d85..5194b89b4a5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 04bd4e10a3b..6316b37945c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index fea4b619aa2..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 9dc457a0167..ec26fbe336a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index d650b20ae5f..cbe79e3318b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("m1", ["require", "exports"], function (require, exports) {
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index aa0c2ca28b2..64a56e71714 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
index cd798e72d89..a8d5da3a201 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
index 0ad51aeb02e..c95451ac730 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
index 6738a871942..1628374eef4 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
index 81d64320d78..f43884731e0 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
index ebd5fdb3b3f..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
index b2ea9133dfc..649377c06fc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index cd798e72d89..a8d5da3a201 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 0ad51aeb02e..c95451ac730 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 6738a871942..1628374eef4 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index 81d64320d78..f43884731e0 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index ebd5fdb3b3f..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index b2ea9133dfc..649377c06fc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index f55492f4b49..22a9cf7b4d7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 27b41a837a9..bbf9b58c64f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
index 41f4a4e2521..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
index 560075530f1..d65693aee66 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
index eae1115846a..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
index 27abb47a45b..5d1100e38fa 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 41f4a4e2521..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index 560075530f1..d65693aee66 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index eae1115846a..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 27abb47a45b..5d1100e38fa 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 25cfe0fccb5..f070fff6f1c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 9a9586bd20d..544b444f69a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index de21b030c35..3e02cc09fcb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 16e3437b61c..39cc19f0b09 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 6b4ece94c15..7571615de41 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
index 41f4a4e2521..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 8271bf25be1..ad01eacc00c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js
index efa0bc948ed..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
index 8be239f3553..343b30f743a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
index c7ae549832a..a7121ab0fb4 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
index eae1115846a..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
index 37adc61e54f..ddd49759374 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js
index 84731dff566..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
index 79b428ca3a1..34026638960 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 8271bf25be1..ad01eacc00c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index efa0bc948ed..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 8be239f3553..343b30f743a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 41f4a4e2521..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 6b4ece94c15..7571615de41 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 37adc61e54f..ddd49759374 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 84731dff566..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index 79b428ca3a1..34026638960 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index eae1115846a..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index c7ae549832a..a7121ab0fb4 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 37064fb583b..b77e0a462a7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -30,6 +32,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index 4d37f7bfbf5..12697408ddd 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
index 29c8533aded..f9a2fd1d740 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js
index c4b7f56d76a..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
index d713f6b7f5e..17545cd729c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
index 8086d9c04da..70db4f7545c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js
index fea4b619aa2..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map
index 0d24a0e332a..0e6c49a9aec 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 29c8533aded..f9a2fd1d740 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index c4b7f56d76a..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index d713f6b7f5e..17545cd729c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 8086d9c04da..70db4f7545c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index fea4b619aa2..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 0d24a0e332a..0e6c49a9aec 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index d650b20ae5f..cbe79e3318b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("m1", ["require", "exports"], function (require, exports) {
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 7e83d4cd269..1132db08bd0 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 91793ab1002..07643a2c9dc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js
index 0ad51aeb02e..c95451ac730 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
index d713f6b7f5e..17545cd729c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
index 00e388b171e..a9e9284e21d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js
index ebd5fdb3b3f..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
index 07178ab519f..9b21b166c37 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 91793ab1002..07643a2c9dc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 0ad51aeb02e..c95451ac730 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index d713f6b7f5e..17545cd729c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index 00e388b171e..a9e9284e21d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index ebd5fdb3b3f..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 07178ab519f..9b21b166c37 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index f55492f4b49..22a9cf7b4d7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 223d2cfdad3..5121f5c6a1e 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js
index 41f4a4e2521..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map
index c4bc3c32708..a7a1fecb87f 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js
index eae1115846a..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map
index 208dd329040..ba1b40abf87 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 41f4a4e2521..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index c0b56df8d90..35edbb3cd9c 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index eae1115846a..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 5e34d4494dd..3c66628ccf7 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 25cfe0fccb5..f070fff6f1c 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index dce282ee37f..df6d2c811c0 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index de21b030c35..3e02cc09fcb 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 1316ec74659..0c75dbb2b00 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map
index c4bc3c32708..a7a1fecb87f 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js
index 41f4a4e2521..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map
index dcdf5faf897..fb3dc7e5f1a 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js
index efa0bc948ed..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map
index 096386e968d..99618a3d6a7 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map
index 208dd329040..ba1b40abf87 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js
index eae1115846a..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map
index 87fa414a454..5660dd85010 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js
index 84731dff566..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map
index a9dba1be1dd..308a0083438 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 2293c1a7c96..8ba69854427 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index efa0bc948ed..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index d21a585cc41..1179d812037 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 41f4a4e2521..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 5d8cf325d52..14fbdd65f4f 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 49bb95f32d5..a42c40521a1 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 84731dff566..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index a48d929a860..86d72e20c93 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index eae1115846a..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index b9e5ddb335f..18103b0a8b1 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 37064fb583b..b77e0a462a7 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -30,6 +32,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index d9151baabe4..783691c52ed 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map
index dcdf5faf897..fb3dc7e5f1a 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js
index c4b7f56d76a..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map
index 9a899efce64..80722609800 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map
index 87fa414a454..5660dd85010 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js
index fea4b619aa2..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map
index 57b2f0a9935..90f1d966b1c 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 128c9957bf4..2eb15ca540b 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index c4b7f56d76a..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 50263c64897..742f4f4a9af 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 40d0111893e..c819ff2c52c 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index fea4b619aa2..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index cc2b2e9b918..b94230beb69 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
index d650b20ae5f..cbe79e3318b 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("m1", ["require", "exports"], function (require, exports) {
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index a910ecda80e..293a1478989 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map
index dcdf5faf897..fb3dc7e5f1a 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js
index 0ad51aeb02e..c95451ac730 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map
index 9a899efce64..80722609800 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map
index 87fa414a454..5660dd85010 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js
index ebd5fdb3b3f..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map
index 6f71fb82f4c..6f61cbbee19 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 28136d8ffc3..8f88c077a44 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 0ad51aeb02e..c95451ac730 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 50263c64897..742f4f4a9af 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index f5f5dfcd793..6c7d26906a4 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index ebd5fdb3b3f..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 9c9d3ffec92..ab37fc26b40 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index f55492f4b49..22a9cf7b4d7 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index a3532b9e4ce..61dfeeeb8d3 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
index 41f4a4e2521..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
index a1c9985be48..85be78ed9b4 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
index eae1115846a..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
index 9ccd44f3a01..e7ecba5fc92 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 41f4a4e2521..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index a1c9985be48..85be78ed9b4 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index eae1115846a..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 9ccd44f3a01..e7ecba5fc92 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 25cfe0fccb5..f070fff6f1c 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 26353fdf396..92315bfcacc 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index de21b030c35..3e02cc09fcb 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index ec57587014d..c98b66faded 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 59ebd34cfe3..e8fba0d4b55 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
index 41f4a4e2521..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 9afdf343f77..8087b94c0c3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js
index efa0bc948ed..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
index 5000f3a49b9..a8f0695ded3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
index 866e1007e24..50a28887d0b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
index eae1115846a..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
index 0f5e28ddbf7..56a4f46ae00 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js
index 84731dff566..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
index a39cd29ba77..6ad9ecad595 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 9afdf343f77..8087b94c0c3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index efa0bc948ed..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 5000f3a49b9..a8f0695ded3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 41f4a4e2521..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 59ebd34cfe3..e8fba0d4b55 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 0f5e28ddbf7..56a4f46ae00 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 84731dff566..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index a39cd29ba77..6ad9ecad595 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index eae1115846a..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 866e1007e24..50a28887d0b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 37064fb583b..b77e0a462a7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -30,6 +32,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index c4facdba936..5d14898713d 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
index 1706ba76817..caee4b20553 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js
index c4b7f56d76a..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
index d134ab774af..fa989919301 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js
index fea4b619aa2..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map
index d07c1aa0678..1ec67278ba3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 1706ba76817..caee4b20553 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index c4b7f56d76a..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index d134ab774af..fa989919301 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index fea4b619aa2..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index d07c1aa0678..1ec67278ba3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
index d650b20ae5f..cbe79e3318b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("m1", ["require", "exports"], function (require, exports) {
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 64c90d05e88..f5849debd83 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 7e2762b41a4..15b12e3a189 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js
index 0ad51aeb02e..c95451ac730 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
index eb883275568..6e97669732b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js
index ebd5fdb3b3f..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
index 4f024886c03..badcd2b1b9c 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index bb59c6fbd90..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 7e2762b41a4..15b12e3a189 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 0ad51aeb02e..c95451ac730 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 121a089af23..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index eb883275568..6e97669732b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index ebd5fdb3b3f..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 4f024886c03..badcd2b1b9c 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index f55492f4b49..22a9cf7b4d7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -15,6 +16,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 6d26d850e19..6f4defc3e4c 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js
index 3053eb35cb4..eb08364649a 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js
@@ -1,3 +1,4 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js
index a40f7b2f9cd..66facecde7f 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var RM = (function () {
         function RM() {
         }
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/server.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/server.js
index 3053eb35cb4..eb08364649a 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/server.js
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/server.js
@@ -1,3 +1,4 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js
index 0c14aab22f7..64cbe53a861 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js
@@ -1 +1,2 @@
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js
index c537ef54352..221c2322227 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var RM = (function () {
     function RM() {
     }
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/server.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/server.js
index 0c14aab22f7..64cbe53a861 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/server.js
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/server.js
@@ -1 +1,2 @@
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js
index f62acb89dfd..457f929fe62 100644
--- a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js
+++ b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js
@@ -31,6 +31,7 @@ var y: Foo2;
 //// [propertyIdentityWithPrivacyMismatch_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x;
     var x; // Should be error (mod1.Foo !== mod2.Foo)
     var Foo1 = (function () {
diff --git a/tests/baselines/reference/protoAsIndexInIndexExpression.js b/tests/baselines/reference/protoAsIndexInIndexExpression.js
index 2c9b0f7a7c7..7805cebbee3 100644
--- a/tests/baselines/reference/protoAsIndexInIndexExpression.js
+++ b/tests/baselines/reference/protoAsIndexInIndexExpression.js
@@ -21,6 +21,7 @@ class C {
 
 //// [protoAsIndexInIndexExpression_0.js]
 "use strict";
+exports.__esModule = true;
 //// [protoAsIndexInIndexExpression_1.js]
 ///<reference path='protoAsIndexInIndexExpression_0.ts'/>
 var EntityPrototype = undefined;
diff --git a/tests/baselines/reference/reExportDefaultExport.js b/tests/baselines/reference/reExportDefaultExport.js
index da50a3a7115..cd306e411d5 100644
--- a/tests/baselines/reference/reExportDefaultExport.js
+++ b/tests/baselines/reference/reExportDefaultExport.js
@@ -16,13 +16,14 @@ foo();
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function f() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f;
 exports.f = f;
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("./m1");
 var m1_2 = require("./m1");
 m1_2.f();
diff --git a/tests/baselines/reference/reExportGlobalDeclaration1.js b/tests/baselines/reference/reExportGlobalDeclaration1.js
index c0db9a0eaf3..9ab432fd084 100644
--- a/tests/baselines/reference/reExportGlobalDeclaration1.js
+++ b/tests/baselines/reference/reExportGlobalDeclaration1.js
@@ -22,3 +22,4 @@ export {b as b2};
 
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/reExportGlobalDeclaration2.js b/tests/baselines/reference/reExportGlobalDeclaration2.js
index 160a9b28f54..52e55bb18c4 100644
--- a/tests/baselines/reference/reExportGlobalDeclaration2.js
+++ b/tests/baselines/reference/reExportGlobalDeclaration2.js
@@ -18,3 +18,4 @@ export {I2 as III2};
 
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/reExportGlobalDeclaration3.js b/tests/baselines/reference/reExportGlobalDeclaration3.js
index e1b85b6b8d5..ed111b42197 100644
--- a/tests/baselines/reference/reExportGlobalDeclaration3.js
+++ b/tests/baselines/reference/reExportGlobalDeclaration3.js
@@ -18,3 +18,4 @@ export {NS2 as NNNS2};
 
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/reExportGlobalDeclaration4.js b/tests/baselines/reference/reExportGlobalDeclaration4.js
index 09d6b760790..a7a0e7525ca 100644
--- a/tests/baselines/reference/reExportGlobalDeclaration4.js
+++ b/tests/baselines/reference/reExportGlobalDeclaration4.js
@@ -18,3 +18,4 @@ export {Cls2 as CCCls2};
 
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/reExportUndefined1.js b/tests/baselines/reference/reExportUndefined1.js
index 94729e4f544..7540901fa30 100644
--- a/tests/baselines/reference/reExportUndefined1.js
+++ b/tests/baselines/reference/reExportUndefined1.js
@@ -4,3 +4,4 @@ export { undefined };
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/reExportUndefined2.js b/tests/baselines/reference/reExportUndefined2.js
index 53b78599cbe..bde88442b33 100644
--- a/tests/baselines/reference/reExportUndefined2.js
+++ b/tests/baselines/reference/reExportUndefined2.js
@@ -12,9 +12,11 @@ use(undefined);
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var undefined;
 exports.undefined = undefined;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var a_1 = require("./a");
 use(a_1.undefined);
diff --git a/tests/baselines/reference/reactNamespaceImportPresevation.js b/tests/baselines/reference/reactNamespaceImportPresevation.js
index 5c44674d031..682dd0f7882 100644
--- a/tests/baselines/reference/reactNamespaceImportPresevation.js
+++ b/tests/baselines/reference/reactNamespaceImportPresevation.js
@@ -16,5 +16,6 @@ declare var foo: any;
 
 //// [test.jsx]
 "use strict";
+exports.__esModule = true;
 var myReactLib = require("my-React-Lib"); // should not be elided
 <foo data/>;
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
index d759bc2f296..87ef9fe8671 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
@@ -29,4 +29,5 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType1_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
index 7704b38f68d..c38c38ea325 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
@@ -33,4 +33,5 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType2_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
index a46be3bdafc..178d8b3b3ee 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
@@ -37,4 +37,5 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType3_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js
index 8ccd6ecf560..893c4ec990f 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js
@@ -31,4 +31,5 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType4_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js
index 4602ed554e5..39cb223d1a0 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js
@@ -40,4 +40,5 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType5_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js
index d3487519218..d8541df0c2c 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js
@@ -49,4 +49,5 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js
index 9a29c2bf949..01f818d5bb2 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js
@@ -51,4 +51,5 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/recursiveMods.js b/tests/baselines/reference/recursiveMods.js
index 6f8304df658..3c41bed5e62 100644
--- a/tests/baselines/reference/recursiveMods.js
+++ b/tests/baselines/reference/recursiveMods.js
@@ -26,6 +26,7 @@ export module Foo {
 
 //// [recursiveMods.js]
 "use strict";
+exports.__esModule = true;
 var Foo;
 (function (Foo) {
     var C = (function () {
diff --git a/tests/baselines/reference/reexportClassDefinition.js b/tests/baselines/reference/reexportClassDefinition.js
index 0242a57d4f5..aae728c9e25 100644
--- a/tests/baselines/reference/reexportClassDefinition.js
+++ b/tests/baselines/reference/reexportClassDefinition.js
@@ -43,6 +43,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var foo2 = require("./foo2");
 var x = (function (_super) {
     __extends(x, _super);
diff --git a/tests/baselines/reference/relativeNamesInClassicResolution.js b/tests/baselines/reference/relativeNamesInClassicResolution.js
index a6c5a06ea3d..cf43ec2a5ca 100644
--- a/tests/baselines/reference/relativeNamesInClassicResolution.js
+++ b/tests/baselines/reference/relativeNamesInClassicResolution.js
@@ -10,9 +10,11 @@ export let x = 1;
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [b.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.x = 1;
 });
diff --git a/tests/baselines/reference/relativePathMustResolve.js b/tests/baselines/reference/relativePathMustResolve.js
index 6986d8ddb68..52e760a0240 100644
--- a/tests/baselines/reference/relativePathMustResolve.js
+++ b/tests/baselines/reference/relativePathMustResolve.js
@@ -10,5 +10,6 @@ var z = foo.x + 10;
 
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./test/foo");
 var z = foo.x + 10;
diff --git a/tests/baselines/reference/relativePathToDeclarationFile.js b/tests/baselines/reference/relativePathToDeclarationFile.js
index 36673510aef..58cf090ad86 100644
--- a/tests/baselines/reference/relativePathToDeclarationFile.js
+++ b/tests/baselines/reference/relativePathToDeclarationFile.js
@@ -28,6 +28,7 @@ if(foo.M2.x){
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("foo");
 var other = require("./other");
 var relMod = require("./sub/relMod");
diff --git a/tests/baselines/reference/requireAsFunctionInExternalModule.js b/tests/baselines/reference/requireAsFunctionInExternalModule.js
index a8b14db3138..f4eac77052a 100644
--- a/tests/baselines/reference/requireAsFunctionInExternalModule.js
+++ b/tests/baselines/reference/requireAsFunctionInExternalModule.js
@@ -18,13 +18,14 @@ hello();
 
 //// [c.js]
 "use strict";
-function require(a) { }
 exports.__esModule = true;
+function require(a) { }
 exports["default"] = require;
 function has(a) { return true; }
 exports.has = has;
 //// [m.js]
 "use strict";
+exports.__esModule = true;
 var c_1 = require("./c");
 function hello() { }
 exports.hello = hello;
@@ -33,5 +34,6 @@ if (c_1.has('ember-debug')) {
 }
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m_1 = require("./m");
 m_1.hello();
diff --git a/tests/baselines/reference/requireEmitSemicolon.js b/tests/baselines/reference/requireEmitSemicolon.js
index 7ac73b6f3df..667002efeaa 100644
--- a/tests/baselines/reference/requireEmitSemicolon.js
+++ b/tests/baselines/reference/requireEmitSemicolon.js
@@ -22,6 +22,7 @@ export module Database {
 //// [requireEmitSemicolon_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Models;
     (function (Models) {
         var Person = (function () {
@@ -35,6 +36,7 @@ define(["require", "exports"], function (require, exports) {
 //// [requireEmitSemicolon_1.js]
 define(["require", "exports", "requireEmitSemicolon_0"], function (require, exports, P) {
     "use strict";
+    exports.__esModule = true;
     var Database;
     (function (Database) {
         var DB = (function () {
diff --git a/tests/baselines/reference/requireOfAnEmptyFile1.js b/tests/baselines/reference/requireOfAnEmptyFile1.js
index 53642272191..a1e6dbbc447 100644
--- a/tests/baselines/reference/requireOfAnEmptyFile1.js
+++ b/tests/baselines/reference/requireOfAnEmptyFile1.js
@@ -12,3 +12,4 @@ import fs = require('./requireOfAnEmptyFile1_b');
 //// [requireOfAnEmptyFile1_a.js]
 //requireOfAnEmptyFile1
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/reservedWords2.js b/tests/baselines/reference/reservedWords2.js
index d9c8105c35f..f172f37d053 100644
--- a/tests/baselines/reference/reservedWords2.js
+++ b/tests/baselines/reference/reservedWords2.js
@@ -15,6 +15,7 @@ enum void {}
 
 //// [reservedWords2.js]
 "use strict";
+exports.__esModule = true;
 require();
 while ( = require("dfdf"))
     ;
diff --git a/tests/baselines/reference/reuseInnerModuleMember.js b/tests/baselines/reference/reuseInnerModuleMember.js
index a8d254f56c1..d432daed2a7 100644
--- a/tests/baselines/reference/reuseInnerModuleMember.js
+++ b/tests/baselines/reference/reuseInnerModuleMember.js
@@ -17,8 +17,10 @@ module bar {
 
 //// [reuseInnerModuleMember_0.js]
 "use strict";
+exports.__esModule = true;
 //// [reuseInnerModuleMember_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='reuseInnerModuleMember_0.ts'/>
 var bar;
 (function (bar) {
diff --git a/tests/baselines/reference/scannerClass2.js b/tests/baselines/reference/scannerClass2.js
index 640f0952bb9..bc489268afd 100644
--- a/tests/baselines/reference/scannerClass2.js
+++ b/tests/baselines/reference/scannerClass2.js
@@ -9,6 +9,7 @@
 
 //// [scannerClass2.js]
 "use strict";
+exports.__esModule = true;
 var LoggerAdapter = (function () {
     function LoggerAdapter(logger) {
         this.logger = logger;
diff --git a/tests/baselines/reference/scannerEnum1.js b/tests/baselines/reference/scannerEnum1.js
index 5d8b506e62f..75c182206b9 100644
--- a/tests/baselines/reference/scannerEnum1.js
+++ b/tests/baselines/reference/scannerEnum1.js
@@ -6,6 +6,7 @@
 
 //// [scannerEnum1.js]
 "use strict";
+exports.__esModule = true;
 var CodeGenTarget;
 (function (CodeGenTarget) {
     CodeGenTarget[CodeGenTarget["ES3"] = 0] = "ES3";
diff --git a/tests/baselines/reference/shebangBeforeReferences.js b/tests/baselines/reference/shebangBeforeReferences.js
index 6c3e1420c4a..41f3cee97e1 100644
--- a/tests/baselines/reference/shebangBeforeReferences.js
+++ b/tests/baselines/reference/shebangBeforeReferences.js
@@ -18,5 +18,6 @@ use(x);
 //// [f.js]
 #!/usr/bin/env node
 "use strict";
+exports.__esModule = true;
 var test_1 = require("test");
 use(test_1.x);
diff --git a/tests/baselines/reference/shorthand-property-es6-amd.js b/tests/baselines/reference/shorthand-property-es6-amd.js
index 383d5d99e9e..0935606ca5d 100644
--- a/tests/baselines/reference/shorthand-property-es6-amd.js
+++ b/tests/baselines/reference/shorthand-property-es6-amd.js
@@ -8,6 +8,7 @@ const bar = { foo, baz };
 //// [test.js]
 define(["require", "exports", "./foo"], function (require, exports, foo_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     const baz = 42;
     const bar = { foo: foo_1.foo, baz };
 });
diff --git a/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.js b/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.js
index c1728d68e9b..b61620c8eb5 100644
--- a/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.js
+++ b/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.js
@@ -9,6 +9,7 @@ export function foo () {
 
 //// [shorthandOfExportedEntity01_targetES2015_CommonJS.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.test = "test";
 function foo() {
     const x = { test: exports.test };
diff --git a/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.js b/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.js
index e89a413463e..9c63ca6aa28 100644
--- a/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.js
+++ b/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.js
@@ -9,6 +9,7 @@ export function foo () {
 
 //// [shorthandOfExportedEntity02_targetES5_CommonJS.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.test = "test";
 function foo() {
     var x = { test: exports.test };
diff --git a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js
index fad9c37ea8f..f5c7a53f307 100644
--- a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js
+++ b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js
@@ -17,9 +17,11 @@ use(foo);
 
 //// [existingModule.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.x = 1;
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const existingModule_1 = require("./existingModule");
 const missingModule_1 = require("./missingModule");
 const test = { x: existingModule_1.x, foo: missingModule_1.foo };
diff --git a/tests/baselines/reference/sourceMapValidationImport.js b/tests/baselines/reference/sourceMapValidationImport.js
index d9a75d96848..537c3c07135 100644
--- a/tests/baselines/reference/sourceMapValidationImport.js
+++ b/tests/baselines/reference/sourceMapValidationImport.js
@@ -10,6 +10,7 @@ var y = new b();
 
 //// [sourceMapValidationImport.js]
 "use strict";
+exports.__esModule = true;
 var m;
 (function (m) {
     var c = (function () {
diff --git a/tests/baselines/reference/sourceMapValidationImport.js.map b/tests/baselines/reference/sourceMapValidationImport.js.map
index 5b7870209a1..bf6c7989cfc 100644
--- a/tests/baselines/reference/sourceMapValidationImport.js.map
+++ b/tests/baselines/reference/sourceMapValidationImport.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationImport.js.map]
-{"version":3,"file":"sourceMapValidationImport.js","sourceRoot":"","sources":["sourceMapValidationImport.ts"],"names":[],"mappings":";AAAA,IAAc,CAAC,CAGd;AAHD,WAAc,CAAC;IACX;QAAA;QACA,CAAC;QAAD,QAAC;IAAD,CAAC,AADD,IACC;IADY,GAAC,IACb,CAAA;AACL,CAAC,EAHa,CAAC,GAAD,SAAC,KAAD,SAAC,QAGd;AACD,IAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACD,QAAA,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACtB,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,IAAI,CAAC,GAAG,IAAI,SAAC,EAAE,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationImport.js","sourceRoot":"","sources":["sourceMapValidationImport.ts"],"names":[],"mappings":";;AAAA,IAAc,CAAC,CAGd;AAHD,WAAc,CAAC;IACX;QAAA;QACA,CAAC;QAAD,QAAC;IAAD,CAAC,AADD,IACC;IADY,GAAC,IACb,CAAA;AACL,CAAC,EAHa,CAAC,GAAD,SAAC,KAAD,SAAC,QAGd;AACD,IAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACD,QAAA,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACtB,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,IAAI,CAAC,GAAG,IAAI,SAAC,EAAE,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt
index 15e68b22c90..d1fc9b1b720 100644
--- a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/sourceMapValidationImport.js
 sourceFile:sourceMapValidationImport.ts
 -------------------------------------------------------------------
 >>>"use strict";
+>>>exports.__esModule = true;
 >>>var m;
 1 >
 2 >^^^^
@@ -22,10 +23,10 @@ sourceFile:sourceMapValidationImport.ts
   >         export class c {
   >         }
   >     }
-1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(1, 15) + SourceIndex(0)
-3 >Emitted(2, 6) Source(1, 16) + SourceIndex(0)
-4 >Emitted(2, 7) Source(4, 2) + SourceIndex(0)
+1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(1, 15) + SourceIndex(0)
+3 >Emitted(3, 6) Source(1, 16) + SourceIndex(0)
+4 >Emitted(3, 7) Source(4, 2) + SourceIndex(0)
 ---
 >>>(function (m) {
 1->
@@ -35,22 +36,22 @@ sourceFile:sourceMapValidationImport.ts
 1->
 2 >export module 
 3 >           m
-1->Emitted(3, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(3, 12) Source(1, 15) + SourceIndex(0)
-3 >Emitted(3, 13) Source(1, 16) + SourceIndex(0)
+1->Emitted(4, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(4, 12) Source(1, 15) + SourceIndex(0)
+3 >Emitted(4, 13) Source(1, 16) + SourceIndex(0)
 ---
 >>>    var c = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^->
 1-> {
   >    
-1->Emitted(4, 5) Source(2, 5) + SourceIndex(0)
+1->Emitted(5, 5) Source(2, 5) + SourceIndex(0)
 ---
 >>>        function c() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(5, 9) Source(2, 5) + SourceIndex(0)
+1->Emitted(6, 9) Source(2, 5) + SourceIndex(0)
 ---
 >>>        }
 1->^^^^^^^^
@@ -59,16 +60,16 @@ sourceFile:sourceMapValidationImport.ts
 1->export class c {
   >    
 2 >        }
-1->Emitted(6, 9) Source(3, 5) + SourceIndex(0)
-2 >Emitted(6, 10) Source(3, 6) + SourceIndex(0)
+1->Emitted(7, 9) Source(3, 5) + SourceIndex(0)
+2 >Emitted(7, 10) Source(3, 6) + SourceIndex(0)
 ---
 >>>        return c;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(7, 9) Source(3, 5) + SourceIndex(0)
-2 >Emitted(7, 17) Source(3, 6) + SourceIndex(0)
+1->Emitted(8, 9) Source(3, 5) + SourceIndex(0)
+2 >Emitted(8, 17) Source(3, 6) + SourceIndex(0)
 ---
 >>>    }());
 1 >^^^^
@@ -81,10 +82,10 @@ sourceFile:sourceMapValidationImport.ts
 3 >     
 4 >     export class c {
   >         }
-1 >Emitted(8, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(8, 6) Source(3, 6) + SourceIndex(0)
-3 >Emitted(8, 6) Source(2, 5) + SourceIndex(0)
-4 >Emitted(8, 10) Source(3, 6) + SourceIndex(0)
+1 >Emitted(9, 5) Source(3, 5) + SourceIndex(0)
+2 >Emitted(9, 6) Source(3, 6) + SourceIndex(0)
+3 >Emitted(9, 6) Source(2, 5) + SourceIndex(0)
+4 >Emitted(9, 10) Source(3, 6) + SourceIndex(0)
 ---
 >>>    m.c = c;
 1->^^^^
@@ -97,10 +98,10 @@ sourceFile:sourceMapValidationImport.ts
 3 >        {
   >           }
 4 >           
-1->Emitted(9, 5) Source(2, 18) + SourceIndex(0)
-2 >Emitted(9, 8) Source(2, 19) + SourceIndex(0)
-3 >Emitted(9, 12) Source(3, 6) + SourceIndex(0)
-4 >Emitted(9, 13) Source(3, 6) + SourceIndex(0)
+1->Emitted(10, 5) Source(2, 18) + SourceIndex(0)
+2 >Emitted(10, 8) Source(2, 19) + SourceIndex(0)
+3 >Emitted(10, 12) Source(3, 6) + SourceIndex(0)
+4 >Emitted(10, 13) Source(3, 6) + SourceIndex(0)
 ---
 >>>})(m = exports.m || (exports.m = {}));
 1->
@@ -125,15 +126,15 @@ sourceFile:sourceMapValidationImport.ts
   >                                  export class c {
   >                                  }
   >                              }
-1->Emitted(10, 1) Source(4, 1) + SourceIndex(0)
-2 >Emitted(10, 2) Source(4, 2) + SourceIndex(0)
-3 >Emitted(10, 4) Source(1, 15) + SourceIndex(0)
-4 >Emitted(10, 5) Source(1, 16) + SourceIndex(0)
-5 >Emitted(10, 8) Source(1, 15) + SourceIndex(0)
-6 >Emitted(10, 17) Source(1, 16) + SourceIndex(0)
-7 >Emitted(10, 22) Source(1, 15) + SourceIndex(0)
-8 >Emitted(10, 31) Source(1, 16) + SourceIndex(0)
-9 >Emitted(10, 39) Source(4, 2) + SourceIndex(0)
+1->Emitted(11, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(11, 2) Source(4, 2) + SourceIndex(0)
+3 >Emitted(11, 4) Source(1, 15) + SourceIndex(0)
+4 >Emitted(11, 5) Source(1, 16) + SourceIndex(0)
+5 >Emitted(11, 8) Source(1, 15) + SourceIndex(0)
+6 >Emitted(11, 17) Source(1, 16) + SourceIndex(0)
+7 >Emitted(11, 22) Source(1, 15) + SourceIndex(0)
+8 >Emitted(11, 31) Source(1, 16) + SourceIndex(0)
+9 >Emitted(11, 39) Source(4, 2) + SourceIndex(0)
 ---
 >>>var a = m.c;
 1 >
@@ -154,14 +155,14 @@ sourceFile:sourceMapValidationImport.ts
 6 >         .
 7 >          c
 8 >           ;
-1 >Emitted(11, 1) Source(5, 1) + SourceIndex(0)
-2 >Emitted(11, 5) Source(5, 8) + SourceIndex(0)
-3 >Emitted(11, 6) Source(5, 9) + SourceIndex(0)
-4 >Emitted(11, 9) Source(5, 12) + SourceIndex(0)
-5 >Emitted(11, 10) Source(5, 13) + SourceIndex(0)
-6 >Emitted(11, 11) Source(5, 14) + SourceIndex(0)
-7 >Emitted(11, 12) Source(5, 15) + SourceIndex(0)
-8 >Emitted(11, 13) Source(5, 16) + SourceIndex(0)
+1 >Emitted(12, 1) Source(5, 1) + SourceIndex(0)
+2 >Emitted(12, 5) Source(5, 8) + SourceIndex(0)
+3 >Emitted(12, 6) Source(5, 9) + SourceIndex(0)
+4 >Emitted(12, 9) Source(5, 12) + SourceIndex(0)
+5 >Emitted(12, 10) Source(5, 13) + SourceIndex(0)
+6 >Emitted(12, 11) Source(5, 14) + SourceIndex(0)
+7 >Emitted(12, 12) Source(5, 15) + SourceIndex(0)
+8 >Emitted(12, 13) Source(5, 16) + SourceIndex(0)
 ---
 >>>exports.b = m.c;
 1->
@@ -182,14 +183,14 @@ sourceFile:sourceMapValidationImport.ts
 6 >             .
 7 >              c
 8 >               ;
-1->Emitted(12, 1) Source(6, 15) + SourceIndex(0)
-2 >Emitted(12, 9) Source(6, 15) + SourceIndex(0)
-3 >Emitted(12, 10) Source(6, 16) + SourceIndex(0)
-4 >Emitted(12, 13) Source(6, 19) + SourceIndex(0)
-5 >Emitted(12, 14) Source(6, 20) + SourceIndex(0)
-6 >Emitted(12, 15) Source(6, 21) + SourceIndex(0)
-7 >Emitted(12, 16) Source(6, 22) + SourceIndex(0)
-8 >Emitted(12, 17) Source(6, 23) + SourceIndex(0)
+1->Emitted(13, 1) Source(6, 15) + SourceIndex(0)
+2 >Emitted(13, 9) Source(6, 15) + SourceIndex(0)
+3 >Emitted(13, 10) Source(6, 16) + SourceIndex(0)
+4 >Emitted(13, 13) Source(6, 19) + SourceIndex(0)
+5 >Emitted(13, 14) Source(6, 20) + SourceIndex(0)
+6 >Emitted(13, 15) Source(6, 21) + SourceIndex(0)
+7 >Emitted(13, 16) Source(6, 22) + SourceIndex(0)
+8 >Emitted(13, 17) Source(6, 23) + SourceIndex(0)
 ---
 >>>var x = new a();
 1->
@@ -210,14 +211,14 @@ sourceFile:sourceMapValidationImport.ts
 6 >            a
 7 >             ()
 8 >               ;
-1->Emitted(13, 1) Source(7, 1) + SourceIndex(0)
-2 >Emitted(13, 5) Source(7, 5) + SourceIndex(0)
-3 >Emitted(13, 6) Source(7, 6) + SourceIndex(0)
-4 >Emitted(13, 9) Source(7, 9) + SourceIndex(0)
-5 >Emitted(13, 13) Source(7, 13) + SourceIndex(0)
-6 >Emitted(13, 14) Source(7, 14) + SourceIndex(0)
-7 >Emitted(13, 16) Source(7, 16) + SourceIndex(0)
-8 >Emitted(13, 17) Source(7, 17) + SourceIndex(0)
+1->Emitted(14, 1) Source(7, 1) + SourceIndex(0)
+2 >Emitted(14, 5) Source(7, 5) + SourceIndex(0)
+3 >Emitted(14, 6) Source(7, 6) + SourceIndex(0)
+4 >Emitted(14, 9) Source(7, 9) + SourceIndex(0)
+5 >Emitted(14, 13) Source(7, 13) + SourceIndex(0)
+6 >Emitted(14, 14) Source(7, 14) + SourceIndex(0)
+7 >Emitted(14, 16) Source(7, 16) + SourceIndex(0)
+8 >Emitted(14, 17) Source(7, 17) + SourceIndex(0)
 ---
 >>>var y = new exports.b();
 1->
@@ -238,13 +239,13 @@ sourceFile:sourceMapValidationImport.ts
 6 >            b
 7 >                     ()
 8 >                       ;
-1->Emitted(14, 1) Source(8, 1) + SourceIndex(0)
-2 >Emitted(14, 5) Source(8, 5) + SourceIndex(0)
-3 >Emitted(14, 6) Source(8, 6) + SourceIndex(0)
-4 >Emitted(14, 9) Source(8, 9) + SourceIndex(0)
-5 >Emitted(14, 13) Source(8, 13) + SourceIndex(0)
-6 >Emitted(14, 22) Source(8, 14) + SourceIndex(0)
-7 >Emitted(14, 24) Source(8, 16) + SourceIndex(0)
-8 >Emitted(14, 25) Source(8, 17) + SourceIndex(0)
+1->Emitted(15, 1) Source(8, 1) + SourceIndex(0)
+2 >Emitted(15, 5) Source(8, 5) + SourceIndex(0)
+3 >Emitted(15, 6) Source(8, 6) + SourceIndex(0)
+4 >Emitted(15, 9) Source(8, 9) + SourceIndex(0)
+5 >Emitted(15, 13) Source(8, 13) + SourceIndex(0)
+6 >Emitted(15, 22) Source(8, 14) + SourceIndex(0)
+7 >Emitted(15, 24) Source(8, 16) + SourceIndex(0)
+8 >Emitted(15, 25) Source(8, 17) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=sourceMapValidationImport.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/staticInstanceResolution3.js b/tests/baselines/reference/staticInstanceResolution3.js
index c480fd33285..747aa93e631 100644
--- a/tests/baselines/reference/staticInstanceResolution3.js
+++ b/tests/baselines/reference/staticInstanceResolution3.js
@@ -14,6 +14,7 @@ WinJS.Promise.timeout(10);
 
 //// [staticInstanceResolution3_0.js]
 "use strict";
+exports.__esModule = true;
 var Promise = (function () {
     function Promise() {
     }
@@ -25,6 +26,7 @@ var Promise = (function () {
 exports.Promise = Promise;
 //// [staticInstanceResolution3_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='staticInstanceResolution3_0.ts'/>
 var WinJS = require("./staticInstanceResolution3_0");
 WinJS.Promise.timeout(10);
diff --git a/tests/baselines/reference/staticInstanceResolution5.js b/tests/baselines/reference/staticInstanceResolution5.js
index b3514e00aad..0bbd1cf412f 100644
--- a/tests/baselines/reference/staticInstanceResolution5.js
+++ b/tests/baselines/reference/staticInstanceResolution5.js
@@ -19,6 +19,7 @@ function z(w3: WinJS) { }
 //// [staticInstanceResolution5_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Promise = (function () {
         function Promise() {
         }
@@ -32,6 +33,7 @@ define(["require", "exports"], function (require, exports) {
 //// [staticInstanceResolution5_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     // these 3 should be errors
     var x = function (w1) { };
     var y = function (w2) { };
diff --git a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js
index 9b8987659c5..b8b5b030bcd 100644
--- a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js
+++ b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js
@@ -23,6 +23,7 @@ export class publicClassWithWithPrivateTypeParameters {
 
 //// [staticMethodWithTypeParameterExtendsClauseDeclFile.js]
 "use strict";
+exports.__esModule = true;
 var privateClass = (function () {
     function privateClass() {
     }
diff --git a/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.js b/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.js
index 50ed1b4d755..409e6f67584 100644
--- a/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.js
+++ b/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.js
@@ -5,3 +5,4 @@ import public = require("1");
 
 //// [strictModeReservedWordInImportEqualDeclaration.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/topLevelAmbientModule.js b/tests/baselines/reference/topLevelAmbientModule.js
index da5885fafab..3e162170c87 100644
--- a/tests/baselines/reference/topLevelAmbientModule.js
+++ b/tests/baselines/reference/topLevelAmbientModule.js
@@ -14,6 +14,7 @@ var z = foo.x + 10;
 //// [foo_0.js]
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="foo_0.ts"/>
 var foo = require("foo");
 var z = foo.x + 10;
diff --git a/tests/baselines/reference/topLevelExports.js b/tests/baselines/reference/topLevelExports.js
index bf274fcf558..5f58c44d2f2 100644
--- a/tests/baselines/reference/topLevelExports.js
+++ b/tests/baselines/reference/topLevelExports.js
@@ -8,6 +8,7 @@ void log(foo).toString();
 //// [topLevelExports.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.foo = 3;
     function log(n) { return n; }
     void log(exports.foo).toString();
diff --git a/tests/baselines/reference/topLevelFileModule.js b/tests/baselines/reference/topLevelFileModule.js
index c893a9b4675..8ff74cc89f4 100644
--- a/tests/baselines/reference/topLevelFileModule.js
+++ b/tests/baselines/reference/topLevelFileModule.js
@@ -14,8 +14,10 @@ var z = foo.x + fum.y;
 
 //// [foo_0.js]
 "use strict";
+exports.__esModule = true;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./vs/foo_0");
 var fum = require("./vs/fum");
 var z = foo.x + fum.y;
diff --git a/tests/baselines/reference/topLevelFileModuleMissing.js b/tests/baselines/reference/topLevelFileModuleMissing.js
index edd090d49cc..37d9ac5b150 100644
--- a/tests/baselines/reference/topLevelFileModuleMissing.js
+++ b/tests/baselines/reference/topLevelFileModuleMissing.js
@@ -10,5 +10,6 @@ var z = foo.x + 10;
 
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("vs/foo");
 var z = foo.x + 10;
diff --git a/tests/baselines/reference/topLevelLambda4.js b/tests/baselines/reference/topLevelLambda4.js
index 81d3c4a1e4f..5ccfb91bec7 100644
--- a/tests/baselines/reference/topLevelLambda4.js
+++ b/tests/baselines/reference/topLevelLambda4.js
@@ -5,5 +5,6 @@ export var x = () => this.window;
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var _this = this;
+    exports.__esModule = true;
     exports.x = function () { return _this.window; };
 });
diff --git a/tests/baselines/reference/topLevelModuleDeclarationAndFile.js b/tests/baselines/reference/topLevelModuleDeclarationAndFile.js
index cb329014412..8f4ecb37d31 100644
--- a/tests/baselines/reference/topLevelModuleDeclarationAndFile.js
+++ b/tests/baselines/reference/topLevelModuleDeclarationAndFile.js
@@ -19,6 +19,7 @@ var z2 = foo.y() + 10; // Should resolve
 //// [foo_1.js]
 //// [foo_2.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="foo_1.ts"/>
 var foo = require("vs/foo_0");
 var z1 = foo.x + 10; // Should error, as declaration should win
diff --git a/tests/baselines/reference/transformNestedGeneratorsWithTry.js b/tests/baselines/reference/transformNestedGeneratorsWithTry.js
index 15be3163cfd..28f405e47b9 100644
--- a/tests/baselines/reference/transformNestedGeneratorsWithTry.js
+++ b/tests/baselines/reference/transformNestedGeneratorsWithTry.js
@@ -59,6 +59,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 // https://github.com/Microsoft/TypeScript/issues/11177
 var Bluebird = require("bluebird");
 function a() {
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js
index f1e36ae9b15..cd4ce3c862e 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js	
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js	
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
diff --git a/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js b/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js
index 61a703e13bb..4571caffa31 100644
--- a/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js	
+++ b/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 var x = 0;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js
index 9d108d63313..4d133b7655c 100644
--- a/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js	
+++ b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js	
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 a;
 b;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates module output.js b/tests/baselines/reference/transpile/Generates module output.js
index 9eadd1f2717..2c7bb7add09 100644
--- a/tests/baselines/reference/transpile/Generates module output.js	
+++ b/tests/baselines/reference/transpile/Generates module output.js	
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x = 0;
 });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js b/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js
index 88d98628eee..04ba1d12e5e 100644
--- a/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js	
+++ b/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js	
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 /// <reference path="file2.ts" />
 var x = 0;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates no diagnostics for missing module imports.js b/tests/baselines/reference/transpile/Generates no diagnostics for missing module imports.js
index 1ceb1bcd146..e9493d9d591 100644
--- a/tests/baselines/reference/transpile/Generates no diagnostics for missing module imports.js	
+++ b/tests/baselines/reference/transpile/Generates no diagnostics for missing module imports.js	
@@ -1,2 +1,3 @@
 "use strict";
+exports.__esModule = true;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js b/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js
index 61a703e13bb..4571caffa31 100644
--- a/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js	
+++ b/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 var x = 0;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/No extra errors for file without extension.js b/tests/baselines/reference/transpile/No extra errors for file without extension.js
index 61a703e13bb..4571caffa31 100644
--- a/tests/baselines/reference/transpile/No extra errors for file without extension.js	
+++ b/tests/baselines/reference/transpile/No extra errors for file without extension.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 var x = 0;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Rename dependencies - AMD.js b/tests/baselines/reference/transpile/Rename dependencies - AMD.js
index a0dd948c9fc..c5ffb86a1aa 100644
--- a/tests/baselines/reference/transpile/Rename dependencies - AMD.js	
+++ b/tests/baselines/reference/transpile/Rename dependencies - AMD.js	
@@ -1,5 +1,6 @@
 define(["require", "exports", "SomeOtherName"], function (require, exports, SomeName_1) {
     "use strict";
+    exports.__esModule = true;
     use(SomeName_1.foo);
 });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Rename dependencies - UMD.js b/tests/baselines/reference/transpile/Rename dependencies - UMD.js
index c2b337076ba..0ecfbce2397 100644
--- a/tests/baselines/reference/transpile/Rename dependencies - UMD.js	
+++ b/tests/baselines/reference/transpile/Rename dependencies - UMD.js	
@@ -8,6 +8,7 @@
     }
 })(function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var SomeName_1 = require("SomeOtherName");
     use(SomeName_1.foo);
 });
diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.js b/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.js
index 1ceb1bcd146..e9493d9d591 100644
--- a/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.js	
+++ b/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.js	
@@ -1,2 +1,3 @@
 "use strict";
+exports.__esModule = true;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.js b/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.js
index 1ceb1bcd146..e9493d9d591 100644
--- a/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.js	
+++ b/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.js	
@@ -1,2 +1,3 @@
 "use strict";
+exports.__esModule = true;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Support options with lib values.js b/tests/baselines/reference/transpile/Support options with lib values.js
index 36c68f08b9f..72e077de381 100644
--- a/tests/baselines/reference/transpile/Support options with lib values.js	
+++ b/tests/baselines/reference/transpile/Support options with lib values.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 var a = 10;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Support options with types values.js b/tests/baselines/reference/transpile/Support options with types values.js
index 36c68f08b9f..72e077de381 100644
--- a/tests/baselines/reference/transpile/Support options with types values.js	
+++ b/tests/baselines/reference/transpile/Support options with types values.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 var a = 10;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports backslashes in file name.js b/tests/baselines/reference/transpile/Supports backslashes in file name.js
index 942449753b0..8ef38d2b617 100644
--- a/tests/baselines/reference/transpile/Supports backslashes in file name.js	
+++ b/tests/baselines/reference/transpile/Supports backslashes in file name.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 var x;
 //# sourceMappingURL=b.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting allowJs.js b/tests/baselines/reference/transpile/Supports setting allowJs.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting allowJs.js	
+++ b/tests/baselines/reference/transpile/Supports setting allowJs.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js b/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js	
+++ b/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js b/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js	
+++ b/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js b/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js	
+++ b/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting alwaysStrict.js b/tests/baselines/reference/transpile/Supports setting alwaysStrict.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting alwaysStrict.js	
+++ b/tests/baselines/reference/transpile/Supports setting alwaysStrict.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting baseUrl.js b/tests/baselines/reference/transpile/Supports setting baseUrl.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting baseUrl.js	
+++ b/tests/baselines/reference/transpile/Supports setting baseUrl.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting charset.js b/tests/baselines/reference/transpile/Supports setting charset.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting charset.js	
+++ b/tests/baselines/reference/transpile/Supports setting charset.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting declaration.js b/tests/baselines/reference/transpile/Supports setting declaration.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting declaration.js	
+++ b/tests/baselines/reference/transpile/Supports setting declaration.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting declarationDir.js b/tests/baselines/reference/transpile/Supports setting declarationDir.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting declarationDir.js	
+++ b/tests/baselines/reference/transpile/Supports setting declarationDir.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting emitBOM.js b/tests/baselines/reference/transpile/Supports setting emitBOM.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting emitBOM.js	
+++ b/tests/baselines/reference/transpile/Supports setting emitBOM.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js b/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js	
+++ b/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js b/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js	
+++ b/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js b/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js	
+++ b/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting isolatedModules.js b/tests/baselines/reference/transpile/Supports setting isolatedModules.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting isolatedModules.js	
+++ b/tests/baselines/reference/transpile/Supports setting isolatedModules.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting jsx.js b/tests/baselines/reference/transpile/Supports setting jsx.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting jsx.js	
+++ b/tests/baselines/reference/transpile/Supports setting jsx.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting jsxFactory.js b/tests/baselines/reference/transpile/Supports setting jsxFactory.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting jsxFactory.js	
+++ b/tests/baselines/reference/transpile/Supports setting jsxFactory.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting lib.js b/tests/baselines/reference/transpile/Supports setting lib.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting lib.js	
+++ b/tests/baselines/reference/transpile/Supports setting lib.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting locale.js b/tests/baselines/reference/transpile/Supports setting locale.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting locale.js	
+++ b/tests/baselines/reference/transpile/Supports setting locale.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting module.js b/tests/baselines/reference/transpile/Supports setting module.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting module.js	
+++ b/tests/baselines/reference/transpile/Supports setting module.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting moduleResolution.js b/tests/baselines/reference/transpile/Supports setting moduleResolution.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting moduleResolution.js	
+++ b/tests/baselines/reference/transpile/Supports setting moduleResolution.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting newLine.js b/tests/baselines/reference/transpile/Supports setting newLine.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting newLine.js	
+++ b/tests/baselines/reference/transpile/Supports setting newLine.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noEmit.js b/tests/baselines/reference/transpile/Supports setting noEmit.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noEmit.js	
+++ b/tests/baselines/reference/transpile/Supports setting noEmit.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js b/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js	
+++ b/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noEmitOnError.js b/tests/baselines/reference/transpile/Supports setting noEmitOnError.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noEmitOnError.js	
+++ b/tests/baselines/reference/transpile/Supports setting noEmitOnError.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js b/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js	
+++ b/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js b/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js	
+++ b/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitAny.js b/tests/baselines/reference/transpile/Supports setting noImplicitAny.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noImplicitAny.js	
+++ b/tests/baselines/reference/transpile/Supports setting noImplicitAny.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js b/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js	
+++ b/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitThis.js b/tests/baselines/reference/transpile/Supports setting noImplicitThis.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noImplicitThis.js	
+++ b/tests/baselines/reference/transpile/Supports setting noImplicitThis.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js b/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js
index 8394371f908..8124d51fde3 100644
--- a/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js	
+++ b/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js	
@@ -1,2 +1,3 @@
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noLib.js b/tests/baselines/reference/transpile/Supports setting noLib.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noLib.js	
+++ b/tests/baselines/reference/transpile/Supports setting noLib.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noResolve.js b/tests/baselines/reference/transpile/Supports setting noResolve.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noResolve.js	
+++ b/tests/baselines/reference/transpile/Supports setting noResolve.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting out.js b/tests/baselines/reference/transpile/Supports setting out.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting out.js	
+++ b/tests/baselines/reference/transpile/Supports setting out.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting outDir.js b/tests/baselines/reference/transpile/Supports setting outDir.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting outDir.js	
+++ b/tests/baselines/reference/transpile/Supports setting outDir.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting outFile.js b/tests/baselines/reference/transpile/Supports setting outFile.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting outFile.js	
+++ b/tests/baselines/reference/transpile/Supports setting outFile.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting paths.js b/tests/baselines/reference/transpile/Supports setting paths.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting paths.js	
+++ b/tests/baselines/reference/transpile/Supports setting paths.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js b/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js	
+++ b/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting reactNamespace.js b/tests/baselines/reference/transpile/Supports setting reactNamespace.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting reactNamespace.js	
+++ b/tests/baselines/reference/transpile/Supports setting reactNamespace.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting removeComments.js b/tests/baselines/reference/transpile/Supports setting removeComments.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting removeComments.js	
+++ b/tests/baselines/reference/transpile/Supports setting removeComments.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting rootDir.js b/tests/baselines/reference/transpile/Supports setting rootDir.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting rootDir.js	
+++ b/tests/baselines/reference/transpile/Supports setting rootDir.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting rootDirs.js b/tests/baselines/reference/transpile/Supports setting rootDirs.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting rootDirs.js	
+++ b/tests/baselines/reference/transpile/Supports setting rootDirs.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js b/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js	
+++ b/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting skipLibCheck.js b/tests/baselines/reference/transpile/Supports setting skipLibCheck.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting skipLibCheck.js	
+++ b/tests/baselines/reference/transpile/Supports setting skipLibCheck.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting strictNullChecks.js b/tests/baselines/reference/transpile/Supports setting strictNullChecks.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting strictNullChecks.js	
+++ b/tests/baselines/reference/transpile/Supports setting strictNullChecks.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting stripInternal.js b/tests/baselines/reference/transpile/Supports setting stripInternal.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting stripInternal.js	
+++ b/tests/baselines/reference/transpile/Supports setting stripInternal.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js b/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js	
+++ b/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js b/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js	
+++ b/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting typeRoots.js b/tests/baselines/reference/transpile/Supports setting typeRoots.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting typeRoots.js	
+++ b/tests/baselines/reference/transpile/Supports setting typeRoots.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting types.js b/tests/baselines/reference/transpile/Supports setting types.js
index 8d91090453b..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting types.js	
+++ b/tests/baselines/reference/transpile/Supports setting types.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports urls in file name.js b/tests/baselines/reference/transpile/Supports urls in file name.js
index 3923d3c9a41..933981306d2 100644
--- a/tests/baselines/reference/transpile/Supports urls in file name.js	
+++ b/tests/baselines/reference/transpile/Supports urls in file name.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 var x;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js
index b6b17292c12..0b3bbaa8d73 100644
--- a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js	
+++ b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js	
@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
diff --git a/tests/baselines/reference/transpile/Uses correct newLine character.js b/tests/baselines/reference/transpile/Uses correct newLine character.js
index bab9c3c4443..04042012d18 100644
--- a/tests/baselines/reference/transpile/Uses correct newLine character.js	
+++ b/tests/baselines/reference/transpile/Uses correct newLine character.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 var x = 0;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/transpile .js files.js b/tests/baselines/reference/transpile/transpile .js files.js
index c17099d84ba..b9048bd515d 100644
--- a/tests/baselines/reference/transpile/transpile .js files.js	
+++ b/tests/baselines/reference/transpile/transpile .js files.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 var a = 10;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js b/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js
index baa27ee64ce..2a73615e476 100644
--- a/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js	
+++ b/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js	
@@ -1,3 +1,4 @@
 "use strict";
+exports.__esModule = true;
 var x = React.createElement("div", null);
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxAttributeResolution10.js b/tests/baselines/reference/tsxAttributeResolution10.js
index 798bbb4c7af..235cca0be1c 100644
--- a/tests/baselines/reference/tsxAttributeResolution10.js
+++ b/tests/baselines/reference/tsxAttributeResolution10.js
@@ -34,6 +34,7 @@ export class MyComponent {
 //// [file.jsx]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var MyComponent = (function () {
         function MyComponent() {
         }
diff --git a/tests/baselines/reference/tsxAttributeResolution9.js b/tests/baselines/reference/tsxAttributeResolution9.js
index cd6946636a6..d7880c820d8 100644
--- a/tests/baselines/reference/tsxAttributeResolution9.js
+++ b/tests/baselines/reference/tsxAttributeResolution9.js
@@ -30,6 +30,7 @@ export class MyComponent {
 //// [file.jsx]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var MyComponent = (function () {
         function MyComponent() {
         }
diff --git a/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js
index 8135af8731f..f6403804fae 100644
--- a/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js
+++ b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js
@@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var ShortDetails = (function (_super) {
     __extends(ShortDetails, _super);
     function ShortDetails() {
diff --git a/tests/baselines/reference/tsxDefaultImports.js b/tests/baselines/reference/tsxDefaultImports.js
index 46a94dea92f..c918efb5f4f 100644
--- a/tests/baselines/reference/tsxDefaultImports.js
+++ b/tests/baselines/reference/tsxDefaultImports.js
@@ -16,6 +16,7 @@ let a = Def.E.one;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var SomeEnum;
 (function (SomeEnum) {
     SomeEnum[SomeEnum["one"] = 0] = "one";
@@ -26,9 +27,9 @@ var SomeClass = (function () {
     return SomeClass;
 }());
 SomeClass.E = SomeEnum;
-exports.__esModule = true;
 exports["default"] = SomeClass;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var a_1 = require("./a");
 var a = a_1["default"].E.one;
diff --git a/tests/baselines/reference/tsxDynamicTagName5.js b/tests/baselines/reference/tsxDynamicTagName5.js
index 00ecc955865..4dd03843f15 100644
--- a/tests/baselines/reference/tsxDynamicTagName5.js
+++ b/tests/baselines/reference/tsxDynamicTagName5.js
@@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var React = require("react");
 var Text = (function (_super) {
     __extends(Text, _super);
diff --git a/tests/baselines/reference/tsxDynamicTagName7.js b/tests/baselines/reference/tsxDynamicTagName7.js
index 2e7802ea94f..f4f230b995a 100644
--- a/tests/baselines/reference/tsxDynamicTagName7.js
+++ b/tests/baselines/reference/tsxDynamicTagName7.js
@@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var React = require("react");
 var Text = (function (_super) {
     __extends(Text, _super);
diff --git a/tests/baselines/reference/tsxDynamicTagName8.js b/tests/baselines/reference/tsxDynamicTagName8.js
index 3b2e43fede7..348574ebf42 100644
--- a/tests/baselines/reference/tsxDynamicTagName8.js
+++ b/tests/baselines/reference/tsxDynamicTagName8.js
@@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var React = require("react");
 var Text = (function (_super) {
     __extends(Text, _super);
diff --git a/tests/baselines/reference/tsxDynamicTagName9.js b/tests/baselines/reference/tsxDynamicTagName9.js
index 1b13845dc18..e720b2644a0 100644
--- a/tests/baselines/reference/tsxDynamicTagName9.js
+++ b/tests/baselines/reference/tsxDynamicTagName9.js
@@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var React = require("react");
 var Text = (function (_super) {
     __extends(Text, _super);
diff --git a/tests/baselines/reference/tsxElementResolution17.js b/tests/baselines/reference/tsxElementResolution17.js
index 1f813b7e24b..899498caf8d 100644
--- a/tests/baselines/reference/tsxElementResolution17.js
+++ b/tests/baselines/reference/tsxElementResolution17.js
@@ -31,5 +31,6 @@ import s2 = require('elements2');
 //// [consumer.jsx]
 define(["require", "exports", "elements1"], function (require, exports, s1) {
     "use strict";
+    exports.__esModule = true;
     <s1.MyElement />;
 });
diff --git a/tests/baselines/reference/tsxElementResolution19.js b/tests/baselines/reference/tsxElementResolution19.js
index f8c3f4b25be..02136e782db 100644
--- a/tests/baselines/reference/tsxElementResolution19.js
+++ b/tests/baselines/reference/tsxElementResolution19.js
@@ -24,6 +24,7 @@ import {MyClass} from './file1';
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var MyClass = (function () {
         function MyClass() {
         }
@@ -34,5 +35,6 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports", "react", "./file1"], function (require, exports, React, file1_1) {
     "use strict";
+    exports.__esModule = true;
     React.createElement(file1_1.MyClass, null);
 });
diff --git a/tests/baselines/reference/tsxExternalModuleEmit1.js b/tests/baselines/reference/tsxExternalModuleEmit1.js
index 5b27360d14c..c8c64062d13 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit1.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit1.js
@@ -43,6 +43,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var React = require("react");
 var Button = (function (_super) {
     __extends(Button, _super);
@@ -67,6 +68,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var React = require("react");
 // Should see var button_1 = require('./button') here
 var button_1 = require("./button");
diff --git a/tests/baselines/reference/tsxExternalModuleEmit2.js b/tests/baselines/reference/tsxExternalModuleEmit2.js
index 6c01a48af78..aae48021457 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit2.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit2.js
@@ -27,6 +27,7 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
     }
     return t;
 };
+exports.__esModule = true;
 var mod_1 = require("mod");
 // Should see mod_1['default'] in emit here
 React.createElement(Foo, { handler: mod_1["default"] });
diff --git a/tests/baselines/reference/tsxPreserveEmit1.js b/tests/baselines/reference/tsxPreserveEmit1.js
index feb314ee2e6..585b603abfb 100644
--- a/tests/baselines/reference/tsxPreserveEmit1.js
+++ b/tests/baselines/reference/tsxPreserveEmit1.js
@@ -36,6 +36,7 @@ module M {
 //// [test.jsx]
 define(["require", "exports", "react", "react-router"], function (require, exports, React, ReactRouter) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var Route = ReactRouter.Route;
     var routes1 = <Route />;
     var M;
diff --git a/tests/baselines/reference/tsxPreserveEmit3.js b/tests/baselines/reference/tsxPreserveEmit3.js
index 500b7d26c93..fdbe8cc2bb4 100644
--- a/tests/baselines/reference/tsxPreserveEmit3.js
+++ b/tests/baselines/reference/tsxPreserveEmit3.js
@@ -21,4 +21,5 @@ import {React} from "./test";
 //// [react-consumer.jsx]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/tsxReactEmit5.js b/tests/baselines/reference/tsxReactEmit5.js
index c3e58d0a0da..a6517352f9a 100644
--- a/tests/baselines/reference/tsxReactEmit5.js
+++ b/tests/baselines/reference/tsxReactEmit5.js
@@ -31,6 +31,7 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
     }
     return t;
 };
+exports.__esModule = true;
 var test_1 = require("./test");
 // Should emit test_1.React.createElement
 //  and React.__spread
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents2.js b/tests/baselines/reference/tsxStatelessFunctionComponents2.js
index a7507a15d8b..64356eefe83 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents2.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.js
@@ -50,6 +50,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var React = require("react");
 function Greet(x) {
     return <div>Hello, {x}</div>;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents3.js b/tests/baselines/reference/tsxStatelessFunctionComponents3.js
index 02ddcc8a58e..d66e105e3e5 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents3.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents3.js
@@ -21,6 +21,7 @@ var App: React.StatelessComponent<{ children }> = ({children}) => (
 //// [file.jsx]
 define(["require", "exports", "react"], function (require, exports, React) {
     "use strict";
+    exports.__esModule = true;
     var Foo = function (props) { return <div />; };
     // Should be OK
     var foo = <Foo />;
diff --git a/tests/baselines/reference/tsxUnionTypeComponent1.js b/tests/baselines/reference/tsxUnionTypeComponent1.js
index b73b1f35361..a0cd220c4e0 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent1.js
+++ b/tests/baselines/reference/tsxUnionTypeComponent1.js
@@ -36,6 +36,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var React = require("react");
 var MyComponent = (function (_super) {
     __extends(MyComponent, _super);
diff --git a/tests/baselines/reference/tsxUnionTypeComponent2.js b/tests/baselines/reference/tsxUnionTypeComponent2.js
index 3cc6f44c699..ded3052dd50 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent2.js
+++ b/tests/baselines/reference/tsxUnionTypeComponent2.js
@@ -13,6 +13,7 @@ const X: Invalid1 = 1;
 
 //// [file.js]
 "use strict";
+exports.__esModule = true;
 var React = require("react");
 var X = 1;
 React.createElement(X, null);
diff --git a/tests/baselines/reference/typeAliasDeclarationEmit.js b/tests/baselines/reference/typeAliasDeclarationEmit.js
index 1f72e1d1b00..cd0e3af0507 100644
--- a/tests/baselines/reference/typeAliasDeclarationEmit.js
+++ b/tests/baselines/reference/typeAliasDeclarationEmit.js
@@ -7,6 +7,7 @@ export type CallbackArray<T extends callback> = () => T;
 //// [typeAliasDeclarationEmit.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/typeAliasDeclarationEmit2.js b/tests/baselines/reference/typeAliasDeclarationEmit2.js
index b94eb56a2a2..dcf5e7898e7 100644
--- a/tests/baselines/reference/typeAliasDeclarationEmit2.js
+++ b/tests/baselines/reference/typeAliasDeclarationEmit2.js
@@ -5,6 +5,7 @@ export type A<a> = { value: a };
 //// [typeAliasDeclarationEmit2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js
index 5590dac249f..df12050eaf6 100644
--- a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js
+++ b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js
@@ -13,6 +13,7 @@ f.foo();
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 function foo() {
     var classes = undefined;
     return new classes(null);
@@ -20,6 +21,7 @@ function foo() {
 exports.foo = foo;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
 var f = require("./file1");
 f.foo();
 
diff --git a/tests/baselines/reference/typeGuardsAsAssertions.js b/tests/baselines/reference/typeGuardsAsAssertions.js
index 84fc996c3ab..84596dd99e2 100644
--- a/tests/baselines/reference/typeGuardsAsAssertions.js
+++ b/tests/baselines/reference/typeGuardsAsAssertions.js
@@ -125,6 +125,7 @@ function f6() {
 //// [typeGuardsAsAssertions.js]
 // Repro from #8513
 "use strict";
+exports.__esModule = true;
 var cond;
 exports.none = { none: '' };
 function isSome(value) {
diff --git a/tests/baselines/reference/typeGuardsInExternalModule.js b/tests/baselines/reference/typeGuardsInExternalModule.js
index 76624440d24..0a5abd59373 100644
--- a/tests/baselines/reference/typeGuardsInExternalModule.js
+++ b/tests/baselines/reference/typeGuardsInExternalModule.js
@@ -27,6 +27,7 @@ else {
 // Note that type guards affect types of variables and parameters only and 
 // have no effect on members of objects such as properties. 
 "use strict";
+exports.__esModule = true;
 // local variable in external module
 var num;
 var var1;
diff --git a/tests/baselines/reference/typeInferenceLiteralUnion.js b/tests/baselines/reference/typeInferenceLiteralUnion.js
index 07776d26061..289dd413046 100644
--- a/tests/baselines/reference/typeInferenceLiteralUnion.js
+++ b/tests/baselines/reference/typeInferenceLiteralUnion.js
@@ -38,6 +38,7 @@ extentMixed = extent([new NumCoercible(10), 13, '12', true]);
 
 //// [typeInferenceLiteralUnion.js]
 "use strict";
+exports.__esModule = true;
 // Not very useful, but meets Numeric
 var NumCoercible = (function () {
     function NumCoercible(a) {
diff --git a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js
index 87e0075a942..9a293139417 100644
--- a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js
+++ b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js
@@ -25,6 +25,7 @@ i2 = a2; // no error
 //// [typeParameterCompatibilityAccrossDeclarations.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a = {
         x: function (y) { return null; }
     };
diff --git a/tests/baselines/reference/typePredicateInLoop.js b/tests/baselines/reference/typePredicateInLoop.js
index 0a1e621cb50..f5a99b68971 100644
--- a/tests/baselines/reference/typePredicateInLoop.js
+++ b/tests/baselines/reference/typePredicateInLoop.js
@@ -24,6 +24,7 @@ export function y(arg: Type): void {
 //// [typePredicateInLoop.js]
 // Repro from #12101
 "use strict";
+exports.__esModule = true;
 var guard = function (arg) { return arg.type === 1; };
 var otherFunc = function (arg1, arg2) { };
 function y(arg) {
diff --git a/tests/baselines/reference/typeReferenceDirectives10.js b/tests/baselines/reference/typeReferenceDirectives10.js
index e4253bb3a58..5d56ef0cf8f 100644
--- a/tests/baselines/reference/typeReferenceDirectives10.js
+++ b/tests/baselines/reference/typeReferenceDirectives10.js
@@ -17,6 +17,7 @@ export interface A {
 
 //// [app.js]
 "use strict";
+exports.__esModule = true;
 
 
 //// [app.d.ts]
diff --git a/tests/baselines/reference/typeReferenceDirectives13.js b/tests/baselines/reference/typeReferenceDirectives13.js
index 9fecdd47f77..c776a507de4 100644
--- a/tests/baselines/reference/typeReferenceDirectives13.js
+++ b/tests/baselines/reference/typeReferenceDirectives13.js
@@ -17,6 +17,7 @@ export interface A {
 
 //// [app.js]
 "use strict";
+exports.__esModule = true;
 
 
 //// [app.d.ts]
diff --git a/tests/baselines/reference/typeReferenceDirectives5.js b/tests/baselines/reference/typeReferenceDirectives5.js
index 41448cbeab2..d663ded713a 100644
--- a/tests/baselines/reference/typeReferenceDirectives5.js
+++ b/tests/baselines/reference/typeReferenceDirectives5.js
@@ -16,6 +16,7 @@ export interface A {
 
 //// [app.js]
 "use strict";
+exports.__esModule = true;
 
 
 //// [app.d.ts]
diff --git a/tests/baselines/reference/typeReferenceDirectives7.js b/tests/baselines/reference/typeReferenceDirectives7.js
index 6a15180d3e7..d44626f51d0 100644
--- a/tests/baselines/reference/typeReferenceDirectives7.js
+++ b/tests/baselines/reference/typeReferenceDirectives7.js
@@ -18,6 +18,7 @@ export let y = () => x
 //// [app.js]
 /// <reference types="lib"/>
 "use strict";
+exports.__esModule = true;
 exports.$ = 1;
 exports.y = function () { return exports.x; };
 
diff --git a/tests/baselines/reference/typeReferenceDirectives8.js b/tests/baselines/reference/typeReferenceDirectives8.js
index cfa22c4228c..f19e63f7e07 100644
--- a/tests/baselines/reference/typeReferenceDirectives8.js
+++ b/tests/baselines/reference/typeReferenceDirectives8.js
@@ -16,10 +16,12 @@ export const bar = foo();
 
 //// [mod1.js]
 "use strict";
+exports.__esModule = true;
 function foo() { return { x: 1 }; }
 exports.foo = foo;
 //// [mod2.js]
 "use strict";
+exports.__esModule = true;
 var mod1_1 = require("./mod1");
 exports.bar = mod1_1.foo();
 
diff --git a/tests/baselines/reference/typeReferenceDirectives9.js b/tests/baselines/reference/typeReferenceDirectives9.js
index 5fd17ea16d3..6710abcad97 100644
--- a/tests/baselines/reference/typeReferenceDirectives9.js
+++ b/tests/baselines/reference/typeReferenceDirectives9.js
@@ -35,6 +35,7 @@ export const bar = Cls.bar();
 
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 var Cls = (function () {
     function Cls() {
     }
@@ -44,10 +45,12 @@ exports.Cls = Cls;
 //// [mod1.js]
 /// <reference types="lib" />
 "use strict";
+exports.__esModule = true;
 var main_1 = require("./main");
 main_1.Cls.prototype.foo = function () { return undefined; };
 //// [mod2.js]
 "use strict";
+exports.__esModule = true;
 var main_1 = require("./main");
 require("./mod1");
 exports.cls = main_1.Cls;
diff --git a/tests/baselines/reference/typeResolution.js b/tests/baselines/reference/typeResolution.js
index cc2bd589bb0..cb8a40cf0a6 100644
--- a/tests/baselines/reference/typeResolution.js
+++ b/tests/baselines/reference/typeResolution.js
@@ -113,6 +113,7 @@ module TopLevelModule2 {
 //// [typeResolution.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var TopLevelModule1;
     (function (TopLevelModule1) {
         var SubModule1;
diff --git a/tests/baselines/reference/typeResolution.js.map b/tests/baselines/reference/typeResolution.js.map
index 99d359bdbee..5bf95ac5b29 100644
--- a/tests/baselines/reference/typeResolution.js.map
+++ b/tests/baselines/reference/typeResolution.js.map
@@ -1,2 +1,2 @@
 //// [typeResolution.js.map]
-{"version":3,"file":"typeResolution.js","sourceRoot":"","sources":["typeResolution.ts"],"names":[],"mappings":";;IAAA,IAAc,eAAe,CAmG5B;IAnGD,WAAc,eAAe;QACzB,IAAc,UAAU,CAwEvB;QAxED,WAAc,UAAU;YACpB,IAAc,aAAa,CAwD1B;YAxDD,WAAc,aAAa;gBACvB;oBAAA;oBAmBA,CAAC;oBAlBU,2BAAU,GAAjB;wBACI,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAnBD,IAmBC;gBAnBY,oBAAM,SAmBlB,CAAA;gBACD;oBAAA;oBAsBA,CAAC;oBArBU,2BAAU,GAAjB;wBACI,+CAA+C;wBAE/C,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzE,IAAI,EAAqC,CAAC;wBAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAEzD,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAtBD,IAsBC;gBAtBY,oBAAM,SAsBlB,CAAA;gBAED;oBACI;wBACI;4BACI,uCAAuC;4BACvC,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAc,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACpC,IAAI,EAAqC,CAAC;4BAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAC7D,CAAC;oBACL,CAAC;oBACL,wBAAC;gBAAD,CAAC,AAVD,IAUC;YACL,CAAC,EAxDa,aAAa,GAAb,wBAAa,KAAb,wBAAa,QAwD1B;YAED,0EAA0E;YAC1E;gBACI;oBACI;wBACI,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;gBACL,CAAC;gBACL,aAAC;YAAD,CAAC,AAXD,IAWC;QACL,CAAC,EAxEa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAwEvB;QAED,IAAc,UAAU,CAWvB;QAXD,WAAc,UAAU;YACpB,IAAc,aAAa,CAO1B;YAPD,WAAc,aAAa;gBACvB,6DAA6D;gBAC7D;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;YAGnD,CAAC,EAPa,aAAa,GAAb,wBAAa,KAAb,wBAAa,QAO1B;QAGL,CAAC,EAXa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAWvB;QAED;YAAA;YAEA,CAAC;YADU,uBAAM,GAAb,cAAkB,CAAC;YACvB,aAAC;QAAD,CAAC,AAFD,IAEC;QAMD,IAAO,iBAAiB,CAEvB;QAFD,WAAO,iBAAiB;YACpB;gBAAA;gBAAsB,CAAC;gBAAD,aAAC;YAAD,CAAC,AAAvB,IAAuB;YAAV,wBAAM,SAAI,CAAA;QAC3B,CAAC,EAFM,iBAAiB,KAAjB,iBAAiB,QAEvB;IACL,CAAC,EAnGa,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAmG5B;IAED,IAAO,eAAe,CAMrB;IAND,WAAO,eAAe;QAClB,IAAc,UAAU,CAIvB;QAJD,WAAc,UAAU;YACpB;gBAAA;gBAEA,CAAC;gBADU,yBAAQ,GAAf,cAAoB,CAAC;gBACzB,aAAC;YAAD,CAAC,AAFD,IAEC;YAFY,iBAAM,SAElB,CAAA;QACL,CAAC,EAJa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAIvB;IACL,CAAC,EANM,eAAe,KAAf,eAAe,QAMrB"}
\ No newline at end of file
+{"version":3,"file":"typeResolution.js","sourceRoot":"","sources":["typeResolution.ts"],"names":[],"mappings":";;;IAAA,IAAc,eAAe,CAmG5B;IAnGD,WAAc,eAAe;QACzB,IAAc,UAAU,CAwEvB;QAxED,WAAc,UAAU;YACpB,IAAc,aAAa,CAwD1B;YAxDD,WAAc,aAAa;gBACvB;oBAAA;oBAmBA,CAAC;oBAlBU,2BAAU,GAAjB;wBACI,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAnBD,IAmBC;gBAnBY,oBAAM,SAmBlB,CAAA;gBACD;oBAAA;oBAsBA,CAAC;oBArBU,2BAAU,GAAjB;wBACI,+CAA+C;wBAE/C,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzE,IAAI,EAAqC,CAAC;wBAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAEzD,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAtBD,IAsBC;gBAtBY,oBAAM,SAsBlB,CAAA;gBAED;oBACI;wBACI;4BACI,uCAAuC;4BACvC,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAc,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACpC,IAAI,EAAqC,CAAC;4BAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAC7D,CAAC;oBACL,CAAC;oBACL,wBAAC;gBAAD,CAAC,AAVD,IAUC;YACL,CAAC,EAxDa,aAAa,GAAb,wBAAa,KAAb,wBAAa,QAwD1B;YAED,0EAA0E;YAC1E;gBACI;oBACI;wBACI,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;gBACL,CAAC;gBACL,aAAC;YAAD,CAAC,AAXD,IAWC;QACL,CAAC,EAxEa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAwEvB;QAED,IAAc,UAAU,CAWvB;QAXD,WAAc,UAAU;YACpB,IAAc,aAAa,CAO1B;YAPD,WAAc,aAAa;gBACvB,6DAA6D;gBAC7D;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;YAGnD,CAAC,EAPa,aAAa,GAAb,wBAAa,KAAb,wBAAa,QAO1B;QAGL,CAAC,EAXa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAWvB;QAED;YAAA;YAEA,CAAC;YADU,uBAAM,GAAb,cAAkB,CAAC;YACvB,aAAC;QAAD,CAAC,AAFD,IAEC;QAMD,IAAO,iBAAiB,CAEvB;QAFD,WAAO,iBAAiB;YACpB;gBAAA;gBAAsB,CAAC;gBAAD,aAAC;YAAD,CAAC,AAAvB,IAAuB;YAAV,wBAAM,SAAI,CAAA;QAC3B,CAAC,EAFM,iBAAiB,KAAjB,iBAAiB,QAEvB;IACL,CAAC,EAnGa,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAmG5B;IAED,IAAO,eAAe,CAMrB;IAND,WAAO,eAAe;QAClB,IAAc,UAAU,CAIvB;QAJD,WAAc,UAAU;YACpB;gBAAA;gBAEA,CAAC;gBADU,yBAAQ,GAAf,cAAoB,CAAC;gBACzB,aAAC;YAAD,CAAC,AAFD,IAEC;YAFY,iBAAM,SAElB,CAAA;QACL,CAAC,EAJa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAIvB;IACL,CAAC,EANM,eAAe,KAAf,eAAe,QAMrB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/typeResolution.sourcemap.txt b/tests/baselines/reference/typeResolution.sourcemap.txt
index 8cfb638991c..19e8b9991d1 100644
--- a/tests/baselines/reference/typeResolution.sourcemap.txt
+++ b/tests/baselines/reference/typeResolution.sourcemap.txt
@@ -10,6 +10,7 @@ sourceFile:typeResolution.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports"], function (require, exports) {
 >>>    "use strict";
+>>>    exports.__esModule = true;
 >>>    var TopLevelModule1;
 1 >^^^^
 2 >    ^^^^
@@ -119,10 +120,10 @@ sourceFile:typeResolution.ts
   >                               export class ClassA { }
   >                           }
   >                       }
-1 >Emitted(3, 5) Source(1, 1) + SourceIndex(0)
-2 >Emitted(3, 9) Source(1, 15) + SourceIndex(0)
-3 >Emitted(3, 24) Source(1, 30) + SourceIndex(0)
-4 >Emitted(3, 25) Source(100, 2) + SourceIndex(0)
+1 >Emitted(4, 5) Source(1, 1) + SourceIndex(0)
+2 >Emitted(4, 9) Source(1, 15) + SourceIndex(0)
+3 >Emitted(4, 24) Source(1, 30) + SourceIndex(0)
+4 >Emitted(4, 25) Source(100, 2) + SourceIndex(0)
 ---
 >>>    (function (TopLevelModule1) {
 1->^^^^
@@ -131,9 +132,9 @@ sourceFile:typeResolution.ts
 1->
 2 >    export module 
 3 >               TopLevelModule1
-1->Emitted(4, 5) Source(1, 1) + SourceIndex(0)
-2 >Emitted(4, 16) Source(1, 15) + SourceIndex(0)
-3 >Emitted(4, 31) Source(1, 30) + SourceIndex(0)
+1->Emitted(5, 5) Source(1, 1) + SourceIndex(0)
+2 >Emitted(5, 16) Source(1, 15) + SourceIndex(0)
+3 >Emitted(5, 31) Source(1, 30) + SourceIndex(0)
 ---
 >>>        var SubModule1;
 1 >^^^^^^^^
@@ -218,10 +219,10 @@ sourceFile:typeResolution.ts
   >                                  }
   >                              }
   >                          }
-1 >Emitted(5, 9) Source(2, 5) + SourceIndex(0)
-2 >Emitted(5, 13) Source(2, 19) + SourceIndex(0)
-3 >Emitted(5, 23) Source(2, 29) + SourceIndex(0)
-4 >Emitted(5, 24) Source(74, 6) + SourceIndex(0)
+1 >Emitted(6, 9) Source(2, 5) + SourceIndex(0)
+2 >Emitted(6, 13) Source(2, 19) + SourceIndex(0)
+3 >Emitted(6, 23) Source(2, 29) + SourceIndex(0)
+4 >Emitted(6, 24) Source(74, 6) + SourceIndex(0)
 ---
 >>>        (function (SubModule1) {
 1->^^^^^^^^
@@ -231,9 +232,9 @@ sourceFile:typeResolution.ts
 1->
 2 >        export module 
 3 >                   SubModule1
-1->Emitted(6, 9) Source(2, 5) + SourceIndex(0)
-2 >Emitted(6, 20) Source(2, 19) + SourceIndex(0)
-3 >Emitted(6, 30) Source(2, 29) + SourceIndex(0)
+1->Emitted(7, 9) Source(2, 5) + SourceIndex(0)
+2 >Emitted(7, 20) Source(2, 19) + SourceIndex(0)
+3 >Emitted(7, 30) Source(2, 29) + SourceIndex(0)
 ---
 >>>            var SubSubModule1;
 1->^^^^^^^^^^^^
@@ -302,10 +303,10 @@ sourceFile:typeResolution.ts
   >                                             }
   >                                         }
   >                                     }
-1->Emitted(7, 13) Source(3, 9) + SourceIndex(0)
-2 >Emitted(7, 17) Source(3, 23) + SourceIndex(0)
-3 >Emitted(7, 30) Source(3, 36) + SourceIndex(0)
-4 >Emitted(7, 31) Source(59, 10) + SourceIndex(0)
+1->Emitted(8, 13) Source(3, 9) + SourceIndex(0)
+2 >Emitted(8, 17) Source(3, 23) + SourceIndex(0)
+3 >Emitted(8, 30) Source(3, 36) + SourceIndex(0)
+4 >Emitted(8, 31) Source(59, 10) + SourceIndex(0)
 ---
 >>>            (function (SubSubModule1) {
 1->^^^^^^^^^^^^
@@ -315,22 +316,22 @@ sourceFile:typeResolution.ts
 1->
 2 >            export module 
 3 >                       SubSubModule1
-1->Emitted(8, 13) Source(3, 9) + SourceIndex(0)
-2 >Emitted(8, 24) Source(3, 23) + SourceIndex(0)
-3 >Emitted(8, 37) Source(3, 36) + SourceIndex(0)
+1->Emitted(9, 13) Source(3, 9) + SourceIndex(0)
+2 >Emitted(9, 24) Source(3, 23) + SourceIndex(0)
+3 >Emitted(9, 37) Source(3, 36) + SourceIndex(0)
 ---
 >>>                var ClassA = (function () {
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^^^^->
 1-> {
   >            
-1->Emitted(9, 17) Source(4, 13) + SourceIndex(0)
+1->Emitted(10, 17) Source(4, 13) + SourceIndex(0)
 ---
 >>>                    function ClassA() {
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^->
 1->
-1->Emitted(10, 21) Source(4, 13) + SourceIndex(0)
+1->Emitted(11, 21) Source(4, 13) + SourceIndex(0)
 ---
 >>>                    }
 1->^^^^^^^^^^^^^^^^^^^^
@@ -357,8 +358,8 @@ sourceFile:typeResolution.ts
   >                }
   >            
 2 >                    }
-1->Emitted(11, 21) Source(23, 13) + SourceIndex(0)
-2 >Emitted(11, 22) Source(23, 14) + SourceIndex(0)
+1->Emitted(12, 21) Source(23, 13) + SourceIndex(0)
+2 >Emitted(12, 22) Source(23, 14) + SourceIndex(0)
 ---
 >>>                    ClassA.prototype.AisIn1_1_1 = function () {
 1->^^^^^^^^^^^^^^^^^^^^
@@ -368,9 +369,9 @@ sourceFile:typeResolution.ts
 1->
 2 >                    AisIn1_1_1
 3 >                                               
-1->Emitted(12, 21) Source(5, 24) + SourceIndex(0)
-2 >Emitted(12, 48) Source(5, 34) + SourceIndex(0)
-3 >Emitted(12, 51) Source(5, 17) + SourceIndex(0)
+1->Emitted(13, 21) Source(5, 24) + SourceIndex(0)
+2 >Emitted(13, 48) Source(5, 34) + SourceIndex(0)
+3 >Emitted(13, 51) Source(5, 17) + SourceIndex(0)
 ---
 >>>                        // Try all qualified names of this type
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -378,8 +379,8 @@ sourceFile:typeResolution.ts
 1->public AisIn1_1_1() {
   >                    
 2 >                        // Try all qualified names of this type
-1->Emitted(13, 25) Source(6, 21) + SourceIndex(0)
-2 >Emitted(13, 64) Source(6, 60) + SourceIndex(0)
+1->Emitted(14, 25) Source(6, 21) + SourceIndex(0)
+2 >Emitted(14, 64) Source(6, 60) + SourceIndex(0)
 ---
 >>>                        var a1;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -392,10 +393,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a1: ClassA
 4 >                              ;
-1 >Emitted(14, 25) Source(7, 21) + SourceIndex(0)
-2 >Emitted(14, 29) Source(7, 25) + SourceIndex(0)
-3 >Emitted(14, 31) Source(7, 35) + SourceIndex(0)
-4 >Emitted(14, 32) Source(7, 36) + SourceIndex(0)
+1 >Emitted(15, 25) Source(7, 21) + SourceIndex(0)
+2 >Emitted(15, 29) Source(7, 25) + SourceIndex(0)
+3 >Emitted(15, 31) Source(7, 35) + SourceIndex(0)
+4 >Emitted(15, 32) Source(7, 36) + SourceIndex(0)
 ---
 >>>                        a1.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -410,12 +411,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(15, 25) Source(7, 37) + SourceIndex(0)
-2 >Emitted(15, 27) Source(7, 39) + SourceIndex(0)
-3 >Emitted(15, 28) Source(7, 40) + SourceIndex(0)
-4 >Emitted(15, 38) Source(7, 50) + SourceIndex(0)
-5 >Emitted(15, 40) Source(7, 52) + SourceIndex(0)
-6 >Emitted(15, 41) Source(7, 53) + SourceIndex(0)
+1->Emitted(16, 25) Source(7, 37) + SourceIndex(0)
+2 >Emitted(16, 27) Source(7, 39) + SourceIndex(0)
+3 >Emitted(16, 28) Source(7, 40) + SourceIndex(0)
+4 >Emitted(16, 38) Source(7, 50) + SourceIndex(0)
+5 >Emitted(16, 40) Source(7, 52) + SourceIndex(0)
+6 >Emitted(16, 41) Source(7, 53) + SourceIndex(0)
 ---
 >>>                        var a2;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -428,10 +429,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a2: SubSubModule1.ClassA
 4 >                              ;
-1 >Emitted(16, 25) Source(8, 21) + SourceIndex(0)
-2 >Emitted(16, 29) Source(8, 25) + SourceIndex(0)
-3 >Emitted(16, 31) Source(8, 49) + SourceIndex(0)
-4 >Emitted(16, 32) Source(8, 50) + SourceIndex(0)
+1 >Emitted(17, 25) Source(8, 21) + SourceIndex(0)
+2 >Emitted(17, 29) Source(8, 25) + SourceIndex(0)
+3 >Emitted(17, 31) Source(8, 49) + SourceIndex(0)
+4 >Emitted(17, 32) Source(8, 50) + SourceIndex(0)
 ---
 >>>                        a2.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -446,12 +447,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(17, 25) Source(8, 51) + SourceIndex(0)
-2 >Emitted(17, 27) Source(8, 53) + SourceIndex(0)
-3 >Emitted(17, 28) Source(8, 54) + SourceIndex(0)
-4 >Emitted(17, 38) Source(8, 64) + SourceIndex(0)
-5 >Emitted(17, 40) Source(8, 66) + SourceIndex(0)
-6 >Emitted(17, 41) Source(8, 67) + SourceIndex(0)
+1->Emitted(18, 25) Source(8, 51) + SourceIndex(0)
+2 >Emitted(18, 27) Source(8, 53) + SourceIndex(0)
+3 >Emitted(18, 28) Source(8, 54) + SourceIndex(0)
+4 >Emitted(18, 38) Source(8, 64) + SourceIndex(0)
+5 >Emitted(18, 40) Source(8, 66) + SourceIndex(0)
+6 >Emitted(18, 41) Source(8, 67) + SourceIndex(0)
 ---
 >>>                        var a3;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -464,10 +465,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a3: SubModule1.SubSubModule1.ClassA
 4 >                              ;
-1 >Emitted(18, 25) Source(9, 21) + SourceIndex(0)
-2 >Emitted(18, 29) Source(9, 25) + SourceIndex(0)
-3 >Emitted(18, 31) Source(9, 60) + SourceIndex(0)
-4 >Emitted(18, 32) Source(9, 61) + SourceIndex(0)
+1 >Emitted(19, 25) Source(9, 21) + SourceIndex(0)
+2 >Emitted(19, 29) Source(9, 25) + SourceIndex(0)
+3 >Emitted(19, 31) Source(9, 60) + SourceIndex(0)
+4 >Emitted(19, 32) Source(9, 61) + SourceIndex(0)
 ---
 >>>                        a3.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -482,12 +483,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(19, 25) Source(9, 62) + SourceIndex(0)
-2 >Emitted(19, 27) Source(9, 64) + SourceIndex(0)
-3 >Emitted(19, 28) Source(9, 65) + SourceIndex(0)
-4 >Emitted(19, 38) Source(9, 75) + SourceIndex(0)
-5 >Emitted(19, 40) Source(9, 77) + SourceIndex(0)
-6 >Emitted(19, 41) Source(9, 78) + SourceIndex(0)
+1->Emitted(20, 25) Source(9, 62) + SourceIndex(0)
+2 >Emitted(20, 27) Source(9, 64) + SourceIndex(0)
+3 >Emitted(20, 28) Source(9, 65) + SourceIndex(0)
+4 >Emitted(20, 38) Source(9, 75) + SourceIndex(0)
+5 >Emitted(20, 40) Source(9, 77) + SourceIndex(0)
+6 >Emitted(20, 41) Source(9, 78) + SourceIndex(0)
 ---
 >>>                        var a4;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -500,10 +501,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA
 4 >                              ;
-1 >Emitted(20, 25) Source(10, 21) + SourceIndex(0)
-2 >Emitted(20, 29) Source(10, 25) + SourceIndex(0)
-3 >Emitted(20, 31) Source(10, 76) + SourceIndex(0)
-4 >Emitted(20, 32) Source(10, 77) + SourceIndex(0)
+1 >Emitted(21, 25) Source(10, 21) + SourceIndex(0)
+2 >Emitted(21, 29) Source(10, 25) + SourceIndex(0)
+3 >Emitted(21, 31) Source(10, 76) + SourceIndex(0)
+4 >Emitted(21, 32) Source(10, 77) + SourceIndex(0)
 ---
 >>>                        a4.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -519,12 +520,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(21, 25) Source(10, 78) + SourceIndex(0)
-2 >Emitted(21, 27) Source(10, 80) + SourceIndex(0)
-3 >Emitted(21, 28) Source(10, 81) + SourceIndex(0)
-4 >Emitted(21, 38) Source(10, 91) + SourceIndex(0)
-5 >Emitted(21, 40) Source(10, 93) + SourceIndex(0)
-6 >Emitted(21, 41) Source(10, 94) + SourceIndex(0)
+1->Emitted(22, 25) Source(10, 78) + SourceIndex(0)
+2 >Emitted(22, 27) Source(10, 80) + SourceIndex(0)
+3 >Emitted(22, 28) Source(10, 81) + SourceIndex(0)
+4 >Emitted(22, 38) Source(10, 91) + SourceIndex(0)
+5 >Emitted(22, 40) Source(10, 93) + SourceIndex(0)
+6 >Emitted(22, 41) Source(10, 94) + SourceIndex(0)
 ---
 >>>                        // Two variants of qualifying a peer type
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -533,8 +534,8 @@ sourceFile:typeResolution.ts
   >                    
   >                    
 2 >                        // Two variants of qualifying a peer type
-1->Emitted(22, 25) Source(12, 21) + SourceIndex(0)
-2 >Emitted(22, 66) Source(12, 62) + SourceIndex(0)
+1->Emitted(23, 25) Source(12, 21) + SourceIndex(0)
+2 >Emitted(23, 66) Source(12, 62) + SourceIndex(0)
 ---
 >>>                        var b1;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -547,10 +548,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            b1: ClassB
 4 >                              ;
-1 >Emitted(23, 25) Source(13, 21) + SourceIndex(0)
-2 >Emitted(23, 29) Source(13, 25) + SourceIndex(0)
-3 >Emitted(23, 31) Source(13, 35) + SourceIndex(0)
-4 >Emitted(23, 32) Source(13, 36) + SourceIndex(0)
+1 >Emitted(24, 25) Source(13, 21) + SourceIndex(0)
+2 >Emitted(24, 29) Source(13, 25) + SourceIndex(0)
+3 >Emitted(24, 31) Source(13, 35) + SourceIndex(0)
+4 >Emitted(24, 32) Source(13, 36) + SourceIndex(0)
 ---
 >>>                        b1.BisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -565,12 +566,12 @@ sourceFile:typeResolution.ts
 4 >                           BisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(24, 25) Source(13, 37) + SourceIndex(0)
-2 >Emitted(24, 27) Source(13, 39) + SourceIndex(0)
-3 >Emitted(24, 28) Source(13, 40) + SourceIndex(0)
-4 >Emitted(24, 38) Source(13, 50) + SourceIndex(0)
-5 >Emitted(24, 40) Source(13, 52) + SourceIndex(0)
-6 >Emitted(24, 41) Source(13, 53) + SourceIndex(0)
+1->Emitted(25, 25) Source(13, 37) + SourceIndex(0)
+2 >Emitted(25, 27) Source(13, 39) + SourceIndex(0)
+3 >Emitted(25, 28) Source(13, 40) + SourceIndex(0)
+4 >Emitted(25, 38) Source(13, 50) + SourceIndex(0)
+5 >Emitted(25, 40) Source(13, 52) + SourceIndex(0)
+6 >Emitted(25, 41) Source(13, 53) + SourceIndex(0)
 ---
 >>>                        var b2;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -583,10 +584,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB
 4 >                              ;
-1 >Emitted(25, 25) Source(14, 21) + SourceIndex(0)
-2 >Emitted(25, 29) Source(14, 25) + SourceIndex(0)
-3 >Emitted(25, 31) Source(14, 76) + SourceIndex(0)
-4 >Emitted(25, 32) Source(14, 77) + SourceIndex(0)
+1 >Emitted(26, 25) Source(14, 21) + SourceIndex(0)
+2 >Emitted(26, 29) Source(14, 25) + SourceIndex(0)
+3 >Emitted(26, 31) Source(14, 76) + SourceIndex(0)
+4 >Emitted(26, 32) Source(14, 77) + SourceIndex(0)
 ---
 >>>                        b2.BisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -602,12 +603,12 @@ sourceFile:typeResolution.ts
 4 >                           BisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(26, 25) Source(14, 78) + SourceIndex(0)
-2 >Emitted(26, 27) Source(14, 80) + SourceIndex(0)
-3 >Emitted(26, 28) Source(14, 81) + SourceIndex(0)
-4 >Emitted(26, 38) Source(14, 91) + SourceIndex(0)
-5 >Emitted(26, 40) Source(14, 93) + SourceIndex(0)
-6 >Emitted(26, 41) Source(14, 94) + SourceIndex(0)
+1->Emitted(27, 25) Source(14, 78) + SourceIndex(0)
+2 >Emitted(27, 27) Source(14, 80) + SourceIndex(0)
+3 >Emitted(27, 28) Source(14, 81) + SourceIndex(0)
+4 >Emitted(27, 38) Source(14, 91) + SourceIndex(0)
+5 >Emitted(27, 40) Source(14, 93) + SourceIndex(0)
+6 >Emitted(27, 41) Source(14, 94) + SourceIndex(0)
 ---
 >>>                        // Type only accessible from the root
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -616,8 +617,8 @@ sourceFile:typeResolution.ts
   >                    
   >                    
 2 >                        // Type only accessible from the root
-1->Emitted(27, 25) Source(16, 21) + SourceIndex(0)
-2 >Emitted(27, 62) Source(16, 58) + SourceIndex(0)
+1->Emitted(28, 25) Source(16, 21) + SourceIndex(0)
+2 >Emitted(28, 62) Source(16, 58) + SourceIndex(0)
 ---
 >>>                        var c1;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -630,10 +631,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA
 4 >                              ;
-1 >Emitted(28, 25) Source(17, 21) + SourceIndex(0)
-2 >Emitted(28, 29) Source(17, 25) + SourceIndex(0)
-3 >Emitted(28, 31) Source(17, 76) + SourceIndex(0)
-4 >Emitted(28, 32) Source(17, 77) + SourceIndex(0)
+1 >Emitted(29, 25) Source(17, 21) + SourceIndex(0)
+2 >Emitted(29, 29) Source(17, 25) + SourceIndex(0)
+3 >Emitted(29, 31) Source(17, 76) + SourceIndex(0)
+4 >Emitted(29, 32) Source(17, 77) + SourceIndex(0)
 ---
 >>>                        c1.AisIn1_2_2();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -649,12 +650,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_2_2
 5 >                                     ()
 6 >                                       ;
-1->Emitted(29, 25) Source(17, 78) + SourceIndex(0)
-2 >Emitted(29, 27) Source(17, 80) + SourceIndex(0)
-3 >Emitted(29, 28) Source(17, 81) + SourceIndex(0)
-4 >Emitted(29, 38) Source(17, 91) + SourceIndex(0)
-5 >Emitted(29, 40) Source(17, 93) + SourceIndex(0)
-6 >Emitted(29, 41) Source(17, 94) + SourceIndex(0)
+1->Emitted(30, 25) Source(17, 78) + SourceIndex(0)
+2 >Emitted(30, 27) Source(17, 80) + SourceIndex(0)
+3 >Emitted(30, 28) Source(17, 81) + SourceIndex(0)
+4 >Emitted(30, 38) Source(17, 91) + SourceIndex(0)
+5 >Emitted(30, 40) Source(17, 93) + SourceIndex(0)
+6 >Emitted(30, 41) Source(17, 94) + SourceIndex(0)
 ---
 >>>                        // Interface reference
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -663,8 +664,8 @@ sourceFile:typeResolution.ts
   >                    
   >                    
 2 >                        // Interface reference
-1->Emitted(30, 25) Source(19, 21) + SourceIndex(0)
-2 >Emitted(30, 47) Source(19, 43) + SourceIndex(0)
+1->Emitted(31, 25) Source(19, 21) + SourceIndex(0)
+2 >Emitted(31, 47) Source(19, 43) + SourceIndex(0)
 ---
 >>>                        var d1;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -677,10 +678,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            d1: InterfaceX
 4 >                              ;
-1 >Emitted(31, 25) Source(20, 21) + SourceIndex(0)
-2 >Emitted(31, 29) Source(20, 25) + SourceIndex(0)
-3 >Emitted(31, 31) Source(20, 39) + SourceIndex(0)
-4 >Emitted(31, 32) Source(20, 40) + SourceIndex(0)
+1 >Emitted(32, 25) Source(20, 21) + SourceIndex(0)
+2 >Emitted(32, 29) Source(20, 25) + SourceIndex(0)
+3 >Emitted(32, 31) Source(20, 39) + SourceIndex(0)
+4 >Emitted(32, 32) Source(20, 40) + SourceIndex(0)
 ---
 >>>                        d1.XisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -695,12 +696,12 @@ sourceFile:typeResolution.ts
 4 >                           XisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(32, 25) Source(20, 41) + SourceIndex(0)
-2 >Emitted(32, 27) Source(20, 43) + SourceIndex(0)
-3 >Emitted(32, 28) Source(20, 44) + SourceIndex(0)
-4 >Emitted(32, 38) Source(20, 54) + SourceIndex(0)
-5 >Emitted(32, 40) Source(20, 56) + SourceIndex(0)
-6 >Emitted(32, 41) Source(20, 57) + SourceIndex(0)
+1->Emitted(33, 25) Source(20, 41) + SourceIndex(0)
+2 >Emitted(33, 27) Source(20, 43) + SourceIndex(0)
+3 >Emitted(33, 28) Source(20, 44) + SourceIndex(0)
+4 >Emitted(33, 38) Source(20, 54) + SourceIndex(0)
+5 >Emitted(33, 40) Source(20, 56) + SourceIndex(0)
+6 >Emitted(33, 41) Source(20, 57) + SourceIndex(0)
 ---
 >>>                        var d2;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -713,10 +714,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            d2: SubSubModule1.InterfaceX
 4 >                              ;
-1 >Emitted(33, 25) Source(21, 21) + SourceIndex(0)
-2 >Emitted(33, 29) Source(21, 25) + SourceIndex(0)
-3 >Emitted(33, 31) Source(21, 53) + SourceIndex(0)
-4 >Emitted(33, 32) Source(21, 54) + SourceIndex(0)
+1 >Emitted(34, 25) Source(21, 21) + SourceIndex(0)
+2 >Emitted(34, 29) Source(21, 25) + SourceIndex(0)
+3 >Emitted(34, 31) Source(21, 53) + SourceIndex(0)
+4 >Emitted(34, 32) Source(21, 54) + SourceIndex(0)
 ---
 >>>                        d2.XisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -731,12 +732,12 @@ sourceFile:typeResolution.ts
 4 >                           XisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(34, 25) Source(21, 55) + SourceIndex(0)
-2 >Emitted(34, 27) Source(21, 57) + SourceIndex(0)
-3 >Emitted(34, 28) Source(21, 58) + SourceIndex(0)
-4 >Emitted(34, 38) Source(21, 68) + SourceIndex(0)
-5 >Emitted(34, 40) Source(21, 70) + SourceIndex(0)
-6 >Emitted(34, 41) Source(21, 71) + SourceIndex(0)
+1->Emitted(35, 25) Source(21, 55) + SourceIndex(0)
+2 >Emitted(35, 27) Source(21, 57) + SourceIndex(0)
+3 >Emitted(35, 28) Source(21, 58) + SourceIndex(0)
+4 >Emitted(35, 38) Source(21, 68) + SourceIndex(0)
+5 >Emitted(35, 40) Source(21, 70) + SourceIndex(0)
+6 >Emitted(35, 41) Source(21, 71) + SourceIndex(0)
 ---
 >>>                    };
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -745,8 +746,8 @@ sourceFile:typeResolution.ts
 1 >
   >                
 2 >                    }
-1 >Emitted(35, 21) Source(22, 17) + SourceIndex(0)
-2 >Emitted(35, 22) Source(22, 18) + SourceIndex(0)
+1 >Emitted(36, 21) Source(22, 17) + SourceIndex(0)
+2 >Emitted(36, 22) Source(22, 18) + SourceIndex(0)
 ---
 >>>                    return ClassA;
 1->^^^^^^^^^^^^^^^^^^^^
@@ -754,8 +755,8 @@ sourceFile:typeResolution.ts
 1->
   >            
 2 >                    }
-1->Emitted(36, 21) Source(23, 13) + SourceIndex(0)
-2 >Emitted(36, 34) Source(23, 14) + SourceIndex(0)
+1->Emitted(37, 21) Source(23, 13) + SourceIndex(0)
+2 >Emitted(37, 34) Source(23, 14) + SourceIndex(0)
 ---
 >>>                }());
 1 >^^^^^^^^^^^^^^^^
@@ -786,10 +787,10 @@ sourceFile:typeResolution.ts
   >                                     var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1();
   >                                 }
   >                             }
-1 >Emitted(37, 17) Source(23, 13) + SourceIndex(0)
-2 >Emitted(37, 18) Source(23, 14) + SourceIndex(0)
-3 >Emitted(37, 18) Source(4, 13) + SourceIndex(0)
-4 >Emitted(37, 22) Source(23, 14) + SourceIndex(0)
+1 >Emitted(38, 17) Source(23, 13) + SourceIndex(0)
+2 >Emitted(38, 18) Source(23, 14) + SourceIndex(0)
+3 >Emitted(38, 18) Source(4, 13) + SourceIndex(0)
+4 >Emitted(38, 22) Source(23, 14) + SourceIndex(0)
 ---
 >>>                SubSubModule1.ClassA = ClassA;
 1->^^^^^^^^^^^^^^^^
@@ -819,23 +820,23 @@ sourceFile:typeResolution.ts
   >                                                    }
   >                                                }
 4 >                                             
-1->Emitted(38, 17) Source(4, 26) + SourceIndex(0)
-2 >Emitted(38, 37) Source(4, 32) + SourceIndex(0)
-3 >Emitted(38, 46) Source(23, 14) + SourceIndex(0)
-4 >Emitted(38, 47) Source(23, 14) + SourceIndex(0)
+1->Emitted(39, 17) Source(4, 26) + SourceIndex(0)
+2 >Emitted(39, 37) Source(4, 32) + SourceIndex(0)
+3 >Emitted(39, 46) Source(23, 14) + SourceIndex(0)
+4 >Emitted(39, 47) Source(23, 14) + SourceIndex(0)
 ---
 >>>                var ClassB = (function () {
 1 >^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >            
-1 >Emitted(39, 17) Source(24, 13) + SourceIndex(0)
+1 >Emitted(40, 17) Source(24, 13) + SourceIndex(0)
 ---
 >>>                    function ClassB() {
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^->
 1->
-1->Emitted(40, 21) Source(24, 13) + SourceIndex(0)
+1->Emitted(41, 21) Source(24, 13) + SourceIndex(0)
 ---
 >>>                    }
 1->^^^^^^^^^^^^^^^^^^^^
@@ -865,8 +866,8 @@ sourceFile:typeResolution.ts
   >                }
   >            
 2 >                    }
-1->Emitted(41, 21) Source(46, 13) + SourceIndex(0)
-2 >Emitted(41, 22) Source(46, 14) + SourceIndex(0)
+1->Emitted(42, 21) Source(46, 13) + SourceIndex(0)
+2 >Emitted(42, 22) Source(46, 14) + SourceIndex(0)
 ---
 >>>                    ClassB.prototype.BisIn1_1_1 = function () {
 1->^^^^^^^^^^^^^^^^^^^^
@@ -876,9 +877,9 @@ sourceFile:typeResolution.ts
 1->
 2 >                    BisIn1_1_1
 3 >                                               
-1->Emitted(42, 21) Source(25, 24) + SourceIndex(0)
-2 >Emitted(42, 48) Source(25, 34) + SourceIndex(0)
-3 >Emitted(42, 51) Source(25, 17) + SourceIndex(0)
+1->Emitted(43, 21) Source(25, 24) + SourceIndex(0)
+2 >Emitted(43, 48) Source(25, 34) + SourceIndex(0)
+3 >Emitted(43, 51) Source(25, 17) + SourceIndex(0)
 ---
 >>>                        /** Exactly the same as above in AisIn1_1_1 **/
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -886,8 +887,8 @@ sourceFile:typeResolution.ts
 1->public BisIn1_1_1() {
   >                    
 2 >                        /** Exactly the same as above in AisIn1_1_1 **/
-1->Emitted(43, 25) Source(26, 21) + SourceIndex(0)
-2 >Emitted(43, 72) Source(26, 68) + SourceIndex(0)
+1->Emitted(44, 25) Source(26, 21) + SourceIndex(0)
+2 >Emitted(44, 72) Source(26, 68) + SourceIndex(0)
 ---
 >>>                        // Try all qualified names of this type
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -896,8 +897,8 @@ sourceFile:typeResolution.ts
   >                    
   >                    
 2 >                        // Try all qualified names of this type
-1 >Emitted(44, 25) Source(28, 21) + SourceIndex(0)
-2 >Emitted(44, 64) Source(28, 60) + SourceIndex(0)
+1 >Emitted(45, 25) Source(28, 21) + SourceIndex(0)
+2 >Emitted(45, 64) Source(28, 60) + SourceIndex(0)
 ---
 >>>                        var a1;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -910,10 +911,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a1: ClassA
 4 >                              ;
-1 >Emitted(45, 25) Source(29, 21) + SourceIndex(0)
-2 >Emitted(45, 29) Source(29, 25) + SourceIndex(0)
-3 >Emitted(45, 31) Source(29, 35) + SourceIndex(0)
-4 >Emitted(45, 32) Source(29, 36) + SourceIndex(0)
+1 >Emitted(46, 25) Source(29, 21) + SourceIndex(0)
+2 >Emitted(46, 29) Source(29, 25) + SourceIndex(0)
+3 >Emitted(46, 31) Source(29, 35) + SourceIndex(0)
+4 >Emitted(46, 32) Source(29, 36) + SourceIndex(0)
 ---
 >>>                        a1.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -928,12 +929,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(46, 25) Source(29, 37) + SourceIndex(0)
-2 >Emitted(46, 27) Source(29, 39) + SourceIndex(0)
-3 >Emitted(46, 28) Source(29, 40) + SourceIndex(0)
-4 >Emitted(46, 38) Source(29, 50) + SourceIndex(0)
-5 >Emitted(46, 40) Source(29, 52) + SourceIndex(0)
-6 >Emitted(46, 41) Source(29, 53) + SourceIndex(0)
+1->Emitted(47, 25) Source(29, 37) + SourceIndex(0)
+2 >Emitted(47, 27) Source(29, 39) + SourceIndex(0)
+3 >Emitted(47, 28) Source(29, 40) + SourceIndex(0)
+4 >Emitted(47, 38) Source(29, 50) + SourceIndex(0)
+5 >Emitted(47, 40) Source(29, 52) + SourceIndex(0)
+6 >Emitted(47, 41) Source(29, 53) + SourceIndex(0)
 ---
 >>>                        var a2;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -946,10 +947,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a2: SubSubModule1.ClassA
 4 >                              ;
-1 >Emitted(47, 25) Source(30, 21) + SourceIndex(0)
-2 >Emitted(47, 29) Source(30, 25) + SourceIndex(0)
-3 >Emitted(47, 31) Source(30, 49) + SourceIndex(0)
-4 >Emitted(47, 32) Source(30, 50) + SourceIndex(0)
+1 >Emitted(48, 25) Source(30, 21) + SourceIndex(0)
+2 >Emitted(48, 29) Source(30, 25) + SourceIndex(0)
+3 >Emitted(48, 31) Source(30, 49) + SourceIndex(0)
+4 >Emitted(48, 32) Source(30, 50) + SourceIndex(0)
 ---
 >>>                        a2.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -964,12 +965,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(48, 25) Source(30, 51) + SourceIndex(0)
-2 >Emitted(48, 27) Source(30, 53) + SourceIndex(0)
-3 >Emitted(48, 28) Source(30, 54) + SourceIndex(0)
-4 >Emitted(48, 38) Source(30, 64) + SourceIndex(0)
-5 >Emitted(48, 40) Source(30, 66) + SourceIndex(0)
-6 >Emitted(48, 41) Source(30, 67) + SourceIndex(0)
+1->Emitted(49, 25) Source(30, 51) + SourceIndex(0)
+2 >Emitted(49, 27) Source(30, 53) + SourceIndex(0)
+3 >Emitted(49, 28) Source(30, 54) + SourceIndex(0)
+4 >Emitted(49, 38) Source(30, 64) + SourceIndex(0)
+5 >Emitted(49, 40) Source(30, 66) + SourceIndex(0)
+6 >Emitted(49, 41) Source(30, 67) + SourceIndex(0)
 ---
 >>>                        var a3;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -982,10 +983,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a3: SubModule1.SubSubModule1.ClassA
 4 >                              ;
-1 >Emitted(49, 25) Source(31, 21) + SourceIndex(0)
-2 >Emitted(49, 29) Source(31, 25) + SourceIndex(0)
-3 >Emitted(49, 31) Source(31, 60) + SourceIndex(0)
-4 >Emitted(49, 32) Source(31, 61) + SourceIndex(0)
+1 >Emitted(50, 25) Source(31, 21) + SourceIndex(0)
+2 >Emitted(50, 29) Source(31, 25) + SourceIndex(0)
+3 >Emitted(50, 31) Source(31, 60) + SourceIndex(0)
+4 >Emitted(50, 32) Source(31, 61) + SourceIndex(0)
 ---
 >>>                        a3.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1000,12 +1001,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(50, 25) Source(31, 62) + SourceIndex(0)
-2 >Emitted(50, 27) Source(31, 64) + SourceIndex(0)
-3 >Emitted(50, 28) Source(31, 65) + SourceIndex(0)
-4 >Emitted(50, 38) Source(31, 75) + SourceIndex(0)
-5 >Emitted(50, 40) Source(31, 77) + SourceIndex(0)
-6 >Emitted(50, 41) Source(31, 78) + SourceIndex(0)
+1->Emitted(51, 25) Source(31, 62) + SourceIndex(0)
+2 >Emitted(51, 27) Source(31, 64) + SourceIndex(0)
+3 >Emitted(51, 28) Source(31, 65) + SourceIndex(0)
+4 >Emitted(51, 38) Source(31, 75) + SourceIndex(0)
+5 >Emitted(51, 40) Source(31, 77) + SourceIndex(0)
+6 >Emitted(51, 41) Source(31, 78) + SourceIndex(0)
 ---
 >>>                        var a4;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1018,10 +1019,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA
 4 >                              ;
-1 >Emitted(51, 25) Source(32, 21) + SourceIndex(0)
-2 >Emitted(51, 29) Source(32, 25) + SourceIndex(0)
-3 >Emitted(51, 31) Source(32, 76) + SourceIndex(0)
-4 >Emitted(51, 32) Source(32, 77) + SourceIndex(0)
+1 >Emitted(52, 25) Source(32, 21) + SourceIndex(0)
+2 >Emitted(52, 29) Source(32, 25) + SourceIndex(0)
+3 >Emitted(52, 31) Source(32, 76) + SourceIndex(0)
+4 >Emitted(52, 32) Source(32, 77) + SourceIndex(0)
 ---
 >>>                        a4.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1037,12 +1038,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(52, 25) Source(32, 78) + SourceIndex(0)
-2 >Emitted(52, 27) Source(32, 80) + SourceIndex(0)
-3 >Emitted(52, 28) Source(32, 81) + SourceIndex(0)
-4 >Emitted(52, 38) Source(32, 91) + SourceIndex(0)
-5 >Emitted(52, 40) Source(32, 93) + SourceIndex(0)
-6 >Emitted(52, 41) Source(32, 94) + SourceIndex(0)
+1->Emitted(53, 25) Source(32, 78) + SourceIndex(0)
+2 >Emitted(53, 27) Source(32, 80) + SourceIndex(0)
+3 >Emitted(53, 28) Source(32, 81) + SourceIndex(0)
+4 >Emitted(53, 38) Source(32, 91) + SourceIndex(0)
+5 >Emitted(53, 40) Source(32, 93) + SourceIndex(0)
+6 >Emitted(53, 41) Source(32, 94) + SourceIndex(0)
 ---
 >>>                        // Two variants of qualifying a peer type
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1051,8 +1052,8 @@ sourceFile:typeResolution.ts
   >                    
   >                    
 2 >                        // Two variants of qualifying a peer type
-1->Emitted(53, 25) Source(34, 21) + SourceIndex(0)
-2 >Emitted(53, 66) Source(34, 62) + SourceIndex(0)
+1->Emitted(54, 25) Source(34, 21) + SourceIndex(0)
+2 >Emitted(54, 66) Source(34, 62) + SourceIndex(0)
 ---
 >>>                        var b1;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1065,10 +1066,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            b1: ClassB
 4 >                              ;
-1 >Emitted(54, 25) Source(35, 21) + SourceIndex(0)
-2 >Emitted(54, 29) Source(35, 25) + SourceIndex(0)
-3 >Emitted(54, 31) Source(35, 35) + SourceIndex(0)
-4 >Emitted(54, 32) Source(35, 36) + SourceIndex(0)
+1 >Emitted(55, 25) Source(35, 21) + SourceIndex(0)
+2 >Emitted(55, 29) Source(35, 25) + SourceIndex(0)
+3 >Emitted(55, 31) Source(35, 35) + SourceIndex(0)
+4 >Emitted(55, 32) Source(35, 36) + SourceIndex(0)
 ---
 >>>                        b1.BisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1083,12 +1084,12 @@ sourceFile:typeResolution.ts
 4 >                           BisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(55, 25) Source(35, 37) + SourceIndex(0)
-2 >Emitted(55, 27) Source(35, 39) + SourceIndex(0)
-3 >Emitted(55, 28) Source(35, 40) + SourceIndex(0)
-4 >Emitted(55, 38) Source(35, 50) + SourceIndex(0)
-5 >Emitted(55, 40) Source(35, 52) + SourceIndex(0)
-6 >Emitted(55, 41) Source(35, 53) + SourceIndex(0)
+1->Emitted(56, 25) Source(35, 37) + SourceIndex(0)
+2 >Emitted(56, 27) Source(35, 39) + SourceIndex(0)
+3 >Emitted(56, 28) Source(35, 40) + SourceIndex(0)
+4 >Emitted(56, 38) Source(35, 50) + SourceIndex(0)
+5 >Emitted(56, 40) Source(35, 52) + SourceIndex(0)
+6 >Emitted(56, 41) Source(35, 53) + SourceIndex(0)
 ---
 >>>                        var b2;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1101,10 +1102,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB
 4 >                              ;
-1 >Emitted(56, 25) Source(36, 21) + SourceIndex(0)
-2 >Emitted(56, 29) Source(36, 25) + SourceIndex(0)
-3 >Emitted(56, 31) Source(36, 76) + SourceIndex(0)
-4 >Emitted(56, 32) Source(36, 77) + SourceIndex(0)
+1 >Emitted(57, 25) Source(36, 21) + SourceIndex(0)
+2 >Emitted(57, 29) Source(36, 25) + SourceIndex(0)
+3 >Emitted(57, 31) Source(36, 76) + SourceIndex(0)
+4 >Emitted(57, 32) Source(36, 77) + SourceIndex(0)
 ---
 >>>                        b2.BisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1120,12 +1121,12 @@ sourceFile:typeResolution.ts
 4 >                           BisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(57, 25) Source(36, 78) + SourceIndex(0)
-2 >Emitted(57, 27) Source(36, 80) + SourceIndex(0)
-3 >Emitted(57, 28) Source(36, 81) + SourceIndex(0)
-4 >Emitted(57, 38) Source(36, 91) + SourceIndex(0)
-5 >Emitted(57, 40) Source(36, 93) + SourceIndex(0)
-6 >Emitted(57, 41) Source(36, 94) + SourceIndex(0)
+1->Emitted(58, 25) Source(36, 78) + SourceIndex(0)
+2 >Emitted(58, 27) Source(36, 80) + SourceIndex(0)
+3 >Emitted(58, 28) Source(36, 81) + SourceIndex(0)
+4 >Emitted(58, 38) Source(36, 91) + SourceIndex(0)
+5 >Emitted(58, 40) Source(36, 93) + SourceIndex(0)
+6 >Emitted(58, 41) Source(36, 94) + SourceIndex(0)
 ---
 >>>                        // Type only accessible from the root
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1134,8 +1135,8 @@ sourceFile:typeResolution.ts
   >                    
   >                    
 2 >                        // Type only accessible from the root
-1->Emitted(58, 25) Source(38, 21) + SourceIndex(0)
-2 >Emitted(58, 62) Source(38, 58) + SourceIndex(0)
+1->Emitted(59, 25) Source(38, 21) + SourceIndex(0)
+2 >Emitted(59, 62) Source(38, 58) + SourceIndex(0)
 ---
 >>>                        var c1;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1148,10 +1149,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA
 4 >                              ;
-1 >Emitted(59, 25) Source(39, 21) + SourceIndex(0)
-2 >Emitted(59, 29) Source(39, 25) + SourceIndex(0)
-3 >Emitted(59, 31) Source(39, 76) + SourceIndex(0)
-4 >Emitted(59, 32) Source(39, 77) + SourceIndex(0)
+1 >Emitted(60, 25) Source(39, 21) + SourceIndex(0)
+2 >Emitted(60, 29) Source(39, 25) + SourceIndex(0)
+3 >Emitted(60, 31) Source(39, 76) + SourceIndex(0)
+4 >Emitted(60, 32) Source(39, 77) + SourceIndex(0)
 ---
 >>>                        c1.AisIn1_2_2();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1166,12 +1167,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_2_2
 5 >                                     ()
 6 >                                       ;
-1->Emitted(60, 25) Source(39, 78) + SourceIndex(0)
-2 >Emitted(60, 27) Source(39, 80) + SourceIndex(0)
-3 >Emitted(60, 28) Source(39, 81) + SourceIndex(0)
-4 >Emitted(60, 38) Source(39, 91) + SourceIndex(0)
-5 >Emitted(60, 40) Source(39, 93) + SourceIndex(0)
-6 >Emitted(60, 41) Source(39, 94) + SourceIndex(0)
+1->Emitted(61, 25) Source(39, 78) + SourceIndex(0)
+2 >Emitted(61, 27) Source(39, 80) + SourceIndex(0)
+3 >Emitted(61, 28) Source(39, 81) + SourceIndex(0)
+4 >Emitted(61, 38) Source(39, 91) + SourceIndex(0)
+5 >Emitted(61, 40) Source(39, 93) + SourceIndex(0)
+6 >Emitted(61, 41) Source(39, 94) + SourceIndex(0)
 ---
 >>>                        var c2;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1184,10 +1185,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            c2: TopLevelModule2.SubModule3.ClassA
 4 >                              ;
-1 >Emitted(61, 25) Source(40, 21) + SourceIndex(0)
-2 >Emitted(61, 29) Source(40, 25) + SourceIndex(0)
-3 >Emitted(61, 31) Source(40, 62) + SourceIndex(0)
-4 >Emitted(61, 32) Source(40, 63) + SourceIndex(0)
+1 >Emitted(62, 25) Source(40, 21) + SourceIndex(0)
+2 >Emitted(62, 29) Source(40, 25) + SourceIndex(0)
+3 >Emitted(62, 31) Source(40, 62) + SourceIndex(0)
+4 >Emitted(62, 32) Source(40, 63) + SourceIndex(0)
 ---
 >>>                        c2.AisIn2_3();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1203,12 +1204,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn2_3
 5 >                                   ()
 6 >                                     ;
-1->Emitted(62, 25) Source(40, 64) + SourceIndex(0)
-2 >Emitted(62, 27) Source(40, 66) + SourceIndex(0)
-3 >Emitted(62, 28) Source(40, 67) + SourceIndex(0)
-4 >Emitted(62, 36) Source(40, 75) + SourceIndex(0)
-5 >Emitted(62, 38) Source(40, 77) + SourceIndex(0)
-6 >Emitted(62, 39) Source(40, 78) + SourceIndex(0)
+1->Emitted(63, 25) Source(40, 64) + SourceIndex(0)
+2 >Emitted(63, 27) Source(40, 66) + SourceIndex(0)
+3 >Emitted(63, 28) Source(40, 67) + SourceIndex(0)
+4 >Emitted(63, 36) Source(40, 75) + SourceIndex(0)
+5 >Emitted(63, 38) Source(40, 77) + SourceIndex(0)
+6 >Emitted(63, 39) Source(40, 78) + SourceIndex(0)
 ---
 >>>                        // Interface reference
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1217,8 +1218,8 @@ sourceFile:typeResolution.ts
   >                    
   >                    
 2 >                        // Interface reference
-1->Emitted(63, 25) Source(42, 21) + SourceIndex(0)
-2 >Emitted(63, 47) Source(42, 43) + SourceIndex(0)
+1->Emitted(64, 25) Source(42, 21) + SourceIndex(0)
+2 >Emitted(64, 47) Source(42, 43) + SourceIndex(0)
 ---
 >>>                        var d1;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1231,10 +1232,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            d1: InterfaceX
 4 >                              ;
-1 >Emitted(64, 25) Source(43, 21) + SourceIndex(0)
-2 >Emitted(64, 29) Source(43, 25) + SourceIndex(0)
-3 >Emitted(64, 31) Source(43, 39) + SourceIndex(0)
-4 >Emitted(64, 32) Source(43, 40) + SourceIndex(0)
+1 >Emitted(65, 25) Source(43, 21) + SourceIndex(0)
+2 >Emitted(65, 29) Source(43, 25) + SourceIndex(0)
+3 >Emitted(65, 31) Source(43, 39) + SourceIndex(0)
+4 >Emitted(65, 32) Source(43, 40) + SourceIndex(0)
 ---
 >>>                        d1.XisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1249,12 +1250,12 @@ sourceFile:typeResolution.ts
 4 >                           XisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(65, 25) Source(43, 41) + SourceIndex(0)
-2 >Emitted(65, 27) Source(43, 43) + SourceIndex(0)
-3 >Emitted(65, 28) Source(43, 44) + SourceIndex(0)
-4 >Emitted(65, 38) Source(43, 54) + SourceIndex(0)
-5 >Emitted(65, 40) Source(43, 56) + SourceIndex(0)
-6 >Emitted(65, 41) Source(43, 57) + SourceIndex(0)
+1->Emitted(66, 25) Source(43, 41) + SourceIndex(0)
+2 >Emitted(66, 27) Source(43, 43) + SourceIndex(0)
+3 >Emitted(66, 28) Source(43, 44) + SourceIndex(0)
+4 >Emitted(66, 38) Source(43, 54) + SourceIndex(0)
+5 >Emitted(66, 40) Source(43, 56) + SourceIndex(0)
+6 >Emitted(66, 41) Source(43, 57) + SourceIndex(0)
 ---
 >>>                        var d2;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1267,10 +1268,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            d2: SubSubModule1.InterfaceX
 4 >                              ;
-1 >Emitted(66, 25) Source(44, 21) + SourceIndex(0)
-2 >Emitted(66, 29) Source(44, 25) + SourceIndex(0)
-3 >Emitted(66, 31) Source(44, 53) + SourceIndex(0)
-4 >Emitted(66, 32) Source(44, 54) + SourceIndex(0)
+1 >Emitted(67, 25) Source(44, 21) + SourceIndex(0)
+2 >Emitted(67, 29) Source(44, 25) + SourceIndex(0)
+3 >Emitted(67, 31) Source(44, 53) + SourceIndex(0)
+4 >Emitted(67, 32) Source(44, 54) + SourceIndex(0)
 ---
 >>>                        d2.XisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1285,12 +1286,12 @@ sourceFile:typeResolution.ts
 4 >                           XisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(67, 25) Source(44, 55) + SourceIndex(0)
-2 >Emitted(67, 27) Source(44, 57) + SourceIndex(0)
-3 >Emitted(67, 28) Source(44, 58) + SourceIndex(0)
-4 >Emitted(67, 38) Source(44, 68) + SourceIndex(0)
-5 >Emitted(67, 40) Source(44, 70) + SourceIndex(0)
-6 >Emitted(67, 41) Source(44, 71) + SourceIndex(0)
+1->Emitted(68, 25) Source(44, 55) + SourceIndex(0)
+2 >Emitted(68, 27) Source(44, 57) + SourceIndex(0)
+3 >Emitted(68, 28) Source(44, 58) + SourceIndex(0)
+4 >Emitted(68, 38) Source(44, 68) + SourceIndex(0)
+5 >Emitted(68, 40) Source(44, 70) + SourceIndex(0)
+6 >Emitted(68, 41) Source(44, 71) + SourceIndex(0)
 ---
 >>>                    };
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -1299,8 +1300,8 @@ sourceFile:typeResolution.ts
 1 >
   >                
 2 >                    }
-1 >Emitted(68, 21) Source(45, 17) + SourceIndex(0)
-2 >Emitted(68, 22) Source(45, 18) + SourceIndex(0)
+1 >Emitted(69, 21) Source(45, 17) + SourceIndex(0)
+2 >Emitted(69, 22) Source(45, 18) + SourceIndex(0)
 ---
 >>>                    return ClassB;
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1308,8 +1309,8 @@ sourceFile:typeResolution.ts
 1->
   >            
 2 >                    }
-1->Emitted(69, 21) Source(46, 13) + SourceIndex(0)
-2 >Emitted(69, 34) Source(46, 14) + SourceIndex(0)
+1->Emitted(70, 21) Source(46, 13) + SourceIndex(0)
+2 >Emitted(70, 34) Source(46, 14) + SourceIndex(0)
 ---
 >>>                }());
 1 >^^^^^^^^^^^^^^^^
@@ -1343,10 +1344,10 @@ sourceFile:typeResolution.ts
   >                                     var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1();
   >                                 }
   >                             }
-1 >Emitted(70, 17) Source(46, 13) + SourceIndex(0)
-2 >Emitted(70, 18) Source(46, 14) + SourceIndex(0)
-3 >Emitted(70, 18) Source(24, 13) + SourceIndex(0)
-4 >Emitted(70, 22) Source(46, 14) + SourceIndex(0)
+1 >Emitted(71, 17) Source(46, 13) + SourceIndex(0)
+2 >Emitted(71, 18) Source(46, 14) + SourceIndex(0)
+3 >Emitted(71, 18) Source(24, 13) + SourceIndex(0)
+4 >Emitted(71, 22) Source(46, 14) + SourceIndex(0)
 ---
 >>>                SubSubModule1.ClassB = ClassB;
 1->^^^^^^^^^^^^^^^^
@@ -1380,10 +1381,10 @@ sourceFile:typeResolution.ts
   >                                                    }
   >                                                }
 4 >                                             
-1->Emitted(71, 17) Source(24, 26) + SourceIndex(0)
-2 >Emitted(71, 37) Source(24, 32) + SourceIndex(0)
-3 >Emitted(71, 46) Source(46, 14) + SourceIndex(0)
-4 >Emitted(71, 47) Source(46, 14) + SourceIndex(0)
+1->Emitted(72, 17) Source(24, 26) + SourceIndex(0)
+2 >Emitted(72, 37) Source(24, 32) + SourceIndex(0)
+3 >Emitted(72, 46) Source(46, 14) + SourceIndex(0)
+4 >Emitted(72, 47) Source(46, 14) + SourceIndex(0)
 ---
 >>>                var NonExportedClassQ = (function () {
 1->^^^^^^^^^^^^^^^^
@@ -1391,21 +1392,21 @@ sourceFile:typeResolution.ts
 1->
   >            export interface InterfaceX { XisIn1_1_1(); }
   >            
-1->Emitted(72, 17) Source(48, 13) + SourceIndex(0)
+1->Emitted(73, 17) Source(48, 13) + SourceIndex(0)
 ---
 >>>                    function NonExportedClassQ() {
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^^^^^^^^^^^^^^^^^^^->
 1->class NonExportedClassQ {
   >                
-1->Emitted(73, 21) Source(49, 17) + SourceIndex(0)
+1->Emitted(74, 21) Source(49, 17) + SourceIndex(0)
 ---
 >>>                        function QQ() {
 1->^^^^^^^^^^^^^^^^^^^^^^^^
 2 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->constructor() {
   >                    
-1->Emitted(74, 25) Source(50, 21) + SourceIndex(0)
+1->Emitted(75, 25) Source(50, 21) + SourceIndex(0)
 ---
 >>>                            /* Sampling of stuff from AisIn1_1_1 */
 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1413,8 +1414,8 @@ sourceFile:typeResolution.ts
 1->function QQ() {
   >                        
 2 >                            /* Sampling of stuff from AisIn1_1_1 */
-1->Emitted(75, 29) Source(51, 25) + SourceIndex(0)
-2 >Emitted(75, 68) Source(51, 64) + SourceIndex(0)
+1->Emitted(76, 29) Source(51, 25) + SourceIndex(0)
+2 >Emitted(76, 68) Source(51, 64) + SourceIndex(0)
 ---
 >>>                            var a4;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1427,10 +1428,10 @@ sourceFile:typeResolution.ts
 2 >                            var 
 3 >                                a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA
 4 >                                  ;
-1 >Emitted(76, 29) Source(52, 25) + SourceIndex(0)
-2 >Emitted(76, 33) Source(52, 29) + SourceIndex(0)
-3 >Emitted(76, 35) Source(52, 80) + SourceIndex(0)
-4 >Emitted(76, 36) Source(52, 81) + SourceIndex(0)
+1 >Emitted(77, 29) Source(52, 25) + SourceIndex(0)
+2 >Emitted(77, 33) Source(52, 29) + SourceIndex(0)
+3 >Emitted(77, 35) Source(52, 80) + SourceIndex(0)
+4 >Emitted(77, 36) Source(52, 81) + SourceIndex(0)
 ---
 >>>                            a4.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1445,12 +1446,12 @@ sourceFile:typeResolution.ts
 4 >                               AisIn1_1_1
 5 >                                         ()
 6 >                                           ;
-1->Emitted(77, 29) Source(52, 82) + SourceIndex(0)
-2 >Emitted(77, 31) Source(52, 84) + SourceIndex(0)
-3 >Emitted(77, 32) Source(52, 85) + SourceIndex(0)
-4 >Emitted(77, 42) Source(52, 95) + SourceIndex(0)
-5 >Emitted(77, 44) Source(52, 97) + SourceIndex(0)
-6 >Emitted(77, 45) Source(52, 98) + SourceIndex(0)
+1->Emitted(78, 29) Source(52, 82) + SourceIndex(0)
+2 >Emitted(78, 31) Source(52, 84) + SourceIndex(0)
+3 >Emitted(78, 32) Source(52, 85) + SourceIndex(0)
+4 >Emitted(78, 42) Source(52, 95) + SourceIndex(0)
+5 >Emitted(78, 44) Source(52, 97) + SourceIndex(0)
+6 >Emitted(78, 45) Source(52, 98) + SourceIndex(0)
 ---
 >>>                            var c1;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1463,10 +1464,10 @@ sourceFile:typeResolution.ts
 2 >                            var 
 3 >                                c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA
 4 >                                  ;
-1 >Emitted(78, 29) Source(53, 25) + SourceIndex(0)
-2 >Emitted(78, 33) Source(53, 29) + SourceIndex(0)
-3 >Emitted(78, 35) Source(53, 80) + SourceIndex(0)
-4 >Emitted(78, 36) Source(53, 81) + SourceIndex(0)
+1 >Emitted(79, 29) Source(53, 25) + SourceIndex(0)
+2 >Emitted(79, 33) Source(53, 29) + SourceIndex(0)
+3 >Emitted(79, 35) Source(53, 80) + SourceIndex(0)
+4 >Emitted(79, 36) Source(53, 81) + SourceIndex(0)
 ---
 >>>                            c1.AisIn1_2_2();
 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1481,12 +1482,12 @@ sourceFile:typeResolution.ts
 4 >                               AisIn1_2_2
 5 >                                         ()
 6 >                                           ;
-1->Emitted(79, 29) Source(53, 82) + SourceIndex(0)
-2 >Emitted(79, 31) Source(53, 84) + SourceIndex(0)
-3 >Emitted(79, 32) Source(53, 85) + SourceIndex(0)
-4 >Emitted(79, 42) Source(53, 95) + SourceIndex(0)
-5 >Emitted(79, 44) Source(53, 97) + SourceIndex(0)
-6 >Emitted(79, 45) Source(53, 98) + SourceIndex(0)
+1->Emitted(80, 29) Source(53, 82) + SourceIndex(0)
+2 >Emitted(80, 31) Source(53, 84) + SourceIndex(0)
+3 >Emitted(80, 32) Source(53, 85) + SourceIndex(0)
+4 >Emitted(80, 42) Source(53, 95) + SourceIndex(0)
+5 >Emitted(80, 44) Source(53, 97) + SourceIndex(0)
+6 >Emitted(80, 45) Source(53, 98) + SourceIndex(0)
 ---
 >>>                            var d1;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1499,10 +1500,10 @@ sourceFile:typeResolution.ts
 2 >                            var 
 3 >                                d1: InterfaceX
 4 >                                  ;
-1 >Emitted(80, 29) Source(54, 25) + SourceIndex(0)
-2 >Emitted(80, 33) Source(54, 29) + SourceIndex(0)
-3 >Emitted(80, 35) Source(54, 43) + SourceIndex(0)
-4 >Emitted(80, 36) Source(54, 44) + SourceIndex(0)
+1 >Emitted(81, 29) Source(54, 25) + SourceIndex(0)
+2 >Emitted(81, 33) Source(54, 29) + SourceIndex(0)
+3 >Emitted(81, 35) Source(54, 43) + SourceIndex(0)
+4 >Emitted(81, 36) Source(54, 44) + SourceIndex(0)
 ---
 >>>                            d1.XisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1517,12 +1518,12 @@ sourceFile:typeResolution.ts
 4 >                               XisIn1_1_1
 5 >                                         ()
 6 >                                           ;
-1->Emitted(81, 29) Source(54, 45) + SourceIndex(0)
-2 >Emitted(81, 31) Source(54, 47) + SourceIndex(0)
-3 >Emitted(81, 32) Source(54, 48) + SourceIndex(0)
-4 >Emitted(81, 42) Source(54, 58) + SourceIndex(0)
-5 >Emitted(81, 44) Source(54, 60) + SourceIndex(0)
-6 >Emitted(81, 45) Source(54, 61) + SourceIndex(0)
+1->Emitted(82, 29) Source(54, 45) + SourceIndex(0)
+2 >Emitted(82, 31) Source(54, 47) + SourceIndex(0)
+3 >Emitted(82, 32) Source(54, 48) + SourceIndex(0)
+4 >Emitted(82, 42) Source(54, 58) + SourceIndex(0)
+5 >Emitted(82, 44) Source(54, 60) + SourceIndex(0)
+6 >Emitted(82, 45) Source(54, 61) + SourceIndex(0)
 ---
 >>>                            var c2;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1535,10 +1536,10 @@ sourceFile:typeResolution.ts
 2 >                            var 
 3 >                                c2: TopLevelModule2.SubModule3.ClassA
 4 >                                  ;
-1 >Emitted(82, 29) Source(55, 25) + SourceIndex(0)
-2 >Emitted(82, 33) Source(55, 29) + SourceIndex(0)
-3 >Emitted(82, 35) Source(55, 66) + SourceIndex(0)
-4 >Emitted(82, 36) Source(55, 67) + SourceIndex(0)
+1 >Emitted(83, 29) Source(55, 25) + SourceIndex(0)
+2 >Emitted(83, 33) Source(55, 29) + SourceIndex(0)
+3 >Emitted(83, 35) Source(55, 66) + SourceIndex(0)
+4 >Emitted(83, 36) Source(55, 67) + SourceIndex(0)
 ---
 >>>                            c2.AisIn2_3();
 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1553,12 +1554,12 @@ sourceFile:typeResolution.ts
 4 >                               AisIn2_3
 5 >                                       ()
 6 >                                         ;
-1->Emitted(83, 29) Source(55, 68) + SourceIndex(0)
-2 >Emitted(83, 31) Source(55, 70) + SourceIndex(0)
-3 >Emitted(83, 32) Source(55, 71) + SourceIndex(0)
-4 >Emitted(83, 40) Source(55, 79) + SourceIndex(0)
-5 >Emitted(83, 42) Source(55, 81) + SourceIndex(0)
-6 >Emitted(83, 43) Source(55, 82) + SourceIndex(0)
+1->Emitted(84, 29) Source(55, 68) + SourceIndex(0)
+2 >Emitted(84, 31) Source(55, 70) + SourceIndex(0)
+3 >Emitted(84, 32) Source(55, 71) + SourceIndex(0)
+4 >Emitted(84, 40) Source(55, 79) + SourceIndex(0)
+5 >Emitted(84, 42) Source(55, 81) + SourceIndex(0)
+6 >Emitted(84, 43) Source(55, 82) + SourceIndex(0)
 ---
 >>>                        }
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1566,8 +1567,8 @@ sourceFile:typeResolution.ts
 1 >
   >                    
 2 >                        }
-1 >Emitted(84, 25) Source(56, 21) + SourceIndex(0)
-2 >Emitted(84, 26) Source(56, 22) + SourceIndex(0)
+1 >Emitted(85, 25) Source(56, 21) + SourceIndex(0)
+2 >Emitted(85, 26) Source(56, 22) + SourceIndex(0)
 ---
 >>>                    }
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -1576,8 +1577,8 @@ sourceFile:typeResolution.ts
 1 >
   >                
 2 >                    }
-1 >Emitted(85, 21) Source(57, 17) + SourceIndex(0)
-2 >Emitted(85, 22) Source(57, 18) + SourceIndex(0)
+1 >Emitted(86, 21) Source(57, 17) + SourceIndex(0)
+2 >Emitted(86, 22) Source(57, 18) + SourceIndex(0)
 ---
 >>>                    return NonExportedClassQ;
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1585,8 +1586,8 @@ sourceFile:typeResolution.ts
 1->
   >            
 2 >                    }
-1->Emitted(86, 21) Source(58, 13) + SourceIndex(0)
-2 >Emitted(86, 45) Source(58, 14) + SourceIndex(0)
+1->Emitted(87, 21) Source(58, 13) + SourceIndex(0)
+2 >Emitted(87, 45) Source(58, 14) + SourceIndex(0)
 ---
 >>>                }());
 1 >^^^^^^^^^^^^^^^^
@@ -1608,10 +1609,10 @@ sourceFile:typeResolution.ts
   >                                     }
   >                                 }
   >                             }
-1 >Emitted(87, 17) Source(58, 13) + SourceIndex(0)
-2 >Emitted(87, 18) Source(58, 14) + SourceIndex(0)
-3 >Emitted(87, 18) Source(48, 13) + SourceIndex(0)
-4 >Emitted(87, 22) Source(58, 14) + SourceIndex(0)
+1 >Emitted(88, 17) Source(58, 13) + SourceIndex(0)
+2 >Emitted(88, 18) Source(58, 14) + SourceIndex(0)
+3 >Emitted(88, 18) Source(48, 13) + SourceIndex(0)
+4 >Emitted(88, 22) Source(58, 14) + SourceIndex(0)
 ---
 >>>            })(SubSubModule1 = SubModule1.SubSubModule1 || (SubModule1.SubSubModule1 = {}));
 1->^^^^^^^^^^^^
@@ -1689,15 +1690,15 @@ sourceFile:typeResolution.ts
   >                                                                                                    }
   >                                                                                                }
   >                                                                                            }
-1->Emitted(88, 13) Source(59, 9) + SourceIndex(0)
-2 >Emitted(88, 14) Source(59, 10) + SourceIndex(0)
-3 >Emitted(88, 16) Source(3, 23) + SourceIndex(0)
-4 >Emitted(88, 29) Source(3, 36) + SourceIndex(0)
-5 >Emitted(88, 32) Source(3, 23) + SourceIndex(0)
-6 >Emitted(88, 56) Source(3, 36) + SourceIndex(0)
-7 >Emitted(88, 61) Source(3, 23) + SourceIndex(0)
-8 >Emitted(88, 85) Source(3, 36) + SourceIndex(0)
-9 >Emitted(88, 93) Source(59, 10) + SourceIndex(0)
+1->Emitted(89, 13) Source(59, 9) + SourceIndex(0)
+2 >Emitted(89, 14) Source(59, 10) + SourceIndex(0)
+3 >Emitted(89, 16) Source(3, 23) + SourceIndex(0)
+4 >Emitted(89, 29) Source(3, 36) + SourceIndex(0)
+5 >Emitted(89, 32) Source(3, 23) + SourceIndex(0)
+6 >Emitted(89, 56) Source(3, 36) + SourceIndex(0)
+7 >Emitted(89, 61) Source(3, 23) + SourceIndex(0)
+8 >Emitted(89, 85) Source(3, 36) + SourceIndex(0)
+9 >Emitted(89, 93) Source(59, 10) + SourceIndex(0)
 ---
 >>>            // Should have no effect on S1.SS1.ClassA above because it is not exported
 1 >^^^^^^^^^^^^
@@ -1706,29 +1707,29 @@ sourceFile:typeResolution.ts
   >        
   >        
 2 >            // Should have no effect on S1.SS1.ClassA above because it is not exported
-1 >Emitted(89, 13) Source(61, 9) + SourceIndex(0)
-2 >Emitted(89, 87) Source(61, 83) + SourceIndex(0)
+1 >Emitted(90, 13) Source(61, 9) + SourceIndex(0)
+2 >Emitted(90, 87) Source(61, 83) + SourceIndex(0)
 ---
 >>>            var ClassA = (function () {
 1 >^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >        
-1 >Emitted(90, 13) Source(62, 9) + SourceIndex(0)
+1 >Emitted(91, 13) Source(62, 9) + SourceIndex(0)
 ---
 >>>                function ClassA() {
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^->
 1->class ClassA {
   >            
-1->Emitted(91, 17) Source(63, 13) + SourceIndex(0)
+1->Emitted(92, 17) Source(63, 13) + SourceIndex(0)
 ---
 >>>                    function AA() {
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^^^^^^^^^^^->
 1->constructor() {
   >                
-1->Emitted(92, 21) Source(64, 17) + SourceIndex(0)
+1->Emitted(93, 21) Source(64, 17) + SourceIndex(0)
 ---
 >>>                        var a2;
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1741,10 +1742,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a2: SubSubModule1.ClassA
 4 >                              ;
-1->Emitted(93, 25) Source(65, 21) + SourceIndex(0)
-2 >Emitted(93, 29) Source(65, 25) + SourceIndex(0)
-3 >Emitted(93, 31) Source(65, 49) + SourceIndex(0)
-4 >Emitted(93, 32) Source(65, 50) + SourceIndex(0)
+1->Emitted(94, 25) Source(65, 21) + SourceIndex(0)
+2 >Emitted(94, 29) Source(65, 25) + SourceIndex(0)
+3 >Emitted(94, 31) Source(65, 49) + SourceIndex(0)
+4 >Emitted(94, 32) Source(65, 50) + SourceIndex(0)
 ---
 >>>                        a2.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1759,12 +1760,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(94, 25) Source(65, 51) + SourceIndex(0)
-2 >Emitted(94, 27) Source(65, 53) + SourceIndex(0)
-3 >Emitted(94, 28) Source(65, 54) + SourceIndex(0)
-4 >Emitted(94, 38) Source(65, 64) + SourceIndex(0)
-5 >Emitted(94, 40) Source(65, 66) + SourceIndex(0)
-6 >Emitted(94, 41) Source(65, 67) + SourceIndex(0)
+1->Emitted(95, 25) Source(65, 51) + SourceIndex(0)
+2 >Emitted(95, 27) Source(65, 53) + SourceIndex(0)
+3 >Emitted(95, 28) Source(65, 54) + SourceIndex(0)
+4 >Emitted(95, 38) Source(65, 64) + SourceIndex(0)
+5 >Emitted(95, 40) Source(65, 66) + SourceIndex(0)
+6 >Emitted(95, 41) Source(65, 67) + SourceIndex(0)
 ---
 >>>                        var a3;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1777,10 +1778,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a3: SubModule1.SubSubModule1.ClassA
 4 >                              ;
-1 >Emitted(95, 25) Source(66, 21) + SourceIndex(0)
-2 >Emitted(95, 29) Source(66, 25) + SourceIndex(0)
-3 >Emitted(95, 31) Source(66, 60) + SourceIndex(0)
-4 >Emitted(95, 32) Source(66, 61) + SourceIndex(0)
+1 >Emitted(96, 25) Source(66, 21) + SourceIndex(0)
+2 >Emitted(96, 29) Source(66, 25) + SourceIndex(0)
+3 >Emitted(96, 31) Source(66, 60) + SourceIndex(0)
+4 >Emitted(96, 32) Source(66, 61) + SourceIndex(0)
 ---
 >>>                        a3.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1795,12 +1796,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(96, 25) Source(66, 62) + SourceIndex(0)
-2 >Emitted(96, 27) Source(66, 64) + SourceIndex(0)
-3 >Emitted(96, 28) Source(66, 65) + SourceIndex(0)
-4 >Emitted(96, 38) Source(66, 75) + SourceIndex(0)
-5 >Emitted(96, 40) Source(66, 77) + SourceIndex(0)
-6 >Emitted(96, 41) Source(66, 78) + SourceIndex(0)
+1->Emitted(97, 25) Source(66, 62) + SourceIndex(0)
+2 >Emitted(97, 27) Source(66, 64) + SourceIndex(0)
+3 >Emitted(97, 28) Source(66, 65) + SourceIndex(0)
+4 >Emitted(97, 38) Source(66, 75) + SourceIndex(0)
+5 >Emitted(97, 40) Source(66, 77) + SourceIndex(0)
+6 >Emitted(97, 41) Source(66, 78) + SourceIndex(0)
 ---
 >>>                        var a4;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1813,10 +1814,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA
 4 >                              ;
-1 >Emitted(97, 25) Source(67, 21) + SourceIndex(0)
-2 >Emitted(97, 29) Source(67, 25) + SourceIndex(0)
-3 >Emitted(97, 31) Source(67, 76) + SourceIndex(0)
-4 >Emitted(97, 32) Source(67, 77) + SourceIndex(0)
+1 >Emitted(98, 25) Source(67, 21) + SourceIndex(0)
+2 >Emitted(98, 29) Source(67, 25) + SourceIndex(0)
+3 >Emitted(98, 31) Source(67, 76) + SourceIndex(0)
+4 >Emitted(98, 32) Source(67, 77) + SourceIndex(0)
 ---
 >>>                        a4.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1832,12 +1833,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(98, 25) Source(67, 78) + SourceIndex(0)
-2 >Emitted(98, 27) Source(67, 80) + SourceIndex(0)
-3 >Emitted(98, 28) Source(67, 81) + SourceIndex(0)
-4 >Emitted(98, 38) Source(67, 91) + SourceIndex(0)
-5 >Emitted(98, 40) Source(67, 93) + SourceIndex(0)
-6 >Emitted(98, 41) Source(67, 94) + SourceIndex(0)
+1->Emitted(99, 25) Source(67, 78) + SourceIndex(0)
+2 >Emitted(99, 27) Source(67, 80) + SourceIndex(0)
+3 >Emitted(99, 28) Source(67, 81) + SourceIndex(0)
+4 >Emitted(99, 38) Source(67, 91) + SourceIndex(0)
+5 >Emitted(99, 40) Source(67, 93) + SourceIndex(0)
+6 >Emitted(99, 41) Source(67, 94) + SourceIndex(0)
 ---
 >>>                        // Interface reference
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1846,8 +1847,8 @@ sourceFile:typeResolution.ts
   >                    
   >                    
 2 >                        // Interface reference
-1->Emitted(99, 25) Source(69, 21) + SourceIndex(0)
-2 >Emitted(99, 47) Source(69, 43) + SourceIndex(0)
+1->Emitted(100, 25) Source(69, 21) + SourceIndex(0)
+2 >Emitted(100, 47) Source(69, 43) + SourceIndex(0)
 ---
 >>>                        var d2;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1860,10 +1861,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            d2: SubSubModule1.InterfaceX
 4 >                              ;
-1 >Emitted(100, 25) Source(70, 21) + SourceIndex(0)
-2 >Emitted(100, 29) Source(70, 25) + SourceIndex(0)
-3 >Emitted(100, 31) Source(70, 53) + SourceIndex(0)
-4 >Emitted(100, 32) Source(70, 54) + SourceIndex(0)
+1 >Emitted(101, 25) Source(70, 21) + SourceIndex(0)
+2 >Emitted(101, 29) Source(70, 25) + SourceIndex(0)
+3 >Emitted(101, 31) Source(70, 53) + SourceIndex(0)
+4 >Emitted(101, 32) Source(70, 54) + SourceIndex(0)
 ---
 >>>                        d2.XisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1878,12 +1879,12 @@ sourceFile:typeResolution.ts
 4 >                           XisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(101, 25) Source(70, 55) + SourceIndex(0)
-2 >Emitted(101, 27) Source(70, 57) + SourceIndex(0)
-3 >Emitted(101, 28) Source(70, 58) + SourceIndex(0)
-4 >Emitted(101, 38) Source(70, 68) + SourceIndex(0)
-5 >Emitted(101, 40) Source(70, 70) + SourceIndex(0)
-6 >Emitted(101, 41) Source(70, 71) + SourceIndex(0)
+1->Emitted(102, 25) Source(70, 55) + SourceIndex(0)
+2 >Emitted(102, 27) Source(70, 57) + SourceIndex(0)
+3 >Emitted(102, 28) Source(70, 58) + SourceIndex(0)
+4 >Emitted(102, 38) Source(70, 68) + SourceIndex(0)
+5 >Emitted(102, 40) Source(70, 70) + SourceIndex(0)
+6 >Emitted(102, 41) Source(70, 71) + SourceIndex(0)
 ---
 >>>                    }
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -1891,8 +1892,8 @@ sourceFile:typeResolution.ts
 1 >
   >                
 2 >                    }
-1 >Emitted(102, 21) Source(71, 17) + SourceIndex(0)
-2 >Emitted(102, 22) Source(71, 18) + SourceIndex(0)
+1 >Emitted(103, 21) Source(71, 17) + SourceIndex(0)
+2 >Emitted(103, 22) Source(71, 18) + SourceIndex(0)
 ---
 >>>                }
 1 >^^^^^^^^^^^^^^^^
@@ -1901,8 +1902,8 @@ sourceFile:typeResolution.ts
 1 >
   >            
 2 >                }
-1 >Emitted(103, 17) Source(72, 13) + SourceIndex(0)
-2 >Emitted(103, 18) Source(72, 14) + SourceIndex(0)
+1 >Emitted(104, 17) Source(72, 13) + SourceIndex(0)
+2 >Emitted(104, 18) Source(72, 14) + SourceIndex(0)
 ---
 >>>                return ClassA;
 1->^^^^^^^^^^^^^^^^
@@ -1910,8 +1911,8 @@ sourceFile:typeResolution.ts
 1->
   >        
 2 >                }
-1->Emitted(104, 17) Source(73, 9) + SourceIndex(0)
-2 >Emitted(104, 30) Source(73, 10) + SourceIndex(0)
+1->Emitted(105, 17) Source(73, 9) + SourceIndex(0)
+2 >Emitted(105, 30) Source(73, 10) + SourceIndex(0)
 ---
 >>>            }());
 1 >^^^^^^^^^^^^
@@ -1934,10 +1935,10 @@ sourceFile:typeResolution.ts
   >                             }
   >                         }
   >                     }
-1 >Emitted(105, 13) Source(73, 9) + SourceIndex(0)
-2 >Emitted(105, 14) Source(73, 10) + SourceIndex(0)
-3 >Emitted(105, 14) Source(62, 9) + SourceIndex(0)
-4 >Emitted(105, 18) Source(73, 10) + SourceIndex(0)
+1 >Emitted(106, 13) Source(73, 9) + SourceIndex(0)
+2 >Emitted(106, 14) Source(73, 10) + SourceIndex(0)
+3 >Emitted(106, 14) Source(62, 9) + SourceIndex(0)
+4 >Emitted(106, 18) Source(73, 10) + SourceIndex(0)
 ---
 >>>        })(SubModule1 = TopLevelModule1.SubModule1 || (TopLevelModule1.SubModule1 = {}));
 1->^^^^^^^^
@@ -2031,15 +2032,15 @@ sourceFile:typeResolution.ts
   >                                                                                             }
   >                                                                                         }
   >                                                                                     }
-1->Emitted(106, 9) Source(74, 5) + SourceIndex(0)
-2 >Emitted(106, 10) Source(74, 6) + SourceIndex(0)
-3 >Emitted(106, 12) Source(2, 19) + SourceIndex(0)
-4 >Emitted(106, 22) Source(2, 29) + SourceIndex(0)
-5 >Emitted(106, 25) Source(2, 19) + SourceIndex(0)
-6 >Emitted(106, 51) Source(2, 29) + SourceIndex(0)
-7 >Emitted(106, 56) Source(2, 19) + SourceIndex(0)
-8 >Emitted(106, 82) Source(2, 29) + SourceIndex(0)
-9 >Emitted(106, 90) Source(74, 6) + SourceIndex(0)
+1->Emitted(107, 9) Source(74, 5) + SourceIndex(0)
+2 >Emitted(107, 10) Source(74, 6) + SourceIndex(0)
+3 >Emitted(107, 12) Source(2, 19) + SourceIndex(0)
+4 >Emitted(107, 22) Source(2, 29) + SourceIndex(0)
+5 >Emitted(107, 25) Source(2, 19) + SourceIndex(0)
+6 >Emitted(107, 51) Source(2, 29) + SourceIndex(0)
+7 >Emitted(107, 56) Source(2, 19) + SourceIndex(0)
+8 >Emitted(107, 82) Source(2, 29) + SourceIndex(0)
+9 >Emitted(107, 90) Source(74, 6) + SourceIndex(0)
 ---
 >>>        var SubModule2;
 1 >^^^^^^^^
@@ -2064,10 +2065,10 @@ sourceFile:typeResolution.ts
   >                              
   >                              export interface InterfaceY { YisIn1_2(); }
   >                          }
-1 >Emitted(107, 9) Source(76, 5) + SourceIndex(0)
-2 >Emitted(107, 13) Source(76, 19) + SourceIndex(0)
-3 >Emitted(107, 23) Source(76, 29) + SourceIndex(0)
-4 >Emitted(107, 24) Source(87, 6) + SourceIndex(0)
+1 >Emitted(108, 9) Source(76, 5) + SourceIndex(0)
+2 >Emitted(108, 13) Source(76, 19) + SourceIndex(0)
+3 >Emitted(108, 23) Source(76, 29) + SourceIndex(0)
+4 >Emitted(108, 24) Source(87, 6) + SourceIndex(0)
 ---
 >>>        (function (SubModule2) {
 1->^^^^^^^^
@@ -2077,9 +2078,9 @@ sourceFile:typeResolution.ts
 1->
 2 >        export module 
 3 >                   SubModule2
-1->Emitted(108, 9) Source(76, 5) + SourceIndex(0)
-2 >Emitted(108, 20) Source(76, 19) + SourceIndex(0)
-3 >Emitted(108, 30) Source(76, 29) + SourceIndex(0)
+1->Emitted(109, 9) Source(76, 5) + SourceIndex(0)
+2 >Emitted(109, 20) Source(76, 19) + SourceIndex(0)
+3 >Emitted(109, 30) Source(76, 29) + SourceIndex(0)
 ---
 >>>            var SubSubModule2;
 1->^^^^^^^^^^^^
@@ -2099,10 +2100,10 @@ sourceFile:typeResolution.ts
   >                                         export interface InterfaceY { YisIn1_2_2(); }
   >                                         interface NonExportedInterfaceQ { }
   >                                     }
-1->Emitted(109, 13) Source(77, 9) + SourceIndex(0)
-2 >Emitted(109, 17) Source(77, 23) + SourceIndex(0)
-3 >Emitted(109, 30) Source(77, 36) + SourceIndex(0)
-4 >Emitted(109, 31) Source(84, 10) + SourceIndex(0)
+1->Emitted(110, 13) Source(77, 9) + SourceIndex(0)
+2 >Emitted(110, 17) Source(77, 23) + SourceIndex(0)
+3 >Emitted(110, 30) Source(77, 36) + SourceIndex(0)
+4 >Emitted(110, 31) Source(84, 10) + SourceIndex(0)
 ---
 >>>            (function (SubSubModule2) {
 1->^^^^^^^^^^^^
@@ -2112,9 +2113,9 @@ sourceFile:typeResolution.ts
 1->
 2 >            export module 
 3 >                       SubSubModule2
-1->Emitted(110, 13) Source(77, 9) + SourceIndex(0)
-2 >Emitted(110, 24) Source(77, 23) + SourceIndex(0)
-3 >Emitted(110, 37) Source(77, 36) + SourceIndex(0)
+1->Emitted(111, 13) Source(77, 9) + SourceIndex(0)
+2 >Emitted(111, 24) Source(77, 23) + SourceIndex(0)
+3 >Emitted(111, 37) Source(77, 36) + SourceIndex(0)
 ---
 >>>                // No code here since these are the mirror of the above calls
 1->^^^^^^^^^^^^^^^^
@@ -2122,21 +2123,21 @@ sourceFile:typeResolution.ts
 1-> {
   >            
 2 >                // No code here since these are the mirror of the above calls
-1->Emitted(111, 17) Source(78, 13) + SourceIndex(0)
-2 >Emitted(111, 78) Source(78, 74) + SourceIndex(0)
+1->Emitted(112, 17) Source(78, 13) + SourceIndex(0)
+2 >Emitted(112, 78) Source(78, 74) + SourceIndex(0)
 ---
 >>>                var ClassA = (function () {
 1 >^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >            
-1 >Emitted(112, 17) Source(79, 13) + SourceIndex(0)
+1 >Emitted(113, 17) Source(79, 13) + SourceIndex(0)
 ---
 >>>                    function ClassA() {
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^->
 1->
-1->Emitted(113, 21) Source(79, 13) + SourceIndex(0)
+1->Emitted(114, 21) Source(79, 13) + SourceIndex(0)
 ---
 >>>                    }
 1->^^^^^^^^^^^^^^^^^^^^
@@ -2144,8 +2145,8 @@ sourceFile:typeResolution.ts
 3 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->export class ClassA { public AisIn1_2_2() { } 
 2 >                    }
-1->Emitted(114, 21) Source(79, 59) + SourceIndex(0)
-2 >Emitted(114, 22) Source(79, 60) + SourceIndex(0)
+1->Emitted(115, 21) Source(79, 59) + SourceIndex(0)
+2 >Emitted(115, 22) Source(79, 60) + SourceIndex(0)
 ---
 >>>                    ClassA.prototype.AisIn1_2_2 = function () { };
 1->^^^^^^^^^^^^^^^^^^^^
@@ -2158,19 +2159,19 @@ sourceFile:typeResolution.ts
 3 >                                               
 4 >                                                  public AisIn1_2_2() { 
 5 >                                                                }
-1->Emitted(115, 21) Source(79, 42) + SourceIndex(0)
-2 >Emitted(115, 48) Source(79, 52) + SourceIndex(0)
-3 >Emitted(115, 51) Source(79, 35) + SourceIndex(0)
-4 >Emitted(115, 65) Source(79, 57) + SourceIndex(0)
-5 >Emitted(115, 66) Source(79, 58) + SourceIndex(0)
+1->Emitted(116, 21) Source(79, 42) + SourceIndex(0)
+2 >Emitted(116, 48) Source(79, 52) + SourceIndex(0)
+3 >Emitted(116, 51) Source(79, 35) + SourceIndex(0)
+4 >Emitted(116, 65) Source(79, 57) + SourceIndex(0)
+5 >Emitted(116, 66) Source(79, 58) + SourceIndex(0)
 ---
 >>>                    return ClassA;
 1 >^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^^^^^^^^^^^^
 1 > 
 2 >                    }
-1 >Emitted(116, 21) Source(79, 59) + SourceIndex(0)
-2 >Emitted(116, 34) Source(79, 60) + SourceIndex(0)
+1 >Emitted(117, 21) Source(79, 59) + SourceIndex(0)
+2 >Emitted(117, 34) Source(79, 60) + SourceIndex(0)
 ---
 >>>                }());
 1 >^^^^^^^^^^^^^^^^
@@ -2182,10 +2183,10 @@ sourceFile:typeResolution.ts
 2 >                }
 3 >                 
 4 >                 export class ClassA { public AisIn1_2_2() { } }
-1 >Emitted(117, 17) Source(79, 59) + SourceIndex(0)
-2 >Emitted(117, 18) Source(79, 60) + SourceIndex(0)
-3 >Emitted(117, 18) Source(79, 13) + SourceIndex(0)
-4 >Emitted(117, 22) Source(79, 60) + SourceIndex(0)
+1 >Emitted(118, 17) Source(79, 59) + SourceIndex(0)
+2 >Emitted(118, 18) Source(79, 60) + SourceIndex(0)
+3 >Emitted(118, 18) Source(79, 13) + SourceIndex(0)
+4 >Emitted(118, 22) Source(79, 60) + SourceIndex(0)
 ---
 >>>                SubSubModule2.ClassA = ClassA;
 1->^^^^^^^^^^^^^^^^
@@ -2196,23 +2197,23 @@ sourceFile:typeResolution.ts
 2 >                ClassA
 3 >                                     { public AisIn1_2_2() { } }
 4 >                                             
-1->Emitted(118, 17) Source(79, 26) + SourceIndex(0)
-2 >Emitted(118, 37) Source(79, 32) + SourceIndex(0)
-3 >Emitted(118, 46) Source(79, 60) + SourceIndex(0)
-4 >Emitted(118, 47) Source(79, 60) + SourceIndex(0)
+1->Emitted(119, 17) Source(79, 26) + SourceIndex(0)
+2 >Emitted(119, 37) Source(79, 32) + SourceIndex(0)
+3 >Emitted(119, 46) Source(79, 60) + SourceIndex(0)
+4 >Emitted(119, 47) Source(79, 60) + SourceIndex(0)
 ---
 >>>                var ClassB = (function () {
 1 >^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >            
-1 >Emitted(119, 17) Source(80, 13) + SourceIndex(0)
+1 >Emitted(120, 17) Source(80, 13) + SourceIndex(0)
 ---
 >>>                    function ClassB() {
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^->
 1->
-1->Emitted(120, 21) Source(80, 13) + SourceIndex(0)
+1->Emitted(121, 21) Source(80, 13) + SourceIndex(0)
 ---
 >>>                    }
 1->^^^^^^^^^^^^^^^^^^^^
@@ -2220,8 +2221,8 @@ sourceFile:typeResolution.ts
 3 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->export class ClassB { public BisIn1_2_2() { } 
 2 >                    }
-1->Emitted(121, 21) Source(80, 59) + SourceIndex(0)
-2 >Emitted(121, 22) Source(80, 60) + SourceIndex(0)
+1->Emitted(122, 21) Source(80, 59) + SourceIndex(0)
+2 >Emitted(122, 22) Source(80, 60) + SourceIndex(0)
 ---
 >>>                    ClassB.prototype.BisIn1_2_2 = function () { };
 1->^^^^^^^^^^^^^^^^^^^^
@@ -2234,19 +2235,19 @@ sourceFile:typeResolution.ts
 3 >                                               
 4 >                                                  public BisIn1_2_2() { 
 5 >                                                                }
-1->Emitted(122, 21) Source(80, 42) + SourceIndex(0)
-2 >Emitted(122, 48) Source(80, 52) + SourceIndex(0)
-3 >Emitted(122, 51) Source(80, 35) + SourceIndex(0)
-4 >Emitted(122, 65) Source(80, 57) + SourceIndex(0)
-5 >Emitted(122, 66) Source(80, 58) + SourceIndex(0)
+1->Emitted(123, 21) Source(80, 42) + SourceIndex(0)
+2 >Emitted(123, 48) Source(80, 52) + SourceIndex(0)
+3 >Emitted(123, 51) Source(80, 35) + SourceIndex(0)
+4 >Emitted(123, 65) Source(80, 57) + SourceIndex(0)
+5 >Emitted(123, 66) Source(80, 58) + SourceIndex(0)
 ---
 >>>                    return ClassB;
 1 >^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^^^^^^^^^^^^
 1 > 
 2 >                    }
-1 >Emitted(123, 21) Source(80, 59) + SourceIndex(0)
-2 >Emitted(123, 34) Source(80, 60) + SourceIndex(0)
+1 >Emitted(124, 21) Source(80, 59) + SourceIndex(0)
+2 >Emitted(124, 34) Source(80, 60) + SourceIndex(0)
 ---
 >>>                }());
 1 >^^^^^^^^^^^^^^^^
@@ -2258,10 +2259,10 @@ sourceFile:typeResolution.ts
 2 >                }
 3 >                 
 4 >                 export class ClassB { public BisIn1_2_2() { } }
-1 >Emitted(124, 17) Source(80, 59) + SourceIndex(0)
-2 >Emitted(124, 18) Source(80, 60) + SourceIndex(0)
-3 >Emitted(124, 18) Source(80, 13) + SourceIndex(0)
-4 >Emitted(124, 22) Source(80, 60) + SourceIndex(0)
+1 >Emitted(125, 17) Source(80, 59) + SourceIndex(0)
+2 >Emitted(125, 18) Source(80, 60) + SourceIndex(0)
+3 >Emitted(125, 18) Source(80, 13) + SourceIndex(0)
+4 >Emitted(125, 22) Source(80, 60) + SourceIndex(0)
 ---
 >>>                SubSubModule2.ClassB = ClassB;
 1->^^^^^^^^^^^^^^^^
@@ -2272,23 +2273,23 @@ sourceFile:typeResolution.ts
 2 >                ClassB
 3 >                                     { public BisIn1_2_2() { } }
 4 >                                             
-1->Emitted(125, 17) Source(80, 26) + SourceIndex(0)
-2 >Emitted(125, 37) Source(80, 32) + SourceIndex(0)
-3 >Emitted(125, 46) Source(80, 60) + SourceIndex(0)
-4 >Emitted(125, 47) Source(80, 60) + SourceIndex(0)
+1->Emitted(126, 17) Source(80, 26) + SourceIndex(0)
+2 >Emitted(126, 37) Source(80, 32) + SourceIndex(0)
+3 >Emitted(126, 46) Source(80, 60) + SourceIndex(0)
+4 >Emitted(126, 47) Source(80, 60) + SourceIndex(0)
 ---
 >>>                var ClassC = (function () {
 1 >^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >            
-1 >Emitted(126, 17) Source(81, 13) + SourceIndex(0)
+1 >Emitted(127, 17) Source(81, 13) + SourceIndex(0)
 ---
 >>>                    function ClassC() {
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^->
 1->
-1->Emitted(127, 21) Source(81, 13) + SourceIndex(0)
+1->Emitted(128, 21) Source(81, 13) + SourceIndex(0)
 ---
 >>>                    }
 1->^^^^^^^^^^^^^^^^^^^^
@@ -2296,8 +2297,8 @@ sourceFile:typeResolution.ts
 3 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->export class ClassC { public CisIn1_2_2() { } 
 2 >                    }
-1->Emitted(128, 21) Source(81, 59) + SourceIndex(0)
-2 >Emitted(128, 22) Source(81, 60) + SourceIndex(0)
+1->Emitted(129, 21) Source(81, 59) + SourceIndex(0)
+2 >Emitted(129, 22) Source(81, 60) + SourceIndex(0)
 ---
 >>>                    ClassC.prototype.CisIn1_2_2 = function () { };
 1->^^^^^^^^^^^^^^^^^^^^
@@ -2310,19 +2311,19 @@ sourceFile:typeResolution.ts
 3 >                                               
 4 >                                                  public CisIn1_2_2() { 
 5 >                                                                }
-1->Emitted(129, 21) Source(81, 42) + SourceIndex(0)
-2 >Emitted(129, 48) Source(81, 52) + SourceIndex(0)
-3 >Emitted(129, 51) Source(81, 35) + SourceIndex(0)
-4 >Emitted(129, 65) Source(81, 57) + SourceIndex(0)
-5 >Emitted(129, 66) Source(81, 58) + SourceIndex(0)
+1->Emitted(130, 21) Source(81, 42) + SourceIndex(0)
+2 >Emitted(130, 48) Source(81, 52) + SourceIndex(0)
+3 >Emitted(130, 51) Source(81, 35) + SourceIndex(0)
+4 >Emitted(130, 65) Source(81, 57) + SourceIndex(0)
+5 >Emitted(130, 66) Source(81, 58) + SourceIndex(0)
 ---
 >>>                    return ClassC;
 1 >^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^^^^^^^^^^^^
 1 > 
 2 >                    }
-1 >Emitted(130, 21) Source(81, 59) + SourceIndex(0)
-2 >Emitted(130, 34) Source(81, 60) + SourceIndex(0)
+1 >Emitted(131, 21) Source(81, 59) + SourceIndex(0)
+2 >Emitted(131, 34) Source(81, 60) + SourceIndex(0)
 ---
 >>>                }());
 1 >^^^^^^^^^^^^^^^^
@@ -2334,10 +2335,10 @@ sourceFile:typeResolution.ts
 2 >                }
 3 >                 
 4 >                 export class ClassC { public CisIn1_2_2() { } }
-1 >Emitted(131, 17) Source(81, 59) + SourceIndex(0)
-2 >Emitted(131, 18) Source(81, 60) + SourceIndex(0)
-3 >Emitted(131, 18) Source(81, 13) + SourceIndex(0)
-4 >Emitted(131, 22) Source(81, 60) + SourceIndex(0)
+1 >Emitted(132, 17) Source(81, 59) + SourceIndex(0)
+2 >Emitted(132, 18) Source(81, 60) + SourceIndex(0)
+3 >Emitted(132, 18) Source(81, 13) + SourceIndex(0)
+4 >Emitted(132, 22) Source(81, 60) + SourceIndex(0)
 ---
 >>>                SubSubModule2.ClassC = ClassC;
 1->^^^^^^^^^^^^^^^^
@@ -2349,10 +2350,10 @@ sourceFile:typeResolution.ts
 2 >                ClassC
 3 >                                     { public CisIn1_2_2() { } }
 4 >                                             
-1->Emitted(132, 17) Source(81, 26) + SourceIndex(0)
-2 >Emitted(132, 37) Source(81, 32) + SourceIndex(0)
-3 >Emitted(132, 46) Source(81, 60) + SourceIndex(0)
-4 >Emitted(132, 47) Source(81, 60) + SourceIndex(0)
+1->Emitted(133, 17) Source(81, 26) + SourceIndex(0)
+2 >Emitted(133, 37) Source(81, 32) + SourceIndex(0)
+3 >Emitted(133, 46) Source(81, 60) + SourceIndex(0)
+4 >Emitted(133, 47) Source(81, 60) + SourceIndex(0)
 ---
 >>>            })(SubSubModule2 = SubModule2.SubSubModule2 || (SubModule2.SubSubModule2 = {}));
 1->^^^^^^^^^^^^
@@ -2383,15 +2384,15 @@ sourceFile:typeResolution.ts
   >                                                                                                export interface InterfaceY { YisIn1_2_2(); }
   >                                                                                                interface NonExportedInterfaceQ { }
   >                                                                                            }
-1->Emitted(133, 13) Source(84, 9) + SourceIndex(0)
-2 >Emitted(133, 14) Source(84, 10) + SourceIndex(0)
-3 >Emitted(133, 16) Source(77, 23) + SourceIndex(0)
-4 >Emitted(133, 29) Source(77, 36) + SourceIndex(0)
-5 >Emitted(133, 32) Source(77, 23) + SourceIndex(0)
-6 >Emitted(133, 56) Source(77, 36) + SourceIndex(0)
-7 >Emitted(133, 61) Source(77, 23) + SourceIndex(0)
-8 >Emitted(133, 85) Source(77, 36) + SourceIndex(0)
-9 >Emitted(133, 93) Source(84, 10) + SourceIndex(0)
+1->Emitted(134, 13) Source(84, 9) + SourceIndex(0)
+2 >Emitted(134, 14) Source(84, 10) + SourceIndex(0)
+3 >Emitted(134, 16) Source(77, 23) + SourceIndex(0)
+4 >Emitted(134, 29) Source(77, 36) + SourceIndex(0)
+5 >Emitted(134, 32) Source(77, 23) + SourceIndex(0)
+6 >Emitted(134, 56) Source(77, 36) + SourceIndex(0)
+7 >Emitted(134, 61) Source(77, 23) + SourceIndex(0)
+8 >Emitted(134, 85) Source(77, 36) + SourceIndex(0)
+9 >Emitted(134, 93) Source(84, 10) + SourceIndex(0)
 ---
 >>>        })(SubModule2 = TopLevelModule1.SubModule2 || (TopLevelModule1.SubModule2 = {}));
 1 >^^^^^^^^
@@ -2426,15 +2427,15 @@ sourceFile:typeResolution.ts
   >                                                                                         
   >                                                                                         export interface InterfaceY { YisIn1_2(); }
   >                                                                                     }
-1 >Emitted(134, 9) Source(87, 5) + SourceIndex(0)
-2 >Emitted(134, 10) Source(87, 6) + SourceIndex(0)
-3 >Emitted(134, 12) Source(76, 19) + SourceIndex(0)
-4 >Emitted(134, 22) Source(76, 29) + SourceIndex(0)
-5 >Emitted(134, 25) Source(76, 19) + SourceIndex(0)
-6 >Emitted(134, 51) Source(76, 29) + SourceIndex(0)
-7 >Emitted(134, 56) Source(76, 19) + SourceIndex(0)
-8 >Emitted(134, 82) Source(76, 29) + SourceIndex(0)
-9 >Emitted(134, 90) Source(87, 6) + SourceIndex(0)
+1 >Emitted(135, 9) Source(87, 5) + SourceIndex(0)
+2 >Emitted(135, 10) Source(87, 6) + SourceIndex(0)
+3 >Emitted(135, 12) Source(76, 19) + SourceIndex(0)
+4 >Emitted(135, 22) Source(76, 29) + SourceIndex(0)
+5 >Emitted(135, 25) Source(76, 19) + SourceIndex(0)
+6 >Emitted(135, 51) Source(76, 29) + SourceIndex(0)
+7 >Emitted(135, 56) Source(76, 19) + SourceIndex(0)
+8 >Emitted(135, 82) Source(76, 29) + SourceIndex(0)
+9 >Emitted(135, 90) Source(87, 6) + SourceIndex(0)
 ---
 >>>        var ClassA = (function () {
 1 >^^^^^^^^
@@ -2442,13 +2443,13 @@ sourceFile:typeResolution.ts
 1 >
   >    
   >    
-1 >Emitted(135, 9) Source(89, 5) + SourceIndex(0)
+1 >Emitted(136, 9) Source(89, 5) + SourceIndex(0)
 ---
 >>>            function ClassA() {
 1->^^^^^^^^^^^^
 2 >            ^^->
 1->
-1->Emitted(136, 13) Source(89, 5) + SourceIndex(0)
+1->Emitted(137, 13) Source(89, 5) + SourceIndex(0)
 ---
 >>>            }
 1->^^^^^^^^^^^^
@@ -2458,8 +2459,8 @@ sourceFile:typeResolution.ts
   >        public AisIn1() { }
   >    
 2 >            }
-1->Emitted(137, 13) Source(91, 5) + SourceIndex(0)
-2 >Emitted(137, 14) Source(91, 6) + SourceIndex(0)
+1->Emitted(138, 13) Source(91, 5) + SourceIndex(0)
+2 >Emitted(138, 14) Source(91, 6) + SourceIndex(0)
 ---
 >>>            ClassA.prototype.AisIn1 = function () { };
 1->^^^^^^^^^^^^
@@ -2472,11 +2473,11 @@ sourceFile:typeResolution.ts
 3 >                                   
 4 >                                      public AisIn1() { 
 5 >                                                    }
-1->Emitted(138, 13) Source(90, 16) + SourceIndex(0)
-2 >Emitted(138, 36) Source(90, 22) + SourceIndex(0)
-3 >Emitted(138, 39) Source(90, 9) + SourceIndex(0)
-4 >Emitted(138, 53) Source(90, 27) + SourceIndex(0)
-5 >Emitted(138, 54) Source(90, 28) + SourceIndex(0)
+1->Emitted(139, 13) Source(90, 16) + SourceIndex(0)
+2 >Emitted(139, 36) Source(90, 22) + SourceIndex(0)
+3 >Emitted(139, 39) Source(90, 9) + SourceIndex(0)
+4 >Emitted(139, 53) Source(90, 27) + SourceIndex(0)
+5 >Emitted(139, 54) Source(90, 28) + SourceIndex(0)
 ---
 >>>            return ClassA;
 1 >^^^^^^^^^^^^
@@ -2484,8 +2485,8 @@ sourceFile:typeResolution.ts
 1 >
   >    
 2 >            }
-1 >Emitted(139, 13) Source(91, 5) + SourceIndex(0)
-2 >Emitted(139, 26) Source(91, 6) + SourceIndex(0)
+1 >Emitted(140, 13) Source(91, 5) + SourceIndex(0)
+2 >Emitted(140, 26) Source(91, 6) + SourceIndex(0)
 ---
 >>>        }());
 1 >^^^^^^^^
@@ -2499,10 +2500,10 @@ sourceFile:typeResolution.ts
 4 >         class ClassA {
   >                 public AisIn1() { }
   >             }
-1 >Emitted(140, 9) Source(91, 5) + SourceIndex(0)
-2 >Emitted(140, 10) Source(91, 6) + SourceIndex(0)
-3 >Emitted(140, 10) Source(89, 5) + SourceIndex(0)
-4 >Emitted(140, 14) Source(91, 6) + SourceIndex(0)
+1 >Emitted(141, 9) Source(91, 5) + SourceIndex(0)
+2 >Emitted(141, 10) Source(91, 6) + SourceIndex(0)
+3 >Emitted(141, 10) Source(89, 5) + SourceIndex(0)
+4 >Emitted(141, 14) Source(91, 6) + SourceIndex(0)
 ---
 >>>        var NotExportedModule;
 1->^^^^^^^^
@@ -2522,10 +2523,10 @@ sourceFile:typeResolution.ts
 4 >                              {
   >                                     export class ClassA { }
   >                                 }
-1->Emitted(141, 9) Source(97, 5) + SourceIndex(0)
-2 >Emitted(141, 13) Source(97, 12) + SourceIndex(0)
-3 >Emitted(141, 30) Source(97, 29) + SourceIndex(0)
-4 >Emitted(141, 31) Source(99, 6) + SourceIndex(0)
+1->Emitted(142, 9) Source(97, 5) + SourceIndex(0)
+2 >Emitted(142, 13) Source(97, 12) + SourceIndex(0)
+3 >Emitted(142, 30) Source(97, 29) + SourceIndex(0)
+4 >Emitted(142, 31) Source(99, 6) + SourceIndex(0)
 ---
 >>>        (function (NotExportedModule) {
 1->^^^^^^^^
@@ -2535,22 +2536,22 @@ sourceFile:typeResolution.ts
 1->
 2 >        module 
 3 >                   NotExportedModule
-1->Emitted(142, 9) Source(97, 5) + SourceIndex(0)
-2 >Emitted(142, 20) Source(97, 12) + SourceIndex(0)
-3 >Emitted(142, 37) Source(97, 29) + SourceIndex(0)
+1->Emitted(143, 9) Source(97, 5) + SourceIndex(0)
+2 >Emitted(143, 20) Source(97, 12) + SourceIndex(0)
+3 >Emitted(143, 37) Source(97, 29) + SourceIndex(0)
 ---
 >>>            var ClassA = (function () {
 1->^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^^^^^^^^^^^^^^->
 1-> {
   >        
-1->Emitted(143, 13) Source(98, 9) + SourceIndex(0)
+1->Emitted(144, 13) Source(98, 9) + SourceIndex(0)
 ---
 >>>                function ClassA() {
 1->^^^^^^^^^^^^^^^^
 2 >                ^^->
 1->
-1->Emitted(144, 17) Source(98, 9) + SourceIndex(0)
+1->Emitted(145, 17) Source(98, 9) + SourceIndex(0)
 ---
 >>>                }
 1->^^^^^^^^^^^^^^^^
@@ -2558,16 +2559,16 @@ sourceFile:typeResolution.ts
 3 >                 ^^^^^^^^^^^^^^->
 1->export class ClassA { 
 2 >                }
-1->Emitted(145, 17) Source(98, 31) + SourceIndex(0)
-2 >Emitted(145, 18) Source(98, 32) + SourceIndex(0)
+1->Emitted(146, 17) Source(98, 31) + SourceIndex(0)
+2 >Emitted(146, 18) Source(98, 32) + SourceIndex(0)
 ---
 >>>                return ClassA;
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^
 1->
 2 >                }
-1->Emitted(146, 17) Source(98, 31) + SourceIndex(0)
-2 >Emitted(146, 30) Source(98, 32) + SourceIndex(0)
+1->Emitted(147, 17) Source(98, 31) + SourceIndex(0)
+2 >Emitted(147, 30) Source(98, 32) + SourceIndex(0)
 ---
 >>>            }());
 1 >^^^^^^^^^^^^
@@ -2579,10 +2580,10 @@ sourceFile:typeResolution.ts
 2 >            }
 3 >             
 4 >             export class ClassA { }
-1 >Emitted(147, 13) Source(98, 31) + SourceIndex(0)
-2 >Emitted(147, 14) Source(98, 32) + SourceIndex(0)
-3 >Emitted(147, 14) Source(98, 9) + SourceIndex(0)
-4 >Emitted(147, 18) Source(98, 32) + SourceIndex(0)
+1 >Emitted(148, 13) Source(98, 31) + SourceIndex(0)
+2 >Emitted(148, 14) Source(98, 32) + SourceIndex(0)
+3 >Emitted(148, 14) Source(98, 9) + SourceIndex(0)
+4 >Emitted(148, 18) Source(98, 32) + SourceIndex(0)
 ---
 >>>            NotExportedModule.ClassA = ClassA;
 1->^^^^^^^^^^^^
@@ -2594,10 +2595,10 @@ sourceFile:typeResolution.ts
 2 >            ClassA
 3 >                                     { }
 4 >                                             
-1->Emitted(148, 13) Source(98, 22) + SourceIndex(0)
-2 >Emitted(148, 37) Source(98, 28) + SourceIndex(0)
-3 >Emitted(148, 46) Source(98, 32) + SourceIndex(0)
-4 >Emitted(148, 47) Source(98, 32) + SourceIndex(0)
+1->Emitted(149, 13) Source(98, 22) + SourceIndex(0)
+2 >Emitted(149, 37) Source(98, 28) + SourceIndex(0)
+3 >Emitted(149, 46) Source(98, 32) + SourceIndex(0)
+4 >Emitted(149, 47) Source(98, 32) + SourceIndex(0)
 ---
 >>>        })(NotExportedModule || (NotExportedModule = {}));
 1->^^^^^^^^
@@ -2618,13 +2619,13 @@ sourceFile:typeResolution.ts
 7 >                                                   {
   >                                                          export class ClassA { }
   >                                                      }
-1->Emitted(149, 9) Source(99, 5) + SourceIndex(0)
-2 >Emitted(149, 10) Source(99, 6) + SourceIndex(0)
-3 >Emitted(149, 12) Source(97, 12) + SourceIndex(0)
-4 >Emitted(149, 29) Source(97, 29) + SourceIndex(0)
-5 >Emitted(149, 34) Source(97, 12) + SourceIndex(0)
-6 >Emitted(149, 51) Source(97, 29) + SourceIndex(0)
-7 >Emitted(149, 59) Source(99, 6) + SourceIndex(0)
+1->Emitted(150, 9) Source(99, 5) + SourceIndex(0)
+2 >Emitted(150, 10) Source(99, 6) + SourceIndex(0)
+3 >Emitted(150, 12) Source(97, 12) + SourceIndex(0)
+4 >Emitted(150, 29) Source(97, 29) + SourceIndex(0)
+5 >Emitted(150, 34) Source(97, 12) + SourceIndex(0)
+6 >Emitted(150, 51) Source(97, 29) + SourceIndex(0)
+7 >Emitted(150, 59) Source(99, 6) + SourceIndex(0)
 ---
 >>>    })(TopLevelModule1 = exports.TopLevelModule1 || (exports.TopLevelModule1 = {}));
 1->^^^^
@@ -2745,15 +2746,15 @@ sourceFile:typeResolution.ts
   >                                                                                    export class ClassA { }
   >                                                                                }
   >                                                                            }
-1->Emitted(150, 5) Source(100, 1) + SourceIndex(0)
-2 >Emitted(150, 6) Source(100, 2) + SourceIndex(0)
-3 >Emitted(150, 8) Source(1, 15) + SourceIndex(0)
-4 >Emitted(150, 23) Source(1, 30) + SourceIndex(0)
-5 >Emitted(150, 26) Source(1, 15) + SourceIndex(0)
-6 >Emitted(150, 49) Source(1, 30) + SourceIndex(0)
-7 >Emitted(150, 54) Source(1, 15) + SourceIndex(0)
-8 >Emitted(150, 77) Source(1, 30) + SourceIndex(0)
-9 >Emitted(150, 85) Source(100, 2) + SourceIndex(0)
+1->Emitted(151, 5) Source(100, 1) + SourceIndex(0)
+2 >Emitted(151, 6) Source(100, 2) + SourceIndex(0)
+3 >Emitted(151, 8) Source(1, 15) + SourceIndex(0)
+4 >Emitted(151, 23) Source(1, 30) + SourceIndex(0)
+5 >Emitted(151, 26) Source(1, 15) + SourceIndex(0)
+6 >Emitted(151, 49) Source(1, 30) + SourceIndex(0)
+7 >Emitted(151, 54) Source(1, 15) + SourceIndex(0)
+8 >Emitted(151, 77) Source(1, 30) + SourceIndex(0)
+9 >Emitted(151, 85) Source(100, 2) + SourceIndex(0)
 ---
 >>>    var TopLevelModule2;
 1 >^^^^
@@ -2773,10 +2774,10 @@ sourceFile:typeResolution.ts
   >                               }
   >                           }
   >                       }
-1 >Emitted(151, 5) Source(102, 1) + SourceIndex(0)
-2 >Emitted(151, 9) Source(102, 8) + SourceIndex(0)
-3 >Emitted(151, 24) Source(102, 23) + SourceIndex(0)
-4 >Emitted(151, 25) Source(108, 2) + SourceIndex(0)
+1 >Emitted(152, 5) Source(102, 1) + SourceIndex(0)
+2 >Emitted(152, 9) Source(102, 8) + SourceIndex(0)
+3 >Emitted(152, 24) Source(102, 23) + SourceIndex(0)
+4 >Emitted(152, 25) Source(108, 2) + SourceIndex(0)
 ---
 >>>    (function (TopLevelModule2) {
 1->^^^^
@@ -2785,9 +2786,9 @@ sourceFile:typeResolution.ts
 1->
 2 >    module 
 3 >               TopLevelModule2
-1->Emitted(152, 5) Source(102, 1) + SourceIndex(0)
-2 >Emitted(152, 16) Source(102, 8) + SourceIndex(0)
-3 >Emitted(152, 31) Source(102, 23) + SourceIndex(0)
+1->Emitted(153, 5) Source(102, 1) + SourceIndex(0)
+2 >Emitted(153, 16) Source(102, 8) + SourceIndex(0)
+3 >Emitted(153, 31) Source(102, 23) + SourceIndex(0)
 ---
 >>>        var SubModule3;
 1 >^^^^^^^^
@@ -2804,10 +2805,10 @@ sourceFile:typeResolution.ts
   >                                  public AisIn2_3() { }
   >                              }
   >                          }
-1 >Emitted(153, 9) Source(103, 5) + SourceIndex(0)
-2 >Emitted(153, 13) Source(103, 19) + SourceIndex(0)
-3 >Emitted(153, 23) Source(103, 29) + SourceIndex(0)
-4 >Emitted(153, 24) Source(107, 6) + SourceIndex(0)
+1 >Emitted(154, 9) Source(103, 5) + SourceIndex(0)
+2 >Emitted(154, 13) Source(103, 19) + SourceIndex(0)
+3 >Emitted(154, 23) Source(103, 29) + SourceIndex(0)
+4 >Emitted(154, 24) Source(107, 6) + SourceIndex(0)
 ---
 >>>        (function (SubModule3) {
 1->^^^^^^^^
@@ -2817,22 +2818,22 @@ sourceFile:typeResolution.ts
 1->
 2 >        export module 
 3 >                   SubModule3
-1->Emitted(154, 9) Source(103, 5) + SourceIndex(0)
-2 >Emitted(154, 20) Source(103, 19) + SourceIndex(0)
-3 >Emitted(154, 30) Source(103, 29) + SourceIndex(0)
+1->Emitted(155, 9) Source(103, 5) + SourceIndex(0)
+2 >Emitted(155, 20) Source(103, 19) + SourceIndex(0)
+3 >Emitted(155, 30) Source(103, 29) + SourceIndex(0)
 ---
 >>>            var ClassA = (function () {
 1->^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^^^^^^^^^^^^^^->
 1-> {
   >        
-1->Emitted(155, 13) Source(104, 9) + SourceIndex(0)
+1->Emitted(156, 13) Source(104, 9) + SourceIndex(0)
 ---
 >>>                function ClassA() {
 1->^^^^^^^^^^^^^^^^
 2 >                ^^->
 1->
-1->Emitted(156, 17) Source(104, 9) + SourceIndex(0)
+1->Emitted(157, 17) Source(104, 9) + SourceIndex(0)
 ---
 >>>                }
 1->^^^^^^^^^^^^^^^^
@@ -2842,8 +2843,8 @@ sourceFile:typeResolution.ts
   >            public AisIn2_3() { }
   >        
 2 >                }
-1->Emitted(157, 17) Source(106, 9) + SourceIndex(0)
-2 >Emitted(157, 18) Source(106, 10) + SourceIndex(0)
+1->Emitted(158, 17) Source(106, 9) + SourceIndex(0)
+2 >Emitted(158, 18) Source(106, 10) + SourceIndex(0)
 ---
 >>>                ClassA.prototype.AisIn2_3 = function () { };
 1->^^^^^^^^^^^^^^^^
@@ -2856,11 +2857,11 @@ sourceFile:typeResolution.ts
 3 >                                         
 4 >                                            public AisIn2_3() { 
 5 >                                                          }
-1->Emitted(158, 17) Source(105, 20) + SourceIndex(0)
-2 >Emitted(158, 42) Source(105, 28) + SourceIndex(0)
-3 >Emitted(158, 45) Source(105, 13) + SourceIndex(0)
-4 >Emitted(158, 59) Source(105, 33) + SourceIndex(0)
-5 >Emitted(158, 60) Source(105, 34) + SourceIndex(0)
+1->Emitted(159, 17) Source(105, 20) + SourceIndex(0)
+2 >Emitted(159, 42) Source(105, 28) + SourceIndex(0)
+3 >Emitted(159, 45) Source(105, 13) + SourceIndex(0)
+4 >Emitted(159, 59) Source(105, 33) + SourceIndex(0)
+5 >Emitted(159, 60) Source(105, 34) + SourceIndex(0)
 ---
 >>>                return ClassA;
 1 >^^^^^^^^^^^^^^^^
@@ -2868,8 +2869,8 @@ sourceFile:typeResolution.ts
 1 >
   >        
 2 >                }
-1 >Emitted(159, 17) Source(106, 9) + SourceIndex(0)
-2 >Emitted(159, 30) Source(106, 10) + SourceIndex(0)
+1 >Emitted(160, 17) Source(106, 9) + SourceIndex(0)
+2 >Emitted(160, 30) Source(106, 10) + SourceIndex(0)
 ---
 >>>            }());
 1 >^^^^^^^^^^^^
@@ -2883,10 +2884,10 @@ sourceFile:typeResolution.ts
 4 >             export class ClassA {
   >                         public AisIn2_3() { }
   >                     }
-1 >Emitted(160, 13) Source(106, 9) + SourceIndex(0)
-2 >Emitted(160, 14) Source(106, 10) + SourceIndex(0)
-3 >Emitted(160, 14) Source(104, 9) + SourceIndex(0)
-4 >Emitted(160, 18) Source(106, 10) + SourceIndex(0)
+1 >Emitted(161, 13) Source(106, 9) + SourceIndex(0)
+2 >Emitted(161, 14) Source(106, 10) + SourceIndex(0)
+3 >Emitted(161, 14) Source(104, 9) + SourceIndex(0)
+4 >Emitted(161, 18) Source(106, 10) + SourceIndex(0)
 ---
 >>>            SubModule3.ClassA = ClassA;
 1->^^^^^^^^^^^^
@@ -2900,10 +2901,10 @@ sourceFile:typeResolution.ts
   >                                         public AisIn2_3() { }
   >                                     }
 4 >                                      
-1->Emitted(161, 13) Source(104, 22) + SourceIndex(0)
-2 >Emitted(161, 30) Source(104, 28) + SourceIndex(0)
-3 >Emitted(161, 39) Source(106, 10) + SourceIndex(0)
-4 >Emitted(161, 40) Source(106, 10) + SourceIndex(0)
+1->Emitted(162, 13) Source(104, 22) + SourceIndex(0)
+2 >Emitted(162, 30) Source(104, 28) + SourceIndex(0)
+3 >Emitted(162, 39) Source(106, 10) + SourceIndex(0)
+4 >Emitted(162, 40) Source(106, 10) + SourceIndex(0)
 ---
 >>>        })(SubModule3 = TopLevelModule2.SubModule3 || (TopLevelModule2.SubModule3 = {}));
 1->^^^^^^^^
@@ -2929,15 +2930,15 @@ sourceFile:typeResolution.ts
   >                                                                                             public AisIn2_3() { }
   >                                                                                         }
   >                                                                                     }
-1->Emitted(162, 9) Source(107, 5) + SourceIndex(0)
-2 >Emitted(162, 10) Source(107, 6) + SourceIndex(0)
-3 >Emitted(162, 12) Source(103, 19) + SourceIndex(0)
-4 >Emitted(162, 22) Source(103, 29) + SourceIndex(0)
-5 >Emitted(162, 25) Source(103, 19) + SourceIndex(0)
-6 >Emitted(162, 51) Source(103, 29) + SourceIndex(0)
-7 >Emitted(162, 56) Source(103, 19) + SourceIndex(0)
-8 >Emitted(162, 82) Source(103, 29) + SourceIndex(0)
-9 >Emitted(162, 90) Source(107, 6) + SourceIndex(0)
+1->Emitted(163, 9) Source(107, 5) + SourceIndex(0)
+2 >Emitted(163, 10) Source(107, 6) + SourceIndex(0)
+3 >Emitted(163, 12) Source(103, 19) + SourceIndex(0)
+4 >Emitted(163, 22) Source(103, 29) + SourceIndex(0)
+5 >Emitted(163, 25) Source(103, 19) + SourceIndex(0)
+6 >Emitted(163, 51) Source(103, 29) + SourceIndex(0)
+7 >Emitted(163, 56) Source(103, 19) + SourceIndex(0)
+8 >Emitted(163, 82) Source(103, 29) + SourceIndex(0)
+9 >Emitted(163, 90) Source(107, 6) + SourceIndex(0)
 ---
 >>>    })(TopLevelModule2 || (TopLevelModule2 = {}));
 1 >^^^^
@@ -2961,13 +2962,13 @@ sourceFile:typeResolution.ts
   >                                                  }
   >                                              }
   >                                          }
-1 >Emitted(163, 5) Source(108, 1) + SourceIndex(0)
-2 >Emitted(163, 6) Source(108, 2) + SourceIndex(0)
-3 >Emitted(163, 8) Source(102, 8) + SourceIndex(0)
-4 >Emitted(163, 23) Source(102, 23) + SourceIndex(0)
-5 >Emitted(163, 28) Source(102, 8) + SourceIndex(0)
-6 >Emitted(163, 43) Source(102, 23) + SourceIndex(0)
-7 >Emitted(163, 51) Source(108, 2) + SourceIndex(0)
+1 >Emitted(164, 5) Source(108, 1) + SourceIndex(0)
+2 >Emitted(164, 6) Source(108, 2) + SourceIndex(0)
+3 >Emitted(164, 8) Source(102, 8) + SourceIndex(0)
+4 >Emitted(164, 23) Source(102, 23) + SourceIndex(0)
+5 >Emitted(164, 28) Source(102, 8) + SourceIndex(0)
+6 >Emitted(164, 43) Source(102, 23) + SourceIndex(0)
+7 >Emitted(164, 51) Source(108, 2) + SourceIndex(0)
 ---
 >>>});
 >>>//# sourceMappingURL=typeResolution.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js
index a2542ca9cc0..2ea407932bb 100644
--- a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js
+++ b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js
@@ -25,6 +25,7 @@ x + y + z;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var xyz_1 = require("xyz");
 var pdq_1 = require("pdq");
 var abc_1 = require("abc");
diff --git a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js
index 9e93755d1f0..d21c51faee3 100644
--- a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js
+++ b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js
@@ -13,5 +13,6 @@ x;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var xyz_1 = require("xyz");
 xyz_1.x;
diff --git a/tests/baselines/reference/typeUsedAsValueError2.js b/tests/baselines/reference/typeUsedAsValueError2.js
index c3bd736cbb7..2c068d4f4d2 100644
--- a/tests/baselines/reference/typeUsedAsValueError2.js
+++ b/tests/baselines/reference/typeUsedAsValueError2.js
@@ -24,14 +24,17 @@ HelloNamespace.world;
 //// [helloInterface.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [helloNamespace.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [world.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     HelloInterface.world;
     HelloNamespace.world;
 });
diff --git a/tests/baselines/reference/typeofANonExportedType.js b/tests/baselines/reference/typeofANonExportedType.js
index 5c99948e9c9..ba4451243ca 100644
--- a/tests/baselines/reference/typeofANonExportedType.js
+++ b/tests/baselines/reference/typeofANonExportedType.js
@@ -53,6 +53,7 @@ export var r13: typeof foo;
 
 //// [typeofANonExportedType.js]
 "use strict";
+exports.__esModule = true;
 var x = 1;
 var y = { foo: '' };
 var C = (function () {
diff --git a/tests/baselines/reference/typeofAmbientExternalModules.js b/tests/baselines/reference/typeofAmbientExternalModules.js
index de158544d0d..2500193ebde 100644
--- a/tests/baselines/reference/typeofAmbientExternalModules.js
+++ b/tests/baselines/reference/typeofAmbientExternalModules.js
@@ -20,6 +20,7 @@ y2 = ext;
 
 //// [typeofAmbientExternalModules_0.js]
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
@@ -36,6 +37,7 @@ var D = (function () {
 module.exports = D;
 //// [typeofAmbientExternalModules_2.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='typeofAmbientExternalModules_0.ts'/>
 ///<reference path='typeofAmbientExternalModules_1.ts'/>
 var ext = require("./typeofAmbientExternalModules_0");
diff --git a/tests/baselines/reference/typeofAnExportedType.js b/tests/baselines/reference/typeofAnExportedType.js
index 69602d3e4c3..e166f6b745b 100644
--- a/tests/baselines/reference/typeofAnExportedType.js
+++ b/tests/baselines/reference/typeofAnExportedType.js
@@ -53,6 +53,7 @@ export var r13: typeof foo;
 
 //// [typeofAnExportedType.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 1;
 exports.y = { foo: '' };
 var C = (function () {
diff --git a/tests/baselines/reference/typeofExternalModules.js b/tests/baselines/reference/typeofExternalModules.js
index 1c43d28be8b..97c6b6d7278 100644
--- a/tests/baselines/reference/typeofExternalModules.js
+++ b/tests/baselines/reference/typeofExternalModules.js
@@ -18,6 +18,7 @@ y2 = ext;
 
 //// [typeofExternalModules_external.js]
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
@@ -34,6 +35,7 @@ var D = (function () {
 module.exports = D;
 //// [typeofExternalModules_core.js]
 "use strict";
+exports.__esModule = true;
 var ext = require("./typeofExternalModules_external");
 var exp = require("./typeofExternalModules_exportAssign");
 var y1 = ext;
diff --git a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js
index 1424f9343aa..4a93b9293a5 100644
--- a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js
+++ b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js
@@ -22,8 +22,10 @@ var y: {M2: Object} = foo0;
 
 //// [foo_0.js]
 "use strict";
+exports.__esModule = true;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo0 = require("./foo_0");
 // Per 11.2.3, foo_0 should still be "instantiated", albeit with no members
 var x = {};
diff --git a/tests/baselines/reference/typingsLookup4.js b/tests/baselines/reference/typingsLookup4.js
index c11bc13c613..d2424644d16 100644
--- a/tests/baselines/reference/typingsLookup4.js
+++ b/tests/baselines/reference/typingsLookup4.js
@@ -18,19 +18,33 @@ export const k: number;
 //// [lquery.ts]
 export const l = 2;
 
+//// [package.json]
+{ "typings": "mquery" }
+
+//// [index.tsx]
+export const m = 3;
+
 //// [a.ts]
 import { j } from "jquery";
 import { k } from "kquery";
 import { l } from "lquery";
-j + k + l;
+import { m } from "mquery";
+j + k + l + m;
 
 
 //// [lquery.js]
 "use strict";
+exports.__esModule = true;
 exports.l = 2;
+//// [index.js]
+"use strict";
+exports.__esModule = true;
+exports.m = 3;
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var jquery_1 = require("jquery");
 var kquery_1 = require("kquery");
 var lquery_1 = require("lquery");
-jquery_1.j + kquery_1.k + lquery_1.l;
+var mquery_1 = require("mquery");
+jquery_1.j + kquery_1.k + lquery_1.l + mquery_1.m;
diff --git a/tests/baselines/reference/typingsLookup4.symbols b/tests/baselines/reference/typingsLookup4.symbols
index 144548c6452..9269ee6617d 100644
--- a/tests/baselines/reference/typingsLookup4.symbols
+++ b/tests/baselines/reference/typingsLookup4.symbols
@@ -8,10 +8,14 @@ import { k } from "kquery";
 import { l } from "lquery";
 >l : Symbol(l, Decl(a.ts, 2, 8))
 
-j + k + l;
+import { m } from "mquery";
+>m : Symbol(m, Decl(a.ts, 3, 8))
+
+j + k + l + m;
 >j : Symbol(j, Decl(a.ts, 0, 8))
 >k : Symbol(k, Decl(a.ts, 1, 8))
 >l : Symbol(l, Decl(a.ts, 2, 8))
+>m : Symbol(m, Decl(a.ts, 3, 8))
 
 === /node_modules/@types/jquery/jquery.d.ts ===
 export const j: number;
@@ -25,3 +29,7 @@ export const k: number;
 export const l = 2;
 >l : Symbol(l, Decl(lquery.ts, 0, 12))
 
+=== /node_modules/@types/mquery/mquery/index.tsx ===
+export const m = 3;
+>m : Symbol(m, Decl(index.tsx, 0, 12))
+
diff --git a/tests/baselines/reference/typingsLookup4.trace.json b/tests/baselines/reference/typingsLookup4.trace.json
index 451d68edf28..332d9ffa416 100644
--- a/tests/baselines/reference/typingsLookup4.trace.json
+++ b/tests/baselines/reference/typingsLookup4.trace.json
@@ -21,6 +21,7 @@
     "Found 'package.json' at '/node_modules/@types/kquery/package.json'.",
     "'package.json' has 'typings' field 'kquery' that references '/node_modules/@types/kquery/kquery'.",
     "File '/node_modules/@types/kquery/kquery' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/@types/kquery/kquery', target file type 'TypeScript'.",
     "File '/node_modules/@types/kquery/kquery.ts' does not exist.",
     "File '/node_modules/@types/kquery/kquery.tsx' does not exist.",
     "File '/node_modules/@types/kquery/kquery.d.ts' exist - use it as a name resolution result.",
@@ -36,9 +37,28 @@
     "Found 'package.json' at '/node_modules/@types/lquery/package.json'.",
     "'package.json' has 'typings' field 'lquery' that references '/node_modules/@types/lquery/lquery'.",
     "File '/node_modules/@types/lquery/lquery' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/@types/lquery/lquery', target file type 'TypeScript'.",
     "File '/node_modules/@types/lquery/lquery.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/node_modules/@types/lquery/lquery.ts', result '/node_modules/@types/lquery/lquery.ts'",
     "======== Module name 'lquery' was successfully resolved to '/node_modules/@types/lquery/lquery.ts'. ========",
+    "======== Resolving module 'mquery' from '/a.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module 'mquery' from 'node_modules' folder, target file type 'TypeScript'.",
+    "File '/node_modules/mquery.ts' does not exist.",
+    "File '/node_modules/mquery.tsx' does not exist.",
+    "File '/node_modules/mquery.d.ts' does not exist.",
+    "File '/node_modules/@types/mquery.d.ts' does not exist.",
+    "Found 'package.json' at '/node_modules/@types/mquery/package.json'.",
+    "'package.json' has 'typings' field 'mquery' that references '/node_modules/@types/mquery/mquery'.",
+    "File '/node_modules/@types/mquery/mquery' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/@types/mquery/mquery', target file type 'TypeScript'.",
+    "File '/node_modules/@types/mquery/mquery.ts' does not exist.",
+    "File '/node_modules/@types/mquery/mquery.tsx' does not exist.",
+    "File '/node_modules/@types/mquery/mquery.d.ts' does not exist.",
+    "File '/node_modules/@types/mquery/mquery/index.ts' does not exist.",
+    "File '/node_modules/@types/mquery/mquery/index.tsx' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/@types/mquery/mquery/index.tsx', result '/node_modules/@types/mquery/mquery/index.tsx'",
+    "======== Module name 'mquery' was successfully resolved to '/node_modules/@types/mquery/mquery/index.tsx'. ========",
     "======== Resolving type reference directive 'jquery', containing file '/__inferred type names__.ts', root directory '/node_modules/@types'. ========",
     "Resolving with primary search path '/node_modules/@types'",
     "Found 'package.json' at '/node_modules/@types/jquery/package.json'.",
@@ -51,6 +71,7 @@
     "Found 'package.json' at '/node_modules/@types/kquery/package.json'.",
     "'package.json' has 'typings' field 'kquery' that references '/node_modules/@types/kquery/kquery'.",
     "File '/node_modules/@types/kquery/kquery' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/@types/kquery/kquery', target file type 'TypeScript'.",
     "File '/node_modules/@types/kquery/kquery.ts' does not exist.",
     "File '/node_modules/@types/kquery/kquery.tsx' does not exist.",
     "File '/node_modules/@types/kquery/kquery.d.ts' exist - use it as a name resolution result.",
@@ -61,7 +82,21 @@
     "Found 'package.json' at '/node_modules/@types/lquery/package.json'.",
     "'package.json' has 'typings' field 'lquery' that references '/node_modules/@types/lquery/lquery'.",
     "File '/node_modules/@types/lquery/lquery' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/@types/lquery/lquery', target file type 'TypeScript'.",
     "File '/node_modules/@types/lquery/lquery.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/node_modules/@types/lquery/lquery.ts', result '/node_modules/@types/lquery/lquery.ts'",
-    "======== Type reference directive 'lquery' was successfully resolved to '/node_modules/@types/lquery/lquery.ts', primary: true. ========"
+    "======== Type reference directive 'lquery' was successfully resolved to '/node_modules/@types/lquery/lquery.ts', primary: true. ========",
+    "======== Resolving type reference directive 'mquery', containing file '/__inferred type names__.ts', root directory '/node_modules/@types'. ========",
+    "Resolving with primary search path '/node_modules/@types'",
+    "Found 'package.json' at '/node_modules/@types/mquery/package.json'.",
+    "'package.json' has 'typings' field 'mquery' that references '/node_modules/@types/mquery/mquery'.",
+    "File '/node_modules/@types/mquery/mquery' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/@types/mquery/mquery', target file type 'TypeScript'.",
+    "File '/node_modules/@types/mquery/mquery.ts' does not exist.",
+    "File '/node_modules/@types/mquery/mquery.tsx' does not exist.",
+    "File '/node_modules/@types/mquery/mquery.d.ts' does not exist.",
+    "File '/node_modules/@types/mquery/mquery/index.ts' does not exist.",
+    "File '/node_modules/@types/mquery/mquery/index.tsx' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/@types/mquery/mquery/index.tsx', result '/node_modules/@types/mquery/mquery/index.tsx'",
+    "======== Type reference directive 'mquery' was successfully resolved to '/node_modules/@types/mquery/mquery/index.tsx', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typingsLookup4.types b/tests/baselines/reference/typingsLookup4.types
index e3f747ac55d..afa2483a862 100644
--- a/tests/baselines/reference/typingsLookup4.types
+++ b/tests/baselines/reference/typingsLookup4.types
@@ -8,12 +8,17 @@ import { k } from "kquery";
 import { l } from "lquery";
 >l : 2
 
-j + k + l;
+import { m } from "mquery";
+>m : 3
+
+j + k + l + m;
+>j + k + l + m : number
 >j + k + l : number
 >j + k : number
 >j : number
 >k : number
 >l : 2
+>m : 3
 
 === /node_modules/@types/jquery/jquery.d.ts ===
 export const j: number;
@@ -28,3 +33,8 @@ export const l = 2;
 >l : 2
 >2 : 2
 
+=== /node_modules/@types/mquery/mquery/index.tsx ===
+export const m = 3;
+>m : 3
+>3 : 3
+
diff --git a/tests/baselines/reference/typingsLookupAmd.js b/tests/baselines/reference/typingsLookupAmd.js
index 1e99644d489..2dc19872ad4 100644
--- a/tests/baselines/reference/typingsLookupAmd.js
+++ b/tests/baselines/reference/typingsLookupAmd.js
@@ -15,4 +15,5 @@ import {B} from "b";
 //// [foo.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/umd-augmentation-1.js b/tests/baselines/reference/umd-augmentation-1.js
index ee4c143486c..b04de61f192 100644
--- a/tests/baselines/reference/umd-augmentation-1.js
+++ b/tests/baselines/reference/umd-augmentation-1.js
@@ -41,6 +41,7 @@ var t = p.x;
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="math2d-augment.d.ts" />
 var m = require("math2d");
 var v = new m.Vector(3, 2);
diff --git a/tests/baselines/reference/umd-augmentation-3.js b/tests/baselines/reference/umd-augmentation-3.js
index e9abf724881..9c4c4b09ec6 100644
--- a/tests/baselines/reference/umd-augmentation-3.js
+++ b/tests/baselines/reference/umd-augmentation-3.js
@@ -47,6 +47,7 @@ var t = p.x;
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="math2d-augment.d.ts" />
 var m = require("math2d");
 var v = new m.Vector(3, 2);
diff --git a/tests/baselines/reference/umd-errors.js b/tests/baselines/reference/umd-errors.js
index 7423c81f9ed..a8b789294bd 100644
--- a/tests/baselines/reference/umd-errors.js
+++ b/tests/baselines/reference/umd-errors.js
@@ -34,3 +34,4 @@ export as namespace C2;
 
 //// [err5.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/umd3.js b/tests/baselines/reference/umd3.js
index 03e15be2ecf..a3208c0741a 100644
--- a/tests/baselines/reference/umd3.js
+++ b/tests/baselines/reference/umd3.js
@@ -16,6 +16,7 @@ let y: number = x.n;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var Foo = require("./foo");
 Foo.fn();
 var x;
diff --git a/tests/baselines/reference/umd4.js b/tests/baselines/reference/umd4.js
index d06fc3aba93..ca96540d305 100644
--- a/tests/baselines/reference/umd4.js
+++ b/tests/baselines/reference/umd4.js
@@ -16,6 +16,7 @@ let y: number = x.n;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var Bar = require("./foo");
 Bar.fn();
 var x;
diff --git a/tests/baselines/reference/umd5.js b/tests/baselines/reference/umd5.js
index 95626132f77..aa7ccc485c0 100644
--- a/tests/baselines/reference/umd5.js
+++ b/tests/baselines/reference/umd5.js
@@ -18,6 +18,7 @@ let z = Foo;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var Bar = require("./foo");
 Bar.fn();
 var x;
diff --git a/tests/baselines/reference/umd8.js b/tests/baselines/reference/umd8.js
index e76b3902156..c3e6617396b 100644
--- a/tests/baselines/reference/umd8.js
+++ b/tests/baselines/reference/umd8.js
@@ -23,6 +23,7 @@ let x: any = Foo; // Not OK in value position
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var y; // OK in type position
 y.foo();
 var z; // OK in ns position
diff --git a/tests/baselines/reference/umdDependencyComment2.js b/tests/baselines/reference/umdDependencyComment2.js
index 4e784d87fa3..021ba5254b0 100644
--- a/tests/baselines/reference/umdDependencyComment2.js
+++ b/tests/baselines/reference/umdDependencyComment2.js
@@ -17,6 +17,7 @@ m1.f();
     }
 })(function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var m1 = require("m2");
     m1.f();
 });
diff --git a/tests/baselines/reference/umdDependencyCommentName1.js b/tests/baselines/reference/umdDependencyCommentName1.js
index 45cae25192a..eba6f0cc16b 100644
--- a/tests/baselines/reference/umdDependencyCommentName1.js
+++ b/tests/baselines/reference/umdDependencyCommentName1.js
@@ -17,6 +17,7 @@ m1.f();
     }
 })(function (require, exports, b) {
     "use strict";
+    exports.__esModule = true;
     var m1 = require("m2");
     m1.f();
 });
diff --git a/tests/baselines/reference/umdDependencyCommentName2.js b/tests/baselines/reference/umdDependencyCommentName2.js
index e85d5b99b14..2ca52848d15 100644
--- a/tests/baselines/reference/umdDependencyCommentName2.js
+++ b/tests/baselines/reference/umdDependencyCommentName2.js
@@ -21,6 +21,7 @@ m1.f();
     }
 })(function (require, exports, b, c) {
     "use strict";
+    exports.__esModule = true;
     var m1 = require("m2");
     m1.f();
 });
diff --git a/tests/baselines/reference/umdGlobalConflict.js b/tests/baselines/reference/umdGlobalConflict.js
index e8a820e2333..114bdd643e4 100644
--- a/tests/baselines/reference/umdGlobalConflict.js
+++ b/tests/baselines/reference/umdGlobalConflict.js
@@ -18,6 +18,7 @@ const p: string = Alpha.x;
 
 //// [consumer.js]
 "use strict";
+exports.__esModule = true;
 //// [global.js]
 // Should be OK, first in wins
 var p = Alpha.x;
diff --git a/tests/baselines/reference/unclosedExportClause01.js b/tests/baselines/reference/unclosedExportClause01.js
index 1fe59e24a51..f6b2c7e1062 100644
--- a/tests/baselines/reference/unclosedExportClause01.js
+++ b/tests/baselines/reference/unclosedExportClause01.js
@@ -18,23 +18,28 @@ export { x as a, from "./t1"
 
 //// [t1.js]
 "use strict";
+exports.__esModule = true;
 exports.x = "x";
 //// [t2.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.x = t1_1.x;
 exports.from = t1_1.from;
 //// [t3.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.from = t1_1.from;
 //// [t4.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.a = t1_1.x;
 exports.from = t1_1.from;
 //// [t5.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.a = t1_1.x;
 exports.from = t1_1.from;
diff --git a/tests/baselines/reference/unclosedExportClause02.js b/tests/baselines/reference/unclosedExportClause02.js
index 188c8e9d18e..73a83a39b62 100644
--- a/tests/baselines/reference/unclosedExportClause02.js
+++ b/tests/baselines/reference/unclosedExportClause02.js
@@ -22,16 +22,21 @@ export { x as a, from
 
 //// [t1.js]
 "use strict";
+exports.__esModule = true;
 exports.x = "x";
 //// [t2.js]
 "use strict";
+exports.__esModule = true;
 "./t1";
 //// [t3.js]
 "use strict";
+exports.__esModule = true;
 "./t1";
 //// [t4.js]
 "use strict";
+exports.__esModule = true;
 "./t1";
 //// [t5.js]
 "use strict";
+exports.__esModule = true;
 "./t1";
diff --git a/tests/baselines/reference/undeclaredModuleError.js b/tests/baselines/reference/undeclaredModuleError.js
index 88f5e3ab352..927df99766e 100644
--- a/tests/baselines/reference/undeclaredModuleError.js
+++ b/tests/baselines/reference/undeclaredModuleError.js
@@ -18,6 +18,7 @@ function instrumentFile(covFileDir: string, covFileName: string, originalFilePat
 //// [undeclaredModuleError.js]
 define(["require", "exports", "fs"], function (require, exports, fs) {
     "use strict";
+    exports.__esModule = true;
     function readdir(path, accept, callback) { }
     function join() {
         var paths = [];
diff --git a/tests/baselines/reference/untypedModuleImport.js b/tests/baselines/reference/untypedModuleImport.js
index e3548856411..90fb9ab5f43 100644
--- a/tests/baselines/reference/untypedModuleImport.js
+++ b/tests/baselines/reference/untypedModuleImport.js
@@ -23,14 +23,17 @@ foo(bar());
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("foo");
 foo.bar();
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("foo");
 foo();
 //// [c.js]
 "use strict";
+exports.__esModule = true;
 var foo_1 = require("foo");
 require("./a");
 require("./b");
diff --git a/tests/baselines/reference/untypedModuleImport_allowJs.js b/tests/baselines/reference/untypedModuleImport_allowJs.js
index 8ca5115a386..5d60df6687c 100644
--- a/tests/baselines/reference/untypedModuleImport_allowJs.js
+++ b/tests/baselines/reference/untypedModuleImport_allowJs.js
@@ -12,5 +12,6 @@ foo.bar();
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var foo_1 = require("foo");
 foo_1["default"].bar();
diff --git a/tests/baselines/reference/untypedModuleImport_noImplicitAny.js b/tests/baselines/reference/untypedModuleImport_noImplicitAny.js
index ab1e1940e36..86e2ae3c175 100644
--- a/tests/baselines/reference/untypedModuleImport_noImplicitAny.js
+++ b/tests/baselines/reference/untypedModuleImport_noImplicitAny.js
@@ -11,3 +11,4 @@ import * as foo from "foo";
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/untypedModuleImport_noLocalImports.js b/tests/baselines/reference/untypedModuleImport_noLocalImports.js
index 8fa67a0857f..6328101a2ee 100644
--- a/tests/baselines/reference/untypedModuleImport_noLocalImports.js
+++ b/tests/baselines/reference/untypedModuleImport_noLocalImports.js
@@ -11,3 +11,4 @@ import * as foo from "./foo";
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/untypedModuleImport_vsAmbient.js b/tests/baselines/reference/untypedModuleImport_vsAmbient.js
index 080cd443375..4273033fe22 100644
--- a/tests/baselines/reference/untypedModuleImport_vsAmbient.js
+++ b/tests/baselines/reference/untypedModuleImport_vsAmbient.js
@@ -18,6 +18,7 @@ x;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="./declarations.d.ts" />
 var foo_1 = require("foo");
 foo_1.x;
diff --git a/tests/baselines/reference/untypedModuleImport_withAugmentation.js b/tests/baselines/reference/untypedModuleImport_withAugmentation.js
index 17eda95aa8a..9d1770f5497 100644
--- a/tests/baselines/reference/untypedModuleImport_withAugmentation.js
+++ b/tests/baselines/reference/untypedModuleImport_withAugmentation.js
@@ -15,5 +15,6 @@ x;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var foo_1 = require("foo");
 foo_1.x;
diff --git a/tests/baselines/reference/untypedModuleImport_withAugmentation2.js b/tests/baselines/reference/untypedModuleImport_withAugmentation2.js
index f9fa7443224..6a01db5dd25 100644
--- a/tests/baselines/reference/untypedModuleImport_withAugmentation2.js
+++ b/tests/baselines/reference/untypedModuleImport_withAugmentation2.js
@@ -17,3 +17,4 @@ import { } from "augmenter";
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImportDeclaration.js b/tests/baselines/reference/unusedImportDeclaration.js
index ef1d5018892..37f88dc65c3 100644
--- a/tests/baselines/reference/unusedImportDeclaration.js
+++ b/tests/baselines/reference/unusedImportDeclaration.js
@@ -25,6 +25,7 @@ var TesterB = (function () {
 module.exports = TesterB;
 //// [unusedImportDeclaration_testerA.js]
 "use strict";
+exports.__esModule = true;
 var thingy = {
     me: "A"
 };
diff --git a/tests/baselines/reference/unusedImports1.js b/tests/baselines/reference/unusedImports1.js
index afd6eb80843..4bfc7b31a4d 100644
--- a/tests/baselines/reference/unusedImports1.js
+++ b/tests/baselines/reference/unusedImports1.js
@@ -11,6 +11,7 @@ import {Calculator} from "./file1"
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var Calculator = (function () {
     function Calculator() {
     }
@@ -19,3 +20,4 @@ var Calculator = (function () {
 exports.Calculator = Calculator;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports11.js b/tests/baselines/reference/unusedImports11.js
index 109c2e5a886..3f65619c2ae 100644
--- a/tests/baselines/reference/unusedImports11.js
+++ b/tests/baselines/reference/unusedImports11.js
@@ -20,16 +20,17 @@ new r.Member();
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var Member = (function () {
     function Member() {
     }
     return Member;
 }());
 exports.Member = Member;
-exports.__esModule = true;
 exports["default"] = Member;
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var b_1 = require("./b");
 var b_2 = require("./b");
 var ns = require("./b");
diff --git a/tests/baselines/reference/unusedImports12.js b/tests/baselines/reference/unusedImports12.js
index ece9b105bc9..bd4dbacbf26 100644
--- a/tests/baselines/reference/unusedImports12.js
+++ b/tests/baselines/reference/unusedImports12.js
@@ -15,13 +15,14 @@ import r = require("./b");
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var Member = (function () {
     function Member() {
     }
     return Member;
 }());
 exports.Member = Member;
-exports.__esModule = true;
 exports["default"] = Member;
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports13.js b/tests/baselines/reference/unusedImports13.js
index 01e91abc14b..6c5977eaea8 100644
--- a/tests/baselines/reference/unusedImports13.js
+++ b/tests/baselines/reference/unusedImports13.js
@@ -23,5 +23,6 @@ declare global {
 
 //// [foo.jsx]
 "use strict";
+exports.__esModule = true;
 var React = require("react");
 exports.FooComponent = <div></div>;
diff --git a/tests/baselines/reference/unusedImports14.js b/tests/baselines/reference/unusedImports14.js
index f3c51590e49..19a10f2a3a0 100644
--- a/tests/baselines/reference/unusedImports14.js
+++ b/tests/baselines/reference/unusedImports14.js
@@ -23,5 +23,6 @@ declare global {
 
 //// [foo.js]
 "use strict";
+exports.__esModule = true;
 var React = require("react");
 exports.FooComponent = React.createElement("div", null);
diff --git a/tests/baselines/reference/unusedImports15.js b/tests/baselines/reference/unusedImports15.js
index 01be756e0e5..78bd0aa6c74 100644
--- a/tests/baselines/reference/unusedImports15.js
+++ b/tests/baselines/reference/unusedImports15.js
@@ -23,5 +23,6 @@ declare global {
 
 //// [foo.jsx]
 "use strict";
+exports.__esModule = true;
 var Element = require("react");
 exports.FooComponent = <div></div>;
diff --git a/tests/baselines/reference/unusedImports16.js b/tests/baselines/reference/unusedImports16.js
index 1ce802d869a..ffaafc45d4f 100644
--- a/tests/baselines/reference/unusedImports16.js
+++ b/tests/baselines/reference/unusedImports16.js
@@ -23,5 +23,6 @@ declare global {
 
 //// [foo.js]
 "use strict";
+exports.__esModule = true;
 var Element = require("react");
 exports.FooComponent = Element.createElement("div", null);
diff --git a/tests/baselines/reference/unusedImports2.js b/tests/baselines/reference/unusedImports2.js
index f8918db5ab1..ccb57a8f378 100644
--- a/tests/baselines/reference/unusedImports2.js
+++ b/tests/baselines/reference/unusedImports2.js
@@ -19,6 +19,7 @@ x.handleChar();
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var Calculator = (function () {
     function Calculator() {
     }
@@ -31,6 +32,7 @@ function test() {
 exports.test = test;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
 var file1_1 = require("./file1");
 var x = new file1_1.Calculator();
 x.handleChar();
diff --git a/tests/baselines/reference/unusedImports3.js b/tests/baselines/reference/unusedImports3.js
index 5c0a3edf16b..e968ac64062 100644
--- a/tests/baselines/reference/unusedImports3.js
+++ b/tests/baselines/reference/unusedImports3.js
@@ -22,6 +22,7 @@ test2();
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var Calculator = (function () {
     function Calculator() {
     }
@@ -37,6 +38,7 @@ function test2() {
 exports.test2 = test2;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
 var file1_1 = require("./file1");
 file1_1.test();
 file1_1.test2();
diff --git a/tests/baselines/reference/unusedImports4.js b/tests/baselines/reference/unusedImports4.js
index e95938091ae..2a7f456fe99 100644
--- a/tests/baselines/reference/unusedImports4.js
+++ b/tests/baselines/reference/unusedImports4.js
@@ -23,6 +23,7 @@ test2();
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var Calculator = (function () {
     function Calculator() {
     }
@@ -38,6 +39,7 @@ function test2() {
 exports.test2 = test2;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
 var file1_1 = require("./file1");
 var x = new file1_1.Calculator();
 x.handleChar();
diff --git a/tests/baselines/reference/unusedImports5.js b/tests/baselines/reference/unusedImports5.js
index cf92d01eb75..1d187f008b8 100644
--- a/tests/baselines/reference/unusedImports5.js
+++ b/tests/baselines/reference/unusedImports5.js
@@ -23,6 +23,7 @@ test();
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var Calculator = (function () {
     function Calculator() {
     }
@@ -38,6 +39,7 @@ function test2() {
 exports.test2 = test2;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
 var file1_1 = require("./file1");
 var x = new file1_1.Calculator();
 x.handleChar();
diff --git a/tests/baselines/reference/unusedImports6.js b/tests/baselines/reference/unusedImports6.js
index 2e203a62a1b..62386a5fa6c 100644
--- a/tests/baselines/reference/unusedImports6.js
+++ b/tests/baselines/reference/unusedImports6.js
@@ -23,6 +23,7 @@ import d from "./file1"
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var Calculator = (function () {
     function Calculator() {
     }
@@ -35,7 +36,7 @@ function test() {
 exports.test = test;
 function test2() {
 }
-exports.__esModule = true;
 exports["default"] = test2;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports7.js b/tests/baselines/reference/unusedImports7.js
index 67524fcd22a..2c2c87e56bf 100644
--- a/tests/baselines/reference/unusedImports7.js
+++ b/tests/baselines/reference/unusedImports7.js
@@ -21,6 +21,7 @@ import * as n from "./file1"
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var Calculator = (function () {
     function Calculator() {
     }
@@ -33,7 +34,7 @@ function test() {
 exports.test = test;
 function test2() {
 }
-exports.__esModule = true;
 exports["default"] = test2;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports8.js b/tests/baselines/reference/unusedImports8.js
index 2554472e6ce..a095acd5466 100644
--- a/tests/baselines/reference/unusedImports8.js
+++ b/tests/baselines/reference/unusedImports8.js
@@ -23,6 +23,7 @@ t1();
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var Calculator = (function () {
     function Calculator() {
     }
@@ -38,6 +39,7 @@ function test2() {
 exports.test2 = test2;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
 var file1_1 = require("./file1");
 var x = new file1_1.Calculator();
 x.handleChar();
diff --git a/tests/baselines/reference/unusedImports9.js b/tests/baselines/reference/unusedImports9.js
index cd19e167b19..89108d10e17 100644
--- a/tests/baselines/reference/unusedImports9.js
+++ b/tests/baselines/reference/unusedImports9.js
@@ -19,6 +19,7 @@ import c = require('./file1')
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var Calculator = (function () {
     function Calculator() {
     }
@@ -34,3 +35,4 @@ function test2() {
 exports.test2 = test2;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedLocalsAndObjectSpread2.js b/tests/baselines/reference/unusedLocalsAndObjectSpread2.js
index e6cd890abb7..3fb4ef5347b 100644
--- a/tests/baselines/reference/unusedLocalsAndObjectSpread2.js
+++ b/tests/baselines/reference/unusedLocalsAndObjectSpread2.js
@@ -28,6 +28,7 @@ var __rest = (this && this.__rest) || function (s, e) {
             t[p[i]] = s[p[i]];
     return t;
 };
+exports.__esModule = true;
 var children = props.children, // here!
 _a = props.active, // here!
 rest = __rest(props, ["children", "active"]);
diff --git a/tests/baselines/reference/unusedLocalsAndParameters.js b/tests/baselines/reference/unusedLocalsAndParameters.js
index 64ff373db4a..dc575daad33 100644
--- a/tests/baselines/reference/unusedLocalsAndParameters.js
+++ b/tests/baselines/reference/unusedLocalsAndParameters.js
@@ -86,6 +86,7 @@ namespace N {
 
 //// [unusedLocalsAndParameters.js]
 "use strict";
+exports.__esModule = true;
 // function declaration paramter
 function f(a) {
 }
diff --git a/tests/baselines/reference/unusedLocalsAndParametersDeferred.js b/tests/baselines/reference/unusedLocalsAndParametersDeferred.js
index d6e2326842a..5d3e13e328b 100644
--- a/tests/baselines/reference/unusedLocalsAndParametersDeferred.js
+++ b/tests/baselines/reference/unusedLocalsAndParametersDeferred.js
@@ -162,6 +162,7 @@ N;
 
 //// [unusedLocalsAndParametersDeferred.js]
 "use strict";
+exports.__esModule = true;
 function defered(a) {
     return a();
 }
diff --git a/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.js b/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.js
index 221d49a0fdf..475b1ddb769 100644
--- a/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.js
+++ b/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.js
@@ -25,6 +25,7 @@ export function genericFunc(details: number, message: any): any {
 
 //// [unusedLocalsAndParametersOverloadSignatures.js]
 "use strict";
+exports.__esModule = true;
 function func(details, message) {
     return details + message;
 }
diff --git a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.js b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.js
index b854278a3e3..0ff6ac828d0 100644
--- a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.js
+++ b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.js
@@ -29,6 +29,7 @@ y[0]();
 
 //// [unusedLocalsAndParametersTypeAliases.js]
 "use strict";
+exports.__esModule = true;
 var x;
 x();
 var y;
diff --git a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.js b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.js
index 7da916370ca..97c7129b4a9 100644
--- a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.js
+++ b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.js
@@ -13,6 +13,7 @@ export {}
 
 //// [unusedLocalsAndParametersTypeAliases2.js]
 "use strict";
+exports.__esModule = true;
 function foo() {
     foo();
 }
diff --git a/tests/baselines/reference/unusedVariablesinModules1.js b/tests/baselines/reference/unusedVariablesinModules1.js
index 18622a32ba9..edfb384697a 100644
--- a/tests/baselines/reference/unusedVariablesinModules1.js
+++ b/tests/baselines/reference/unusedVariablesinModules1.js
@@ -8,4 +8,5 @@ export var y: string;
 
 //// [unusedVariablesinModules1.js]
 "use strict";
+exports.__esModule = true;
 var x;
diff --git a/tests/baselines/reference/useStrictLikePrologueString01.js b/tests/baselines/reference/useStrictLikePrologueString01.js
index 56df03abfe5..6a1836f4332 100644
--- a/tests/baselines/reference/useStrictLikePrologueString01.js
+++ b/tests/baselines/reference/useStrictLikePrologueString01.js
@@ -9,6 +9,7 @@ export function f() {
 "hey!";
 " use strict ";
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function f() {
 }
 exports.f = f;
diff --git a/tests/baselines/reference/varArgsOnConstructorTypes.js b/tests/baselines/reference/varArgsOnConstructorTypes.js
index c859b4f8260..9c790e7a48b 100644
--- a/tests/baselines/reference/varArgsOnConstructorTypes.js
+++ b/tests/baselines/reference/varArgsOnConstructorTypes.js
@@ -37,6 +37,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A(ctor) {
         }
diff --git a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js
index c80d65158dc..a6d1b095894 100644
--- a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js
+++ b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js
@@ -27,11 +27,14 @@ function run(configuration: commands.IConfiguration) {
 
 //// [visibilityOfCrossModuleTypeUsage_server.js]
 "use strict";
+exports.__esModule = true;
 //// [visibilityOfCrossModuleTypeUsage_commands.js]
 //visibilityOfCrossModuleTypeUsage
 "use strict";
+exports.__esModule = true;
 //// [visibilityOfCrossModuleTypeUsage_fs.js]
 "use strict";
+exports.__esModule = true;
 function run(configuration) {
     var absoluteWorkspacePath = configuration.workspace.toAbsolutePath(configuration.server);
 }
diff --git a/tests/baselines/reference/visibilityOfTypeParameters.js b/tests/baselines/reference/visibilityOfTypeParameters.js
index e9cd9f4deda..9d8a3e73dbe 100644
--- a/tests/baselines/reference/visibilityOfTypeParameters.js
+++ b/tests/baselines/reference/visibilityOfTypeParameters.js
@@ -8,6 +8,7 @@ export class MyClass {
 
 //// [visibilityOfTypeParameters.js]
 "use strict";
+exports.__esModule = true;
 var MyClass = (function () {
     function MyClass() {
     }
diff --git a/tests/baselines/reference/voidAsNonAmbiguousReturnType.js b/tests/baselines/reference/voidAsNonAmbiguousReturnType.js
index 7a31dcb97d0..4883f840ddb 100644
--- a/tests/baselines/reference/voidAsNonAmbiguousReturnType.js
+++ b/tests/baselines/reference/voidAsNonAmbiguousReturnType.js
@@ -15,10 +15,12 @@ function main() {
 
 //// [voidAsNonAmbiguousReturnType_0.js]
 "use strict";
+exports.__esModule = true;
 function mkdirSync(path, mode) { }
 exports.mkdirSync = mkdirSync;
 //// [voidAsNonAmbiguousReturnType_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='voidAsNonAmbiguousReturnType_0.ts'/>
 var fs = require("./voidAsNonAmbiguousReturnType_0");
 function main() {
diff --git a/tests/baselines/reference/withExportDecl.js b/tests/baselines/reference/withExportDecl.js
index efb5454c261..97d528ecd62 100644
--- a/tests/baselines/reference/withExportDecl.js
+++ b/tests/baselines/reference/withExportDecl.js
@@ -61,6 +61,7 @@ export var eVar3 = 10, eVar4, eVar5;
 //// [withExportDecl.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var simpleVar;
     var anotherVar;
     var varWithSimpleType;
diff --git a/tests/baselines/reference/withImportDecl.js b/tests/baselines/reference/withImportDecl.js
index 92a90cb2177..f0a1a2d2f14 100644
--- a/tests/baselines/reference/withImportDecl.js
+++ b/tests/baselines/reference/withImportDecl.js
@@ -46,6 +46,7 @@ b.foo;
 //// [withImportDecl_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
@@ -56,6 +57,7 @@ define(["require", "exports"], function (require, exports) {
 //// [withImportDecl_1.js]
 define(["require", "exports", "withImportDecl_0"], function (require, exports, m3) {
     "use strict";
+    exports.__esModule = true;
     ///<reference path='withImportDecl_0.ts'/>
     var simpleVar;
     var anotherVar;
diff --git a/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts b/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts
new file mode 100644
index 00000000000..8abea19f6cd
--- /dev/null
+++ b/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts
@@ -0,0 +1,51 @@
+// @strictNullChecks: true
+// @declaration: true
+function f(addUndefined1 = "J", addUndefined2?: number) {
+    return addUndefined1.length + (addUndefined2 || 0);
+}
+function g(addUndefined = "J", addDefined: number) {
+    return addUndefined.length + addDefined;
+}
+let total = f() + f('a', 1) + f('b') + f(undefined, 2);
+total = g('c', 3) + g(undefined, 4);
+
+function foo1(x: string = "string", b: number) {
+    x.length;
+}
+
+function foo2(x = "string", b: number) {
+    x.length; // ok, should be string
+}
+
+function foo3(x: string | undefined = "string", b: number) {
+    x.length; // ok, should be string
+}
+
+function foo4(x: string | undefined = undefined, b: number) {
+    x; // should be string | undefined
+}
+
+
+
+// .d.ts should have `string | undefined` for foo1, foo2, foo3 and foo4
+foo1(undefined, 1);
+foo2(undefined, 1);
+foo3(undefined, 1);
+foo4(undefined, 1);
+
+
+function removeUndefinedButNotFalse(x = true) {
+    if (x === false) {
+        return x;
+    }
+}
+
+declare const cond: boolean;
+function removeNothing(y = cond ? true : undefined) {
+    if (y !== undefined) {
+        if (y === false) {
+            return y;
+        }
+    }
+    return true;
+}
diff --git a/tests/cases/compiler/es5-commonjs7.ts b/tests/cases/compiler/es5-commonjs7.ts
new file mode 100644
index 00000000000..384feb22638
--- /dev/null
+++ b/tests/cases/compiler/es5-commonjs7.ts
@@ -0,0 +1,8 @@
+// @target: ES5
+// @sourcemap: false
+// @declaration: false
+// @module: commonjs
+
+// @filename: test.d.ts
+export default "test";
+export var __esModule;
diff --git a/tests/cases/compiler/es5-commonjs8.ts b/tests/cases/compiler/es5-commonjs8.ts
new file mode 100644
index 00000000000..6926115497c
--- /dev/null
+++ b/tests/cases/compiler/es5-commonjs8.ts
@@ -0,0 +1,8 @@
+// @target: ES5
+// @sourcemap: false
+// @declaration: false
+// @module: commonjs
+// @noEmit: true
+
+export default "test";
+export var __esModule = 1;
diff --git a/tests/cases/compiler/es5-system2.ts b/tests/cases/compiler/es5-system2.ts
new file mode 100644
index 00000000000..0eb77f8b9b9
--- /dev/null
+++ b/tests/cases/compiler/es5-system2.ts
@@ -0,0 +1,6 @@
+// @target: ES5
+// @sourcemap: false
+// @declaration: false
+// @module: system
+
+export var __esModule = 1;
\ No newline at end of file
diff --git a/tests/cases/compiler/mixinPrivateAndProtected.ts b/tests/cases/compiler/mixinPrivateAndProtected.ts
new file mode 100644
index 00000000000..5cbcdb1c7b6
--- /dev/null
+++ b/tests/cases/compiler/mixinPrivateAndProtected.ts
@@ -0,0 +1,88 @@
+// Repro from #13830
+
+type Constructor<T> = new(...args: any[]) => T;
+
+class A {
+    public pb: number = 2;
+    protected ptd: number = 1;
+    private pvt: number = 0;
+}
+
+function mixB<T extends Constructor<{}>>(Cls: T) {
+    return class extends Cls {
+        protected ptd: number = 10;
+        private pvt: number = 0;
+    };
+}
+
+function mixB2<T extends Constructor<A>>(Cls: T) {
+    return class extends Cls {
+        protected ptd: number = 10;
+    };
+}
+
+const
+    AB = mixB(A),
+    AB2 = mixB2(A);
+
+function mixC<T extends Constructor<{}>>(Cls: T) {
+    return class extends Cls {
+        protected ptd: number = 100;
+        private pvt: number = 0;
+    };
+}
+
+const
+    AB2C = mixC(AB2),
+    ABC = mixC(AB);
+
+const
+    a = new A(),
+    ab = new AB(),
+    abc = new ABC(),
+    ab2c = new AB2C();
+
+a.pb.toFixed();
+a.ptd.toFixed();    // Error
+a.pvt.toFixed();    // Error
+
+ab.pb.toFixed();
+ab.ptd.toFixed();   // Error
+ab.pvt.toFixed();   // Error
+
+abc.pb.toFixed();
+abc.ptd.toFixed();  // Error
+abc.pvt.toFixed();  // Error
+
+ab2c.pb.toFixed();
+ab2c.ptd.toFixed(); // Error
+ab2c.pvt.toFixed(); // Error
+
+// Repro from #13924
+
+class Person {
+	constructor(public name: string) {}
+
+	protected myProtectedFunction() {
+		// do something
+	}
+}
+
+function PersonMixin<T extends Constructor<Person>>(Base: T) {
+	return class extends Base {
+		constructor(...args: any[]) {
+			super(...args);
+		}
+
+		myProtectedFunction() {
+			super.myProtectedFunction();
+			// do more things
+		}
+	};
+}
+
+class Customer extends PersonMixin(Person) {
+	accountBalance: number;
+    f() {
+    }
+}
diff --git a/tests/cases/compiler/optionalParameterRetainsNull.ts b/tests/cases/compiler/optionalParameterRetainsNull.ts
new file mode 100644
index 00000000000..a3b50a82d2c
--- /dev/null
+++ b/tests/cases/compiler/optionalParameterRetainsNull.ts
@@ -0,0 +1,7 @@
+// @strictNullChecks: true
+interface Bar {  bar: number; foo: object | null;  }
+
+let a = {
+  test<K extends keyof Bar> (a: K,  b?: Bar[K]  |  null)  { }
+};
+a.test("bar", null); // ok, null is assignable to number | null | undefined
diff --git a/tests/cases/conformance/classes/mixinAccessModifiers.ts b/tests/cases/conformance/classes/mixinAccessModifiers.ts
new file mode 100644
index 00000000000..a628371eec6
--- /dev/null
+++ b/tests/cases/conformance/classes/mixinAccessModifiers.ts
@@ -0,0 +1,108 @@
+// @declaration: true
+
+type Constructable = new (...args: any[]) => object;
+
+class Private {
+	constructor (...args: any[]) {}
+	private p: string;
+}
+
+class Private2 {
+	constructor (...args: any[]) {}
+	private p: string;
+}
+
+class Protected {
+	constructor (...args: any[]) {}
+	protected p: string;
+	protected static s: string;
+}
+
+class Protected2 {
+	constructor (...args: any[]) {}
+	protected p: string;
+	protected static s: string;
+}
+
+class Public {
+	constructor (...args: any[]) {}
+	public p: string;
+	public static s: string;
+}
+
+class Public2 {
+	constructor (...args: any[]) {}
+	public p: string;
+	public static s: string;
+}
+
+function f1(x: Private & Private2) {
+	x.p;  // Error, private constituent makes property inaccessible
+}
+
+function f2(x: Private & Protected) {
+	x.p;  // Error, private constituent makes property inaccessible
+}
+
+function f3(x: Private & Public) {
+	x.p;  // Error, private constituent makes property inaccessible
+}
+
+function f4(x: Protected & Protected2) {
+	x.p;  // Error, protected when all constituents are protected
+}
+
+function f5(x: Protected & Public) {
+	x.p;  // Ok, public if any constituent is public
+}
+
+function f6(x: Public & Public2) {
+	x.p;  // Ok, public if any constituent is public
+}
+
+declare function Mix<T, U>(c1: T, c2: U): T & U;
+
+// Can't derive from type with inaccessible properties
+
+class C1 extends Mix(Private, Private2) {}
+class C2 extends Mix(Private, Protected) {}
+class C3 extends Mix(Private, Public) {}
+
+class C4 extends Mix(Protected, Protected2) {
+	f(c4: C4, c5: C5, c6: C6) {
+		c4.p;
+		c5.p;
+		c6.p;
+	}
+	static g() {
+		C4.s;
+		C5.s;
+		C6.s
+	}
+}
+
+class C5 extends Mix(Protected, Public) {
+	f(c4: C4, c5: C5, c6: C6) {
+		c4.p;  // Error, not in class deriving from Protected2
+		c5.p;
+		c6.p;
+	}
+	static g() {
+		C4.s;  // Error, not in class deriving from Protected2
+		C5.s;
+		C6.s
+	}
+}
+
+class C6 extends Mix(Public, Public2) {
+	f(c4: C4, c5: C5, c6: C6) {
+		c4.p;  // Error, not in class deriving from Protected2
+		c5.p;
+		c6.p;
+	}
+	static g() {
+		C4.s;  // Error, not in class deriving from Protected2
+		C5.s;
+		C6.s
+	}
+}
diff --git a/tests/cases/conformance/moduleResolution/packageJsonMain.ts b/tests/cases/conformance/moduleResolution/packageJsonMain.ts
new file mode 100644
index 00000000000..6bf21cfaa3a
--- /dev/null
+++ b/tests/cases/conformance/moduleResolution/packageJsonMain.ts
@@ -0,0 +1,27 @@
+// @noImplicitReferences: true
+// @currentDirectory: /
+// @traceResolution: true
+
+// @filename: /node_modules/foo/package.json
+{ "main": "oof" }
+
+// @filename: /node_modules/foo/oof.js
+module.exports = 0;
+
+// @filename: /node_modules/bar/package.json
+{ "main": "rab.js" }
+
+// @filename: /node_modules/bar/rab.js
+module.exports = 0;
+
+// @filename: /node_modules/baz/package.json
+{ "main": "zab" }
+
+// @filename: /node_modules/baz/zab/index.js
+module.exports = 0;
+
+// @filename: /a.ts
+import foo = require("foo");
+import bar = require("bar");
+import baz = require("baz");
+foo + bar + baz;
diff --git a/tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts b/tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts
new file mode 100644
index 00000000000..c6e684b3fe1
--- /dev/null
+++ b/tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts
@@ -0,0 +1,15 @@
+// @noImplicitReferences: true
+// @currentDirectory: /
+// @traceResolution: true
+
+// @filename: /node_modules/foo/package.json
+{ "main": "oof" }
+
+// @filename: /node_modules/foo/oof/package.json
+{ "main": "ofo" }
+
+// @filename: /node_modules/foo/oof/ofo.js
+module.exports = 0;
+
+// @filename: /a.ts
+import foo = require("foo");
diff --git a/tests/cases/conformance/typings/typingsLookup4.ts b/tests/cases/conformance/typings/typingsLookup4.ts
index 234090aebad..10317b6084b 100644
--- a/tests/cases/conformance/typings/typingsLookup4.ts
+++ b/tests/cases/conformance/typings/typingsLookup4.ts
@@ -1,6 +1,7 @@
 // @traceResolution: true
 // @noImplicitReferences: true
 // @currentDirectory: /
+// @jsx: react
 // A file extension is optional in typings entries.
 
 // @filename: /tsconfig.json
@@ -24,8 +25,15 @@ export const k: number;
 // @filename: /node_modules/@types/lquery/lquery.ts
 export const l = 2;
 
+// @filename: /node_modules/@types/mquery/package.json
+{ "typings": "mquery" }
+
+// @filename: /node_modules/@types/mquery/mquery/index.tsx
+export const m = 3;
+
 // @filename: /a.ts
 import { j } from "jquery";
 import { k } from "kquery";
 import { l } from "lquery";
-j + k + l;
+import { m } from "mquery";
+j + k + l + m;
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsIife.ts b/tests/cases/fourslash/quickInfoDisplayPartsIife.ts
new file mode 100644
index 00000000000..e4ce2bf96e3
--- /dev/null
+++ b/tests/cases/fourslash/quickInfoDisplayPartsIife.ts
@@ -0,0 +1,5 @@
+/// <reference path='fourslash.ts'/>
+// @strictNullChecks: true
+////var iife = (function foo/*1*/(x, y) { return x })(12);
+
+verify.quickInfoAt('1', '(local function) foo(x: number, y?: undefined): number');