scala-js
diff --git a/‎linker/shared/src/main/scala/org/scalajs/linker/backend/BasicLinkerBackend.scala‎
Lines changed: 2 additions & 2 deletions b/‎linker/shared/src/main/scala/org/scalajs/linker/backend/BasicLinkerBackend.scala‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎linker/shared/src/main/scala/org/scalajs/linker/backend/emitter/ClassEmitter.scala‎
Lines changed: 9 additions & 9 deletions b/‎linker/shared/src/main/scala/org/scalajs/linker/backend/emitter/ClassEmitter.scala‎
Lines changed: 9 additions & 9 deletions
diff --git a/‎linker/shared/src/main/scala/org/scalajs/linker/backend/emitter/Emitter.scala‎
Lines changed: 2 additions & 2 deletions b/‎linker/shared/src/main/scala/org/scalajs/linker/backend/emitter/Emitter.scala‎
Lines changed: 2 additions & 2 deletions
@@ -283,7 +283,7 @@ private object BasicLinkerBackend {
       val jsCodeWriter = new ByteArrayWriter()
       val printer = new Printers.JSTreePrinter(jsCodeWriter)
 
-      printer.printTopLevelTree(tree)
+      printer.printStat(tree)
 
       new PrintedTree(jsCodeWriter.toByteArray(), SourceMapWriter.Fragment.Empty)
     }
@@ -321,7 +321,7 @@ private object BasicLinkerBackend {
       val smFragmentBuilder = new SourceMapWriter.FragmentBuilder()
       val printer = new Printers.JSTreePrinterWithSourceMap(jsCodeWriter, smFragmentBuilder)
 
-      printer.printTopLevelTree(tree)
+      printer.printStat(tree)
       smFragmentBuilder.complete()
 
       new PrintedTree(jsCodeWriter.toByteArray(), smFragmentBuilder.result())
 
@@ -683,12 +683,12 @@ private[emitter] final class ClassEmitter(sjsGen: SJSGen) {
 
   def genInstanceTests(className: ClassName, kind: ClassKind)(
       implicit moduleContext: ModuleContext,
-      globalKnowledge: GlobalKnowledge, pos: Position): WithGlobals[js.Tree] = {
+      globalKnowledge: GlobalKnowledge, pos: Position): WithGlobals[List[js.Tree]] = {
     for {
       single <- genSingleInstanceTests(className, kind)
       array <- genArrayInstanceTests(className)
     } yield {
-      js.Block(single ::: array)
+      single ::: array
     }
   }
 
@@ -1028,16 +1028,16 @@ private[emitter] final class ClassEmitter(sjsGen: SJSGen) {
         case e: TopLevelMethodExportDef =>
           genTopLevelMethodExportDef(e)
         case e: TopLevelFieldExportDef =>
-          genTopLevelFieldExportDef(topLevelExport.owningClass, e)
+          genTopLevelFieldExportDef(topLevelExport.owningClass, e).map(_ :: Nil)
       }
     }
 
-    WithGlobals.list(exportsWithGlobals)
+    WithGlobals.flatten(exportsWithGlobals)
   }
 
   private def genTopLevelMethodExportDef(tree: TopLevelMethodExportDef)(
       implicit moduleContext: ModuleContext,
-      globalKnowledge: GlobalKnowledge): WithGlobals[js.Tree] = {
+      globalKnowledge: GlobalKnowledge): WithGlobals[List[js.Tree]] = {
     import TreeDSL._
 
     val JSMethodDef(flags, StringLiteral(exportName), args, restParam, body) =
@@ -1056,22 +1056,22 @@ private[emitter] final class ClassEmitter(sjsGen: SJSGen) {
 
   private def genConstValueExportDef(exportName: String,
       exportedValue: js.Tree)(
-      implicit pos: Position): WithGlobals[js.Tree] = {
+      implicit pos: Position): WithGlobals[List[js.Tree]] = {
     moduleKind match {
       case ModuleKind.NoModule =>
-        genAssignToNoModuleExportVar(exportName, exportedValue)
+        genAssignToNoModuleExportVar(exportName, exportedValue).map(_ :: Nil)
 
       case ModuleKind.ESModule =>
         val field = fileLevelVar(VarField.e, exportName)
         val let = js.Let(field.ident, mutable = true, Some(exportedValue))
         val exportStat = js.Export((field.ident -> js.ExportName(exportName)) :: Nil)
-        WithGlobals(js.Block(let, exportStat))
+        WithGlobals(List(let, exportStat))
 
       case ModuleKind.CommonJSModule =>
         globalRef("exports").map { exportsVarRef =>
           js.Assign(
               genBracketSelect(exportsVarRef, js.StringLiteral(exportName)),
-              exportedValue)
+              exportedValue) :: Nil
         }
     }
   }
 
@@ -595,7 +595,7 @@ final class Emitter(config: Emitter.Config) {
        */
 
       if (classEmitter.needInstanceTests(linkedClass)(classCache)) {
-        main += extractWithGlobals(classTreeCache.instanceTests.getOrElseUpdate(
+        main ++= extractWithGlobals(classTreeCache.instanceTests.getOrElseUpdate(
             classEmitter.genInstanceTests(className, kind)(moduleContext, classCache, linkedClass.pos)))
       }
 
@@ -1035,7 +1035,7 @@ object Emitter {
 
   private final class DesugaredClassCache {
     val privateJSFields = new OneTimeCache[WithGlobals[List[js.Tree]]]
-    val instanceTests = new OneTimeCache[WithGlobals[js.Tree]]
+    val instanceTests = new OneTimeCache[WithGlobals[List[js.Tree]]]
     val typeData = new OneTimeCache[WithGlobals[List[js.Tree]]]
     val setTypeData = new OneTimeCache[js.Tree]
     val moduleAccessor = new OneTimeCache[WithGlobals[List[js.Tree]]]