[pull] main from django:main

.editorconfig

@@ -19,13 +19,13 @@ max_line_length = 88
 indent_size = 2
 
 [**/admin/js/vendor/**]
-indent_style = ignore
-indent_size = ignore
+indent_style = unset
+indent_size = unset
 
 # Minified JavaScript files shouldn't be changed
 [**.min.js]
-indent_style = ignore
-insert_final_newline = ignore
+indent_style = unset
+insert_final_newline = unset
 
 # Makefiles always use tabs for indentation
 [Makefile]

.git-blame-ignore-revs

@@ -17,3 +17,4 @@ c9178ef17a0e1070f5a25096d8e13385d404dc92
 1101467ce0756272a54f4c7bc65c4c335a94111b
 6cff02078799b7c683a0d39630d49ab4fe532e7c
 4286a23df64f6ce3b9b6ed097f4d1aac7d9e0de4
+241b8e1aab7fc71018a059467b2ba17bce6556cc

.github/workflows/linters.yml

@@ -83,3 +83,20 @@ jobs:
         with:
           advanced-security: false
           annotations: true
+
+  biome:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+      - name: Set up Node.js
+        uses: actions/setup-node@v5
+        with:
+          node-version: '20'
+          cache: 'npm'
+          cache-dependency-path: '**/package.json'
+      - run: npm install
+      - run: npx biome ci

.pre-commit-config.yaml

@@ -24,6 +24,11 @@ repos:
     rev: v9.39.1
     hooks:
       - id: eslint
+  - repo: https://github.com/biomejs/pre-commit
+    rev: v2.4.12
+    hooks:
+      - id: biome-check
+        additional_dependencies: ["@biomejs/biome@2.4.12"]
   - repo: https://github.com/zizmorcore/zizmor-pre-commit
     rev: v1.19.0
     hooks:

AUTHORS

@@ -422,6 +422,7 @@ answer newbie questions, and generally made Django that much better:
     Grzegorz Ślusarek <grzegorz.slusarek@gmail.com>
     Guilherme Mesquita Gondim <semente@taurinus.org>
     Guillaume Pannatier <guillaume.pannatier@gmail.com>
+    Gurpreet Singh <https://www.garybadwal.com/>
     Gustavo Picon
     hambaloney
     Hang Park <hangpark@kaist.ac.kr>

biome.json

@@ -0,0 +1,37 @@
+{
+    "$schema": "https://biomejs.dev/schemas/2.4.12/schema.json",
+    "files": {
+        "includes": [
+            "django/contrib/admin/static/admin/css/**/*.css",
+            "!django/contrib/admin/static/admin/css/vendor/**",
+            "django/contrib/gis/static/gis/css/**/*.css",
+            "docs/_theme/**/*.css",
+            "!docs/_theme/djangodocs/static/fontawesome/**",
+            "!docs/_theme/djangodocs/static/reset-fonts-grids.css",
+            "!**/*.min.css"
+        ]
+    },
+    "formatter": {
+        "enabled": true,
+        "useEditorconfig": true
+    },
+    "linter": {
+        "enabled": true,
+        "rules": {
+            "complexity": {
+                "noImportantStyles": "off"
+            },
+            "style": {
+                "noDescendingSpecificity": "off"
+            }
+        }
+    },
+    "javascript": {
+        "linter": { "enabled": false },
+        "formatter": { "enabled": false }
+    },
+    "json": {
+        "linter": { "enabled": false },
+        "formatter": { "enabled": false }
+    }
+}