gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5941 from FreeCodeCamp/fix/update-babel-to-6.0

Browse Source 
Update babel to 6.0
This commit is contained in:
Berkeley Martinez
2016-01-19 13:02:25 -08:00
parent 04fd94e2cd 4341a3eee2
commit 49987c57e8
11 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.babelrc
View File

@ -1,3 +1,4 @@
{ {
"stage": 0 "presets": ["es2015", "react", "stage-0"],
"plugins": ["babel-plugin-add-module-exports"]
} }

2
client/index.js
View File

@ -8,7 +8,7 @@ import { createLocation, createHistory } from 'history';
import { hydrate } from 'thundercats'; import { hydrate } from 'thundercats';
import { render$ } from 'thundercats-react'; import { render$ } from 'thundercats-react';
import { app$ } from '../common/app'; import app$ from '../common/app';
import historySaga from './history-saga'; import historySaga from './history-saga';
import errSaga from './err-saga'; import errSaga from './err-saga';

2
common/app/App.jsx
View File

@ -3,7 +3,7 @@ import { Row } from 'react-bootstrap';
import { ToastMessage, ToastContainer } from 'react-toastr'; import { ToastMessage, ToastContainer } from 'react-toastr';
import { contain } from 'thundercats-react'; import { contain } from 'thundercats-react';
import { Nav } from './components/Nav'; import Nav from './components/Nav';
const toastMessageFactory = React.createFactory(ToastMessage.animation); const toastMessageFactory = React.createFactory(ToastMessage.animation);

4
common/app/Cat.js
View File

@ -4,8 +4,8 @@ import { Disposable, Observable } from 'rx';
import { post$, postJSON$ } from '../utils/ajax-stream.js'; import { post$, postJSON$ } from '../utils/ajax-stream.js';
import { AppActions, AppStore } from './flux'; import { AppActions, AppStore } from './flux';
import { HikesActions } from './routes/Hikes/flux'; import HikesActions from './routes/Hikes/flux';
import { JobActions } from './routes/Jobs/flux'; import JobActions from './routes/Jobs/flux';
const ajaxStamp = stamp({ const ajaxStamp = stamp({
methods: { methods: {

2
common/app/components/Footer/index.js
View File

@ -1 +1 @@
export { default as Footer } from './Footer.jsx'; export default from './Footer.jsx';

2
common/app/components/Nav/index.js
View File

@ -1 +1 @@
export { default as Nav } from './Nav.jsx'; export default from './Nav.jsx';

2
common/app/index.js
View File

@ -1 +1 @@
export { default as app$ } from './app-stream.jsx'; export default from './app-stream.jsx';

2
common/app/routes/Hikes/flux/index.js
View File

@ -1 +1 @@
export { default as HikesActions } from './Actions'; export default from './Actions';

2
common/app/routes/Jobs/flux/index.js
View File

@ -1 +1 @@
export { default as JobActions } from './Actions'; export default from './Actions';

12
package.json
View File

@ -27,10 +27,14 @@
"dependencies": { "dependencies": {
"accepts": "^1.3.0", "accepts": "^1.3.0",
"async": "^1.5.0", "async": "^1.5.0",
"babel": "5.8.34", "babel-cli": "^6.3.17",
"babel-core": "5.8.34", "babel-core": "^6.3.26",
"babel-eslint": "^4.1.4", "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", "body-parser": "^1.13.2",
"chai-jquery": "^2.0.0", "chai-jquery": "^2.0.0",
"cheerio": "~0.19.0", "cheerio": "~0.19.0",
@ -58,7 +62,7 @@
"forever": "~0.15.1", "forever": "~0.15.1",
"frameguard": "~0.2.2", "frameguard": "~0.2.2",
"gulp": "^3.9.0", "gulp": "^3.9.0",
"gulp-babel": "^5.3.0", "gulp-babel": "^6.1.1",
"gulp-concat": "^2.6.0", "gulp-concat": "^2.6.0",
"gulp-eslint": "^1.1.0", "gulp-eslint": "^1.1.0",
"gulp-inject": "^3.0.0", "gulp-inject": "^3.0.0",

2
server/boot/a-react.js
View File

@ -6,7 +6,7 @@ import debugFactory from 'debug';
import { dehydrate } from 'thundercats'; import { dehydrate } from 'thundercats';
import { renderToString$ } from 'thundercats-react'; import { renderToString$ } from 'thundercats-react';
import { app$ } from '../../common/app'; import app$ from '../../common/app';
const debug = debugFactory('freecc:react-server'); const debug = debugFactory('freecc:react-server');