fix(vite-runner): 修复解析页面模板超时

ZakaryCode · ZakaryCode · commit e415b12b65db · 2024-12-16T21:19:43.000+08:00
diff --git a/packages/taro-vite-runner/src/common/vite-plugin-assets.ts b/packages/taro-vite-runner/src/common/vite-plugin-assets.ts
@@ -42,7 +42,7 @@ export default function (viteCompilerContext: ViteH5CompilerContext | ViteMiniCo
         return cachedValue
       }
 
-      const source = await fs.readFile(id)
+      const source = fs.readFileSync(id)
 
       const {
         imageUrlLoaderOption = {},
@@ -78,7 +78,7 @@ export default function (viteCompilerContext: ViteH5CompilerContext | ViteMiniCo
         const referenceId = this.emitFile({
           type: 'asset',
           fileName,
-          source
+          source: Uint8Array.from(source)
         })
         url = `__VITE_ASSET__${referenceId}__`
       }
diff --git a/packages/taro-vite-runner/src/h5/entry.ts b/packages/taro-vite-runner/src/h5/entry.ts
@@ -69,7 +69,7 @@ export default function (viteCompilerContext: ViteH5CompilerContext): PluginOpti
             this.emitFile({
               type: 'asset',
               fileName,
-              source: await fs.readFile(filePath)
+              source: Uint8Array.from(fs.readFileSync(filePath))
             })
             this.addWatchFile(filePath)
           }
diff --git a/packages/taro-vite-runner/src/harmony/entry.ts b/packages/taro-vite-runner/src/harmony/entry.ts
@@ -76,13 +76,7 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi
 
         // native components
         for (const comp of viteCompilerContext.nativeComponents.values()) {
-          if (comp.isPackage) continue
-          this.emitFile({
-            type: 'chunk',
-            id: comp.templatePath + QUERY_IS_NATIVE_SCRIPT,
-            fileName: path.relative(viteCompilerContext.sourceDir, comp.templatePath) + QUERY_IS_NATIVE_SCRIPT,
-            implicitlyLoadedAfterOneOf: [rawId]
-          })
+          viteCompilerContext.generateNativeComponent(this, comp, [rawId])
         }
 
         // emit tabbar
@@ -97,7 +91,7 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi
               this.emitFile({
                 type: 'asset',
                 fileName: removePathPrefix(iconPath),
-                source: await fs.readFile(filePath)
+                source: Uint8Array.from(fs.readFileSync(filePath))
               })
               if (!isFinished) {
                 this.addWatchFile(filePath)
@@ -109,7 +103,7 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi
               this.emitFile({
                 type: 'asset',
                 fileName: removePathPrefix(selectedIconPath),
-                source: await fs.readFile(filePath)
+                source: Uint8Array.from(fs.readFileSync(filePath))
               })
               if (!isFinished) {
                 this.addWatchFile(filePath)
@@ -124,7 +118,7 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi
           this.emitFile({
             type: 'asset',
             fileName: appConfig.themeLocation,
-            source: fs.readFileSync(themePath)
+            source: Uint8Array.from(fs.readFileSync(themePath))
           })
           if (!isFinished) {
             this.addWatchFile(themePath)
diff --git a/packages/taro-vite-runner/src/harmony/page.ts b/packages/taro-vite-runner/src/harmony/page.ts
@@ -63,7 +63,7 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi
       }
       return null
     },
-    async load (id) {
+    load (id) {
       if (!viteCompilerContext) return
       const { taroConfig, cwd: appPath, app, loaderMeta } = viteCompilerContext
       const appConfig = app.config
@@ -100,9 +100,28 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi
               code: parse.parse(tabbarId, tabbarPages as TaroHarmonyPageMeta[], name, this.resolve),
               exports: ['default'],
             })
-            await Promise.all(tabbarPages.map(async page => {
-              await viteCompilerContext.collectedDeps(this, escapePath(page.scriptPath), filter)
-            }))
+            tabbarPages.forEach(async page => {
+              const deps = await viteCompilerContext.collectedDeps(this, escapePath(page.scriptPath), filter)
+              const ncObj: Record<string, [string, string]> = {}
+              deps.forEach(dep => {
+                Object.entries(nCompCache.get(dep) || {}).forEach(([key, value]) => {
+                  const absPath = value[0]
+                  const ext = path.extname(absPath)
+                  const basename = path.basename(absPath, ext)
+                  ncObj[key] = [path.join(path.dirname(path.relative(path.dirname(rawId), absPath)), basename), value[1]]
+                })
+              })
+              if (!page.isNative) {
+                page.config.usingComponents = {
+                  ...page.config.usingComponents,
+                  ...ncObj,
+                }
+              }
+              const nativeComps = viteCompilerContext.collectNativeComponents(page)
+              nativeComps.forEach(comp => {
+                viteCompilerContext.generateNativeComponent(this, comp, [rawId])
+              })
+            })
           }
         } else {
           const list: string[] = []
@@ -118,7 +137,7 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi
             list.push(page.name)
           }
 
-          await Promise.all(list.map(async pageName => {
+          list.forEach(pageName => {
             pageName = removeHeadSlash(pageName)
             if (!pageName) {
               pageName = 'index'
@@ -135,29 +154,33 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi
               code: parse.parse(path.resolve(appRoot, pageName), page_, name, this.resolve),
               exports: ['default'],
             })
-            const deps: Set<string> = await viteCompilerContext.collectedDeps(this, escapePath(rawId), filter)
-            const ncObj: Record<string, [string, string]> = {}
-            deps.forEach(dep => {
-              Object.entries(nCompCache.get(dep) || {}).forEach(([key, value]) => {
-                const absPath = value[0]
-                const ext = path.extname(absPath)
-                const basename = path.basename(absPath, ext)
-                ncObj[key] = [path.join(path.dirname(path.relative(path.dirname(rawId), absPath)), basename), value[1]]
+            viteCompilerContext.collectedDeps(this, escapePath(rawId), filter).then(deps => {
+              const ncObj: Record<string, [string, string]> = {}
+              deps.forEach(dep => {
+                Object.entries(nCompCache.get(dep) || {}).forEach(([key, value]) => {
+                  const absPath = value[0]
+                  const ext = path.extname(absPath)
+                  const basename = path.basename(absPath, ext)
+                  ncObj[key] = [path.join(path.dirname(path.relative(path.dirname(rawId), absPath)), basename), value[1]]
+                })
               })
-            })
-            if (!page.isNative) {
-              page.config.usingComponents = {
-                ...page.config.usingComponents,
-                ...ncObj,
+              if (!page.isNative) {
+                page.config.usingComponents = {
+                  ...page.config.usingComponents,
+                  ...ncObj,
+                }
               }
-            }
-            viteCompilerContext.collectNativeComponents(page)
-          }))
+              const nativeComps = viteCompilerContext.collectNativeComponents(page)
+              nativeComps.forEach(comp => {
+                viteCompilerContext.generateNativeComponent(this, comp, [rawId])
+              })
+            })
+          })
         }
         return parse.parseEntry(rawId, page as TaroHarmonyPageMeta)
       }
     },
-    async transform(code, id) {
+    transform(code, id) {
       if (/\.m?[jt]sx?$/.test(id) && filter(id)) {
         const scopeNativeComp = new Map<string, [string, string]>()
         let enableImportComponent = true
diff --git a/packages/taro-vite-runner/src/mini/entry.ts b/packages/taro-vite-runner/src/mini/entry.ts
@@ -5,8 +5,7 @@ import { isString } from '@tarojs/shared'
 
 import { appendVirtualModulePrefix, escapePath, prettyPrintJson, stripVirtualModulePrefix } from '../utils'
 import { baseCompName, customWrapperName } from '../utils/constants'
-import { miniTemplateLoader, QUERY_IS_NATIVE_COMP, QUERY_IS_NATIVE_PAGE } from './native-support'
-import { PAGE_SUFFIX } from './page'
+import { miniTemplateLoader, QUERY_IS_NATIVE_PAGE } from './native-support'
 
 import type { ViteMiniCompilerContext } from '@tarojs/taro/types/compile/viteCompilerContext'
 import type { PluginOption } from 'vite'
@@ -57,7 +56,7 @@ export default function (viteCompilerContext: ViteMiniCompilerContext): PluginOp
         }
 
         // pages
-        await Promise.all(viteCompilerContext.pages.map(async page => {
+        viteCompilerContext.pages.forEach(async page => {
           // 小程序原生页面
           if (page.isNative) {
             if (page.templatePath) {
@@ -76,27 +75,11 @@ export default function (viteCompilerContext: ViteMiniCompilerContext): PluginOp
             fileName: viteCompilerContext.getScriptPath(page.name),
             implicitlyLoadedAfterOneOf: [rawId]
           })
-          await this.load({
-            id: appendVirtualModulePrefix(page.scriptPath + PAGE_SUFFIX),
-            resolveDependencies: true
-          })
-        }))
+        })
 
         // native components
         for (const comp of viteCompilerContext.nativeComponents.values()) {
-          this.emitFile({
-            type: 'chunk',
-            id: comp.scriptPath + QUERY_IS_NATIVE_COMP,
-            fileName: viteCompilerContext.getScriptPath(comp.name),
-            implicitlyLoadedAfterOneOf: [rawId]
-          })
-          const source = miniTemplateLoader(this, comp.templatePath, viteCompilerContext.sourceDir)
-          this.emitFile({
-            type: 'asset',
-            fileName: viteCompilerContext.getTemplatePath(comp.name),
-            source
-          })
-          comp.cssPath && this.addWatchFile(comp.cssPath)
+          viteCompilerContext.generateNativeComponent(this, comp, [rawId])
         }
 
         // comp' script
@@ -128,7 +111,7 @@ export default function (viteCompilerContext: ViteMiniCompilerContext): PluginOp
               this.emitFile({
                 type: 'asset',
                 fileName: removePathPrefix(iconPath),
-                source: await fs.readFile(filePath)
+                source: Uint8Array.from(fs.readFileSync(filePath))
               })
               this.addWatchFile(filePath)
             }
@@ -138,7 +121,7 @@ export default function (viteCompilerContext: ViteMiniCompilerContext): PluginOp
               this.emitFile({
                 type: 'asset',
                 fileName: removePathPrefix(selectedIconPath),
-                source: await fs.readFile(filePath)
+                source: Uint8Array.from(fs.readFileSync(filePath))
               })
               this.addWatchFile(filePath)
             }
@@ -151,7 +134,7 @@ export default function (viteCompilerContext: ViteMiniCompilerContext): PluginOp
           this.emitFile({
             type: 'asset',
             fileName: appConfig.themeLocation,
-            source: fs.readFileSync(themePath)
+            source: Uint8Array.from(fs.readFileSync(themePath))
           })
           this.addWatchFile(themePath)
         }
diff --git a/packages/taro-vite-runner/src/mini/native-support.ts b/packages/taro-vite-runner/src/mini/native-support.ts
@@ -71,7 +71,7 @@ export default function (viteCompilerContext: ViteMiniCompilerContext | undefine
       } else if (IS_NATIVE_STYLE_REG.test(id)) {
         let source = id.replace(new RegExp(`\\${QUERY_IS_NATIVE_STYLE}`), '')
         source = viteCompilerContext.getTargetFilePath(source, viteCompilerContext.fileType.style)
-        const code = await fs.readFile(source, 'utf-8')
+        const code = fs.readFileSync(source, 'utf-8')
         return {
           code
         }
@@ -157,7 +157,7 @@ export function miniTemplateLoader (ctx: PluginContext, templatePath: string, so
       ctx.emitFile({
         type: 'asset',
         fileName: requests[i].replace(sourceDir, '').replace(/^\//, ''),
-        source: await fs.readFile(requests[i])
+        source: Uint8Array.from(fs.readFileSync(requests[i]))
       })
       ctx.addWatchFile(requests[i])
     }
diff --git a/packages/taro-vite-runner/src/mini/page.ts b/packages/taro-vite-runner/src/mini/page.ts
@@ -47,7 +47,7 @@ export default function (viteCompilerContext: ViteMiniCompilerContext): PluginOp
       }
       return null
     },
-    async load (id) {
+    load (id) {
       if (viteCompilerContext && id.endsWith(PAGE_SUFFIX)) {
         const rawId = stripVirtualModulePrefix(id).replace(PAGE_SUFFIX, '')
         const page = viteCompilerContext.getPageById(rawId)
@@ -65,23 +65,27 @@ export default function (viteCompilerContext: ViteMiniCompilerContext): PluginOp
           instantiatePage = viteCompilerContext.loaderMeta.modifyInstantiate(instantiatePage, 'page')
         }
 
-        const deps: Set<string> = await viteCompilerContext.collectedDeps(this, escapePath(rawId), filter)
-        const ncObj: Record<string, string> = {}
-        deps.forEach(dep => {
-          Object.entries(nCompCache.get(dep) || {}).forEach(([key, value]) => {
-            const absPath = value
-            const ext = path.extname(absPath)
-            const basename = path.basename(absPath, ext)
-            ncObj[key] = path.join(path.dirname(path.relative(path.dirname(rawId), absPath)), basename)
+        viteCompilerContext.collectedDeps(this, escapePath(rawId), filter).then(deps => {
+          const ncObj: Record<string, string> = {}
+          deps.forEach(dep => {
+            Object.entries(nCompCache.get(dep) || {}).forEach(([key, value]) => {
+              const absPath = value
+              const ext = path.extname(absPath)
+              const basename = path.basename(absPath, ext)
+              ncObj[key] = path.join(path.dirname(path.relative(path.dirname(rawId), absPath)), basename)
+            })
           })
-        })
-        if (!page.isNative) {
-          page.config.usingComponents = {
-            ...page.config.usingComponents,
-            ...ncObj,
+          if (!page.isNative) {
+            page.config.usingComponents = {
+              ...page.config.usingComponents,
+              ...ncObj,
+            }
           }
-        }
-        viteCompilerContext.collectNativeComponents(page)
+          const nativeComps = viteCompilerContext.collectNativeComponents(page)
+          nativeComps.forEach(comp => {
+            viteCompilerContext.generateNativeComponent(this, comp, [rawId])
+          })
+        })
 
         return [
           'import { createPageConfig } from "@tarojs/runtime"',
@@ -93,7 +97,7 @@ export default function (viteCompilerContext: ViteMiniCompilerContext): PluginOp
         ].join('\n')
       }
     },
-    async transform(code, id) {
+    transform(code, id) {
       if (/\.m?[jt]sx?$/.test(id) && filter(id)) {
         const scopeNativeComp = new Map<string, string>()
         let enableImportComponent = true
diff --git a/packages/taro-vite-runner/src/utils/compiler/harmony.ts b/packages/taro-vite-runner/src/utils/compiler/harmony.ts
@@ -14,6 +14,7 @@ import { isArray, isFunction } from '@tarojs/shared'
 import JSON5 from 'json5'
 
 import defaultConfig from '../../defaultConfig/defaultConfig.harmony'
+import { QUERY_IS_NATIVE_SCRIPT } from '../../harmony/ets'
 import { TARO_TABBAR_PAGE_PATH } from '../../harmony/page'
 import { componentConfig } from '../../utils/component'
 import { parseRelativePath } from '..'
@@ -28,6 +29,7 @@ import type {
   ViteNativeCompMeta,
   VitePageMeta,
 } from '@tarojs/taro/types/compile/viteCompilerContext'
+import type { PluginContext } from 'rollup'
 
 export function readJsonSync(file: string) {
   const ext = path.extname(file)
@@ -128,11 +130,12 @@ export class TaroCompilerContext extends CompilerContext<ViteHarmonyBuildConfig>
     return importPath
   }
 
-  collectNativeComponents(meta: ViteAppMeta | VitePageMeta | ViteNativeCompMeta) {
+  collectNativeComponents(meta: ViteAppMeta | VitePageMeta | ViteNativeCompMeta): ViteNativeCompMeta[] {
     const { name, scriptPath, config } = meta
     const { usingComponents } = config
 
-    if (!usingComponents) return
+    const list: ViteNativeCompMeta[] = []
+    if (!usingComponents) return list
 
     Object.entries(usingComponents).forEach(([compName, value]) => {
       const compPath = value instanceof Array ? value[0] : value
@@ -181,8 +184,21 @@ export class TaroCompilerContext extends CompilerContext<ViteHarmonyBuildConfig>
         componentConfig.thirdPartyComponents.set(compName, new Set())
       }
 
-      this.collectNativeComponents(nativeCompMeta)
+      list.push(...this.collectNativeComponents(nativeCompMeta), nativeCompMeta)
     })
+    return list
+  }
+
+  generateNativeComponent (rollupCtx: PluginContext, meta: ViteNativeCompMeta, implicitlyLoadedAfterOneOf: string[] = []) {
+    if (meta.isGenerated || meta.isPackage) return
+
+    rollupCtx.emitFile({
+      type: 'chunk',
+      id: meta.templatePath + QUERY_IS_NATIVE_SCRIPT,
+      fileName: path.relative(this.sourceDir, meta.templatePath) + QUERY_IS_NATIVE_SCRIPT,
+      implicitlyLoadedAfterOneOf
+    })
+    meta.isGenerated = true
   }
 
   modifyHarmonyResources(id = '', data: any = {}) {
diff --git a/packages/taro-vite-runner/src/utils/compiler/mini.ts b/packages/taro-vite-runner/src/utils/compiler/mini.ts
diff --git a/packages/taro/types/compile/viteCompilerContext.d.ts b/packages/taro/types/compile/viteCompilerContext.d.ts

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ export default function (viteCompilerContext: ViteH5CompilerContext): PluginOpti`
`69`	`69`	`this.emitFile({`
`70`	`70`	`type: 'asset',`
`71`	`71`	`fileName,`
`72`		`- source: await fs.readFile(filePath)`
	`72`	`+ source: Uint8Array.from(fs.readFileSync(filePath))`
`73`	`73`	`})`
`74`	`74`	`this.addWatchFile(filePath)`
`75`	`75`	`}`