From 089303d5eb638bd4de95ede80740ba926689ce7c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 18 Jun 2023 09:19:55 +0000
Subject: [PATCH 01/10] chore(deps) Update all non-major dependencies

---
 docs/package.json |  6 ++--
 package-lock.json | 63 ++++++++++++++++++++++++++++++----------
 package.json      |  6 ++--
 poetry.lock       | 74 +++++++++++++++++++++++------------------------
 4 files changed, 90 insertions(+), 59 deletions(-)

diff --git a/docs/package.json b/docs/package.json
index 447ece75c..61ffc6f33 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "djlint_docs",
-  "version": "1.0.74",
+  "version": "1.0.75",
   "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.2",
+    "@fontsource/inter": "5.0.3",
     "@fortawesome/fontawesome-free": "^6.4.0",
     "@fullhuman/postcss-purgecss": "5.0.0",
     "@toycode/markdown-it-class": "1.2.4",
@@ -47,7 +47,7 @@
     "cz-conventional-changelog": "3.3.0",
     "eleventy-plugin-edit-on-github": "1.1.0",
     "eleventy-plugin-metagen": "1.7.11",
-    "esbuild": "^0.17.15",
+    "esbuild": "^0.18.0",
     "eslint": "^8.36.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-plugin-import": "2.27.5",
diff --git a/package-lock.json b/package-lock.json
index d0686d8b3..19faa066e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "djlint",
-  "version": "1.29.4",
+  "version": "1.30.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "djlint",
-      "version": "1.29.4",
+      "version": "1.30.3",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "devDependencies": {
@@ -15,12 +15,12 @@
         "@semantic-release/exec": "6.0.3",
         "@semantic-release/git": "10.0.1",
         "@semantic-release/github": "9.0.3",
-        "@semantic-release/npm": "10.0.3",
+        "@semantic-release/npm": "10.0.4",
         "@semantic-release/release-notes-generator": "11.0.3",
         "cz-conventional-changelog": "3.3.0",
         "lint-staged": "13.2.2",
         "prettier": "^2.8.8",
-        "semantic-release": "21.0.3"
+        "semantic-release": "21.0.5"
       }
     },
     "node_modules/@babel/code-frame": {
@@ -802,12 +802,12 @@
       }
     },
     "node_modules/@semantic-release/npm": {
-      "version": "10.0.3",
-      "resolved": "https://registry.npmjs.org/@semantic-release/npm/-/npm-10.0.3.tgz",
-      "integrity": "sha512-Chbv3kX4o+y+r1X6hsqBVB8NFbSVfiNlYOqMG6o9Wc8r5Y4cjxfbaMCuJ++XAtw3YXYX/NVD05cPzBi4Orjusg==",
+      "version": "10.0.4",
+      "resolved": "https://registry.npmjs.org/@semantic-release/npm/-/npm-10.0.4.tgz",
+      "integrity": "sha512-6R3timIQ7VoL2QWRkc9DG8v74RQtRp7UOe/2KbNaqwJ815qOibAv65bH3RtTEhs4axEaHoZf7HDgFs5opaZ9Jw==",
       "dev": true,
       "dependencies": {
-        "@semantic-release/error": "^3.0.0",
+        "@semantic-release/error": "^4.0.0",
         "aggregate-error": "^4.0.1",
         "execa": "^7.0.0",
         "fs-extra": "^11.0.0",
@@ -828,6 +828,15 @@
         "semantic-release": ">=20.1.0"
       }
     },
+    "node_modules/@semantic-release/npm/node_modules/@semantic-release/error": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@semantic-release/error/-/error-4.0.0.tgz",
+      "integrity": "sha512-mgdxrHTLOjOddRVYIYDo0fR3/v61GNN1YGkfbrjuIKg/uMgCd+Qzo3UAXJ+woLQQpos4pl5Esuw5A7AoNlzjUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@semantic-release/npm/node_modules/aggregate-error": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-4.0.1.tgz",
@@ -1085,9 +1094,9 @@
       }
     },
     "node_modules/@semantic-release/npm/node_modules/type-fest": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.8.0.tgz",
-      "integrity": "sha512-FVNSzGQz9Th+/9R6Lvv7WIAkstylfHN2/JYxkyhhmKFYh9At2DST8t6L6Lref9eYO8PXFTfG9Sg1Agg0K3vq3Q==",
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.12.0.tgz",
+      "integrity": "sha512-qj9wWsnFvVEMUDbESiilKeXeHL7FwwiFcogfhfyjmvT968RXSvnl23f1JOClTHYItsi7o501C/7qVllscUP3oA==",
       "dev": true,
       "engines": {
         "node": ">=14.16"
@@ -3945,6 +3954,7 @@
       "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.12.tgz",
       "integrity": "sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw==",
       "dev": true,
+      "peer": true,
       "bin": {
         "marked": "bin/marked.js"
       },
@@ -8001,13 +8011,13 @@
       "dev": true
     },
     "node_modules/semantic-release": {
-      "version": "21.0.3",
-      "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-21.0.3.tgz",
-      "integrity": "sha512-DS/0P1DrL8cKpkhN7JCzhkbOge9sURSRqUlmEAjeXTzK0lOSWhp+oJJcji0bLFEIyu3DuYEeQrWCdJNwRHrFdw==",
+      "version": "21.0.5",
+      "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-21.0.5.tgz",
+      "integrity": "sha512-mCc7Hx9Ro/1Clk9tLLgwQIQuiEzx+1OX12EazvNysnx1VG4eaNJE9b9IyWtTxyFxaFYi7nM5VB5ZDVzheHTDPA==",
       "dev": true,
       "dependencies": {
         "@semantic-release/commit-analyzer": "^10.0.0",
-        "@semantic-release/error": "^3.0.0",
+        "@semantic-release/error": "^4.0.0",
         "@semantic-release/github": "^9.0.0",
         "@semantic-release/npm": "^10.0.2",
         "@semantic-release/release-notes-generator": "^11.0.0",
@@ -8023,7 +8033,7 @@
         "hook-std": "^3.0.0",
         "hosted-git-info": "^6.0.0",
         "lodash-es": "^4.17.21",
-        "marked": "^4.1.0",
+        "marked": "^5.0.0",
         "marked-terminal": "^5.1.1",
         "micromatch": "^4.0.2",
         "p-each-series": "^3.0.0",
@@ -8042,6 +8052,15 @@
         "node": ">=18"
       }
     },
+    "node_modules/semantic-release/node_modules/@semantic-release/error": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@semantic-release/error/-/error-4.0.0.tgz",
+      "integrity": "sha512-mgdxrHTLOjOddRVYIYDo0fR3/v61GNN1YGkfbrjuIKg/uMgCd+Qzo3UAXJ+woLQQpos4pl5Esuw5A7AoNlzjUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/semantic-release/node_modules/aggregate-error": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-4.0.1.tgz",
@@ -8227,6 +8246,18 @@
         "node": ">=12"
       }
     },
+    "node_modules/semantic-release/node_modules/marked": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-5.1.0.tgz",
+      "integrity": "sha512-z3/nBe7aTI8JDszlYLk7dDVNpngjw0o1ZJtrA9kIfkkHcIF+xH7mO23aISl4WxP83elU+MFROgahqdpd05lMEQ==",
+      "dev": true,
+      "bin": {
+        "marked": "bin/marked.js"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/semantic-release/node_modules/mimic-fn": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
diff --git a/package.json b/package.json
index 5ab323f6f..5c06032af 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "djlint",
-  "version": "1.30.2",
+  "version": "1.30.3",
   "description": "HTML Template Linter and Formatter",
   "directories": {
     "doc": "docs",
@@ -51,12 +51,12 @@
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "@semantic-release/github": "9.0.3",
-    "@semantic-release/npm": "10.0.3",
+    "@semantic-release/npm": "10.0.4",
     "@semantic-release/release-notes-generator": "11.0.3",
     "cz-conventional-changelog": "3.3.0",
     "lint-staged": "13.2.2",
     "prettier": "^2.8.8",
-    "semantic-release": "21.0.3"
+    "semantic-release": "21.0.5"
   },
   "config": {
     "commitizen": {
diff --git a/poetry.lock b/poetry.lock
index 9eee5e57c..75fc1b1a5 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -52,14 +52,14 @@ uvloop = ["uvloop (>=0.15.2)"]
 
 [[package]]
 name = "cachetools"
-version = "5.3.0"
+version = "5.3.1"
 description = "Extensible memoizing collections and decorators"
 category = "dev"
 optional = false
-python-versions = "~=3.7"
+python-versions = ">=3.7"
 files = [
-    {file = "cachetools-5.3.0-py3-none-any.whl", hash = "sha256:429e1a1e845c008ea6c85aa35d4b98b65d6a9763eeef3e37e92728a12d1de9d4"},
-    {file = "cachetools-5.3.0.tar.gz", hash = "sha256:13dfddc7b8df938c21a940dfa6557ce6e94a2f1cdfa58eb90c805721d58f2c14"},
+    {file = "cachetools-5.3.1-py3-none-any.whl", hash = "sha256:95ef631eeaea14ba2e36f06437f36463aac3a096799e876ee55e5cdccb102590"},
+    {file = "cachetools-5.3.1.tar.gz", hash = "sha256:dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b"},
 ]
 
 [[package]]
@@ -249,19 +249,19 @@ testing = ["pre-commit"]
 
 [[package]]
 name = "filelock"
-version = "3.12.0"
+version = "3.12.2"
 description = "A platform independent file lock."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "filelock-3.12.0-py3-none-any.whl", hash = "sha256:ad98852315c2ab702aeb628412cbf7e95b7ce8c3bf9565670b4eaecf1db370a9"},
-    {file = "filelock-3.12.0.tar.gz", hash = "sha256:fc03ae43288c013d2ea83c8597001b1129db351aad9c57fe2409327916b8e718"},
+    {file = "filelock-3.12.2-py3-none-any.whl", hash = "sha256:cbb791cdea2a72f23da6ac5b5269ab0a0d161e9ef0100e653b69049a7706d1ec"},
+    {file = "filelock-3.12.2.tar.gz", hash = "sha256:002740518d8aa59a26b0c76e10fb8c6e15eae825d34b6fdf670333fd7b938d81"},
 ]
 
 [package.extras]
-docs = ["furo (>=2023.3.27)", "sphinx (>=6.1.3)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"]
-testing = ["covdefaults (>=2.3)", "coverage (>=7.2.3)", "diff-cover (>=7.5)", "pytest (>=7.3.1)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-timeout (>=2.1)"]
+docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"]
+testing = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "diff-cover (>=7.5)", "pytest (>=7.3.1)", "pytest-cov (>=4.1)", "pytest-mock (>=3.10)", "pytest-timeout (>=2.1)"]
 
 [[package]]
 name = "html-tag-names"
@@ -432,19 +432,19 @@ files = [
 
 [[package]]
 name = "platformdirs"
-version = "3.5.1"
+version = "3.6.0"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "platformdirs-3.5.1-py3-none-any.whl", hash = "sha256:e2378146f1964972c03c085bb5662ae80b2b8c06226c54b2ff4aa9483e8a13a5"},
-    {file = "platformdirs-3.5.1.tar.gz", hash = "sha256:412dae91f52a6f84830f39a8078cecd0e866cb72294a5c66808e74d5e88d251f"},
+    {file = "platformdirs-3.6.0-py3-none-any.whl", hash = "sha256:ffa199e3fbab8365778c4a10e1fbf1b9cd50707de826eb304b50e57ec0cc8d38"},
+    {file = "platformdirs-3.6.0.tar.gz", hash = "sha256:57e28820ca8094678b807ff529196506d7a21e17156cb1cddb3e74cebce54640"},
 ]
 
 [package.extras]
-docs = ["furo (>=2023.3.27)", "proselint (>=0.13)", "sphinx (>=6.2.1)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"]
-test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.3.1)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"]
+docs = ["furo (>=2023.5.20)", "proselint (>=0.13)", "sphinx (>=7.0.1)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"]
+test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.3.1)", "pytest-cov (>=4.1)", "pytest-mock (>=3.10)"]
 
 [[package]]
 name = "pluggy"
@@ -464,23 +464,23 @@ testing = ["pytest", "pytest-benchmark"]
 
 [[package]]
 name = "pyproject-api"
-version = "1.5.1"
+version = "1.5.2"
 description = "API to interact with the python pyproject.toml based projects"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "pyproject_api-1.5.1-py3-none-any.whl", hash = "sha256:4698a3777c2e0f6b624f8a4599131e2a25376d90fe8d146d7ac74c67c6f97c43"},
-    {file = "pyproject_api-1.5.1.tar.gz", hash = "sha256:435f46547a9ff22cf4208ee274fca3e2869aeb062a4834adfc99a4dd64af3cf9"},
+    {file = "pyproject_api-1.5.2-py3-none-any.whl", hash = "sha256:9cffcbfb64190f207444d7579d315f3278f2c04ba46d685fad93197b5326d348"},
+    {file = "pyproject_api-1.5.2.tar.gz", hash = "sha256:999f58fa3c92b23ebd31a6bad5d1f87d456744d75e05391be7f5c729015d3d91"},
 ]
 
 [package.dependencies]
-packaging = ">=23"
+packaging = ">=23.1"
 tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""}
 
 [package.extras]
-docs = ["furo (>=2022.12.7)", "sphinx (>=6.1.3)", "sphinx-autodoc-typehints (>=1.22,!=1.23.4)"]
-testing = ["covdefaults (>=2.2.2)", "importlib-metadata (>=6)", "pytest (>=7.2.1)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "virtualenv (>=20.17.1)", "wheel (>=0.38.4)"]
+docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"]
+testing = ["covdefaults (>=2.3)", "importlib-metadata (>=6.6)", "pytest (>=7.3.1)", "pytest-cov (>=4.1)", "pytest-mock (>=3.10)", "setuptools (>=67.8)", "wheel (>=0.40)"]
 
 [[package]]
 name = "pytest"
@@ -746,31 +746,31 @@ files = [
 
 [[package]]
 name = "tox"
-version = "4.6.0"
+version = "4.6.2"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "tox-4.6.0-py3-none-any.whl", hash = "sha256:4874000453e637a87ca892f9744a2ab9a7d24064dad1b0ecbf5a4c3c146cc732"},
-    {file = "tox-4.6.0.tar.gz", hash = "sha256:954f1f647f67f481d239a193288983242a6152b67503c4a56b19a4aafaa29736"},
+    {file = "tox-4.6.2-py3-none-any.whl", hash = "sha256:52241851a7b0cd7de07d6ef067a13b092d2a4f82fe9048efb2444aed1708d713"},
+    {file = "tox-4.6.2.tar.gz", hash = "sha256:58c7c2acce2f3d44cd1b359349557162336288ecf19ef53ccda89c9cee0ad9c4"},
 ]
 
 [package.dependencies]
-cachetools = ">=5.3"
+cachetools = ">=5.3.1"
 chardet = ">=5.1"
 colorama = ">=0.4.6"
-filelock = ">=3.12"
+filelock = ">=3.12.2"
 packaging = ">=23.1"
-platformdirs = ">=3.5.1"
+platformdirs = ">=3.5.3"
 pluggy = ">=1"
-pyproject-api = ">=1.5.1"
+pyproject-api = ">=1.5.2"
 tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""}
-virtualenv = ">=20.23"
+virtualenv = ">=20.23.1"
 
 [package.extras]
-docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-argparse-cli (>=1.11)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)", "sphinx-copybutton (>=0.5.2)", "sphinx-inline-tabs (>=2023.4.21)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"]
-testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "devpi-process (>=0.3)", "diff-cover (>=7.5)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.17)", "psutil (>=5.9.5)", "pytest (>=7.3.1)", "pytest-cov (>=4.1)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.3.1)", "re-assert (>=1.1)", "time-machine (>=2.9)", "wheel (>=0.40)"]
+docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-argparse-cli (>=1.11.1)", "sphinx-autodoc-typehints (>=1.23.2,!=1.23.4)", "sphinx-copybutton (>=0.5.2)", "sphinx-inline-tabs (>=2023.4.21)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"]
+testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "detect-test-pollution (>=1.1.1)", "devpi-process (>=0.3.1)", "diff-cover (>=7.6)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.17.1)", "psutil (>=5.9.5)", "pytest (>=7.3.2)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-xdist (>=3.3.1)", "re-assert (>=1.1)", "time-machine (>=2.10)", "wheel (>=0.40)"]
 
 [[package]]
 name = "tqdm"
@@ -819,24 +819,24 @@ files = [
 
 [[package]]
 name = "virtualenv"
-version = "20.23.0"
+version = "20.23.1"
 description = "Virtual Python Environment builder"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "virtualenv-20.23.0-py3-none-any.whl", hash = "sha256:6abec7670e5802a528357fdc75b26b9f57d5d92f29c5462ba0fbe45feacc685e"},
-    {file = "virtualenv-20.23.0.tar.gz", hash = "sha256:a85caa554ced0c0afbd0d638e7e2d7b5f92d23478d05d17a76daeac8f279f924"},
+    {file = "virtualenv-20.23.1-py3-none-any.whl", hash = "sha256:34da10f14fea9be20e0fd7f04aba9732f84e593dac291b757ce42e3368a39419"},
+    {file = "virtualenv-20.23.1.tar.gz", hash = "sha256:8ff19a38c1021c742148edc4f81cb43d7f8c6816d2ede2ab72af5b84c749ade1"},
 ]
 
 [package.dependencies]
 distlib = ">=0.3.6,<1"
-filelock = ">=3.11,<4"
-platformdirs = ">=3.2,<4"
+filelock = ">=3.12,<4"
+platformdirs = ">=3.5.1,<4"
 
 [package.extras]
-docs = ["furo (>=2023.3.27)", "proselint (>=0.13)", "sphinx (>=6.1.3)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"]
-test = ["covdefaults (>=2.3)", "coverage (>=7.2.3)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.3.1)", "pytest-env (>=0.8.1)", "pytest-freezegun (>=0.4.2)", "pytest-mock (>=3.10)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)", "setuptools (>=67.7.1)", "time-machine (>=2.9)"]
+docs = ["furo (>=2023.5.20)", "proselint (>=0.13)", "sphinx (>=7.0.1)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"]
+test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.3.1)", "pytest-env (>=0.8.1)", "pytest-freezer (>=0.4.6)", "pytest-mock (>=3.10)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)", "setuptools (>=67.8)", "time-machine (>=2.9)"]
 
 [metadata]
 lock-version = "2.0"

From f780bef357b0da35da32c66b18e1d225efbbc0e7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 18 Jun 2023 21:27:12 +0000
Subject: [PATCH 02/10] chore(deps) Update pre-commit hook asottile/pyupgrade
 to v3.7.0

---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 291cd9ea0..b6f7a28c0 100644
--- 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.6.0
+  rev: v3.7.0
   hooks:
   - id: pyupgrade
     args: [--py36-plus]

From 5b6d680cf84d1a2f43199daa7e50b5f758ab5b94 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 25 Jun 2023 06:11:43 +0000
Subject: [PATCH 03/10] chore(deps) Update all non-major dependencies

---
 .pre-commit-config.yaml |   2 +-
 poetry.lock             | 104 ++++++++++++++++++++--------------------
 pyproject.toml          |   2 +-
 3 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b6f7a28c0..0c6041f1a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -11,7 +11,7 @@ repos:
   - id: end-of-file-fixer
   - id: check-yaml
 - repo: https://github.com/myint/autoflake
-  rev: v2.1.1
+  rev: v2.2.0
   hooks:
   - id: autoflake
     exclude: &fixtures tests/functional/|tests/input|tests/extensions/data|tests/regrtest_data/|tests/data/
diff --git a/poetry.lock b/poetry.lock
index 75fc1b1a5..f19bc97c2 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -349,38 +349,38 @@ dev = ["hypothesis"]
 
 [[package]]
 name = "mypy"
-version = "1.3.0"
+version = "1.4.0"
 description = "Optional static typing for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "mypy-1.3.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c1eb485cea53f4f5284e5baf92902cd0088b24984f4209e25981cc359d64448d"},
-    {file = "mypy-1.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:4c99c3ecf223cf2952638da9cd82793d8f3c0c5fa8b6ae2b2d9ed1e1ff51ba85"},
-    {file = "mypy-1.3.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:550a8b3a19bb6589679a7c3c31f64312e7ff482a816c96e0cecec9ad3a7564dd"},
-    {file = "mypy-1.3.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cbc07246253b9e3d7d74c9ff948cd0fd7a71afcc2b77c7f0a59c26e9395cb152"},
-    {file = "mypy-1.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:a22435632710a4fcf8acf86cbd0d69f68ac389a3892cb23fbad176d1cddaf228"},
-    {file = "mypy-1.3.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6e33bb8b2613614a33dff70565f4c803f889ebd2f859466e42b46e1df76018dd"},
-    {file = "mypy-1.3.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:7d23370d2a6b7a71dc65d1266f9a34e4cde9e8e21511322415db4b26f46f6b8c"},
-    {file = "mypy-1.3.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:658fe7b674769a0770d4b26cb4d6f005e88a442fe82446f020be8e5f5efb2fae"},
-    {file = "mypy-1.3.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:6e42d29e324cdda61daaec2336c42512e59c7c375340bd202efa1fe0f7b8f8ca"},
-    {file = "mypy-1.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:d0b6c62206e04061e27009481cb0ec966f7d6172b5b936f3ead3d74f29fe3dcf"},
-    {file = "mypy-1.3.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:76ec771e2342f1b558c36d49900dfe81d140361dd0d2df6cd71b3db1be155409"},
-    {file = "mypy-1.3.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ebc95f8386314272bbc817026f8ce8f4f0d2ef7ae44f947c4664efac9adec929"},
-    {file = "mypy-1.3.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:faff86aa10c1aa4a10e1a301de160f3d8fc8703b88c7e98de46b531ff1276a9a"},
-    {file = "mypy-1.3.0-cp37-cp37m-win_amd64.whl", hash = "sha256:8c5979d0deb27e0f4479bee18ea0f83732a893e81b78e62e2dda3e7e518c92ee"},
-    {file = "mypy-1.3.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:c5d2cc54175bab47011b09688b418db71403aefad07cbcd62d44010543fc143f"},
-    {file = "mypy-1.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:87df44954c31d86df96c8bd6e80dfcd773473e877ac6176a8e29898bfb3501cb"},
-    {file = "mypy-1.3.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:473117e310febe632ddf10e745a355714e771ffe534f06db40702775056614c4"},
-    {file = "mypy-1.3.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:74bc9b6e0e79808bf8678d7678b2ae3736ea72d56eede3820bd3849823e7f305"},
-    {file = "mypy-1.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:44797d031a41516fcf5cbfa652265bb994e53e51994c1bd649ffcd0c3a7eccbf"},
-    {file = "mypy-1.3.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:ddae0f39ca146972ff6bb4399f3b2943884a774b8771ea0a8f50e971f5ea5ba8"},
-    {file = "mypy-1.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1c4c42c60a8103ead4c1c060ac3cdd3ff01e18fddce6f1016e08939647a0e703"},
-    {file = "mypy-1.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e86c2c6852f62f8f2b24cb7a613ebe8e0c7dc1402c61d36a609174f63e0ff017"},
-    {file = "mypy-1.3.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:f9dca1e257d4cc129517779226753dbefb4f2266c4eaad610fc15c6a7e14283e"},
-    {file = "mypy-1.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:95d8d31a7713510685b05fbb18d6ac287a56c8f6554d88c19e73f724a445448a"},
-    {file = "mypy-1.3.0-py3-none-any.whl", hash = "sha256:a8763e72d5d9574d45ce5881962bc8e9046bf7b375b0abf031f3e6811732a897"},
-    {file = "mypy-1.3.0.tar.gz", hash = "sha256:e1f4d16e296f5135624b34e8fb741eb0eadedca90862405b1f1fde2040b9bd11"},
+    {file = "mypy-1.4.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a3af348e0925a59213244f28c7c0c3a2c2088b4ba2fe9d6c8d4fbb0aba0b7d05"},
+    {file = "mypy-1.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a0b2e0da7ff9dd8d2066d093d35a169305fc4e38db378281fce096768a3dbdbf"},
+    {file = "mypy-1.4.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:210fe0f39ec5be45dd9d0de253cb79245f0a6f27631d62e0c9c7988be7152965"},
+    {file = "mypy-1.4.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:f7a5971490fd4a5a436e143105a1f78fa8b3fe95b30fff2a77542b4f3227a01f"},
+    {file = "mypy-1.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:50f65f0e9985f1e50040e603baebab83efed9eb37e15a22a4246fa7cd660f981"},
+    {file = "mypy-1.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3b1b5c875fcf3e7217a3de7f708166f641ca154b589664c44a6fd6d9f17d9e7e"},
+    {file = "mypy-1.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b4c734d947e761c7ceb1f09a98359dd5666460acbc39f7d0a6b6beec373c5840"},
+    {file = "mypy-1.4.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f5984a8d13d35624e3b235a793c814433d810acba9eeefe665cdfed3d08bc3af"},
+    {file = "mypy-1.4.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:0f98973e39e4a98709546a9afd82e1ffcc50c6ec9ce6f7870f33ebbf0bd4f26d"},
+    {file = "mypy-1.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:19d42b08c7532d736a7e0fb29525855e355fa51fd6aef4f9bbc80749ff64b1a2"},
+    {file = "mypy-1.4.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:6ba9a69172abaa73910643744d3848877d6aac4a20c41742027dcfd8d78f05d9"},
+    {file = "mypy-1.4.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a34eed094c16cad0f6b0d889811592c7a9b7acf10d10a7356349e325d8704b4f"},
+    {file = "mypy-1.4.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:53c2a1fed81e05ded10a4557fe12bae05b9ecf9153f162c662a71d924d504135"},
+    {file = "mypy-1.4.0-cp37-cp37m-win_amd64.whl", hash = "sha256:bba57b4d2328740749f676807fcf3036e9de723530781405cc5a5e41fc6e20de"},
+    {file = "mypy-1.4.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:653863c75f0dbb687d92eb0d4bd9fe7047d096987ecac93bb7b1bc336de48ebd"},
+    {file = "mypy-1.4.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7461469e163f87a087a5e7aa224102a30f037c11a096a0ceeb721cb0dce274c8"},
+    {file = "mypy-1.4.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0cf0ca95e4b8adeaf07815a78b4096b65adf64ea7871b39a2116c19497fcd0dd"},
+    {file = "mypy-1.4.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:94a81b9354545123feb1a99b960faeff9e1fa204fce47e0042335b473d71530d"},
+    {file = "mypy-1.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:67242d5b28ed0fa88edd8f880aed24da481929467fdbca6487167cb5e3fd31ff"},
+    {file = "mypy-1.4.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3f2b353eebef669529d9bd5ae3566905a685ae98b3af3aad7476d0d519714758"},
+    {file = "mypy-1.4.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:62bf18d97c6b089f77f0067b4e321db089d8520cdeefc6ae3ec0f873621c22e5"},
+    {file = "mypy-1.4.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ca33ab70a4aaa75bb01086a0b04f0ba8441e51e06fc57e28585176b08cad533b"},
+    {file = "mypy-1.4.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5a0ee54c2cb0f957f8a6f41794d68f1a7e32b9968675ade5846f538504856d42"},
+    {file = "mypy-1.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:6c34d43e3d54ad05024576aef28081d9d0580f6fa7f131255f54020eb12f5352"},
+    {file = "mypy-1.4.0-py3-none-any.whl", hash = "sha256:f051ca656be0c179c735a4c3193f307d34c92fdc4908d44fd4516fbe8b10567d"},
+    {file = "mypy-1.4.0.tar.gz", hash = "sha256:de1e7e68148a213036276d1f5303b3836ad9a774188961eb2684eddff593b042"},
 ]
 
 [package.dependencies]
@@ -484,14 +484,14 @@ testing = ["covdefaults (>=2.3)", "importlib-metadata (>=6.6)", "pytest (>=7.3.1
 
 [[package]]
 name = "pytest"
-version = "7.3.2"
+version = "7.4.0"
 description = "pytest: simple powerful testing with Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "pytest-7.3.2-py3-none-any.whl", hash = "sha256:cdcbd012c9312258922f8cd3f1b62a6580fdced17db6014896053d47cddf9295"},
-    {file = "pytest-7.3.2.tar.gz", hash = "sha256:ee990a3cc55ba808b80795a79944756f315c67c12b56abd3ac993a7b8c17030b"},
+    {file = "pytest-7.4.0-py3-none-any.whl", hash = "sha256:78bf16451a2eb8c7a2ea98e32dc119fd2aa758f1d5d66dbf0a59d69a3969df32"},
+    {file = "pytest-7.4.0.tar.gz", hash = "sha256:b4bf8c45bd59934ed84001ad51e11b4ee40d40a1229d2c79f9c592b0a3f6bd8a"},
 ]
 
 [package.dependencies]
@@ -695,29 +695,29 @@ files = [
 
 [[package]]
 name = "ruff"
-version = "0.0.272"
+version = "0.0.275"
 description = "An extremely fast Python linter, written in Rust."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "ruff-0.0.272-py3-none-macosx_10_7_x86_64.whl", hash = "sha256:ae9b57546e118660175d45d264b87e9b4c19405c75b587b6e4d21e6a17bf4fdf"},
-    {file = "ruff-0.0.272-py3-none-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:1609b864a8d7ee75a8c07578bdea0a7db75a144404e75ef3162e0042bfdc100d"},
-    {file = "ruff-0.0.272-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ee76b4f05fcfff37bd6ac209d1370520d509ea70b5a637bdf0a04d0c99e13dff"},
-    {file = "ruff-0.0.272-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:48eccf225615e106341a641f826b15224b8a4240b84269ead62f0afd6d7e2d95"},
-    {file = "ruff-0.0.272-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:677284430ac539bb23421a2b431b4ebc588097ef3ef918d0e0a8d8ed31fea216"},
-    {file = "ruff-0.0.272-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:9c4bfb75456a8e1efe14c52fcefb89cfb8f2a0d31ed8d804b82c6cf2dc29c42c"},
-    {file = "ruff-0.0.272-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:86bc788245361a8148ff98667da938a01e1606b28a45e50ac977b09d3ad2c538"},
-    {file = "ruff-0.0.272-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:27b2ea68d2aa69fff1b20b67636b1e3e22a6a39e476c880da1282c3e4bf6ee5a"},
-    {file = "ruff-0.0.272-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bd2bbe337a3f84958f796c77820d55ac2db1e6753f39d1d1baed44e07f13f96d"},
-    {file = "ruff-0.0.272-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:d5a208f8ef0e51d4746930589f54f9f92f84bb69a7d15b1de34ce80a7681bc00"},
-    {file = "ruff-0.0.272-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:905ff8f3d6206ad56fcd70674453527b9011c8b0dc73ead27618426feff6908e"},
-    {file = "ruff-0.0.272-py3-none-musllinux_1_2_i686.whl", hash = "sha256:19643d448f76b1eb8a764719072e9c885968971bfba872e14e7257e08bc2f2b7"},
-    {file = "ruff-0.0.272-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:691d72a00a99707a4e0b2846690961157aef7b17b6b884f6b4420a9f25cd39b5"},
-    {file = "ruff-0.0.272-py3-none-win32.whl", hash = "sha256:dc406e5d756d932da95f3af082814d2467943631a587339ee65e5a4f4fbe83eb"},
-    {file = "ruff-0.0.272-py3-none-win_amd64.whl", hash = "sha256:a37ec80e238ead2969b746d7d1b6b0d31aa799498e9ba4281ab505b93e1f4b28"},
-    {file = "ruff-0.0.272-py3-none-win_arm64.whl", hash = "sha256:06b8ee4eb8711ab119db51028dd9f5384b44728c23586424fd6e241a5b9c4a3b"},
-    {file = "ruff-0.0.272.tar.gz", hash = "sha256:273a01dc8c3c4fd4c2af7ea7a67c8d39bb09bce466e640dd170034da75d14cab"},
+    {file = "ruff-0.0.275-py3-none-macosx_10_7_x86_64.whl", hash = "sha256:5e6554a072e7ce81eb6f0bec1cebd3dcb0e358652c0f4900d7d630d61691e914"},
+    {file = "ruff-0.0.275-py3-none-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:1cc599022fe5ffb143a965b8d659eb64161ab8ab4433d208777eab018a1aab67"},
+    {file = "ruff-0.0.275-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5206fc1cd8c1c1deadd2e6360c0dbcd690f1c845da588ca9d32e4a764a402c60"},
+    {file = "ruff-0.0.275-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0c4e6468da26f77b90cae35319d310999f471a8c352998e9b39937a23750149e"},
+    {file = "ruff-0.0.275-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0dbdea02942131dbc15dd45f431d152224f15e1dd1859fcd0c0487b658f60f1a"},
+    {file = "ruff-0.0.275-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:22efd9f41af27ef8fb9779462c46c35c89134d33e326c889971e10b2eaf50c63"},
+    {file = "ruff-0.0.275-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2c09662112cfa22d7467a19252a546291fd0eae4f423e52b75a7a2000a1894db"},
+    {file = "ruff-0.0.275-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:80043726662144876a381efaab88841c88e8df8baa69559f96b22d4fa216bef1"},
+    {file = "ruff-0.0.275-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5859ee543b01b7eb67835dfd505faa8bb7cc1550f0295c92c1401b45b42be399"},
+    {file = "ruff-0.0.275-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:c8ace4d40a57b5ea3c16555f25a6b16bc5d8b2779ae1912ce2633543d4e9b1da"},
+    {file = "ruff-0.0.275-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:8347fc16aa185aae275906c4ac5b770e00c896b6a0acd5ba521f158801911998"},
+    {file = "ruff-0.0.275-py3-none-musllinux_1_2_i686.whl", hash = "sha256:ec43658c64bfda44fd84bbea9da8c7a3b34f65448192d1c4dd63e9f4e7abfdd4"},
+    {file = "ruff-0.0.275-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:508b13f7ca37274cceaba4fb3ea5da6ca192356323d92acf39462337c33ad14e"},
+    {file = "ruff-0.0.275-py3-none-win32.whl", hash = "sha256:6afb1c4422f24f361e877937e2a44b3f8176774a476f5e33845ebfe887dd5ec2"},
+    {file = "ruff-0.0.275-py3-none-win_amd64.whl", hash = "sha256:d9b264d78621bf7b698b6755d4913ab52c19bd28bee1a16001f954d64c1a1220"},
+    {file = "ruff-0.0.275-py3-none-win_arm64.whl", hash = "sha256:a19ce3bea71023eee5f0f089dde4a4272d088d5ac0b675867e074983238ccc65"},
+    {file = "ruff-0.0.275.tar.gz", hash = "sha256:a63a0b645da699ae5c758fce19188e901b3033ec54d862d93fcd042addf7f38d"},
 ]
 
 [[package]]
@@ -746,14 +746,14 @@ files = [
 
 [[package]]
 name = "tox"
-version = "4.6.2"
+version = "4.6.3"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "tox-4.6.2-py3-none-any.whl", hash = "sha256:52241851a7b0cd7de07d6ef067a13b092d2a4f82fe9048efb2444aed1708d713"},
-    {file = "tox-4.6.2.tar.gz", hash = "sha256:58c7c2acce2f3d44cd1b359349557162336288ecf19ef53ccda89c9cee0ad9c4"},
+    {file = "tox-4.6.3-py3-none-any.whl", hash = "sha256:2946a0bb38924c3a9f9575c7fb4ca1f4c11a7c69c61592f176778892155cb50c"},
+    {file = "tox-4.6.3.tar.gz", hash = "sha256:9e2c5091a117d03b583c57c4c40aecd068099c17d40520e7b165e85c19334534"},
 ]
 
 [package.dependencies]
@@ -841,4 +841,4 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.8.0,<4.0"
-content-hash = "a47a25d840e34e0ac7a3048da2afea1e6d3f2929620fa01995fde5ed41517c5f"
+content-hash = "b43ea6864740bf6e2dbe155a4fa2f1ec6cf46cd6bcb841e198e88f0e70a4a352"
diff --git a/pyproject.toml b/pyproject.toml
index b5ce66d92..66ce7f543 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -51,7 +51,7 @@ coverage = "^7.2.2"
 pytest = "^7.2.2"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.2.1"
-ruff = "^0.0.272"
+ruff = "^0.0.275"
 mypy = "^1.1.1"
 types-pyyaml = "^6.0.12.8"
 tox = "^4.4.8"

From bc15080b3d682e3f72e68080ff2ca6960a800477 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 26 Jun 2023 01:25:18 +0000
Subject: [PATCH 04/10] chore(deps) Update dependency mypy to v1.4.1

---
 poetry.lock | 56 ++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index f19bc97c2..61dc1df47 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -349,44 +349,44 @@ dev = ["hypothesis"]
 
 [[package]]
 name = "mypy"
-version = "1.4.0"
+version = "1.4.1"
 description = "Optional static typing for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "mypy-1.4.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a3af348e0925a59213244f28c7c0c3a2c2088b4ba2fe9d6c8d4fbb0aba0b7d05"},
-    {file = "mypy-1.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a0b2e0da7ff9dd8d2066d093d35a169305fc4e38db378281fce096768a3dbdbf"},
-    {file = "mypy-1.4.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:210fe0f39ec5be45dd9d0de253cb79245f0a6f27631d62e0c9c7988be7152965"},
-    {file = "mypy-1.4.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:f7a5971490fd4a5a436e143105a1f78fa8b3fe95b30fff2a77542b4f3227a01f"},
-    {file = "mypy-1.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:50f65f0e9985f1e50040e603baebab83efed9eb37e15a22a4246fa7cd660f981"},
-    {file = "mypy-1.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3b1b5c875fcf3e7217a3de7f708166f641ca154b589664c44a6fd6d9f17d9e7e"},
-    {file = "mypy-1.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b4c734d947e761c7ceb1f09a98359dd5666460acbc39f7d0a6b6beec373c5840"},
-    {file = "mypy-1.4.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f5984a8d13d35624e3b235a793c814433d810acba9eeefe665cdfed3d08bc3af"},
-    {file = "mypy-1.4.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:0f98973e39e4a98709546a9afd82e1ffcc50c6ec9ce6f7870f33ebbf0bd4f26d"},
-    {file = "mypy-1.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:19d42b08c7532d736a7e0fb29525855e355fa51fd6aef4f9bbc80749ff64b1a2"},
-    {file = "mypy-1.4.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:6ba9a69172abaa73910643744d3848877d6aac4a20c41742027dcfd8d78f05d9"},
-    {file = "mypy-1.4.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a34eed094c16cad0f6b0d889811592c7a9b7acf10d10a7356349e325d8704b4f"},
-    {file = "mypy-1.4.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:53c2a1fed81e05ded10a4557fe12bae05b9ecf9153f162c662a71d924d504135"},
-    {file = "mypy-1.4.0-cp37-cp37m-win_amd64.whl", hash = "sha256:bba57b4d2328740749f676807fcf3036e9de723530781405cc5a5e41fc6e20de"},
-    {file = "mypy-1.4.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:653863c75f0dbb687d92eb0d4bd9fe7047d096987ecac93bb7b1bc336de48ebd"},
-    {file = "mypy-1.4.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7461469e163f87a087a5e7aa224102a30f037c11a096a0ceeb721cb0dce274c8"},
-    {file = "mypy-1.4.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0cf0ca95e4b8adeaf07815a78b4096b65adf64ea7871b39a2116c19497fcd0dd"},
-    {file = "mypy-1.4.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:94a81b9354545123feb1a99b960faeff9e1fa204fce47e0042335b473d71530d"},
-    {file = "mypy-1.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:67242d5b28ed0fa88edd8f880aed24da481929467fdbca6487167cb5e3fd31ff"},
-    {file = "mypy-1.4.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3f2b353eebef669529d9bd5ae3566905a685ae98b3af3aad7476d0d519714758"},
-    {file = "mypy-1.4.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:62bf18d97c6b089f77f0067b4e321db089d8520cdeefc6ae3ec0f873621c22e5"},
-    {file = "mypy-1.4.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ca33ab70a4aaa75bb01086a0b04f0ba8441e51e06fc57e28585176b08cad533b"},
-    {file = "mypy-1.4.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5a0ee54c2cb0f957f8a6f41794d68f1a7e32b9968675ade5846f538504856d42"},
-    {file = "mypy-1.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:6c34d43e3d54ad05024576aef28081d9d0580f6fa7f131255f54020eb12f5352"},
-    {file = "mypy-1.4.0-py3-none-any.whl", hash = "sha256:f051ca656be0c179c735a4c3193f307d34c92fdc4908d44fd4516fbe8b10567d"},
-    {file = "mypy-1.4.0.tar.gz", hash = "sha256:de1e7e68148a213036276d1f5303b3836ad9a774188961eb2684eddff593b042"},
+    {file = "mypy-1.4.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:566e72b0cd6598503e48ea610e0052d1b8168e60a46e0bfd34b3acf2d57f96a8"},
+    {file = "mypy-1.4.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ca637024ca67ab24a7fd6f65d280572c3794665eaf5edcc7e90a866544076878"},
+    {file = "mypy-1.4.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0dde1d180cd84f0624c5dcaaa89c89775550a675aff96b5848de78fb11adabcd"},
+    {file = "mypy-1.4.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:8c4d8e89aa7de683e2056a581ce63c46a0c41e31bd2b6d34144e2c80f5ea53dc"},
+    {file = "mypy-1.4.1-cp310-cp310-win_amd64.whl", hash = "sha256:bfdca17c36ae01a21274a3c387a63aa1aafe72bff976522886869ef131b937f1"},
+    {file = "mypy-1.4.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:7549fbf655e5825d787bbc9ecf6028731973f78088fbca3a1f4145c39ef09462"},
+    {file = "mypy-1.4.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:98324ec3ecf12296e6422939e54763faedbfcc502ea4a4c38502082711867258"},
+    {file = "mypy-1.4.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:141dedfdbfe8a04142881ff30ce6e6653c9685b354876b12e4fe6c78598b45e2"},
+    {file = "mypy-1.4.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:8207b7105829eca6f3d774f64a904190bb2231de91b8b186d21ffd98005f14a7"},
+    {file = "mypy-1.4.1-cp311-cp311-win_amd64.whl", hash = "sha256:16f0db5b641ba159eff72cff08edc3875f2b62b2fa2bc24f68c1e7a4e8232d01"},
+    {file = "mypy-1.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:470c969bb3f9a9efcedbadcd19a74ffb34a25f8e6b0e02dae7c0e71f8372f97b"},
+    {file = "mypy-1.4.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e5952d2d18b79f7dc25e62e014fe5a23eb1a3d2bc66318df8988a01b1a037c5b"},
+    {file = "mypy-1.4.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:190b6bab0302cec4e9e6767d3eb66085aef2a1cc98fe04936d8a42ed2ba77bb7"},
+    {file = "mypy-1.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:9d40652cc4fe33871ad3338581dca3297ff5f2213d0df345bcfbde5162abf0c9"},
+    {file = "mypy-1.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:01fd2e9f85622d981fd9063bfaef1aed6e336eaacca00892cd2d82801ab7c042"},
+    {file = "mypy-1.4.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2460a58faeea905aeb1b9b36f5065f2dc9a9c6e4c992a6499a2360c6c74ceca3"},
+    {file = "mypy-1.4.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a2746d69a8196698146a3dbe29104f9eb6a2a4d8a27878d92169a6c0b74435b6"},
+    {file = "mypy-1.4.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ae704dcfaa180ff7c4cfbad23e74321a2b774f92ca77fd94ce1049175a21c97f"},
+    {file = "mypy-1.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:43d24f6437925ce50139a310a64b2ab048cb2d3694c84c71c3f2a1626d8101dc"},
+    {file = "mypy-1.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c482e1246726616088532b5e964e39765b6d1520791348e6c9dc3af25b233828"},
+    {file = "mypy-1.4.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:43b592511672017f5b1a483527fd2684347fdffc041c9ef53428c8dc530f79a3"},
+    {file = "mypy-1.4.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:34a9239d5b3502c17f07fd7c0b2ae6b7dd7d7f6af35fbb5072c6208e76295816"},
+    {file = "mypy-1.4.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5703097c4936bbb9e9bce41478c8d08edd2865e177dc4c52be759f81ee4dd26c"},
+    {file = "mypy-1.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:e02d700ec8d9b1859790c0475df4e4092c7bf3272a4fd2c9f33d87fac4427b8f"},
+    {file = "mypy-1.4.1-py3-none-any.whl", hash = "sha256:45d32cec14e7b97af848bddd97d85ea4f0db4d5a149ed9676caa4eb2f7402bb4"},
+    {file = "mypy-1.4.1.tar.gz", hash = "sha256:9bbcd9ab8ea1f2e1c8031c21445b511442cc45c89951e49bbf852cbb70755b1b"},
 ]
 
 [package.dependencies]
 mypy-extensions = ">=1.0.0"
 tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""}
-typing-extensions = ">=3.10"
+typing-extensions = ">=4.1.0"
 
 [package.extras]
 dmypy = ["psutil (>=4.0)"]

From 6d63a6a83947caa7a45d71cf5953225b5147b3bf Mon Sep 17 00:00:00 2001
From: Christopher Pickering <christopher@going.bg>
Date: Mon, 26 Jun 2023 10:11:20 -0500
Subject: [PATCH 05/10] fix(formatter): fixed function formatting with nested
 quoted parenthesis

closes #698
---
 poetry.lock                           | 28 +++++++++++++--------------
 src/djlint/formatter/indent.py        |  2 +-
 tests/test_nunjucks/test_functions.py |  6 ++++++
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 61dc1df47..e031f17dd 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.4.2 and should not be changed by hand.
+# This file is automatically @generated by Poetry and should not be changed by hand.
 
 [[package]]
 name = "black"
@@ -432,14 +432,14 @@ files = [
 
 [[package]]
 name = "platformdirs"
-version = "3.6.0"
+version = "3.8.0"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "platformdirs-3.6.0-py3-none-any.whl", hash = "sha256:ffa199e3fbab8365778c4a10e1fbf1b9cd50707de826eb304b50e57ec0cc8d38"},
-    {file = "platformdirs-3.6.0.tar.gz", hash = "sha256:57e28820ca8094678b807ff529196506d7a21e17156cb1cddb3e74cebce54640"},
+    {file = "platformdirs-3.8.0-py3-none-any.whl", hash = "sha256:ca9ed98ce73076ba72e092b23d3c93ea6c4e186b3f1c3dad6edd98ff6ffcca2e"},
+    {file = "platformdirs-3.8.0.tar.gz", hash = "sha256:b0cabcb11063d21a0b261d557acb0a9d2126350e63b70cdf7db6347baea456dc"},
 ]
 
 [package.extras]
@@ -448,14 +448,14 @@ test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.3.1)", "pytest-
 
 [[package]]
 name = "pluggy"
-version = "1.0.0"
+version = "1.2.0"
 description = "plugin and hook calling mechanisms for python"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 files = [
-    {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
-    {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
+    {file = "pluggy-1.2.0-py3-none-any.whl", hash = "sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849"},
+    {file = "pluggy-1.2.0.tar.gz", hash = "sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3"},
 ]
 
 [package.extras]
@@ -795,26 +795,26 @@ telegram = ["requests"]
 
 [[package]]
 name = "types-pyyaml"
-version = "6.0.12.9"
+version = "6.0.12.10"
 description = "Typing stubs for PyYAML"
 category = "dev"
 optional = false
 python-versions = "*"
 files = [
-    {file = "types-PyYAML-6.0.12.9.tar.gz", hash = "sha256:c51b1bd6d99ddf0aa2884a7a328810ebf70a4262c292195d3f4f9a0005f9eeb6"},
-    {file = "types_PyYAML-6.0.12.9-py3-none-any.whl", hash = "sha256:5aed5aa66bd2d2e158f75dda22b059570ede988559f030cf294871d3b647e3e8"},
+    {file = "types-PyYAML-6.0.12.10.tar.gz", hash = "sha256:ebab3d0700b946553724ae6ca636ea932c1b0868701d4af121630e78d695fc97"},
+    {file = "types_PyYAML-6.0.12.10-py3-none-any.whl", hash = "sha256:662fa444963eff9b68120d70cda1af5a5f2aa57900003c2006d7626450eaae5f"},
 ]
 
 [[package]]
 name = "typing-extensions"
-version = "4.5.0"
+version = "4.6.3"
 description = "Backported and Experimental Type Hints for Python 3.7+"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "typing_extensions-4.5.0-py3-none-any.whl", hash = "sha256:fb33085c39dd998ac16d1431ebc293a8b3eedd00fd4a32de0ff79002c19511b4"},
-    {file = "typing_extensions-4.5.0.tar.gz", hash = "sha256:5cb5f4a79139d699607b3ef622a1dedafa84e115ab0024e0d9c044a9479ca7cb"},
+    {file = "typing_extensions-4.6.3-py3-none-any.whl", hash = "sha256:88a4153d8505aabbb4e13aacb7c486c2b4a33ca3b3f807914a9b4c844c471c26"},
+    {file = "typing_extensions-4.6.3.tar.gz", hash = "sha256:d91d5919357fe7f681a9f2b5b4cb2a5f1ef0a1e9f59c4d8ff0d3491e05c0ffd5"},
 ]
 
 [[package]]
diff --git a/src/djlint/formatter/indent.py b/src/djlint/formatter/indent.py
index 6f2a545ad..8a8bccef5 100644
--- a/src/djlint/formatter/indent.py
+++ b/src/djlint/formatter/indent.py
@@ -414,7 +414,7 @@ def format_function(config: Config, html: str, match: re.Match) -> str:
         # format function contents
         beautified_code = re.sub(
             re.compile(
-                r"([ ]*)({{-?\+?)[ ]*?((?:(?!}}).)*?\w)(\([^\)]*?\)[ ]*)((?:(?!}}).)*?-?\+?}})",
+                r"([ ]*)({{-?\+?)[ ]*?((?:(?!}}).)*?\w)(\((?:\"[^\"]*\"|'[^']*'|[^\)])*?\)[ ]*)((?:(?!}}).)*?-?\+?}})",
                 flags=re.IGNORECASE | re.MULTILINE | re.VERBOSE | re.DOTALL,
             ),
             func,
diff --git a/tests/test_nunjucks/test_functions.py b/tests/test_nunjucks/test_functions.py
index 3270a5dac..26d7bd9d9 100644
--- a/tests/test_nunjucks/test_functions.py
+++ b/tests/test_nunjucks/test_functions.py
@@ -22,6 +22,12 @@
         ({}),
         id="long line",
     ),
+    pytest.param(
+        ('<span class="nav">{{ _("Orders (Selling)") }}</span>'),
+        ('<span class="nav">{{ _("Orders (Selling)") }}</span>\n'),
+        ({}),
+        id="test quoting",
+    ),
     pytest.param(
         (
             "{{ myfunc({\n"

From a1972008630dad54b0aa1e90cf6e8ef4192ff938 Mon Sep 17 00:00:00 2001
From: Christopher Pickering <christopher@going.bg>
Date: Mon, 26 Jun 2023 10:41:03 -0500
Subject: [PATCH 06/10] fix(formatter): function index was not formatted
 correctly

closes #693
---
 src/djlint/formatter/indent.py        | 7 ++++---
 tests/test_nunjucks/test_functions.py | 6 ++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/djlint/formatter/indent.py b/src/djlint/formatter/indent.py
index 8a8bccef5..c73553427 100644
--- a/src/djlint/formatter/indent.py
+++ b/src/djlint/formatter/indent.py
@@ -387,7 +387,8 @@ def format_function(config: Config, html: str, match: re.Match) -> str:
         leading_space = match.group(1)
         open_bracket = match.group(2)
         tag = match.group(3).strip()
-        close_bracket = match.group(5)
+        index = (match.group(5) or "").strip()
+        close_bracket = match.group(6)
         contents = format_data(
             config,
             match.group(4).strip()[1:-1],
@@ -395,7 +396,7 @@ def format_function(config: Config, html: str, match: re.Match) -> str:
             leading_space,
         )
 
-        return f"{leading_space}{open_bracket} {tag}({contents}) {close_bracket}"
+        return f"{leading_space}{open_bracket} {tag}({contents}){index} {close_bracket}"
 
     if config.no_set_formatting is False:
         func = partial(format_set, config, beautified_code)
@@ -414,7 +415,7 @@ def format_function(config: Config, html: str, match: re.Match) -> str:
         # format function contents
         beautified_code = re.sub(
             re.compile(
-                r"([ ]*)({{-?\+?)[ ]*?((?:(?!}}).)*?\w)(\((?:\"[^\"]*\"|'[^']*'|[^\)])*?\)[ ]*)((?:(?!}}).)*?-?\+?}})",
+                r"([ ]*)({{-?\+?)[ ]*?((?:(?!}}).)*?\w)(\((?:\"[^\"]*\"|'[^']*'|[^\)])*?\)[ ]*)((?:\[[^\]]*?\]|\.\d+)[ ]*)?((?:(?!}}).)*?-?\+?}})",
                 flags=re.IGNORECASE | re.MULTILINE | re.VERBOSE | re.DOTALL,
             ),
             func,
diff --git a/tests/test_nunjucks/test_functions.py b/tests/test_nunjucks/test_functions.py
index 26d7bd9d9..cf5fede77 100644
--- a/tests/test_nunjucks/test_functions.py
+++ b/tests/test_nunjucks/test_functions.py
@@ -28,6 +28,12 @@
         ({}),
         id="test quoting",
     ),
+    pytest.param(
+        ('{{ item.split("/")[1] }}\n' '{{ item.split("/").123 }}'),
+        ('{{ item.split("/")[1] }}\n' '{{ item.split("/").123 }}\n'),
+        ({}),
+        id="test index",
+    ),
     pytest.param(
         (
             "{{ myfunc({\n"

From 5c75d87a1bcce9189d5b8a561d4ea6a92c1ee1bb Mon Sep 17 00:00:00 2001
From: Christopher Pickering <christopher@going.bg>
Date: Mon, 26 Jun 2023 12:43:49 -0500
Subject: [PATCH 07/10] fix(formatter): fixed formatter formatting ignored code

closes #655
---
 src/djlint/settings.py           |  3 ++-
 tests/test_djlint/test_ignore.py | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 tests/test_djlint/test_ignore.py

diff --git a/src/djlint/settings.py b/src/djlint/settings.py
index 010a24d12..470c67a2a 100644
--- a/src/djlint/settings.py
+++ b/src/djlint/settings.py
@@ -760,7 +760,8 @@ def __init__(
             # html comment
             | <!--\s*djlint\:off\s*-->.*?(?=<!--\s*djlint\:on\s*-->)
             # django/jinja/nunjucks
-            | {\#\s*djlint\:\s*off\s*\#}.*?(?={\#\s*djlint\:\s*on\s*\#})
+            | {\#\s*djlint\:\s*off\s*\#}(?:(?!{\#\s*djlint\:\s*on\s*\#}).)*
+            # | {\#\s*djlint\:\s*off\s*\#}.*?(?={\#\s*djlint\:\s*on\s*\#})
             | {%\s*comment\s*%\}\s*djlint\:off\s*\{%\s*endcomment\s*%\}.*?(?={%\s*comment\s*%\}\s*djlint\:on\s*\{%\s*endcomment\s*%\})
             # inline jinja comments
             | {\#(?!\s*djlint\:\s*(?:off|on)).*?\#}
diff --git a/tests/test_djlint/test_ignore.py b/tests/test_djlint/test_ignore.py
new file mode 100644
index 000000000..cd62b67ad
--- /dev/null
+++ b/tests/test_djlint/test_ignore.py
@@ -0,0 +1,24 @@
+"""Test disable.
+
+poetry run pytest tests/test_djlint/test_ignore.py
+"""
+import pytest
+
+from src.djlint.reformat import formatter
+from tests.conftest import printer
+
+test_data = [
+    pytest.param(
+        ("{# djlint:off #}\n" "<img \n" "/>"),
+        ("{# djlint:off #}\n" "<img \n" "/>\n"),
+        id="don't compress",
+    ),
+]
+
+
+@pytest.mark.parametrize(("source", "expected"), test_data)
+def test_base(source, expected, basic_config):
+    output = formatter(basic_config, source)
+
+    printer(expected, source, output)
+    assert expected == output

From 75c3134da17862eff531b7594cbf5eb050614090 Mon Sep 17 00:00:00 2001
From: Christopher Pickering <christopher@going.bg>
Date: Mon, 26 Jun 2023 12:51:07 -0500
Subject: [PATCH 08/10] fix(formatter): fixed overgrabbing on template tag
 condensing

closes #686
---
 src/djlint/formatter/condense.py |  2 +-
 tests/test_django/test_for.py    | 35 ++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/djlint/formatter/condense.py b/src/djlint/formatter/condense.py
index ef27d6cb1..7ca4cc9c7 100644
--- a/src/djlint/formatter/condense.py
+++ b/src/djlint/formatter/condense.py
@@ -220,7 +220,7 @@ def if_blank_line_before_match(config: Config, html: str) -> bool:
     # jinja +%} and {%+ intentionally omitted.
     html = re.sub(
         re.compile(
-            rf"((?:\s|^){{%-?[ ]*?({config.optional_single_line_template_tags})(?:(?!\n|%}}).)*?%}})\s*([^%\n]*?)\s*?({{%-?[ ]+?end(\2)[ ]*?%}})",
+            rf"((?:\s|^){{%-?[ ]*?({config.optional_single_line_template_tags})\b(?:(?!\n|%}}).)*?%}})\s*([^%\n]*?)\s*?({{%-?[ ]+?end(\2)[ ]*?%}})",
             flags=re.IGNORECASE | re.MULTILINE | re.VERBOSE,
         ),
         func,
diff --git a/tests/test_django/test_for.py b/tests/test_django/test_for.py
index 6dfc04442..612b9741a 100644
--- a/tests/test_django/test_for.py
+++ b/tests/test_django/test_for.py
@@ -32,6 +32,41 @@
         ),
         id="test nested formfield",
     ),
+    pytest.param(
+        (
+            '<div class="form-inputs plans-form">\n'
+            '    <div class="trans-wrapper pos-comparator-flex">\n'
+            "        {% for field in POSOptimizer %}\n"
+            "            <div>\n"
+            "                <label>{{ field.label }}</label>\n"
+            "                {% formfield field show_label=False %}\n"
+            "            </div>\n"
+            "        {% endfor %}\n"
+            "        <div>\n"
+            "            <label>&nbsp</label>\n"
+            '            <button type="submit">{% trans "Calcola" %}</button>\n'
+            "        </div>\n"
+            "    </div>\n"
+            "</div>\n"
+        ),
+        (
+            '<div class="form-inputs plans-form">\n'
+            '    <div class="trans-wrapper pos-comparator-flex">\n'
+            "        {% for field in POSOptimizer %}\n"
+            "            <div>\n"
+            "                <label>{{ field.label }}</label>\n"
+            "                {% formfield field show_label=False %}\n"
+            "            </div>\n"
+            "        {% endfor %}\n"
+            "        <div>\n"
+            "            <label>&nbsp</label>\n"
+            '            <button type="submit">{% trans "Calcola" %}</button>\n'
+            "        </div>\n"
+            "    </div>\n"
+            "</div>\n"
+        ),
+        id="test nested formfield inside for",
+    ),
 ]
 
 

From f2a9511dab0e13070e6b23080a78b421444dc5aa Mon Sep 17 00:00:00 2001
From: Christopher Pickering <christopher@going.bg>
Date: Mon, 26 Jun 2023 12:54:45 -0500
Subject: [PATCH 09/10] chore(regex): cleaned up some regex for matching
 ignored blocks

---
 src/djlint/settings.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/djlint/settings.py b/src/djlint/settings.py
index 470c67a2a..5af975b8e 100644
--- a/src/djlint/settings.py
+++ b/src/djlint/settings.py
@@ -758,17 +758,16 @@ def __init__(
 
         self.unformatted_blocks: str = r"""
             # html comment
-            | <!--\s*djlint\:off\s*-->.*?(?=<!--\s*djlint\:on\s*-->)
+            | <!--\s*djlint\:off\s*-->.(?:(?!<!--\s*djlint\:on\s*-->).)*
             # django/jinja/nunjucks
             | {\#\s*djlint\:\s*off\s*\#}(?:(?!{\#\s*djlint\:\s*on\s*\#}).)*
-            # | {\#\s*djlint\:\s*off\s*\#}.*?(?={\#\s*djlint\:\s*on\s*\#})
-            | {%\s*comment\s*%\}\s*djlint\:off\s*\{%\s*endcomment\s*%\}.*?(?={%\s*comment\s*%\}\s*djlint\:on\s*\{%\s*endcomment\s*%\})
+            | {%\s*comment\s*%\}\s*djlint\:off\s*\{%\s*endcomment\s*%\}(?:(?!{%\s*comment\s*%\}\s*djlint\:on\s*\{%\s*endcomment\s*%\}).)*
             # inline jinja comments
             | {\#(?!\s*djlint\:\s*(?:off|on)).*?\#}
             # handlebars
-            | {{!--\s*djlint\:off\s*--}}.*?(?={{!--\s*djlint\:on\s*--}})
+            | {{!--\s*djlint\:off\s*--}}(?:(?!{{!--\s*djlint\:on\s*--}}).)*
             # golang
-            | {{-?\s*/\*\s*djlint\:off\s*\*/\s*-?}}.*?(?={{-?\s*/\*\s*djlint\:on\s*\*/\s*-?}})
+            | {{-?\s*/\*\s*djlint\:off\s*\*/\s*-?}}(?:(?!{{-?\s*/\*\s*djlint\:on\s*\*/\s*-?}}).)*
             | ^---[\s\S]+?---
         """
 
@@ -776,7 +775,7 @@ def __init__(
               <(pre|textarea).*?</(\1)>
             | <(script|style).*?(?=(\</(?:\3)>))
             # html comment
-            | <!--\s*djlint\:off\s*-->.*?(?=<!--\s*djlint\:on\s*-->)
+            | <!--\s*djlint\:off\s*-->.(?:(?!<!--\s*djlint\:on\s*-->).)*
             # django/jinja/nunjucks
             | {\#\s*djlint\:\s*off\s*\#}(?:(?!{\#\s*djlint\:\s*on\s*\#}).)*
             | {%\s*comment\s*%\}\s*djlint\:off\s*\{%\s*endcomment\s*%\}(?:(?!{%\s*comment\s*%\}\s*djlint\:on\s*\{%\s*endcomment\s*%\}).)*

From 7366ed56e8fec668589da0d68492b74944bd56bc Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Mon, 26 Jun 2023 18:34:08 +0000
Subject: [PATCH 10/10] chore(release): 1.31.1 [skip ci]

## [1.31.1](https://github.com/Riverside-Healthcare/djLint/compare/v1.31.0...v1.31.1) (2023-06-26)

### Bug Fixes

* **formatter:** fixed formatter formatting ignored code ([5c75d87](https://github.com/Riverside-Healthcare/djLint/commit/5c75d87a1bcce9189d5b8a561d4ea6a92c1ee1bb)), closes [#655](https://github.com/Riverside-Healthcare/djLint/issues/655)
* **formatter:** fixed function formatting with nested quoted parenthesis ([6d63a6a](https://github.com/Riverside-Healthcare/djLint/commit/6d63a6a83947caa7a45d71cf5953225b5147b3bf)), closes [#698](https://github.com/Riverside-Healthcare/djLint/issues/698)
* **formatter:** fixed overgrabbing on template tag condensing ([75c3134](https://github.com/Riverside-Healthcare/djLint/commit/75c3134da17862eff531b7594cbf5eb050614090)), closes [#686](https://github.com/Riverside-Healthcare/djLint/issues/686)
* **formatter:** function index was not formatted correctly ([a197200](https://github.com/Riverside-Healthcare/djLint/commit/a1972008630dad54b0aa1e90cf6e8ef4192ff938)), closes [#693](https://github.com/Riverside-Healthcare/djLint/issues/693)
---
 .../py/cssbeautifier-99-py3-none-any.whl      | Bin 30144 -> 30144 bytes
 docs/src/static/py/djlint-99-py3-none-any.whl | Bin 48542 -> 48582 bytes
 .../py/jsbeautifier-99-py3-none-any.whl       | Bin 93957 -> 93957 bytes
 package.json                                  |   4 ++--
 pyproject.toml                                |   2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/src/static/py/cssbeautifier-99-py3-none-any.whl b/docs/src/static/py/cssbeautifier-99-py3-none-any.whl
index 08d034a37aba62ce9507440b6ae8ea2c240747aa..3c95104ba0f3e025b24b3cdab3b20dde152c3d7d 100644
GIT binary patch
delta 91
zcmX@`n(@GE#tl1im`$hL+Ppi*oDsyB{55wrn4X+h1*Qe^!@&x&@@KPv1vpBAz;tYh
UKbT%$5(TDtO2G;zr<Fzl0D-3{L;wH)

delta 91
zcmX@`n(@GE#tl1in3t?Mvw3%pIU|TM`D^ZMFg-c13QP;+hl3Sl<<DjT3viSKf$7*1
Ue=xniBnnLPl!6sbPAiQ908jEP{r~^~

diff --git a/docs/src/static/py/djlint-99-py3-none-any.whl b/docs/src/static/py/djlint-99-py3-none-any.whl
index 5da2692cbe6071d6ad68102b6f3d4eedd60869fc..40fb8211d07dceb5830b07772e6883bbebf1bcd4 100644
GIT binary patch
delta 13635
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

delta 13657
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

diff --git a/docs/src/static/py/jsbeautifier-99-py3-none-any.whl b/docs/src/static/py/jsbeautifier-99-py3-none-any.whl
index e06a87fa026db301da49ba37e29fa080122261be..2831f2c18b1c0bd849c895fe11f772591c6a5fc4 100644
GIT binary patch
delta 103
zcmZp@$J%<2wP6dRRV1_Nlv~?vBN;syL9FQ=QH-;|4Ap4H3NT|qG-D`O(T`}xa6zz8
gP%dL2n6WIE(GSe{p34X}X?k!TV;ERuO&((;03cc@TL1t6

delta 103
zcmZp@$J%<2wP6dRRV4G0HD|WlMlyOZf>_f#q8Mj^8LH8Y6=24KXvR>mq94(W;eueH
gpj^g4Fk@LRqaT>@J(m$|()8dw#xStRnmoox00^Wl6#xJL

diff --git a/package.json b/package.json
index 8b64ee879..23f6f858f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "djlint",
-  "version": "1.31.0",
+  "version": "1.31.1",
   "description": "HTML Template Linter and Formatter",
   "directories": {
     "doc": "docs",
@@ -31,7 +31,7 @@
   ],
   "scripts": {
     "format": "prettier --config .prettierrc \"{bin,docs}/**/*.{ts,css,less,scss,js,json,md,yaml,html}\" --write",
-    "postinstall": "python3 -m pip install --upgrade djlint==1.31.0",
+    "postinstall": "python3 -m pip install --upgrade djlint==1.31.1",
     "pre-commit": "lint-staged",
     "commit": "git add . && pre-commit run; git add . && npm run pre-commit && cz --no-verify",
     "test": "xo"
diff --git a/pyproject.toml b/pyproject.toml
index 217209093..ce2704f7a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name="djlint"
-version="1.31.0"
+version="1.31.1"
 description="HTML Template Linter and Formatter"
 license="GPL-3.0-or-later"
 authors=["Christopher Pickering <cpickering@rhc.net>"]