azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, JS] Provide entry for DCE to webpack

Browse Source
This commit is contained in:
Ilya Goncharov
2019-10-17 18:49:05 +03:00
parent 174fd5975d
commit e1387e3d3d
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt
+20 -8
View File
@@ -31,7 +31,8 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
KotlinJsSubTarget(target, "browser"),
KotlinJsBrowserDsl {
lateinit var dceTask: TaskProvider<KotlinJsDce>
private val dceWebpackEntryAppliers: MutableList<KotlinJsDce.(File) -> Unit> = mutableListOf()
private lateinit var dceTaskProvider: TaskProvider<KotlinJsDce>
lateinit var buildVariants: NamedDomainObjectContainer<BuildVariant>
@@ -59,8 +60,8 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
val project = compilation.target.project
val nodeJs = NodeJsRootPlugin.apply(project.rootProject)
val dceTask = if (::dceTask.isInitialized) {
this.dceTask
val dceTaskProvider = if (::dceTaskProvider.isInitialized) {
this.dceTaskProvider
} else {
configureDce(compilation)
}
@@ -96,8 +97,11 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
when (kind) {
BuildVariantKind.RELEASE -> {
dceWebpackEntryAppliers.add { file ->
it.entry = file
}
it.resolveFromModulesFirst = true
it.dependsOn(dceTask)
it.dependsOn(dceTaskProvider)
}
BuildVariantKind.DEBUG -> {
it.dependsOn(compileKotlinTask)
@@ -112,8 +116,8 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
val project = compilation.target.project
val nodeJs = NodeJsRootPlugin.apply(project.rootProject)
val dceTask = if (::dceTask.isInitialized) {
this.dceTask
val dceTaskProvider = if (::dceTaskProvider.isInitialized) {
this.dceTaskProvider
} else {
configureDce(compilation)
}
@@ -140,8 +144,11 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
when (kind) {
BuildVariantKind.RELEASE -> {
dceWebpackEntryAppliers.add { file ->
it.entry = file
}
it.resolveFromModulesFirst = true
it.dependsOn(dceTask)
it.dependsOn(dceTaskProvider)
project.tasks.getByName(LifecycleBasePlugin.ASSEMBLE_TASK_NAME).dependsOn(it)
}
BuildVariantKind.DEBUG -> {
@@ -170,9 +177,14 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
it.classpath = project.configurations.getByName(compilation.compileDependencyConfigurationName)
it.destinationDir = it.dceOptions.outputDirectory?.let { File(it) }
?: compilation.npmProject.dir.resolve(DCE_DIR)
dceWebpackEntryAppliers.forEach { entryApplier ->
it.entryApplier(it.destinationDir.resolve(kotlinTask.outputFile.name))
}
it.source(kotlinTask.outputFile)
}.also {
dceTask = it
dceTaskProvider = it
}
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt
+3 -3
View File
@@ -53,8 +53,8 @@ open class KotlinWebpack : DefaultTask(), RequiresNpmDependencies {
@get:PathSensitive(PathSensitivity.ABSOLUTE)
@get:InputFile
val entry: File
get() = compilation.compileKotlinTask.outputFile
var entry: File? = null
get() = field ?: compilation.compileKotlinTask.outputFile
@Input
var resolveFromModulesFirst: Boolean = false
@@ -96,7 +96,7 @@ open class KotlinWebpack : DefaultTask(), RequiresNpmDependencies {
var report: Boolean = false
open val reportDir: File
@OutputDirectory get() = project.reportsDir.resolve("webpack").resolve(entry.nameWithoutExtension)
@OutputDirectory get() = project.reportsDir.resolve("webpack").resolve(entry!!.nameWithoutExtension)
open val evaluatedConfigFile: File
@OutputFile get() = reportDir.resolve("webpack.config.evaluated.js")