Skip to content

Commit

Permalink
fix(ssr): handle function expression name scoping (#16563)
Browse files Browse the repository at this point in the history
  • Loading branch information
bluwy committed May 1, 2024
1 parent 2f42006 commit 02db947
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 0 deletions.
22 changes: 22 additions & 0 deletions packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,28 @@ test('do not rewrite when function declaration is in scope', async () => {
expect(result?.deps).toEqual(['vue'])
})

// #16452
test('do not rewrite when function expression is in scope', async () => {
const result = await ssrTransformSimple(
`import {fn} from './vue';var a = function() { return function fn() { console.log(fn) } }`,
)
expect(result?.code).toMatchInlineSnapshot(`
"const __vite_ssr_import_0__ = await __vite_ssr_import__("./vue", {"importedNames":["fn"]});
var a = function() { return function fn() { console.log(fn) } }"
`)
})

// #16452
test('do not rewrite when function expression is in global scope', async () => {
const result = await ssrTransformSimple(
`import {fn} from './vue';foo(function fn(a = fn) { console.log(fn) })`,
)
expect(result?.code).toMatchInlineSnapshot(`
"const __vite_ssr_import_0__ = await __vite_ssr_import__("./vue", {"importedNames":["fn"]});
foo(function fn(a = fn) { console.log(fn) })"
`)
})

test('do not rewrite catch clause', async () => {
const result = await ssrTransformSimple(
`import {error} from './dependency';try {} catch(error) {}`,
Expand Down
5 changes: 5 additions & 0 deletions packages/vite/src/node/ssr/ssrTransform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,11 @@ function walk(
setScope(parentScope, node.id!.name)
}
}
// If it is a function expression, its name (if exist) could also be
// shadowing an import. So add its own name to the scope
if (node.type === 'FunctionExpression' && node.id) {
setScope(node, node.id.name)
}
// walk function expressions and add its arguments to known identifiers
// so that we don't prefix them
node.params.forEach((p) => {
Expand Down

0 comments on commit 02db947

Please sign in to comment.