From bd146dd2ca5e73dd792889726301cbc8d527ab3d Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Fri, 28 Jul 2023 13:14:56 +0200
Subject: [PATCH 01/13] add integration boilerplate

---
 .../browser/src/integrations/contextlines.ts  | 49 +++++++++++++++++++
 packages/browser/src/integrations/index.ts    |  1 +
 2 files changed, 50 insertions(+)
 create mode 100644 packages/browser/src/integrations/contextlines.ts

diff --git a/packages/browser/src/integrations/contextlines.ts b/packages/browser/src/integrations/contextlines.ts
new file mode 100644
index 000000000000..23b4eb152b6a
--- /dev/null
+++ b/packages/browser/src/integrations/contextlines.ts
@@ -0,0 +1,49 @@
+import type { Event, EventProcessor, Integration } from '@sentry/types';
+
+interface ContextLinesOptions {
+  /**
+   * Sets the number of context lines for each frame when loading a file.
+   * Defaults to 7.
+   *
+   * Set to 0 to disable loading and inclusion of source files.
+   **/
+  frameContextLines?: number;
+}
+
+/**
+ * Collects source context lines around the line of a stackframe
+ * This integration only works for stack frames pointing to JS that's directly embedded
+ * in HTML files.
+ * It DOES NOT work for stack frames pointing to JS files that are loaded by the browser.
+ * For frames pointing to files, context lines are added during ingestino and symbolication
+ * by attempting to download the JS files to the Sentry backend.
+ */
+export class ContextLines implements Integration {
+  /**
+   * @inheritDoc
+   */
+  public static id: string = 'ContextLines';
+
+  /**
+   * @inheritDoc
+   */
+  public name: string = ContextLines.id;
+
+  public constructor(
+    private readonly _options: ContextLinesOptions = {
+      frameContextLines: 0,
+    },
+  ) {}
+
+  /**
+   * @inheritDoc
+   */
+  public setupOnce(addGlobalEventProcessor: (callback: EventProcessor) => void): void {
+    addGlobalEventProcessor(event => this.addSourceContext(event));
+  }
+
+  /** Processes an event and adds context lines */
+  public addSourceContext(event: Event): Event {
+    return event;
+  }
+}
diff --git a/packages/browser/src/integrations/index.ts b/packages/browser/src/integrations/index.ts
index e029422f363c..ec826b561000 100644
--- a/packages/browser/src/integrations/index.ts
+++ b/packages/browser/src/integrations/index.ts
@@ -4,3 +4,4 @@ export { Breadcrumbs } from './breadcrumbs';
 export { LinkedErrors } from './linkederrors';
 export { HttpContext } from './httpcontext';
 export { Dedupe } from './dedupe';
+export { ContextLines } from './contextlines';

From a8685deb8d2971f48bec842d460ca5b517901f87 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Fri, 28 Jul 2023 18:40:15 +0200
Subject: [PATCH 02/13] feat(browser): Add `ContextLines` integration for
 html-embedded JS stack frames

---
 .../browser/src/integrations/contextlines.ts  | 75 +++++++++++++++++--
 1 file changed, 69 insertions(+), 6 deletions(-)

diff --git a/packages/browser/src/integrations/contextlines.ts b/packages/browser/src/integrations/contextlines.ts
index 23b4eb152b6a..91bd817acac9 100644
--- a/packages/browser/src/integrations/contextlines.ts
+++ b/packages/browser/src/integrations/contextlines.ts
@@ -1,4 +1,7 @@
-import type { Event, EventProcessor, Integration } from '@sentry/types';
+import type { Event, EventProcessor, Integration, StackFrame } from '@sentry/types';
+import { stripUrlQueryAndFragment } from '@sentry/utils';
+
+import { WINDOW } from '../helpers';
 
 interface ContextLinesOptions {
   /**
@@ -29,11 +32,7 @@ export class ContextLines implements Integration {
    */
   public name: string = ContextLines.id;
 
-  public constructor(
-    private readonly _options: ContextLinesOptions = {
-      frameContextLines: 0,
-    },
-  ) {}
+  public constructor(private readonly _options: ContextLinesOptions = {}) {}
 
   /**
    * @inheritDoc
@@ -44,6 +43,70 @@ export class ContextLines implements Integration {
 
   /** Processes an event and adds context lines */
   public addSourceContext(event: Event): Event {
+    const doc = WINDOW.document;
+    const htmlFilename = WINDOW.location && stripUrlQueryAndFragment(WINDOW.location.href);
+    if (!doc || !htmlFilename) {
+      return event;
+    }
+
+    const exceptions = event.exception && event.exception.values;
+    if (!exceptions || !exceptions.length) {
+      return event;
+    }
+
+    const html = doc.documentElement.innerHTML;
+
+    const htmlLines = ['<!DOCTYPE html>', '<html>', ...html.split('\n'), '</html>'];
+    if (!htmlLines.length) {
+      return event;
+    }
+
+    exceptions.forEach(exception => {
+      const stacktrace = exception.stacktrace;
+      if (stacktrace && stacktrace.frames) {
+        stacktrace.frames = stacktrace.frames.map(frame =>
+          applySourceContextToFrame(frame, htmlLines, htmlFilename, this._options.frameContextLines || 7),
+        );
+      }
+    });
+
     return event;
   }
 }
+
+/**
+ * Only exported for testing
+ */
+export function applySourceContextToFrame(
+  frame: StackFrame,
+  htmlLines: string[],
+  htmlFilename: string,
+  contextRange: number,
+): StackFrame {
+  if (frame.filename !== htmlFilename || !frame.lineno || !htmlLines.length) {
+    return frame;
+  }
+
+  const sourroundingRange = Math.floor(contextRange / 2);
+  const contextLineIndex = frame.lineno - 1;
+  const preStartIndex = Math.max(contextLineIndex - sourroundingRange, 0);
+  const postEndIndex = Math.min(contextLineIndex + sourroundingRange, htmlLines.length - 1);
+
+  const preLines = htmlLines.slice(preStartIndex, contextLineIndex);
+  const contextLine = htmlLines[contextLineIndex];
+  const postLines = htmlLines.slice(contextLineIndex + 1, postEndIndex + 1);
+
+  if (preLines.length) {
+    frame.pre_context = preLines;
+  }
+
+  if (contextLine) {
+    frame.context_line = contextLine;
+  }
+
+  if (postLines.length) {
+    frame.post_context = postLines || undefined;
+  }
+
+  return frame;
+}

From 0e15ba0546ab5e9a3eb98c65113750a548861ef5 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Fri, 28 Jul 2023 18:41:10 +0200
Subject: [PATCH 03/13] add tests

---
 .../suites/integrations/ContextLines/init.js  |   8 ++
 .../integrations/ContextLines/subject.js      |   3 +
 .../integrations/ContextLines/template.html   |  13 ++
 .../suites/integrations/ContextLines/test.ts  |  59 +++++++++
 .../unit/integrations/contextlines.test.ts    | 115 ++++++++++++++++++
 5 files changed, 198 insertions(+)
 create mode 100644 packages/browser-integration-tests/suites/integrations/ContextLines/init.js
 create mode 100644 packages/browser-integration-tests/suites/integrations/ContextLines/subject.js
 create mode 100644 packages/browser-integration-tests/suites/integrations/ContextLines/template.html
 create mode 100644 packages/browser-integration-tests/suites/integrations/ContextLines/test.ts
 create mode 100644 packages/browser/test/unit/integrations/contextlines.test.ts

diff --git a/packages/browser-integration-tests/suites/integrations/ContextLines/init.js b/packages/browser-integration-tests/suites/integrations/ContextLines/init.js
new file mode 100644
index 000000000000..93d8362fbac0
--- /dev/null
+++ b/packages/browser-integration-tests/suites/integrations/ContextLines/init.js
@@ -0,0 +1,8 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  integrations: [new Sentry.Integrations.ContextLines()],
+});
diff --git a/packages/browser-integration-tests/suites/integrations/ContextLines/subject.js b/packages/browser-integration-tests/suites/integrations/ContextLines/subject.js
new file mode 100644
index 000000000000..744649fb291c
--- /dev/null
+++ b/packages/browser-integration-tests/suites/integrations/ContextLines/subject.js
@@ -0,0 +1,3 @@
+document.getElementById('script-error-btn').addEventListener('click', () => {
+  throw new Error('Error without context lines');
+});
diff --git a/packages/browser-integration-tests/suites/integrations/ContextLines/template.html b/packages/browser-integration-tests/suites/integrations/ContextLines/template.html
new file mode 100644
index 000000000000..790dddf90c81
--- /dev/null
+++ b/packages/browser-integration-tests/suites/integrations/ContextLines/template.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+  </head>
+  <body>
+      <button id="inline-error-btn" onclick="throw new Error('Error with context lines')">Click me</button>
+      <button id="script-error-btn">Click me too</button>
+  </body>
+  <footer>
+    Some text...
+  </foot>
+</html>
diff --git a/packages/browser-integration-tests/suites/integrations/ContextLines/test.ts b/packages/browser-integration-tests/suites/integrations/ContextLines/test.ts
new file mode 100644
index 000000000000..a065712ed46f
--- /dev/null
+++ b/packages/browser-integration-tests/suites/integrations/ContextLines/test.ts
@@ -0,0 +1,59 @@
+import { expect } from '@playwright/test';
+import type { Event } from '@sentry/types';
+
+import { sentryTest } from '../../../utils/fixtures';
+import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers';
+
+sentryTest(
+  'should add source context lines around stack frames from errors in Html',
+  async ({ getLocalTestPath, page }) => {
+    const url = await getLocalTestPath({ testDir: __dirname });
+
+    const eventPromise = getFirstSentryEnvelopeRequest<Event>(page, url);
+
+    await page.click('#inline-error-btn');
+
+    const eventData = await eventPromise;
+
+    expect(eventData.exception?.values).toHaveLength(1);
+
+    const exception = eventData.exception?.values?.[0];
+
+    expect(exception).toMatchObject({
+      stacktrace: {
+        frames: [
+          {
+            colno: 97,
+            lineno: 7,
+            pre_context: ['    <meta charset="utf-8">', '  </head>', '  <body>'],
+            context_line:
+              '      <button id="inline-error-btn" onclick="throw new Error(\'Error with context lines\')">Click me</button>',
+            post_context: [
+              '      <button id="script-error-btn">Click me too</button>',
+              '  <script defer="" src="init.bundle.js"></script><script defer="" src="subject.bundle.js"></script>',
+              '  <footer>',
+            ],
+          },
+        ],
+      },
+    });
+  },
+);
+
+sentryTest('should not add source context lines to errors from scripts', async ({ getLocalTestPath, page }) => {
+  const url = await getLocalTestPath({ testDir: __dirname });
+
+  const eventPromise = getFirstSentryEnvelopeRequest<Event>(page, url);
+
+  await page.click('#script-error-btn');
+
+  const eventData = await eventPromise;
+  const exception = eventData.exception?.values?.[0];
+  const frames = exception?.stacktrace?.frames;
+  expect(frames).toHaveLength(1);
+  frames?.forEach(f => {
+    expect(f).not.toHaveProperty('pre_context');
+    expect(f).not.toHaveProperty('context_line');
+    expect(f).not.toHaveProperty('post_context');
+  });
+});
diff --git a/packages/browser/test/unit/integrations/contextlines.test.ts b/packages/browser/test/unit/integrations/contextlines.test.ts
new file mode 100644
index 000000000000..34b7641517b4
--- /dev/null
+++ b/packages/browser/test/unit/integrations/contextlines.test.ts
@@ -0,0 +1,115 @@
+import type { StackFrame } from '@sentry/types';
+
+import { applySourceContextToFrame } from '../../../src/integrations/contextlines';
+
+const lines = ['line1', 'line2', 'line3', 'line4', 'line5', 'line6', 'line7', 'line8', 'line9'];
+describe('ContextLines', () => {
+  describe('applySourceContextToFrame', () => {
+    it.each([
+      [
+        5,
+        {
+          pre_context: ['line2', 'line3', 'line4'],
+          context_line: 'line5',
+          post_context: ['line6', 'line7', 'line8'],
+        },
+      ],
+      [
+        1,
+        {
+          context_line: 'line1',
+          post_context: ['line2', 'line3', 'line4'],
+        },
+      ],
+      [
+        2,
+        {
+          pre_context: ['line1'],
+          context_line: 'line2',
+          post_context: ['line3', 'line4', 'line5'],
+        },
+      ],
+      [
+        9,
+        {
+          pre_context: ['line6', 'line7', 'line8'],
+          context_line: 'line9',
+        },
+      ],
+      [
+        11,
+        {
+          pre_context: ['line8', 'line9'],
+        },
+      ],
+    ])(
+      'correctly applies pre, post contexts and context lines for an inline stack frame (lineno %s)',
+      (lineno, contextLines) => {
+        const frame: StackFrame = {
+          lineno,
+          filename: 'https://mydomain.com/index.html',
+        };
+
+        expect(applySourceContextToFrame(frame, lines, 'https://mydomain.com/index.html', 7)).toStrictEqual({
+          filename: 'https://mydomain.com/index.html',
+          lineno,
+          ...contextLines,
+        });
+      },
+    );
+
+    it('only applies the context line if the range is 1', () => {
+      const frame: StackFrame = {
+        lineno: 5,
+        filename: 'https://mydomain.com/index.html',
+      };
+
+      expect(applySourceContextToFrame(frame, lines, 'https://mydomain.com/index.html', 1)).toStrictEqual({
+        filename: 'https://mydomain.com/index.html',
+        lineno: 5,
+        context_line: 'line5',
+      });
+    });
+
+    it("no-ops if the frame's line number is out of bounds for the found lines", () => {
+      const frame: StackFrame = {
+        lineno: 20,
+        filename: 'https://mydomain.com/index.html',
+      };
+
+      expect(applySourceContextToFrame(frame, lines, 'https://mydomain.com/index.html', 7)).toStrictEqual(frame);
+    });
+
+    it("no-ops if the frame's filename is not the html file's name", () => {
+      const frame: StackFrame = {
+        filename: '/someScript.js',
+      };
+
+      expect(applySourceContextToFrame(frame, lines, 'https://mydomain.com/index.html', 7)).toStrictEqual(frame);
+    });
+
+    it("no-ops if the frame doesn't have a line number", () => {
+      const frame: StackFrame = {
+        filename: '/index.html',
+      };
+
+      expect(applySourceContextToFrame(frame, lines, 'https://mydomain.com/index.html', 0)).toStrictEqual(frame);
+    });
+
+    it("no-ops if the frame doesn't have a filename", () => {
+      const frame: StackFrame = {
+        lineno: 9,
+      };
+
+      expect(applySourceContextToFrame(frame, lines, 'https://mydomain.com/index.html', 0)).toStrictEqual(frame);
+    });
+
+    it('no-ops if there are no html lines available', () => {
+      const frame: StackFrame = {
+        lineno: 9,
+        filename: '/index.html',
+      };
+      expect(applySourceContextToFrame(frame, [], 'https://mydomain.com/index.html', 0)).toStrictEqual(frame);
+    });
+  });
+});

From 7184b59fef36344290405a0b55fd210e313184ca Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Mon, 31 Jul 2023 08:59:06 +0200
Subject: [PATCH 04/13] improve integration test

---
 .../suites/integrations/ContextLines/test.ts         | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/browser-integration-tests/suites/integrations/ContextLines/test.ts b/packages/browser-integration-tests/suites/integrations/ContextLines/test.ts
index a065712ed46f..6a46e4d1c1c1 100644
--- a/packages/browser-integration-tests/suites/integrations/ContextLines/test.ts
+++ b/packages/browser-integration-tests/suites/integrations/ContextLines/test.ts
@@ -5,15 +5,15 @@ import { sentryTest } from '../../../utils/fixtures';
 import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers';
 
 sentryTest(
-  'should add source context lines around stack frames from errors in Html',
+  'should add source context lines around stack frames from errors in Html inline JS',
   async ({ getLocalTestPath, page }) => {
     const url = await getLocalTestPath({ testDir: __dirname });
 
     const eventPromise = getFirstSentryEnvelopeRequest<Event>(page, url);
 
-    await page.click('#inline-error-btn');
+    const clickPromise = page.click('#inline-error-btn');
 
-    const eventData = await eventPromise;
+    const [eventData] = await Promise.all([eventPromise, clickPromise]);
 
     expect(eventData.exception?.values).toHaveLength(1);
 
@@ -23,14 +23,12 @@ sentryTest(
       stacktrace: {
         frames: [
           {
-            colno: 97,
-            lineno: 7,
             pre_context: ['    <meta charset="utf-8">', '  </head>', '  <body>'],
             context_line:
               '      <button id="inline-error-btn" onclick="throw new Error(\'Error with context lines\')">Click me</button>',
             post_context: [
               '      <button id="script-error-btn">Click me too</button>',
-              '  <script defer="" src="init.bundle.js"></script><script defer="" src="subject.bundle.js"></script>',
+              expect.stringContaining('subject.bundle.js'), // this line varies in the test based on tarball/cdn bundle (+variants)
               '  <footer>',
             ],
           },
@@ -40,7 +38,7 @@ sentryTest(
   },
 );
 
-sentryTest('should not add source context lines to errors from scripts', async ({ getLocalTestPath, page }) => {
+sentryTest('should not add source context lines to errors from script files', async ({ getLocalTestPath, page }) => {
   const url = await getLocalTestPath({ testDir: __dirname });
 
   const eventPromise = getFirstSentryEnvelopeRequest<Event>(page, url);

From 9180679a6dc1e7c61ed618d3e12e49e5f725181d Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Mon, 31 Jul 2023 10:49:59 +0200
Subject: [PATCH 05/13] further integration test and doc improvements

---
 .../suites/integrations/ContextLines/test.ts  | 29 ++++++++++++++-----
 .../browser/src/integrations/contextlines.ts  | 13 +++++----
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/packages/browser-integration-tests/suites/integrations/ContextLines/test.ts b/packages/browser-integration-tests/suites/integrations/ContextLines/test.ts
index 6a46e4d1c1c1..63109c77d7cf 100644
--- a/packages/browser-integration-tests/suites/integrations/ContextLines/test.ts
+++ b/packages/browser-integration-tests/suites/integrations/ContextLines/test.ts
@@ -1,19 +1,29 @@
 import { expect } from '@playwright/test';
-import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers';
+import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../utils/helpers';
 
 sentryTest(
   'should add source context lines around stack frames from errors in Html inline JS',
-  async ({ getLocalTestPath, page }) => {
+  async ({ getLocalTestPath, page, browserName }) => {
+    if (browserName === 'webkit') {
+      // The error we're throwing in this test is thrown as "Script error." in Webkit.
+      // We filter "Script error." out by default in `InboundFilters`.
+      // I don't think there's much value to disable InboundFilters defaults for this test,
+      // given that most of our users won't do that either.
+      // Let's skip it instead for Webkit.
+      sentryTest.skip();
+    }
+
     const url = await getLocalTestPath({ testDir: __dirname });
 
-    const eventPromise = getFirstSentryEnvelopeRequest<Event>(page, url);
+    const eventReqPromise = waitForErrorRequestOnUrl(page, url);
 
     const clickPromise = page.click('#inline-error-btn');
 
-    const [eventData] = await Promise.all([eventPromise, clickPromise]);
+    const [req] = await Promise.all([eventReqPromise, clickPromise]);
+
+    const eventData = envelopeRequestParser(req);
 
     expect(eventData.exception?.values).toHaveLength(1);
 
@@ -41,11 +51,14 @@ sentryTest(
 sentryTest('should not add source context lines to errors from script files', async ({ getLocalTestPath, page }) => {
   const url = await getLocalTestPath({ testDir: __dirname });
 
-  const eventPromise = getFirstSentryEnvelopeRequest<Event>(page, url);
+  const eventReqPromise = waitForErrorRequestOnUrl(page, url);
+
+  const clickPromise = page.click('#script-error-btn');
+
+  const [req] = await Promise.all([eventReqPromise, clickPromise]);
 
-  await page.click('#script-error-btn');
+  const eventData = envelopeRequestParser(req);
 
-  const eventData = await eventPromise;
   const exception = eventData.exception?.values?.[0];
   const frames = exception?.stacktrace?.frames;
   expect(frames).toHaveLength(1);
diff --git a/packages/browser/src/integrations/contextlines.ts b/packages/browser/src/integrations/contextlines.ts
index 91bd817acac9..4dc7e92bd57c 100644
--- a/packages/browser/src/integrations/contextlines.ts
+++ b/packages/browser/src/integrations/contextlines.ts
@@ -14,11 +14,14 @@ interface ContextLinesOptions {
 }
 
 /**
- * Collects source context lines around the line of a stackframe
- * This integration only works for stack frames pointing to JS that's directly embedded
- * in HTML files.
- * It DOES NOT work for stack frames pointing to JS files that are loaded by the browser.
- * For frames pointing to files, context lines are added during ingestino and symbolication
+ * Collects source context lines around the line of a stackframe pointing to JS embedded in
+ * the current page's HTML.
+ *
+ * Use this integration if you have inline JS code in HTML pages that can't be accessed
+ * by our backend (e.g. due to a login-protected page).
+ *
+ * This integratino DOES NOT work for stack frames pointing to JS files that are loaded by the browser.
+ * For frames pointing to files, context lines are added during ingestion and symbolication
  * by attempting to download the JS files to the Sentry backend.
  */
 export class ContextLines implements Integration {

From 60ddc6a3a02cb9722a904822136447338d211cb9 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Mon, 31 Jul 2023 11:23:15 +0200
Subject: [PATCH 06/13] doc

---
 packages/browser/src/integrations/contextlines.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/browser/src/integrations/contextlines.ts b/packages/browser/src/integrations/contextlines.ts
index 4dc7e92bd57c..98dad4269d62 100644
--- a/packages/browser/src/integrations/contextlines.ts
+++ b/packages/browser/src/integrations/contextlines.ts
@@ -14,15 +14,15 @@ interface ContextLinesOptions {
 }
 
 /**
- * Collects source context lines around the line of a stackframe pointing to JS embedded in
+ * Collects source context lines around the lines of stackframes pointing to JS embedded in
  * the current page's HTML.
  *
- * Use this integration if you have inline JS code in HTML pages that can't be accessed
- * by our backend (e.g. due to a login-protected page).
- *
- * This integratino DOES NOT work for stack frames pointing to JS files that are loaded by the browser.
+ * This integration DOES NOT work for stack frames pointing to JS files that are loaded by the browser.
  * For frames pointing to files, context lines are added during ingestion and symbolication
  * by attempting to download the JS files to the Sentry backend.
+ *
+ * Use this integration if you have inline JS code in HTML pages that can't be accessed
+ * by our backend (e.g. due to a login-protected page).
  */
 export class ContextLines implements Integration {
   /**

From 40770b72184e4f71034b136558ba326914dc6ad5 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Mon, 31 Jul 2023 13:25:37 +0200
Subject: [PATCH 07/13] move to `@sentry/integrations`

---
 .../suites/integrations/ContextLines/init.js                  | 3 ++-
 packages/browser/src/integrations/index.ts                    | 1 -
 .../src/integrations => integrations/src}/contextlines.ts     | 4 ++--
 packages/integrations/src/index.ts                            | 1 +
 .../integrations => integrations/test}/contextlines.test.ts   | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)
 rename packages/{browser/src/integrations => integrations/src}/contextlines.ts (96%)
 rename packages/{browser/test/unit/integrations => integrations/test}/contextlines.test.ts (97%)

diff --git a/packages/browser-integration-tests/suites/integrations/ContextLines/init.js b/packages/browser-integration-tests/suites/integrations/ContextLines/init.js
index 93d8362fbac0..4461826e0214 100644
--- a/packages/browser-integration-tests/suites/integrations/ContextLines/init.js
+++ b/packages/browser-integration-tests/suites/integrations/ContextLines/init.js
@@ -1,8 +1,9 @@
 import * as Sentry from '@sentry/browser';
+import { ContextLines } from '@sentry/integrations';
 
 window.Sentry = Sentry;
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
-  integrations: [new Sentry.Integrations.ContextLines()],
+  integrations: [new ContextLines()],
 });
diff --git a/packages/browser/src/integrations/index.ts b/packages/browser/src/integrations/index.ts
index ec826b561000..e029422f363c 100644
--- a/packages/browser/src/integrations/index.ts
+++ b/packages/browser/src/integrations/index.ts
@@ -4,4 +4,3 @@ export { Breadcrumbs } from './breadcrumbs';
 export { LinkedErrors } from './linkederrors';
 export { HttpContext } from './httpcontext';
 export { Dedupe } from './dedupe';
-export { ContextLines } from './contextlines';
diff --git a/packages/browser/src/integrations/contextlines.ts b/packages/integrations/src/contextlines.ts
similarity index 96%
rename from packages/browser/src/integrations/contextlines.ts
rename to packages/integrations/src/contextlines.ts
index 98dad4269d62..f234e809f3a6 100644
--- a/packages/browser/src/integrations/contextlines.ts
+++ b/packages/integrations/src/contextlines.ts
@@ -1,7 +1,7 @@
 import type { Event, EventProcessor, Integration, StackFrame } from '@sentry/types';
-import { stripUrlQueryAndFragment } from '@sentry/utils';
+import { GLOBAL_OBJ, stripUrlQueryAndFragment } from '@sentry/utils';
 
-import { WINDOW } from '../helpers';
+const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & Window;
 
 interface ContextLinesOptions {
   /**
diff --git a/packages/integrations/src/index.ts b/packages/integrations/src/index.ts
index 372a730e3a5c..b7dcc1f4716a 100644
--- a/packages/integrations/src/index.ts
+++ b/packages/integrations/src/index.ts
@@ -9,3 +9,4 @@ export { RewriteFrames } from './rewriteframes';
 export { SessionTiming } from './sessiontiming';
 export { Transaction } from './transaction';
 export { HttpClient } from './httpclient';
+export { ContextLines } from './contextlines';
diff --git a/packages/browser/test/unit/integrations/contextlines.test.ts b/packages/integrations/test/contextlines.test.ts
similarity index 97%
rename from packages/browser/test/unit/integrations/contextlines.test.ts
rename to packages/integrations/test/contextlines.test.ts
index 34b7641517b4..2c5d03bcf5bd 100644
--- a/packages/browser/test/unit/integrations/contextlines.test.ts
+++ b/packages/integrations/test/contextlines.test.ts
@@ -1,6 +1,6 @@
 import type { StackFrame } from '@sentry/types';
 
-import { applySourceContextToFrame } from '../../../src/integrations/contextlines';
+import { applySourceContextToFrame } from '../src/contextlines';
 
 const lines = ['line1', 'line2', 'line3', 'line4', 'line5', 'line6', 'line7', 'line8', 'line9'];
 describe('ContextLines', () => {

From 05b450b6fbee9a81d9d934442539b2ce9734ce90 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Tue, 1 Aug 2023 16:57:26 +0200
Subject: [PATCH 08/13] fix guard check, add more tests

---
 .../ContextLines/{ => inline}/template.html   |  1 -
 .../ContextLines/{ => inline}/test.ts         | 27 +--------
 .../{ => noAddedLines}/subject.js             |  0
 .../ContextLines/noAddedLines/template.html   | 12 ++++
 .../ContextLines/noAddedLines/test.ts         | 25 +++++++++
 .../ContextLines/scriptTag/template.html      | 17 ++++++
 .../ContextLines/scriptTag/test.ts            | 55 +++++++++++++++++++
 packages/integrations/src/contextlines.ts     |  6 +-
 8 files changed, 115 insertions(+), 28 deletions(-)
 rename packages/browser-integration-tests/suites/integrations/ContextLines/{ => inline}/template.html (80%)
 rename packages/browser-integration-tests/suites/integrations/ContextLines/{ => inline}/test.ts (65%)
 rename packages/browser-integration-tests/suites/integrations/ContextLines/{ => noAddedLines}/subject.js (100%)
 create mode 100644 packages/browser-integration-tests/suites/integrations/ContextLines/noAddedLines/template.html
 create mode 100644 packages/browser-integration-tests/suites/integrations/ContextLines/noAddedLines/test.ts
 create mode 100644 packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/template.html
 create mode 100644 packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/test.ts

diff --git a/packages/browser-integration-tests/suites/integrations/ContextLines/template.html b/packages/browser-integration-tests/suites/integrations/ContextLines/inline/template.html
similarity index 80%
rename from packages/browser-integration-tests/suites/integrations/ContextLines/template.html
rename to packages/browser-integration-tests/suites/integrations/ContextLines/inline/template.html
index 790dddf90c81..acb69e682644 100644
--- a/packages/browser-integration-tests/suites/integrations/ContextLines/template.html
+++ b/packages/browser-integration-tests/suites/integrations/ContextLines/inline/template.html
@@ -5,7 +5,6 @@
   </head>
   <body>
       <button id="inline-error-btn" onclick="throw new Error('Error with context lines')">Click me</button>
-      <button id="script-error-btn">Click me too</button>
   </body>
   <footer>
     Some text...
diff --git a/packages/browser-integration-tests/suites/integrations/ContextLines/test.ts b/packages/browser-integration-tests/suites/integrations/ContextLines/inline/test.ts
similarity index 65%
rename from packages/browser-integration-tests/suites/integrations/ContextLines/test.ts
rename to packages/browser-integration-tests/suites/integrations/ContextLines/inline/test.ts
index 63109c77d7cf..8312ff7264fa 100644
--- a/packages/browser-integration-tests/suites/integrations/ContextLines/test.ts
+++ b/packages/browser-integration-tests/suites/integrations/ContextLines/inline/test.ts
@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test';
 
-import { sentryTest } from '../../../utils/fixtures';
-import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../utils/helpers';
+import { sentryTest } from '../../../../utils/fixtures';
+import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
 
 sentryTest(
   'should add source context lines around stack frames from errors in Html inline JS',
@@ -37,9 +37,9 @@ sentryTest(
             context_line:
               '      <button id="inline-error-btn" onclick="throw new Error(\'Error with context lines\')">Click me</button>',
             post_context: [
-              '      <button id="script-error-btn">Click me too</button>',
               expect.stringContaining('subject.bundle.js'), // this line varies in the test based on tarball/cdn bundle (+variants)
               '  <footer>',
+              '    Some text...',
             ],
           },
         ],
@@ -47,24 +47,3 @@ sentryTest(
     });
   },
 );
-
-sentryTest('should not add source context lines to errors from script files', async ({ getLocalTestPath, page }) => {
-  const url = await getLocalTestPath({ testDir: __dirname });
-
-  const eventReqPromise = waitForErrorRequestOnUrl(page, url);
-
-  const clickPromise = page.click('#script-error-btn');
-
-  const [req] = await Promise.all([eventReqPromise, clickPromise]);
-
-  const eventData = envelopeRequestParser(req);
-
-  const exception = eventData.exception?.values?.[0];
-  const frames = exception?.stacktrace?.frames;
-  expect(frames).toHaveLength(1);
-  frames?.forEach(f => {
-    expect(f).not.toHaveProperty('pre_context');
-    expect(f).not.toHaveProperty('context_line');
-    expect(f).not.toHaveProperty('post_context');
-  });
-});
diff --git a/packages/browser-integration-tests/suites/integrations/ContextLines/subject.js b/packages/browser-integration-tests/suites/integrations/ContextLines/noAddedLines/subject.js
similarity index 100%
rename from packages/browser-integration-tests/suites/integrations/ContextLines/subject.js
rename to packages/browser-integration-tests/suites/integrations/ContextLines/noAddedLines/subject.js
diff --git a/packages/browser-integration-tests/suites/integrations/ContextLines/noAddedLines/template.html b/packages/browser-integration-tests/suites/integrations/ContextLines/noAddedLines/template.html
new file mode 100644
index 000000000000..80569790143a
--- /dev/null
+++ b/packages/browser-integration-tests/suites/integrations/ContextLines/noAddedLines/template.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+  </head>
+  <body>
+      <button id="script-error-btn">Click me</button>
+  </body>
+  <footer>
+    Some text...
+  </foot>
+</html>
diff --git a/packages/browser-integration-tests/suites/integrations/ContextLines/noAddedLines/test.ts b/packages/browser-integration-tests/suites/integrations/ContextLines/noAddedLines/test.ts
new file mode 100644
index 000000000000..cd90d8477080
--- /dev/null
+++ b/packages/browser-integration-tests/suites/integrations/ContextLines/noAddedLines/test.ts
@@ -0,0 +1,25 @@
+import { expect } from '@playwright/test';
+
+import { sentryTest } from '../../../../utils/fixtures';
+import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
+
+sentryTest('should not add source context lines to errors from script files', async ({ getLocalTestPath, page }) => {
+  const url = await getLocalTestPath({ testDir: __dirname });
+
+  const eventReqPromise = waitForErrorRequestOnUrl(page, url);
+
+  const clickPromise = page.click('#script-error-btn');
+
+  const [req] = await Promise.all([eventReqPromise, clickPromise]);
+
+  const eventData = envelopeRequestParser(req);
+
+  const exception = eventData.exception?.values?.[0];
+  const frames = exception?.stacktrace?.frames;
+  expect(frames).toHaveLength(1);
+  frames?.forEach(f => {
+    expect(f).not.toHaveProperty('pre_context');
+    expect(f).not.toHaveProperty('context_line');
+    expect(f).not.toHaveProperty('post_context');
+  });
+});
diff --git a/packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/template.html b/packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/template.html
new file mode 100644
index 000000000000..e5c90a38f1e6
--- /dev/null
+++ b/packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/template.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <script>
+      function throwTestError() {
+        throw new Error('Error with context lines')
+      }
+    </script>
+  </head>
+  <body>
+      <button id="inline-error-btn" onclick="throwTestError()">Click me</button>
+  </body>
+  <footer>
+    Some text...
+  </foot>
+</html>
diff --git a/packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/test.ts b/packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/test.ts
new file mode 100644
index 000000000000..085bb8020358
--- /dev/null
+++ b/packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/test.ts
@@ -0,0 +1,55 @@
+import { expect } from '@playwright/test';
+
+import { sentryTest } from '../../../../utils/fixtures';
+import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
+
+sentryTest(
+  'should add source context lines around stack frames from errors in Html script tags',
+  async ({ getLocalTestPath, page, browserName }) => {
+    if (browserName === 'webkit') {
+      // The error we're throwing in this test is thrown as "Script error." in Webkit.
+      // We filter "Script error." out by default in `InboundFilters`.
+      // I don't think there's much value to disable InboundFilters defaults for this test,
+      // given that most of our users won't do that either.
+      // Let's skip it instead for Webkit.
+      sentryTest.skip();
+    }
+
+    const url = await getLocalTestPath({ testDir: __dirname });
+
+    const eventReqPromise = waitForErrorRequestOnUrl(page, url);
+
+    const clickPromise = page.click('#inline-error-btn');
+
+    const [req] = await Promise.all([eventReqPromise, clickPromise]);
+
+    const eventData = envelopeRequestParser(req);
+
+    expect(eventData.exception?.values).toHaveLength(1);
+
+    const exception = eventData.exception?.values?.[0];
+
+    expect(exception).toMatchObject({
+      stacktrace: {
+        frames: [
+          {
+            lineno: 12,
+            pre_context: ['    </script>', '  </head>', '  <body>'],
+            context_line: '      <button id="inline-error-btn" onclick="throwTestError()">Click me</button>',
+            post_context: [
+              expect.stringContaining('subject.bundle.js'), // this line varies in the test based on tarball/cdn bundle (+variants)
+              '  <footer>',
+              '    Some text...',
+            ],
+          },
+          {
+            lineno: 7,
+            pre_context: ['    <meta charset="utf-8">', '    <script>', '      function throwTestError() {'],
+            context_line: "        throw new Error('Error with context lines')",
+            post_context: ['      }', '    </script>', '  </head>'],
+          },
+        ],
+      },
+    });
+  },
+);
diff --git a/packages/integrations/src/contextlines.ts b/packages/integrations/src/contextlines.ts
index f234e809f3a6..207bc041bb50 100644
--- a/packages/integrations/src/contextlines.ts
+++ b/packages/integrations/src/contextlines.ts
@@ -58,12 +58,12 @@ export class ContextLines implements Integration {
     }
 
     const html = doc.documentElement.innerHTML;
-
-    const htmlLines = ['<!DOCTYPE html>', '<html>', ...html.split('\n'), '</html>'];
-    if (!htmlLines.length) {
+    if (!html) {
       return event;
     }
 
+    const htmlLines = ['<!DOCTYPE html>', '<html>', ...html.split('\n'), '</html>'];
+
     exceptions.forEach(exception => {
       const stacktrace = exception.stacktrace;
       if (stacktrace && stacktrace.frames) {

From 449ca2b6cd489a0acbb543d42074c70b4687fee4 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Tue, 1 Aug 2023 18:10:28 +0200
Subject: [PATCH 09/13] add self check and cleanup

---
 packages/integrations/src/contextlines.ts | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/integrations/src/contextlines.ts b/packages/integrations/src/contextlines.ts
index 207bc041bb50..42a5808813d9 100644
--- a/packages/integrations/src/contextlines.ts
+++ b/packages/integrations/src/contextlines.ts
@@ -1,4 +1,4 @@
-import type { Event, EventProcessor, Integration, StackFrame } from '@sentry/types';
+import type { Event, EventProcessor, Hub, Integration, StackFrame } from '@sentry/types';
 import { GLOBAL_OBJ, stripUrlQueryAndFragment } from '@sentry/utils';
 
 const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & Window;
@@ -40,8 +40,14 @@ export class ContextLines implements Integration {
   /**
    * @inheritDoc
    */
-  public setupOnce(addGlobalEventProcessor: (callback: EventProcessor) => void): void {
-    addGlobalEventProcessor(event => this.addSourceContext(event));
+  public setupOnce(addGlobalEventProcessor: (callback: EventProcessor) => void, getCurrentHub: () => Hub): void {
+    addGlobalEventProcessor(event => {
+      const self = getCurrentHub().getIntegration(ContextLines);
+      if (!self) {
+        return event;
+      }
+      return this.addSourceContext(event);
+    });
   }
 
   /** Processes an event and adds context lines */
@@ -108,7 +114,7 @@ export function applySourceContextToFrame(
   }
 
   if (postLines.length) {
-    frame.post_context = postLines || undefined;
+    frame.post_context = postLines;
   }
 
   return frame;

From 27b4c35a28ce2db9a5536c90872d0e4b8302dd79 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Wed, 2 Aug 2023 16:40:40 +0200
Subject: [PATCH 10/13] reuse addContextToFrame

---
 .../integrations/ContextLines/inline/test.ts  |  6 +++-
 .../ContextLines/scriptTag/test.ts            | 33 ++++++++++++++++--
 packages/integrations/src/contextlines.ts     | 34 ++++++-------------
 .../integrations/test/contextlines.test.ts    | 20 +++++------
 4 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/packages/browser-integration-tests/suites/integrations/ContextLines/inline/test.ts b/packages/browser-integration-tests/suites/integrations/ContextLines/inline/test.ts
index 8312ff7264fa..f57cad6ad95d 100644
--- a/packages/browser-integration-tests/suites/integrations/ContextLines/inline/test.ts
+++ b/packages/browser-integration-tests/suites/integrations/ContextLines/inline/test.ts
@@ -33,13 +33,17 @@ sentryTest(
       stacktrace: {
         frames: [
           {
-            pre_context: ['    <meta charset="utf-8">', '  </head>', '  <body>'],
+            pre_context: ['<!DOCTYPE html>', '<html>', '<head>', '    <meta charset="utf-8">', '  </head>', '  <body>'],
             context_line:
               '      <button id="inline-error-btn" onclick="throw new Error(\'Error with context lines\')">Click me</button>',
             post_context: [
               expect.stringContaining('subject.bundle.js'), // this line varies in the test based on tarball/cdn bundle (+variants)
               '  <footer>',
               '    Some text...',
+              '  ',
+              '',
+              '</footer></body>',
+              '</html>',
             ],
           },
         ],
diff --git a/packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/test.ts b/packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/test.ts
index 085bb8020358..32991b56b734 100644
--- a/packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/test.ts
+++ b/packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/test.ts
@@ -34,19 +34,46 @@ sentryTest(
         frames: [
           {
             lineno: 12,
-            pre_context: ['    </script>', '  </head>', '  <body>'],
+            pre_context: [
+              '    <script>',
+              '      function throwTestError() {',
+              "        throw new Error('Error with context lines')",
+              '      }',
+              '    </script>',
+              '  </head>',
+              '  <body>',
+            ],
             context_line: '      <button id="inline-error-btn" onclick="throwTestError()">Click me</button>',
             post_context: [
               expect.stringContaining('subject.bundle.js'), // this line varies in the test based on tarball/cdn bundle (+variants)
               '  <footer>',
               '    Some text...',
+              '  ',
+              '',
+              '</footer></body>',
+              '</html>',
             ],
           },
           {
             lineno: 7,
-            pre_context: ['    <meta charset="utf-8">', '    <script>', '      function throwTestError() {'],
+            pre_context: [
+              '<!DOCTYPE html>',
+              '<html>',
+              '<head>',
+              '    <meta charset="utf-8">',
+              '    <script>',
+              '      function throwTestError() {',
+            ],
             context_line: "        throw new Error('Error with context lines')",
-            post_context: ['      }', '    </script>', '  </head>'],
+            post_context: [
+              '      }',
+              '    </script>',
+              '  </head>',
+              '  <body>',
+              '      <button id="inline-error-btn" onclick="throwTestError()">Click me</button>',
+              '  <script defer="" src="init.bundle.js"></script><script defer="" src="subject.bundle.js"></script>',
+              '  <footer>',
+            ],
           },
         ],
       },
diff --git a/packages/integrations/src/contextlines.ts b/packages/integrations/src/contextlines.ts
index 42a5808813d9..d643b946b86e 100644
--- a/packages/integrations/src/contextlines.ts
+++ b/packages/integrations/src/contextlines.ts
@@ -1,8 +1,10 @@
 import type { Event, EventProcessor, Hub, Integration, StackFrame } from '@sentry/types';
-import { GLOBAL_OBJ, stripUrlQueryAndFragment } from '@sentry/utils';
+import { addContextToFrame, GLOBAL_OBJ, snipLine, stripUrlQueryAndFragment } from '@sentry/utils';
 
 const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & Window;
 
+const DEFAULT_LINES_OF_CONTEXT = 7;
+
 interface ContextLinesOptions {
   /**
    * Sets the number of context lines for each frame when loading a file.
@@ -74,7 +76,12 @@ export class ContextLines implements Integration {
       const stacktrace = exception.stacktrace;
       if (stacktrace && stacktrace.frames) {
         stacktrace.frames = stacktrace.frames.map(frame =>
-          applySourceContextToFrame(frame, htmlLines, htmlFilename, this._options.frameContextLines || 7),
+          applySourceContextToFrame(
+            frame,
+            htmlLines,
+            htmlFilename,
+            this._options.frameContextLines != null ? this._options.frameContextLines : DEFAULT_LINES_OF_CONTEXT,
+          ),
         );
       }
     });
@@ -90,32 +97,13 @@ export function applySourceContextToFrame(
   frame: StackFrame,
   htmlLines: string[],
   htmlFilename: string,
-  contextRange: number,
+  linesOfContext: number,
 ): StackFrame {
   if (frame.filename !== htmlFilename || !frame.lineno || !htmlLines.length) {
     return frame;
   }
 
-  const sourroundingRange = Math.floor(contextRange / 2);
-  const contextLineIndex = frame.lineno - 1;
-  const preStartIndex = Math.max(contextLineIndex - sourroundingRange, 0);
-  const postEndIndex = Math.min(contextLineIndex + sourroundingRange, htmlLines.length - 1);
-
-  const preLines = htmlLines.slice(preStartIndex, contextLineIndex);
-  const contextLine = htmlLines[contextLineIndex];
-  const postLines = htmlLines.slice(contextLineIndex + 1, postEndIndex + 1);
-
-  if (preLines.length) {
-    frame.pre_context = preLines;
-  }
-
-  if (contextLine) {
-    frame.context_line = contextLine;
-  }
-
-  if (postLines.length) {
-    frame.post_context = postLines;
-  }
+  addContextToFrame(htmlLines, frame, linesOfContext);
 
   return frame;
 }
diff --git a/packages/integrations/test/contextlines.test.ts b/packages/integrations/test/contextlines.test.ts
index 2c5d03bcf5bd..00365d7ab910 100644
--- a/packages/integrations/test/contextlines.test.ts
+++ b/packages/integrations/test/contextlines.test.ts
@@ -17,6 +17,7 @@ describe('ContextLines', () => {
       [
         1,
         {
+          pre_context: [],
           context_line: 'line1',
           post_context: ['line2', 'line3', 'line4'],
         },
@@ -34,12 +35,7 @@ describe('ContextLines', () => {
         {
           pre_context: ['line6', 'line7', 'line8'],
           context_line: 'line9',
-        },
-      ],
-      [
-        11,
-        {
-          pre_context: ['line8', 'line9'],
+          post_context: [],
         },
       ],
     ])(
@@ -50,7 +46,7 @@ describe('ContextLines', () => {
           filename: 'https://mydomain.com/index.html',
         };
 
-        expect(applySourceContextToFrame(frame, lines, 'https://mydomain.com/index.html', 7)).toStrictEqual({
+        expect(applySourceContextToFrame(frame, lines, 'https://mydomain.com/index.html', 3)).toStrictEqual({
           filename: 'https://mydomain.com/index.html',
           lineno,
           ...contextLines,
@@ -58,16 +54,18 @@ describe('ContextLines', () => {
       },
     );
 
-    it('only applies the context line if the range is 1', () => {
+    it('only applies the context line if the range is 0', () => {
       const frame: StackFrame = {
         lineno: 5,
         filename: 'https://mydomain.com/index.html',
       };
 
-      expect(applySourceContextToFrame(frame, lines, 'https://mydomain.com/index.html', 1)).toStrictEqual({
+      expect(applySourceContextToFrame(frame, lines, 'https://mydomain.com/index.html', 0)).toStrictEqual({
         filename: 'https://mydomain.com/index.html',
         lineno: 5,
         context_line: 'line5',
+        pre_context: [],
+        post_context: [],
       });
     });
 
@@ -77,7 +75,7 @@ describe('ContextLines', () => {
         filename: 'https://mydomain.com/index.html',
       };
 
-      expect(applySourceContextToFrame(frame, lines, 'https://mydomain.com/index.html', 7)).toStrictEqual(frame);
+      expect(applySourceContextToFrame(frame, lines, 'https://mydomain.com/index.html', 3)).toStrictEqual(frame);
     });
 
     it("no-ops if the frame's filename is not the html file's name", () => {
@@ -85,7 +83,7 @@ describe('ContextLines', () => {
         filename: '/someScript.js',
       };
 
-      expect(applySourceContextToFrame(frame, lines, 'https://mydomain.com/index.html', 7)).toStrictEqual(frame);
+      expect(applySourceContextToFrame(frame, lines, 'https://mydomain.com/index.html', 3)).toStrictEqual(frame);
     });
 
     it("no-ops if the frame doesn't have a line number", () => {

From 49a2bba63bef718e85f694e7caffe1bb88648aff Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Wed, 2 Aug 2023 17:15:01 +0200
Subject: [PATCH 11/13] adjust test, fix lint

---
 .../suites/integrations/ContextLines/inline/test.ts           | 2 +-
 .../suites/integrations/ContextLines/scriptTag/test.ts        | 4 ++--
 packages/integrations/src/contextlines.ts                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/browser-integration-tests/suites/integrations/ContextLines/inline/test.ts b/packages/browser-integration-tests/suites/integrations/ContextLines/inline/test.ts
index f57cad6ad95d..1432583386b3 100644
--- a/packages/browser-integration-tests/suites/integrations/ContextLines/inline/test.ts
+++ b/packages/browser-integration-tests/suites/integrations/ContextLines/inline/test.ts
@@ -37,7 +37,7 @@ sentryTest(
             context_line:
               '      <button id="inline-error-btn" onclick="throw new Error(\'Error with context lines\')">Click me</button>',
             post_context: [
-              expect.stringContaining('subject.bundle.js'), // this line varies in the test based on tarball/cdn bundle (+variants)
+              expect.stringContaining('contextlines.bundle.js'), // this line varies in the test based on tarball/cdn bundle (+variants)
               '  <footer>',
               '    Some text...',
               '  ',
diff --git a/packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/test.ts b/packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/test.ts
index 32991b56b734..49d4993a4bb4 100644
--- a/packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/test.ts
+++ b/packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/test.ts
@@ -45,7 +45,7 @@ sentryTest(
             ],
             context_line: '      <button id="inline-error-btn" onclick="throwTestError()">Click me</button>',
             post_context: [
-              expect.stringContaining('subject.bundle.js'), // this line varies in the test based on tarball/cdn bundle (+variants)
+              expect.stringContaining('contextlines.bundle.js'), // this line varies in the test based on tarball/cdn bundle (+variants)
               '  <footer>',
               '    Some text...',
               '  ',
@@ -71,7 +71,7 @@ sentryTest(
               '  </head>',
               '  <body>',
               '      <button id="inline-error-btn" onclick="throwTestError()">Click me</button>',
-              '  <script defer="" src="init.bundle.js"></script><script defer="" src="subject.bundle.js"></script>',
+              expect.stringContaining('contextlines.bundle.js'),
               '  <footer>',
             ],
           },
diff --git a/packages/integrations/src/contextlines.ts b/packages/integrations/src/contextlines.ts
index d643b946b86e..908e37a8413e 100644
--- a/packages/integrations/src/contextlines.ts
+++ b/packages/integrations/src/contextlines.ts
@@ -1,5 +1,5 @@
 import type { Event, EventProcessor, Hub, Integration, StackFrame } from '@sentry/types';
-import { addContextToFrame, GLOBAL_OBJ, snipLine, stripUrlQueryAndFragment } from '@sentry/utils';
+import { addContextToFrame, GLOBAL_OBJ, stripUrlQueryAndFragment } from '@sentry/utils';
 
 const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & Window;
 

From c73af827b098002388701507900c670dcc1ed5d3 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Wed, 2 Aug 2023 17:17:09 +0200
Subject: [PATCH 12/13] set name in constructor

---
 packages/integrations/src/contextlines.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/integrations/src/contextlines.ts b/packages/integrations/src/contextlines.ts
index 908e37a8413e..3bc483958b42 100644
--- a/packages/integrations/src/contextlines.ts
+++ b/packages/integrations/src/contextlines.ts
@@ -35,9 +35,11 @@ export class ContextLines implements Integration {
   /**
    * @inheritDoc
    */
-  public name: string = ContextLines.id;
+  public name: string;
 
-  public constructor(private readonly _options: ContextLinesOptions = {}) {}
+  public constructor(private readonly _options: ContextLinesOptions = {}) {
+    this.name = ContextLines.id;
+  }
 
   /**
    * @inheritDoc

From a5dc494b648a79593e723f2aa1e340c6ffc8312e Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Wed, 2 Aug 2023 18:37:37 +0200
Subject: [PATCH 13/13] fix tests now pls

---
 .../suites/integrations/ContextLines/inline/test.ts           | 2 +-
 .../suites/integrations/ContextLines/scriptTag/test.ts        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/browser-integration-tests/suites/integrations/ContextLines/inline/test.ts b/packages/browser-integration-tests/suites/integrations/ContextLines/inline/test.ts
index 1432583386b3..c1521bfe16ec 100644
--- a/packages/browser-integration-tests/suites/integrations/ContextLines/inline/test.ts
+++ b/packages/browser-integration-tests/suites/integrations/ContextLines/inline/test.ts
@@ -37,7 +37,7 @@ sentryTest(
             context_line:
               '      <button id="inline-error-btn" onclick="throw new Error(\'Error with context lines\')">Click me</button>',
             post_context: [
-              expect.stringContaining('contextlines.bundle.js'), // this line varies in the test based on tarball/cdn bundle (+variants)
+              expect.stringContaining('<script'), // this line varies in the test based on tarball/cdn bundle (+variants)
               '  <footer>',
               '    Some text...',
               '  ',
diff --git a/packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/test.ts b/packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/test.ts
index 49d4993a4bb4..f66208a87d4d 100644
--- a/packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/test.ts
+++ b/packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/test.ts
@@ -45,7 +45,7 @@ sentryTest(
             ],
             context_line: '      <button id="inline-error-btn" onclick="throwTestError()">Click me</button>',
             post_context: [
-              expect.stringContaining('contextlines.bundle.js'), // this line varies in the test based on tarball/cdn bundle (+variants)
+              expect.stringContaining('<script'), // this line varies in the test based on tarball/cdn bundle (+variants)
               '  <footer>',
               '    Some text...',
               '  ',
@@ -71,7 +71,7 @@ sentryTest(
               '  </head>',
               '  <body>',
               '      <button id="inline-error-btn" onclick="throwTestError()">Click me</button>',
-              expect.stringContaining('contextlines.bundle.js'),
+              expect.stringContaining('<script'), // this line varies in the test based on tarball/cdn bundle (+variants)
               '  <footer>',
             ],
           },