Skip to content

Commit af42645

Browse files
committed
updated to React 0.13.1
1 parent 8495122 commit af42645

File tree

9 files changed

+41
-61
lines changed

9 files changed

+41
-61
lines changed

Brocfile.js

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,34 @@ var rimraf = require('rimraf'),
22
mergeTrees = require('broccoli-merge-trees'),
33
Funnel = require('broccoli-funnel'),
44
compileSass = require('broccoli-sass'),
5-
esTranspiler = require('broccoli-babel-transpiler'),
5+
babelTranspiler = require('broccoli-babel-transpiler'),
66
fastBrowserify = require('broccoli-fast-browserify'),
77
uglifyJavaScript = require('broccoli-uglify-js'),
88
gzipFiles = require('broccoli-gzip'),
99
env = require('broccoli-env').getEnv();
1010

11+
// copy index.html
1112
var staticFiles = new Funnel('src', {
1213
files: ['index.html']
1314
});
1415

15-
// build vendor/*
16-
var jqueryFiles = new Funnel('bower_components/jquery/dist', {
17-
include: [
18-
new RegExp(/\.min\.(js|map)$/),
19-
],
20-
destDir: 'vendor/jquery'
21-
}),
22-
semanticUIFiles = new Funnel('bower_components/semantic-ui/dist', {
23-
include: [
24-
new RegExp(/\.min\.(js|css)$/),
25-
new RegExp(/themes/)
26-
],
27-
destDir: 'vendor/semantic-ui'
28-
}),
29-
fontAwesomeFiles = new Funnel('bower_components/font-awesome', {
30-
include: [
31-
new RegExp(/min\.css$/),
32-
new RegExp(/fonts/)
33-
],
34-
destDir: 'vendor/font-awesome'
35-
});
36-
var vendorFiles = mergeTrees([jqueryFiles, semanticUIFiles, fontAwesomeFiles]);
37-
16+
// convert SCSS into CSS
3817
var cssFiles = compileSass(['src'], 'styles/app.scss', 'styles/app.css');
3918

19+
// exclude tests from build
4020
var jsFiles = new Funnel('src', {
4121
exclude: [new RegExp(/__tests__/)],
4222
include: [new RegExp(/\.js$/)]
4323
});
4424

45-
jsFiles = esTranspiler(jsFiles, {experimental: true});
25+
// transpile ES6/7 into ES5
26+
jsFiles = babelTranspiler(jsFiles, {stage: 0});
4627

28+
// transpile for the browser
4729
jsFiles = fastBrowserify(jsFiles, {
4830
bundles: {
4931
'index.js': {
50-
entryPoints: ['**/index.js']
32+
entryPoints: ['index.js']
5133
}
5234
}
5335
});
@@ -61,5 +43,5 @@ if (env === 'production') {
6143
}
6244

6345
rimraf.sync('./dist');
64-
module.exports = mergeTrees([staticFiles, vendorFiles, jsFiles, cssFiles], {overwrite: false});
46+
module.exports = mergeTrees([staticFiles, cssFiles, jsFiles], {overwrite: true});
6547

package.json

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-es7",
3-
"version": "0.0.15",
3+
"version": "0.0.16",
44
"description": "Example of using React + Reflux + router + ES6 with experimental ES7 syntax + Jest + Semantic-UI",
55
"main": "src/index.js",
66
"scripts": {
@@ -17,37 +17,31 @@
1717
"moduleFileExtensions": [
1818
"js",
1919
"json",
20-
"es6",
21-
"jsx"
20+
"es6"
2221
]
2322
},
24-
"author": "",
25-
"license": "ISC",
23+
"author": "Jaroslaw Zabiello <[email protected]>",
24+
"license": "MIT",
2625
"devDependencies": {
27-
"babel-jest": "^4.0.0",
28-
"broccoli": "^0.13.3",
29-
"broccoli-babel-transpiler": "^4.0.0",
30-
"broccoli-cli": "0.0.1",
26+
"jest-cli": "^0.4.0",
27+
"babel-jest": "^5.0.1",
28+
"broccoli": "^0.15.3",
29+
"broccoli-babel-transpiler": "^5.0.0",
3130
"broccoli-env": "0.0.1",
32-
"broccoli-fast-browserify": "^0.2.3",
33-
"broccoli-filter": "^0.1.10",
34-
"broccoli-funnel": "^0.1.7",
35-
"broccoli-gzip": "^0.2.0",
31+
"broccoli-fast-browserify": "^0.2.5",
32+
"broccoli-funnel": "^0.2.3",
33+
"broccoli-gzip": "^0.2.1",
3634
"broccoli-merge-trees": "^0.2.1",
35+
"broccoli-sass": "^0.6.3",
3736
"broccoli-timepiece": "^0.3.0",
3837
"broccoli-uglify-js": "^0.1.3",
39-
"broccoli-sass": "hipertracker/broccoli-sass",
40-
"browserify": "^8.0.1",
41-
"http-server": "^0.7.4",
42-
"jest-cli": "^0.4.0"
38+
"rimraf": "^2.3.2"
4339
},
4440
"dependencies": {
45-
"lodash": "*",
46-
"react": "*",
47-
"react-router": "*",
48-
"react-semantify": "jessy1092/react-semantify",
49-
"reactify": "*",
50-
"reflux": "*",
51-
"rimraf": "^2.2.8"
41+
"lodash": "^3.6.0",
42+
"react": "^0.13.1",
43+
"react-router": "^0.13.2",
44+
"react-semantify": "^0.3.1",
45+
"reflux": "^0.2.7"
5246
}
5347
}

src/app/actions/LinksActions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,4 @@ LinksActions.loadData.listen(function () {
8888
LinksActions.loadDataSuccess(data);
8989
});
9090

91-
export default LinksActions;
91+
export default LinksActions

src/app/components/About.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,14 @@ const About = React.createClass({
55
render() {
66
return (
77
<Segment>
8-
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus ligula eros, sollicitudin nec libero non, cursus fringilla lectus. Aliquam volutpat velit feugiat pellentesque lobortis. Pellentesque pulvinar ornare ligula, sit amet imperdiet nibh tincidunt et. Suspendisse suscipit dolor vel turpis viverra ullamcorper. Fusce in enim elementum, hendrerit enim ut, pretium ipsum. Sed malesuada justo nec augue sodales, eu luctus dolor vulputate. Nunc ut consequat ipsum. Nam tempor fermentum risus at dictum. Sed et diam metus. Donec ac nisi suscipit, tristique enim sit amet, hendrerit ante. Pellentesque nec augue malesuada, ultrices dolor a, placerat ex. Pellentesque imperdiet feugiat nunc.
8+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus ligula eros, sollicitudin nec libero
9+
non, cursus fringilla lectus. Aliquam volutpat velit feugiat pellentesque lobortis. Pellentesque
10+
pulvinar ornare ligula, sit amet imperdiet nibh tincidunt et. Suspendisse suscipit dolor vel turpis
11+
viverra ullamcorper. Fusce in enim elementum, hendrerit enim ut, pretium ipsum. Sed malesuada justo nec
12+
augue sodales, eu luctus dolor vulputate. Nunc ut consequat ipsum. Nam tempor fermentum risus at dictum.
913
</Segment>
1014
)
1115
}
1216
});
1317

14-
export default About;
18+
export default About

src/app/components/App.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ const App = React.createClass({
3434
}
3535
});
3636

37-
export default App;
37+
export default App

src/app/components/Home.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ const Home = React.createClass({
1313
}
1414
});
1515

16-
export default Home;
16+
export default Home

src/app/components/UsefulLinks.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const UsefulLinks = React.createClass({
3535
const style = m(styles.item, this.props.style);
3636
const items = this.state.links.map((item, key) =>
3737
<li key={key}>
38-
{item.title} (<a href={item.url} target="_blank">{item.url}</a>)
38+
{item.title} (<a href={item.url} target="_blank">{item.url}</a>)
3939
</li>);
4040
return (
4141
<div>
@@ -46,4 +46,4 @@ const UsefulLinks = React.createClass({
4646
}
4747
});
4848

49-
export default UsefulLinks;
49+
export default UsefulLinks

src/app/lib/tools.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ export function mount(component, location, argv = {}) {
1212
component = React.createFactory(component);
1313
}
1414
React.render(component(argv), location);
15-
};
15+
}
1616

1717
// merging properties, used in React component for aggregating styles
1818
export function m() {
1919
let res = {};
2020
_.each(arguments, (arg) => arg && _.merge(res, arg));
2121
return res;
22-
};
22+
}
2323

src/app/stores/LinksStore.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ const LinksStore = Reflux.createStore({
1010
}
1111
});
1212

13-
export default LinksStore;
13+
export default LinksStore

0 commit comments

Comments
 (0)