Merge pull request #372 from fs-webdev/joeyTest

very slowly adding lang code stuff in

Author: joeycozza

CHANGELOG-FRONTIER.md

@@ -1,3 +1,8 @@
+## 8.8.0
+
+- Removed some proxies that are no longer needed, and scoped some others tighter to not conflict with localhost URLs
+- Update proxy tool with a pathFilter that looks for lang code in url
+
 ## 8.7.11
 
 - Feature detection for private class fields was erroring out before running the check, now it will be within `eval` so it will run even if the browser doesn't support it.

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@fs/react-scripts",
-  "version": "8.7.11",
+  "version": "8.8.0",
   "upstreamVersion": "5.0.1",
   "description": "Configuration and scripts for Create React App.",
   "repository": {
@@ -82,7 +82,7 @@
     "file-loader": "^6.2.0",
     "fs-extra": "^10.0.0",
     "html-webpack-plugin": "^5.5.0",
-    "http-proxy-middleware": "^1.0.5",
+    "http-proxy-middleware": "^3.0.2",
     "identity-obj-proxy": "^3.0.0",
     "intersection-observer": "^0.12.0",
     "jest": "^27.4.3",

packages/react-scripts/package.json

@@ -19,20 +19,23 @@ const proxies = [
     accept:
       'application/' /* 'application/x-gedcomx-v1+json', 'application/json', etc. */,
   },
-  {
-    route: '/ask',
-  },
   {
     route: '/cis-web',
   },
   {
-    route: '/cmsa',
+    route: '/cmsa/api',
   },
   {
     route: '/dz',
   },
   {
-    route: '/frontier',
+    route: '/frontier/beacon',
+  },
+  {
+    route: '/frontier/ip',
+  },
+  {
+    route: '/frontier/graphql',
   },
   {
     route: '/hf',

packages/react-scripts/proxy/proxies.js

@@ -4,8 +4,6 @@ const { createProxyMiddleware } = require('http-proxy-middleware')
 require('dotenv').config()
 
 const setProxies = (app, customProxies = []) => {
-  // detect env
-  const env = process.env.TARGET_ENV || 'local'
 
   // bring in auth middleware once required keys are set
   const cookieParser = require('cookie-parser')
@@ -26,13 +24,17 @@ const setProxies = (app, customProxies = []) => {
   auth('/auth', app)
   console.log('\n/auth local proxy set up!')
 
+  const langRegex = '^\/[a-z]{2,3}(-[a-zA-Z0-9-]*)?' // Copied from DTM haproxy config MATCH_root_lang_path_with_slash acl
+
   // set default env target
   // prod auth keys don't exist in fs-config for security reasons, so only other alt-envs for now
   const target = process.env.BASE_URL
 
   const setProxy = proxyConfig => {
+    const langPathRegex = new RegExp(langRegex + proxyConfig.route)
     const options = {
       target,
+      pathFilter: (pathname) => pathname.startsWith(proxyConfig.route) || pathname.match(langPathRegex),
       changeOrigin: true,
       logLevel: 'debug',
       timeout: 5000,
@@ -46,15 +48,15 @@ const setProxies = (app, customProxies = []) => {
         // (e.g., type 'application/' works for 'application/x-gedcomx-v1+json' and 'application/json')
         if (req.headers.accept && req.headers.accept.indexOf(proxyConfig.accept) === 0) {
           // set up proxy middleware and use immediately
-          createProxyMiddleware(proxyConfig.route, options)(req, res, next)
+          createProxyMiddleware(options)(req, res, next)
         } else {
           // wrong accept type: don't proxy request
           next();
         }
       })
     }
     else {
-      app.use(createProxyMiddleware(proxyConfig.route, options))
+      app.use(createProxyMiddleware(options))
     }
   }