fix types

Author: mydea

packages/browser/src/integrations/breadcrumbs.ts

@@ -216,7 +216,7 @@ function _consoleBreadcrumb(handlerData: HandlerData & { args: unknown[]; level:
 /**
  * Creates breadcrumbs from XHR API calls
  */
-function _xhrBreadcrumb(handlerData: HandlerData & { xhr: SentryWrappedXMLHttpRequest }): void {
+function _xhrBreadcrumb(handlerData: HandlerData & { xhr: XMLHttpRequest & SentryWrappedXMLHttpRequest }): void {
   if (handlerData.endTimestamp) {
     // We only capture complete, non-sentry requests
     if (handlerData.xhr.__sentry_own_request__) {
@@ -248,7 +248,7 @@ function _xhrBreadcrumb(handlerData: HandlerData & { xhr: SentryWrappedXMLHttpRe
 /**
  * Creates breadcrumbs from fetch API calls
  */
-function _fetchBreadcrumb(handlerData: HandlerData & HandlerDataFetch): void {
+function _fetchBreadcrumb(handlerData: HandlerData & HandlerDataFetch & { response?: Response }): void {
   // We only capture complete fetch requests
   if (!handlerData.endTimestamp) {
     return;

packages/types/.eslintrc.js

@@ -1,5 +1,9 @@
 module.exports = {
   extends: ['../../.eslintrc.js'],
+  env: {
+    node: true,
+    browser: false,
+  },
   rules: {
     '@typescript-eslint/no-explicit-any': 'off',
   },

packages/types/src/instrument.ts

@@ -1,6 +1,9 @@
-type XHRSendInput = null | Blob | BufferSource | FormData | URLSearchParams | string;
+// This should be: null | Blob | BufferSource | FormData | URLSearchParams | string
+// But since not all of those are available in node, we just export `unknown` here for now
+// Make sure to cast it where needed!
+type XHRSendInput = unknown;
 
-export interface SentryWrappedXMLHttpRequest extends XMLHttpRequest {
+export interface SentryWrappedXMLHttpRequest {
   [key: string]: any;
   __sentry_xhr__?: {
     method?: string;
@@ -19,5 +22,6 @@ export interface HandlerDataFetch {
   args: any[];
   fetchData: SentryFetchData;
   startTimestamp: number;
-  response?: Response;
+  // This is actually `Response`, make sure to cast this where needed (not available in Node)
+  response?: unknown;
 }

packages/types/tsconfig.json

@@ -4,6 +4,6 @@
   "include": ["src/**/*"],
 
   "compilerOptions": {
-    // package-specific options
+    "lib": ["ES6"]
   }
 }

packages/utils/src/instrument.ts

@@ -208,7 +208,7 @@ function instrumentXHR(): void {
   const xhrproto = XMLHttpRequest.prototype;
 
   fill(xhrproto, 'open', function (originalOpen: () => void): () => void {
-    return function (this: SentryWrappedXMLHttpRequest, ...args: any[]): void {
+    return function (this: XMLHttpRequest & SentryWrappedXMLHttpRequest, ...args: any[]): void {
       // eslint-disable-next-line @typescript-eslint/no-this-alias
       const xhr = this;
       const url = args[1];
@@ -259,7 +259,7 @@ function instrumentXHR(): void {
   });
 
   fill(xhrproto, 'send', function (originalSend: () => void): () => void {
-    return function (this: SentryWrappedXMLHttpRequest, ...args: any[]): void {
+    return function (this: XMLHttpRequest & SentryWrappedXMLHttpRequest, ...args: any[]): void {
       if (this.__sentry_xhr__ && args[0] !== undefined) {
         this.__sentry_xhr__.body = args[0];
       }