Skip to content
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,022 changes: 1,027 additions & 995 deletions Cargo.lock

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ minify-html = { version = "0.15.0" }
minify-html-onepass = { version = "0.15.0" }
miette = { version = "7.5.0", features = ["fancy"] }
mimalloc = { version = "0.1.43" }
orogene = { git = "https://github.com/elide-dev/orogene", rev = "1122f0884f8c6e726ac36dbd926a5102ce2fa950", default-features = false, features = [
# orogene = { path = "../orogene", default-features = false, features = ["mimalloc"] }
orogene = { git = "https://github.com/elide-dev/orogene", rev = "020b9752f360c68b75ab1ffd28e746a3df3efb5b", default-features = false, features = [
"mimalloc",
] }
image = { version = "0.25.6", default-features = false, features = [
Expand All @@ -133,7 +134,7 @@ rustix = { version = "1.0.2", features = ["process"] }
serde = { version = "1.0.218", default-features = false }
parcel_sourcemap = { version = "2.1.1" }
sourcemap = { version = "9.2.2" }
sysinfo = { version = "0.36.0" }
sysinfo = { version = "0.37.0" }
once_cell = { version = "1.21.3" }
markdown = { version = "1.0.0" }
mdxjs = { version = "1.0.4" }
Expand Down Expand Up @@ -164,7 +165,7 @@ toml = { version = "0.8.20", default-features = false }
typeshare = { version = "1.0.4" }

## Oxc
oxc = { git = "https://github.com/elide-dev/oxc", rev = "42c8f29ab27dae5163d03062a118757dcd7f56e4", default-features = false, features = [
oxc = { git = "https://github.com/elide-dev/oxc", rev = "6fcb0d05c6c78043f57b9f5b3183519cd195832d", default-features = false, features = [
"full",
"isolated_declarations",
"mangler",
Expand Down
6 changes: 5 additions & 1 deletion crates/web/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ repository = { workspace = true }
authors = { workspace = true }
license = { workspace = true }

[features]
default = []
mdx = ["dep:mdxjs"]

[lib]
crate-type = ["lib", "staticlib", "cdylib"]

Expand All @@ -38,7 +42,7 @@ minify-html = { workspace = true }
# sourcemap = { workspace = true }
grass = { workspace = true }
# oxvg = { workspace = true }
mdxjs = { workspace = true }
mdxjs = { workspace = true, optional = true }
markdown = { workspace = true }
browserslist-rs = { workspace = true }
media = { workspace = true }
8 changes: 8 additions & 0 deletions crates/web/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ fn dispatch_css_error(mut env: JNIEnv, cls: JClass, message: String) {
}

/// Dispatch a MDX processing error to the Java side.
#[cfg(feature = "mdx")]
fn dispatch_mdx_error(mut env: JNIEnv, cls: JClass, message: String) {
let jstring_err = env
.new_string(message)
Expand Down Expand Up @@ -177,6 +178,7 @@ pub fn buildCss<'a>(
}

/// JNI entrypoint function to parse and then build MDX code for a given source file.
#[cfg(feature = "mdx")]
#[jni("elide.tooling.web.mdx.MdxNative")]
pub fn buildMdx<'a>(mut env: JNIEnv<'a>, cls: JClass<'a>, jmdx: JString<'a>) -> JObject<'a> {
let binding = env.get_string(&jmdx).expect("failed to obtain MDX string");
Expand All @@ -195,6 +197,12 @@ pub fn buildMdx<'a>(mut env: JNIEnv<'a>, cls: JClass<'a>, jmdx: JString<'a>) ->
}
}

#[cfg(not(feature = "mdx"))]
#[jni("elide.tooling.web.mdx.MdxNative")]
pub fn buildMdx<'a>(_env: JNIEnv<'a>, _cls: JClass<'a>, _jmdx: JString<'a>) -> JObject<'a> {
JObject::null()
}

/// JNI entrypoint for performing minification of HTML code, using the `minify-html` crate.
#[jni("in.wilsonl.minifyhtml.MinifyHtml")]
pub fn minify<'a>(
Expand Down
4 changes: 4 additions & 0 deletions crates/web/src/md.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,14 @@
* License for the specific language governing permissions and limitations under the License.
*/

#[cfg(feature = "mdx")]
use markdown::message::Message;

#[cfg(feature = "mdx")]
use mdxjs::compile;

/// Compile MDX-formatted files into JavaScript via SWC and MDX.
#[cfg(feature = "mdx")]
pub fn compile_mdx(src: String) -> Result<String, Message> {
compile(src.as_str(), &Default::default())
}
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ versions.java.language = 21
versions.java.toolchain = 24
versions.java.minimum = 21
versions.java.target = 21
versions.kotlin.sdk = 2.2.0
versions.kotlin.sdk = 2.2.20
versions.kotlin.language = 2.1
versions.android.sdk.target = 33

# Settings: Libraries
micronautCatalogVersion = 4.5.4
micronautVersion = 4.9.2
micronautVersion = 4.9.3

# Settings: Kotlin
kotlin.code.style = official
Expand Down
46 changes: 23 additions & 23 deletions gradle/elide.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@
aedile = "2.0.3"
apiguardian = "1.1.2"
arrow = "2.0.1"
asciidoctor = "4.0.4"
asciidoctor = "4.0.5"
asm = "9.8"
assertk = "0.28.1"
atomicfu = "0.29.0"
auto-common = "1.2.2"
auto-factory = "1.1.0"
auto-service = "1.1.1"
auto-value = "1.11.0"
aws-sdk = "2.31.74"
bouncycastle = "1.81"
aws-sdk = "2.34.0"
bouncycastle = "1.82"
brotli = "0.1.2"
brotli4j = "1.18.0"
brotli4j = "1.20.0"
buf = "1.28.1"
buildTimeTracker = "4.3.0"
buildconfig-plugin = "5.6.7"
buildconfig-plugin = "5.6.8"
byteunits = "0.9.1"
caffeine = "3.2.0"
capnproto = "0.1.18-elide"
Expand Down Expand Up @@ -71,7 +71,7 @@ google-api-common = "2.43.0"
google-html-types = "1.0.8"
gr8 = "0.11.2"
graalvm = "24.2.2"
graalvm-metadata = "0.3.23"
graalvm-metadata = "0.3.26"
graalvm-pin = "24.2.2"
graalvm-plugin = "0.11.0"
graalvm-stable = "24.2.2"
Expand All @@ -82,7 +82,7 @@ gradleTestRetry = "1.6.2"
grpc-java = "1.62.2"
grpc-kotlin = "1.4.1"
grpc-web = "1.4.2"
guava = "33.4.8-jre"
guava = "33.5.0-jre"
h2 = "2.3.232"
hamcrest-core = "2.2"
hamcrest-junit = "2.0.0.0"
Expand All @@ -95,7 +95,7 @@ intellij-target-ide = "2025.1"
intellij-sinceBuild = "251"
inquirer = "0.1.0"
j4rs = "0.22.0"
jackson = "2.19.2"
jackson = "2.20.0"
jacoco = "0.8.13"
jakarta = "2.0.1"
jakarta-annotation-api = "2.1.1"
Expand All @@ -106,7 +106,7 @@ javax-annotations = "1.3.2"
javax-inject = "1"
javax-persistence = "2.2"
jdoctor = "0.1.2"
jetbrains-annotations = "26.0.2"
jetbrains-annotations = "26.0.2-1"
jetty-alpn = "1.1.3.v20160715"
jetty-npn = "8.1.2.v20120308"
jgit = "7.3.0.202506031305-r"
Expand Down Expand Up @@ -136,7 +136,7 @@ kotest-plugin = "0.8.18"
kotlin-compile-testing = "1.6.0"
kotlin-dataframe = "0.11.0"
kotlin-language = "2.1"
kotlin-sdk = "2.2.0"
kotlin-sdk = "2.2.20"
kotlinpoet = "2.2.0"
kotlinx-abiValidator = "0.17.0"
kotlinx-benchmark = "0.4.13"
Expand All @@ -154,7 +154,7 @@ kotlinx-serialization = "1.9.0"
kotlinx-wrappers-bom = "1.0.0-pre.754"
kotlinx-wrappers-browser = "1.0.0-pre.754"
kotlinx-wrappers-cesium = "1.114.0-pre.754"
kotlinx-wrappers-css = "2025.8.1"
kotlinx-wrappers-css = "2025.9.8"
kotlinx-wrappers-csstype = "3.1.4-pre.754"
kotlinx-wrappers-emotion = "11.11.4-pre.754"
kotlinx-wrappers-history = "5.3.0-pre.506-compat"
Expand Down Expand Up @@ -187,27 +187,27 @@ kotlinx-wrappers-web = "1.0.0-pre.754"
kotlinxWrappers = "pre.754"
kover = "0.9.1"
kover-plugin = "0.9.1"
ksp = "2.2.0-2.0.2"
ktor = "3.2.3"
ksp = "2.2.20-2.0.3"
ktor = "3.3.0"
ktlint = "1.1.1"
ktoml = "0.7.0"
ktoml = "0.7.1"
larray = "0.2.1"
lettuce = "6.2.5.RELEASE"
lmaxDisruptor = "4.0.0"
lmaxDisruptorProxy = "3.1.1"
locals3 = "1.25"
locals3 = "1.27"
logback = "1.5.18"
lz4 = "1.3.0"
markdown = "0.7.3"
magicProgress = "0.3.2"
maven-core = "3.9.9"
maven-lib = "1.9.22"
maven-wagon = "3.5.3"
mcp = "0.6.0"
mcp = "0.7.2"
mermaidDokka = "0.6.0"
micronaut = "4.9.8"
micronaut = "4.9.11"
micronaut-aot = "2.8.1"
micronaut-lib = "4.9.2"
micronaut-lib = "4.9.3"
micronaut-liquibase = "5.4.1"
micronaut-plugin = "4.5.4"
micronaut-xml = "3.1.0"
Expand All @@ -218,10 +218,10 @@ mordant = "3.0.2"
mosaic = "0.16.0"
mrjar = "0.1.1"
msgpack = "0.9.4"
netty = "4.2.3.Final"
netty = "4.2.6.Final"
netty-http3 = "0.0.70.Final"
netty-iouring = "0.0.26.Final"
netty-tcnative = "2.0.72.Final"
netty-tcnative = "2.0.73.Final"
nexusPublishing = "2.0.0"
node = "23.3.0"
node-plugin = "7.0.2"
Expand All @@ -239,7 +239,7 @@ openrewrite-lib = "8.1.13"
openrewrite-plugin = "6.12.0"
opentest = "1.3.0"
oshi = "6.6.1"
owasp = "12.1.3"
owasp = "12.1.5"
parallelGzip = "1.0.5"
picnic = "0.7.0"
picocli = "4.7.7"
Expand All @@ -259,13 +259,13 @@ qodanaGradle = "2023.3.1"
r8 = "1.4.45"
react = "19.0.0"
reactivestreams = "1.0.4"
redacted-plugin = "1.14.1"
redacted-plugin = "1.15.0"
sarif4k = "0.6.0"
semver = "6.0.0"
shadow-plugin = "8.1.1"
sigstore = "1.3.0"
slf4j = "2.0.16"
snakeyaml-core = "2.4"
snakeyaml-core = "2.5"
snakeyaml-engine = "2.10"
snappy = "1.1.10.7"
snyk = "0.6.1"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,7 @@ public val kotlinc: Tool.CommandLineTool = Tool.describe(
Logging.root().debug { "Kotlin compiler plugins loaded: $it" }
Services.Builder().apply {
it.forEach { svc ->
@Suppress("UNCHECKED_CAST")
register(svc::class.java as Class<Any>, svc)
}
}.build().let { services ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class MdxBuilderTest {
assertNotNull(MarkdownOptions.defaults())
}

@Ignore
@Test fun testRenderMdx() = runTest {
Markdown.renderMarkdown(style = MarkdownFlavor.Mdx) {
MarkdownSourceLiteral {
Expand Down
5 changes: 1 addition & 4 deletions packages/cli/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -457,10 +457,7 @@ dependencies {
ksp(mn.micronaut.inject.kotlin)
classpathExtras(mn.micronaut.core.processor)

// fix for elide-dev/elide#1503
api(mn.micronaut.http.netty) {
version { strictly("4.8.18") }
}
api(mn.micronaut.http.netty)
api(libs.clikt)
api(libs.picocli)
api(libs.guava)
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/projects/kterr-gradle/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
kotlin("jvm") version "2.2.0-RC3"
kotlin("jvm") version "2.2.20"
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>().configureEach {
Expand All @@ -8,6 +8,6 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>().configureEa

dependencies {
implementation("com.google.guava:guava:33.4.8-jre")
testImplementation("org.jetbrains.kotlin:kotlin-test:2.2.0-RC3")
testImplementation("org.jetbrains.kotlin:kotlin-test:2.2.20")
}

4 changes: 2 additions & 2 deletions packages/cli/src/projects/ktjvm-gradle/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
kotlin("jvm") version "2.2.0-RC3"
kotlin("jvm") version "2.2.20"
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>().configureEach {
Expand All @@ -8,6 +8,6 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>().configureEa

dependencies {
implementation("com.google.guava:guava:33.4.8-jre")
testImplementation("org.jetbrains.kotlin:kotlin-test:2.2.0-RC3")
testImplementation("org.jetbrains.kotlin:kotlin-test:2.2.20")
}

Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import elide.runtime.gvm.kotlin.feature.KotlinResource
private const val KOTLIN_ID = "kotlin"
private const val KOTLIN_NAME = "Kotlin"
private const val KOTLIN_IMPL = "Kotlin/JVM (Espresso)"
private const val KOTLIN_IMPL_VERSION = "2.2.0"
private const val KOTLIN_IMPL_VERSION = "2.2.20"
private const val KOTLIN_MIME_TYPE = "application/x-kotlin"

/**
Expand Down
Loading
Loading