Merge pull request #693 from liqd/ym-2017-02-mitigat-webpack-library-…

…name-clash Remove clash between adhocracy4 library names
liqd · Feb 22, 2017 · 3ce7d7d · 3ce7d7d
2 parents 49a4af3 + 5f5ed42
commit 3ce7d7d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/euth_wagtail/templates/base.html b/euth_wagtail/templates/base.html
@@ -29,7 +29,7 @@
         {% endblock %}
 
         {% render_bundle 'vendor' 'css' %}
-        {% render_bundle 'opin' 'css' %}
+        {% render_bundle 'adhocracy4' 'css' %}
 
         {# Global javascript #}
         <script type="text/javascript" src="{% url 'javascript-catalog' %}"></script>
@@ -39,7 +39,7 @@
         </script>
 
         {% render_bundle 'vendor' 'js' %}
-        {% render_bundle 'opin' 'js' %}
+        {% render_bundle 'adhocracy4' 'js' %}
     </head>
 
     <body class="{% block body_class %}{% endblock %}">

diff --git a/webpack.config.js b/webpack.config.js
@@ -23,7 +23,7 @@ var autoprefixer = require('autoprefixer');
 
 module.exports = {
   entry: {
-    opin: [
+    adhocracy4: [
       './euth_wagtail/assets/scss/all.scss',
       './euth/contrib/static/js/app.js'
     ],
@@ -49,7 +49,7 @@ module.exports = {
   devtool: 'eval',
   output: {
     libraryTarget: 'var',
-    library: 'adhocracy4',
+    library: '[name]',
     path: './euth_wagtail/static/',
     publicPath: "/static/",
     filename: '[name].js'