diff --git a/examples/jwt/.babelrc b/examples/jwt/.babelrc deleted file mode 100644 index 41d0cf6..0000000 --- a/examples/jwt/.babelrc +++ /dev/null @@ -1,26 +0,0 @@ -{ - "stage": 0, - "optional": "runtime", - "loose": "all", - "plugins": [ - "typecheck" - ], - "env": { - "development": { - "plugins": [ - "react-transform" - ], - "extra": { - "react-transform": { - "transforms": [{ - "transform": "react-transform-catch-errors", - "imports": [ - "react", - "redbox-react" - ] - }] - } - } - } - } -} diff --git a/examples/jwt/bin/transpile.js b/examples/jwt/bin/transpile.js index 1f409f4..1246ebb 100644 --- a/examples/jwt/bin/transpile.js +++ b/examples/jwt/bin/transpile.js @@ -3,7 +3,7 @@ var fs = require('fs'); var path = require('path'); -var babelrc = fs.readFileSync(path.resolve(__dirname, '../.babelrc')); +var babelrc = fs.readFileSync(path.resolve(__dirname, '../node_modules/universal-redux/.babelrc')); var config; try { diff --git a/examples/jwt/config/universal-redux.config.js b/examples/jwt/config/universal-redux.config.js index de5add5..8430310 100644 --- a/examples/jwt/config/universal-redux.config.js +++ b/examples/jwt/config/universal-redux.config.js @@ -55,10 +55,12 @@ module.exports = { // Expects: Boolean */ lint: { - enabled: true, + enabled: false, config: projectRoot + '/.eslintrc' }, + // babelConfig: projectRoot + '/.babelrc', + /* // Enable native desktop notifications for Webpack build events. // Will not be run on production. diff --git a/examples/jwt/package.json b/examples/jwt/package.json index c4f36bd..fa1ade3 100644 --- a/examples/jwt/package.json +++ b/examples/jwt/package.json @@ -3,7 +3,7 @@ "version": "0.0.1", "description": "JWT example with Universal Redux", "main": "index.js", - "scripts": { + "scripts": { "start": "concurrent --kill-others \"better-npm-run api\" \"better-npm-run auth\" \"better-npm-run server\"", "build": "better-npm-run build", "postinstall": "./bin/build_for_heroku.sh", @@ -86,14 +86,9 @@ "concurrently": "1.0.0", "jsonwebtoken": "^5.4.1", "superagent": "^1.6.1", - "universal-redux": "^1.0.0-beta4" + "universal-redux": "^2.0.0-beta3" }, "devDependencies": { - "babel-core": "~5.8.33", - "babel-eslint": "^4.1.3", - "babel-plugin-react-transform": "~1.1.1", - "babel-plugin-typecheck": "^2.0.0", - "babel-runtime": "~5.8.29", "better-npm-run": "0.0.5", "classnames": "^2.2.0", "deep-equal": "^1.0.1", @@ -109,11 +104,12 @@ "react-addons-css-transition-group": "^0.14.3", "react-dom": "^0.14.3", "react-redux": "4.0.0", + "react-router": "1.0.2", "react-toolbox": "^0.13.4", "react-tools": "^0.10.0", "react-transform-catch-errors": "^1.0.0", "redbox-react": "^1.1.1", - "redux-simple-router": "0.0.10", + "redux-simple-router": "1.0.1", "url-loader": "^0.5.7", "warning": "^2.1.0" }