From cc88b5a6802e1b1fdaee42aa27f171cb416493dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Mond=C3=A9jar?= <mondejar1994@gmail.com>
Date: Thu, 30 Dec 2021 22:06:33 +0100
Subject: [PATCH] Reuse Jinja2 `tojson` builtin filter (#2713)

Also drop Markupsafe from requirements
---
 mkdocs/theme.py                     | 1 -
 mkdocs/themes/readthedocs/base.html | 6 +++---
 mkdocs/utils/filters.py             | 7 -------
 requirements/project-min.txt        | 1 -
 requirements/project.txt            | 1 -
 5 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/mkdocs/theme.py b/mkdocs/theme.py
index d0287496..04ae3c4d 100644
--- a/mkdocs/theme.py
+++ b/mkdocs/theme.py
@@ -112,7 +112,6 @@ class Theme:
         loader = jinja2.FileSystemLoader(self.dirs)
         # No autoreload because editing a template in the middle of a build is not useful.
         env = jinja2.Environment(loader=loader, auto_reload=False)
-        env.filters['tojson'] = filters.tojson
         env.filters['url'] = filters.url_filter
         localization.install_translations(env, self._vars['locale'], self.dirs)
         return env
diff --git a/mkdocs/themes/readthedocs/base.html b/mkdocs/themes/readthedocs/base.html
index dfdace69..e7dd8762 100644
--- a/mkdocs/themes/readthedocs/base.html
+++ b/mkdocs/themes/readthedocs/base.html
@@ -34,9 +34,9 @@
     {% if page %}
       <script>
         // Current page data
-        var mkdocs_page_name = {{ page.title|tojson|safe }};
-        var mkdocs_page_input_path = {{ page.file.src_path|string|tojson|safe }};
-        var mkdocs_page_url = {{ page.abs_url|tojson|safe }};
+        var mkdocs_page_name = {{ page.title|tojson }};
+        var mkdocs_page_input_path = {{ page.file.src_path|string|tojson }};
+        var mkdocs_page_url = {{ page.abs_url|tojson }};
       </script>
     {% endif %}
     <script src="{{ 'js/jquery-3.6.0.min.js'|url }}" defer></script>
diff --git a/mkdocs/utils/filters.py b/mkdocs/utils/filters.py
index e7fb163e..abf715f9 100644
--- a/mkdocs/utils/filters.py
+++ b/mkdocs/utils/filters.py
@@ -1,15 +1,8 @@
-import json
-
 import jinja2
-import markupsafe
 
 from mkdocs.utils import normalize_url
 
 
-def tojson(obj, **kwargs):
-    return markupsafe.Markup(json.dumps(obj, **kwargs))
-
-
 @jinja2.contextfilter
 def url_filter(context, value):
     """ A Template filter to normalize URLs. """
diff --git a/requirements/project-min.txt b/requirements/project-min.txt
index 20a9327d..dc70a2dc 100644
--- a/requirements/project-min.txt
+++ b/requirements/project-min.txt
@@ -1,7 +1,6 @@
 babel==2.9.0
 click==3.3
 Jinja2==2.10.1
-MarkupSafe==0.23
 Markdown==3.2.1
 PyYAML==5.1
 watchdog==2.0.0
diff --git a/requirements/project.txt b/requirements/project.txt
index c8fd1133..6cd5295b 100644
--- a/requirements/project.txt
+++ b/requirements/project.txt
@@ -1,7 +1,6 @@
 babel>=2.9.0
 click>=7.0
 Jinja2>=2.10.3
-MarkupSafe>=0.23
 Markdown>=3.2.1
 PyYAML>=5.2
 watchdog>=2.0.0