Skip to content

Commit

Permalink
Merge pull request #2 from AdrieanKhisbe/upgrade-babel
Browse files Browse the repository at this point in the history
Upgrade dev dependancies (migration to babel 6)
  • Loading branch information
Dindaleon committed Dec 23, 2015
2 parents 1d2efb7 + 8c0e4d8 commit 282316c
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 11 deletions.
3 changes: 3 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["es2015", "stage-0", "react"]
}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
node_modules
static/assets/*
converage
coverage
npm-debug.log
TO_BE_REMOVED
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ This repo was inspired by the following projects and their authors
* Hapi server framework for Node [hapijs](https://github.com/hapijs/hapi)
* React JS Library for user interfaces [reactjs](https://github.com/reactjs) v0.14
* Webpack + [React-transform](https://github.com/gaearon/babel-plugin-react-transform) and [react-transform-hmr](https://github.com/gaearon/react-transform-hmr)
* React Router keeps your UI in sync with the URL [react-router](https://github.com/rackt/react-router) v1.0.0-rc3
* React Router keeps your UI in sync with the URL [react-router](https://github.com/rackt/react-router) v1.0.2
* React transmit for server side rendering of reactjs [react-transmit](https://github.com/RickWong/react-transmit)
* ES6 and ES7 ready with [BabelJs](https://babeljs.io/)
* Linting with eslint & jscs
Expand Down
21 changes: 12 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hapi-react-starter-kit",
"version": "0.0.1",
"version": "0.0.2",
"description": "A hapi React Starter kit with react-router, redux, react-transform",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -44,29 +44,32 @@
"dependencies": {
"h2o2": "^4.0.1",
"hapi": "^11.0.0",
"history": "^1.12.5",
"history": "~1.13.1",
"inert": "^3.1.0",
"react": "^0.14.0",
"react-dom": "^0.14.0",
"react-router": "^1.0.0-rc3",
"react-router": "^1.0.2",
"react-transmit": "^3.0.7"
},
"devDependencies": {
"babel": "^5.8.23",
"babel-core": "^5.8.25",
"babel-cli": "^6.3.15",
"babel-core": "^6.3.15",
"babel-eslint": "^4.1.3",
"babel-jscs": "^2.0.4",
"babel-loader": "^5.3.2",
"babel-loader": "^6.2.0",
"babel-plugin-react-transform": "^1.1.1",
"babel-preset-es2015": "^6.3.13",
"babel-preset-react": "^6.3.13",
"babel-preset-stage-0": "^6.3.13",
"chalk": "^1.1.1",
"codacy-coverage": "^1.1.3",
"coveralls": "^2.11.4",
"eslint": "^1.7.0",
"eslint-plugin-react": "^3.5.1",
"extract-text-webpack-plugin": "^0.8.2",
"extract-text-webpack-plugin": "^0.9.1",
"hapi-webpack-plugin": "^1.2.1",
"isparta": "^3.1.0",
"isparta-instrumenter-loader": "^0.2.1",
"isparta": "^4.0.0",
"isparta-instrumenter-loader": "^1.0.0",
"istanbul": "^0.4.0",
"jscs": "^2.3.2",
"json-loader": "^0.5.3",
Expand Down

0 comments on commit 282316c

Please sign in to comment.