Use RoutePrefixToken if registered

package.json

@@ -27,7 +27,7 @@
     "react-router-dom": "^4.3.1"
   },
   "peerDependencies": {
-    "fusion-core": "^1.7.0-alpha.2",
+    "fusion-core": "^1.7.0-alpha.3",
     "react": "14.x - 16.x",
     "react-dom": "14.x - 16.x"
   },
@@ -44,7 +44,7 @@
     "eslint-plugin-prettier": "2.6.2",
     "eslint-plugin-react": "7.11.0",
     "flow-bin": "0.78.0",
-    "fusion-core": "^1.7.0-alpha.2",
+    "fusion-core": "^1.7.0-alpha.3",
     "fusion-plugin-universal-events": "^1.0.5",
     "fusion-react": "^1.1.0",
     "fusion-test-utils": "^1.2.2",

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();
       }
@@ -125,13 +140,13 @@ export default createPlugin({
             return payload;
           });
         // Expose the history object
-        const history = createBrowserHistory({basename: ctx.prefix});
+        const history = createBrowserHistory({basename: prefix});
         myAPI.history = history;
         ctx.element = (
           <Router
             history={history}
             Provider={Provider}
-            basename={ctx.prefix}
+            basename={prefix}
             onRoute={payload => {
               pageData = payload;
               emitter && emitter.emit('pageview:browser', payload);

yarn.lock

@@ -2557,9 +2557,9 @@ functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
 
-fusion-core@^1.7.0-alpha.2:
-  version "1.7.0-alpha.2"
-  resolved "https://registry.yarnpkg.com/fusion-core/-/fusion-core-1.7.0-alpha.2.tgz#f2279a57b93d4e19b468d106402accd1bafdef9f"
+fusion-core@^1.7.0-alpha.3:
+  version "1.7.0-alpha.3"
+  resolved "https://registry.yarnpkg.com/fusion-core/-/fusion-core-1.7.0-alpha.3.tgz#dfcb57dc2c3e4daa06d4714d729a6d2fbd725945"
   dependencies:
     koa "^2.4.1"
     koa-compose "^4.0.0"