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

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
Remove redundant project. accessors
  • Loading branch information
@Schahen
Schahen committed Jul 24, 2025
commit 09ecd32b53a119339d31bad55278f2e4f52b7817
12 changes: 6 additions & 6 deletions ...ins/compose/src/main/kotlin/org/jetbrains/compose/web/internal/configureWebApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ internal fun Project.configureWeb(
}

private fun Project.introduceComposeWebCompatibilityTask(targets: Collection<KotlinJsIrTarget>) {
Copy link
Member

Choose a reason for hiding this comment

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

There are some gradle plugin tests in the project.

Would you like to add some tests?
For example:

  • a task is created when the condition match and it's not created otherwise
  • Run the task and check the output directory exists. And the output directory contains the must-have files (index.html, .js file, wasm file, etc)

val webProductionDist = project.layout.buildDirectory.dir("dist/web/productionExecutable")
val webProductionDist = layout.buildDirectory.dir("dist/web/productionExecutable")

val jsAppRenamed = "__jsApp.js"
val wasmAppRenamed = "__wasmApp.js"

project.registerTask<Copy>("composeWebCompatibilityDist") {
registerTask<Copy>("composeWebCompatibilityDist") {
val jsTarget = targets.firstOrNull { it.name == "js" }?.outputModuleName
val wasmTarget = targets.firstOrNull { it.name == "wasmJs" }?.outputModuleName

Expand All @@ -74,10 +74,10 @@ private fun Project.introduceComposeWebCompatibilityTask(targets: Collection<Kot
}

into(webProductionDist)
with(project.copySpec { spec ->
with(copySpec { spec ->
val jsTarget = targets.firstOrNull { it.name == "js" }?.outputModuleName
spec.apply {
from( project.tasks.named("jsBrowserDistribution")) {
from( tasks.named("jsBrowserDistribution")) {
rename { name ->
val moduleName = jsTarget?.get()
when (name) {
Expand All @@ -88,10 +88,10 @@ private fun Project.introduceComposeWebCompatibilityTask(targets: Collection<Kot
}
}
}
}, project.copySpec { spec ->
}, copySpec { spec ->
val wasmTarget = targets.firstOrNull { it.name == "wasmJs" }?.outputModuleName
spec.apply {
from( project.tasks.named("wasmJsBrowserDistribution")) {
from( tasks.named("wasmJsBrowserDistribution")) {
rename { name ->
val moduleName = wasmTarget?.get()
when (name) {
Expand Down