Merge branch 'master' of github.com:owais/django-webpack-loader

Author: owais

README.md

@@ -63,7 +63,7 @@ module.exports = {
   context: __dirname,
   entry: './assets/js/index',
   output: {
-      path: path.resolve('./assets/bundles/'),
+      path: path.resolve('./assets/webpack_bundles/'),
       filename: "[name]-[hash].js"
   },
 
@@ -80,7 +80,7 @@ module.exports = {
 WEBPACK_LOADER = {
     'DEFAULT': {
         'CACHE': not DEBUG,
-        'BUNDLE_DIR_NAME': 'bundles/', # must end with slash
+        'BUNDLE_DIR_NAME': 'webpack_bundles/', # must end with slash
         'STATS_FILE': os.path.join(BASE_DIR, 'webpack-stats.json'),
         'POLL_INTERVAL': 0.1,
         'TIMEOUT': None,
@@ -292,7 +292,8 @@ In the below example, `logo.png` can be any static asset shipped with any npm or
 
 `./webpack_production.config.js`
 ```javascript
-config = require('./webpack.config.js');
+var config = require('./webpack.config.js');
+var BundleTracker = require('webpack-bundle-tracker');
 
 config.output.path = require('path').resolve('./assets/dist');
 

requirements-dev.txt

@@ -1 +1,5 @@
 twine==1.7.4
+Django==1.10.1
+django-jinja==2.2.1
+django-jinja2==0.1
+unittest2==1.1.0

tests/app/tests/test_webpack.py

@@ -13,7 +13,8 @@
 from webpack_loader.exceptions import (
     WebpackError,
     WebpackLoaderBadStatsError,
-    WebpackLoaderTimeoutError
+    WebpackLoaderTimeoutError,
+    WebpackBundleLookupError
 )
 from webpack_loader.utils import get_loader
 
@@ -66,6 +67,20 @@ def test_simple_and_css_extract(self):
         self.assertEqual(main[0]['path'], os.path.join(settings.BASE_DIR, 'assets/bundles/main.js'))
         self.assertEqual(main[1]['path'], os.path.join(settings.BASE_DIR, 'assets/bundles/styles.css'))
 
+    def test_js_gzip_extract(self):
+        self.compile_bundles('webpack.config.gzipTest.js')
+        assets = get_loader(DEFAULT_CONFIG).get_assets()
+        self.assertEqual(assets['status'], 'done')
+        self.assertIn('chunks', assets)
+
+        chunks = assets['chunks']
+        self.assertIn('main', chunks)
+        self.assertEqual(len(chunks), 1)
+
+        main = chunks['main']
+        self.assertEqual(main[0]['path'], os.path.join(settings.BASE_DIR, 'assets/bundles/main.js.gz'))
+        self.assertEqual(main[1]['path'], os.path.join(settings.BASE_DIR, 'assets/bundles/styles.css'))
+
     def test_static_url(self):
         self.compile_bundles('webpack.config.publicPath.js')
         assets = get_loader(DEFAULT_CONFIG).get_assets()
@@ -153,6 +168,14 @@ def test_reporting_errors(self):
         except WebpackError as e:
             self.assertIn("Cannot resolve module 'the-library-that-did-not-exist'", str(e))
 
+    def test_missing_bundle(self):
+        missing_bundle_name = 'missing_bundle'
+        self.compile_bundles('webpack.config.simple.js')
+        try:
+            get_loader(DEFAULT_CONFIG).get_bundle(missing_bundle_name)
+        except WebpackBundleLookupError as e:
+            self.assertIn('Cannot resolve bundle {0}'.format(missing_bundle_name), str(e))
+
     def test_missing_stats_file(self):
         stats_file = settings.WEBPACK_LOADER[DEFAULT_CONFIG]['STATS_FILE']
         if os.path.exists(stats_file):

tests/webpack.config.gzipTest.js

@@ -0,0 +1,32 @@
+var path = require("path");
+var webpack = require('webpack');
+var BundleTracker = require('webpack-bundle-tracker');
+var ExtractTextPlugin = require("extract-text-webpack-plugin");
+
+
+module.exports = {
+  context: __dirname,
+  entry: './assets/js/index',
+  output: {
+      path: path.resolve('./assets/bundles/'),
+      filename: "[name].js.gz"
+  },
+
+  plugins: [
+    new ExtractTextPlugin("styles.css"),
+    new BundleTracker({filename: './webpack-stats.json'}),
+  ],
+
+  module: {
+    loaders: [
+      // we pass the output from babel loader to react-hot loader
+      { test: /\.jsx?$/, exclude: /node_modules/, loaders: ['babel'], },
+      { test: /\.css$/, loader: ExtractTextPlugin.extract("style-loader", "css-loader") }
+    ],
+  },
+
+  resolve: {
+    modulesDirectories: ['node_modules', 'bower_components'],
+    extensions: ['', '.js', '.jsx']
+  },
+}

webpack_loader/exceptions.py

@@ -1,4 +1,9 @@
-__all__ = ('WebpackError', 'WebpackLoaderBadStatsError')
+__all__ = (
+    'WebpackError',
+    'WebpackLoaderBadStatsError',
+    'WebpackLoaderTimeoutError',
+    'WebpackBundleLookupError'
+)
 
 
 class WebpackError(Exception):
@@ -11,3 +16,7 @@ class WebpackLoaderBadStatsError(Exception):
 
 class WebpackLoaderTimeoutError(Exception):
     pass
+
+
+class WebpackBundleLookupError(Exception):
+    pass

webpack_loader/loader.py

@@ -7,7 +7,8 @@
 from .exceptions import (
     WebpackError,
     WebpackLoaderBadStatsError,
-    WebpackLoaderTimeoutError
+    WebpackLoaderTimeoutError,
+    WebpackBundleLookupError
 )
 from .config import load_config
 
@@ -76,7 +77,9 @@ def get_bundle(self, bundle_name):
                 )
 
         if assets.get('status') == 'done':
-            chunks = assets['chunks'][bundle_name]
+            chunks = assets['chunks'].get(bundle_name, None)
+            if chunks is None:
+                raise WebpackBundleLookupError('Cannot resolve bundle {0}.'.format(bundle_name))
             return self.filter_chunks(chunks)
 
         elif assets.get('status') == 'error':

webpack_loader/templatetags/webpack_loader.py

@@ -17,11 +17,11 @@ def filter_by_extension(bundle, extension):
 def render_as_tags(bundle, attrs):
     tags = []
     for chunk in bundle:
-        if chunk['name'].endswith('.js'):
+        if chunk['name'].endswith(('.js', '.js.gz')):
             tags.append((
                 '<script type="text/javascript" src="{0}" {1}></script>'
             ).format(chunk['url'], attrs))
-        elif chunk['name'].endswith('.css'):
+        elif chunk['name'].endswith(('.css', '.css.gz')):
             tags.append((
                 '<link type="text/css" href="{0}" rel="stylesheet" {1}/>'
             ).format(chunk['url'], attrs))