From 536dd140b749425d41d25de6b10c4cbf75899b4d Mon Sep 17 00:00:00 2001 From: Charly Gomez Date: Mon, 20 Jan 2025 13:37:19 +0100 Subject: [PATCH 1/3] update ci labels for remix integration tests --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4e12ea57656..995dfcea8a84 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -747,7 +747,7 @@ jobs: run: yarn test job_remix_integration_tests: - name: Remix v${{ matrix.remix }} (Node ${{ matrix.node }}) Tests + name: Remix v2 (Node ${{ matrix.node }}) Tests needs: [job_get_metadata, job_build] if: needs.job_build.outputs.changed_remix == 'true' || github.event_name != 'pull_request' runs-on: ubuntu-20.04 From 256d8ed59bfeb92e6c906ca849468342791b811c Mon Sep 17 00:00:00 2001 From: Charly Gomez Date: Mon, 20 Jan 2025 13:41:55 +0100 Subject: [PATCH 2/3] Update .github/workflows/build.yml Co-authored-by: Francesco Gringl-Novy --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 995dfcea8a84..24f3ee0454f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -747,7 +747,7 @@ jobs: run: yarn test job_remix_integration_tests: - name: Remix v2 (Node ${{ matrix.node }}) Tests + name: Remix (Node ${{ matrix.node }}) Tests needs: [job_get_metadata, job_build] if: needs.job_build.outputs.changed_remix == 'true' || github.event_name != 'pull_request' runs-on: ubuntu-20.04 From 918464b4b038d12c4535a0da734ed241ce9c9561 Mon Sep 17 00:00:00 2001 From: Charly Gomez Date: Mon, 20 Jan 2025 13:48:33 +0100 Subject: [PATCH 3/3] update client params --- packages/remix/src/index.client.tsx | 7 +------ packages/remix/src/index.types.ts | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/packages/remix/src/index.client.tsx b/packages/remix/src/index.client.tsx index 846366c1d73c..3f6d14294978 100644 --- a/packages/remix/src/index.client.tsx +++ b/packages/remix/src/index.client.tsx @@ -15,12 +15,7 @@ export * from '@sentry/react'; // function signature is the same as in the server SDK. // See issue: https://github.com/getsentry/sentry-javascript/issues/9594 /* eslint-disable @typescript-eslint/no-unused-vars */ -export async function captureRemixServerException( - err: unknown, - name: string, - request: Request, - isRemixV2?: boolean, -): Promise { +export async function captureRemixServerException(err: unknown, name: string, request: Request): Promise { DEBUG_BUILD && logger.warn( '`captureRemixServerException` is a server-only function and should not be called in the browser. ' + diff --git a/packages/remix/src/index.types.ts b/packages/remix/src/index.types.ts index 18f2c4f90298..27325bbe621f 100644 --- a/packages/remix/src/index.types.ts +++ b/packages/remix/src/index.types.ts @@ -18,12 +18,7 @@ export declare const contextLinesIntegration: typeof clientSdk.contextLinesInteg export declare const getDefaultIntegrations: (options: Options) => Integration[]; export declare const defaultStackParser: StackParser; -export declare function captureRemixServerException( - err: unknown, - name: string, - request: Request, - isRemixV2?: boolean, -): Promise; +export declare function captureRemixServerException(err: unknown, name: string, request: Request): Promise; // This variable is not a runtime variable but just a type to tell typescript that the methods below can either come // from the client SDK or from the server SDK. TypeScript is smart enough to understand that these resolve to the same