From b2f152544e634cd1eee9ed33ddecad42db328ff1 Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Wed, 16 Oct 2024 14:34:39 -0400 Subject: [PATCH 1/8] Build with Kotlin 2.0.21 This requires some boilerplate on function declarations. --- .gitignore | 1 + build-support/build.gradle.kts | 2 +- build-support/settings.gradle.kts | 8 +- gradle/libs.versions.toml | 18 +-- okio/src/commonMain/kotlin/okio/Buffer.kt | 105 +++++++++++------- .../src/commonMain/kotlin/okio/HashingSink.kt | 5 + .../commonMain/kotlin/okio/HashingSource.kt | 4 + .../kotlin/okio/RealBufferedSink.kt | 26 +++++ .../kotlin/okio/RealBufferedSource.kt | 45 ++++++++ 9 files changed, 165 insertions(+), 49 deletions(-) diff --git a/.gitignore b/.gitignore index 977efb8716..49cdaadfab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .classpath .gradle +.kotlin .project .settings eclipsebin diff --git a/build-support/build.gradle.kts b/build-support/build.gradle.kts index 46edcc10e9..ea79bc78b6 100644 --- a/build-support/build.gradle.kts +++ b/build-support/build.gradle.kts @@ -22,5 +22,5 @@ gradlePlugin { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25") + implementation(libs.kotlin.gradle.plugin) } diff --git a/build-support/settings.gradle.kts b/build-support/settings.gradle.kts index 2fcdac3848..215a5d58e7 100644 --- a/build-support/settings.gradle.kts +++ b/build-support/settings.gradle.kts @@ -1 +1,7 @@ -// empty. +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + from(files("../gradle/libs.versions.toml")) + } + } +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e8eed39773..6fed45d36b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,24 +1,26 @@ [versions] jmh = "1.37" +kotlin = "2.0.21" ktlint = "0.48.2" [libraries] -android-gradle-plugin = { module = "com.android.tools.build:gradle", version = "8.7.1" } android-desugar-jdk-libs = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.2" } +android-gradle-plugin = { module = "com.android.tools.build:gradle", version = "8.7.1" } androidx-test-ext-junit = { module = "androidx.test.ext:junit", version = "1.2.1" } androidx-test-runner = { module = "androidx.test:runner", version = "1.5.2" } binaryCompatibilityValidator = { module = "org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin", version = "0.16.3" } +bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version = "7.0.0" } +dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "1.9.20" } +jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" } +jmh-generator = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" } +jmh-gradle-plugin = { module = "me.champeau.jmh:jmh-gradle-plugin", version = "0.7.2" } +kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test" } kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit" } kotlin-time = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.6.1" } -jmh-gradle-plugin = { module = "me.champeau.jmh:jmh-gradle-plugin", version = "0.7.2" } -jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" } -jmh-generator = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" } -dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "1.9.20" } spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.25.0" } -bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version = "7.0.0" } -vanniktech-publish-plugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.30.0" } -test-junit = { module = "junit:junit", version = "4.13.2" } test-assertj = { module = "org.assertj:assertj-core", version = "3.26.3" } test-assertk = "com.willowtreeapps.assertk:assertk:0.28.1" test-jimfs = "com.google.jimfs:jimfs:1.3.0" +test-junit = { module = "junit:junit", version = "4.13.2" } +vanniktech-publish-plugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.30.0" } diff --git a/okio/src/commonMain/kotlin/okio/Buffer.kt b/okio/src/commonMain/kotlin/okio/Buffer.kt index ec4ab34fb4..26bc89f1da 100644 --- a/okio/src/commonMain/kotlin/okio/Buffer.kt +++ b/okio/src/commonMain/kotlin/okio/Buffer.kt @@ -34,12 +34,6 @@ expect class Buffer() : BufferedSource, BufferedSink { var size: Long internal set - override val buffer: Buffer - - override fun emitCompleteSegments(): Buffer - - override fun emit(): Buffer - /** Copy `byteCount` bytes from this, starting at `offset`, to `out`. */ fun copyTo( out: Buffer, @@ -74,18 +68,6 @@ expect class Buffer() : BufferedSource, BufferedSink { /** Discards `byteCount` bytes from the head of this buffer. */ override fun skip(byteCount: Long) - override fun write(byteString: ByteString): Buffer - - override fun write(byteString: ByteString, offset: Int, byteCount: Int): Buffer - - override fun writeUtf8(string: String): Buffer - - override fun writeUtf8(string: String, beginIndex: Int, endIndex: Int): Buffer - - override fun writeUtf8CodePoint(codePoint: Int): Buffer - - override fun write(source: ByteArray): Buffer - /** * Returns a tail segment that we can write at least `minimumCapacity` * bytes to, creating it if necessary. @@ -109,27 +91,6 @@ expect class Buffer() : BufferedSource, BufferedSink { /** Returns the 512-bit SHA-512 HMAC of this buffer. */ fun hmacSha512(key: ByteString): ByteString - override fun write(source: ByteArray, offset: Int, byteCount: Int): Buffer - - override fun write(source: Source, byteCount: Long): Buffer - - override fun writeByte(b: Int): Buffer - - override fun writeShort(s: Int): Buffer - - override fun writeShortLe(s: Int): Buffer - - override fun writeInt(i: Int): Buffer - - override fun writeIntLe(i: Int): Buffer - - override fun writeLong(v: Long): Buffer - - override fun writeLongLe(v: Long): Buffer - - override fun writeDecimalLong(v: Long): Buffer - - override fun writeHexadecimalUnsignedLong(v: Long): Buffer /** * Returns a deep copy of this buffer. The returned [Buffer] initially shares the underlying @@ -147,6 +108,72 @@ expect class Buffer() : BufferedSource, BufferedSink { fun readAndWriteUnsafe(unsafeCursor: UnsafeCursor = DEFAULT__new_UnsafeCursor): UnsafeCursor + override val buffer: Buffer + override fun close() + override fun emit(): Buffer + override fun emitCompleteSegments(): Buffer + override fun exhausted(): Boolean + override fun flush() + override fun indexOf(b: Byte): Long + override fun indexOf(b: Byte, fromIndex: Long): Long + override fun indexOf(b: Byte, fromIndex: Long, toIndex: Long): Long + override fun indexOf(bytes: ByteString): Long + override fun indexOf(bytes: ByteString, fromIndex: Long): Long + override fun indexOfElement(targetBytes: ByteString): Long + override fun indexOfElement(targetBytes: ByteString, fromIndex: Long): Long + override fun peek(): BufferedSource + override fun rangeEquals(offset: Long, bytes: ByteString): Boolean + override fun rangeEquals(offset: Long, bytes: ByteString, bytesOffset: Int, byteCount: Int): Boolean + override fun read(sink: Buffer, byteCount: Long): Long + override fun read(sink: ByteArray): Int + override fun read(sink: ByteArray, offset: Int, byteCount: Int): Int + override fun readAll(sink: Sink): Long + override fun readByte(): Byte + override fun readByteArray(): ByteArray + override fun readByteArray(byteCount: Long): ByteArray + override fun readByteString(): ByteString + override fun readByteString(byteCount: Long): ByteString + override fun readDecimalLong(): Long + override fun readFully(sink: Buffer, byteCount: Long) + override fun readFully(sink: ByteArray) + override fun readHexadecimalUnsignedLong(): Long + override fun readInt(): Int + override fun readIntLe(): Int + override fun readLong(): Long + override fun readLongLe(): Long + override fun readShort(): Short + override fun readShortLe(): Short + override fun readUtf8(): String + override fun readUtf8(byteCount: Long): String + override fun readUtf8CodePoint(): Int + override fun readUtf8Line(): String? + override fun readUtf8LineStrict(): String + override fun readUtf8LineStrict(limit: Long): String + override fun request(byteCount: Long): Boolean + override fun require(byteCount: Long) + override fun select(options: Options): Int + override fun select(options: TypedOptions): T? + override fun timeout(): Timeout + override fun write(byteString: ByteString): Buffer + override fun write(byteString: ByteString, offset: Int, byteCount: Int): Buffer + override fun write(source: Buffer, byteCount: Long) + override fun write(source: ByteArray): Buffer + override fun write(source: ByteArray, offset: Int, byteCount: Int): Buffer + override fun write(source: Source, byteCount: Long): Buffer + override fun writeAll(source: Source): Long + override fun writeByte(b: Int): Buffer + override fun writeDecimalLong(v: Long): Buffer + override fun writeHexadecimalUnsignedLong(v: Long): Buffer + override fun writeInt(i: Int): Buffer + override fun writeIntLe(i: Int): Buffer + override fun writeLong(v: Long): Buffer + override fun writeLongLe(v: Long): Buffer + override fun writeShort(s: Int): Buffer + override fun writeShortLe(s: Int): Buffer + override fun writeUtf8(string: String): Buffer + override fun writeUtf8(string: String, beginIndex: Int, endIndex: Int): Buffer + override fun writeUtf8CodePoint(codePoint: Int): Buffer + /** * A handle to the underlying data in a buffer. This handle is unsafe because it does not enforce * its own invariants. Instead, it assumes a careful user who has studied Okio's implementation diff --git a/okio/src/commonMain/kotlin/okio/HashingSink.kt b/okio/src/commonMain/kotlin/okio/HashingSink.kt index 6e241eeb8e..19431698f5 100644 --- a/okio/src/commonMain/kotlin/okio/HashingSink.kt +++ b/okio/src/commonMain/kotlin/okio/HashingSink.kt @@ -42,6 +42,11 @@ expect class HashingSink : Sink { */ val hash: ByteString + override fun close() + override fun flush() + override fun timeout(): Timeout + override fun write(source: Buffer, byteCount: Long) + companion object { /** * Returns a sink that uses the obsolete MD5 hash algorithm to produce 128-bit hashes. diff --git a/okio/src/commonMain/kotlin/okio/HashingSource.kt b/okio/src/commonMain/kotlin/okio/HashingSource.kt index 9301732d72..95bfe91a32 100644 --- a/okio/src/commonMain/kotlin/okio/HashingSource.kt +++ b/okio/src/commonMain/kotlin/okio/HashingSource.kt @@ -43,6 +43,10 @@ expect class HashingSource : Source { */ val hash: ByteString + override fun close() + override fun read(sink: Buffer, byteCount: Long): Long + override fun timeout(): Timeout + companion object { /** * Returns a source that uses the obsolete MD5 hash algorithm to produce 128-bit hashes. diff --git a/okio/src/commonMain/kotlin/okio/RealBufferedSink.kt b/okio/src/commonMain/kotlin/okio/RealBufferedSink.kt index 81032153cd..65554cbc24 100644 --- a/okio/src/commonMain/kotlin/okio/RealBufferedSink.kt +++ b/okio/src/commonMain/kotlin/okio/RealBufferedSink.kt @@ -21,4 +21,30 @@ internal expect class RealBufferedSink( ) : BufferedSink { val sink: Sink var closed: Boolean + + override val buffer: Buffer + override fun close() + override fun emit(): BufferedSink + override fun emitCompleteSegments(): BufferedSink + override fun flush() + override fun timeout(): Timeout + override fun write(byteString: ByteString): BufferedSink + override fun write(byteString: ByteString, offset: Int, byteCount: Int): BufferedSink + override fun write(source: Buffer, byteCount: Long) + override fun write(source: ByteArray): BufferedSink + override fun write(source: ByteArray, offset: Int, byteCount: Int): BufferedSink + override fun write(source: Source, byteCount: Long): BufferedSink + override fun writeAll(source: Source): Long + override fun writeByte(b: Int): BufferedSink + override fun writeDecimalLong(v: Long): BufferedSink + override fun writeHexadecimalUnsignedLong(v: Long): BufferedSink + override fun writeInt(i: Int): BufferedSink + override fun writeIntLe(i: Int): BufferedSink + override fun writeLong(v: Long): BufferedSink + override fun writeLongLe(v: Long): BufferedSink + override fun writeShort(s: Int): BufferedSink + override fun writeShortLe(s: Int): BufferedSink + override fun writeUtf8(string: String): BufferedSink + override fun writeUtf8(string: String, beginIndex: Int, endIndex: Int): BufferedSink + override fun writeUtf8CodePoint(codePoint: Int): BufferedSink } diff --git a/okio/src/commonMain/kotlin/okio/RealBufferedSource.kt b/okio/src/commonMain/kotlin/okio/RealBufferedSource.kt index b6f7322ec7..a2e582915c 100644 --- a/okio/src/commonMain/kotlin/okio/RealBufferedSource.kt +++ b/okio/src/commonMain/kotlin/okio/RealBufferedSource.kt @@ -21,4 +21,49 @@ internal expect class RealBufferedSource( ) : BufferedSource { val source: Source var closed: Boolean + + override val buffer: Buffer + override fun close() + override fun exhausted(): Boolean + override fun indexOf(b: Byte): Long + override fun indexOf(b: Byte, fromIndex: Long): Long + override fun indexOf(b: Byte, fromIndex: Long, toIndex: Long): Long + override fun indexOf(bytes: ByteString): Long + override fun indexOf(bytes: ByteString, fromIndex: Long): Long + override fun indexOfElement(targetBytes: ByteString): Long + override fun indexOfElement(targetBytes: ByteString, fromIndex: Long): Long + override fun peek(): BufferedSource + override fun rangeEquals(offset: Long, bytes: ByteString): Boolean + override fun rangeEquals(offset: Long, bytes: ByteString, bytesOffset: Int, byteCount: Int): Boolean + override fun read(sink: Buffer, byteCount: Long): Long + override fun read(sink: ByteArray): Int + override fun read(sink: ByteArray, offset: Int, byteCount: Int): Int + override fun readAll(sink: Sink): Long + override fun readByte(): Byte + override fun readByteArray(): ByteArray + override fun readByteArray(byteCount: Long): ByteArray + override fun readByteString(): ByteString + override fun readByteString(byteCount: Long): ByteString + override fun readDecimalLong(): Long + override fun readFully(sink: Buffer, byteCount: Long) + override fun readFully(sink: ByteArray) + override fun readHexadecimalUnsignedLong(): Long + override fun readInt(): Int + override fun readIntLe(): Int + override fun readLong(): Long + override fun readLongLe(): Long + override fun readShort(): Short + override fun readShortLe(): Short + override fun readUtf8(): String + override fun readUtf8(byteCount: Long): String + override fun readUtf8CodePoint(): Int + override fun readUtf8Line(): String? + override fun readUtf8LineStrict(): String + override fun readUtf8LineStrict(limit: Long): String + override fun request(byteCount: Long): Boolean + override fun require(byteCount: Long) + override fun select(options: Options): Int + override fun select(options: TypedOptions): T? + override fun skip(byteCount: Long) + override fun timeout(): Timeout } From fe6b5c9d44691a8d373d805bfc5acb93d4a3e904 Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Wed, 16 Oct 2024 16:36:27 -0400 Subject: [PATCH 2/8] Fix whitespace --- okio/src/commonMain/kotlin/okio/Buffer.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/okio/src/commonMain/kotlin/okio/Buffer.kt b/okio/src/commonMain/kotlin/okio/Buffer.kt index 26bc89f1da..f186d2aaf9 100644 --- a/okio/src/commonMain/kotlin/okio/Buffer.kt +++ b/okio/src/commonMain/kotlin/okio/Buffer.kt @@ -91,7 +91,6 @@ expect class Buffer() : BufferedSource, BufferedSink { /** Returns the 512-bit SHA-512 HMAC of this buffer. */ fun hmacSha512(key: ByteString): ByteString - /** * Returns a deep copy of this buffer. The returned [Buffer] initially shares the underlying * [ByteArray]s. See [UnsafeCursor] for more details. From 3e6bff7e8427cca9d45364d16dc2e02c403af574 Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Thu, 17 Oct 2024 08:07:06 -0400 Subject: [PATCH 3/8] Well actually --- okio/src/jvmMain/kotlin/okio/Buffer.kt | 91 +++++++++--------- okio/src/jvmMain/kotlin/okio/HashingSink.kt | 2 +- okio/src/jvmMain/kotlin/okio/HashingSource.kt | 2 +- .../jvmMain/kotlin/okio/RealBufferedSink.kt | 50 +++++----- .../jvmMain/kotlin/okio/RealBufferedSource.kt | 92 ++++++++++--------- 5 files changed, 121 insertions(+), 116 deletions(-) diff --git a/okio/src/jvmMain/kotlin/okio/Buffer.kt b/okio/src/jvmMain/kotlin/okio/Buffer.kt index a23241ab0e..bc4bd1bf04 100644 --- a/okio/src/jvmMain/kotlin/okio/Buffer.kt +++ b/okio/src/jvmMain/kotlin/okio/Buffer.kt @@ -106,16 +106,16 @@ actual class Buffer : BufferedSource, BufferedSink, Cloneable, ByteChannel { actual override fun emit() = this // Nowhere to emit to! - override fun exhausted() = size == 0L + actual override fun exhausted() = size == 0L @Throws(EOFException::class) - override fun require(byteCount: Long) { + actual override fun require(byteCount: Long) { if (size < byteCount) throw EOFException() } - override fun request(byteCount: Long) = size >= byteCount + actual override fun request(byteCount: Long) = size >= byteCount - override fun peek(): BufferedSource { + actual override fun peek(): BufferedSource { return PeekSource(this).buffer() } @@ -252,54 +252,54 @@ actual class Buffer : BufferedSource, BufferedSink, Cloneable, ByteChannel { actual fun completeSegmentByteCount(): Long = commonCompleteSegmentByteCount() @Throws(EOFException::class) - override fun readByte(): Byte = commonReadByte() + actual override fun readByte(): Byte = commonReadByte() @JvmName("getByte") actual operator fun get(pos: Long): Byte = commonGet(pos) @Throws(EOFException::class) - override fun readShort(): Short = commonReadShort() + actual override fun readShort(): Short = commonReadShort() @Throws(EOFException::class) - override fun readInt(): Int = commonReadInt() + actual override fun readInt(): Int = commonReadInt() @Throws(EOFException::class) - override fun readLong(): Long = commonReadLong() + actual override fun readLong(): Long = commonReadLong() @Throws(EOFException::class) - override fun readShortLe() = readShort().reverseBytes() + actual override fun readShortLe() = readShort().reverseBytes() @Throws(EOFException::class) - override fun readIntLe() = readInt().reverseBytes() + actual override fun readIntLe() = readInt().reverseBytes() @Throws(EOFException::class) - override fun readLongLe() = readLong().reverseBytes() + actual override fun readLongLe() = readLong().reverseBytes() @Throws(EOFException::class) - override fun readDecimalLong(): Long = commonReadDecimalLong() + actual override fun readDecimalLong(): Long = commonReadDecimalLong() @Throws(EOFException::class) - override fun readHexadecimalUnsignedLong(): Long = commonReadHexadecimalUnsignedLong() + actual override fun readHexadecimalUnsignedLong(): Long = commonReadHexadecimalUnsignedLong() - override fun readByteString(): ByteString = commonReadByteString() + actual override fun readByteString(): ByteString = commonReadByteString() @Throws(EOFException::class) - override fun readByteString(byteCount: Long) = commonReadByteString(byteCount) + actual override fun readByteString(byteCount: Long) = commonReadByteString(byteCount) - override fun select(options: Options): Int = commonSelect(options) + actual override fun select(options: Options): Int = commonSelect(options) - override fun select(options: TypedOptions): T? = commonSelect(options) + actual override fun select(options: TypedOptions): T? = commonSelect(options) @Throws(EOFException::class) - override fun readFully(sink: Buffer, byteCount: Long): Unit = commonReadFully(sink, byteCount) + actual override fun readFully(sink: Buffer, byteCount: Long): Unit = commonReadFully(sink, byteCount) @Throws(IOException::class) - override fun readAll(sink: Sink): Long = commonReadAll(sink) + actual override fun readAll(sink: Sink): Long = commonReadAll(sink) - override fun readUtf8() = readString(size, Charsets.UTF_8) + actual override fun readUtf8() = readString(size, Charsets.UTF_8) @Throws(EOFException::class) - override fun readUtf8(byteCount: Long) = readString(byteCount, Charsets.UTF_8) + actual override fun readUtf8(byteCount: Long) = readString(byteCount, Charsets.UTF_8) override fun readString(charset: Charset) = readString(size, charset) @@ -328,28 +328,28 @@ actual class Buffer : BufferedSource, BufferedSink, Cloneable, ByteChannel { } @Throws(EOFException::class) - override fun readUtf8Line(): String? = commonReadUtf8Line() + actual override fun readUtf8Line(): String? = commonReadUtf8Line() @Throws(EOFException::class) - override fun readUtf8LineStrict() = readUtf8LineStrict(Long.MAX_VALUE) + actual override fun readUtf8LineStrict() = readUtf8LineStrict(Long.MAX_VALUE) @Throws(EOFException::class) - override fun readUtf8LineStrict(limit: Long): String = commonReadUtf8LineStrict(limit) + actual override fun readUtf8LineStrict(limit: Long): String = commonReadUtf8LineStrict(limit) @Throws(EOFException::class) - override fun readUtf8CodePoint(): Int = commonReadUtf8CodePoint() + actual override fun readUtf8CodePoint(): Int = commonReadUtf8CodePoint() - override fun readByteArray() = commonReadByteArray() + actual override fun readByteArray() = commonReadByteArray() @Throws(EOFException::class) - override fun readByteArray(byteCount: Long): ByteArray = commonReadByteArray(byteCount) + actual override fun readByteArray(byteCount: Long): ByteArray = commonReadByteArray(byteCount) - override fun read(sink: ByteArray) = commonRead(sink) + actual override fun read(sink: ByteArray) = commonRead(sink) @Throws(EOFException::class) - override fun readFully(sink: ByteArray) = commonReadFully(sink) + actual override fun readFully(sink: ByteArray) = commonReadFully(sink) - override fun read(sink: ByteArray, offset: Int, byteCount: Int): Int = + actual override fun read(sink: ByteArray, offset: Int, byteCount: Int): Int = commonRead(sink, offset, byteCount) @Throws(IOException::class) @@ -436,7 +436,7 @@ actual class Buffer : BufferedSource, BufferedSink, Cloneable, ByteChannel { } @Throws(IOException::class) - override fun writeAll(source: Source): Long = commonWriteAll(source) + actual override fun writeAll(source: Source): Long = commonWriteAll(source) @Throws(IOException::class) actual override fun write(source: Source, byteCount: Long): Buffer = @@ -464,48 +464,49 @@ actual class Buffer : BufferedSource, BufferedSink, Cloneable, ByteChannel { internal actual fun writableSegment(minimumCapacity: Int): Segment = commonWritableSegment(minimumCapacity) - override fun write(source: Buffer, byteCount: Long): Unit = commonWrite(source, byteCount) + actual override fun write(source: Buffer, byteCount: Long): Unit = commonWrite(source, byteCount) - override fun read(sink: Buffer, byteCount: Long): Long = commonRead(sink, byteCount) + actual override fun read(sink: Buffer, byteCount: Long): Long = commonRead(sink, byteCount) - override fun indexOf(b: Byte) = indexOf(b, 0, Long.MAX_VALUE) + actual override fun indexOf(b: Byte) = indexOf(b, 0, Long.MAX_VALUE) /** * Returns the index of `b` in this at or beyond `fromIndex`, or -1 if this buffer does not * contain `b` in that range. */ - override fun indexOf(b: Byte, fromIndex: Long) = indexOf(b, fromIndex, Long.MAX_VALUE) + actual override fun indexOf(b: Byte, fromIndex: Long) = indexOf(b, fromIndex, Long.MAX_VALUE) - override fun indexOf(b: Byte, fromIndex: Long, toIndex: Long): Long = commonIndexOf(b, fromIndex, toIndex) + actual override fun indexOf(b: Byte, fromIndex: Long, toIndex: Long): Long = + commonIndexOf(b, fromIndex, toIndex) @Throws(IOException::class) - override fun indexOf(bytes: ByteString): Long = indexOf(bytes, 0) + actual override fun indexOf(bytes: ByteString): Long = indexOf(bytes, 0) @Throws(IOException::class) - override fun indexOf(bytes: ByteString, fromIndex: Long): Long = commonIndexOf(bytes, fromIndex) + actual override fun indexOf(bytes: ByteString, fromIndex: Long): Long = commonIndexOf(bytes, fromIndex) - override fun indexOfElement(targetBytes: ByteString) = indexOfElement(targetBytes, 0L) + actual override fun indexOfElement(targetBytes: ByteString) = indexOfElement(targetBytes, 0L) - override fun indexOfElement(targetBytes: ByteString, fromIndex: Long): Long = + actual override fun indexOfElement(targetBytes: ByteString, fromIndex: Long): Long = commonIndexOfElement(targetBytes, fromIndex) - override fun rangeEquals(offset: Long, bytes: ByteString) = + actual override fun rangeEquals(offset: Long, bytes: ByteString) = rangeEquals(offset, bytes, 0, bytes.size) - override fun rangeEquals( + actual override fun rangeEquals( offset: Long, bytes: ByteString, bytesOffset: Int, byteCount: Int, ): Boolean = commonRangeEquals(offset, bytes, bytesOffset, byteCount) - override fun flush() {} + actual override fun flush() {} override fun isOpen() = true - override fun close() {} + actual override fun close() {} - override fun timeout() = Timeout.NONE + actual override fun timeout() = Timeout.NONE /** * Returns the 128-bit MD5 hash of this buffer. diff --git a/okio/src/jvmMain/kotlin/okio/HashingSink.kt b/okio/src/jvmMain/kotlin/okio/HashingSink.kt index e072835695..8b17867732 100644 --- a/okio/src/jvmMain/kotlin/okio/HashingSink.kt +++ b/okio/src/jvmMain/kotlin/okio/HashingSink.kt @@ -66,7 +66,7 @@ actual class HashingSink : ForwardingSink, Sink { // Need to explicitly declare ) @Throws(IOException::class) - override fun write(source: Buffer, byteCount: Long) { + actual override fun write(source: Buffer, byteCount: Long) { checkOffsetAndCount(source.size, 0, byteCount) // Hash byteCount bytes from the prefix of source. diff --git a/okio/src/jvmMain/kotlin/okio/HashingSource.kt b/okio/src/jvmMain/kotlin/okio/HashingSource.kt index 2a00b3ee43..4d33558943 100644 --- a/okio/src/jvmMain/kotlin/okio/HashingSource.kt +++ b/okio/src/jvmMain/kotlin/okio/HashingSource.kt @@ -67,7 +67,7 @@ actual class HashingSource : ForwardingSource, Source { // Need to explicitly de ) @Throws(IOException::class) - override fun read(sink: Buffer, byteCount: Long): Long { + actual override fun read(sink: Buffer, byteCount: Long): Long { val result = super.read(sink, byteCount) if (result != -1L) { diff --git a/okio/src/jvmMain/kotlin/okio/RealBufferedSink.kt b/okio/src/jvmMain/kotlin/okio/RealBufferedSink.kt index dece38d62e..d1665ca726 100644 --- a/okio/src/jvmMain/kotlin/okio/RealBufferedSink.kt +++ b/okio/src/jvmMain/kotlin/okio/RealBufferedSink.kt @@ -47,20 +47,20 @@ internal actual class RealBufferedSink actual constructor( @JvmField actual var closed: Boolean = false @Suppress("OVERRIDE_BY_INLINE") // Prevent internal code from calling the getter. - override val buffer: Buffer + actual override val buffer: Buffer inline get() = bufferField override fun buffer() = bufferField - override fun write(source: Buffer, byteCount: Long) = commonWrite(source, byteCount) - override fun write(byteString: ByteString) = commonWrite(byteString) - override fun write(byteString: ByteString, offset: Int, byteCount: Int) = + actual override fun write(source: Buffer, byteCount: Long) = commonWrite(source, byteCount) + actual override fun write(byteString: ByteString) = commonWrite(byteString) + actual override fun write(byteString: ByteString, offset: Int, byteCount: Int) = commonWrite(byteString, offset, byteCount) - override fun writeUtf8(string: String) = commonWriteUtf8(string) - override fun writeUtf8(string: String, beginIndex: Int, endIndex: Int) = + actual override fun writeUtf8(string: String) = commonWriteUtf8(string) + actual override fun writeUtf8(string: String, beginIndex: Int, endIndex: Int) = commonWriteUtf8(string, beginIndex, endIndex) - override fun writeUtf8CodePoint(codePoint: Int) = commonWriteUtf8CodePoint(codePoint) + actual override fun writeUtf8CodePoint(codePoint: Int) = commonWriteUtf8CodePoint(codePoint) override fun writeString(string: String, charset: Charset): BufferedSink { check(!closed) { "closed" } @@ -79,8 +79,8 @@ internal actual class RealBufferedSink actual constructor( return emitCompleteSegments() } - override fun write(source: ByteArray) = commonWrite(source) - override fun write(source: ByteArray, offset: Int, byteCount: Int) = + actual override fun write(source: ByteArray) = commonWrite(source) + actual override fun write(source: ByteArray, offset: Int, byteCount: Int) = commonWrite(source, offset, byteCount) override fun write(source: ByteBuffer): Int { @@ -90,19 +90,19 @@ internal actual class RealBufferedSink actual constructor( return result } - override fun writeAll(source: Source) = commonWriteAll(source) - override fun write(source: Source, byteCount: Long): BufferedSink = commonWrite(source, byteCount) - override fun writeByte(b: Int) = commonWriteByte(b) - override fun writeShort(s: Int) = commonWriteShort(s) - override fun writeShortLe(s: Int) = commonWriteShortLe(s) - override fun writeInt(i: Int) = commonWriteInt(i) - override fun writeIntLe(i: Int) = commonWriteIntLe(i) - override fun writeLong(v: Long) = commonWriteLong(v) - override fun writeLongLe(v: Long) = commonWriteLongLe(v) - override fun writeDecimalLong(v: Long) = commonWriteDecimalLong(v) - override fun writeHexadecimalUnsignedLong(v: Long) = commonWriteHexadecimalUnsignedLong(v) - override fun emitCompleteSegments() = commonEmitCompleteSegments() - override fun emit() = commonEmit() + actual override fun writeAll(source: Source) = commonWriteAll(source) + actual override fun write(source: Source, byteCount: Long): BufferedSink = commonWrite(source, byteCount) + actual override fun writeByte(b: Int) = commonWriteByte(b) + actual override fun writeShort(s: Int) = commonWriteShort(s) + actual override fun writeShortLe(s: Int) = commonWriteShortLe(s) + actual override fun writeInt(i: Int) = commonWriteInt(i) + actual override fun writeIntLe(i: Int) = commonWriteIntLe(i) + actual override fun writeLong(v: Long) = commonWriteLong(v) + actual override fun writeLongLe(v: Long) = commonWriteLongLe(v) + actual override fun writeDecimalLong(v: Long) = commonWriteDecimalLong(v) + actual override fun writeHexadecimalUnsignedLong(v: Long) = commonWriteHexadecimalUnsignedLong(v) + actual override fun emitCompleteSegments() = commonEmitCompleteSegments() + actual override fun emit() = commonEmit() override fun outputStream(): OutputStream { return object : OutputStream() { @@ -131,11 +131,11 @@ internal actual class RealBufferedSink actual constructor( } } - override fun flush() = commonFlush() + actual override fun flush() = commonFlush() override fun isOpen() = !closed - override fun close() = commonClose() - override fun timeout() = commonTimeout() + actual override fun close() = commonClose() + actual override fun timeout() = commonTimeout() override fun toString() = commonToString() } diff --git a/okio/src/jvmMain/kotlin/okio/RealBufferedSource.kt b/okio/src/jvmMain/kotlin/okio/RealBufferedSource.kt index a313fcd1e9..4b754b0a8d 100644 --- a/okio/src/jvmMain/kotlin/okio/RealBufferedSource.kt +++ b/okio/src/jvmMain/kotlin/okio/RealBufferedSource.kt @@ -59,25 +59,25 @@ internal actual class RealBufferedSource actual constructor( @JvmField actual var closed: Boolean = false @Suppress("OVERRIDE_BY_INLINE") // Prevent internal code from calling the getter. - override val buffer: Buffer + actual override val buffer: Buffer inline get() = bufferField override fun buffer() = bufferField - override fun read(sink: Buffer, byteCount: Long): Long = commonRead(sink, byteCount) - override fun exhausted(): Boolean = commonExhausted() - override fun require(byteCount: Long): Unit = commonRequire(byteCount) - override fun request(byteCount: Long): Boolean = commonRequest(byteCount) - override fun readByte(): Byte = commonReadByte() - override fun readByteString(): ByteString = commonReadByteString() - override fun readByteString(byteCount: Long): ByteString = commonReadByteString(byteCount) - override fun select(options: Options): Int = commonSelect(options) - override fun select(options: TypedOptions): T? = commonSelect(options) - override fun readByteArray(): ByteArray = commonReadByteArray() - override fun readByteArray(byteCount: Long): ByteArray = commonReadByteArray(byteCount) - override fun read(sink: ByteArray): Int = read(sink, 0, sink.size) - override fun readFully(sink: ByteArray): Unit = commonReadFully(sink) - override fun read(sink: ByteArray, offset: Int, byteCount: Int): Int = + actual override fun read(sink: Buffer, byteCount: Long): Long = commonRead(sink, byteCount) + actual override fun exhausted(): Boolean = commonExhausted() + actual override fun require(byteCount: Long): Unit = commonRequire(byteCount) + actual override fun request(byteCount: Long): Boolean = commonRequest(byteCount) + actual override fun readByte(): Byte = commonReadByte() + actual override fun readByteString(): ByteString = commonReadByteString() + actual override fun readByteString(byteCount: Long): ByteString = commonReadByteString(byteCount) + actual override fun select(options: Options): Int = commonSelect(options) + actual override fun select(options: TypedOptions): T? = commonSelect(options) + actual override fun readByteArray(): ByteArray = commonReadByteArray() + actual override fun readByteArray(byteCount: Long): ByteArray = commonReadByteArray(byteCount) + actual override fun read(sink: ByteArray): Int = read(sink, 0, sink.size) + actual override fun readFully(sink: ByteArray): Unit = commonReadFully(sink) + actual override fun read(sink: ByteArray, offset: Int, byteCount: Int): Int = commonRead(sink, offset, byteCount) override fun read(sink: ByteBuffer): Int { @@ -89,10 +89,11 @@ internal actual class RealBufferedSource actual constructor( return buffer.read(sink) } - override fun readFully(sink: Buffer, byteCount: Long): Unit = commonReadFully(sink, byteCount) - override fun readAll(sink: Sink): Long = commonReadAll(sink) - override fun readUtf8(): String = commonReadUtf8() - override fun readUtf8(byteCount: Long): String = commonReadUtf8(byteCount) + actual override fun readFully(sink: Buffer, byteCount: Long): Unit = + commonReadFully(sink, byteCount) + actual override fun readAll(sink: Sink): Long = commonReadAll(sink) + actual override fun readUtf8(): String = commonReadUtf8() + actual override fun readUtf8(byteCount: Long): String = commonReadUtf8(byteCount) override fun readString(charset: Charset): String { buffer.writeAll(source) @@ -104,45 +105,48 @@ internal actual class RealBufferedSource actual constructor( return buffer.readString(byteCount, charset) } - override fun readUtf8Line(): String? = commonReadUtf8Line() - override fun readUtf8LineStrict() = readUtf8LineStrict(Long.MAX_VALUE) - override fun readUtf8LineStrict(limit: Long): String = commonReadUtf8LineStrict(limit) - override fun readUtf8CodePoint(): Int = commonReadUtf8CodePoint() - override fun readShort(): Short = commonReadShort() - override fun readShortLe(): Short = commonReadShortLe() - override fun readInt(): Int = commonReadInt() - override fun readIntLe(): Int = commonReadIntLe() - override fun readLong(): Long = commonReadLong() - override fun readLongLe(): Long = commonReadLongLe() - override fun readDecimalLong(): Long = commonReadDecimalLong() - override fun readHexadecimalUnsignedLong(): Long = commonReadHexadecimalUnsignedLong() - override fun skip(byteCount: Long): Unit = commonSkip(byteCount) - override fun indexOf(b: Byte): Long = indexOf(b, 0L, Long.MAX_VALUE) - override fun indexOf(b: Byte, fromIndex: Long): Long = indexOf(b, fromIndex, Long.MAX_VALUE) - override fun indexOf(b: Byte, fromIndex: Long, toIndex: Long): Long = + actual override fun readUtf8Line(): String? = commonReadUtf8Line() + actual override fun readUtf8LineStrict() = readUtf8LineStrict(Long.MAX_VALUE) + actual override fun readUtf8LineStrict(limit: Long): String = commonReadUtf8LineStrict(limit) + actual override fun readUtf8CodePoint(): Int = commonReadUtf8CodePoint() + actual override fun readShort(): Short = commonReadShort() + actual override fun readShortLe(): Short = commonReadShortLe() + actual override fun readInt(): Int = commonReadInt() + actual override fun readIntLe(): Int = commonReadIntLe() + actual override fun readLong(): Long = commonReadLong() + actual override fun readLongLe(): Long = commonReadLongLe() + actual override fun readDecimalLong(): Long = commonReadDecimalLong() + actual override fun readHexadecimalUnsignedLong(): Long = commonReadHexadecimalUnsignedLong() + actual override fun skip(byteCount: Long): Unit = commonSkip(byteCount) + actual override fun indexOf(b: Byte): Long = indexOf(b, 0L, Long.MAX_VALUE) + actual override fun indexOf(b: Byte, fromIndex: Long): Long = + indexOf(b, fromIndex, Long.MAX_VALUE) + actual override fun indexOf(b: Byte, fromIndex: Long, toIndex: Long): Long = commonIndexOf(b, fromIndex, toIndex) - override fun indexOf(bytes: ByteString): Long = indexOf(bytes, 0L) - override fun indexOf(bytes: ByteString, fromIndex: Long): Long = commonIndexOf(bytes, fromIndex) - override fun indexOfElement(targetBytes: ByteString): Long = indexOfElement(targetBytes, 0L) - override fun indexOfElement(targetBytes: ByteString, fromIndex: Long): Long = + actual override fun indexOf(bytes: ByteString): Long = indexOf(bytes, 0L) + actual override fun indexOf(bytes: ByteString, fromIndex: Long): Long = + commonIndexOf(bytes, fromIndex) + actual override fun indexOfElement(targetBytes: ByteString): Long = + indexOfElement(targetBytes, 0L) + actual override fun indexOfElement(targetBytes: ByteString, fromIndex: Long): Long = commonIndexOfElement(targetBytes, fromIndex) - override fun rangeEquals(offset: Long, bytes: ByteString) = rangeEquals( + actual override fun rangeEquals(offset: Long, bytes: ByteString) = rangeEquals( offset, bytes, 0, bytes.size, ) - override fun rangeEquals( + actual override fun rangeEquals( offset: Long, bytes: ByteString, bytesOffset: Int, byteCount: Int, ): Boolean = commonRangeEquals(offset, bytes, bytesOffset, byteCount) - override fun peek(): BufferedSource = commonPeek() + actual override fun peek(): BufferedSource = commonPeek() override fun inputStream(): InputStream { return object : InputStream() { @@ -194,7 +198,7 @@ internal actual class RealBufferedSource actual constructor( override fun isOpen() = !closed - override fun close(): Unit = commonClose() - override fun timeout(): Timeout = commonTimeout() + actual override fun close(): Unit = commonClose() + actual override fun timeout(): Timeout = commonTimeout() override fun toString(): String = commonToString() } From ab5e276d0e3d7547e2ceb90f348a36bd66041547 Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Thu, 17 Oct 2024 08:24:31 -0400 Subject: [PATCH 4/8] More actuals --- okio/src/nonJvmMain/kotlin/okio/Buffer.kt | 90 +++++++++--------- .../src/nonJvmMain/kotlin/okio/HashingSink.kt | 8 +- .../nonJvmMain/kotlin/okio/HashingSource.kt | 6 +- .../kotlin/okio/RealBufferedSink.kt | 50 +++++----- .../kotlin/okio/RealBufferedSource.kt | 91 ++++++++++--------- 5 files changed, 124 insertions(+), 121 deletions(-) diff --git a/okio/src/nonJvmMain/kotlin/okio/Buffer.kt b/okio/src/nonJvmMain/kotlin/okio/Buffer.kt index 223fd5205a..4a3f6d4d3a 100644 --- a/okio/src/nonJvmMain/kotlin/okio/Buffer.kt +++ b/okio/src/nonJvmMain/kotlin/okio/Buffer.kt @@ -80,15 +80,15 @@ actual class Buffer : BufferedSource, BufferedSink { actual override fun emit(): Buffer = this // Nowhere to emit to! - override fun exhausted(): Boolean = size == 0L + actual override fun exhausted(): Boolean = size == 0L - override fun require(byteCount: Long) { + actual override fun require(byteCount: Long) { if (size < byteCount) throw EOFException(null) } - override fun request(byteCount: Long): Boolean = size >= byteCount + actual override fun request(byteCount: Long): Boolean = size >= byteCount - override fun peek(): BufferedSource = PeekSource(this).buffer() + actual override fun peek(): BufferedSource = PeekSource(this).buffer() actual fun copyTo( out: Buffer, @@ -105,57 +105,57 @@ actual class Buffer : BufferedSource, BufferedSink { actual fun completeSegmentByteCount(): Long = commonCompleteSegmentByteCount() - override fun readByte(): Byte = commonReadByte() + actual override fun readByte(): Byte = commonReadByte() - override fun readShort(): Short = commonReadShort() + actual override fun readShort(): Short = commonReadShort() - override fun readInt(): Int = commonReadInt() + actual override fun readInt(): Int = commonReadInt() - override fun readLong(): Long = commonReadLong() + actual override fun readLong(): Long = commonReadLong() - override fun readShortLe(): Short = readShort().reverseBytes() + actual override fun readShortLe(): Short = readShort().reverseBytes() - override fun readIntLe(): Int = readInt().reverseBytes() + actual override fun readIntLe(): Int = readInt().reverseBytes() - override fun readLongLe(): Long = readLong().reverseBytes() + actual override fun readLongLe(): Long = readLong().reverseBytes() - override fun readDecimalLong(): Long = commonReadDecimalLong() + actual override fun readDecimalLong(): Long = commonReadDecimalLong() - override fun readHexadecimalUnsignedLong(): Long = commonReadHexadecimalUnsignedLong() + actual override fun readHexadecimalUnsignedLong(): Long = commonReadHexadecimalUnsignedLong() - override fun readByteString(): ByteString = commonReadByteString() + actual override fun readByteString(): ByteString = commonReadByteString() - override fun readByteString(byteCount: Long): ByteString = commonReadByteString(byteCount) + actual override fun readByteString(byteCount: Long): ByteString = commonReadByteString(byteCount) - override fun readFully(sink: Buffer, byteCount: Long): Unit = commonReadFully(sink, byteCount) + actual override fun readFully(sink: Buffer, byteCount: Long): Unit = commonReadFully(sink, byteCount) - override fun readAll(sink: Sink): Long = commonReadAll(sink) + actual override fun readAll(sink: Sink): Long = commonReadAll(sink) - override fun readUtf8(): String = readUtf8(size) + actual override fun readUtf8(): String = readUtf8(size) - override fun readUtf8(byteCount: Long): String = commonReadUtf8(byteCount) + actual override fun readUtf8(byteCount: Long): String = commonReadUtf8(byteCount) - override fun readUtf8Line(): String? = commonReadUtf8Line() + actual override fun readUtf8Line(): String? = commonReadUtf8Line() - override fun readUtf8LineStrict(): String = readUtf8LineStrict(Long.MAX_VALUE) + actual override fun readUtf8LineStrict(): String = readUtf8LineStrict(Long.MAX_VALUE) - override fun readUtf8LineStrict(limit: Long): String = commonReadUtf8LineStrict(limit) + actual override fun readUtf8LineStrict(limit: Long): String = commonReadUtf8LineStrict(limit) - override fun readUtf8CodePoint(): Int = commonReadUtf8CodePoint() + actual override fun readUtf8CodePoint(): Int = commonReadUtf8CodePoint() - override fun select(options: Options): Int = commonSelect(options) + actual override fun select(options: Options): Int = commonSelect(options) - override fun select(options: TypedOptions): T? = commonSelect(options) + actual override fun select(options: TypedOptions): T? = commonSelect(options) - override fun readByteArray(): ByteArray = commonReadByteArray() + actual override fun readByteArray(): ByteArray = commonReadByteArray() - override fun readByteArray(byteCount: Long): ByteArray = commonReadByteArray(byteCount) + actual override fun readByteArray(byteCount: Long): ByteArray = commonReadByteArray(byteCount) - override fun read(sink: ByteArray): Int = commonRead(sink) + actual override fun read(sink: ByteArray): Int = commonRead(sink) - override fun readFully(sink: ByteArray): Unit = commonReadFully(sink) + actual override fun readFully(sink: ByteArray): Unit = commonReadFully(sink) - override fun read(sink: ByteArray, offset: Int, byteCount: Int): Int = + actual override fun read(sink: ByteArray, offset: Int, byteCount: Int): Int = commonRead(sink, offset, byteCount) actual fun clear(): Unit = commonClear() @@ -183,7 +183,7 @@ actual class Buffer : BufferedSource, BufferedSink { actual override fun write(source: ByteArray, offset: Int, byteCount: Int): Buffer = commonWrite(source, offset, byteCount) - override fun writeAll(source: Source): Long = commonWriteAll(source) + actual override fun writeAll(source: Source): Long = commonWriteAll(source) actual override fun write(source: Source, byteCount: Long): Buffer = commonWrite(source, byteCount) @@ -207,41 +207,41 @@ actual class Buffer : BufferedSource, BufferedSink { actual override fun writeHexadecimalUnsignedLong(v: Long): Buffer = commonWriteHexadecimalUnsignedLong(v) - override fun write(source: Buffer, byteCount: Long): Unit = commonWrite(source, byteCount) + actual override fun write(source: Buffer, byteCount: Long): Unit = commonWrite(source, byteCount) - override fun read(sink: Buffer, byteCount: Long): Long = commonRead(sink, byteCount) + actual override fun read(sink: Buffer, byteCount: Long): Long = commonRead(sink, byteCount) - override fun indexOf(b: Byte): Long = indexOf(b, 0, Long.MAX_VALUE) + actual override fun indexOf(b: Byte): Long = indexOf(b, 0, Long.MAX_VALUE) - override fun indexOf(b: Byte, fromIndex: Long): Long = indexOf(b, fromIndex, Long.MAX_VALUE) + actual override fun indexOf(b: Byte, fromIndex: Long): Long = indexOf(b, fromIndex, Long.MAX_VALUE) - override fun indexOf(b: Byte, fromIndex: Long, toIndex: Long): Long = + actual override fun indexOf(b: Byte, fromIndex: Long, toIndex: Long): Long = commonIndexOf(b, fromIndex, toIndex) - override fun indexOf(bytes: ByteString): Long = indexOf(bytes, 0) + actual override fun indexOf(bytes: ByteString): Long = indexOf(bytes, 0) - override fun indexOf(bytes: ByteString, fromIndex: Long): Long = commonIndexOf(bytes, fromIndex) + actual override fun indexOf(bytes: ByteString, fromIndex: Long): Long = commonIndexOf(bytes, fromIndex) - override fun indexOfElement(targetBytes: ByteString): Long = indexOfElement(targetBytes, 0L) + actual override fun indexOfElement(targetBytes: ByteString): Long = indexOfElement(targetBytes, 0L) - override fun indexOfElement(targetBytes: ByteString, fromIndex: Long): Long = + actual override fun indexOfElement(targetBytes: ByteString, fromIndex: Long): Long = commonIndexOfElement(targetBytes, fromIndex) - override fun rangeEquals(offset: Long, bytes: ByteString): Boolean = + actual override fun rangeEquals(offset: Long, bytes: ByteString): Boolean = rangeEquals(offset, bytes, 0, bytes.size) - override fun rangeEquals( + actual override fun rangeEquals( offset: Long, bytes: ByteString, bytesOffset: Int, byteCount: Int, ): Boolean = commonRangeEquals(offset, bytes, bytesOffset, byteCount) - override fun flush() = Unit + actual override fun flush() = Unit - override fun close() = Unit + actual override fun close() = Unit - override fun timeout(): Timeout = Timeout.NONE + actual override fun timeout(): Timeout = Timeout.NONE override fun equals(other: Any?): Boolean = commonEquals(other) diff --git a/okio/src/nonJvmMain/kotlin/okio/HashingSink.kt b/okio/src/nonJvmMain/kotlin/okio/HashingSink.kt index fd86acf904..15e4b9aeaf 100644 --- a/okio/src/nonJvmMain/kotlin/okio/HashingSink.kt +++ b/okio/src/nonJvmMain/kotlin/okio/HashingSink.kt @@ -27,7 +27,7 @@ actual class HashingSink internal constructor( private val hashFunction: HashFunction, ) : Sink { - override fun write(source: Buffer, byteCount: Long) { + actual override fun write(source: Buffer, byteCount: Long) { checkOffsetAndCount(source.size, 0, byteCount) // Hash byteCount bytes from the prefix of source. @@ -44,11 +44,11 @@ actual class HashingSink internal constructor( sink.write(source, byteCount) } - override fun flush() = sink.flush() + actual override fun flush() = sink.flush() - override fun timeout(): Timeout = sink.timeout() + actual override fun timeout(): Timeout = sink.timeout() - override fun close() = sink.close() + actual override fun close() = sink.close() /** * Returns the hash of the bytes accepted thus far and resets the internal state of this sink. diff --git a/okio/src/nonJvmMain/kotlin/okio/HashingSource.kt b/okio/src/nonJvmMain/kotlin/okio/HashingSource.kt index 40e4a62839..dae96c6bb3 100644 --- a/okio/src/nonJvmMain/kotlin/okio/HashingSource.kt +++ b/okio/src/nonJvmMain/kotlin/okio/HashingSource.kt @@ -27,7 +27,7 @@ actual class HashingSource internal constructor( private val hashFunction: HashFunction, ) : Source { - override fun read(sink: Buffer, byteCount: Long): Long { + actual override fun read(sink: Buffer, byteCount: Long): Long { val result = source.read(sink, byteCount) if (result != -1L) { @@ -54,10 +54,10 @@ actual class HashingSource internal constructor( return result } - override fun timeout(): Timeout = + actual override fun timeout(): Timeout = source.timeout() - override fun close() = + actual override fun close() = source.close() actual val hash: ByteString diff --git a/okio/src/nonJvmMain/kotlin/okio/RealBufferedSink.kt b/okio/src/nonJvmMain/kotlin/okio/RealBufferedSink.kt index 8b09c7f428..f41cd6ebc0 100644 --- a/okio/src/nonJvmMain/kotlin/okio/RealBufferedSink.kt +++ b/okio/src/nonJvmMain/kotlin/okio/RealBufferedSink.kt @@ -40,36 +40,36 @@ internal actual class RealBufferedSink actual constructor( actual val sink: Sink, ) : BufferedSink { actual var closed: Boolean = false - override val buffer = Buffer() + actual override val buffer = Buffer() - override fun write(source: Buffer, byteCount: Long) = commonWrite(source, byteCount) - override fun write(byteString: ByteString) = commonWrite(byteString) - override fun write(byteString: ByteString, offset: Int, byteCount: Int) = + actual override fun write(source: Buffer, byteCount: Long) = commonWrite(source, byteCount) + actual override fun write(byteString: ByteString) = commonWrite(byteString) + actual override fun write(byteString: ByteString, offset: Int, byteCount: Int) = commonWrite(byteString, offset, byteCount) - override fun writeUtf8(string: String) = commonWriteUtf8(string) - override fun writeUtf8(string: String, beginIndex: Int, endIndex: Int) = + actual override fun writeUtf8(string: String) = commonWriteUtf8(string) + actual override fun writeUtf8(string: String, beginIndex: Int, endIndex: Int) = commonWriteUtf8(string, beginIndex, endIndex) - override fun writeUtf8CodePoint(codePoint: Int) = commonWriteUtf8CodePoint(codePoint) - override fun write(source: ByteArray) = commonWrite(source) - override fun write(source: ByteArray, offset: Int, byteCount: Int) = + actual override fun writeUtf8CodePoint(codePoint: Int) = commonWriteUtf8CodePoint(codePoint) + actual override fun write(source: ByteArray) = commonWrite(source) + actual override fun write(source: ByteArray, offset: Int, byteCount: Int) = commonWrite(source, offset, byteCount) - override fun writeAll(source: Source) = commonWriteAll(source) - override fun write(source: Source, byteCount: Long): BufferedSink = commonWrite(source, byteCount) - override fun writeByte(b: Int) = commonWriteByte(b) - override fun writeShort(s: Int) = commonWriteShort(s) - override fun writeShortLe(s: Int) = commonWriteShortLe(s) - override fun writeInt(i: Int) = commonWriteInt(i) - override fun writeIntLe(i: Int) = commonWriteIntLe(i) - override fun writeLong(v: Long) = commonWriteLong(v) - override fun writeLongLe(v: Long) = commonWriteLongLe(v) - override fun writeDecimalLong(v: Long) = commonWriteDecimalLong(v) - override fun writeHexadecimalUnsignedLong(v: Long) = commonWriteHexadecimalUnsignedLong(v) - override fun emitCompleteSegments() = commonEmitCompleteSegments() - override fun emit() = commonEmit() - override fun flush() = commonFlush() - override fun close() = commonClose() - override fun timeout() = commonTimeout() + actual override fun writeAll(source: Source) = commonWriteAll(source) + actual override fun write(source: Source, byteCount: Long): BufferedSink = commonWrite(source, byteCount) + actual override fun writeByte(b: Int) = commonWriteByte(b) + actual override fun writeShort(s: Int) = commonWriteShort(s) + actual override fun writeShortLe(s: Int) = commonWriteShortLe(s) + actual override fun writeInt(i: Int) = commonWriteInt(i) + actual override fun writeIntLe(i: Int) = commonWriteIntLe(i) + actual override fun writeLong(v: Long) = commonWriteLong(v) + actual override fun writeLongLe(v: Long) = commonWriteLongLe(v) + actual override fun writeDecimalLong(v: Long) = commonWriteDecimalLong(v) + actual override fun writeHexadecimalUnsignedLong(v: Long) = commonWriteHexadecimalUnsignedLong(v) + actual override fun emitCompleteSegments() = commonEmitCompleteSegments() + actual override fun emit() = commonEmit() + actual override fun flush() = commonFlush() + actual override fun close() = commonClose() + actual override fun timeout() = commonTimeout() override fun toString() = commonToString() } diff --git a/okio/src/nonJvmMain/kotlin/okio/RealBufferedSource.kt b/okio/src/nonJvmMain/kotlin/okio/RealBufferedSource.kt index 59f532dbe9..5bb7ced78a 100644 --- a/okio/src/nonJvmMain/kotlin/okio/RealBufferedSource.kt +++ b/okio/src/nonJvmMain/kotlin/okio/RealBufferedSource.kt @@ -50,68 +50,71 @@ internal actual class RealBufferedSource actual constructor( actual val source: Source, ) : BufferedSource { actual var closed: Boolean = false - override val buffer: Buffer = Buffer() + actual override val buffer: Buffer = Buffer() - override fun read(sink: Buffer, byteCount: Long): Long = commonRead(sink, byteCount) - override fun exhausted(): Boolean = commonExhausted() - override fun require(byteCount: Long): Unit = commonRequire(byteCount) - override fun request(byteCount: Long): Boolean = commonRequest(byteCount) - override fun readByte(): Byte = commonReadByte() - override fun readByteString(): ByteString = commonReadByteString() - override fun readByteString(byteCount: Long): ByteString = commonReadByteString(byteCount) - override fun select(options: Options): Int = commonSelect(options) - override fun select(options: TypedOptions): T? = commonSelect(options) - override fun readByteArray(): ByteArray = commonReadByteArray() - override fun readByteArray(byteCount: Long): ByteArray = commonReadByteArray(byteCount) - override fun read(sink: ByteArray): Int = read(sink, 0, sink.size) - override fun readFully(sink: ByteArray): Unit = commonReadFully(sink) - override fun read(sink: ByteArray, offset: Int, byteCount: Int): Int = + actual override fun read(sink: Buffer, byteCount: Long): Long = commonRead(sink, byteCount) + actual override fun exhausted(): Boolean = commonExhausted() + actual override fun require(byteCount: Long): Unit = commonRequire(byteCount) + actual override fun request(byteCount: Long): Boolean = commonRequest(byteCount) + actual override fun readByte(): Byte = commonReadByte() + actual override fun readByteString(): ByteString = commonReadByteString() + actual override fun readByteString(byteCount: Long): ByteString = commonReadByteString(byteCount) + actual override fun select(options: Options): Int = commonSelect(options) + actual override fun select(options: TypedOptions): T? = commonSelect(options) + actual override fun readByteArray(): ByteArray = commonReadByteArray() + actual override fun readByteArray(byteCount: Long): ByteArray = commonReadByteArray(byteCount) + actual override fun read(sink: ByteArray): Int = read(sink, 0, sink.size) + actual override fun readFully(sink: ByteArray): Unit = commonReadFully(sink) + actual override fun read(sink: ByteArray, offset: Int, byteCount: Int): Int = commonRead(sink, offset, byteCount) - override fun readFully(sink: Buffer, byteCount: Long): Unit = commonReadFully(sink, byteCount) - override fun readAll(sink: Sink): Long = commonReadAll(sink) - override fun readUtf8(): String = commonReadUtf8() - override fun readUtf8(byteCount: Long): String = commonReadUtf8(byteCount) - override fun readUtf8Line(): String? = commonReadUtf8Line() - override fun readUtf8LineStrict() = readUtf8LineStrict(Long.MAX_VALUE) - override fun readUtf8LineStrict(limit: Long): String = commonReadUtf8LineStrict(limit) - override fun readUtf8CodePoint(): Int = commonReadUtf8CodePoint() - override fun readShort(): Short = commonReadShort() - override fun readShortLe(): Short = commonReadShortLe() - override fun readInt(): Int = commonReadInt() - override fun readIntLe(): Int = commonReadIntLe() - override fun readLong(): Long = commonReadLong() - override fun readLongLe(): Long = commonReadLongLe() - override fun readDecimalLong(): Long = commonReadDecimalLong() - override fun readHexadecimalUnsignedLong(): Long = commonReadHexadecimalUnsignedLong() - override fun skip(byteCount: Long): Unit = commonSkip(byteCount) - override fun indexOf(b: Byte): Long = indexOf(b, 0L, Long.MAX_VALUE) - override fun indexOf(b: Byte, fromIndex: Long): Long = indexOf(b, fromIndex, Long.MAX_VALUE) - override fun indexOf(b: Byte, fromIndex: Long, toIndex: Long): Long = + actual override fun readFully(sink: Buffer, byteCount: Long): Unit = + commonReadFully(sink, byteCount) + actual override fun readAll(sink: Sink): Long = commonReadAll(sink) + actual override fun readUtf8(): String = commonReadUtf8() + actual override fun readUtf8(byteCount: Long): String = commonReadUtf8(byteCount) + actual override fun readUtf8Line(): String? = commonReadUtf8Line() + actual override fun readUtf8LineStrict() = readUtf8LineStrict(Long.MAX_VALUE) + actual override fun readUtf8LineStrict(limit: Long): String = commonReadUtf8LineStrict(limit) + actual override fun readUtf8CodePoint(): Int = commonReadUtf8CodePoint() + actual override fun readShort(): Short = commonReadShort() + actual override fun readShortLe(): Short = commonReadShortLe() + actual override fun readInt(): Int = commonReadInt() + actual override fun readIntLe(): Int = commonReadIntLe() + actual override fun readLong(): Long = commonReadLong() + actual override fun readLongLe(): Long = commonReadLongLe() + actual override fun readDecimalLong(): Long = commonReadDecimalLong() + actual override fun readHexadecimalUnsignedLong(): Long = commonReadHexadecimalUnsignedLong() + actual override fun skip(byteCount: Long): Unit = commonSkip(byteCount) + actual override fun indexOf(b: Byte): Long = indexOf(b, 0L, Long.MAX_VALUE) + actual override fun indexOf(b: Byte, fromIndex: Long): Long = + indexOf(b, fromIndex, Long.MAX_VALUE) + actual override fun indexOf(b: Byte, fromIndex: Long, toIndex: Long): Long = commonIndexOf(b, fromIndex, toIndex) - override fun indexOf(bytes: ByteString): Long = indexOf(bytes, 0L) - override fun indexOf(bytes: ByteString, fromIndex: Long): Long = commonIndexOf(bytes, fromIndex) - override fun indexOfElement(targetBytes: ByteString): Long = indexOfElement(targetBytes, 0L) - override fun indexOfElement(targetBytes: ByteString, fromIndex: Long): Long = + actual override fun indexOf(bytes: ByteString): Long = indexOf(bytes, 0L) + actual override fun indexOf(bytes: ByteString, fromIndex: Long): Long = commonIndexOf(bytes, fromIndex) + actual override fun indexOfElement(targetBytes: ByteString): Long = + indexOfElement(targetBytes, 0L) + actual override fun indexOfElement(targetBytes: ByteString, fromIndex: Long): Long = commonIndexOfElement(targetBytes, fromIndex) - override fun rangeEquals(offset: Long, bytes: ByteString) = rangeEquals( + actual override fun rangeEquals(offset: Long, bytes: ByteString) = rangeEquals( offset, bytes, 0, bytes.size, ) - override fun rangeEquals( + actual override fun rangeEquals( offset: Long, bytes: ByteString, bytesOffset: Int, byteCount: Int, ): Boolean = commonRangeEquals(offset, bytes, bytesOffset, byteCount) - override fun peek(): BufferedSource = commonPeek() - override fun close(): Unit = commonClose() - override fun timeout(): Timeout = commonTimeout() + actual override fun peek(): BufferedSource = commonPeek() + actual override fun close(): Unit = commonClose() + actual override fun timeout(): Timeout = commonTimeout() override fun toString(): String = commonToString() } From 21e18d650c2c6148ad248d70f78355055baf5274 Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Thu, 17 Oct 2024 09:28:01 -0400 Subject: [PATCH 5/8] Actual on zlib and testing support --- .../src/commonMain/kotlin/okio/TestingCommon.kt | 2 ++ .../src/wasmMain/kotlin/okio/TestingWasm.kt | 2 +- okio/src/jvmMain/kotlin/okio/DeflaterSink.kt | 8 ++++---- okio/src/jvmMain/kotlin/okio/InflaterSource.kt | 6 +++--- okio/src/nativeMain/kotlin/okio/DeflaterSink.kt | 8 ++++---- okio/src/nativeMain/kotlin/okio/InflaterSource.kt | 6 +++--- okio/src/zlibMain/kotlin/okio/DeflaterSink.kt | 5 +++++ okio/src/zlibMain/kotlin/okio/InflaterSource.kt | 4 ++++ 8 files changed, 26 insertions(+), 15 deletions(-) diff --git a/okio-testing-support/src/commonMain/kotlin/okio/TestingCommon.kt b/okio-testing-support/src/commonMain/kotlin/okio/TestingCommon.kt index d3a08214f8..d8a5c25e84 100644 --- a/okio-testing-support/src/commonMain/kotlin/okio/TestingCommon.kt +++ b/okio-testing-support/src/commonMain/kotlin/okio/TestingCommon.kt @@ -76,6 +76,8 @@ expect class Instant : Comparable { operator fun plus(duration: Duration): Instant operator fun minus(duration: Duration): Instant + + override operator fun compareTo(other: Instant): Int } expect fun fromEpochSeconds( diff --git a/okio-testing-support/src/wasmMain/kotlin/okio/TestingWasm.kt b/okio-testing-support/src/wasmMain/kotlin/okio/TestingWasm.kt index 865cf716a9..1720c779ef 100644 --- a/okio-testing-support/src/wasmMain/kotlin/okio/TestingWasm.kt +++ b/okio-testing-support/src/wasmMain/kotlin/okio/TestingWasm.kt @@ -37,7 +37,7 @@ actual class Instant( actual operator fun minus(duration: Duration) = Instant(epochMilliseconds - duration.inWholeMilliseconds) - override fun compareTo(other: Instant) = + actual override fun compareTo(other: Instant) = epochMilliseconds.compareTo(other.epochMilliseconds) } diff --git a/okio/src/jvmMain/kotlin/okio/DeflaterSink.kt b/okio/src/jvmMain/kotlin/okio/DeflaterSink.kt index 73d69b5b44..2114e1ea4c 100644 --- a/okio/src/jvmMain/kotlin/okio/DeflaterSink.kt +++ b/okio/src/jvmMain/kotlin/okio/DeflaterSink.kt @@ -28,7 +28,7 @@ actual class DeflaterSink internal actual constructor( private var closed = false @Throws(IOException::class) - override fun write(source: Buffer, byteCount: Long) { + actual override fun write(source: Buffer, byteCount: Long) { checkOffsetAndCount(source.size, 0, byteCount) var remaining = byteCount @@ -88,7 +88,7 @@ actual class DeflaterSink internal actual constructor( } @Throws(IOException::class) - override fun flush() { + actual override fun flush() { deflate(true) sink.flush() } @@ -99,7 +99,7 @@ actual class DeflaterSink internal actual constructor( } @Throws(IOException::class) - override fun close() { + actual override fun close() { if (closed) return // Emit deflated data to the underlying sink. If this fails, we still need @@ -128,7 +128,7 @@ actual class DeflaterSink internal actual constructor( if (thrown != null) throw thrown } - override fun timeout(): Timeout = sink.timeout() + actual override fun timeout(): Timeout = sink.timeout() override fun toString() = "DeflaterSink($sink)" } diff --git a/okio/src/jvmMain/kotlin/okio/InflaterSource.kt b/okio/src/jvmMain/kotlin/okio/InflaterSource.kt index e986c53fce..a07873d1ca 100644 --- a/okio/src/jvmMain/kotlin/okio/InflaterSource.kt +++ b/okio/src/jvmMain/kotlin/okio/InflaterSource.kt @@ -37,7 +37,7 @@ actual class InflaterSource internal actual constructor( actual constructor(source: Source, inflater: Inflater) : this(source.buffer(), inflater) @Throws(IOException::class) - override fun read(sink: Buffer, byteCount: Long): Long { + actual override fun read(sink: Buffer, byteCount: Long): Long { while (true) { val bytesInflated = readOrInflate(sink, byteCount) if (bytesInflated > 0) return bytesInflated @@ -119,10 +119,10 @@ actual class InflaterSource internal actual constructor( source.skip(toRelease.toLong()) } - override fun timeout(): Timeout = source.timeout() + actual override fun timeout(): Timeout = source.timeout() @Throws(IOException::class) - override fun close() { + actual override fun close() { if (closed) return inflater.end() closed = true diff --git a/okio/src/nativeMain/kotlin/okio/DeflaterSink.kt b/okio/src/nativeMain/kotlin/okio/DeflaterSink.kt index 697533a8fa..496854d264 100644 --- a/okio/src/nativeMain/kotlin/okio/DeflaterSink.kt +++ b/okio/src/nativeMain/kotlin/okio/DeflaterSink.kt @@ -29,7 +29,7 @@ actual class DeflaterSink internal actual constructor( ) : this(sink.buffer(), deflater) @Throws(IOException::class) - override fun write(source: Buffer, byteCount: Long) { + actual override fun write(source: Buffer, byteCount: Long) { checkOffsetAndCount(source.size, 0, byteCount) deflater.flush = Z_NO_FLUSH @@ -41,7 +41,7 @@ actual class DeflaterSink internal actual constructor( } @Throws(IOException::class) - override fun flush() { + actual override fun flush() { deflater.flush = Z_SYNC_FLUSH deflater.dataProcessor.writeBytesFromSource( source = null, @@ -52,7 +52,7 @@ actual class DeflaterSink internal actual constructor( sink.flush() } - override fun timeout(): Timeout { + actual override fun timeout(): Timeout { return sink.timeout() } @@ -67,7 +67,7 @@ actual class DeflaterSink internal actual constructor( } @Throws(IOException::class) - override fun close() { + actual override fun close() { if (deflater.dataProcessor.closed) return // We must close the deflater and the target, even if flushing fails. Otherwise, we'll leak diff --git a/okio/src/nativeMain/kotlin/okio/InflaterSource.kt b/okio/src/nativeMain/kotlin/okio/InflaterSource.kt index c9f7f5c44e..04351b968d 100644 --- a/okio/src/nativeMain/kotlin/okio/InflaterSource.kt +++ b/okio/src/nativeMain/kotlin/okio/InflaterSource.kt @@ -25,7 +25,7 @@ actual class InflaterSource internal actual constructor( ) : this(source.buffer(), inflater) @Throws(IOException::class) - override fun read(sink: Buffer, byteCount: Long): Long { + actual override fun read(sink: Buffer, byteCount: Long): Long { require(byteCount >= 0L) { "byteCount < 0: $byteCount" } return inflater.dataProcessor.readBytesToTarget( @@ -35,11 +35,11 @@ actual class InflaterSource internal actual constructor( ) } - override fun timeout(): Timeout { + actual override fun timeout(): Timeout { return source.timeout() } - override fun close() { + actual override fun close() { if (inflater.dataProcessor.closed) return inflater.dataProcessor.close() diff --git a/okio/src/zlibMain/kotlin/okio/DeflaterSink.kt b/okio/src/zlibMain/kotlin/okio/DeflaterSink.kt index d537b24622..b81e7dd00f 100644 --- a/okio/src/zlibMain/kotlin/okio/DeflaterSink.kt +++ b/okio/src/zlibMain/kotlin/okio/DeflaterSink.kt @@ -47,6 +47,11 @@ internal constructor( constructor(sink: Sink, deflater: Deflater) internal fun finishDeflate() + + override fun write(source: Buffer, byteCount: Long) + override fun flush() + override fun timeout(): Timeout + override fun close() } /** diff --git a/okio/src/zlibMain/kotlin/okio/InflaterSource.kt b/okio/src/zlibMain/kotlin/okio/InflaterSource.kt index 0c1065156e..01bfc8efa9 100644 --- a/okio/src/zlibMain/kotlin/okio/InflaterSource.kt +++ b/okio/src/zlibMain/kotlin/okio/InflaterSource.kt @@ -33,6 +33,10 @@ internal constructor( inflater: Inflater, ) : Source { constructor(source: Source, inflater: Inflater) + + override fun read(sink: Buffer, byteCount: Long): Long + override fun timeout(): Timeout + override fun close() } /** From e2362e0ddac5731fe779830c3052962a00e6d940 Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Thu, 17 Oct 2024 10:32:38 -0400 Subject: [PATCH 6/8] kotlinUpgradeYarnLock --- kotlin-js-store/yarn.lock | 596 ++++++++++++++++++++------------------ 1 file changed, 320 insertions(+), 276 deletions(-) diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock index c9f26541fd..3aabb8020c 100644 --- a/kotlin-js-store/yarn.lock +++ b/kotlin-js-store/yarn.lock @@ -26,6 +26,11 @@ resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== +"@jridgewell/resolve-uri@^3.1.0": + version "3.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6" + integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw== + "@jridgewell/set-array@^1.0.1": version "1.1.2" resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" @@ -49,7 +54,20 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== -"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": +"@jridgewell/sourcemap-codec@^1.4.14": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a" + integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ== + +"@jridgewell/trace-mapping@^0.3.20": + version "0.3.25" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" + integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== + dependencies: + "@jridgewell/resolve-uri" "^3.1.0" + "@jridgewell/sourcemap-codec" "^1.4.14" + +"@jridgewell/trace-mapping@^0.3.9": version "0.3.18" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6" integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA== @@ -95,11 +113,16 @@ "@types/estree" "*" "@types/json-schema" "*" -"@types/estree@*", "@types/estree@^1.0.0": +"@types/estree@*": version "1.0.1" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194" integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA== +"@types/estree@^1.0.5": + version "1.0.6" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50" + integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw== + "@types/json-schema@*", "@types/json-schema@^7.0.8": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb" @@ -110,10 +133,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.1.tgz#a6033a8718653c50ac4962977e14d0f984d9527d" integrity sha512-JIzsAvJeA/5iY6Y/OxZbv1lUcc8dNSE77lb2gnBH+/PJ3lFR1Ccvgwl5JWnHAkNHcRsT0TbpVOsiMKZ1F/yyJg== -"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24" - integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q== +"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb" + integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg== dependencies: "@webassemblyjs/helper-numbers" "1.11.6" "@webassemblyjs/helper-wasm-bytecode" "1.11.6" @@ -128,10 +151,10 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768" integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q== -"@webassemblyjs/helper-buffer@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093" - integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA== +"@webassemblyjs/helper-buffer@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz#6df20d272ea5439bf20ab3492b7fb70e9bfcb3f6" + integrity sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw== "@webassemblyjs/helper-numbers@1.11.6": version "1.11.6" @@ -147,15 +170,15 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9" integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA== -"@webassemblyjs/helper-wasm-section@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577" - integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g== +"@webassemblyjs/helper-wasm-section@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz#3da623233ae1a60409b509a52ade9bc22a37f7bf" + integrity sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g== dependencies: - "@webassemblyjs/ast" "1.11.6" - "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/ast" "1.12.1" + "@webassemblyjs/helper-buffer" "1.12.1" "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/wasm-gen" "1.11.6" + "@webassemblyjs/wasm-gen" "1.12.1" "@webassemblyjs/ieee754@1.11.6": version "1.11.6" @@ -176,72 +199,72 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a" integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA== -"@webassemblyjs/wasm-edit@^1.11.5": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab" - integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw== +"@webassemblyjs/wasm-edit@^1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b" + integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g== dependencies: - "@webassemblyjs/ast" "1.11.6" - "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/ast" "1.12.1" + "@webassemblyjs/helper-buffer" "1.12.1" "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/helper-wasm-section" "1.11.6" - "@webassemblyjs/wasm-gen" "1.11.6" - "@webassemblyjs/wasm-opt" "1.11.6" - "@webassemblyjs/wasm-parser" "1.11.6" - "@webassemblyjs/wast-printer" "1.11.6" - -"@webassemblyjs/wasm-gen@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268" - integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA== - dependencies: - "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-wasm-section" "1.12.1" + "@webassemblyjs/wasm-gen" "1.12.1" + "@webassemblyjs/wasm-opt" "1.12.1" + "@webassemblyjs/wasm-parser" "1.12.1" + "@webassemblyjs/wast-printer" "1.12.1" + +"@webassemblyjs/wasm-gen@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz#a6520601da1b5700448273666a71ad0a45d78547" + integrity sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w== + dependencies: + "@webassemblyjs/ast" "1.12.1" "@webassemblyjs/helper-wasm-bytecode" "1.11.6" "@webassemblyjs/ieee754" "1.11.6" "@webassemblyjs/leb128" "1.11.6" "@webassemblyjs/utf8" "1.11.6" -"@webassemblyjs/wasm-opt@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2" - integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g== +"@webassemblyjs/wasm-opt@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz#9e6e81475dfcfb62dab574ac2dda38226c232bc5" + integrity sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg== dependencies: - "@webassemblyjs/ast" "1.11.6" - "@webassemblyjs/helper-buffer" "1.11.6" - "@webassemblyjs/wasm-gen" "1.11.6" - "@webassemblyjs/wasm-parser" "1.11.6" + "@webassemblyjs/ast" "1.12.1" + "@webassemblyjs/helper-buffer" "1.12.1" + "@webassemblyjs/wasm-gen" "1.12.1" + "@webassemblyjs/wasm-parser" "1.12.1" -"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1" - integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ== +"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937" + integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ== dependencies: - "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/ast" "1.12.1" "@webassemblyjs/helper-api-error" "1.11.6" "@webassemblyjs/helper-wasm-bytecode" "1.11.6" "@webassemblyjs/ieee754" "1.11.6" "@webassemblyjs/leb128" "1.11.6" "@webassemblyjs/utf8" "1.11.6" -"@webassemblyjs/wast-printer@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20" - integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A== +"@webassemblyjs/wast-printer@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz#bcecf661d7d1abdaf989d8341a4833e33e2b31ac" + integrity sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA== dependencies: - "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/ast" "1.12.1" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^2.1.0": +"@webpack-cli/configtest@^2.1.1": version "2.1.1" resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646" integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw== -"@webpack-cli/info@^2.0.1": +"@webpack-cli/info@^2.0.2": version "2.0.2" resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd" integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A== -"@webpack-cli/serve@^2.0.3": +"@webpack-cli/serve@^2.0.5": version "2.0.5" resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e" integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ== @@ -256,11 +279,6 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -abab@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" - integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== - accepts@~1.3.4: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" @@ -269,10 +287,10 @@ accepts@~1.3.4: mime-types "~2.1.34" negotiator "0.6.3" -acorn-import-assertions@^1.7.6: - version "1.9.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac" - integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA== +acorn-import-attributes@^1.9.5: + version "1.9.5" + resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef" + integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ== acorn@^8.7.1, acorn@^8.8.2: version "8.10.0" @@ -294,10 +312,10 @@ ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ansi-colors@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" - integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== +ansi-colors@^4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b" + integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw== ansi-regex@^5.0.1: version "5.0.1" @@ -379,20 +397,20 @@ braces@^3.0.2, braces@~3.0.2: dependencies: fill-range "^7.0.1" -browser-stdout@1.3.1: +browser-stdout@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== -browserslist@^4.14.5: - version "4.21.9" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.9.tgz#e11bdd3c313d7e2a9e87e8b4b0c7872b13897635" - integrity sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg== +browserslist@^4.21.10: + version "4.24.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.0.tgz#a1325fe4bc80b64fda169629fc01b3d6cecd38d4" + integrity sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A== dependencies: - caniuse-lite "^1.0.30001503" - electron-to-chromium "^1.4.431" - node-releases "^2.0.12" - update-browserslist-db "^1.0.11" + caniuse-lite "^1.0.30001663" + electron-to-chromium "^1.5.28" + node-releases "^2.0.18" + update-browserslist-db "^1.1.0" buffer-from@^1.0.0: version "1.1.2" @@ -417,10 +435,10 @@ camelcase@^6.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001503: - version "1.0.30001513" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001513.tgz#382fe5fbfb0f7abbaf8c55ca3ac71a0307a752e9" - integrity sha512-pnjGJo7SOOjAGytZZ203Em95MRM8Cr6jhCXNF/FAXTpCTRTECnqQWLpiTRqrFtdYcth8hf4WECUpkezuYsMVww== +caniuse-lite@^1.0.30001663: + version "1.0.30001669" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz#fda8f1d29a8bfdc42de0c170d7f34a9cf19ed7a3" + integrity sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w== chalk@^4.1.0: version "4.1.2" @@ -430,7 +448,7 @@ chalk@^4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chokidar@3.5.3, chokidar@^3.5.1: +chokidar@^3.5.1: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -445,6 +463,21 @@ chokidar@3.5.3, chokidar@^3.5.1: optionalDependencies: fsevents "~2.3.2" +chokidar@^3.5.3: + version "3.6.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" + integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + chrome-trace-event@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" @@ -515,10 +548,10 @@ content-type@~1.0.5: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== -cookie@~0.4.1: - version "0.4.2" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" - integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== +cookie@~0.7.2: + version "0.7.2" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.2.tgz#556369c472a2ba910f2979891b526b3436237ed7" + integrity sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w== cors@~2.8.5: version "2.8.5" @@ -554,13 +587,20 @@ debug@2.6.9: dependencies: ms "2.0.0" -debug@4.3.4, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2: +debug@^4.3.4, debug@~4.3.1, debug@~4.3.2: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" +debug@^4.3.5: + version "4.3.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52" + integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ== + dependencies: + ms "^2.1.3" + decamelize@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837" @@ -581,10 +621,10 @@ di@^0.0.1: resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c" integrity sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA== -diff@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" - integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== +diff@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-5.2.0.tgz#26ded047cd1179b78b9537d5ef725503ce1ae531" + integrity sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A== dom-serialize@^2.2.1: version "2.2.1" @@ -601,10 +641,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -electron-to-chromium@^1.4.431: - version "1.4.454" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.454.tgz#774dc7cb5e58576d0125939ec34a4182f3ccc87d" - integrity sha512-pmf1rbAStw8UEQ0sr2cdJtWl48ZMuPD9Sto8HVQOq9vx9j2WgDEN6lYoaqFvqEHYOmGA9oRGn7LqWI9ta0YugQ== +electron-to-chromium@^1.5.28: + version "1.5.40" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.40.tgz#5f6aec13751123c5c3185999ebe3e7bcaf828c2b" + integrity sha512-LYm78o6if4zTasnYclgQzxEcgMoIcybWOhkATWepN95uwVVWV0/IW10v+2sIeHE+bIYWipLneTftVyQm45UY7g== emoji-regex@^8.0.0: version "8.0.0" @@ -616,31 +656,31 @@ encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== -engine.io-parser@~5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.1.0.tgz#d593d6372d7f79212df48f807b8cace1ea1cb1b8" - integrity sha512-enySgNiK5tyZFynt3z7iqBR+Bto9EVVVvDFuTT0ioHCGbzirZVGDGiQjZzEp8hWl6hd5FSVytJGuScX1C1C35w== +engine.io-parser@~5.2.1: + version "5.2.3" + resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.3.tgz#00dc5b97b1f233a23c9398d0209504cf5f94d92f" + integrity sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q== -engine.io@~6.5.0: - version "6.5.1" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.5.1.tgz#59725f8593ccc891abb47f1efcdc52a089525a56" - integrity sha512-mGqhI+D7YxS9KJMppR6Iuo37Ed3abhU8NdfgSvJSDUafQutrN+sPTncJYTyM9+tkhSmWodKtVYGPPHyXJEwEQA== +engine.io@~6.6.0: + version "6.6.2" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.6.2.tgz#32bd845b4db708f8c774a4edef4e5c8a98b3da72" + integrity sha512-gmNvsYi9C8iErnZdVcJnvCpSKbWTt1E8+JZo8b+daLninywUWi5NQ5STSHZ9rFjFO7imNcvb8Pc5pe/wMR5xEw== dependencies: "@types/cookie" "^0.4.1" "@types/cors" "^2.8.12" "@types/node" ">=10.0.0" accepts "~1.3.4" base64id "2.0.0" - cookie "~0.4.1" + cookie "~0.7.2" cors "~2.8.5" debug "~4.3.1" - engine.io-parser "~5.1.0" - ws "~8.11.0" + engine.io-parser "~5.2.1" + ws "~8.17.1" -enhanced-resolve@^5.13.0: - version "5.15.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35" - integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg== +enhanced-resolve@^5.17.0: + version "5.17.1" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15" + integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -665,12 +705,17 @@ escalade@^3.1.1: resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== +escalade@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5" + integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA== + escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== -escape-string-regexp@4.0.0: +escape-string-regexp@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== @@ -750,14 +795,6 @@ finalhandler@1.1.2: statuses "~1.5.0" unpipe "~1.0.0" -find-up@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - find-up@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" @@ -766,6 +803,14 @@ find-up@^4.0.0: locate-path "^5.0.0" path-exists "^4.0.0" +find-up@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + flat@^5.0.2: version "5.0.2" resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" @@ -837,31 +882,30 @@ glob-to-regexp@^0.4.1: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== -glob@7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== +glob@^7.1.3, glob@^7.1.7: + version "7.2.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.0.4" + minimatch "^3.1.1" once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.3, glob@^7.1.7: - version "7.2.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== +glob@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.1.1" + minimatch "^5.0.1" once "^1.3.0" - path-is-absolute "^1.0.0" -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -888,7 +932,7 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -he@1.2.0: +he@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== @@ -1030,7 +1074,7 @@ jest-worker@^27.4.5: merge-stream "^2.0.0" supports-color "^8.0.0" -js-yaml@4.1.0: +js-yaml@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== @@ -1075,19 +1119,19 @@ karma-sourcemap-loader@0.4.0: dependencies: graceful-fs "^4.2.10" -karma-webpack@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-5.0.0.tgz#2a2c7b80163fe7ffd1010f83f5507f95ef39f840" - integrity sha512-+54i/cd3/piZuP3dr54+NcFeKOPnys5QeM1IY+0SPASwrtHsliXUiCL50iW+K9WWA7RvamC4macvvQ86l3KtaA== +karma-webpack@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-5.0.1.tgz#4eafd31bbe684a747a6e8f3e4ad373e53979ced4" + integrity sha512-oo38O+P3W2mSPCSUrQdySSPv1LvPpXP+f+bBimNomS5sW+1V4SuhCuW8TfJzV+rDv921w2fDSDw0xJbPe6U+kQ== dependencies: glob "^7.1.3" - minimatch "^3.0.4" + minimatch "^9.0.3" webpack-merge "^4.1.5" -karma@6.4.2: - version "6.4.2" - resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.2.tgz#a983f874cee6f35990c4b2dcc3d274653714de8e" - integrity sha512-C6SU/53LB31BEgRg+omznBEMY4SjHU3ricV6zBcAe1EeILKkeScr+fZXtaI5WyDbkVowJxxAI6h73NcFPmXolQ== +karma@6.4.3: + version "6.4.3" + resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.3.tgz#763e500f99597218bbb536de1a14acc4ceea7ce8" + integrity sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q== dependencies: "@colors/colors" "1.5.0" body-parser "^1.19.0" @@ -1108,7 +1152,7 @@ karma@6.4.2: qjobs "^1.2.0" range-parser "^1.2.1" rimraf "^3.0.2" - socket.io "^4.4.1" + socket.io "^4.7.2" source-map "^0.6.1" tmp "^0.2.1" ua-parser-js "^0.7.30" @@ -1143,7 +1187,7 @@ lodash@^4.17.15, lodash@^4.17.21: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -log-symbols@4.1.0: +log-symbols@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== @@ -1189,13 +1233,6 @@ mime@^2.5.2: resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== -minimatch@5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b" - integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g== - dependencies: - brace-expansion "^2.0.1" - minimatch@^3.0.4, minimatch@^3.1.1: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" @@ -1203,6 +1240,20 @@ minimatch@^3.0.4, minimatch@^3.1.1: dependencies: brace-expansion "^1.1.7" +minimatch@^5.0.1, minimatch@^5.1.6: + version "5.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== + dependencies: + brace-expansion "^2.0.1" + +minimatch@^9.0.3: + version "9.0.5" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5" + integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow== + dependencies: + brace-expansion "^2.0.1" + minimist@^1.2.3, minimist@^1.2.6: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" @@ -1215,32 +1266,31 @@ mkdirp@^0.5.5: dependencies: minimist "^1.2.6" -mocha@10.2.0: - version "10.2.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.2.0.tgz#1fd4a7c32ba5ac372e03a17eef435bd00e5c68b8" - integrity sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg== - dependencies: - ansi-colors "4.1.1" - browser-stdout "1.3.1" - chokidar "3.5.3" - debug "4.3.4" - diff "5.0.0" - escape-string-regexp "4.0.0" - find-up "5.0.0" - glob "7.2.0" - he "1.2.0" - js-yaml "4.1.0" - log-symbols "4.1.0" - minimatch "5.0.1" - ms "2.1.3" - nanoid "3.3.3" - serialize-javascript "6.0.0" - strip-json-comments "3.1.1" - supports-color "8.1.1" - workerpool "6.2.1" - yargs "16.2.0" - yargs-parser "20.2.4" - yargs-unparser "2.0.0" +mocha@10.7.0: + version "10.7.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.0.tgz#9e5cbed8fa9b37537a25bd1f7fb4f6fc45458b9a" + integrity sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA== + dependencies: + ansi-colors "^4.1.3" + browser-stdout "^1.3.1" + chokidar "^3.5.3" + debug "^4.3.5" + diff "^5.2.0" + escape-string-regexp "^4.0.0" + find-up "^5.0.0" + glob "^8.1.0" + he "^1.2.0" + js-yaml "^4.1.0" + log-symbols "^4.1.0" + minimatch "^5.1.6" + ms "^2.1.3" + serialize-javascript "^6.0.2" + strip-json-comments "^3.1.1" + supports-color "^8.1.1" + workerpool "^6.5.1" + yargs "^16.2.0" + yargs-parser "^20.2.9" + yargs-unparser "^2.0.0" ms@2.0.0: version "2.0.0" @@ -1252,16 +1302,11 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@2.1.3: +ms@^2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -nanoid@3.3.3: - version "3.3.3" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" - integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== - negotiator@0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" @@ -1272,10 +1317,10 @@ neo-async@^2.6.2: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== -node-releases@^2.0.12: - version "2.0.13" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d" - integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ== +node-releases@^2.0.18: + version "2.0.18" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f" + integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g== normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" @@ -1371,10 +1416,10 @@ path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== -picocolors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" - integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== +picocolors@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" + integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== picomatch@^2.0.4, picomatch@^2.2.1: version "2.3.1" @@ -1494,7 +1539,7 @@ safe-buffer@^5.1.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -schema-utils@^3.1.1, schema-utils@^3.1.2: +schema-utils@^3.1.1, schema-utils@^3.2.0: version "3.3.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe" integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg== @@ -1503,13 +1548,6 @@ schema-utils@^3.1.1, schema-utils@^3.1.2: ajv "^6.12.5" ajv-keywords "^3.5.2" -serialize-javascript@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" - integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== - dependencies: - randombytes "^2.1.0" - serialize-javascript@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" @@ -1517,6 +1555,13 @@ serialize-javascript@^6.0.1: dependencies: randombytes "^2.1.0" +serialize-javascript@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2" + integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g== + dependencies: + randombytes "^2.1.0" + setprototypeof@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" @@ -1565,16 +1610,16 @@ socket.io-parser@~4.2.4: "@socket.io/component-emitter" "~3.1.0" debug "~4.3.1" -socket.io@^4.4.1: - version "4.7.1" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.7.1.tgz#9009f31bf7be25478895145e92fbc972ad1db900" - integrity sha512-W+utHys2w//dhFjy7iQQu9sGd3eokCjGbl2r59tyLqNiJJBdIebn3GAKEXBr3osqHTObJi2die/25bCx2zsaaw== +socket.io@^4.7.2: + version "4.8.0" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.8.0.tgz#33d05ae0915fad1670bd0c4efcc07ccfabebe3b1" + integrity sha512-8U6BEgGjQOfGz3HHTYaC/L1GaxDCJ/KM0XTkJly0EhZ5U/du9uNEZy4ZgYzEzIqlx2CMm25CrCqr1ck899eLNA== dependencies: accepts "~1.3.4" base64id "~2.0.0" cors "~2.8.5" debug "~4.3.2" - engine.io "~6.5.0" + engine.io "~6.6.0" socket.io-adapter "~2.5.2" socket.io-parser "~4.2.4" @@ -1583,12 +1628,11 @@ source-map-js@^1.0.2: resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== -source-map-loader@4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-4.0.1.tgz#72f00d05f5d1f90f80974eda781cbd7107c125f2" - integrity sha512-oqXpzDIByKONVY8g1NUPOTQhe0UTU5bWUl32GSkqK2LjJj0HmwTMVKxcUip0RgAYhY1mqgOxjbQM48a0mmeNfA== +source-map-loader@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-5.0.0.tgz#f593a916e1cc54471cfc8851b905c8a845fc7e38" + integrity sha512-k2Dur7CbSLcAH73sBcIkV5xjPV4SzqO1NJ7+XaQl8if3VODDUj3FNchNGpqgJSKbvUfJuhVdv8K2Eu8/TNl2eA== dependencies: - abab "^2.0.6" iconv-lite "^0.6.3" source-map-js "^1.0.2" @@ -1640,18 +1684,11 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-json-comments@3.1.1: +strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== -supports-color@8.1.1, supports-color@^8.0.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" @@ -1659,6 +1696,13 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" +supports-color@^8.0.0, supports-color@^8.1.1: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" @@ -1669,21 +1713,21 @@ tapable@^2.1.1, tapable@^2.2.0: resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== -terser-webpack-plugin@^5.3.7: - version "5.3.9" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1" - integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA== +terser-webpack-plugin@^5.3.10: + version "5.3.10" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199" + integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w== dependencies: - "@jridgewell/trace-mapping" "^0.3.17" + "@jridgewell/trace-mapping" "^0.3.20" jest-worker "^27.4.5" schema-utils "^3.1.1" serialize-javascript "^6.0.1" - terser "^5.16.8" + terser "^5.26.0" -terser@^5.16.8: - version "5.18.2" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.18.2.tgz#ff3072a0faf21ffd38f99acc9a0ddf7b5f07b948" - integrity sha512-Ah19JS86ypbJzTzvUCX7KOsEIhDaRONungA4aYBjEP3JZRf4ocuDzTg4QWZnPn9DEMiMYGJPiSOy7aykoCc70w== +terser@^5.26.0: + version "5.36.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.36.0.tgz#8b0dbed459ac40ff7b4c9fd5a3a2029de105180e" + integrity sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" @@ -1717,10 +1761,10 @@ type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" -typescript@5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b" - integrity sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw== +typescript@5.5.4: + version "5.5.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba" + integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q== ua-parser-js@^0.7.30: version "0.7.35" @@ -1737,13 +1781,13 @@ unpipe@1.0.0, unpipe@~1.0.0: resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== -update-browserslist-db@^1.0.11: - version "1.0.11" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940" - integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA== +update-browserslist-db@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz#80846fba1d79e82547fb661f8d141e0945755fe5" + integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A== dependencies: - escalade "^3.1.1" - picocolors "^1.0.0" + escalade "^3.2.0" + picocolors "^1.1.0" uri-js@^4.2.2: version "4.4.1" @@ -1767,23 +1811,23 @@ void-elements@^2.0.0: resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung== -watchpack@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" - integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg== +watchpack@^2.4.1: + version "2.4.2" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da" + integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw== dependencies: glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" -webpack-cli@5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.0.tgz#abc4b1f44b50250f2632d8b8b536cfe2f6257891" - integrity sha512-a7KRJnCxejFoDpYTOwzm5o21ZXMaNqtRlvS183XzGDUPRdVEzJNImcQokqYZ8BNTnk9DkKiuWxw75+DCCoZ26w== +webpack-cli@5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b" + integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^2.1.0" - "@webpack-cli/info" "^2.0.1" - "@webpack-cli/serve" "^2.0.3" + "@webpack-cli/configtest" "^2.1.1" + "@webpack-cli/info" "^2.0.2" + "@webpack-cli/serve" "^2.0.5" colorette "^2.0.14" commander "^10.0.1" cross-spawn "^7.0.3" @@ -1814,34 +1858,34 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@5.82.0: - version "5.82.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.82.0.tgz#3c0d074dec79401db026b4ba0fb23d6333f88e7d" - integrity sha512-iGNA2fHhnDcV1bONdUu554eZx+XeldsaeQ8T67H6KKHl2nUSwX8Zm7cmzOA46ox/X1ARxf7Bjv8wQ/HsB5fxBg== +webpack@5.93.0: + version "5.93.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5" + integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA== dependencies: "@types/eslint-scope" "^3.7.3" - "@types/estree" "^1.0.0" - "@webassemblyjs/ast" "^1.11.5" - "@webassemblyjs/wasm-edit" "^1.11.5" - "@webassemblyjs/wasm-parser" "^1.11.5" + "@types/estree" "^1.0.5" + "@webassemblyjs/ast" "^1.12.1" + "@webassemblyjs/wasm-edit" "^1.12.1" + "@webassemblyjs/wasm-parser" "^1.12.1" acorn "^8.7.1" - acorn-import-assertions "^1.7.6" - browserslist "^4.14.5" + acorn-import-attributes "^1.9.5" + browserslist "^4.21.10" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.13.0" + enhanced-resolve "^5.17.0" es-module-lexer "^1.2.1" eslint-scope "5.1.1" events "^3.2.0" glob-to-regexp "^0.4.1" - graceful-fs "^4.2.9" + graceful-fs "^4.2.11" json-parse-even-better-errors "^2.3.1" loader-runner "^4.2.0" mime-types "^2.1.27" neo-async "^2.6.2" - schema-utils "^3.1.2" + schema-utils "^3.2.0" tapable "^2.1.1" - terser-webpack-plugin "^5.3.7" - watchpack "^2.4.0" + terser-webpack-plugin "^5.3.10" + watchpack "^2.4.1" webpack-sources "^3.2.3" which@^1.2.1: @@ -1863,10 +1907,10 @@ wildcard@^2.0.0: resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67" integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ== -workerpool@6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343" - integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== +workerpool@^6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544" + integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA== wrap-ansi@^7.0.0: version "7.0.0" @@ -1887,22 +1931,22 @@ ws@~8.11.0: resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== +ws@~8.17.1: + version "8.17.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b" + integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ== + y18n@^5.0.5: version "5.0.8" resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== -yargs-parser@20.2.4: - version "20.2.4" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== - -yargs-parser@^20.2.2: +yargs-parser@^20.2.2, yargs-parser@^20.2.9: version "20.2.9" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== -yargs-unparser@2.0.0: +yargs-unparser@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA== @@ -1912,7 +1956,7 @@ yargs-unparser@2.0.0: flat "^5.0.2" is-plain-obj "^2.1.0" -yargs@16.2.0, yargs@^16.1.1: +yargs@^16.1.1, yargs@^16.2.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== From 29dec8db03e53d0bb8d2768452f2001df76e1083 Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Thu, 17 Oct 2024 11:07:10 -0400 Subject: [PATCH 7/8] Track WASI changes --- okio-wasifilesystem/build.gradle.kts | 34 +++++++++++++++++++--------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/okio-wasifilesystem/build.gradle.kts b/okio-wasifilesystem/build.gradle.kts index aaf43faa16..5a363c1c2a 100644 --- a/okio-wasifilesystem/build.gradle.kts +++ b/okio-wasifilesystem/build.gradle.kts @@ -79,29 +79,41 @@ val injectWasiInit by tasks.creating { import { WASI } from 'wasi'; import { argv, env } from 'node:process'; - export const wasi = new WASI({ + const wasi = new WASI({ version: 'preview1', + args: argv, preopens: { '/tmp': '$base', '/a': '$baseA', '/b': '$baseB' - } + }, + env, }); - const module = await import(/* webpackIgnore: true */'node:module'); - const require = module.default.createRequire(import.meta.url); - const fs = require('fs'); - const path = require('path'); - const url = require('url'); - const filepath = url.fileURLToPath(import.meta.url); - const dirpath = path.dirname(filepath); - const wasmBuffer = fs.readFileSync(path.resolve(dirpath, './$moduleName.wasm')); + const fs = await import('node:fs'); + const url = await import('node:url'); + const wasmBuffer = fs.readFileSync(url.fileURLToPath(import.meta.resolve('./okio-parent-okio-wasifilesystem-wasm-wasi-test.wasm'))); const wasmModule = new WebAssembly.Module(wasmBuffer); const wasmInstance = new WebAssembly.Instance(wasmModule, wasi.getImportObject()); wasi.initialize(wasmInstance); - export default wasmInstance.exports; + const exports = wasmInstance.exports + + export default new Proxy(exports, { + _shownError: false, + get(target, prop) { + if (!this._shownError) { + this._shownError = true; + throw new Error("Do not use default import. Use the corresponding named import instead.") + } + } + }); + export const { + startUnitTests, + _initialize, + memory + } = exports; """.trimIndent() ) } From eb163c9e5b9f52f8fcf03f97deb37b30cc41e749 Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Thu, 17 Oct 2024 13:24:59 -0400 Subject: [PATCH 8/8] Suppress a lint crash --- android-test/build.gradle.kts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/android-test/build.gradle.kts b/android-test/build.gradle.kts index 725dea7ea9..a0a971a4a5 100644 --- a/android-test/build.gradle.kts +++ b/android-test/build.gradle.kts @@ -1,3 +1,6 @@ +import com.android.build.gradle.internal.lint.AndroidLintAnalysisTask +import com.android.build.gradle.internal.lint.AndroidLintTask + plugins { id("com.android.library") id("org.jetbrains.kotlin.android") @@ -60,6 +63,11 @@ android { } } +// https://issuetracker.google.com/issues/325146674 +tasks.withType { + onlyIf { false } +} + dependencies { coreLibraryDesugaring(libs.android.desugar.jdk.libs) androidTestImplementation(libs.androidx.test.ext.junit)