Skip to content

Beautiful Open-Source Form Builder

Refactor feature flag handling in client and server plugins

Julien Nahum22a543fa8041
diff --git a/client/plugins/feature-flags.client.js b/client/plugins/feature-flags.client.js
index a4b349c54..44dc01ff9 100644
--- a/client/plugins/feature-flags.client.js
+++ b/client/plugins/feature-flags.client.js
@@ -5,10 +5,10 @@ export default defineNuxtPlugin((nuxtApp) => {
// Provide refresh capability
nuxtApp.provide('refreshFeatureFlags', async () => {
try {
- const { contentApi } = await import('~/api/content')
- const newFlags = await contentApi.featureFlags.list()
- featureFlagsState.value = newFlags
- return newFlags
+ // Force fresh fetch by adding cache-busting timestamp
+ const flags = await $fetch(`/api/feature-flags?t=${Date.now()}`)
+ featureFlagsState.value = flags
+ return flags
} catch (error) {
console.error('Failed to refresh feature flags:', error)
throw error
diff --git a/client/plugins/feature-flags.server.js b/client/plugins/feature-flags.server.js
index 9f67cc21d..60d86f301 100644
--- a/client/plugins/feature-flags.server.js
+++ b/client/plugins/feature-flags.server.js
@@ -1,23 +1,22 @@
export default defineNuxtPlugin(async (nuxtApp) => {
- // Load feature flags during SSR
+ // Load feature flags during SSR using cached server route
const featureFlagsState = useState('featureFlags', () => ({}))
try {
- const { contentApi } = await import('~/api/content')
- const flags = await contentApi.featureFlags.list()
+ const flags = await $fetch('/api/feature-flags')
featureFlagsState.value = flags
} catch (error) {
console.error('Failed to load feature flags on server:', error)
// Keep empty object as fallback
}
- // Provide refresh capability
+ // Provide simple refresh capability
nuxtApp.provide('refreshFeatureFlags', async () => {
try {
- const { contentApi } = await import('~/api/content')
- const newFlags = await contentApi.featureFlags.list()
- featureFlagsState.value = newFlags
- return newFlags
+ // Force fresh fetch by adding cache-busting timestamp
+ const flags = await $fetch(`/api/feature-flags?t=${Date.now()}`)
+ featureFlagsState.value = flags
+ return flags
} catch (error) {
console.error('Failed to refresh feature flags:', error)
throw error
diff --git a/client/server/api/feature-flags.get.js b/client/server/api/feature-flags.get.js
new file mode 100644
index 000000000..691c05f67
--- /dev/null
+++ b/client/server/api/feature-flags.get.js
@@ -0,0 +1,33 @@
+// Cached server API route for feature flags
+export default defineCachedEventHandler(async (event) => {
+ const config = useRuntimeConfig()
+
+ // Call Laravel API directly with proper headers
+ const apiBase = config.privateApiBase || config.public.apiBase
+
+ try {
+ const response = await $fetch('/content/feature-flags', {
+ baseURL: apiBase,
+ headers: {
+ 'accept': 'application/json',
+ ...(config.apiSecret && { 'x-api-secret': config.apiSecret })
+ }
+ })
+
+ return response
+ } catch (error) {
+ console.error('Failed to fetch feature flags from Laravel API:', error)
+ // Return empty object as fallback to prevent breaking the app
+ return {}
+ }
+}, {
+ maxAge: 10 * 60, // 10 minutes cache
+ name: 'feature-flags',
+ getKey: (event) => {
+ // Include timestamp in cache key for cache-busting when refreshing
+ const url = new URL(event.node.req.url || '', 'http://localhost')
+ const timestamp = url.searchParams.get('t')
+ return timestamp ? `global:${timestamp}` : 'global'
+ },
+ swr: true // Serve stale while revalidating in background
+})
\ No newline at end of file