[Gradle, JS] Do not force dukat in separate dukat task
^KT-34014 fixed ^KT-49505 fixed
This commit is contained in:
+1
-1
@@ -20,7 +20,7 @@ constructor(
|
|||||||
override val considerGeneratingFlag: Boolean = false
|
override val considerGeneratingFlag: Boolean = false
|
||||||
|
|
||||||
override val requiredNpmDependencies: Set<RequiredKotlinJsDependency> by lazy {
|
override val requiredNpmDependencies: Set<RequiredKotlinJsDependency> by lazy {
|
||||||
setOf(nodeJs.versions.dukat)
|
emptySet()
|
||||||
}
|
}
|
||||||
|
|
||||||
@get:OutputDirectory
|
@get:OutputDirectory
|
||||||
|
|||||||
+1
-1
@@ -462,7 +462,7 @@ internal class KotlinCompilationNpmResolver(
|
|||||||
val toolsNpmDependencies = compilationResolver.rootResolver.taskRequirements
|
val toolsNpmDependencies = compilationResolver.rootResolver.taskRequirements
|
||||||
.getCompilationNpmRequirements(projectPath, compilationResolver.compilationDisambiguatedName)
|
.getCompilationNpmRequirements(projectPath, compilationResolver.compilationDisambiguatedName)
|
||||||
|
|
||||||
val dukatIfNecessary = if (externalNpmDependencies.any { it.generateExternals }) {
|
val dukatIfNecessary = if (externalNpmDependencies.isNotEmpty()) {
|
||||||
setOf(
|
setOf(
|
||||||
NpmDependencyDeclaration(
|
NpmDependencyDeclaration(
|
||||||
scope = NpmDependency.Scope.DEV,
|
scope = NpmDependency.Scope.DEV,
|
||||||
|
|||||||
+11
-16
@@ -54,8 +54,17 @@ open class YarnPlugin : Plugin<Project> {
|
|||||||
// https://youtrack.jetbrains.com/issue/KT-48241
|
// https://youtrack.jetbrains.com/issue/KT-48241
|
||||||
project.allprojects
|
project.allprojects
|
||||||
.forEach {
|
.forEach {
|
||||||
it.tasks.implementing(RequiresNpmDependencies::class)
|
val fn: (Project) -> Unit = {
|
||||||
.forEach {}
|
it.tasks.implementing(RequiresNpmDependencies::class)
|
||||||
|
.forEach {}
|
||||||
|
}
|
||||||
|
if (it.state.executed) {
|
||||||
|
fn(it)
|
||||||
|
} else {
|
||||||
|
it.afterEvaluate {
|
||||||
|
fn(it)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -77,20 +86,6 @@ open class YarnPlugin : Plugin<Project> {
|
|||||||
it.dependsOn(packageJsonUmbrella)
|
it.dependsOn(packageJsonUmbrella)
|
||||||
}
|
}
|
||||||
|
|
||||||
// project.allprojects
|
|
||||||
// .forEach {
|
|
||||||
// val fn: (Project) -> Unit = {
|
|
||||||
// it.tasks.implementing(RequiresNpmDependencies::class).all {}
|
|
||||||
// }
|
|
||||||
// if (it.state.executed) {
|
|
||||||
// fn(it)
|
|
||||||
// } else {
|
|
||||||
// it.afterEvaluate {
|
|
||||||
// fn(it)
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
val storeYarnLock = tasks.register("kotlinStoreYarnLock", YarnLockCopyTask::class.java) {
|
val storeYarnLock = tasks.register("kotlinStoreYarnLock", YarnLockCopyTask::class.java) {
|
||||||
it.dependsOn(kotlinNpmInstall)
|
it.dependsOn(kotlinNpmInstall)
|
||||||
it.inputFile.set(nodeJs.rootPackageDir.resolve("yarn.lock"))
|
it.inputFile.set(nodeJs.rootPackageDir.resolve("yarn.lock"))
|
||||||
|
|||||||
Reference in New Issue
Block a user