Wizard: fix node js templates
This commit is contained in:
committed by
Kirill Shmakov
parent
63e2d771b3
commit
c05c72387e
+2
-1
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.tools.projectWizard.core.checker
|
|||||||
import org.jetbrains.kotlin.tools.projectWizard.core.entity.PipelineTask
|
import org.jetbrains.kotlin.tools.projectWizard.core.entity.PipelineTask
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.core.entity.Property
|
import org.jetbrains.kotlin.tools.projectWizard.core.entity.Property
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.core.entity.settings.PluginSetting
|
import org.jetbrains.kotlin.tools.projectWizard.core.entity.settings.PluginSetting
|
||||||
|
import org.jetbrains.kotlin.tools.projectWizard.core.service.FileSystemWizardService
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.AndroidModuleConfigurator
|
import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.AndroidModuleConfigurator
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.phases.GenerationPhase
|
import org.jetbrains.kotlin.tools.projectWizard.phases.GenerationPhase
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.allIRModules
|
import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.allIRModules
|
||||||
@@ -58,7 +59,7 @@ class AndroidPlugin(context: Context) : Plugin(context) {
|
|||||||
if (allIRModules.none { it.originalModule.configurator is AndroidModuleConfigurator }) return@withAction UNIT_SUCCESS
|
if (allIRModules.none { it.originalModule.configurator is AndroidModuleConfigurator }) return@withAction UNIT_SUCCESS
|
||||||
val path = androidSdkPath.settingValue
|
val path = androidSdkPath.settingValue
|
||||||
val fileSystemService = service<FileSystemWizardService>()
|
val fileSystemService = service<FileSystemWizardService>()
|
||||||
GradlePlugin.localProperties.addValues(
|
GradlePlugin.localProperties.addValues(
|
||||||
"sdk.dir" to fileSystemService.renderPath(path)
|
"sdk.dir" to fileSystemService.renderPath(path)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
+16
-1
@@ -6,9 +6,24 @@
|
|||||||
package org.jetbrains.kotlin.tools.projectWizard.plugins.templates
|
package org.jetbrains.kotlin.tools.projectWizard.plugins.templates
|
||||||
|
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.core.Context
|
import org.jetbrains.kotlin.tools.projectWizard.core.Context
|
||||||
|
import org.jetbrains.kotlin.tools.projectWizard.core.entity.PipelineTask
|
||||||
|
import org.jetbrains.kotlin.tools.projectWizard.templates.KtorServerTemplate
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.templates.SimpleJsClientTemplate
|
import org.jetbrains.kotlin.tools.projectWizard.templates.SimpleJsClientTemplate
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.templates.SimpleNodeJsTemplate
|
import org.jetbrains.kotlin.tools.projectWizard.templates.SimpleNodeJsTemplate
|
||||||
|
|
||||||
class SimpleNodeJsTemplatesPlugin(context: Context) : TemplatePlugin(context) {
|
class SimpleNodeJsTemplatesPlugin(context: Context) : TemplatePlugin(context) {
|
||||||
val addTemplate by addTemplateTask(SimpleNodeJsTemplate())
|
override val path = PATH
|
||||||
|
|
||||||
|
override val pipelineTasks: List<PipelineTask> = super.pipelineTasks +
|
||||||
|
listOf(
|
||||||
|
KtorTemplatesPlugin.addTemplate,
|
||||||
|
)
|
||||||
|
|
||||||
|
val addTemplate by addTemplateTask(PATH, SimpleNodeJsTemplate())
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
private const val PATH = "template.simpleNodeJs"
|
||||||
|
|
||||||
|
val addTemplate by addTemplateTask(PATH, KtorServerTemplate())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+1
-1
@@ -403,7 +403,7 @@ object NodeJsApplicationProjectTemplate : ProjectTemplate() {
|
|||||||
|
|
||||||
override val setsPluginSettings: List<SettingWithValue<*, *>>
|
override val setsPluginSettings: List<SettingWithValue<*, *>>
|
||||||
get() = listOf(
|
get() = listOf(
|
||||||
KotlinPlugin::modules withValue listOf(
|
KotlinPlugin.modules.reference withValue listOf(
|
||||||
Module(
|
Module(
|
||||||
"nodejsApp",
|
"nodejsApp",
|
||||||
NodeJsSinglePlatformModuleConfigurator,
|
NodeJsSinglePlatformModuleConfigurator,
|
||||||
|
|||||||
Reference in New Issue
Block a user