Skip to content

fix: strip export-from server data exports in client transform #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JaredStowell wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: strip export-from server data exports in client transform #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions packages/vinext/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3790,8 +3790,9 @@ function stripServerExports(code: string): string | null {
continue;
}

// Case 3: export { getServerSideProps } or export { getServerSideProps as gSSP }
if (node.specifiers && node.specifiers.length > 0 && !node.source) {
// Case 3: export { getServerSideProps }, export { getServerSideProps as gSSP },
// or export { getServerSideProps } from "./server"
if (node.specifiers && node.specifiers.length > 0) {
const kept: any[] = [];
const stripped: string[] = [];
for (const spec of node.specifiers) {
Expand All @@ -3812,7 +3813,8 @@ function stripServerExports(code: string): string | null {
const exported = sp.exported?.name ?? sp.exported?.value;
return local === exported ? local : `${local} as ${exported}`;
}).join(", ");
parts.push(`export { ${keptStr} };`);
const source = node.source ? ` from ${code.slice(node.source.start, node.source.end)}` : "";
parts.push(`export { ${keptStr} }${source};`);
}
for (const name of stripped) {
parts.push(`export const ${name} = undefined;`);
Expand Down
29 changes: 29 additions & 0 deletions tests/build-optimization.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1244,6 +1244,35 @@ export { getServerSideProps, config };
expect(result).toContain("export const getServerSideProps = undefined;");
});


it("handles export-from re-exports", () => {
const code = `
export default function Page() {
return null;
}

export { getServerSideProps } from './server';
`;
const result = _stripServerExports(code);
expect(result).not.toBeNull();
expect(result).toContain("export const getServerSideProps = undefined;");
expect(result).not.toContain("from './server'");
});

it("handles export-from with mixed specifiers", () => {
const code = `
export default function Page() {
return null;
}

export { getServerSideProps, config } from './server';
`;
const result = _stripServerExports(code);
expect(result).not.toBeNull();
expect(result).toContain("export { config } from './server';");
expect(result).toContain("export const getServerSideProps = undefined;");
});

it("handles strings containing braces", () => {
const code = `
export default function Page({ msg }) {
Expand Down