fix(nextjs): Correctly apply auto-instrumentation to pages in src folder
#5984
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 tasks
AbhiPrasad
approved these changes
Oct 18, 2022
| test: new RegExp(`${escapeStringForRegex(projectDir)}(/src)?/pages/.*\\.(${pageExtensionRegex})`), | ||
| test: new RegExp( | ||
| `${escapeStringForRegex(projectDir)}${ | ||
| shouldIncludeSrcDirectory ? '(/src)?' : '' |
There was a problem hiding this comment.
l: Do we need the ? on (/src)? now?
There was a problem hiding this comment.
Nope, don't need it anymore. Thanks! 652e137
Comment on lines
+3
to
+4
| This page exists to test the compatibility of our auto-wrapper with the option of having the `pages` directory | ||
| inside a `src` directory (https://nextjs.org/docs/advanced-features/src-directory) |
There was a problem hiding this comment.
So the idea is that this page should not get wrapped, correct?
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #5978
Next.js allows users to have their
pagesdirectory inside asrcdirectory. So far, the regex that tests if we wanna apply our auto instrumentation loader to a file, didn't consider that if apagesdirectory exists we don't want to wrap anything insidesrc/pages, because these files don't count as "pages" anymore.This PR introduces a check if there is a root-level
pagesdirectory - if so, we don't wrap anything insidesrc/pages.https://nextjs.org/docs/advanced-features/src-directory