feat(preview): handle app.config.ts sync with nuxt4 tree structure (#177)

larbish · web-flow · commit 87cfcbcbe37e · 2024-06-26T11:13:52.000+02:00
diff --git a/src/runtime/composables/useStudio.ts b/src/runtime/composables/useStudio.ts
@@ -73,10 +73,10 @@ export const useStudio = () => {
     const mergedFiles = mergeDraft(data.files, data.additions, data.deletions)
 
     // Handle content files
-    const contentFiles = mergedFiles.filter(item => !([StudioConfigFiles.appConfig, StudioConfigFiles.nuxtConfig].includes(item.path)))
+    const contentFiles = mergedFiles.filter(item => !([StudioConfigFiles.appConfig, StudioConfigFiles.appConfigV4, StudioConfigFiles.nuxtConfig].includes(item.path)))
     await syncPreviewFiles(contentFiles)
 
-    const appConfig = mergedFiles.find(item => item.path === StudioConfigFiles.appConfig)
+    const appConfig = mergedFiles.find(item => [StudioConfigFiles.appConfig, StudioConfigFiles.appConfigV4].includes(item.path))
     syncPreviewAppConfig(appConfig?.parsed as ParsedContent)
 
     requestRerender()
@@ -210,11 +210,11 @@ export const useStudio = () => {
         case 'nuxt-studio:config:file-changed': {
           const { additions = [], deletions = [] } = payload as FileChangeMessagePayload
 
-          const appConfig = additions.find(item => item.path === StudioConfigFiles.appConfig)
+          const appConfig = additions.find(item => [StudioConfigFiles.appConfig, StudioConfigFiles.appConfigV4].includes(item.path))
           if (appConfig) {
             syncPreviewAppConfig(appConfig?.parsed)
           }
-          const shouldRemoveAppConfig = deletions.find(item => item.path === StudioConfigFiles.appConfig)
+          const shouldRemoveAppConfig = deletions.find(item => [StudioConfigFiles.appConfig, StudioConfigFiles.appConfigV4].includes(item.path))
           if (shouldRemoveAppConfig) {
             syncPreviewAppConfig(undefined)
           }
diff --git a/src/runtime/utils/index.ts b/src/runtime/utils/index.ts
@@ -4,6 +4,7 @@ export * from './files'
 
 export const StudioConfigFiles = {
   appConfig: 'app.config.ts',
+  appConfigV4: 'app/app.config.ts',
   nuxtConfig: 'nuxt.config.ts',
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ export * from './files'`
`4`	`4`
`5`	`5`	`export const StudioConfigFiles = {`
`6`	`6`	`appConfig: 'app.config.ts',`
	`7`	`+ appConfigV4: 'app/app.config.ts',`
`7`	`8`	`nuxtConfig: 'nuxt.config.ts',`
`8`	`9`	`}`
`9`	`10`