Skip to content

Commit

Permalink
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 12 deletions.
16 changes: 12 additions & 4 deletions admin/client/src/boot/index.js
Expand Up @@ -23,6 +23,7 @@ import BreadcrumbsReducer from 'state/breadcrumbs/BreadcrumbsReducer';
import TextField from 'components/TextField/TextField';
import HiddenField from 'components/HiddenField/HiddenField';
import GridField from 'components/GridField/GridField';
import { syncHistoryWithStore, routerReducer } from 'react-router-redux';

// Sections
// eslint-disable-next-line no-unused-vars
Expand All @@ -32,9 +33,12 @@ function initReactRouter(store) {
routeRegister.updateRootRoute({
component: App,
});
const history = useRouterHistory(createHistory)({
basename: Config.get('adminUrlBase'),
});
let history = syncHistoryWithStore(
useRouterHistory(createHistory)({
basename: Config.get('adminUrlBase'),
}),
store
);
ReactDOM.render(
<Provider store={store}>
<ReactRouter
Expand Down Expand Up @@ -97,7 +101,11 @@ function appBoot() {
injector.register('GridField', GridField);

const initialState = {};
const rootReducer = combineReducers(reducerRegister.getAll());
const reducers = reducerRegister.getAll();
const rootReducer = combineReducers({
...reducers,
routing: routerReducer
});
const middleware = [thunkMiddleware];

if (Config.get('environment') === 'dev') {
Expand Down
22 changes: 14 additions & 8 deletions gulpfile.js
Expand Up @@ -252,6 +252,9 @@ gulp.task('bundle-lib', function bundleLib() {
.require('react-router',
{ expose: 'react-router' }
)
.require('react-router-redux',
{ expose: 'react-router-redux' }
)
.require('page.js',
{ expose: 'page.js' }
)
Expand Down Expand Up @@ -385,25 +388,28 @@ gulp.task('bundle-framework', function bundleBoot() {
gulpUtil.log('Finished', `bundled ${bundleFileName} ${msg}`);
})
.transform('babelify', babelifyOptions)
.external('components/Toolbar/Toolbar')
.external('components/FormBuilder/FormBuilder')
.external('bootstrap-collapse')
.external('components/Breadcrumb/Breadcrumb')
.external('components/FormAction/FormAction')
.external('deep-freeze-strict')
.external('components/FormBuilder/FormBuilder')
.external('components/GridField/GridField')
.external('components/Toolbar/Toolbar')
.external('deep-freeze-strict')
.external('i18n')
.external('jQuery')
.external('lib/Backend')
.external('lib/ReducerRegister')
.external('lib/RouteRegister')
.external('lib/SilverStripeComponent')
.external('page.js')
.external('react-addons-test-utils')
.external('react-dom')
.external('react-redux')
.external('react-router-redux')
.external('react-router')
.external('react')
.external('lib/ReducerRegister')
.external('lib/RouteRegister')
.external('redux-thunk')
.external('redux')
.external('lib/Backend')
.external('lib/SilverStripeComponent')
.external('bootstrap-collapse')
.bundle()
.on('update', bundleBoot)
.on('error', notify.onError({ message: `${bundleFileName}: <%= error.message %>` }))
Expand Down
4 changes: 4 additions & 0 deletions npm-shrinkwrap.json

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

1 change: 1 addition & 0 deletions package.json
Expand Up @@ -55,6 +55,7 @@
"react-dom": "^0.14.8",
"react-redux": "^4.4.1",
"react-router": "^2.4.1",
"react-router-redux": "^4.0.5",
"redux": "https://registry.npmjs.org/redux/-/redux-3.0.5.tgz",
"redux-thunk": "^2.1.0",
"tinymce": "^4.3.3",
Expand Down

0 comments on commit 073c05d

Please sign in to comment.