Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelBenin committed Sep 28, 2017
1 parent dc296d0 commit 42f9acc
Show file tree
Hide file tree
Showing 9 changed files with 149 additions and 46 deletions.
48 changes: 36 additions & 12 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,20 +1,44 @@
{
"presets": [
["env", {
"targets": {
"node": "current"
}
}],
"react"
],
"env": {
"production": {
"presets": [
[
"env",
{
"targets": {
"node": "current"
}
}
],
"react"
]
},
"development": {
"presets": [
[
"env",
{
"targets": {
"node": "current"
}
}
],
"react"
],
"plugins": [
"transform-react-jsx-source"
]
},
"coverage": {
"presets": [
["env", {
"targets": {
"node": "current"
[
"env",
{
"targets": {
"node": "current"
}
}
}],
],
"react"
],
"plugins": [
Expand Down
4 changes: 1 addition & 3 deletions gulpfile.babel.js/configs/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ const config = {
env: {
NODE_ENV: 'development'
},
nodeArgs: [
// '--inspect'
]
nodeArgs: ['--inspect']
},
test: {
server: {
Expand Down
56 changes: 37 additions & 19 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
"prop-types": "https://registry.npmjs.org/prop-types/-/prop-types-15.5.8.tgz",
"react": "16.0.0",
"react-dom": "16.0.0",
"react-guard": "0.5.0",
"react-helmet": "5.2.0",
"react-redux": "5.0.6",
"react-router": "4.2.0",
Expand All @@ -92,6 +93,7 @@
"babel-eslint": "8.0.1",
"babel-loader": "7.1.2",
"babel-plugin-istanbul": "4.1.5",
"babel-plugin-transform-react-jsx-source": "6.22.0",
"babel-preset-env": "1.6.0",
"babel-preset-react": "6.24.1",
"babel-runtime": "6.26.0",
Expand Down
3 changes: 3 additions & 0 deletions src/client/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import configureStore from '../redux/store/store';
import initialLoadActionCreator from '../redux/action_creators/initial_load_action_creator';
import Root from '../views/containers/root_container';
import { ThirdPartyJs, loadAllThirdPartyJs } from './utils/third_party_js_util';
import reactGuardUtil from '../utils/react_guard_util';

const browserHistory = createHistory();
const originalHash = browserHistory.location.hash;
Expand All @@ -30,6 +31,8 @@ try {
bootstrappedConfig = {};
}

reactGuardUtil(env);

browserHistory.location.key = bootstrappedConfig.routing.location.key;

const store = configureStore(browserHistory, bootstrappedConfig, env);
Expand Down

0 comments on commit 42f9acc

Please sign in to comment.