Skip to content

Commit dd8160c

Browse files
committed
added babel experimental code
1 parent d3ed0e5 commit dd8160c

File tree

9 files changed

+37
-15
lines changed

9 files changed

+37
-15
lines changed

.bowerrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"directory": "vendor/",
3+
"analytics": false,
4+
"timeout": 120000
5+
}

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
/.idea/
2-
/bower_components/
3-
/node_modules/

app/startup.js

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
import React from 'react'
22

3+
// works with babel-polyfill.js
4+
function* foo() {
5+
yield 1;
6+
}
7+
8+
// Babel experimental:
9+
let { x, y, ...z } = { x: 1, y: 2, a: 3, b: 4 };
10+
console.log('@Babel experimental:')
11+
console.log('@x:',x);
12+
console.log('@y:',y);
13+
console.log('@z:',z);
14+
315
import Hello from 'es6!./components/Hello'
4-
React.render(React.createElement(Hello), document.getElementById('app'));
16+
React.render(React.createElement(Hello), document.getElementById('HelloWorld'));

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"requirejs": "~2.1.16",
1919
"react": "~0.13.0",
2020
"reflux": "~0.2.6",
21-
"requirejs_babel": "requirejs-babel#*",
22-
"requirejs_text": "requirejs-text#~2.0.14"
21+
"requirejs_text": "requirejs-text#~2.0.14",
22+
"requirejs_babel_fork": "hipertracker/requirejs-babel"
2323
}
2424
}

index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<div id="HelloWorld">Loading...</div>
1111
</body>
1212
<script src="require-config.js"></script>
13-
<script src="bower_components/requirejs/require.js"></script>
13+
<script src="vendor/requirejs/require.js"></script>
1414
<script>
15-
require(['es6!./app/startup']);
15+
require(['es6!app/startup']);
1616
</script>
1717
</html>

index.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

require-config.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@ var require = {
44
paths: {
55
app: './app',
66

7-
babel: 'bower_components/requirejs_babel/babel-4.6.6.min',
8-
es6: 'bower_components/requirejs_babel/es6',
7+
babel: 'vendor/requirejs_babel/babel-4.6.6.min',
8+
babel_polyfill: 'vendor/browser-polyfill',
9+
es6: 'vendor/requirejs_babel/es6',
910

10-
react: 'bower_components/react/react-with-addons',
11-
reflux: 'bower_components/reflux/dist/reflux',
11+
react: 'vendor/react/react-with-addons',
12+
reflux: 'vendor/reflux/dist/reflux'
1213
},
1314
shim: {
14-
//babel: {
15-
// deps: ['babel_polyfill']
16-
//}
15+
babel: {
16+
deps: ['babel_polyfill']
17+
}
1718
//'react-router-shim': {
1819
// exports: 'React'
1920
//},

vendor/.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/requirejs_text/
2+
/requirejs/
3+
/react/
4+
/reflux/
5+
/requirejs_babel_fork/

vendor/browser-polyfill.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)