django-webpack · Sep 9, 2023 · Sep 9, 2023 · Sep 9, 2023 · Sep 9, 2023
Showing with 22 additions and 8 deletions.

+1 −0 webpack_loader/config.py

+7 −3 webpack_loader/loader.py

+11 −3 webpack_loader/templatetags/webpack_loader.py

+3 −2 webpack_loader/utils.py
diff --git a/webpack_loader/config.py b/webpack_loader/config.py
@@ -13,6 +13,7 @@
         # FIXME: Explore usage of fsnotify
         'POLL_INTERVAL': 0.1,
         'TIMEOUT': None,
+        'PUBLIC_PATH_PREFIX': '',
         'IGNORE': [r'.+\.hot-update.js', r'.+\.map'],
         'LOADER_CLASS': 'webpack_loader.loader.WebpackLoader',
         'INTEGRITY': False,

diff --git a/webpack_loader/loader.py b/webpack_loader/loader.py
@@ -76,16 +76,20 @@ def map_chunk_files_to_url(self, chunks):
             else:
                 yield {'name': chunk, 'url': url}
 
+    def prefix_url(self, url):
+        prefix = self.config.get('PUBLIC_PATH_PREFIX', '')
+        return prefix + url
+
     def get_chunk_url(self, chunk_file):
         public_path = chunk_file.get('publicPath')
         if public_path:
-            return public_path
+            return self.prefix_url(public_path)
 
         # Use os.path.normpath for Windows paths
         relpath = os.path.normpath(
             os.path.join(self.config['BUNDLE_DIR_NAME'], chunk_file['name'])
         )
-        return staticfiles_storage.url(relpath)
+        return self.prefix_url(staticfiles_storage.url(relpath))
 
     def get_bundle(self, bundle_name):
         assets = self.get_assets()
@@ -111,7 +115,7 @@ def get_bundle(self, bundle_name):
         if assets.get('status') == 'done':
             chunks = assets['chunks'].get(bundle_name, None)
             if chunks is None:
-                raise WebpackBundleLookupError('Cannot resolve bundle {0}.'.format(bundle_name))
+                return []
 
             filtered_chunks = self.filter_chunks(chunks)
 

diff --git a/webpack_loader/templatetags/webpack_loader.py b/webpack_loader/templatetags/webpack_loader.py
@@ -3,6 +3,7 @@
 from django.template import Library
 from django.utils.safestring import mark_safe
 
+from webpack_loader.exceptions import WebpackLoaderBadStatsError
 from .. import utils
 
 register = Library()
@@ -19,9 +20,16 @@ def render_bundle(
         attrs='', is_preload=False, skip_common_chunks=None):
     if skip_common_chunks is None:
         skip_common_chunks = utils.get_skip_common_chunks(config)
-    tags = utils.get_as_tags(
-        bundle_name, extension=extension, config=config, suffix=suffix,
-        attrs=attrs, is_preload=is_preload)
+    try:
+        tags = utils.get_as_tags(
+            bundle_name, extension=extension, config=config, suffix=suffix,
+            attrs=attrs, is_preload=is_preload)
+    except WebpackLoaderBadStatsError:
+        tags = [
+            '<p class="text-danger">'
+            f'Could not load webpack stats for bundle "{bundle_name}" :('
+            '</p>'
+        ]
     request = context.get('request')
     if request is None:
         if skip_common_chunks:

diff --git a/webpack_loader/utils.py b/webpack_loader/utils.py
@@ -72,7 +72,8 @@ def get_as_tags(bundle_name, extension=None, config='DEFAULT', suffix='', attrs=
     tags = []
 
     for chunk in bundle:
-        if chunk['name'].endswith(('.js', '.js.gz')):
+        chunk_name = chunk['name'].split('?')[0]
+        if chunk_name.endswith(('.js', '.js.gz')):
             if is_preload:
                 tags.append((
                     '<link rel="preload" as="script" href="{0}" {1}/>'
@@ -85,7 +86,7 @@ def get_as_tags(bundle_name, extension=None, config='DEFAULT', suffix='', attrs=
                     attrs,
                     loader.get_integrity_attr(chunk),
                 ))
-        elif chunk['name'].endswith(('.css', '.css.gz')):
+        elif chunk_name.endswith(('.css', '.css.gz')):
             tags.append((
                 '<link href="{0}" rel={2}{3}{1}/>'
             ).format(