Adds contents hash to improve caching webpack output

digitalfabrik · Sep 20, 2021 · d1677de · d1677de
1 parent 38c0601
commit d1677de
Show file tree

Hide file tree

Showing 18 changed files with 679 additions and 489 deletions.
diff --git a/.gitignore b/.gitignore
@@ -52,6 +52,7 @@ sphinx/templates/breadcrumbs.html*
 .directory
 cms-django.iml
 integreat-cms.iml
+webpack-stats.json
 
 # Media Library
 src/media/

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/dev-tools/run.sh b/dev-tools/run.sh
@@ -36,7 +36,11 @@ echo -e "Starting WebPack dev server in background..." | print_info | print_pref
 deescalate_privileges npm run dev 2>&1 | print_prefix "webpack" 36 &
 
 # Waiting for initial WebPack dev build
-while [[ ! -f "${BASE_DIR}/src/cms/static/main.js" ]]; do sleep 1; done
+compgen -G "${BASE_DIR}/src/cms/static/main.*.js" > /dev/null
+while [[ $? -eq 1 ]]; do 
+    sleep 1
+    compgen -G "${BASE_DIR}/src/cms/static/main.*.js" > /dev/null
+done
 
 # Show success message once dev server is up
 listen_for_devserver &

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "CMS developed by the Integreat-Team",
   "scripts": {
-    "dev": "NODE_ENV=development webpack serve --mode development --color --stats=errors-warnings",
+    "dev": "NODE_ENV=development webpack watch --mode development --color --stats=errors-warnings",
     "prod": "NODE_ENV=production webpack --mode production"
   },
   "repository": {
@@ -69,6 +69,7 @@
     "tailwindcss": "^2.2.4",
     "tinymce": "^5.8.2",
     "tinymce-i18n": "20.12.25",
+    "webpack-bundle-tracker": "^1.3.0",
     "whatwg-fetch": "^3.6.2"
   }
 }
diff --git a/setup.py b/setup.py
@@ -37,6 +37,7 @@
         "django-linkcheck",
         "django-mptt",
         "django-widget-tweaks",
+        "django-webpack-loader",
         "feedparser",
         "idna",
         "lxml",

diff --git a/src/backend/settings.py b/src/backend/settings.py
@@ -167,6 +167,7 @@
     "mptt",
     "rules.apps.AutodiscoverRulesConfig",
     "linkcheck",
+    "webpack_loader",
 ]
 
 # The default Django Admin application will only be activated if the system is in debug mode.
@@ -676,3 +677,15 @@
 #############################
 
 CHANNELS = (("News", "News"),)
+
+
+#########################
+# DJANGO WEBPACK LOADER #
+#########################
+
+#: Overwrite default bundle directory
+WEBPACK_LOADER = {
+    "DEFAULT": {
+        "BUNDLE_DIR_NAME": "",
+    }
+}