Skip to content

Commit 3252f15

Browse files
committed
component fix
1 parent 721ca44 commit 3252f15

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

lib/mp-compiler/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ function compileMPScript (script, mpOptioins, moduleId) {
115115
metadata = parseComponentsDepsTs(scriptContent)
116116
} else {
117117
const result = babel.transform(scriptContent, babelOptions)
118-
metadata = { importsMap: getImportsMap(result), components: result.components }
118+
metadata = result.metadata
119119
}
120120
// metadata: importsMap, components
121121
const { importsMap, components: originComponents } = metadata

lib/mp-compiler/parse.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,12 @@ const traverseComponentsVisitor = {
6969
const file = path.hub.file
7070
const { metadata } = file
7171
// enhance: 修复在babel@7(@babel)下获取以下参数的方式
72-
const importsMap = getImportsMap(file)
72+
const importsData = getImportsMap(file)
73+
74+
let importsMap = {}
75+
importsData.forEach(item => {
76+
importsMap = Object.assign(importsMap, item.importsMap)
77+
})
7378

7479
// 找到所有的 imports
7580
const { properties } = path.node.value
@@ -81,7 +86,9 @@ const traverseComponentsVisitor = {
8186
components[k] = importsMap[v]
8287
})
8388

89+
8490
metadata.components = components
91+
metadata.importsMap = importsMap
8592
}
8693
}
8794

0 commit comments

Comments
 (0)