mirror of
https://github.com/aspnet/JavaScriptServices.git
synced 2025-12-23 01:58:29 +00:00
ReactReduxSpa's boot-server now supports redirections issued by react-router
This commit is contained in:
@@ -5,15 +5,22 @@ import { match, RouterContext } from 'react-router';
|
|||||||
import createMemoryHistory from 'history/lib/createMemoryHistory';
|
import createMemoryHistory from 'history/lib/createMemoryHistory';
|
||||||
import routes from './routes';
|
import routes from './routes';
|
||||||
import configureStore from './configureStore';
|
import configureStore from './configureStore';
|
||||||
|
type BootResult = { html?: string, globals?: { [key: string]: any }, redirectUrl?: string};
|
||||||
|
|
||||||
export default function (params: any): Promise<{ html: string }> {
|
export default function (params: any): Promise<{ html: string }> {
|
||||||
return new Promise<{ html: string, globals: { [key: string]: any } }>((resolve, reject) => {
|
return new Promise<BootResult>((resolve, reject) => {
|
||||||
// Match the incoming request against the list of client-side routes
|
// Match the incoming request against the list of client-side routes
|
||||||
match({ routes, location: params.location }, (error, redirectLocation, renderProps: any) => {
|
match({ routes, location: params.location }, (error, redirectLocation, renderProps: any) => {
|
||||||
if (error) {
|
if (error) {
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If there's a redirection, just send this information back to the host application
|
||||||
|
if (redirectLocation) {
|
||||||
|
resolve({ redirectUrl: redirectLocation.pathname });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// If it didn't match any route, renderProps will be undefined
|
// If it didn't match any route, renderProps will be undefined
|
||||||
if (!renderProps) {
|
if (!renderProps) {
|
||||||
throw new Error(`The location '${ params.url }' doesn't match any route configured in react-router.`);
|
throw new Error(`The location '${ params.url }' doesn't match any route configured in react-router.`);
|
||||||
|
|||||||
Reference in New Issue
Block a user