diff --git a/.scalafmt.conf b/.scalafmt.conf index e68366eb..41f01ebf 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.2.1" +version = "3.2.2" runner.dialect = scala213 style = defaultWithAlign maxColumn = 120 diff --git a/app/nodejs-v12/src/test/scala/io/scalajs/nodejs/fs/FsV8AsyncTest.scala b/app/nodejs-v12/src/test/scala/io/scalajs/nodejs/fs/FsV8AsyncTest.scala index df4f59df..d7394d4b 100644 --- a/app/nodejs-v12/src/test/scala/io/scalajs/nodejs/fs/FsV8AsyncTest.scala +++ b/app/nodejs-v12/src/test/scala/io/scalajs/nodejs/fs/FsV8AsyncTest.scala @@ -86,9 +86,9 @@ class FsV8AsyncTest extends AsyncFunSpec with BeforeAndAfterEach { it("should support copyFileFuture") { for { - _ <- Fs.appendFileFuture("x.CopyFile.txt", "yay") - _ <- Fs.copyFileFuture("x.CopyFile.txt", "x.CopyFile_2.txt") - _ <- Fs.copyFileFuture("x.CopyFile.txt", "x.CopyFile_2.txt") // succeed + _ <- Fs.appendFileFuture("x.CopyFile.txt", "yay") + _ <- Fs.copyFileFuture("x.CopyFile.txt", "x.CopyFile_2.txt") + _ <- Fs.copyFileFuture("x.CopyFile.txt", "x.CopyFile_2.txt") // succeed _ <- Fs.copyFileFuture("x.CopyFile.txt", "x.CopyFile_2.txt", Fs.constants.COPYFILE_EXCL).failed stat <- Fs.statFuture("x.CopyFile_2.txt") _ <- Fs.unlinkFuture("x.CopyFile.txt") diff --git a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/dns/PromisesResolver.scala b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/dns/PromisesResolver.scala index d90e292c..4e0be92e 100644 --- a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/dns/PromisesResolver.scala +++ b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/dns/PromisesResolver.scala @@ -20,15 +20,15 @@ class PromisesResolver extends js.Object { def resolveAny(hostname: String): js.Promise[js.Array[ResolveObject]] = js.native @enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs14) def resolveCaa(hostname: String): js.Promise[js.Array[ResolveObject]] = js.native - def resolveCname(hostname: String): js.Promise[js.Array[String]] = js.native - def resolveMx(hostname: String): js.Promise[js.Array[MX]] = js.native - def resolveNaptr(hostname: String): js.Promise[js.Array[NAPTR]] = js.native - def resolveNs(hostname: String): js.Promise[js.Array[String]] = js.native - def resolveSoa(hostname: String): js.Promise[js.Array[SOA]] = js.native - def resolveSrv(hostname: String): js.Promise[js.Array[SRV]] = js.native - def resolvePtr(hostname: String): js.Promise[js.Array[String]] = js.native - def resolveTxt(hostname: String): js.Promise[js.Array[String]] = js.native - def reverse(ipAddress: String): js.Promise[js.Array[String]] = js.native + def resolveCname(hostname: String): js.Promise[js.Array[String]] = js.native + def resolveMx(hostname: String): js.Promise[js.Array[MX]] = js.native + def resolveNaptr(hostname: String): js.Promise[js.Array[NAPTR]] = js.native + def resolveNs(hostname: String): js.Promise[js.Array[String]] = js.native + def resolveSoa(hostname: String): js.Promise[js.Array[SOA]] = js.native + def resolveSrv(hostname: String): js.Promise[js.Array[SRV]] = js.native + def resolvePtr(hostname: String): js.Promise[js.Array[String]] = js.native + def resolveTxt(hostname: String): js.Promise[js.Array[String]] = js.native + def reverse(ipAddress: String): js.Promise[js.Array[String]] = js.native @enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs14) def setDefaultResultOrder(order: String): js.Promise[Unit] = js.native diff --git a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/events/Event.scala b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/events/Event.scala index 763e8060..381b9e9c 100644 --- a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/events/Event.scala +++ b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/events/Event.scala @@ -18,13 +18,13 @@ trait Event extends js.Object { def stopPropagation(): Unit = js.native @deprecated("Use stopPropagation", "legacy") - def cancelBubble: Boolean = js.native + def cancelBubble: Boolean = js.native def stopImmediatePropagation(): Unit = js.native def bubbles: Boolean = js.native def cancelable: Boolean = js.native @deprecated("Use returnValue", "legacy") - def returnValue: Boolean = js.native + def returnValue: Boolean = js.native def preventDefault(): Unit = js.native def defaultPrevented: Boolean = js.native def composed: Boolean = js.native diff --git a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/http/ClientRequest.scala b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/http/ClientRequest.scala index 29e85d87..241c1d37 100644 --- a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/http/ClientRequest.scala +++ b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/http/ClientRequest.scala @@ -102,7 +102,7 @@ class ClientRequest extends stream.Writable { @enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs14) def getRawHeaderNames(): js.Array[String] = js.native - def host: String = js.native + def host: String = js.native } trait Information extends js.Object { diff --git a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/http2/Http2ServerResponse.scala b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/http2/Http2ServerResponse.scala index 2c503b16..93ca71c2 100644 --- a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/http2/Http2ServerResponse.scala +++ b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/http2/Http2ServerResponse.scala @@ -14,8 +14,8 @@ class Http2ServerResponse extends stream.Writable with Http2TimeoutOps { @deprecated("Use response.socket", "Node.js v13.0.0") def connection: net.Socket | tls.TLSSocket = js.native - def socket: net.Socket | tls.TLSSocket = js.native - def stream: Http2Stream = js.native + def socket: net.Socket | tls.TLSSocket = js.native + def stream: Http2Stream = js.native @enableIf(io.scalajs.nodejs.internal.CompilerSwitches.ltNodeJs16) def req: Http2ServerRequest = js.native @@ -40,7 +40,7 @@ class Http2ServerResponse extends stream.Writable with Http2TimeoutOps { def setHeader(name: String, value: js.Array[String]): Unit = js.native @deprecated("Use writableEnd", "Node.js v13.4.0, v12.16.0") - def finished: Boolean = js.native + def finished: Boolean = js.native def headersSent: Boolean = js.native def sendDate: Boolean = js.native