ref: Remove includes method usage

kamilogorek · kamilogorek · commit 2d9a0bd017b8 · 2019-09-20T12:22:53.000+02:00
diff --git a/packages/browser/src/integrations/breadcrumbs.ts b/packages/browser/src/integrations/breadcrumbs.ts
@@ -236,7 +236,7 @@ export class Breadcrumbs implements Integration {
           const filterUrl = new API(dsn).getStoreEndpoint();
           // if Sentry key appears in URL, don't capture it as a request
           // but rather as our own 'sentry' type breadcrumb
-          if (filterUrl && url.includes(filterUrl)) {
+          if (filterUrl && url.indexOf(filterUrl) !== -1) {
             if (method === 'POST' && args[1] && args[1].body) {
               addSentryBreadcrumb(args[1].body);
             }
@@ -407,7 +407,7 @@ export class Breadcrumbs implements Integration {
             const filterUrl = new API(dsn).getStoreEndpoint();
             // if Sentry key appears in URL, don't capture it as a request
             // but rather as our own 'sentry' type breadcrumb
-            if (isString(url) && (filterUrl && url.includes(filterUrl))) {
+            if (isString(url) && (filterUrl && url.indexOf(filterUrl) !== -1)) {
               this.__sentry_own_request__ = true;
             }
           }
diff --git a/packages/browser/src/parsers.ts b/packages/browser/src/parsers.ts
@@ -80,12 +80,12 @@ export function prepareFramesForEvent(stack: TraceKitStackFrame[]): StackFrame[]
   const lastFrameFunction = localStack[localStack.length - 1].func || '';
 
   // If stack starts with one of our API calls, remove it (starts, meaning it's the top of the stack - aka last call)
-  if (firstFrameFunction.includes('captureMessage') || firstFrameFunction.includes('captureException')) {
+  if (firstFrameFunction.indexOf('captureMessage') !== -1 || firstFrameFunction.indexOf('captureException') !== -1) {
     localStack = localStack.slice(1);
   }
 
   // If stack ends with one of our internal API calls, remove it (ends, meaning it's the bottom of the stack - aka top-most call)
-  if (lastFrameFunction.includes('sentryWrapped')) {
+  if (lastFrameFunction.indexOf('sentryWrapped') !== -1) {
     localStack = localStack.slice(0, -1);
   }
 
diff --git a/packages/browser/test/integration/polyfills/includes.js b/packages/browser/test/integration/polyfills/includes.js
diff --git a/packages/browser/test/integration/run.js b/packages/browser/test/integration/run.js
@@ -77,7 +77,6 @@ function build() {
     "polyfills/events.js",
     "polyfills/assign.js",
     "polyfills/nan.js",
-    "polyfills/includes.js",
   ]);
 
   writeFile(
diff --git a/packages/node/src/integrations/http.ts b/packages/node/src/integrations/http.ts
@@ -142,7 +142,7 @@ function emitWrapper(origEmit: EventListener): (event: string, response: http.Se
       const dsn = client.getDsn();
 
       const isInterestingEvent = event === 'response' || event === 'error';
-      const isNotSentryRequest = dsn && this.__ravenBreadcrumbUrl && !this.__ravenBreadcrumbUrl.includes(dsn.host);
+      const isNotSentryRequest = dsn && this.__ravenBreadcrumbUrl && this.__ravenBreadcrumbUrl.indexOf(dsn.host) === -1;
 
       if (isInterestingEvent && isNotSentryRequest && getCurrentHub().getIntegration(Http)) {
         getCurrentHub().addBreadcrumb(
diff --git a/packages/node/src/parsers.ts b/packages/node/src/parsers.ts
@@ -157,7 +157,7 @@ export function parseStack(stack: stacktrace.StackFrame[], options?: NodeOptions
     // note that isNative appears to return true even for node core libraries
     // see https://github.com/getsentry/raven-node/issues/176
     parsedFrame.in_app =
-      !isInternal && parsedFrame.filename !== undefined && !parsedFrame.filename.includes('node_modules/');
+      !isInternal && parsedFrame.filename !== undefined && parsedFrame.filename.indexOf('node_modules/') === -1;
 
     // Extract a module name based on the filename
     if (parsedFrame.filename) {
@@ -271,7 +271,7 @@ export function prepareFramesForEvent(stack: StackFrame[]): StackFrame[] {
   let localStack = stack;
   const firstFrameFunction = localStack[0].function || '';
 
-  if (firstFrameFunction.includes('captureMessage') || firstFrameFunction.includes('captureException')) {
+  if (firstFrameFunction.indexOf('captureMessage') !== -1 || firstFrameFunction.indexOf('captureException') !== -1) {
     localStack = localStack.slice(1);
   }
 
diff --git a/packages/utils/src/string.ts b/packages/utils/src/string.ts
@@ -117,7 +117,7 @@ export function isMatchingPattern(value: string, pattern: RegExp | string): bool
     return (pattern as RegExp).test(value);
   }
   if (typeof pattern === 'string') {
-    return value.includes(pattern);
+    return value.indexOf(pattern) !== -1;
   }
   return false;
 }

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ export class Breadcrumbs implements Integration {`
`236`	`236`	`const filterUrl = new API(dsn).getStoreEndpoint();`
`237`	`237`	`// if Sentry key appears in URL, don't capture it as a request`
`238`	`238`	`// but rather as our own 'sentry' type breadcrumb`
`239`		`- if (filterUrl && url.includes(filterUrl)) {`
	`239`	`+ if (filterUrl && url.indexOf(filterUrl) !== -1) {`
`240`	`240`	`if (method === 'POST' && args[1] && args[1].body) {`
`241`	`241`	`addSentryBreadcrumb(args[1].body);`
`242`	`242`	`}`
`@@ -407,7 +407,7 @@ export class Breadcrumbs implements Integration {`
`407`	`407`	`const filterUrl = new API(dsn).getStoreEndpoint();`
`408`	`408`	`// if Sentry key appears in URL, don't capture it as a request`
`409`	`409`	`// but rather as our own 'sentry' type breadcrumb`
`410`		`- if (isString(url) && (filterUrl && url.includes(filterUrl))) {`
	`410`	`+ if (isString(url) && (filterUrl && url.indexOf(filterUrl) !== -1)) {`
`411`	`411`	`this.__sentry_own_request__ = true;`
`412`	`412`	`}`
`413`	`413`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,12 +80,12 @@ export function prepareFramesForEvent(stack: TraceKitStackFrame[]): StackFrame[]`
`80`	`80`	`const lastFrameFunction = localStack[localStack.length - 1].func \|\| '';`
`81`	`81`
`82`	`82`	`// If stack starts with one of our API calls, remove it (starts, meaning it's the top of the stack - aka last call)`
`83`		`- if (firstFrameFunction.includes('captureMessage') \|\| firstFrameFunction.includes('captureException')) {`
	`83`	`+ if (firstFrameFunction.indexOf('captureMessage') !== -1 \|\| firstFrameFunction.indexOf('captureException') !== -1) {`
`84`	`84`	`localStack = localStack.slice(1);`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`// If stack ends with one of our internal API calls, remove it (ends, meaning it's the bottom of the stack - aka top-most call)`
`88`		`- if (lastFrameFunction.includes('sentryWrapped')) {`
	`88`	`+ if (lastFrameFunction.indexOf('sentryWrapped') !== -1) {`
`89`	`89`	`localStack = localStack.slice(0, -1);`
`90`	`90`	`}`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ export function isMatchingPattern(value: string, pattern: RegExp \| string): bool`
`117`	`117`	`return (pattern as RegExp).test(value);`
`118`	`118`	`}`
`119`	`119`	`if (typeof pattern === 'string') {`
`120`		`- return value.includes(pattern);`
	`120`	`+ return value.indexOf(pattern) !== -1;`
`121`	`121`	`}`
`122`	`122`	`return false;`
`123`	`123`	`}`