[Gradle, JS] Public package json does not have dependency on npm install task
This commit is contained in:
committed by
Space Team
parent
fc170aa990
commit
0547a89080
+10
@@ -1102,6 +1102,16 @@ abstract class AbstractKotlin2JsGradlePluginIT(protected val irBackend: Boolean)
|
|||||||
gradleProperties.appendText(jsCompilerType(KotlinJsCompilerType.IR))
|
gradleProperties.appendText(jsCompilerType(KotlinJsCompilerType.IR))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (irBackend) {
|
||||||
|
build("compileProductionExecutableKotlinJs") {
|
||||||
|
assertTasksExecuted(":app:compileProductionExecutableKotlinJs")
|
||||||
|
assert(task(":kotlinNpmInstall") == null) {
|
||||||
|
printBuildOutput()
|
||||||
|
"NPM install should not be run"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
build("assemble") {
|
build("assemble") {
|
||||||
assertTasksExecuted(":app:browserProductionWebpack")
|
assertTasksExecuted(":app:browserProductionWebpack")
|
||||||
|
|
||||||
|
|||||||
-4
@@ -80,10 +80,6 @@ internal class KotlinCompilationNpmResolver(
|
|||||||
npmProject.publicPackageJsonTaskName,
|
npmProject.publicPackageJsonTaskName,
|
||||||
listOf(compilation)
|
listOf(compilation)
|
||||||
) {
|
) {
|
||||||
it.dependsOn(
|
|
||||||
nodeJs_.npmInstallTaskProvider,
|
|
||||||
nodeJs_.storeYarnLockTaskProvider,
|
|
||||||
)
|
|
||||||
it.dependsOn(packageJsonTaskHolder)
|
it.dependsOn(packageJsonTaskHolder)
|
||||||
}.also { packageJsonTask ->
|
}.also { packageJsonTask ->
|
||||||
if (compilation.isMain()) {
|
if (compilation.isMain()) {
|
||||||
|
|||||||
-1
@@ -108,7 +108,6 @@ abstract class KotlinPackageJsonTask : DefaultTask() {
|
|||||||
val nodeJs = NodeJsRootPlugin.apply(project.rootProject)
|
val nodeJs = NodeJsRootPlugin.apply(project.rootProject)
|
||||||
|
|
||||||
val rootClean = project.rootProject.tasks.named(BasePlugin.CLEAN_TASK_NAME)
|
val rootClean = project.rootProject.tasks.named(BasePlugin.CLEAN_TASK_NAME)
|
||||||
val npmInstallTask = nodeJs.npmInstallTaskProvider
|
|
||||||
val npmCachesSetupTask = nodeJs.npmCachesSetupTaskProvider
|
val npmCachesSetupTask = nodeJs.npmCachesSetupTaskProvider
|
||||||
val packageJsonTaskName = npmProject.packageJsonTaskName
|
val packageJsonTaskName = npmProject.packageJsonTaskName
|
||||||
val packageJsonUmbrella = nodeJs.packageJsonUmbrellaTaskProvider
|
val packageJsonUmbrella = nodeJs.packageJsonUmbrellaTaskProvider
|
||||||
|
|||||||
Reference in New Issue
Block a user