未验证 提交 499808fa 编写于 作者: J JJ Kasper 提交者: GitHub

Make sure to update scope for page export declaration (#9115)

* Register page export declaration to scope

* Update to not need to traverse to update scope
上级 fd0ba93f
...@@ -37,6 +37,7 @@ function replaceBundle(path: any, t: typeof BabelTypes) { ...@@ -37,6 +37,7 @@ function replaceBundle(path: any, t: typeof BabelTypes) {
interface ConfigState { interface ConfigState {
isPrerender?: boolean isPrerender?: boolean
bundleDropped?: boolean bundleDropped?: boolean
defaultExportUpdated?: boolean
} }
// config to parsing pageConfig for client bundles // config to parsing pageConfig for client bundles
...@@ -116,7 +117,7 @@ export default function nextPageConfig({ ...@@ -116,7 +117,7 @@ export default function nextPageConfig({
}, },
}, },
ExportDefaultDeclaration(path, state: ConfigState) { ExportDefaultDeclaration(path, state: ConfigState) {
if (!state.isPrerender) { if (!state.isPrerender || state.defaultExportUpdated) {
return return
} }
const prev = t.cloneDeep(path.node.declaration) const prev = t.cloneDeep(path.node.declaration)
...@@ -127,7 +128,8 @@ export default function nextPageConfig({ ...@@ -127,7 +128,8 @@ export default function nextPageConfig({
prev.type = prev.type.replace(/Declaration$/, 'Expression') as any prev.type = prev.type.replace(/Declaration$/, 'Expression') as any
} }
path.insertBefore([ // @ts-ignore invalid return type
const [pageCompPath] = path.replaceWithMultiple([
t.variableDeclaration('const', [ t.variableDeclaration('const', [
t.variableDeclarator(t.identifier(pageComponentVar), prev as any), t.variableDeclarator(t.identifier(pageComponentVar), prev as any),
]), ]),
...@@ -139,9 +141,10 @@ export default function nextPageConfig({ ...@@ -139,9 +141,10 @@ export default function nextPageConfig({
), ),
t.booleanLiteral(true) t.booleanLiteral(true)
), ),
t.exportDefaultDeclaration(t.identifier(pageComponentVar)),
]) ])
path.scope.registerDeclaration(pageCompPath)
path.node.declaration = t.identifier(pageComponentVar) state.defaultExportUpdated = true
}, },
}, },
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册