Skip to content

Introduce wasmJsBrowserDistribution task #5375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Jul 31, 2025
Merged

Introduce wasmJsBrowserDistribution task #5375

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
930e350
Introduce wasmJsBrowserDistribution task
Schahen Jul 24, 2025
38e548f
Extract dedicated logic to Project.introduceComposeWebCompatibilityTask
Schahen Jul 24, 2025
09ecd32
Remove redundant project. accessors
Schahen Jul 24, 2025
0ad0d7c
Don't create task at all if any target is missing
Schahen Jul 24, 2025
7afaf52
Introduce minimal test for composeWebCompatibilityDist
Schahen Jul 24, 2025
7126308
Fix list of files checking - they need to be sorted because this is O…
Schahen Jul 25, 2025
88e7d98
Make composeWebCompatibilityDist lazy
Schahen Jul 28, 2025
b89fc65
Don't rely on target name in Project.registerWebCompatibilityTask
Schahen Jul 28, 2025
0d3f551
Fixes for testFinalArtefacts
Schahen Jul 29, 2025
443ec35
Add description to the task
Schahen Jul 29, 2025
f3b3036
Typo fix
Schahen Jul 29, 2025
616cf52
Change path to the artefact generated to make the clash with standard…
Schahen Jul 29, 2025
2ce4a31
Disable yanrnLock in webJsWasm test
Schahen Jul 29, 2025
8bcf5a8
Revert "Disable yanrnLock in webJsWasm test"
Schahen Jul 29, 2025
b3f48dc
Introduce .yarnc to th e test project
Schahen Jul 29, 2025
30ecac2
refactor
terrakok Jul 30, 2025
41e6aa2
Revert "refactor"
Schahen Jul 31, 2025
d90b3d0
name this task composeCompatibilityBrowserDistribution after all
Schahen Jul 30, 2025
7cb2ded
More tests
Schahen Jul 31, 2025
e133bb2
jsAppFileName and wasmAppRenamed resolved differently
Schahen Jul 31, 2025
14bef86
Minor file writing refactoring
Schahen Jul 31, 2025
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
Prev Previous commit
Next Next commit
Fixes for testFinalArtefacts 
Co-authored-by: Oleksandr Karpovich <[email protected]>
  • Loading branch information
@Schahen @eymar
Schahen and eymar committed Jul 29, 2025
commit 0d3f551c2c33284e4fd74f581b43961b5926aa2c
29 changes: 22 additions & 7 deletions ...e-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/tasks/WebCompatibilityTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package org.jetbrains.compose.web.tasks

import org.gradle.api.DefaultTask
import org.gradle.api.Project
import org.gradle.api.file.ConfigurableFileCollection
import org.gradle.api.file.DirectoryProperty
import org.gradle.api.file.DuplicatesStrategy
import org.gradle.api.file.FileCollection
Expand All @@ -19,6 +20,7 @@ import org.jetbrains.compose.internal.utils.registerTask
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget
import javax.inject.Inject
import kotlin.math.log

abstract class WebCompatibilityTask : DefaultTask() {
@get:Inject
Expand All @@ -28,10 +30,10 @@ abstract class WebCompatibilityTask : DefaultTask() {
abstract val outputDir: DirectoryProperty

@get:InputFiles
lateinit var jsDistFiles: FileCollection
abstract val jsDistFiles: ConfigurableFileCollection

@get:InputFiles
lateinit var wasmDistFiles: FileCollection
abstract val wasmDistFiles: ConfigurableFileCollection

@get:Input
@get:Optional
Expand Down Expand Up @@ -126,23 +128,36 @@ abstract class WebCompatibilityTask : DefaultTask() {

private fun Project.registerWebCompatibilityTask(mppPlugin: KotlinMultiplatformExtension) = registerTask<WebCompatibilityTask>("composeWebCompatibilityDist") {
val webProductionDist = layout.buildDirectory.dir("dist/web/productionExecutable")
outputDir.set(webProductionDist)

mppPlugin.targets.matching { it is KotlinJsIrTarget }.all { target ->
val outputName = when {
(target as KotlinJsIrTarget).wasmTargetType == null -> wasmOutputName
(target as KotlinJsIrTarget).wasmTargetType != null -> wasmOutputName
else -> jsOutputName
}

outputName.set(target.outputModuleName)
}

onlyIf {
jsOutputName.orNull != null && wasmOutputName.orNull != null
val hasBothDistributions = !jsDistFiles.isEmpty && !wasmDistFiles.isEmpty
val hasBothOutputs = jsOutputName.orNull != null && wasmOutputName.orNull != null

if (!hasBothDistributions) {
logger.lifecycle("Task ${this.name} skipped: no js and wasm distributions found, both are required for compatibility")
} else if (!hasBothOutputs) {
logger.lifecycle("Task ${this.name} skipped: no js and wasm output names specified")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add tests for this logic too, please

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can add a log check into one of existed tests for other cases with only one of the web targets

}
hasBothDistributions && hasBothOutputs
}

outputDir.set(webProductionDist)
jsDistFiles = tasks.named("jsBrowserDistribution").get().outputs.files
wasmDistFiles = tasks.named("wasmJsBrowserDistribution").get().outputs.files
jsDistFiles.from(project.provider {
project.tasks.findByName("jsBrowserDistribution")?.outputs?.files ?: project.files()
})

wasmDistFiles.from(project.provider {
project.tasks.findByName("wasmJsBrowserDistribution")?.outputs?.files ?: project.files()
})
}

internal fun Project.configureWebCompatibility() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's add a description what's going here

Expand Down
2 changes: 2 additions & 0 deletions .../compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/GradlePluginTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ class GradlePluginTest : GradlePluginTestBase() {
) {
gradle(":composeApp:composeWebCompatibilityDist").checks {
check.taskSuccessful(":composeApp:composeWebCompatibilityDist")
check.taskSuccessful(":composeApp:jsBrowserDistribution")
check.taskSuccessful(":composeApp:wasmJsBrowserDistribution")

file("./composeApp/build/dist/web/productionExecutable").apply {
checkExists()
Expand Down
Loading