Skip to content
Browse files

Update babel to 6.0

1 parent 05d34c8 commit 4341a3eee2f73d035390d6ba8f42b338f52135e7 @ltegman ltegman committed
View
3 .babelrc
@@ -1,3 +1,4 @@
{
- "stage": 0
+ "presets": ["es2015", "react", "stage-0"],
+ "plugins": ["babel-plugin-add-module-exports"]
}
View
2 client/index.js
@@ -8,7 +8,7 @@ import { createLocation, createHistory } from 'history';
import { hydrate } from 'thundercats';
import { render$ } from 'thundercats-react';
-import { app$ } from '../common/app';
+import app$ from '../common/app';
import historySaga from './history-saga';
import errSaga from './err-saga';
View
2 common/app/App.jsx
@@ -3,7 +3,7 @@ import { Row } from 'react-bootstrap';
import { ToastMessage, ToastContainer } from 'react-toastr';
import { contain } from 'thundercats-react';
-import { Nav } from './components/Nav';
+import Nav from './components/Nav';
const toastMessageFactory = React.createFactory(ToastMessage.animation);
View
4 common/app/Cat.js
@@ -4,8 +4,8 @@ import { Disposable, Observable } from 'rx';
import { post$, postJSON$ } from '../utils/ajax-stream.js';
import { AppActions, AppStore } from './flux';
-import { HikesActions } from './routes/Hikes/flux';
-import { JobActions } from './routes/Jobs/flux';
+import HikesActions from './routes/Hikes/flux';
+import JobActions from './routes/Jobs/flux';
const ajaxStamp = stamp({
methods: {
View
2 common/app/components/Footer/index.js
@@ -1 +1 @@
-export { default as Footer } from './Footer.jsx';
+export default from './Footer.jsx';
View
2 common/app/components/Nav/index.js
@@ -1 +1 @@
-export { default as Nav } from './Nav.jsx';
+export default from './Nav.jsx';
View
2 common/app/index.js
@@ -1 +1 @@
-export { default as app$ } from './app-stream.jsx';
+export default from './app-stream.jsx';
View
2 common/app/routes/Hikes/flux/index.js
@@ -1 +1 @@
-export { default as HikesActions } from './Actions';
+export default from './Actions';
View
2 common/app/routes/Jobs/flux/index.js
@@ -1 +1 @@
-export { default as JobActions } from './Actions';
+export default from './Actions';
View
12 package.json
@@ -28,10 +28,14 @@
"dependencies": {
"accepts": "^1.3.0",
"async": "^1.5.0",
- "babel": "5.8.34",
- "babel-core": "5.8.34",
+ "babel-cli": "^6.3.17",
+ "babel-core": "^6.3.26",
"babel-eslint": "^4.1.4",
- "babel-loader": "5.4.0",
+ "babel-loader": "^6.2.1",
+ "babel-plugin-add-module-exports": "^0.1.2",
+ "babel-preset-es2015": "^6.3.13",
+ "babel-preset-react": "^6.3.13",
+ "babel-preset-stage-0": "^6.3.13",
"body-parser": "^1.13.2",
"chai-jquery": "^2.0.0",
"cheerio": "~0.19.0",
@@ -59,7 +63,7 @@
"forever": "~0.15.1",
"frameguard": "~0.2.2",
"gulp": "^3.9.0",
- "gulp-babel": "^5.3.0",
+ "gulp-babel": "^6.1.1",
"gulp-concat": "^2.6.0",
"gulp-eslint": "^1.1.0",
"gulp-inject": "^3.0.0",
View
2 server/boot/a-react.js
@@ -6,7 +6,7 @@ import debugFactory from 'debug';
import { dehydrate } from 'thundercats';
import { renderToString$ } from 'thundercats-react';
-import { app$ } from '../../common/app';
+import app$ from '../../common/app';
const debug = debugFactory('freecc:react-server');

0 comments on commit 4341a3e

Please sign in to comment.
Something went wrong with that request. Please try again.