From 1914db18672f59397c14f2ccf8d5831cf1b6b0a1 Mon Sep 17 00:00:00 2001
From: Luca Forstner <luca.forstner@sentry.io>
Date: Tue, 29 Aug 2023 13:09:48 +0000
Subject: [PATCH] fix(nextjs): Fix `package.json` exports

---
 packages/nextjs/package.json                           | 10 ----------
 packages/nextjs/src/config/loaders/wrappingLoader.ts   |  2 +-
 .../src/config/templates/requestAsyncStorageShim.ts    |  6 ------
 .../config/templates/serverComponentWrapperTemplate.ts |  2 +-
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
index 9190bb3d28dd..507cb763372b 100644
--- a/packages/nextjs/package.json
+++ b/packages/nextjs/package.json
@@ -13,16 +13,6 @@
   "module": "build/esm/index.server.js",
   "browser": "build/esm/index.client.js",
   "types": "build/types/index.types.d.ts",
-  "exports": {
-    ".": {
-      "import": "./build/esm/index.server.js",
-      "require": "./build/cjs/index.server.js",
-      "types": "./build/types/index.types.d.ts"
-    },
-    "./requestAsyncStorageShim": {
-      "import": "./build/esm/config/templates/requestAsyncStorageShim.js"
-    }
-  },
   "typesVersions": {
     "<4.9": {
       "build/npm/types/index.d.ts": [
diff --git a/packages/nextjs/src/config/loaders/wrappingLoader.ts b/packages/nextjs/src/config/loaders/wrappingLoader.ts
index 4cc2425a33c0..1731722de7bb 100644
--- a/packages/nextjs/src/config/loaders/wrappingLoader.ts
+++ b/packages/nextjs/src/config/loaders/wrappingLoader.ts
@@ -191,7 +191,7 @@ export default function wrappingLoader(
       }
       templateCode = templateCode.replace(
         /__SENTRY_NEXTJS_REQUEST_ASYNC_STORAGE_SHIM__/g,
-        '@sentry/nextjs/requestAsyncStorageShim',
+        '@sentry/nextjs/build/esm/config/templates/requestAsyncStorageShim.js',
       );
     }
 
diff --git a/packages/nextjs/src/config/templates/requestAsyncStorageShim.ts b/packages/nextjs/src/config/templates/requestAsyncStorageShim.ts
index bc0e23000815..44222403d026 100644
--- a/packages/nextjs/src/config/templates/requestAsyncStorageShim.ts
+++ b/packages/nextjs/src/config/templates/requestAsyncStorageShim.ts
@@ -7,9 +7,3 @@ export interface RequestAsyncStorage {
       }
     | undefined;
 }
-
-export const requestAsyncStorage: RequestAsyncStorage = {
-  getStore: () => {
-    return undefined;
-  },
-};
diff --git a/packages/nextjs/src/config/templates/serverComponentWrapperTemplate.ts b/packages/nextjs/src/config/templates/serverComponentWrapperTemplate.ts
index 3f5ef8349c30..7ebf29099f3a 100644
--- a/packages/nextjs/src/config/templates/serverComponentWrapperTemplate.ts
+++ b/packages/nextjs/src/config/templates/serverComponentWrapperTemplate.ts
@@ -28,7 +28,7 @@ if (typeof serverComponent === 'function') {
       let sentryTraceHeader: string | undefined | null = undefined;
       let baggageHeader: string | undefined | null = undefined;
 
-      // We try-catch here just in case the API around `requestAsyncStorage` changes unexpectedly since it is not public API
+      // We try-catch here just in `requestAsyncStorage` is undefined since it may not be defined
       try {
         const requestAsyncStore = requestAsyncStorage.getStore();
         sentryTraceHeader = requestAsyncStore?.headers.get('sentry-trace');