diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 373ae44ccda6be3c72bb809a8ac2821fc69dcecb..19a1e4b3ccaa4aa670f964c0f17709a68104b7c6 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,6 +9,12 @@ and this project adheres to `Semantic Versioning`_. Unreleased ---------- +Deprecated +~~~~~~~~~~ + +* The `webpack_bundle` management command is replaced by the new `vite` + command. The `webpack_bundle` command will be removed in AlekSIS-Core 4.0. + Added ~~~~~ @@ -19,6 +25,8 @@ Changed ~~~~~~~ * Rewrite of frontend using Vuetify + * The runuwsgi dev server now starts a Vite dev server with HMR in the + background * OIDC scope "profile" now exposes the avatar instead of the official photo * Based on Django 4.0 * Use built-in Redis cache backend @@ -27,6 +35,7 @@ Changed requests * Incorporate SPDX license list for app licenses on About page * [Dev] The undocumented field `check` on `DataCheckResult` was renamed to `data_check` +* Frontend bundling migrated from Webpack to Vite Fixed ~~~~~ diff --git a/Dockerfile b/Dockerfile index 914ee330f0d7e6646ba62c4d630747501b72d4f4..44159bb3fd185d4eb11224e48139319c9468b019 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,7 +75,7 @@ CMD ["/usr/local/bin/aleksis-docker-startup"] # Install assets FROM core as assets -RUN eatmydata aleksis-admin webpack_bundle; \ +RUN eatmydata aleksis-admin vite build; \ eatmydata aleksis-admin collectstatic --no-input; \ rm -rf /usr/local/share/.cache # FIXME Introduce deletion after we don't need materializecss anymore for SASS @@ -124,7 +124,7 @@ ONBUILD RUN set -e; \ if [ -n "$APPS" ]; then \ eatmydata pip install $APPS; \ fi; \ - eatmydata aleksis-admin webpack_bundle; \ + eatmydata aleksis-admin vite build; \ eatmydata aleksis-admin collectstatic --no-input; \ rm -rf /usr/local/share/.cache; \ eatmydata apt-get remove --purge -y yarnpkg $BUILD_DEPS; \ diff --git a/docs/admin/10_install.rst b/docs/admin/10_install.rst index ee46193d93282c9e44016b3b0ebf8e1f1b9c4b36..322d39023183a171b29f2fffc4a55988441a89c7 100644 --- a/docs/admin/10_install.rst +++ b/docs/admin/10_install.rst @@ -144,7 +144,7 @@ After that, you can install the aleksis meta-package, or only `aleksis-core`: .. code-block:: shell pip3 install aleksis - aleksis-admin webpack_bundle + aleksis-admin vite build aleksis-admin collectstatic aleksis-admin migrate aleksis-admin createinitialrevisions diff --git a/tox.ini b/tox.ini index ff7a8c4aa3f0d97c2224ac9e4998fdaa246265c7..0c422a187839c40b718427898e2de2fab1c80758 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ skip_install = true envdir = {toxworkdir}/globalenv commands_pre = poetry install -E ldap - poetry run aleksis-admin webpack_bundle + poetry run aleksis-admin vite build poetry run aleksis-admin collectstatic --no-input commands = poetry run pytest --cov=. {posargs} aleksis/