Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps) Update all non-major dependencies #691

Merged
merged 13 commits into from
Jun 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/linkcheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
npm install
npm run build

- uses: untitaker/[email protected].27
- uses: untitaker/[email protected].29
with:
args: docs/_site/
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ repos:
- --remove-duplicate-keys
- --remove-unused-variables
- repo: https://github.com/asottile/pyupgrade
rev: v3.4.0
rev: v3.6.0
hooks:
- id: pyupgrade
args: [--py36-plus]
Expand Down
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "djlint_docs",
"version": "1.0.73",
"version": "1.0.74",
"description": "",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -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.1",
"@fontsource/inter": "5.0.2",
"@fortawesome/fontawesome-free": "^6.4.0",
"@fullhuman/postcss-purgecss": "5.0.0",
"@toycode/markdown-it-class": "1.2.4",
Expand Down
23 changes: 23 additions & 0 deletions docs/src/_data/configuration.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,27 @@
[
{
"name": "max_blank_lines",
"description": {
"en": "Consolidate blank lines down to x lines. Default is 0 meaning blank lines will be removed.",
"ru": "Объедините пустые строки до х строк. По умолчанию 0, что означает, что пустые строки будут удалены.",
"fr": "Consolider les lignes vierges en les ramenant à x lignes. La valeur par défaut est 0, ce qui signifie que les lignes vierges seront supprimées."
},
"usage": [
{
"name": "pyproject.toml",
"value": "max_blank_lines=5"
},
{
"name": ".djlintrc",
"value": "\"max_blank_lines\": 5"
},
{
"name": "cli",
"value": "--max_blank_lines 5"
}
],
"tags": ["formatter"]
},
{
"name": "no_set_formatting",
"description": {
Expand Down
1 change: 1 addition & 0 deletions docs/src/_includes/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ Options:
matter.
--no-function-formatting Do not attempt to format function contents.
--no-set-formatting Do not attempt to format set contents.
--max-blank-lines INTEGER Consolidate blank lines down to x lines. [default: 0]
-h, --help Show this message and exit.
```

Expand Down
2 changes: 1 addition & 1 deletion docs/src/docs/linter.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ This can also be done through the [{{ "configuration" | i18n }}]({{ "lang_code_u
| H033 | Extra whitespace found in form action. | ✔️ |
| J004 | (Jinja) Static urls should follow {% raw %}`{{ url_for('static'..) }}`{% endraw %} pattern. | ✔️ |
| J018 | (Jinja) Internal links should use the {% raw %}`{% url ... %}`{% endraw %} pattern. | ✔️ |
| T001 | Variables should be wrapped in a single whitespace. Ex: {% raw %}`{{ this }}`{% endraw %} | ✔️ |
| T001 | Variables should be wrapped in whitespace. Ex: {% raw %}`{{ this }}`{% endraw %} | ✔️ |
| T002 | Double quotes should be used in tags. Ex {% raw %}`{% extends "this.html" %}`{% endraw %} | ✔️ |
| T003 | Endblock should have name. Ex: {% raw %}`{% endblock body %}`{% endraw %}. | ✔️ |
| T027 | Unclosed string found in template syntax. | ✔️ |
Expand Down
2 changes: 1 addition & 1 deletion docs/src/fr/docs/linter.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Cela peut également se faire par l'intermédiaire de l'option [{{ "configuratio
| H033 | Espace supplémentaire dans l'action du formulaire. | ✔️ |
| J004 | (Jinja) Les urls statiques doivent suivre le modèle {% raw %}`{ url_for('static'..) }}`{% endraw %}. | ✔️ |
| J018 | (Jinja) Les liens internes doivent utiliser le modèle {% raw %}`{% url ... %}`{% endraw %}. | ✔️ |
| T001 | Les variables doivent être entourées d'un seul espace. Ex : {% raw %}`{{ this }}`{% endraw %} | ✔️ |
| T001 | Les variables doivent être entourées d'un espace. Ex : {% raw %}`{{ this }}`{% endraw %} | ✔️ |
| T002 | Les doubles quotes doivent être utilisées dans les balises. Ex : {% raw %}`{% extends "this.html" %}`{% endraw %} | ✔️ |
| T003 | Le bloc de fin doit avoir un nom. Ex : {% raw %}`{% endblock body %}`{% endraw %}. | ✔️ |
| T027 | Chaîne non fermée trouvée dans la syntaxe du modèle. | ✔️ |
Expand Down
2 changes: 1 addition & 1 deletion docs/src/ru/docs/linter.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ djlint . --lint --include=H017,H035 --ignore=H013,H015
| H033 | В действии формы обнаружен лишний пробел. | ✔️ |
| J004 | (Jinja) Статические урлы должны следовать шаблону {% raw %}`{{ url_for('static'...)}}`{% endraw %}. | ✔️ |
| J018 | (Jinja) Внутренние ссылки должны использовать шаблон {% raw %}`{% url ... %}`{% endraw %}. | ✔️ |
| T001 | Переменные должны быть заключены в один пробел. Например: {% raw %}`{{ this }}`{% endraw %} | ✔️ |
| T001 | Переменные должны быть заключены в пробел. Например: {% raw %}`{{ this }}`{% endraw %} | ✔️ |
| T002 | В тегах следует использовать двойные кавычки. Ex {% raw %}`{% extends "this.html" %}`{% endraw %} | ✔️ |
| T003 | Конечный блок должен иметь имя. Например: {% raw %}`{% endblock body %}`{% endraw %}. | ✔️ |
| T027 | В синтаксисе шаблона найдена незакрытая строка. | ✔️ |
Expand Down
Loading