Skip to content

Commit 4341a3e

Browse files
committed
Update babel to 6.0
1 parent 05d34c8 commit 4341a3e

File tree

11 files changed

+20
-15
lines changed

11 files changed

+20
-15
lines changed

.babelrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"stage": 0
2+
"presets": ["es2015", "react", "stage-0"],
3+
"plugins": ["babel-plugin-add-module-exports"]
34
}

client/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { createLocation, createHistory } from 'history';
88
import { hydrate } from 'thundercats';
99
import { render$ } from 'thundercats-react';
1010

11-
import { app$ } from '../common/app';
11+
import app$ from '../common/app';
1212
import historySaga from './history-saga';
1313
import errSaga from './err-saga';
1414

common/app/App.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Row } from 'react-bootstrap';
33
import { ToastMessage, ToastContainer } from 'react-toastr';
44
import { contain } from 'thundercats-react';
55

6-
import { Nav } from './components/Nav';
6+
import Nav from './components/Nav';
77

88
const toastMessageFactory = React.createFactory(ToastMessage.animation);
99

common/app/Cat.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { Disposable, Observable } from 'rx';
44

55
import { post$, postJSON$ } from '../utils/ajax-stream.js';
66
import { AppActions, AppStore } from './flux';
7-
import { HikesActions } from './routes/Hikes/flux';
8-
import { JobActions } from './routes/Jobs/flux';
7+
import HikesActions from './routes/Hikes/flux';
8+
import JobActions from './routes/Jobs/flux';
99

1010
const ajaxStamp = stamp({
1111
methods: {

common/app/components/Footer/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default as Footer } from './Footer.jsx';
1+
export default from './Footer.jsx';

common/app/components/Nav/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default as Nav } from './Nav.jsx';
1+
export default from './Nav.jsx';

common/app/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default as app$ } from './app-stream.jsx';
1+
export default from './app-stream.jsx';

common/app/routes/Hikes/flux/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default as HikesActions } from './Actions';
1+
export default from './Actions';

common/app/routes/Jobs/flux/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default as JobActions } from './Actions';
1+
export default from './Actions';

package.json

+8-4
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,14 @@
2828
"dependencies": {
2929
"accepts": "^1.3.0",
3030
"async": "^1.5.0",
31-
"babel": "5.8.34",
32-
"babel-core": "5.8.34",
31+
"babel-cli": "^6.3.17",
32+
"babel-core": "^6.3.26",
3333
"babel-eslint": "^4.1.4",
34-
"babel-loader": "5.4.0",
34+
"babel-loader": "^6.2.1",
35+
"babel-plugin-add-module-exports": "^0.1.2",
36+
"babel-preset-es2015": "^6.3.13",
37+
"babel-preset-react": "^6.3.13",
38+
"babel-preset-stage-0": "^6.3.13",
3539
"body-parser": "^1.13.2",
3640
"chai-jquery": "^2.0.0",
3741
"cheerio": "~0.19.0",
@@ -59,7 +63,7 @@
5963
"forever": "~0.15.1",
6064
"frameguard": "~0.2.2",
6165
"gulp": "^3.9.0",
62-
"gulp-babel": "^5.3.0",
66+
"gulp-babel": "^6.1.1",
6367
"gulp-concat": "^2.6.0",
6468
"gulp-eslint": "^1.1.0",
6569
"gulp-inject": "^3.0.0",

server/boot/a-react.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import debugFactory from 'debug';
66
import { dehydrate } from 'thundercats';
77
import { renderToString$ } from 'thundercats-react';
88

9-
import { app$ } from '../../common/app';
9+
import app$ from '../../common/app';
1010

1111
const debug = debugFactory('freecc:react-server');
1212

0 commit comments

Comments
 (0)