Bug fixes.

markfinger · markfinger · commit aa10b899eff5 · 2015-04-12T23:02:45.000+10:00
- Fixed an issue where bundled components would have issues would have issues resolving which how to find React.
- Fixed an issue where rendered markup was not having mark_safe applied.
diff --git a/django_react/bundle.py b/django_react/bundle.py
@@ -34,11 +34,19 @@ def get_webpack_config(path, translate=None, var=None):
             libraryTarget: 'umd',
             library: '{var}'
         }},
-        externals: ['react'],
+        externals: [
+            {{
+                'react': {{
+                    commonjs2: '{path_to_react}',
+                    root: 'React'
+                }}
+            }}
+        ],
         devtool: 'eval\''''.format(
         dir=os.path.dirname(path),
         file='./' + os.path.basename(path),
         var=var,
+        path_to_react=os.path.join(os.path.dirname(__file__), 'services', 'node_modules', 'react'),
     )
 
     if translate:
diff --git a/django_react/render.py b/django_react/render.py
@@ -22,10 +22,10 @@ def __init__(self, markup, path_to_source, props, serialized_props, watch_source
         self.to_static_markup = to_static_markup
 
     def __str__(self):
-        return self.render_markup()
+        return mark_safe(self.render_markup())
 
     def __unicode__(self):
-        return self.render_markup()
+        return mark_safe(unicode(self.render_markup()))
 
     def render_markup(self):
         markup = self.markup
@@ -43,11 +43,13 @@ def render_props(self):
 
     def get_bundle(self):
         if not self.bundle:
-            raise ComponentWasNotBundled((
-                'The component "{path}" was not bundled during the rendering process. '
-                'Call render_component with `bundle`, `translate`, or `watch_source` '
-                'keyword arguments set to `True` to ensure that it is bundled.'
-            ).format(path=self.path_to_source))
+            raise ComponentWasNotBundled(
+                (
+                    'The component "{path}" was not bundled during the rendering process. '
+                    'Call render_component with `bundle`, `translate`, or `watch_source` '
+                    'keyword arguments set to `True` to ensure that it is bundled.'
+                ).format(path=self.path_to_source)
+            )
         return self.bundle
 
     def get_var(self):
diff --git a/django_react/services/__init__.py b/django_react/services/__init__.py
@@ -20,4 +20,6 @@ def render(self, path_to_source, serialized_props, to_static_markup):
         except NodeServiceError as e:
             six.reraise(ComponentRenderingError, ComponentRenderingError(*e.args), sys.exc_info()[2])
 
-        return response.text
+        markup = response.text.encode('utf-8')
+
+        return markup
