fix(@angular/build): keep the order of glob entries in the proxy configuration

Glob keys were converted to regular expressions by adding the new key and
deleting the old one, which moved every glob entry to the end of the
object. Since Vite proxies a request with the first entry that matches it,
a glob written before a broader plain key could never be used.

(cherry picked from commit 3871a9d)

Author: aminesbdev

packages/angular/build/src/builders/dev-server/tests/options/proxy-config_spec.ts

@@ -302,19 +302,47 @@ describeServeBuilder(executeDevServer, DEV_SERVER_BUILDER_INFO, (harness, setupT
         await proxyServer.close();
       }
     });
+
+    it('keeps the order of glob entries relative to other entries', async () => {
+      harness.useTarget('serve', {
+        ...BASE_OPTIONS,
+        proxyConfig: 'proxy.config.json',
+      });
+
+      const proxyServer = await createProxyServer();
+      const otherProxyServer = await createProxyServer('OTHER_API_RETURN');
+      try {
+        await harness.writeFiles({
+          'proxy.config.json': `
+              {
+                "/api/test/**": { "target": "http://127.0.0.1:${proxyServer.address.port}" },
+                "/api": { "target": "http://127.0.0.1:${otherProxyServer.address.port}" }
+              }
+            `,
+        });
+
+        const { result, response } = await executeOnceAndFetch(harness, '/api/test');
+
+        expect(result?.success).toBeTrue();
+        expect(await response?.text()).toContain('TEST_API_RETURN');
+      } finally {
+        await proxyServer.close();
+        await otherProxyServer.close();
+      }
+    });
   });
 });
 
 /**
  * Creates an HTTP Server used for proxy testing that provides a `/test` endpoint
- * that returns a 200 response with a body of `TEST_API_RETURN`. All other requests
- * will return a 404 response.
+ * that returns a 200 response with a body of `body` (`TEST_API_RETURN` by default).
+ * All other requests will return a 404 response.
  */
-async function createProxyServer() {
+async function createProxyServer(body = 'TEST_API_RETURN') {
   const proxyServer = createServer((request, response) => {
     if (request.url?.endsWith('/test')) {
       response.writeHead(200);
-      response.end('TEST_API_RETURN');
+      response.end(body);
     } else {
       response.writeHead(404);
       response.end();

packages/angular/build/src/utils/load-proxy-config.ts

@@ -114,13 +114,14 @@ function normalizeProxyConfiguration(
   }
 
   // TODO: Consider upstreaming glob support
-  for (const key of Object.keys(normalizedProxy)) {
-    if (key[0] !== '^' && isDynamicPattern(key)) {
-      const pattern = makeRegExpFromGlob(key).source;
-      normalizedProxy[pattern] = normalizedProxy[key];
-      delete normalizedProxy[key];
-    }
+  // The object is rebuilt so that converted glob entries keep their original position,
+  // since Vite proxies a request with the first entry that matches it.
+  const orderedProxy: Record<string, object> = {};
+  for (const [key, value] of Object.entries(normalizedProxy)) {
+    const context = key[0] !== '^' && isDynamicPattern(key) ? makeRegExpFromGlob(key).source : key;
+    orderedProxy[context] = value;
   }
+  normalizedProxy = orderedProxy;
 
   // Replace `pathRewrite` field with a `rewrite` function
   for (const proxyEntry of Object.values(normalizedProxy)) {