Skip to content

fix(package): Support re-exported metadata and generate functions #294

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

Merged
Jon1VK merged 1 commit into from
Feb 10, 2026
Merged

fix(package): Support re-exported metadata and generate functions #294

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
14 changes: 10 additions & 4 deletions package/src/cli/commands/generate/getTemplateCompiler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,11 @@ function withMetadata(
originContents: string,
config: ResolvedConfig,
) {
const staticMetadataRegExp = new RegExp(`export const metadata`);
const staticMetadataRegExp = new RegExp(
`export const metadata|export {[^}]*\\bmetadata\\b[^}]*}`,
);
const generateMetadataRegExp = new RegExp(
`export ((async )?function|const) generateMetadata`,
`export ((async )?function|const) generateMetadata|export {[^}]*\\bgenerateMetadata\\b[^}]*}`,
);
const hasStaticMetadata = staticMetadataRegExp.test(originContents);
const hasGenerateMetadata = generateMetadataRegExp.test(originContents);
Expand Down Expand Up @@ -170,7 +172,9 @@ function withLanguageAlternatesMetadata(
}

function withReExport(template: string, originContents: string, name: string) {
const regExp = new RegExp(`export const ${name}`);
const regExp = new RegExp(
`export const ${name}|export {[^}]*\\b${name}\\b[^}]*}`,
);
if (!regExp.test(originContents)) return template;
return template.concat(
`\n\nexport { ${name} } from "${PATTERNS.relativePath}";`,
Expand All @@ -182,7 +186,9 @@ function withGenerateFn(
originContents: string,
fnName: string,
) {
const regExp = new RegExp(`export ((async )?function|const) ${fnName}`);
const regExp = new RegExp(
`export ((async )?function|const) ${fnName}|export {[^}]*\\b${fnName}\\b[^}]*}`,
);
if (!regExp.test(originContents)) return template;
const additionalParams = fnName === "generateMetadata" ? ", parent" : "";
const shouldSetLocale =
Expand Down