@@ -13,7 +13,7 @@ export function setupAnalyzeBuildRPC({ nuxt, refresh, ensureDevAuthToken }: Nuxt
1313 let initalized : Promise < any > | undefined
1414
1515 const processId = 'devtools:analyze-build'
16- const analyzeDir = join ( nuxt . options . rootDir , '. nuxt/analyze' )
16+ const devtoolsAnalyzeDir = join ( nuxt . options . rootDir , 'node_modules/.cache/ nuxt-devtools /analyze' )
1717
1818 async function startAnalyzeBuild ( name : string ) {
1919 if ( promise )
@@ -31,6 +31,7 @@ export function setupAnalyzeBuildRPC({ nuxt, refresh, ensureDevAuthToken }: Nuxt
3131
3232 refresh ( 'getAnalyzeBuildInfo' )
3333
34+ initalized = undefined
3435 promise = result . getProcess ( )
3536 . then ( ( ) => {
3637 refresh ( 'getAnalyzeBuildInfo' )
@@ -46,7 +47,29 @@ export function setupAnalyzeBuildRPC({ nuxt, refresh, ensureDevAuthToken }: Nuxt
4647 }
4748
4849 async function readBuildInfo ( ) {
49- const files = await glob ( [ '*/meta.json' ] , { cwd : analyzeDir , onlyFiles : true , absolute : true } )
50+ for ( const dir of new Set ( [
51+ join ( nuxt . options . rootDir , '.nuxt/analyze' ) ,
52+ join ( nuxt . options . rootDir , 'node_modules/.cache/nuxt/.nuxt/analyze' ) ,
53+ nuxt . options . analyzeDir ,
54+ ] ) ) {
55+ const files = await glob ( [ '**/meta.json' , 'meta.json' ] , {
56+ cwd : dir ,
57+ onlyFiles : true ,
58+ absolute : true ,
59+ } )
60+ for ( const file of files ) {
61+ const slug = JSON . parse ( await fsp . readFile ( file , 'utf-8' ) ) . slug
62+ const dir = dirname ( file )
63+ await fsp . mkdir ( devtoolsAnalyzeDir , { recursive : true } )
64+ await fsp . rename ( dir , join ( devtoolsAnalyzeDir , slug ) )
65+ }
66+ }
67+
68+ const files = await glob ( [ '**/meta.json' ] , {
69+ cwd : devtoolsAnalyzeDir ,
70+ onlyFiles : true ,
71+ absolute : true ,
72+ } )
5073 builds = await Promise . all ( files . map ( async ( file ) => {
5174 const dir = dirname ( file )
5275 const json = JSON . parse ( await fsp . readFile ( file , 'utf-8' ) ) as NuxtAnalyzeMeta
@@ -93,11 +116,11 @@ export function setupAnalyzeBuildRPC({ nuxt, refresh, ensureDevAuthToken }: Nuxt
93116 await ensureDevAuthToken ( token )
94117
95118 if ( ! names ) {
96- await fsp . rm ( analyzeDir , { recursive : true , force : true } )
119+ await fsp . rm ( devtoolsAnalyzeDir , { recursive : true , force : true } )
97120 }
98121 else {
99122 const targets = builds . filter ( build => names . includes ( build . name ) )
100- await Promise . all ( targets . map ( target => fsp . rm ( join ( analyzeDir , target . slug ) , { recursive : true , force : true } ) ) )
123+ await Promise . all ( targets . map ( target => fsp . rm ( join ( devtoolsAnalyzeDir , target . slug ) , { recursive : true , force : true } ) ) )
101124 }
102125 initalized = readBuildInfo ( )
103126 refresh ( 'getAnalyzeBuildInfo' )
0 commit comments