Removed unneeded mark_safe tag from render_bundle;

Modified jinja2ext to handle context;
Added tests for takes_context and skip_common_chunks

Author: TeamTeaTime

tests/app/tests/test_webpack.py

@@ -9,6 +9,7 @@
 from django.conf import settings
 from django.test import RequestFactory, TestCase
 from django.views.generic.base import TemplateView
+from django.template import Context, Template
 from django_jinja.builtins import DEFAULT_EXTENSIONS
 from unittest2 import skipIf
 from webpack_loader.exceptions import (
@@ -180,7 +181,6 @@ def test_jinja2(self):
                             "extensions": DEFAULT_EXTENSIONS + [
                                 "webpack_loader.contrib.jinja2ext.WebpackExtension",
                             ]
-
                         }
                     },
                 ]
@@ -283,3 +283,46 @@ def test_request_blocking(self):
             result.rendered_content
             elapsed = time.time() - then
             self.assertTrue(elapsed < wait_for)
+
+    def test_takes_context(self):
+        self.compile_bundles('webpack.config.simple.js')
+        self.compile_bundles('webpack.config.app2.js')
+        template_to_test = Template(
+            "{% load render_bundle from webpack_loader %}"
+            "{% render_bundle 'main' 'css' %}"
+            "{% render_bundle 'main' 'js' %}"
+        )
+        context = Context({})
+        rendered_template = template_to_test.render(context)
+        self.assertIn("webpack_loader_used_tags", context)
+        used_tags = context["webpack_loader_used_tags"]
+        self.assertIn('<link href="/static/django_webpack_loader_bundles/main.css" rel="stylesheet" />', used_tags)
+        self.assertIn('<script src="/static/django_webpack_loader_bundles/main.js" ></script>', used_tags)
+
+        
+
+    def test_skip_common_chunks(self):
+        self.compile_bundles('webpack.config.skipCommon.js')
+        # Test default case where duplicates will be generated
+        template_to_test_duplicates = Template(
+            "{% load render_bundle from webpack_loader %}"
+            "{% render_bundle 'app1' %}"
+            "{% render_bundle 'app2' %}"
+        )
+        context = Context({})
+        rendered_template = template_to_test_duplicates.render(context)
+        self.assertIn("webpack_loader_used_tags", context)
+        used_tags = context["webpack_loader_used_tags"]
+        self.assertEqual(rendered_template.count('<script src="/static/django_webpack_loader_bundles/vendors.js" ></script>'), 2)
+
+        template_to_test_skipped_chunks = Template(
+            "{% load render_bundle from webpack_loader %}"
+            "{% render_bundle 'app1' %}"
+            "{% render_bundle 'app2' skip_common_chunks=True %}"
+        )
+        context = Context({})
+        rendered_template = template_to_test_skipped_chunks.render(context)
+        self.assertEqual(rendered_template.count('<script src="/static/django_webpack_loader_bundles/vendors.js" ></script>'), 1)
+
+        
+

tests/webpack.config.skipCommon.js

@@ -0,0 +1,58 @@
+var path = require("path");
+var webpack = require('webpack');
+var BundleTracker = require('webpack-bundle-tracker');
+var MiniCssExtractPlugin = require('mini-css-extract-plugin');
+
+
+module.exports = {
+  context: __dirname,
+  entry: {
+      app1: './assets/js/index',
+      app2: './assets/js/index'
+  },
+  output: {
+      path: path.resolve('./assets/django_webpack_loader_bundles/'),
+      filename: "[name].js",
+      chunkFilename: "[name].js"
+  },
+
+  plugins: [
+    new MiniCssExtractPlugin(),
+    new BundleTracker({path: __dirname, filename: './webpack-stats.json'}),
+  ],
+
+  module: {
+    rules: [
+      // we pass the output from babel loader to react-hot loader
+      {
+        test: /\.jsx?$/,
+        exclude: /node_modules/,
+        use: {
+          loader: 'babel-loader',
+          options: {
+            presets: ['@babel/preset-react']
+          }
+        }
+      },
+      { test: /\.css$/, use: [MiniCssExtractPlugin.loader, 'css-loader'] }
+    ],
+  },
+
+  resolve: {
+    modules: ['node_modules'],
+    extensions: ['.js', '.jsx']
+  },
+
+  optimization: {
+    splitChunks: {
+      cacheGroups: {
+        commons: {
+          test: /[\\/]node_modules[\\/]/,
+          name: 'vendors',
+          chunks: 'all',
+          enforce: true
+        }
+      }
+    }
+  }
+}

webpack_loader/contrib/jinja2ext.py

@@ -6,4 +6,5 @@
 class WebpackExtension(jinja2.ext.Extension):
     def __init__(self, environment):
         super(WebpackExtension, self).__init__(environment)
-        environment.globals["render_bundle"] = lambda *a, **k: jinja2.Markup(render_bundle(*a, **k))
+        environment.globals["context"] = dict()
+        environment.globals["render_bundle"] = lambda *a, **k: jinja2.Markup(render_bundle(environment.globals["context"], *a, **k))

webpack_loader/templatetags/webpack_loader.py

@@ -17,7 +17,7 @@ def render_bundle(context, bundle_name, extension=None, config='DEFAULT', suffix
         context["webpack_loader_used_tags"] = set()
     used_tags = context["webpack_loader_used_tags"]
     if skip_common_chunks:
-        tags = [mark_safe(tag) for tag in tags if tag not in used_tags]
+        tags = [tag for tag in tags if tag not in used_tags]
     context["webpack_loader_used_tags"].update(tags)
 
     return mark_safe('\n'.join(tags))