diff --git a/bin/merge-configs.js b/bin/merge-configs.js index 908435f..5efd5a6 100644 --- a/bin/merge-configs.js +++ b/bin/merge-configs.js @@ -73,10 +73,10 @@ module.exports = (userConfig) => { // add routes, reducer and rootClientComponent aliases so that client has access to them combinedWebpackConfig.resolve.alias = combinedWebpackConfig.resolve.alias || {}; - combinedWebpackConfig.resolve.alias.routes = universalReduxConfig.routes; - combinedWebpackConfig.resolve.alias.middleware = universalReduxConfig.redux.middleware || path.resolve(__dirname, '../lib/helpers/empty.js'); + combinedWebpackConfig.resolve.alias['universal-redux/routes'] = universalReduxConfig.routes; + combinedWebpackConfig.resolve.alias['universal-redux/middleware'] = universalReduxConfig.redux.middleware || path.resolve(__dirname, '../lib/helpers/empty.js'); const rootComponentPath = universalReduxConfig.rootClientComponent || universalReduxConfig.rootComponent || path.resolve(__dirname, '../lib/client/root.js'); - combinedWebpackConfig.resolve.alias.rootClientComponent = rootComponentPath; + combinedWebpackConfig.resolve.alias['universal-redux/rootClientComponent'] = rootComponentPath; // add project level vendor libs if (universalReduxConfig.webpack.vendorLibraries && isProduction) { diff --git a/src/client.js b/src/client.js index 62a10ed..45d4592 100755 --- a/src/client.js +++ b/src/client.js @@ -6,8 +6,8 @@ import { render as renderDevtools } from './client/devtools'; // dependencies of external source. these resolve via webpack aliases // as assigned in merge-configs.js -import middleware from 'middleware'; -import createRootClientComponent from 'rootClientComponent'; +import middleware from 'universal-redux/middleware'; +import createRootClientComponent from 'universal-redux/rootClientComponent'; const dest = document.getElementById('content'); diff --git a/src/client/providers/async-props.js b/src/client/providers/async-props.js index 052d386..2da59ec 100644 --- a/src/client/providers/async-props.js +++ b/src/client/providers/async-props.js @@ -1,7 +1,7 @@ import React from 'react'; import { Provider } from 'react-redux'; import { Router } from 'react-router'; -import getRoutes from 'routes'; +import getRoutes from 'universal-redux/routes'; import AsyncProps from '../../vendor/async-props'; export default function(store, devComponent) { diff --git a/src/client/providers/react-router.js b/src/client/providers/react-router.js index 2d8b666..ef4b9d9 100644 --- a/src/client/providers/react-router.js +++ b/src/client/providers/react-router.js @@ -2,7 +2,7 @@ import React from 'react'; import { Router } from 'react-router'; import { browserHistory } from 'react-router'; import { ReduxAsyncConnect } from 'redux-async-connect'; -import getRoutes from 'routes'; +import getRoutes from 'universal-redux/routes'; export default function(store) { const component = (