Skip to content

Commit

Permalink
fix(cli): 调整initRouter的执行时序 调整initRouter的入参
Browse files Browse the repository at this point in the history
  • Loading branch information
Littly committed Apr 9, 2018
1 parent b60d9d1 commit 7406942
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions packages/taro-cli/src/h5.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,19 +137,19 @@ function processEntry (code) {
const node = astPath.node
const routerPages = pages.map(v => {
const pageName = v.startsWith('/') ? v : `/${v}`
return `'${pageName}': () => import('.${pageName}.js')`
return `['${pageName}', () => import('.${pageName}.js')]`
}).join(',')

const importTaro = template(`import ${taroImportDefaultName} from '${taroJsFramework}'`, babylonConfig)()
const importTaroRouter = template(`import ${routerImportDefaultName} from '${taroRouterFramework}'`, babylonConfig)()
const initRouter = template(`${routerImportDefaultName}.initRouter({${routerPages}}, ${taroImportDefaultName})`, babylonConfig)()
const initRouter = template(`${routerImportDefaultName}.initRouter([${routerPages}], ${taroImportDefaultName})`, babylonConfig)()
const initNativeApi = template(`${taroImportDefaultName}.initNativeApi(${taroImportDefaultName})`, babylonConfig)()
const renderApp = template(`${nervJsImportDefaultName}.render(<${componentClassName} />, document.getElementById('app'))`, babylonConfig)()

node.body.unshift(importTaro)
node.body.unshift(importTaroRouter)
node.body.push(initRouter)
node.body.push(initNativeApi)
node.body.push(initRouter)
node.body.push(renderApp)
}
}
Expand Down

0 comments on commit 7406942

Please sign in to comment.