Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions packages/taro-vite-runner/src/mini/page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@ export default function (viteCompilerContext: ViteMiniCompilerContext): PluginOp

const pageConfig = prettyPrintJson(page.config)

let instantiatePage = `var inst = Page(createPageConfig(component, '${page.name}', {root:{cn:[]}}, config || {}))`
const isCustomTabBar = page.name === 'custom-tab-bar/index'
let instantiatePage = isCustomTabBar
? `var inst = Component(createComponentConfig(component, '${page.name}', {root:{cn:[]}}))`
: `var inst = Page(createPageConfig(component, '${page.name}', {root:{cn:[]}}, config || {}))`

if (typeof viteCompilerContext.loaderMeta.modifyInstantiate === 'function') {
instantiatePage = viteCompilerContext.loaderMeta.modifyInstantiate(instantiatePage, 'page')
Expand Down Expand Up @@ -88,7 +91,9 @@ export default function (viteCompilerContext: ViteMiniCompilerContext): PluginOp
})

return [
'import { createPageConfig } from "@tarojs/runtime"',
isCustomTabBar
? 'import { createComponentConfig } from "@tarojs/runtime"'
: 'import { createPageConfig } from "@tarojs/runtime"',
`import component from "${escapePath(rawId)}"`,
`var config = ${pageConfig}`,
page.config.enableShareTimeline ? 'component.enableShareTimeline = true' : '',
Expand Down
11 changes: 11 additions & 0 deletions packages/taro-vite-runner/src/utils/compiler/mini.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ export class TaroCompilerContext extends CompilerContext<ViteMiniBuildConfig> im
this.app = this.getApp()
this.collectNativeComponents(this.app)
this.pages = this.getPages()
this.collectCustomTabBar()
}

processConfig () {
Expand Down Expand Up @@ -89,6 +90,16 @@ export class TaroCompilerContext extends CompilerContext<ViteMiniBuildConfig> im
return pageMeta
}

collectCustomTabBar () {
if (!this.app.config.tabBar?.custom) return

const customTabBarName = 'custom-tab-bar/index'
const scriptPath = resolveMainFilePath(path.join(this.sourceDir, customTabBarName), this.frameworkExts)
if (!fs.existsSync(scriptPath)) return

this.pages.push(this.compilePage(customTabBarName))
}

resolvePageImportPath (scriptPath: string, importPath: string) {
const alias = this.taroConfig.alias
if (isAliasPath(importPath, alias)) {
Expand Down
Loading