[Gradle, JS] No externalsDir
This commit is contained in:
committed by
Space Team
parent
5a7b4294c5
commit
f14d9679e0
-7
@@ -70,13 +70,6 @@ open class NpmProject(@Transient val compilation: KotlinJsCompilation) : Seriali
|
|||||||
val main: String
|
val main: String
|
||||||
get() = "$DIST_FOLDER${File.separator}$name$extension"
|
get() = "$DIST_FOLDER${File.separator}$name$extension"
|
||||||
|
|
||||||
val externalsDirRoot by lazy {
|
|
||||||
project.buildDir.resolve("externals").resolve(name)
|
|
||||||
}
|
|
||||||
|
|
||||||
val externalsDir: File
|
|
||||||
get() = externalsDirRoot.resolve("src")
|
|
||||||
|
|
||||||
val publicPackageJsonTaskName: String
|
val publicPackageJsonTaskName: String
|
||||||
get() = compilation.disambiguateName(PublicPackageJsonTask.NAME)
|
get() = compilation.disambiguateName(PublicPackageJsonTask.NAME)
|
||||||
|
|
||||||
|
|||||||
-7
@@ -180,13 +180,6 @@ internal class KotlinCompilationNpmResolver(
|
|||||||
// We don't have `kotlin-js-test-runner` in NPM yet
|
// We don't have `kotlin-js-test-runner` in NPM yet
|
||||||
all.dependencies.add(nodeJs_.versions.kotlinJsTestRunner.createDependency(project))
|
all.dependencies.add(nodeJs_.versions.kotlinJsTestRunner.createDependency(project))
|
||||||
|
|
||||||
project.dependencies.add(
|
|
||||||
all.name,
|
|
||||||
project.fileTree(npmProject.externalsDir).include {
|
|
||||||
it.file.isCompatibleArchive
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
return all
|
return all
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user