Merge branch 'master' into '831-data-management-for-the-model-room'

# Conflicts:
#   CHANGELOG.rst

CHANGELOG.rst

@@ -29,6 +29,8 @@ Changed
 Fixed
 ~~~~~
 
+* [Docker] The build could silently continue even if frontend bundling failed, resulting
+  in an incomplete AlekSIS frontend app.
 * GraphQL mutations did not return errors in case of exceptions.
 
 `3.1.2`_ - 2023-07-05

aleksis/core/management/commands/vite.py

 import os
 
 from django.conf import settings
+from django.core.management.base import CommandError
 
 from django_yarnpkg.management.base import BaseYarnCommand
 from django_yarnpkg.yarn import yarn_adapter
@@ -26,4 +27,6 @@ class Command(BaseYarnCommand):
             yarn_adapter.install(settings.YARN_INSTALLED_APPS)
 
         # Run Vite build
-        run_vite([options["command"]])
+        ret = run_vite([options["command"]])
+        if ret != 0:
+            raise CommandError("yarn command failed", returncode=ret)

aleksis/core/util/frontend_helpers.py

@@ -49,7 +49,7 @@ def write_vite_values(out_path: str) -> dict[str, Any]:
         json.dump(vite_values, out)
 
 
-def run_vite(args: Optional[Sequence[str]] = None) -> None:
+def run_vite(args: Optional[Sequence[str]] = None) -> int:
     args = list(args) if args else []
 
     config_path = os.path.join(settings.BASE_DIR, "aleksis", "core", "vite.config.js")
@@ -64,7 +64,7 @@ def run_vite(args: Optional[Sequence[str]] = None) -> None:
     log_level = {"INFO": "info", "WARNING": "warn", "ERROR": "error"}.get(log_level, "silent")
     args += ["-l", log_level]
 
-    yarn_adapter.call_yarn(["run", "vite"] + args)
+    return yarn_adapter.call_yarn(["run", "vite"] + args)
 
 
 def get_language_cookie(code: str) -> str:

pyproject.toml

@@ -113,7 +113,7 @@ ipython = "^8.0.0"
 django-oauth-toolkit = "^2.0.0"
 django-storages = {version = "^1.13.2", optional = true}
 boto3 = {version = "^1.26.142", optional = true}
-django-cleanup = "^7.0.0"
+django-cleanup = "^8.0.0"
 djangorestframework = "^3.12.4"
 Whoosh = "^2.7.4"
 django-titofisto = "^0.2.0"