Merge pull request #131 from sjrd/remove-sourcemapwriteraccess

Remove SourceMapWriterAccess.
tanishiking · May 17, 2024 · 0e0a8be · 0e0a8be
2 parents 405ec4a + 03cb7f3
commit 0e0a8be
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 24 deletions.
diff --git a/wasm/src/main/scala/org/scalajs/linker/backend/WebAssemblyLinkerBackend.scala b/wasm/src/main/scala/org/scalajs/linker/backend/WebAssemblyLinkerBackend.scala
@@ -12,6 +12,7 @@ import org.scalajs.linker.interface._
 import org.scalajs.linker.interface.unstable._
 import org.scalajs.linker.standard._
 
+import org.scalajs.linker.backend.javascript.{ByteArrayWriter, SourceMapWriter}
 import org.scalajs.linker.backend.webassembly._
 
 import org.scalajs.linker.backend.wasmemitter.Emitter
@@ -88,13 +89,13 @@ final class WebAssemblyLinkerBackend(
       val emitDebugInfo = !linkerConfig.minify
 
       if (linkerConfig.sourceMap) {
-        val sourceMapWriter = new SourceMapWriterAccess.ByteArrayWriterBox()
+        val sourceMapWriter = new ByteArrayWriter
 
         val wasmFileURI = s"./$wasmFileName"
         val sourceMapURI = s"./$sourceMapFileName"
 
         val smWriter =
-          sourceMapWriter.createSourceMapWriter(wasmFileURI, linkerConfig.relativizeSourceMapBase)
+          new SourceMapWriter(sourceMapWriter, wasmFileURI, linkerConfig.relativizeSourceMapBase)
         val binaryOutput = new BinaryWriter.WithSourceMap(
           wasmModule,
           emitDebugInfo,

diff --git a/wasm/src/main/scala/org/scalajs/linker/backend/webassembly/SourceMapWriterAccess.scala b/wasm/src/main/scala/org/scalajs/linker/backend/webassembly/SourceMapWriterAccess.scala