From a4c75338f39f1ef4d1c23af6dd78fc9a5c689795 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Wed, 28 Jun 2023 05:47:06 +0200
Subject: [PATCH] [stdlib-mpp] js artifacts for dist

KT-56106
---
 libraries/stdlib/build.gradle.kts | 18 +++++++++++++++++-
 prepare/compiler/build.gradle.kts |  7 ++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/libraries/stdlib/build.gradle.kts b/libraries/stdlib/build.gradle.kts
index 87135e8943d..15386d2c323 100644
--- a/libraries/stdlib/build.gradle.kts
+++ b/libraries/stdlib/build.gradle.kts
@@ -18,7 +18,6 @@ plugins {
 
 
 // TODO: JS
-//   - ensure dist content
 //   - ensure npm publishing
 
 configureJvmToolchain(JdkMajorVersion.JDK_1_8)
@@ -671,6 +670,23 @@ tasks {
         }
     }
 
+    artifacts {
+        val distJsJar = configurations.create("distJsJar")
+        val distJsSourcesJar = configurations.create("distJsSourcesJar")
+        val distJsContent = configurations.create("distJsContent")
+        val distJsKlib = configurations.create("distJsKlib")
+
+        add(distJsJar.name, jsResultingJar)
+        add(distJsSourcesJar.name, jsSourcesJar)
+        add(distJsKlib.name, jsJar)
+        mergeJsV1.get().outputs.files.forEach { artifact ->
+            add(distJsContent.name, artifact) {
+                builtBy(mergeJsV1)
+            }
+        }
+    }
+
+
     val jvmTest by existing(Test::class)
 
     listOf(JdkMajorVersion.JDK_9_0, JdkMajorVersion.JDK_10_0, JdkMajorVersion.JDK_11_0).forEach { jvmVersion ->
diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts
index d0c71d03058..00c2ede15f0 100644
--- a/prepare/compiler/build.gradle.kts
+++ b/prepare/compiler/build.gradle.kts
@@ -167,7 +167,8 @@ dependencies {
 
     libraries(kotlinStdlib("jdk8"))
     if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
-        libraries(kotlinStdlib("js", "distLibrary"))
+        libraries(kotlinStdlib(classifier = "distJsJar"))
+        libraries(kotlinStdlib(classifier = "distJsKlib"))
         libraries(project(":kotlin-test:kotlin-test-js", configuration = "distLibrary"))
     }
 
@@ -204,13 +205,13 @@ dependencies {
         sources("org.jetbrains.kotlin:kotlin-reflect:$bootstrapKotlinVersion:sources")
     } else {
         sources(project(":kotlin-stdlib", configuration = "distSources"))
-        sources(project(":kotlin-stdlib-js", configuration = "distSources"))
+        sources(project(":kotlin-stdlib", configuration = "distJsSourcesJar"))
         sources(project(":kotlin-reflect", configuration = "sources"))
         sources(project(":kotlin-test", "combinedJvmSourcesJar"))
 
         distStdlibMinimalForTests(project(":kotlin-stdlib-jvm-minimal-for-test"))
 
-        distJSContents(project(":kotlin-stdlib-js", configuration = "distJs"))
+        distJSContents(project(":kotlin-stdlib", configuration = "distJsContent"))
         distJSContents(project(":kotlin-test:kotlin-test-js", configuration = "distJs"))
     }