diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt
index 9c09450543a..8af7d3e95a9 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.gradle.targets.js.JsAggregatingExecutionSource
 import org.jetbrains.kotlin.gradle.targets.js.KotlinJsProducingType
 import org.jetbrains.kotlin.gradle.targets.js.KotlinJsReportAggregatingTestRun
 import org.jetbrains.kotlin.gradle.targets.js.dsl.*
+import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
 import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName
 import javax.inject.Inject
 
@@ -129,11 +130,24 @@ constructor(
 
     fun useCommonJs() {
         compilations.all {
-            it.compileKotlinTask.kotlinOptions {
-                moduleKind = "commonjs"
-                sourceMap = true
-                sourceMapEmbedSources = null
+            it.compileKotlinTask.configureCommonJsOptions()
+
+            listOf(
+                it.productionLinkTask,
+                it.developmentLinkTask
+            ).forEach {
+                it.configure { linkTask ->
+                    linkTask.configureCommonJsOptions()
+                }
             }
         }
     }
+
+    private fun Kotlin2JsCompile.configureCommonJsOptions() {
+        kotlinOptions {
+            moduleKind = "commonjs"
+            sourceMap = true
+            sourceMapEmbedSources = null
+        }
+    }
 }
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt
index 70c13504863..52070b7bb1e 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt
@@ -72,6 +72,15 @@ open class KotlinJsIrTargetConfigurator(kotlinPluginVersion: String) :
                     PRODUCE_UNZIPPED_KLIB
                 )
             }
+
+            listOf(
+                it.productionLinkTask,
+                it.developmentLinkTask
+            ).forEach {
+                it.configure { linkTask ->
+                    linkTask.kotlinOptions.configureOptions()
+                }
+            }
         }
     }