Use RoutePrefixToken if registered

Author: rtsao

src/__tests__/plugin.js

@@ -8,7 +8,7 @@
 
 import React from 'react';
 import {UniversalEventsToken} from 'fusion-plugin-universal-events';
-import {createPlugin} from 'fusion-core';
+import {createPlugin, RoutePrefixToken} from 'fusion-core';
 import App from 'fusion-react';
 import {getSimulator} from 'fusion-test-utils';
 import {withRouter, Link} from 'react-router-dom';
@@ -17,12 +17,6 @@ import {Route} from '../modules/Route';
 import {Redirect} from '../modules/Redirect.js';
 import RouterPlugin, {RouterProviderToken, RouterToken} from '../plugin';
 
-const addRoutePrefix = (ctx, next) => {
-  // hack until we have better route prefix support in fusion-test-utils
-  ctx.prefix = '/test';
-  return next();
-};
-
 function getApp(el) {
   const app = new App(el);
   app.register(RouterToken, RouterPlugin);
@@ -31,7 +25,7 @@ function getApp(el) {
 
 function getPrefixApp(el) {
   const app = new App(el);
-  app.middleware(addRoutePrefix);
+  app.register(RoutePrefixToken, '/test');
   app.register(RouterPlugin);
   return app;
 }

src/plugin.js

@@ -8,7 +8,14 @@
 
 import * as React from 'react';
 import {UniversalEventsToken} from 'fusion-plugin-universal-events';
-import {createPlugin, createToken, html, unescape, memoize} from 'fusion-core';
+import {
+  createPlugin,
+  createToken,
+  html,
+  unescape,
+  memoize,
+  RoutePrefixToken,
+} from 'fusion-core';
 import {Router as ServerRouter} from './server';
 import {Router as BrowserRouter} from './browser';
 import {Router as DefaultProvider} from 'react-router-dom';
@@ -41,10 +48,18 @@ export default createPlugin({
   deps: {
     emitter: UniversalEventsToken.optional,
     Provider: RouterProviderToken.optional,
+    prefix: RoutePrefixToken.optional,
   },
-  middleware: ({emitter, Provider = DefaultProvider}, self) => {
+  middleware: ({emitter, Provider = DefaultProvider, prefix}, self) => {
     return async (ctx, next) => {
-      const prefix = ctx.prefix || '';
+      if (!prefix) {
+        if (ctx.prefix) {
+          prefix = ctx.prefix;
+        } else {
+          prefix = '';
+        }
+      }
+
       if (!ctx.element) {
         return next();
       }