Adopt Kotlin/JS for 1.4-M2 (Kotlin#2060)

* Prepare for 1.4-M2 Kotlin/JS
* Compatibility with 1.3.70
* Fix check for irTarget

Author: ilgonmic

gradle/compile-js-multiplatform.gradle

@@ -5,15 +5,22 @@
 apply from: rootProject.file('gradle/node-js.gradle')
 
 kotlin {
-    targets {
-        fromPreset(presets.js, 'js') {
-            // Enable built-in test runner only for IR target.
-            // These runners don't support changing js module name change.
-            if (js.hasProperty("irTarget") && irTarget != null) {
-                irTarget.nodejs()
-                irTarget.compilations['main']?.dependencies {
-                    api "org.jetbrains.kotlinx:atomicfu-js:$atomicfu_version"
-                }
+    js {
+        // In 1.3.7x js() has not member `moduleName`
+        // In 1.4.x it has and allow to safety set compiler output file name and does not break test integration
+        if (it.hasProperty("moduleName")) {
+            moduleName = project.name
+        }
+
+        // In 1.3.7x js() has not member `irTarget`
+        // In 1.4.x it has in `both` and `legacy` mode and js() is of type `KotlinJsTarget`
+        // `irTarget` is non-null in `both` mode
+        // and contains appropriate `irTarget` with type `KotlinJsIrTarget`
+        // `irTarget` is null in `legacy` mode
+        if (it.hasProperty("irTarget") && it.irTarget != null) {
+            irTarget.nodejs()
+            irTarget.compilations['main']?.dependencies {
+                api "org.jetbrains.kotlinx:atomicfu-js:$atomicfu_version"
             }
         }
     }
@@ -32,7 +39,15 @@ kotlin {
 // When source sets are configured
 apply from: rootProject.file('gradle/test-mocha-js.gradle')
 
-compileKotlinJs {
+def compileJsLegacy = tasks.hasProperty("compileKotlinJsLegacy")
+        ? compileKotlinJsLegacy
+        : compileKotlinJs
+
+def compileTestJsLegacy = tasks.hasProperty("compileTestKotlinJsLegacy")
+        ? compileTestKotlinJsLegacy
+        : compileTestKotlinJs
+
+compileJsLegacy.configure {
     kotlinOptions.metaInfo = true
     kotlinOptions.sourceMap = true
     kotlinOptions.moduleKind = 'umd'
@@ -44,20 +59,20 @@ compileKotlinJs {
     }
 }
 
-compileTestKotlinJs {
+compileTestJsLegacy.configure {
     kotlinOptions.metaInfo = true
     kotlinOptions.sourceMap = true
     kotlinOptions.moduleKind = 'umd'
 }
 
 
-task populateNodeModules(type: Copy, dependsOn: compileTestKotlinJs) {
+task populateNodeModules(type: Copy, dependsOn: compileTestJsLegacy) {
     // we must copy output that is transformed by atomicfu
-    from(kotlin.targets.js.compilations.main.output.allOutputs)
+    from(kotlin.js().compilations.main.output.allOutputs)
     into "$node.nodeModulesDir/node_modules"
 
-    def configuration = configurations.hasProperty("legacyjsTestRuntimeClasspath")
-            ? configurations.legacyjsTestRuntimeClasspath
+    def configuration = configurations.hasProperty("jsLegacyTestRuntimeClasspath")
+            ? configurations.jsLegacyTestRuntimeClasspath
             : configurations.jsTestRuntimeClasspath
 
     from(files {

gradle/publish-npm-js.gradle

@@ -20,6 +20,10 @@ def npmDeployDir = file("$buildDir/npm")
 def authToken = prop("kotlin.npmjs.auth.token", "")
 def dryRun = prop("dryRun", "false")
 
+def jsLegacy = kotlin.targets.hasProperty("jsLegacy")
+        ? kotlin.targets.jsLegacy
+        : kotlin.targets.js
+
 // Note: publish transformed files using dependency on sourceSets.main.output
 task preparePublishNpm(type: Copy) {
     from(npmTemplateDir) {
@@ -30,7 +34,7 @@ task preparePublishNpm(type: Copy) {
         }
     }
     // we must publish output that is transformed by atomicfu
-    from(kotlin.targets.js.compilations.main.output.allOutputs)
+    from(jsLegacy.compilations.main.output.allOutputs)
     into npmDeployDir
 }
 

gradle/test-mocha-js.gradle

@@ -12,16 +12,24 @@ task installDependenciesMochaNode(type: NpmTask, dependsOn: [npmInstall]) {
     if (project.hasProperty("teamcity")) args += ["mocha-teamcity-reporter@$mocha_teamcity_reporter_version"]
 }
 
+def compileJsLegacy = tasks.hasProperty("compileKotlinJsLegacy")
+        ? compileKotlinJsLegacy
+        : compileKotlinJs
+
+def compileTestJsLegacy = tasks.hasProperty("compileTestKotlinJsLegacy")
+        ? compileTestKotlinJsLegacy
+        : compileTestKotlinJs
+
 // todo: use atomicfu-transformed test files here (not critical)
-task testMochaNode(type: NodeTask, dependsOn: [compileTestKotlinJs, installDependenciesMochaNode]) {
+task testMochaNode(type: NodeTask, dependsOn: [compileTestJsLegacy, installDependenciesMochaNode]) {
     script = file("$node.nodeModulesDir/node_modules/mocha/bin/mocha")
-    args = [compileTestKotlinJs.outputFile, '--require', 'source-map-support/register']
+    args = [compileTestJsLegacy.outputFile, '--require', 'source-map-support/register']
     if (project.hasProperty("teamcity")) args += ['--reporter', 'mocha-teamcity-reporter']
 }
 
-def legacyjsTestTask = project.tasks.findByName('legacyjsTest') ? legacyjsTest : jsTest
+def jsLegacyTestTask = project.tasks.findByName('jsLegacyTest') ? jsLegacyTest : jsTest
 
-legacyjsTestTask.dependsOn testMochaNode
+jsLegacyTestTask.dependsOn testMochaNode
 
 // -- Testing with Mocha under headless Chrome
 
@@ -38,7 +46,7 @@ task installDependenciesMochaChrome(type: NpmTask, dependsOn: [npmInstall]) {
 
 def mochaChromeTestPage = file("$buildDir/test-page.html")
 
-task prepareMochaChrome(dependsOn: [compileTestKotlinJs, installDependenciesMochaChrome]) {
+task prepareMochaChrome(dependsOn: [compileTestJsLegacy, installDependenciesMochaChrome]) {
     outputs.file(mochaChromeTestPage)
 }
 
@@ -56,8 +64,8 @@ prepareMochaChrome.doLast {
         <script>mocha.setup('bdd');</script>
         <script src="$node.nodeModulesDir/node_modules/kotlin/kotlin.js"></script>
         <script src="$node.nodeModulesDir/node_modules/kotlin-test/kotlin-test.js"></script>
-        <script src="$compileKotlinJs.outputFile"></script>
-        <script src="$compileTestKotlinJs.outputFile"></script>
+        <script src="$compileJsLegacy.outputFile"></script>
+        <script src="$compileTestJsLegacy.outputFile"></script>
         <script>mocha.run();</script>
         </body>
         </html>
@@ -66,7 +74,7 @@ prepareMochaChrome.doLast {
 
 task testMochaChrome(type: NodeTask, dependsOn: prepareMochaChrome) {
     script = file("$node.nodeModulesDir/node_modules/mocha-headless-chrome/bin/start")
-    args = [compileTestKotlinJs.outputFile, '--file', mochaChromeTestPage]
+    args = [compileTestJsLegacy.outputFile, '--file', mochaChromeTestPage]
     if (project.hasProperty("teamcity")) args += ['--reporter', 'mocha-teamcity-reporter']
 }
 
@@ -85,11 +93,11 @@ task installDependenciesMochaJsdom(type: NpmTask, dependsOn: [npmInstall]) {
     if (project.hasProperty("teamcity")) args += ["mocha-teamcity-reporter@$mocha_teamcity_reporter_version"]
 }
 
-task testMochaJsdom(type: NodeTask, dependsOn: [compileTestKotlinJs, installDependenciesMochaJsdom]) {
+task testMochaJsdom(type: NodeTask, dependsOn: [compileTestJsLegacy, installDependenciesMochaJsdom]) {
     script = file("$node.nodeModulesDir/node_modules/mocha/bin/mocha")
-    args = [compileTestKotlinJs.outputFile, '--require', 'source-map-support/register', '--require', 'jsdom-global/register']
+    args = [compileTestJsLegacy.outputFile, '--require', 'source-map-support/register', '--require', 'jsdom-global/register']
     if (project.hasProperty("teamcity")) args += ['--reporter', 'mocha-teamcity-reporter']
 }
 
-legacyjsTestTask.dependsOn testMochaJsdom
+jsLegacyTestTask.dependsOn testMochaJsdom
 

js/example-frontend-js/build.gradle

@@ -8,7 +8,7 @@ apply from: rootProject.file('gradle/node-js.gradle')
 // Workaround resolving new Gradle metadata with kotlin2js
 // TODO: Remove once KT-37188 is fixed
 try {
-    def jsCompilerType = Class.forName("org.jetbrains.kotlin.gradle.targets.js.JsCompilerType")
+    def jsCompilerType = Class.forName("org.jetbrains.kotlin.gradle.targets.js.KotlinJsCompilerAttribute")
     def jsCompilerAttr = Attribute.of("org.jetbrains.kotlin.js.compiler", jsCompilerType)
     project.dependencies.attributesSchema.attribute(jsCompilerAttr)
     configurations {