1 files changed, 7 insertions, 35 deletions
diff --git a/plugins/all-modules-page/src/main/kotlin/AllModulesPagePlugin.kt b/plugins/all-modules-page/src/main/kotlin/AllModulesPagePlugin.kt
index c99293ef..9f4b62ee 100644
--- a/plugins/all-modules-page/src/main/kotlin/AllModulesPagePlugin.kt
+++ b/plugins/all-modules-page/src/main/kotlin/AllModulesPagePlugin.kt
@@ -1,31 +1,29 @@
 package org.jetbrains.dokka.allModulesPage
 
 import org.jetbrains.dokka.CoreExtensions
-import org.jetbrains.dokka.allModulesPage.templates.*
 import org.jetbrains.dokka.base.DokkaBase
 import org.jetbrains.dokka.base.resolvers.local.DokkaLocationProviderFactory
 import org.jetbrains.dokka.base.resolvers.local.LocationProviderFactory
 import org.jetbrains.dokka.plugability.DokkaPlugin
+import org.jetbrains.dokka.templates.TemplatingPlugin
 import org.jetbrains.dokka.transformers.pages.PageCreator
 import org.jetbrains.dokka.transformers.pages.PageTransformer
 
 class AllModulesPagePlugin : DokkaPlugin() {
 
-    val templateProcessor by extensionPoint<TemplateProcessor>()
-    val templateProcessingStrategy by extensionPoint<TemplateProcessingStrategy>()
     val partialLocationProviderFactory by extensionPoint<LocationProviderFactory>()
     val allModulesPageCreator by extensionPoint<PageCreator>()
     val allModulesPageTransformer by extensionPoint<PageTransformer>()
     val externalModuleLinkResolver by extensionPoint<ExternalModuleLinkResolver>()
 
-    val substitutor by extensionPoint<Substitutor>()
-
     val allModulesPageCreators by extending {
         allModulesPageCreator providing ::MultimodulePageCreator
     }
 
+    val dokkaBase by lazy { plugin<DokkaBase>() }
+
     val multimoduleLocationProvider by extending {
-        (plugin<DokkaBase>().locationProviderFactory
+        (dokkaBase.locationProviderFactory
                 providing MultimoduleLocationProvider::Factory
                 override plugin<DokkaBase>().locationProvider)
     }
@@ -37,37 +35,11 @@ class AllModulesPagePlugin : DokkaPlugin() {
     val allModulesPageGeneration by extending {
         (CoreExtensions.generation
                 providing ::AllModulesPageGeneration
-                override plugin<DokkaBase>().singleGeneration)
-    }
-
-    val defaultTemplateProcessor by extending {
-        templateProcessor providing ::DefaultTemplateProcessor
-    }
-
-    val directiveBasedHtmlTemplateProcessingStrategy by extending {
-        templateProcessingStrategy providing ::DirectiveBasedHtmlTemplateProcessingStrategy order {
-            before(fallbackProcessingStrategy)
-        }
-    }
-
-    val fallbackProcessingStrategy by extending {
-        templateProcessingStrategy providing ::FallbackTemplateProcessingStrategy
-    }
-
-    val navigationSearchTemplateStrategy by extending {
-        templateProcessingStrategy providing ::NavigationSearchTemplateStrategy order {
-            before(fallbackProcessingStrategy)
-        }
-    }
-
-    val pagesSearchTemplateStrategy by extending {
-        templateProcessingStrategy providing ::PagesSearchTemplateStrategy order {
-            before(fallbackProcessingStrategy)
-        }
+                override dokkaBase.singleGeneration)
     }
 
-    val pathToRootSubstitutor by extending {
-        substitutor providing ::PathToRootSubstitutor
+    val resolveLinkCommandHandler by extending {
+        plugin<TemplatingPlugin>().directiveBasedCommandHandlers providing ::ResolveLinkCommandHandler
     }
 
     val multiModuleLinkResolver by extending {