Fix proxy middleware and public path

alexbrazier · Mar 7, 2020 · 04a95dc · 04a95dc
1 parent 0107520
commit 04a95dc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/frontend/public/index.html b/frontend/public/index.html
@@ -22,7 +22,7 @@
       type="application/opensearchdescription+xml"
     />
     <title>Go</title>
-    <script src="/config.js"></script>
+    <script src="%PUBLIC_URL%/config.js"></script>
   </head>
   <body>
     <noscript>

diff --git a/frontend/src/setupProxy.js b/frontend/src/setupProxy.js
@@ -1,18 +1,15 @@
 const { createProxyMiddleware } = require('http-proxy-middleware');
 
 const excludedTypes = ['.js', '.css', '.json', '.ico', '.map', 'png', 'svg'];
+const filter = pathname =>
+  !pathname.startsWith('/go') &&
+  !excludedTypes.some(type => pathname.endsWith(type));
+
 module.exports = function setupProxy(app) {
-  app.use('/', (req, res, next) => {
-    if (
-      req.path.startsWith('/go') ||
-      excludedTypes.some(type => req.path.endsWith(type))
-    ) {
-      return next();
-    }
-    return createProxyMiddleware({ target: 'http://localhost:1323' })(
-      req,
-      res,
-      next,
-    );
-  });
+  app.use(
+    '/',
+    createProxyMiddleware(filter, {
+      target: 'http://localhost:1323',
+    }),
+  );
 };