flamefront 0.1.5 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flamefront",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "private": false,
   "description": "Typed centralized route manifests for Octane.",
   "license": "MIT",

package/src/action-client.ts

@@ -1,6 +1,7 @@
 import * as devalue from "devalue"
 import { data } from "@octanejs/remix-router"
 import {
+  actionRedirectStatusHeader,
   actionProtocolEnvelope,
   actionResponseInit,
   type ActionEnvelope,
@@ -45,6 +46,19 @@ function isRedirect(response: Response): boolean {
   return response.status >= 300 && response.status < 400
 }
 
+function transportedRedirect(response: Response): Response | undefined {
+  const status = Number(response.headers.get(actionRedirectStatusHeader))
+
+  if (!Number.isInteger(status) || status < 300 || status >= 400) {
+    return undefined
+  }
+
+  const headers = new Headers(response.headers)
+
+  headers.delete(actionRedirectStatusHeader)
+  return new Response(null, { status, headers })
+}
+
 function headersFromEnvelope(envelope: ActionEnvelope): Headers | undefined {
   return envelope.headers.length > 0
     ? new Headers(
@@ -83,6 +97,14 @@ async function decodeActionResponse(
   response: Response,
   options: ActionRequestOptions,
 ): Promise<unknown> {
+  const redirect = transportedRedirect(response)
+
+  if (redirect) {
+    invalidateRouteDataCache()
+    invalidateRouteFragments()
+    throw redirect
+  }
+
   if (isRedirect(response)) {
     invalidateRouteDataCache()
     invalidateRouteFragments()
@@ -157,7 +179,6 @@ export function createActionProxy<
     const response = await globalThis.fetch(endpoint, {
       method: "POST",
       credentials: "same-origin",
-      redirect: "manual",
       headers: {
         "Content-Type": "application/vnd.flamefront.action+devalue",
         Accept: "application/vnd.flamefront.action+devalue",
@@ -178,8 +199,13 @@ export async function submitRouteAction(
 
   url.searchParams.set("__flamefront_action", "1")
   const source = request.clone()
-  const response = await globalThis.fetch(new Request(url, source), {
-    redirect: "manual",
+  const actionRequest = new Request(url, {
+    method: source.method,
+    headers: source.headers,
+    body: await source.blob(),
+    signal: source.signal,
+  })
+  const response = await globalThis.fetch(actionRequest, {
     credentials: "same-origin",
   })
 

package/src/action.ts

@@ -1,5 +1,7 @@
 import * as devalue from "devalue"
 
+export const actionRedirectStatusHeader = "X-Flamefront-Redirect-Status"
+
 /** The structural value returned by the router's `data()` helper. */
 export interface ActionDataWithResponseInit<Data = unknown> {
   readonly type: "DataWithResponseInit"
@@ -339,6 +341,13 @@ function envelopeResponse(envelope: ActionEnvelope): Response {
 /** Encode an action return value or error as a Fetch response. */
 export function actionResultResponse(value: unknown): Response {
   if (value instanceof Response) {
+    if (value.status >= 300 && value.status < 400) {
+      const headers = new Headers(value.headers)
+
+      headers.set(actionRedirectStatusHeader, String(value.status))
+      return new Response(null, { status: 204, headers })
+    }
+
     return value
   }
 

package/src/vite.ts

@@ -820,10 +820,15 @@ export function flamefront(options: FlamefrontOptions = {}) {
       transformOptions?: TransformOptions,
     ) {
       const context = this as Pick<PluginContext, "environment">
+      const moduleId = cleanModuleId(id)
+
+      if (moduleId.endsWith(".md") || moduleId.endsWith(".mdx")) {
+        return null
+      }
 
       if (
         isServerEnvironment(context, transformOptions) &&
-        !cleanModuleId(id).endsWith(".tsrx") &&
+        !moduleId.endsWith(".tsrx") &&
         source.includes("action") &&
         /flamefront(?:\/server)?["']/.test(source)
       ) {
@@ -838,7 +843,7 @@ export function flamefront(options: FlamefrontOptions = {}) {
       }
 
       if (
-        !cleanModuleId(id).endsWith(".tsrx") &&
+        !moduleId.endsWith(".tsrx") &&
         source.includes("action") &&
         /flamefront(?:\/server)?["']/.test(source)
       ) {
@@ -1134,7 +1139,13 @@ export function flamefront(options: FlamefrontOptions = {}) {
         return null
       }
 
-      if (!(await loadRouteModuleIds()).has(cleanModuleId(id))) {
+      const moduleId = cleanModuleId(id)
+
+      if (moduleId.endsWith(".md") || moduleId.endsWith(".mdx")) {
+        return null
+      }
+
+      if (!(await loadRouteModuleIds()).has(moduleId)) {
         return null
       }