Fix Windows by patching the Sentry CLI instead

timfish · timfish · commit d7f679409744 · 2026-03-01T15:31:41.000+01:00
diff --git a/package.json b/package.json
@@ -22,6 +22,7 @@
     "packages/integration-tests-next/fixtures/rolldown"
   ],
   "scripts": {
+    "postinstall": "patch-package",
     "build": "nx run-many --target=build --all",
     "build:watch": "nx run-many --target=build:watch --all",
     "build:graph": "nx graph",
@@ -44,7 +45,8 @@
     "npm-run-all": "^4.1.5",
     "nx": "22.5.2",
     "oxfmt": "^0.33.0",
-    "ts-node": "^10.9.2"
+    "ts-node": "^10.9.2",
+    "patch-package": "^8.0.1"
   },
   "volta": {
     "node": "22.22.0",
diff --git a/packages/integration-tests-next/fixtures/rolldown/application-key.test.ts b/packages/integration-tests-next/fixtures/rolldown/application-key.test.ts
@@ -5,7 +5,7 @@ import { test, getEmptyOutputDir, runRolldown } from "./utils";
 const outputDir = getEmptyOutputDir(import.meta.url, "application-key");
 
 test("Application key injection", () => {
-  runRolldown("application-key");
+  runRolldown("application-key", outputDir);
   const files = readAllFiles(outputDir);
   expect(files).toMatchInlineSnapshot(`
       {
diff --git a/packages/integration-tests-next/fixtures/rolldown/basic-release-disabled.test.ts b/packages/integration-tests-next/fixtures/rolldown/basic-release-disabled.test.ts
@@ -5,7 +5,7 @@ import { test, getEmptyOutputDir, runRolldown } from "./utils";
 const outputDir = getEmptyOutputDir(import.meta.url, "basic-release-disabled");
 
 test("Release injection disabled", () => {
-  runRolldown("basic-release-disabled");
+  runRolldown("basic-release-disabled", outputDir);
   const files = readAllFiles(outputDir);
   expect(files).toMatchInlineSnapshot(`
       {
diff --git a/packages/integration-tests-next/fixtures/rolldown/basic-sourcemaps.test.ts b/packages/integration-tests-next/fixtures/rolldown/basic-sourcemaps.test.ts
@@ -5,7 +5,7 @@ import { test, getEmptyOutputDir, runRolldown } from "./utils";
 const outputDir = getEmptyOutputDir(import.meta.url, "basic-sourcemaps");
 
 test("Basic with sourcemaps", () => {
-  runRolldown("basic-sourcemaps");
+  runRolldown("basic-sourcemaps", outputDir);
   const files = readAllFiles(outputDir);
   expect(files).toMatchInlineSnapshot(`
     {
diff --git a/packages/integration-tests-next/fixtures/rolldown/basic.test.ts b/packages/integration-tests-next/fixtures/rolldown/basic.test.ts
@@ -5,7 +5,7 @@ import { test, getEmptyOutputDir, runRolldown } from "./utils";
 const outputDir = getEmptyOutputDir(import.meta.url, "basic");
 
 test("Basic", () => {
-  runRolldown("basic");
+  runRolldown("basic", outputDir);
   const files = readAllFiles(outputDir);
   expect(files).toMatchInlineSnapshot(`
     {
diff --git a/packages/integration-tests-next/fixtures/rolldown/component-annotation-disabled.test.ts b/packages/integration-tests-next/fixtures/rolldown/component-annotation-disabled.test.ts
@@ -5,7 +5,7 @@ import { test, getEmptyOutputDir, runRolldown } from "./utils";
 const outputDir = getEmptyOutputDir(import.meta.url, "component-annotation-disabled");
 
 test("Component annotation disabled", () => {
-  runRolldown("component-annotation-disabled");
+  runRolldown("component-annotation-disabled", outputDir);
   const files = readAllFiles(outputDir);
   expect(files).toMatchInlineSnapshot(`
       {
diff --git a/packages/integration-tests-next/fixtures/rolldown/component-annotation-next.test.ts b/packages/integration-tests-next/fixtures/rolldown/component-annotation-next.test.ts
@@ -5,7 +5,7 @@ import { test, getEmptyOutputDir, runRolldown } from "./utils";
 const outputDir = getEmptyOutputDir(import.meta.url, "component-annotation-next");
 
 test("Component annotation experimental", () => {
-  runRolldown("component-annotation-next");
+  runRolldown("component-annotation-next", outputDir);
   const files = readAllFiles(outputDir);
   expect(files).toMatchInlineSnapshot(`
       {
diff --git a/packages/integration-tests-next/fixtures/rolldown/component-annotation.test.ts b/packages/integration-tests-next/fixtures/rolldown/component-annotation.test.ts
@@ -5,7 +5,7 @@ import { test, getEmptyOutputDir, runRolldown } from "./utils";
 const outputDir = getEmptyOutputDir(import.meta.url, "component-annotation");
 
 test("Component annotation", () => {
-  runRolldown("component-annotation");
+  runRolldown("component-annotation", outputDir);
   const files = readAllFiles(outputDir);
   expect(files).toMatchInlineSnapshot(`
       {
diff --git a/packages/integration-tests-next/fixtures/rolldown/debugid-disabled.test.ts b/packages/integration-tests-next/fixtures/rolldown/debugid-disabled.test.ts
@@ -5,7 +5,7 @@ import { test, getEmptyOutputDir, runRolldown } from "./utils";
 const outputDir = getEmptyOutputDir(import.meta.url, "debugid-disabled");
 
 test("Debug ID injection disabled", () => {
-  runRolldown("debugid-disabled");
+  runRolldown("debugid-disabled", outputDir);
   const files = readAllFiles(outputDir);
   expect(files).toMatchInlineSnapshot(`
       {
diff --git a/packages/integration-tests-next/fixtures/rolldown/debugids-already-injected.test.ts b/packages/integration-tests-next/fixtures/rolldown/debugids-already-injected.test.ts
@@ -23,7 +23,7 @@ process.on("exit", () => {
 test("Debug IDs already injected", () => {
   const tempDir = createTempDir();
 
-  runRolldown("debugids-already-injected", { SENTRY_TEST_OVERRIDE_TEMP_DIR: tempDir });
+  runRolldown("debugids-already-injected", undefined, { SENTRY_TEST_OVERRIDE_TEMP_DIR: tempDir });
   const files = readAllFiles(tempDir);
   expect(files).toMatchInlineSnapshot(`
       {
diff --git a/packages/integration-tests-next/fixtures/rolldown/module-metadata.test.ts b/packages/integration-tests-next/fixtures/rolldown/module-metadata.test.ts
@@ -5,7 +5,7 @@ import { test, getEmptyOutputDir, runRolldown } from "./utils";
 const outputDir = getEmptyOutputDir(import.meta.url, "module-metadata");
 
 test("Module metadata injection", () => {
-  runRolldown("module-metadata");
+  runRolldown("module-metadata", outputDir);
   const files = readAllFiles(outputDir);
   expect(files).toMatchInlineSnapshot(`
       {
diff --git a/packages/integration-tests-next/fixtures/rolldown/multiple-entry-points.test.ts b/packages/integration-tests-next/fixtures/rolldown/multiple-entry-points.test.ts
@@ -5,7 +5,7 @@ import { test, getEmptyOutputDir, runRolldown } from "./utils";
 const outputDir = getEmptyOutputDir(import.meta.url, "multiple-entry-points");
 
 test("Multiple entry points", () => {
-  runRolldown("multiple-entry-points");
+  runRolldown("multiple-entry-points", outputDir);
   const files = readAllFiles(outputDir);
   expect(files).toMatchInlineSnapshot(`
       {
diff --git a/packages/integration-tests-next/fixtures/rolldown/release-disabled.test.ts b/packages/integration-tests-next/fixtures/rolldown/release-disabled.test.ts
@@ -5,7 +5,7 @@ import { test, getEmptyOutputDir, runRolldown } from "./utils";
 const outputDir = getEmptyOutputDir(import.meta.url, "release-disabled");
 
 test("Basic", () => {
-  runRolldown("release-disabled");
+  runRolldown("release-disabled", outputDir);
   const files = readAllFiles(outputDir);
   expect(files).toMatchInlineSnapshot(`
     {
diff --git a/packages/integration-tests-next/fixtures/rolldown/utils.ts b/packages/integration-tests-next/fixtures/rolldown/utils.ts
@@ -17,8 +17,12 @@ export function test(name: string, callback: () => void) {
   }
 }
 
-export function runRolldown(name: string, env: Record<string, string | undefined> = {}): void {
-  runBundler(`rolldown --config ${name}.config.ts`, cwd, {
+export function runRolldown(
+  name: string,
+  outdir?: string,
+  env: Record<string, string | undefined> = {}
+): void {
+  runBundler(`rolldown --config ${name}.config.ts`, cwd, outdir, {
     ...process.env,
     ...env,
     INTEGRATION_TEST_NAME: name,
diff --git a/packages/integration-tests-next/fixtures/utils.ts b/packages/integration-tests-next/fixtures/utils.ts
@@ -13,10 +13,13 @@ type SourceMap = {
 export function runBundler(
   command: string,
   cwd: string,
+  outDir: string | undefined,
   env: Record<string, string | undefined>
 ): void {
-  // Override the Sentry CLI binary path to use our mock, which allows us to capture the arguments it was called with for testing
-  env["SENTRY_BINARY_PATH"] = join(cwd, "../../../..", "node_modules", ".bin", "sentry-cli-mock");
+  if (outDir) {
+    // We've patched the sentry-cli helper to write the args to a file instead of actually executing the command
+    env["SENTRY_CLI_FILE_APPEND"] = join(outDir, "sentry-cli-mock.json");
+  }
 
   execSync(command, { cwd, stdio: DEBUG ? "inherit" : "ignore", env });
 }
diff --git a/packages/integration-tests-next/package.json b/packages/integration-tests-next/package.json
@@ -24,9 +24,6 @@
     "premove": "^4.0.0",
     "vitest": "^4.0.0"
   },
-  "bin": {
-    "sentry-cli-mock": "./sentry-cli-mock.js"
-  },
   "volta": {
     "extends": "../../package.json"
   }
diff --git a/packages/integration-tests-next/sentry-cli-mock.js b/packages/integration-tests-next/sentry-cli-mock.js
diff --git a/patches/@sentry+cli+2.58.5.patch b/patches/@sentry+cli+2.58.5.patch
@@ -0,0 +1,17 @@
+diff --git a/node_modules/@sentry/cli/js/helper.js b/node_modules/@sentry/cli/js/helper.js
+index 56f95c9..c70f216 100644
+--- a/node_modules/@sentry/cli/js/helper.js
++++ b/node_modules/@sentry/cli/js/helper.js
+@@ -298,6 +298,12 @@ function execute(args_1, live_1, silent_1, configFile_1) {
+         if (config.customHeader) {
+             env.CUSTOM_HEADER = config.customHeader;
+         }
++
++        if (process.env['SENTRY_CLI_FILE_APPEND']) {
++            fs.appendFileSync(process.env['SENTRY_CLI_FILE_APPEND'], JSON.stringify(args) + ',\n');
++            return Promise.resolve();
++        }
++
+         else if (config.headers) {
+             const headers = Object.entries(config.headers).flatMap(([key, value]) => [
+                 '--header',
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import { test, getEmptyOutputDir, runRolldown } from "./utils";`
`5`	`5`	`const outputDir = getEmptyOutputDir(import.meta.url, "application-key");`
`6`	`6`
`7`	`7`	`test("Application key injection", () => {`
`8`		`- runRolldown("application-key");`
	`8`	`+ runRolldown("application-key", outputDir);`
`9`	`9`	`const files = readAllFiles(outputDir);`
`10`	`10`	expect(files).toMatchInlineSnapshot(`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import { test, getEmptyOutputDir, runRolldown } from "./utils";`
`5`	`5`	`const outputDir = getEmptyOutputDir(import.meta.url, "basic-release-disabled");`
`6`	`6`
`7`	`7`	`test("Release injection disabled", () => {`
`8`		`- runRolldown("basic-release-disabled");`
	`8`	`+ runRolldown("basic-release-disabled", outputDir);`
`9`	`9`	`const files = readAllFiles(outputDir);`
`10`	`10`	expect(files).toMatchInlineSnapshot(`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import { test, getEmptyOutputDir, runRolldown } from "./utils";`
`5`	`5`	`const outputDir = getEmptyOutputDir(import.meta.url, "basic-sourcemaps");`
`6`	`6`
`7`	`7`	`test("Basic with sourcemaps", () => {`
`8`		`- runRolldown("basic-sourcemaps");`
	`8`	`+ runRolldown("basic-sourcemaps", outputDir);`
`9`	`9`	`const files = readAllFiles(outputDir);`
`10`	`10`	expect(files).toMatchInlineSnapshot(`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import { test, getEmptyOutputDir, runRolldown } from "./utils";`
`5`	`5`	`const outputDir = getEmptyOutputDir(import.meta.url, "basic");`
`6`	`6`
`7`	`7`	`test("Basic", () => {`
`8`		`- runRolldown("basic");`
	`8`	`+ runRolldown("basic", outputDir);`
`9`	`9`	`const files = readAllFiles(outputDir);`
`10`	`10`	expect(files).toMatchInlineSnapshot(`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import { test, getEmptyOutputDir, runRolldown } from "./utils";`
`5`	`5`	`const outputDir = getEmptyOutputDir(import.meta.url, "component-annotation-disabled");`
`6`	`6`
`7`	`7`	`test("Component annotation disabled", () => {`
`8`		`- runRolldown("component-annotation-disabled");`
	`8`	`+ runRolldown("component-annotation-disabled", outputDir);`
`9`	`9`	`const files = readAllFiles(outputDir);`
`10`	`10`	expect(files).toMatchInlineSnapshot(`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import { test, getEmptyOutputDir, runRolldown } from "./utils";`
`5`	`5`	`const outputDir = getEmptyOutputDir(import.meta.url, "component-annotation-next");`
`6`	`6`
`7`	`7`	`test("Component annotation experimental", () => {`
`8`		`- runRolldown("component-annotation-next");`
	`8`	`+ runRolldown("component-annotation-next", outputDir);`
`9`	`9`	`const files = readAllFiles(outputDir);`
`10`	`10`	expect(files).toMatchInlineSnapshot(`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import { test, getEmptyOutputDir, runRolldown } from "./utils";`
`5`	`5`	`const outputDir = getEmptyOutputDir(import.meta.url, "component-annotation");`
`6`	`6`
`7`	`7`	`test("Component annotation", () => {`
`8`		`- runRolldown("component-annotation");`
	`8`	`+ runRolldown("component-annotation", outputDir);`
`9`	`9`	`const files = readAllFiles(outputDir);`
`10`	`10`	expect(files).toMatchInlineSnapshot(`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import { test, getEmptyOutputDir, runRolldown } from "./utils";`
`5`	`5`	`const outputDir = getEmptyOutputDir(import.meta.url, "debugid-disabled");`
`6`	`6`
`7`	`7`	`test("Debug ID injection disabled", () => {`
`8`		`- runRolldown("debugid-disabled");`
	`8`	`+ runRolldown("debugid-disabled", outputDir);`
`9`	`9`	`const files = readAllFiles(outputDir);`
`10`	`10`	expect(files).toMatchInlineSnapshot(`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ process.on("exit", () => {`
`23`	`23`	`test("Debug IDs already injected", () => {`
`24`	`24`	`const tempDir = createTempDir();`
`25`	`25`
`26`		`- runRolldown("debugids-already-injected", { SENTRY_TEST_OVERRIDE_TEMP_DIR: tempDir });`
	`26`	`+ runRolldown("debugids-already-injected", undefined, { SENTRY_TEST_OVERRIDE_TEMP_DIR: tempDir });`
`27`	`27`	`const files = readAllFiles(tempDir);`
`28`	`28`	expect(files).toMatchInlineSnapshot(`
`29`	`29`	`{`