From 0f47a38042b21181a5a390b6fc622fd9f8cddfad Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Fri, 5 Jun 2020 19:36:34 +0300
Subject: [PATCH] [Gradle, JS] Enable Dukat by default with false
 generateExternals

---
 .../gradle/targets/js/dukat/PackageJsonDukatExecutor.kt    | 7 ++++++-
 .../kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt | 3 ---
 .../targets/js/npm/resolver/KotlinRootNpmResolver.kt       | 4 +---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/PackageJsonDukatExecutor.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/PackageJsonDukatExecutor.kt
index b70d2c406b8..78987ef60cb 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/PackageJsonDukatExecutor.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/PackageJsonDukatExecutor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -30,6 +30,11 @@ class PackageJsonDukatExecutor(
         get() = inputsFile.isFile && prevVersion == version && !packageJsonIsUpdated
 
     fun execute() {
+        if (typeDefinitions.isEmpty()) {
+            npmProject.externalsDirRoot.deleteRecursively()
+            return
+        }
+
         // delete file to run visit on error even without package.json updates
         versionFile.delete()
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt
index c93b1ab480e..17b805252cd 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt
@@ -44,9 +44,6 @@ open class NodeJsRootExtension(val rootProject: Project) : ConfigurationPhaseAwa
     private val projectProperties = PropertiesProvider(rootProject)
 
     inner class Experimental {
-        val generateKotlinExternals: Boolean
-            get() = projectProperties.jsGenerateExternals == true
-
         val discoverTypes: Boolean
             get() = projectProperties.jsDiscoverTypes == true
     }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt
index 61422b64451..b40640b7636 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt
@@ -33,9 +33,7 @@ internal class KotlinRootNpmResolver internal constructor(
         get() = nodeJs.rootProject
 
     val plugins = mutableListOf<RootResolverPlugin>().also {
-        if (nodeJs.experimental.generateKotlinExternals) {
-            it.add(DukatRootResolverPlugin(this))
-        }
+        it.add(DukatRootResolverPlugin(this))
     }
 
     enum class State {