Skip to content
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

fix(nextjs): Fix matching logic for file convention type for root level components #14038

Merged
merged 9 commits into from
Oct 22, 2024
Merged

fix(nextjs): Fix matching logic for file convention type for root level components #14038

Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
547987a
fix(nextjs): Fix matching logic for file convention type for root lev…
lforst Oct 21, 2024
4406cdb
fix
lforst Oct 21, 2024
d97ad45
fix
lforst Oct 21, 2024
cf96cfc
Merge branch 'develop' into lforst-root-lvl-components
lforst Oct 22, 2024
620ca32
.
lforst Oct 22, 2024
7ecaeb1
sneaking this in because it is too useful
lforst Oct 22, 2024
ea1a932
Fix v4 upload to same file
lforst Oct 22, 2024
f32bc72
Formatting
lforst Oct 22, 2024
bbd4b38
Don't run certain things twice and also upload for canary tests
lforst Oct 22, 2024
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
4 changes: 3 additions & 1 deletion packages/nextjs/src/config/loaders/wrappingLoader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,10 @@ export default function wrappingLoader(

const componentTypeMatch = path.posix
.normalize(path.relative(appDir, this.resourcePath))
// Replace all backslashes with forward slashes (windows)
.replace(/\\/g, '/')
// eslint-disable-next-line @sentry-internal/sdk/no-regexp-constructor
.match(new RegExp(`/\\/?([^/]+)\\.(?:${pageExtensionRegex})$`));
.match(new RegExp(`(?:^|/)?([^/]+)\\.(?:${pageExtensionRegex})$`));

if (componentTypeMatch && componentTypeMatch[1]) {
let componentType: ServerComponentContext['componentType'];
Expand Down
Loading