The React codebase is now resolved from the component's path.

markfinger · markfinger · commit 6a873bcabf2c · 2015-04-13T21:12:06.000+10:00
This prevents users from being coupled to a particular version of React. Re markfinger#31
diff --git a/django_react/bundle.py b/django_react/bundle.py
@@ -33,10 +33,10 @@ def get_webpack_config(path, translate=None, var=None):
         )
 
     return BUNDLE_CONFIG.format(
+        path_to_resolve=os.path.join(os.path.dirname(__file__), 'services', 'node_modules', 'resolve'),
         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'),
         translate_config=translate_config
     )
 
diff --git a/django_react/services/package.json b/django_react/services/package.json
@@ -3,8 +3,8 @@
   "dependencies": {
     "babel-core": "^5.0.12",
     "babel-loader": "^5.0.0",
-    "react": "^0.13.1",
-    "react-render": "^0.1.0",
+    "react-render": "^0.2.4",
+    "resolve": "^1.1.6",
     "webpack": "^1.8.4"
   }
 }
diff --git a/django_react/templates.py b/django_react/templates.py
@@ -1,5 +1,8 @@
 BUNDLE_CONFIG = \
-"""module.exports = {{
+"""
+var resolve = require('{path_to_resolve}');
+
+module.exports = {{
     context: '{dir}',
     entry: '{file}',
     output: {{
@@ -10,7 +13,7 @@
     }},
     externals: [{{
       'react': {{
-        commonjs2: '{path_to_react}',
+        commonjs2: resolve.sync('react', {{basedir: '{dir}'}}),
         root: 'React'
       }}
     }}],
diff --git a/tests/test_functionality.py b/tests/test_functionality.py
@@ -50,7 +50,10 @@ def test_can_generate_a_var_from_a_path(self):
     def test_can_generate_a_webpack_config_for_a_js_component(self):
         config = get_webpack_config(HELLO_WORLD_COMPONENT_JS)
         expected = \
-"""module.exports = {
+"""
+var resolve = require('%s');
+
+module.exports = {
     context: '%s',
     entry: './HelloWorld.js',
     output: {
@@ -61,23 +64,27 @@ def test_can_generate_a_webpack_config_for_a_js_component(self):
     },
     externals: [{
       'react': {
-        commonjs2: '%s',
+        commonjs2: resolve.sync('react', {basedir: '%s'}),
         root: 'React'
       }
     }],
     devtool: 'eval'
 };
 """ % (
+    os.path.join(os.path.dirname(django_react.__file__), 'services', 'node_modules', 'resolve'),
+    os.path.join(os.path.dirname(__file__), 'components'),
     os.path.join(os.path.dirname(__file__), 'components'),
-    os.path.join(os.path.dirname(django_react.__file__), 'services', 'node_modules', 'react'),
 )
 
         self.assertEqual(config, expected)
 
     def test_can_generate_a_webpack_config_for_a_jsx_component(self):
         config = get_webpack_config(HELLO_WORLD_COMPONENT_JSX, translate=True)
         expected = \
-"""module.exports = {
+"""
+var resolve = require('%s');
+
+module.exports = {
     context: '%s',
     entry: './HelloWorld.jsx',
     output: {
@@ -88,7 +95,7 @@ def test_can_generate_a_webpack_config_for_a_jsx_component(self):
     },
     externals: [{
       'react': {
-        commonjs2: '%s',
+        commonjs2: resolve.sync('react', {basedir: '%s'}),
         root: 'React'
       }
     }],
@@ -106,8 +113,9 @@ def test_can_generate_a_webpack_config_for_a_jsx_component(self):
 
 };
 """ % (
+    os.path.join(os.path.dirname(django_react.__file__), 'services', 'node_modules', 'resolve'),
+    os.path.join(os.path.dirname(__file__), 'components'),
     os.path.join(os.path.dirname(__file__), 'components'),
-    os.path.join(os.path.dirname(django_react.__file__), 'services', 'node_modules', 'react'),
     os.path.join(os.path.dirname(django_react.__file__), 'services', 'node_modules'),
 )
         self.assertEqual(config, expected)

Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,10 @@ def get_webpack_config(path, translate=None, var=None):`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`return BUNDLE_CONFIG.format(`
	`36`	`+ path_to_resolve=os.path.join(os.path.dirname(__file__), 'services', 'node_modules', 'resolve'),`
`36`	`37`	`dir=os.path.dirname(path),`
`37`	`38`	`file='./' + os.path.basename(path),`
`38`	`39`	`var=var,`
`39`		`- path_to_react=os.path.join(os.path.dirname(__file__), 'services', 'node_modules', 'react'),`
`40`	`40`	`translate_config=translate_config`
`41`	`41`	`)`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`"dependencies": {`
`4`	`4`	`"babel-core": "^5.0.12",`
`5`	`5`	`"babel-loader": "^5.0.0",`
`6`		`- "react": "^0.13.1",`
`7`		`- "react-render": "^0.1.0",`
	`6`	`+ "react-render": "^0.2.4",`
	`7`	`+ "resolve": "^1.1.6",`
`8`	`8`	`"webpack": "^1.8.4"`
`9`	`9`	`}`
`10`	`10`	`}`