Introduce wasmJsBrowserDistribution task #5375

Schahen · 2025-07-24T08:20:51Z

Testing

Clone https://github.com/Schahen/ComposeWebApp and run

 ./gradlew  :composeApp: composeCompatibilityBrowserDistribution

Release Notes

Features - Web

Introduce composeCompatibilityBrowserDistribution task. This task combines two prod distributions - for js and for wasm in such way so that if modern required features are not supported by the consumer browser, application switch to js mode.

...lugins/compose/src/main/kotlin/org/jetbrains/compose/web/internal/configureWebApplication.kt

igordmn · 2025-07-24T10:15:32Z

Just in case, if it is not already planned, please, fix the PR description before merging (better also before review, if not agreed beforehand):

Describe the changes
Release notes should describe a user-faced change, otherwise it is N/A

Unfortunately, without contracts onlyIf is not enough

eymar · 2025-07-24T13:11:53Z

...lugins/compose/src/main/kotlin/org/jetbrains/compose/web/internal/configureWebApplication.kt

+        val jsTargetModuleName = jsDistTask.outputModuleName
+        val wasmTargetModuleName = wasmDistTask.outputModuleName


Do both outputModuleName have some default value when a user doesn't explicitly specify it in the DSL?

When would this be false?

onlyIf { jsTargetModuleName != null && wasmTargetModuleName != null }

eymar · 2025-07-24T13:13:48Z

...lugins/compose/src/main/kotlin/org/jetbrains/compose/web/internal/configureWebApplication.kt

    }
 }

+private fun Project.introduceComposeWebCompatibilityTask(targets: Collection<KotlinJsIrTarget>) {


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)

...ins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/GradlePluginTest.kt

...lugins/compose/src/main/kotlin/org/jetbrains/compose/web/internal/configureWebApplication.kt

…S-specific

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/tasks/WebCompatibilityTask.kt

Co-authored-by: Oleksandr Karpovich <[email protected]>

terrakok

let's add a test with a custom target name wasmJs("myStrangeTarget")

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/tasks/WebCompatibilityTask.kt

terrakok · 2025-07-29T09:19:13Z

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/tasks/WebCompatibilityTask.kt

+    wasmDistFiles = tasks.named("wasmJsBrowserDistribution").get().outputs.files
+}
+
+internal fun Project.configureWebCompatibility() {


let's add a description what's going here

...ins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/GradlePluginTest.kt

terrakok · 2025-07-29T11:15:33Z

gradle-plugins/compose/src/test/test-projects/application/webJsWasm/composeApp/build.gradle.kts

+}
+
+kotlin {
+    js(IR) {


As I know, we already don't need IR here

terrakok · 2025-07-29T11:16:49Z

gradle-plugins/compose/src/test/test-projects/application/webJsWasm/composeApp/build.gradle.kts

+
+kotlin {
+    js(IR) {
+        outputModuleName.set("composeApp")


If we want to test a custom name here, then you need a different name, because "composeApp" is a name of the module already

terrakok · 2025-07-29T11:17:19Z

gradle-plugins/compose/src/test/test-projects/application/webJsWasm/composeApp/build.gradle.kts

+
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        outputModuleName.set("composeApp")


what will happen if there is a different name?

...ins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/GradlePluginTest.kt

…/frequent configurations less possible

harrytmthy · 2025-07-29T14:45:24Z

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/tasks/WebCompatibilityTask.kt

+
+            copySpec.from(jsDistFiles) {
+                copySpec.rename { name ->
+                    val moduleName = jsOutputName.get()


NIT: Since jsOutputName and wasmOutputName are annotated with @Optional, calling .get() directly could throw an IllegalStateException if they're unset.

Would it make sense to either:

Use orNull ?: return@rename name here, or

Remove @Optional if these properties are guaranteed to be set by the time the task runs?

This keeps the annotation and implementation consistent 🙂

the task is not expected to run when either of them is not set. There is onlyIf { ... } checking it.

So yes, they seem to be not Optional

Exactly, that was my point. Since the properties aren't actually optional, removing @Optional would make it clearer 👍

This reverts commit 2ce4a31.

This reverts commit 30ecac2.

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/tasks/WebCompatibilityTask.kt

terrakok · 2025-07-30T14:35:20Z

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/tasks/WebCompatibilityTask.kt

+        outputDir.file("${jsOutputName.get()}.js").get().asFile.writeText(
+            fallbackResolverCode
+        )
+
+        outputDir.file("${wasmOutputName.get()}.js").get().asFile.writeText(
+            fallbackResolverCode
+        )


val outputDir = outputDir.get().asFile File(outputDir, jsAppFileName).writeText(fallbackResolverCode) File(outputDir, wasmAppFileName).writeText(fallbackResolverCode)

...ins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/GradlePluginTest.kt

terrakok · 2025-07-30T14:43:00Z

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/tasks/WebCompatibilityTask.kt

+        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")


add tests for this logic too, please

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

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/tasks/WebCompatibilityTask.kt

## Testing Clone https://github.com/Schahen/ComposeWebApp and run ``` ./gradlew :composeApp: composeCompatibilityBrowserDistribution ``` ## Release Notes ### Features - Web - Introduce composeCompatibilityBrowserDistribution task. This task combines two prod distributions - for js and for wasm in such way so that if modern require features are not supported by the consumer browser, application switch to js mode. --------- Co-authored-by: Oleksandr Karpovich <[email protected]> Co-authored-by: Konstantin Tskhovrebov <[email protected]>

Introduce wasmJsBrowserDistribution task

930e350

Schahen requested review from eymar and terrakok July 24, 2025 08:20

eymar reviewed Jul 24, 2025

View reviewed changes

...lugins/compose/src/main/kotlin/org/jetbrains/compose/web/internal/configureWebApplication.kt Outdated Show resolved Hide resolved

eymar reviewed Jul 24, 2025

View reviewed changes

...lugins/compose/src/main/kotlin/org/jetbrains/compose/web/internal/configureWebApplication.kt Outdated Show resolved Hide resolved

Schahen added 3 commits July 24, 2025 12:58

Extract dedicated logic to Project.introduceComposeWebCompatibilityTask

38e548f

Remove redundant project. accessors

09ecd32

Don't create task at all if any target is missing

0ad0d7c

Unfortunately, without contracts onlyIf is not enough

eymar reviewed Jul 24, 2025

View reviewed changes

Introduce minimal test for composeWebCompatibilityDist

7afaf52

eymar reviewed Jul 24, 2025

View reviewed changes

...ins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/GradlePluginTest.kt Outdated Show resolved Hide resolved

eymar reviewed Jul 24, 2025

View reviewed changes

...ins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/GradlePluginTest.kt Outdated Show resolved Hide resolved

terrakok requested changes Jul 24, 2025

View reviewed changes

Schahen added 3 commits July 25, 2025 16:30

Fix list of files checking - they need to be sorted because this is O…

7126308

…S-specific

Make composeWebCompatibilityDist lazy

88e7d98

Don't rely on target name in Project.registerWebCompatibilityTask

b89fc65

eymar reviewed Jul 29, 2025

View reviewed changes

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/tasks/WebCompatibilityTask.kt Outdated Show resolved Hide resolved

eymar reviewed Jul 29, 2025

View reviewed changes

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/tasks/WebCompatibilityTask.kt Outdated Show resolved Hide resolved

Schahen and others added 3 commits July 29, 2025 13:04

Fixes for testFinalArtefacts

0d3f551

Co-authored-by: Oleksandr Karpovich <[email protected]>

Add description to the task

443ec35

Typo fix

f3b3036

terrakok requested changes Jul 29, 2025

View reviewed changes

Change path to the artefact generated to make the clash with standard…

616cf52

…/frequent configurations less possible

harrytmthy reviewed Jul 29, 2025

View reviewed changes

Schahen and others added 4 commits July 29, 2025 17:01

Disable yanrnLock in webJsWasm test

2ce4a31

Revert "Disable yanrnLock in webJsWasm test"

8bcf5a8

This reverts commit 2ce4a31.

Introduce .yarnc to th e test project

b3f48dc

refactor

30ecac2

Schahen added 3 commits July 31, 2025 09:11

Revert "refactor"

41e6aa2

This reverts commit 30ecac2.

name this task composeCompatibilityBrowserDistribution after all

d90b3d0

More tests

7cb2ded

terrakok approved these changes Jul 31, 2025

View reviewed changes

Schahen added 2 commits July 31, 2025 12:46

jsAppFileName and wasmAppRenamed resolved differently

e133bb2

Minor file writing refactoring

14bef86

Schahen merged commit 64200ba into master Jul 31, 2025
15 checks passed

Schahen deleted the sh/introduce_web_dist_task branch July 31, 2025 11:52

		val jsTargetModuleName = jsDistTask.outputModuleName
		val wasmTargetModuleName = wasmDistTask.outputModuleName

Introduce wasmJsBrowserDistribution task #5375

Introduce wasmJsBrowserDistribution task #5375

Uh oh!

Conversation

Schahen commented Jul 24, 2025 • edited by igordmn Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Testing

Release Notes

Features - Web

Uh oh!

Uh oh!

Uh oh!

igordmn commented Jul 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

eymar Jul 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

terrakok left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

eymar Jul 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Schahen commented Jul 24, 2025 •

edited by igordmn

Loading

igordmn commented Jul 24, 2025 •

edited

Loading

eymar Jul 24, 2025 •

edited

Loading

eymar Jul 29, 2025 •

edited

Loading