fix(nuxt): fix merge conflicts

danielroe · danielroe · commit 7044450d473b · 2025-05-17T12:27:17.000+02:00
diff --git a/packages/nuxt/src/pages/utils.ts b/packages/nuxt/src/pages/utils.ts
@@ -283,7 +283,7 @@ export function getRouteMeta (contents: string, absolutePath: string, extraExtra
           continue
         }
         const name = property.key.type === 'Identifier' ? property.key.name : String(property.value)
-        if (!extraExtractionKeys.includes(name as keyof NuxtPage)) {
+        if (!extraExtractionKeys.has(name as keyof NuxtPage)) {
           dynamicProperties.add('meta')
           break
         }
diff --git a/vitest.config.ts b/vitest.config.ts
@@ -70,6 +70,8 @@ export default defineConfig({
                   '/pre/**': { prerender: true },
                 },
                 experimental: {
+                  purgeCachedData: true,
+                  granularCachedData: true,
                   appManifest: process.env.TEST_MANIFEST !== 'manifest-off',
                   alwaysRunFetchOnKeyChange: true,
                 },

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ export function getRouteMeta (contents: string, absolutePath: string, extraExtra`
`283`	`283`	`continue`
`284`	`284`	`}`
`285`	`285`	`const name = property.key.type === 'Identifier' ? property.key.name : String(property.value)`
`286`		`- if (!extraExtractionKeys.includes(name as keyof NuxtPage)) {`
	`286`	`+ if (!extraExtractionKeys.has(name as keyof NuxtPage)) {`
`287`	`287`	`dynamicProperties.add('meta')`
`288`	`288`	`break`
`289`	`289`	`}`