[Gradle, JS] PackageJsonDukatExecutor -> DukatExecutor
This commit is contained in:
+2
-2
@@ -52,12 +52,12 @@ internal class DukatCompilationResolverPlugin(
|
|||||||
) {
|
) {
|
||||||
val externalNpmDependencies = resolution[project][compilation].externalNpmDependencies
|
val externalNpmDependencies = resolution[project][compilation].externalNpmDependencies
|
||||||
|
|
||||||
PackageJsonDukatExecutor(
|
DukatExecutor(
|
||||||
nodeJs,
|
nodeJs,
|
||||||
DtsResolver(npmProject).getAllDts(externalNpmDependencies),
|
DtsResolver(npmProject).getAllDts(externalNpmDependencies),
|
||||||
npmProject,
|
npmProject,
|
||||||
packageJsonIsUpdated,
|
packageJsonIsUpdated,
|
||||||
operation = compilation.name + " > " + PackageJsonDukatExecutor.OPERATION,
|
operation = compilation.name + " > " + DukatExecutor.OPERATION,
|
||||||
compareInputs = true
|
compareInputs = true
|
||||||
).execute()
|
).execute()
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.gradle.targets.js.dukat
|
|||||||
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
|
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject
|
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject
|
||||||
|
|
||||||
class PackageJsonDukatExecutor(
|
class DukatExecutor(
|
||||||
val nodeJs: NodeJsRootExtension,
|
val nodeJs: NodeJsRootExtension,
|
||||||
val typeDefinitions: List<DtsResolver.Dts>,
|
val typeDefinitions: List<DtsResolver.Dts>,
|
||||||
val npmProject: NpmProject,
|
val npmProject: NpmProject,
|
||||||
+1
-1
@@ -35,7 +35,7 @@ open class DukatTask : AbstractDukatTask() {
|
|||||||
get() = compilation.npmProject.externalsDir
|
get() = compilation.npmProject.externalsDir
|
||||||
|
|
||||||
private val executor by lazy {
|
private val executor by lazy {
|
||||||
PackageJsonDukatExecutor(nodeJs, dts, compilation.npmProject, true, compareInputs = false)
|
DukatExecutor(nodeJs, dts, compilation.npmProject, true, compareInputs = false)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun run() {
|
override fun run() {
|
||||||
|
|||||||
Reference in New Issue
Block a user