Skip to content

Commit 474a398

Browse files
markfingermarkfinger
committed
Fixed a potential path issue in config files and replaced the webpack-service dependency with webpack-wrapper.
1 parent 99adbe9 commit 474a398

File tree

11 files changed

+98
-94
lines changed

11 files changed

+98
-94
lines changed

‎example/host.config.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
var reactRender = require('react-render');
2-
var webpackService = require('webpack-service');
2+
var webpackWrapper = require('webpack-wrapper');
33

44
module.exports = {
55
functions: {
66
react: reactRender,
7-
webpack: webpackService
7+
webpack: webpackWrapper
88
}
99
};

‎example/package.json‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
22
"private": true,
33
"dependencies": {
4-
"babel-core": "^5.1.11",
5-
"babel-loader": "^5.0.0",
6-
"jquery": "^2.1.3",
7-
"js-host": "^0.11.2",
4+
"babel-core": "^5.4.3",
5+
"babel-loader": "^5.1.0",
6+
"jquery": "^2.1.4",
7+
"js-host": "^0.11.4",
88
"marked": "^0.3.3",
9-
"react": "^0.13.1",
9+
"node-libs-browser": "^0.5.0",
10+
"react": "^0.13.3",
1011
"react-render": "^0.2.4",
11-
"webpack": "^1.8.9",
12-
"webpack-service": "^0.1.1"
12+
"webpack": "^1.9.6",
13+
"webpack-wrapper": "^0.2.2"
1314
}
1415
}

‎react/bundle.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import json
22
import os
33
import re
4-
import tempfile
54
from optional_django import staticfiles
65
from webpack.compiler import webpack
76
from webpack.config_file import ConfigFile, JS
@@ -39,7 +38,9 @@ def get_path_to_config_file(config_file, prefix=None):
3938
def generate_config_file(config):
4039
return ConfigFile(
4140
JS('var path = require("path");\n'),
42-
JS('module.exports = '), config, JS(';'),
41+
JS('module.exports = '),
42+
config,
43+
JS(';'),
4344
)
4445

4546

@@ -57,9 +58,9 @@ def generate_config_for_component(path, translate=None, path_to_react=None, devt
5758

5859
config = {
5960
'context': js_path_join(os.path.dirname(path)),
60-
'entry': '.' + os.path.sep + os.path.basename(path),
61+
'entry': './{}'.format(os.path.basename(path)),
6162
'output': {
62-
'path': '[bundle_dir]/react-components',
63+
'path': js_path_join(os.path.join('[bundle_dir]', 'components')),
6364
'filename': var + '-[hash].js',
6465
'libraryTarget': 'umd',
6566
'library': var
@@ -77,12 +78,10 @@ def generate_config_for_component(path, translate=None, path_to_react=None, devt
7778
}
7879

7980
if translate:
80-
translate_test = settings.TRANSLATE_TEST or '/.jsx$/'
81-
8281
config.update({
8382
'module': {
8483
'loaders': [{
85-
'test': JS(translate_test),
84+
'test': JS(settings.TRANSLATE_TEST),
8685
'exclude': JS('/node_modules/'),
8786
'loader': 'babel-loader'
8887
}]

‎react/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class Conf(conf.Conf):
1010

1111
# A JavaScript regex which is used to test if a file should have the babel
1212
# loader run over it
13-
TRANSLATE_TEST = None
13+
TRANSLATE_TEST = '/.jsx?$/'
1414

1515
JS_HOST_FUNCTION = 'react'
1616

‎runtests.py‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import subprocess
44
import os
5-
import sys
65
import django
76

87
print('\n' + '-' * 80)
@@ -26,4 +25,11 @@
2625
TestRunner = get_runner(settings)
2726
test_runner = TestRunner()
2827
failures = test_runner.run_tests(['tests'])
29-
sys.exit(bool(failures))
28+
29+
print('\n' + '-' * 80)
30+
print('Perf test')
31+
print('-' * 80)
32+
33+
from tests import perf
34+
35+
perf.run_perf_test()

‎tests/host.config.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
var reactRender = require('react-render');
2-
var webpackService = require('webpack-service');
2+
var webpackWrapper = require('webpack-wrapper');
33

44
module.exports = {
55
functions: {
66
react: reactRender,
7-
webpack: webpackService
7+
webpack: webpackWrapper
88
},
99
// Force hosts to stop as soon as the python process exits
1010
disconnectTimeout: 0

‎tests/package.json‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
{
22
"private": true,
33
"dependencies": {
4-
"babel-core": "^5.1.11",
5-
"babel-loader": "^5.0.0",
6-
"js-host": "^0.11.2",
7-
"react": "^0.13.2",
4+
"babel-core": "^5.4.3",
5+
"babel-loader": "^5.1.0",
6+
"js-host": "^0.11.4",
7+
"node-libs-browser": "^0.5.0",
8+
"react": "^0.13.3",
89
"react-render": "^0.2.4",
9-
"webpack": "^1.8.8",
10-
"webpack-service": "^0.1.1"
10+
"webpack": "^1.9.6",
11+
"webpack-wrapper": "^0.2.2"
1112
}
1213
}

‎tests/perf.py‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
import time
2+
from react.render import render_component
3+
from .settings import Components
4+
from .utils import clean_bundle_root
5+
6+
7+
def median(l):
8+
half = int(len(l) / 2)
9+
l.sort()
10+
if len(l) % 2 == 0:
11+
return (l[half-1] + l[half]) / 2.0
12+
else:
13+
return l[half]
14+
15+
16+
def run_perf_test():
17+
render_component_times = []
18+
rendered_components = []
19+
20+
iteration_count = 25
21+
22+
for i in range(iteration_count):
23+
start = time.time()
24+
rendered_components.append(
25+
render_component(
26+
Components.PERF_TEST,
27+
props={'name': 'world'},
28+
translate=True,
29+
to_static_markup=True
30+
)
31+
)
32+
end = time.time()
33+
render_component_times.append(end - start)
34+
35+
clean_bundle_root()
36+
37+
for component in rendered_components:
38+
assert str(component) == '<span>Hello world</span>'
39+
40+
print('Total time taken to render a component {iteration_count} times: {value}'.format(
41+
iteration_count=iteration_count,
42+
value=sum(render_component_times)
43+
))
44+
print('Times: {}'.format(render_component_times))
45+
print('Max: {}'.format(max(render_component_times)))
46+
print('Min: {}'.format(min(render_component_times)))
47+
print('Mean: {}'.format(sum(render_component_times) / len(render_component_times)))
48+
print('Median: {}'.format(median(render_component_times)))

‎tests/test_bundling.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,17 @@ def validate_generated_config(self, config, path, translate=None, path_to_react=
3636

3737
self.assertEqual(
3838
config['entry'],
39-
'.' + os.path.sep + os.path.basename(path)
39+
'./' + os.path.basename(path)
4040
)
4141

42-
var = generate_var_from_path(path)
43-
42+
self.assertIsInstance(config['output']['path'], JS)
4443
self.assertEqual(
45-
config['output']['path'],
46-
'[bundle_dir]/react-components'
44+
config['output']['path'].content,
45+
'path.join.apply(path, ["[bundle_dir]", "components"])'
4746
)
4847

48+
var = generate_var_from_path(path)
49+
4950
self.assertEqual(
5051
config['output']['filename'],
5152
var + '-[hash].js'
@@ -87,7 +88,7 @@ def validate_generated_config(self, config, path, translate=None, path_to_react=
8788

8889
if translate:
8990
self.assertIsInstance(config['module']['loaders'][0]['test'], JS)
90-
self.assertEqual(config['module']['loaders'][0]['test'].content, '/.jsx$/')
91+
self.assertEqual(config['module']['loaders'][0]['test'].content, '/.jsx?$/')
9192

9293
self.assertIsInstance(config['module']['loaders'][0]['exclude'], JS)
9394
self.assertEqual(config['module']['loaders'][0]['exclude'].content, '/node_modules/')

‎tests/test_performance.py‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)