diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 57a533163979e6a8bbdf2cb393c3269e3e85997b..4022174f3b8045633b7afcdf0459b14281d055b2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,15 @@ All notable changes to this project will be documented in this file. The format is based on `Keep a Changelog`_, and this project adheres to `Semantic Versioning`_. +`2.11.1`_ - 2022-08-31 +---------------------- + +Fixed +~~~~~ + +* Installation of frontend dependencies for downstream apps not aware of + webpack yet + `2.11`_ - 2022-08-27 -------------------- @@ -916,3 +925,4 @@ Fixed .. _2.10.1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.10.1 .. _2.10.2: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.10.2 .. _2.11: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.11 +.. _2.11.1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.11.1 diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py index 43dab10b3bae17b6558d0048d93252c656ffa132..ab29581ae448313e7ee89d3d7e4a78b2ab7793c9 100644 --- a/aleksis/core/settings.py +++ b/aleksis/core/settings.py @@ -621,11 +621,10 @@ WEBPACK_LOADER = { "IGNORE": [r".+\.hot-update.js", r".+\.map"], } } -STATICFILES_DIRS = ( - os.path.join(NODE_MODULES_ROOT, "webpack_bundles"), - JS_ROOT, -) - +_USE_WEBPACK = True +STATICFILES_DIRS = [JS_ROOT] +if os.path.exists(os.path.join(NODE_MODULES_ROOT, "webpack_bundles")): + STATICFILES_DIRS.append(os.path.join(NODE_MODULES_ROOT, "webpack_bundles")) SELECT2_CSS = JS_URL + "/select2/dist/css/select2.min.css" SELECT2_JS = JS_URL + "/select2/dist/js/select2.min.js" diff --git a/docs/conf.py b/docs/conf.py index 2c22c7fddae8319d4e618f840abe3babd83dc755..971d6d5276a3e14b1f4af8da52dbe4bbe7f96b5d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -31,7 +31,7 @@ author = "The AlekSIS Team" # The short X.Y version version = "2.11" # The full version, including alpha/beta/rc tags -release = "2.11" +release = "2.11.1" # -- General configuration --------------------------------------------------- diff --git a/pyproject.toml b/pyproject.toml index 2d0ece6369cdddba48c0633595c46b163e22ca53..ffba763cf7794cba55368d2fd308b55a8ca2401f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "AlekSIS-Core" -version = "2.11" +version = "2.11.1" packages = [ { include = "aleksis" } ]