fix(cloudflare): remove Netlify runtime redirect lookup

Author: ThatGuySam

helpers/astro/request.js

@@ -1,5 +1,4 @@
-import { getNetlifyRedirect } from '~/helpers/config-node.js'
-
+import { getRedirectRule } from '../../src/middleware-rules.js'
 
 const ONE_SECOND = 1
 const ONE_MINUTE = 60
@@ -55,21 +54,11 @@ export async function applyResponseDefaults ( Astro ) {
 
 export async function catchRedirectResponse ( Astro ) {
     const requestUrl = new URL( Astro.request.url )
+    const redirectRule = getRedirectRule( requestUrl.pathname )
 
-    let netlifyRedirectUrl = null
-
-    try {
-        netlifyRedirectUrl = await getNetlifyRedirect( requestUrl.pathname )
-    } catch ( error ) {
-        console.warn( `Skipping redirect lookup for ${ requestUrl.pathname }`, error )
-    }
-
-    // console.log('netlifyRedirectUrl', netlifyRedirectUrl)
-
-    if ( netlifyRedirectUrl !== null ) {
-        return Astro.redirect( netlifyRedirectUrl.to )
+    if ( redirectRule !== null ) {
+        return Astro.redirect( redirectRule.to, redirectRule.status )
     }
 
     return null
 }
-

test/playwright/apple-silicon-app-test.playwright.ts

@@ -41,7 +41,7 @@ describe( 'Apple Silicon app test page', () => {
             env: {
                 TEST_RESULT_STORE: '/api/test-results'
             },
-            preferConfiguredBaseUrl: false
+            preferConfiguredBaseUrl: true
         })
 
         browser = await launchBrowser()
@@ -78,7 +78,9 @@ describe( 'Apple Silicon app test page', () => {
         } )
 
         await page.waitForFunction( () => {
-            const island = document.querySelector( 'astro-island[component-url="/pages/apple-silicon-app-test.vue"]' )
+            const island = [ ...document.querySelectorAll( 'astro-island' ) ].find( element => {
+                return element.getAttribute( 'component-url' )?.includes( 'apple-silicon-app-test' )
+            } )
 
             return Boolean( island && !island.hasAttribute( 'ssr' ) )
         }, {
@@ -121,7 +123,7 @@ describe( 'Apple Silicon app test page', () => {
 } )
 
 async function stubResultStore ( page: Page, submittedScans: Record<string, unknown>[] ) {
-    await page.route( '**/api/test-results', async route => {
+    await page.route( '**/api/test-results*', async route => {
         const postData = route.request().postDataJSON()
 
         if ( postData && typeof postData === 'object' ) {

test/prebuild/middleware.test.js

@@ -1,5 +1,6 @@
-import { describe, expect, it } from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
 
+import { catchRedirectResponse } from '../../helpers/astro/request.js'
 import {
     getRedirectRule,
     isProductionHostname
@@ -26,4 +27,18 @@ describe( 'site middleware', () => {
         expect( isProductionHostname( 'cf.doesitarm.com' ) ).toBe( false )
         expect( isProductionHostname( 'doesitarm-preview.workers.dev' ) ).toBe( false )
     } )
+
+    it( 'resolves redirects without reading Netlify runtime config', async () => {
+        const redirect = vi.fn()
+
+        const response = await catchRedirectResponse({
+            request: {
+                url: 'https://doesitarm.com/app/electron'
+            },
+            redirect
+        })
+
+        expect( response ).toBeUndefined()
+        expect( redirect ).toHaveBeenCalledWith( '/app/electron-framework', 301 )
+    } )
 } )