add basename support for SSR Links (#885)

electrode-io · Jul 30, 2018 · 295b11d · 295b11d
1 parent 839c838
commit 295b11d
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/packages/electrode-redux-router-engine/lib/redux-router-engine.js b/packages/electrode-redux-router-engine/lib/redux-router-engine.js
@@ -36,6 +36,8 @@ class ReduxRouterEngine {
 
     this.options.withIds = !!options.withIds;
 
+    this.options.basename = options.basename || "";
+
     if (!options.stringifyPreloadedState) {
       this.options.stringifyPreloadedState = state =>
         `window.__PRELOADED_STATE__ = ${escapeBadChars(JSON.stringify(state))};`;
@@ -198,7 +200,7 @@ class ReduxRouterEngine {
           { store },
           React.createElement(
             StaticRouter,
-            { location, context: routeContext },
+            { location, context: routeContext, basename: this.options.basename },
             this._routesComponent
           )
         )

diff --git a/packages/electrode-redux-router-engine/test/routes.jsx b/packages/electrode-redux-router-engine/test/routes.jsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { connect } from "react-redux";
-import { withRouter, Redirect } from "react-router-dom";
+import { withRouter, Redirect, Link } from "react-router-dom";
 import { renderRoutes } from "react-router-config";
 import { renderFlatRoutes } from "./render-flat-routes";
 
@@ -31,6 +31,12 @@ class Test extends React.Component {
   }
 }
 
+class TestBasename extends React.Component {
+  render() {
+    return <Link to="/to-target">Test</Link>;
+  }
+}
+
 class TestRedirect extends React.Component {
   render() {
     return (
@@ -132,6 +138,12 @@ const routes = [
         exact: true,
         component: Home
       },
+      {
+        // Default, equivalent of RR3's IndexRoute
+        path: "/test/basename",
+        exact: true,
+        component: TestBasename
+      },
       {
         path: "/test/init",
         exact: false,

diff --git a/packages/electrode-redux-router-engine/test/spec/redux-router-engine.spec.js b/packages/electrode-redux-router-engine/test/spec/redux-router-engine.spec.js
@@ -206,6 +206,26 @@ describe("redux-router-engine", function() {
     });
   });
 
+  it("should render Link with no basename", () => {
+    const engine = new ReduxRouterEngine({ routes });
+    testReq.url = Url.parse("/test/basename");
+
+    return engine.render(testReq).then(result => {
+      expect(result.status).to.equal(200);
+      expect(result.html).to.equal("<div>Page<a href=\"/to-target\">Test</a></div>");
+    });
+  });
+
+  it("should render Link with basename", () => {
+    const engine = new ReduxRouterEngine({ routes, basename: "/my-base" });
+    testReq.url = Url.parse("/test/basename");
+
+    return engine.render(testReq).then(result => {
+      expect(result.status).to.equal(200);
+      expect(result.html).to.equal("<div>Page<a href=\"/my-base/to-target\">Test</a></div>");
+    });
+  });
+
   it("should not populate react-id by default", () => {
     const engine = new ReduxRouterEngine({ routes });
     testReq.url = Url.parse("/test");