From fee799a759a947a68714a59d0279cf8c77eb134a Mon Sep 17 00:00:00 2001 From: squidfunk Date: Sun, 16 Oct 2022 16:20:12 +0700 Subject: [PATCH 1/2] Added namespace to plugins and update to MkDocs 1.4.1 --- pyproject.toml | 6 +++--- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c5bd914c0..4e353aa66 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,9 +47,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 index f44eaf512..716ac058c 100644 --- 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.1 mkdocs-material-extensions>=1.0.3 pygments>=2.12 pymdown-extensions>=9.4 From 4b51fa21a8e1f585392b70a73c7f4001f872cb84 Mon Sep 17 00:00:00 2001 From: squidfunk Date: Sun, 16 Oct 2022 16:36:38 +0700 Subject: [PATCH 2/2] Adjusted checks for plugins in templates --- material/overrides/partials/content.html | 2 +- material/partials/content.html | 2 +- material/partials/header.html | 2 +- pyproject.toml | 6 +++--- src/overrides/partials/content.html | 2 +- src/partials/content.html | 2 +- src/partials/header.html | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/material/overrides/partials/content.html b/material/overrides/partials/content.html index 10acfc0cc..bdedcef3b 100644 --- a/material/overrides/partials/content.html +++ b/material/overrides/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 "overrides/partials/actions.html" %} diff --git a/material/partials/content.html b/material/partials/content.html index 758be91b6..e61bcfb17 100644 --- 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 index 6f7068adc..ebb125422 100644 --- a/material/partials/header.html +++ b/material/partials/header.html @@ -66,7 +66,7 @@ {% endif %} - {% if "search" in config.plugins %} + {% if "material/search" in config.plugins %} diff --git a/pyproject.toml b/pyproject.toml index 4e353aa66..9f2bf4d8b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,9 +47,9 @@ classifiers = [ ] [project.entry-points."mkdocs.plugins"] -material/search = "material.plugins.search.plugin:SearchPlugin" -material/social = "material.plugins.social.plugin:SocialPlugin" -material/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/src/overrides/partials/content.html b/src/overrides/partials/content.html index b954431ad..31b98b61c 100644 --- a/src/overrides/partials/content.html +++ b/src/overrides/partials/content.html @@ -21,7 +21,7 @@ --> -{% if "tags" in config.plugins %} +{% if "material/tags" in config.plugins %} {% include "partials/tags.html" %} {% endif %} diff --git a/src/partials/content.html b/src/partials/content.html index 1cf0d8f31..9cb8f3d44 100644 --- a/src/partials/content.html +++ b/src/partials/content.html @@ -21,7 +21,7 @@ --> -{% 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 index 092b88a7b..a0b839e29 100644 --- a/src/partials/header.html +++ b/src/partials/header.html @@ -135,7 +135,7 @@ {% endif %} - {% if "search" in config.plugins %} + {% if "material/search" in config.plugins %}