Merge branch 'refactor/namespace-plugins' into feature/material-v9

squidfunk · Nov 12, 2022 · 17186b4 · 17186b4
2 parents 1f70d9a + 68fcbe6
commit 17186b4
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 8 deletions.
diff --git a/material/partials/content.html b/material/partials/content.html
@@ -1,7 +1,7 @@
 {#-
   This file was automatically generated - do not edit
 -#}
-{% if "tags" in config.plugins %}
+{% if "material/tags" in config.plugins %}
   {% include "partials/tags.html" %}
 {% endif %}
 {% include "partials/actions.html" %}

diff --git a/material/partials/header.html b/material/partials/header.html
@@ -67,7 +67,7 @@
         </div>
       </div>
     {% endif %}
-    {% if "search" in config.plugins %}
+    {% if "material/search" in config.plugins %}
       <label class="md-header__button md-icon" for="__search">
         {% include ".icons/material/magnify.svg" %}
       </label>

diff --git a/material/plugins/tags/plugin.py b/material/plugins/tags/plugin.py
@@ -42,6 +42,7 @@ class TagsPluginConfig(Config):
 
 # Tags plugin
 class TagsPlugin(BasePlugin[TagsPluginConfig]):
+    supports_multiple_instances = True
 
     # Initialize plugin
     def on_config(self, config):

diff --git a/pyproject.toml b/pyproject.toml
@@ -51,9 +51,9 @@ classifiers = [
 ]
 
 [project.entry-points."mkdocs.plugins"]
-search = "material.plugins.search.plugin:SearchPlugin"
-social = "material.plugins.social.plugin:SocialPlugin"
-tags = "material.plugins.tags.plugin:TagsPlugin"
+"material/search" = "material.plugins.search.plugin:SearchPlugin"
+"material/social" = "material.plugins.social.plugin:SocialPlugin"
+"material/tags" = "material.plugins.tags.plugin:TagsPlugin"
 
 [project.entry-points."mkdocs.themes"]
 material = "material"

diff --git a/requirements.txt b/requirements.txt
@@ -21,7 +21,7 @@
 # Requirements for core
 jinja2>=3.0.2
 markdown>=3.2
-mkdocs>=1.4.0
+mkdocs>=1.4.2
 mkdocs-material-extensions>=1.1
 pygments>=2.12
 pymdown-extensions>=9.4

diff --git a/src/partials/content.html b/src/partials/content.html
@@ -21,7 +21,7 @@
 -->
 
 <!-- Tags -->
-{% if "tags" in config.plugins %}
+{% if "material/tags" in config.plugins %}
   {% include "partials/tags.html" %}
 {% endif %}
 

diff --git a/src/partials/header.html b/src/partials/header.html
@@ -136,7 +136,7 @@
     {% endif %}
 
     <!-- Button to open search modal -->
-    {% if "search" in config.plugins %}
+    {% if "material/search" in config.plugins %}
       <label class="md-header__button md-icon" for="__search">
         {% include ".icons/material/magnify.svg" %}
       </label>

diff --git a/src/plugins/tags/plugin.py b/src/plugins/tags/plugin.py
@@ -42,6 +42,7 @@ class TagsPluginConfig(Config):
 
 # Tags plugin
 class TagsPlugin(BasePlugin[TagsPluginConfig]):
+    supports_multiple_instances = True
 
     # Initialize plugin
     def on_config(self, config):