From d050407b80034c3bd44c7ad177776645f08f5247 Mon Sep 17 00:00:00 2001
From: Luca Forstner <luca.forstner@sentry.io>
Date: Tue, 18 Oct 2022 08:21:56 +0000
Subject: [PATCH 1/2] fix(nextjs): Correctly apply auto-instrumentation to
 pages in `src` folder

---
 packages/nextjs/src/config/webpack.ts                 | 11 ++++++++++-
 .../test/integration/src/pages/someNamedComponent.tsx |  6 ++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 packages/nextjs/test/integration/src/pages/someNamedComponent.tsx

diff --git a/packages/nextjs/src/config/webpack.ts b/packages/nextjs/src/config/webpack.ts
index 387d3344b8e8..b49635c05901 100644
--- a/packages/nextjs/src/config/webpack.ts
+++ b/packages/nextjs/src/config/webpack.ts
@@ -82,13 +82,22 @@ export function constructWebpackConfigFunction(
       if (userSentryOptions.autoInstrumentServerFunctions !== false) {
         const pagesDir = newConfig.resolve?.alias?.['private-next-pages'] as string;
 
+        // Next.js allows users to have the `pages` folder inside a `src` folder, however "`src/pages` will be ignored
+        // if `pages` is present in the root directory"
+        // - https://nextjs.org/docs/advanced-features/src-directory
+        const shouldIncludeSrcDirectory = !fs.existsSync(path.resolve(projectDir, 'pages'));
+
         // Default page extensions per https://github.com/vercel/next.js/blob/f1dbc9260d48c7995f6c52f8fbcc65f08e627992/packages/next/server/config-shared.ts#L161
         const pageExtensions = userNextConfig.pageExtensions || ['tsx', 'ts', 'jsx', 'js'];
         const pageExtensionRegex = pageExtensions.map(escapeStringForRegex).join('|');
 
         newConfig.module.rules.push({
           // Nextjs allows the `pages` folder to optionally live inside a `src` folder
-          test: new RegExp(`${escapeStringForRegex(projectDir)}(/src)?/pages/.*\\.(${pageExtensionRegex})`),
+          test: new RegExp(
+            `${escapeStringForRegex(projectDir)}${
+              shouldIncludeSrcDirectory ? '(/src)?' : ''
+            }/pages/.*\\.(${pageExtensionRegex})`,
+          ),
           use: [
             {
               loader: path.resolve(__dirname, 'loaders/proxyLoader.js'),
diff --git a/packages/nextjs/test/integration/src/pages/someNamedComponent.tsx b/packages/nextjs/test/integration/src/pages/someNamedComponent.tsx
new file mode 100644
index 000000000000..c6b4a0859769
--- /dev/null
+++ b/packages/nextjs/test/integration/src/pages/someNamedComponent.tsx
@@ -0,0 +1,6 @@
+export const MyNamedPage = () => (
+  <h1>
+    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)
+  </h1>
+);

From 652e137611015717cd391894876a87ba941d81b3 Mon Sep 17 00:00:00 2001
From: Luca Forstner <luca.forstner@sentry.io>
Date: Tue, 18 Oct 2022 09:39:10 +0000
Subject: [PATCH 2/2] Remove unnecessary optional regex

---
 packages/nextjs/src/config/webpack.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nextjs/src/config/webpack.ts b/packages/nextjs/src/config/webpack.ts
index b49635c05901..8e697ac0a317 100644
--- a/packages/nextjs/src/config/webpack.ts
+++ b/packages/nextjs/src/config/webpack.ts
@@ -95,7 +95,7 @@ export function constructWebpackConfigFunction(
           // Nextjs allows the `pages` folder to optionally live inside a `src` folder
           test: new RegExp(
             `${escapeStringForRegex(projectDir)}${
-              shouldIncludeSrcDirectory ? '(/src)?' : ''
+              shouldIncludeSrcDirectory ? '/src' : ''
             }/pages/.*\\.(${pageExtensionRegex})`,
           ),
           use: [