Merge pull request #717 from Riverside-Healthcare/dev

djlint · Jul 17, 2023 · 6f4df2e · 6f4df2e
2 parents 07dfbad + f980311
commit 6f4df2e
Show file tree

Hide file tree

Showing 17 changed files with 514 additions and 226 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ repos:
     - --remove-duplicate-keys
     - --remove-unused-variables
 - repo: https://github.com/asottile/pyupgrade
-  rev: v3.7.0
+  rev: v3.9.0
   hooks:
   - id: pyupgrade
     args: [--py36-plus]
@@ -33,11 +33,11 @@ repos:
     exclude: docs*
     additional_dependencies: [toml]
 - repo: https://github.com/psf/black
-  rev: 23.3.0
+  rev: 23.7.0
   hooks:
   - id: black
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v2.9.0
+  rev: v2.10.0
   hooks:
   - id: pretty-format-ini
     args: [--autofix]

diff --git a/docs/package.json b/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "djlint_docs",
-  "version": "1.0.75",
+  "version": "1.0.77",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -35,7 +35,7 @@
     "@11ty/eleventy": "2.0.1",
     "@11ty/eleventy-img": "3.1.0",
     "@11ty/eleventy-plugin-syntaxhighlight": "5.0.0",
-    "@fontsource/inter": "5.0.3",
+    "@fontsource/inter": "5.0.5",
     "@fortawesome/fontawesome-free": "^6.4.0",
     "@fullhuman/postcss-purgecss": "5.0.0",
     "@toycode/markdown-it-class": "1.2.4",
@@ -60,7 +60,7 @@
     "outdent": "0.8.0",
     "postcss-cli": "10.1.0",
     "postcss-nested": "6.0.1",
-    "prettier": "^2.8.7",
+    "prettier": "^3.0.0",
     "prismjs": "1.29.0",
     "sass": "^1.60.0",
     "slugify": "^1.6.6"

diff --git a/docs/src/docs/best-practices.md b/docs/src/docs/best-practices.md
@@ -16,7 +16,7 @@ This pattern is recommended:
 
 ```html
 <div class="class1 {% if condition -%}class2{%- endif %}">content</div>
-^ space here
+                  ^ space here
 ```
 
 {% endraw %}
@@ -27,7 +27,7 @@ This pattern is not recommended:
 
 ```html
 <div class="class1{% if condition -%} class2{%- endif %}">content</div>
-^ space here
+                                     ^ space here
 ```
 
 {% endraw %}
@@ -46,7 +46,8 @@ This pattern is recommended:
 <input
   value="{% if database -%}{{ database.name }}{%- else -%}blah{%- endif %}"
 />
-^ ^ ^ ^-- spaceless tags
+                        ^                       ^      ^        ^ -- spaceless
+tags
 ```
 
 {% endraw %}

diff --git a/docs/src/fr/docs/best-practices.md b/docs/src/fr/docs/best-practices.md
@@ -16,7 +16,7 @@ Ce modèle est recommandé :
 
 ```html
 <div class="class1 {% if condition -%}class2{%- endif %}">contenu</div>
-^ espace ici
+                  ^ espace ici
 ```
 
 {% endraw %}
@@ -27,7 +27,7 @@ Ce modèle n'est pas recommandé :
 
 ```html
 <div class="class1{% if condition -%} class2{%- endif %}">contenu</div>
-^ espace ici
+                                     ^ espace ici
 ```
 
 {% endraw %}
@@ -46,7 +46,8 @@ Ce modèle est recommandé :
 <input
   value="{% if database -%}{{ database.name }}{%- else -%}blah{%- endif %}"
 />
-^ ^ ^ ^ -- tags sans espace
+                        ^                       ^      ^        ^ -- tags sans
+espace
 ```
 
 {% endraw %}

diff --git a/docs/src/ru/docs/best-practices.md b/docs/src/ru/docs/best-practices.md
@@ -16,7 +16,7 @@ keywords: облицовка шаблонов, форматер шаблонов
 
 ```html
 <div class="class1 {% if condition -%}class2{%- endif %}">содержание</div>
-^ место здесь
+                  ^ место здесь
 ```
 
 {% endraw %}
@@ -27,7 +27,7 @@ keywords: облицовка шаблонов, форматер шаблонов
 
 ```html
 <div class="class1{% if condition -%} class2{%- endif %}">содержание</div>
-^ место здесь
+                                     ^ место здесь
 ```
 
 {% endraw %}
@@ -46,7 +46,8 @@ djLint будет форматировать длинные атрибуты н
 <input
   value="{% if database -%}{{ database.name }}{%- else -%}бла{%- endif %}"
 />
-^ ^ ^ ^ -- беспространственные метки
+                        ^                       ^      ^        ^ --
+беспространственные метки
 ```
 
 {% endraw %}