[Gradle, JS] Remove dukat
^KT-54445 fixed
This commit is contained in:
committed by
Space Team
parent
1d97b9b936
commit
3a9e92b577
-1
@@ -6,7 +6,6 @@
|
|||||||
package org.jetbrains.kotlin.generators.gradle.targets.js
|
package org.jetbrains.kotlin.generators.gradle.targets.js
|
||||||
|
|
||||||
val npmPackages = listOf(
|
val npmPackages = listOf(
|
||||||
NpmPackage("dukat", "0.5.8-rc.4"),
|
|
||||||
NpmPackage("webpack"),
|
NpmPackage("webpack"),
|
||||||
NpmPackage("webpack", "4.46.0", "webpack4"),
|
NpmPackage("webpack", "4.46.0", "webpack4"),
|
||||||
NpmPackage("webpack-cli"),
|
NpmPackage("webpack-cli"),
|
||||||
|
|||||||
-1
@@ -12,7 +12,6 @@ import java.io.Serializable
|
|||||||
*/
|
*/
|
||||||
// DO NOT MODIFY DIRECTLY! Use org.jetbrains.kotlin.generators.gradle.targets.js.MainKt
|
// DO NOT MODIFY DIRECTLY! Use org.jetbrains.kotlin.generators.gradle.targets.js.MainKt
|
||||||
class NpmVersions : Serializable {
|
class NpmVersions : Serializable {
|
||||||
val dukat = NpmPackageVersion("dukat", "0.5.8-rc.4")
|
|
||||||
val webpack4 = NpmPackageVersion("webpack", "4.46.0")
|
val webpack4 = NpmPackageVersion("webpack", "4.46.0")
|
||||||
val webpackCli3 = NpmPackageVersion("webpack-cli", "3.3.12")
|
val webpackCli3 = NpmPackageVersion("webpack-cli", "3.3.12")
|
||||||
val webpackDevServer3 = NpmPackageVersion("webpack-dev-server", "3.11.2")
|
val webpackDevServer3 = NpmPackageVersion("webpack-dev-server", "3.11.2")
|
||||||
|
|||||||
+1
-11
@@ -449,17 +449,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.isNotEmpty()) {
|
val otherNpmDependencies = toolsNpmDependencies + transitiveNpmDependencies
|
||||||
setOf(
|
|
||||||
NpmDependencyDeclaration(
|
|
||||||
scope = NpmDependency.Scope.DEV,
|
|
||||||
name = dukatPackageVersion.name,
|
|
||||||
version = dukatPackageVersion.version,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
} else emptySet()
|
|
||||||
|
|
||||||
val otherNpmDependencies = toolsNpmDependencies + dukatIfNecessary + transitiveNpmDependencies
|
|
||||||
val allNpmDependencies = disambiguateDependencies(externalNpmDependencies, otherNpmDependencies)
|
val allNpmDependencies = disambiguateDependencies(externalNpmDependencies, otherNpmDependencies)
|
||||||
val packageJsonHandlers = if (compilationResolver.compilation != null) {
|
val packageJsonHandlers = if (compilationResolver.compilation != null) {
|
||||||
compilationResolver.compilation.packageJsonHandlers
|
compilationResolver.compilation.packageJsonHandlers
|
||||||
|
|||||||
Reference in New Issue
Block a user