Update dependency eslint to v8.57.1

.gitlab-ci.yml

@@ -6,8 +6,6 @@ stages:
 static:
   image: node:20-slim
   stage: build
-  only:
-    - master
   cache:
     key: npm-$CI_COMMIT_REF_SLUG
     paths:
@@ -27,8 +25,6 @@ static:
 pip:
   image: python:3.12-slim
   stage: build
-  only:
-    - master
   variables:
     PIP_CACHE_DIR: $CI_PROJECT_DIR/.pip-cache
   cache:
@@ -113,6 +109,12 @@ djlint:
   script:
     - djlint website/ --lint --check
 
+gunicorn_check:
+  extends: .python_test_template
+  script:
+    - apt-get update && apt-get install --yes libpq-dev
+    - gunicorn --check-config --config etc/gunicorn.conf.py
+
 npm_lint:
   image: node:20-slim
   stage: test
@@ -140,6 +142,8 @@ container:
     DOCKER_BUILDKIT: 1
   dependencies: []
   stage: deploy
+  only:
+    - master
   before_script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
   script:

Dockerfile

@@ -39,14 +39,7 @@ ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLA
 RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz && tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
 
 ENV PATH=$VIRTUAL_ENV/bin:$PATH \
-    PYTHONUNBUFFERED=1 \
-    GRANIAN_INTERFACE=wsgi \
-    GRANIAN_HOST=0.0.0.0 \
-    GRANIAN_PORT=8080 \
-    GRANIAN_WORKERS_LIFETIME=1800 \
-    GRANIAN_RESPAWN_INTERVAL=10 \
-    GRANIAN_PROCESS_NAME=website \
-    GRANIAN_RESPAWN_FAILED_WORKERS=1
+    PYTHONUNBUFFERED=1
 
 EXPOSE 8000
 

etc/crontab

@@ -3,5 +3,4 @@
 @daily ./manage.py update_unsplash_photos
 @daily ./manage.py rebuild_references_index
 @weekly ./manage.py refresh_spotify_playlists
-@weekly ./manage.py prune_db_task_results
 */10 * * * * ./manage.py publish_scheduled_pages

etc/gunicorn.conf.py

@@ -0,0 +1,10 @@
+wsgi_app = "website.wsgi:application"
+disable_redirect_access_to_syslog = True
+preload_app = True
+bind = "127.0.0.1:8080"
+max_requests = 1200
+max_requests_jitter = 50
+forwarded_allow_ips = "*"
+
+# Run additional threads so the GIL isn't sitting completely idle
+threads = 4

etc/s6-rc.d/django/run

@@ -4,4 +4,4 @@ set -e
 
 cd /app
 
-exec granian website.wsgi:application
+exec gunicorn -c etc/gunicorn.conf.py

package-lock.json

@@ -22,7 +22,7 @@
         "lodash.throttle": "4.1.1",
         "npm-run-all2": "5.0.0",
         "sass": "1.75.0",
-        "shareon": "^2.6.0"
+        "shareon": "2.4.0"
       },
       "devDependencies": {
         "eslint": "8.55.0",
@@ -2998,15 +2998,14 @@
       }
     },
     "node_modules/shareon": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/shareon/-/shareon-2.6.0.tgz",
-      "integrity": "sha512-AmTP7AwgbhnGsTWg479CY0qAaRd9zWumZh/zcu6H/Po0u/X7/SMAjAwtdS/1Pr8hAFJ6DDa+o4fXkERlqV5HqA==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/shareon/-/shareon-2.4.0.tgz",
+      "integrity": "sha512-241BnM+LziD4xYixXjpzN+jdNKjSR/tQp3DO2jD7zzDoi+a07G+lz00gyqZNn7WJrzczhrKkzC+7ZCc5AbzZrA==",
       "funding": [
         "https://github.com/sponsors/kytta/",
         "https://liberapay.com/kytta",
         "https://www.paypal.com/paypalme/NickKaramoff"
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/shell-quote": {
       "version": "1.7.3",
@@ -5604,9 +5603,9 @@
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
     },
     "shareon": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/shareon/-/shareon-2.6.0.tgz",
-      "integrity": "sha512-AmTP7AwgbhnGsTWg479CY0qAaRd9zWumZh/zcu6H/Po0u/X7/SMAjAwtdS/1Pr8hAFJ6DDa+o4fXkERlqV5HqA=="
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/shareon/-/shareon-2.4.0.tgz",
+      "integrity": "sha512-241BnM+LziD4xYixXjpzN+jdNKjSR/tQp3DO2jD7zzDoi+a07G+lz00gyqZNn7WJrzczhrKkzC+7ZCc5AbzZrA=="
     },
     "shell-quote": {
       "version": "1.7.3",

package.json

@@ -20,7 +20,7 @@
   },
   "author": "Jake Howard",
   "devDependencies": {
-    "eslint": "8.55.0",
+    "eslint": "8.57.1",
     "eslint-plugin-unicorn": "49.0.0",
     "prettier": "2.7.1",
     "stylelint": "14.16.1",
@@ -42,6 +42,6 @@
     "lodash.throttle": "4.1.1",
     "npm-run-all2": "5.0.0",
     "sass": "1.75.0",
-    "shareon": "^2.6.0"
+    "shareon": "2.4.0"
   }
 }

requirements.txt

@@ -1,14 +1,14 @@
-Django==4.2.17
-wagtail==5.2.7
+Django==4.2.15
+wagtail==5.2.6
 django-environ==0.11.2
-whitenoise[brotli]==6.8.2
+whitenoise[brotli]==6.6.0
 Pygments==2.18.0
 beautifulsoup4[lxml]
 requests
 wagtail-generic-chooser==0.6
 django-redis==5.4.0
-granian[pname]==1.6.4
-psycopg==3.2.3
+gunicorn==22.0.0
+psycopg==3.1.18
 djangorestframework
 django-htmx==1.17.2
 wagtail-metadata==5.0.0
@@ -28,7 +28,7 @@ django-proxy==1.2.2
 wagtail-lite-youtube-embed==0.1.0
 django-minify-html==1.7.1
 metadata-parser==0.12.1
-django-tasks==0.6.0
+django-tasks==0.3.0
 lightningcss==0.2.0
 
 # DRF OpenAPI dependencies

website/common/templates/common/shareon.html

@@ -9,11 +9,8 @@
     <a class="pinterest" title="Share on Pintrest"></a>
     <a class="pocket" title="Share on Pocket"></a>
     <a class="reddit" title="Share on Reddit"></a>
-    <a class="hackernews" title="Share on Hacker News"></a>
-    <a class="fediverse" title="Share to the fediverse"></a>
     <a class="teams" title="Share on Teams"></a>
     <a class="telegram" title="Share on Telegram"></a>
-    <a class="bluesky" title="Share on Bluesky"></a>
     <a class="twitter" title="Share on Twitter"></a>
     <a class="whatsapp" title="Share on WhatsApp"></a>
     <a class="email" title="Share by email"></a>

website/common/templates/wagtailmetadata/parts/tags.html

@@ -13,8 +13,6 @@
 
   <meta name="article:modified_time" content="{{ object.last_published_at|date:'c' }}" />
   {% if object.date %}<meta name="article:published_time" content="{{ object.date|date:'c' }}" />{% endif %}
-
-  <meta name="fediverse:creator" content="@jake@theorangeone.net" />
 {% endblock %}
 
 {% block meta %}