Merge branch 'main' into fix/747-esbuild-default-export-warning

Author: timfish

.github/workflows/checks.yml

@@ -190,44 +190,6 @@ jobs:
           path: packages
       - run: yarn test:integration-next
 
-  test-e2e:
-    # We only run E2E tests for non-fork PRs because the E2E tests require secrets to work and they can't be accessed from forks
-    # Dependabot PRs sadly also don't have access to secrets, so we skip them as well
-    if:
-      (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) &&
-      github.actor != 'dependabot[bot]' &&
-      false # Debug ID backend changes broke the E2E tests, we need to revisit them
-    needs: build
-    name: E2E Tests
-    runs-on: ubuntu-latest
-    env:
-      SENTRY_AUTH_TOKEN: ${{ secrets.E2E_TESTS_SENTRY_AUTH_TOKEN }}
-    steps:
-      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
-      - uses: volta-cli/action@007b1509d3ea9999dbba62ca34f4eb968363bb78 # v3
-      - name: Use dependency cache
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
-        id: dependency-cache
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}-${{ hashFiles('**/yarn.lock') }}
-      - name: Use build cache
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
-        with:
-          path: .nxcache
-          key: build-cache-key-${{ runner.os }}-${{ matrix.target }}-${{ matrix.jobIndex }}-${{ github.run_id }}
-          restore-keys: |
-            build-cache-key-${{ runner.os }}-${{ matrix.target }}-${{ matrix.jobIndex }}-
-      - name: Install dependencies
-        run: yarn --frozen-lockfile --ignore-engines
-        if: steps.dependency-cache.outputs.cache-hit != 'true'
-      - name: Download build artifacts
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
-        with:
-          name: dist-artifacts-${{ github.run_id }}
-          path: packages
-      - run: yarn test:e2e
-
   lint:
     needs: build
     name: Linter check

.oxfmtrc.json

@@ -3,9 +3,5 @@
   "printWidth": 100,
   "experimentalSortPackageJson": false,
   "trailingComma": "es5",
-  "ignorePatterns": [
-    "packages/e2e-tests/scenarios/*/ref/**/*",
-    "packages/bundler-plugin-core/test/fixtures",
-    ".nxcache"
-  ]
+  "ignorePatterns": ["packages/bundler-plugin-core/test/fixtures", ".nxcache"]
 }

CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+## 5.2.0
+
+### New Features ✨
+
+- (core) Pass `mapDir` to `rewriteSourcesHook` by @chargome in [#908](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/908)
+- Use `crypto.randomUUID` rather than `uuid` by @timfish in [#892](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/892)
+
+### Bug Fixes 🐛
+
+- (core) Conditionally add tracing headers by @chargome in [#907](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/907)
+- (e2e-tests) Pin axios to 1.13.5 to avoid compromised 1.14.1 by @andreiborza in [#906](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/906)
+- (rollup) Make rollup an optional peer dependency by @andreiborza in [#913](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/913)
+- Add missing webpack5 entrypoint in webpack-plugin by @brunodccarvalho in [#905](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/905)
+
+### Internal Changes 🔧
+
+- (deps) Bump vulnerable webpack version by @chargome in [#909](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/909)
+- (tests) Use deterministic debugids by @chargome in [#912](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/912)
+- Add esbuild integration tests by @timfish in [#911](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/911)
+- Vite integration tests by @timfish in [#899](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/899)
+- Webpack integration tests by @timfish in [#904](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/904)
+- Isolate integration test package installs by @timfish in [#902](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/902)
+- Pin GitHub Actions to full-length commit SHAs by @joshuarli in [#900](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/900)
+- Rollup integration tests by @timfish in [#897](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/897)
+- New integration tests by @timfish in [#896](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/896)
+- Remove lerna by @timfish in [#895](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/895)
+- Migrate to Vitest by @timfish in [#894](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/894)
+
 ## 5.1.1
 
 ### Bug Fixes 🐛

package.json

@@ -9,7 +9,6 @@
     "packages/babel-plugin-component-annotate",
     "packages/bundler-plugin-core",
     "packages/dev-utils",
-    "packages/e2e-tests",
     "packages/esbuild-plugin",
     "packages/eslint-configs",
     "packages/integration-tests",
@@ -28,12 +27,10 @@
     "check:types": "nx run-many --target=check:types --all",
     "clean": "nx run-many --target=clean --all",
     "clean:all": "nx run-many --target=clean:all --all && yarn",
-    "test": "nx run-many --target=test --all --exclude=@sentry-internal/bundler-plugin-e2e-tests",
-    "test:all": "nx run-many --target=test --all",
-    "test:unit": "nx run-many --target=test --all --exclude=@sentry-internal/integration-tests,@sentry-internal/integration-tests-next,@sentry-internal/bundler-plugin-e2e-tests",
+    "test": "nx run-many --target=test --all",
+    "test:unit": "nx run-many --target=test --all --exclude=@sentry-internal/integration-tests,@sentry-internal/integration-tests-next",
     "test:integration": "nx run @sentry-internal/integration-tests:test",
     "test:integration-next": "nx run @sentry-internal/integration-tests-next:test",
-    "test:e2e": "nx run @sentry-internal/bundler-plugin-e2e-tests:test",
     "lint": "nx run-many --target=lint --all",
     "check:formatting": "oxfmt --check .",
     "fix:formatting": "oxfmt ."

packages/babel-plugin-component-annotate/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/babel-plugin-component-annotate",
-  "version": "5.1.1",
+  "version": "5.2.0",
   "description": "A Babel plugin that annotates frontend components with additional data to enrich the experience in Sentry",
   "repository": "git://github.com/getsentry/sentry-javascript-bundler-plugins.git",
   "homepage": "https://github.com/getsentry/sentry-javascript-bundler-plugins/tree/main/packages/babel-plugin-component-annotate",
@@ -52,13 +52,13 @@
   "devDependencies": {
     "@babel/core": "7.18.5",
     "@babel/preset-react": "^7.23.3",
-    "@sentry-internal/eslint-config": "5.1.1",
-    "@sentry-internal/sentry-bundler-plugin-tsconfig": "5.1.1",
+    "@sentry-internal/eslint-config": "5.2.0",
+    "@sentry-internal/sentry-bundler-plugin-tsconfig": "5.2.0",
     "@types/node": "^18.6.3",
     "eslint": "^8.18.0",
     "vitest": "^4.0.0",
     "premove": "^4.0.0",
-    "rolldown": "^1.0.0-rc.6",
+    "rolldown": "1.0.0-rc.10",
     "ts-node": "^10.9.1",
     "typescript": "^4.7.4"
   },

packages/bundler-plugin-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/bundler-plugin-core",
-  "version": "5.1.1",
+  "version": "5.2.0",
   "description": "Sentry Bundler Plugin Core",
   "repository": "git://github.com/getsentry/sentry-javascript-bundler-plugins.git",
   "homepage": "https://github.com/getsentry/sentry-javascript-bundler-plugins/tree/main/packages/bundler-plugin-core",
@@ -55,24 +55,24 @@
   },
   "dependencies": {
     "@babel/core": "^7.18.5",
-    "@sentry/babel-plugin-component-annotate": "5.1.1",
+    "@sentry/babel-plugin-component-annotate": "5.2.0",
     "@sentry/cli": "^2.58.5",
     "dotenv": "^16.3.1",
     "find-up": "^5.0.0",
     "glob": "^13.0.6",
     "magic-string": "~0.30.8"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config": "5.1.1",
-    "@sentry-internal/sentry-bundler-plugin-tsconfig": "5.1.1",
+    "@sentry-internal/eslint-config": "5.2.0",
+    "@sentry-internal/sentry-bundler-plugin-tsconfig": "5.2.0",
     "@sentry/core": "8.30.0",
     "@sentry/types": "8.30.0",
     "@sentry/utils": "8.30.0",
     "@types/node": "^18.6.3",
     "eslint": "^8.18.0",
     "vitest": "^4.0.0",
     "premove": "^4.0.0",
-    "rolldown": "^1.0.0-rc.6",
+    "rolldown": "1.0.0-rc.10",
     "typescript": "^4.7.4"
   },
   "volta": {

packages/bundler-plugin-core/src/build-plugin-manager.ts

@@ -117,7 +117,7 @@ function createCliInstance(options: NormalizedOptions): SentryCli {
     url: options.url,
     vcsRemote: options.release.vcsRemote,
     headers: {
-      ...getTraceData(),
+      ...(options.telemetry ? getTraceData() : {}),
       ...options.headers,
     },
   });

packages/bundler-plugin-core/src/debug-id-upload.ts

@@ -219,7 +219,10 @@ async function prepareSourceMapForDebugIdUpload(
   }
 
   if (map["sources"] && Array.isArray(map["sources"])) {
-    map["sources"] = map["sources"].map((source: string) => rewriteSourcesHook(source, map));
+    const mapDir = path.dirname(sourceMapPath);
+    map["sources"] = map["sources"].map((source: string) =>
+      rewriteSourcesHook(source, map, { mapDir })
+    );
   }
 
   try {

packages/bundler-plugin-core/src/types.ts

@@ -138,6 +138,9 @@ export interface Options {
     /**
      * Hook to rewrite the `sources` field inside the source map before being uploaded to Sentry. Does not modify the actual source map.
      *
+     * The hook receives the source path, the parsed source map object, and a context object containing `mapDir` -
+     * the directory of the source map file, useful for resolving relative source paths.
+     *
      * Defaults to making all sources relative to `process.cwd()` while building.
      */
     rewriteSources?: RewriteSourcesHook;
@@ -427,7 +430,7 @@ export interface Options {
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type RewriteSourcesHook = (source: string, map: any) => string;
+export type RewriteSourcesHook = (source: string, map: any, context?: { mapDir: string }) => string;
 
 export type ResolveSourceMapHook = (
   artifactPath: string,

packages/bundler-plugin-core/test/build-plugin-manager.test.ts

@@ -7,14 +7,19 @@ import { globFiles } from "../src/glob";
 import { prepareBundleForDebugIdUpload } from "../src/debug-id-upload";
 import { describe, it, expect, afterEach, beforeEach, vi, MockedFunction } from "vitest";
 
-const { mockCliExecute, mockCliUploadSourceMaps, mockCliNewDeploy } = vi.hoisted(() => ({
-  mockCliExecute: vi.fn(),
-  mockCliUploadSourceMaps: vi.fn(),
-  mockCliNewDeploy: vi.fn(),
-}));
+const { mockCliExecute, mockCliUploadSourceMaps, mockCliNewDeploy, mockCliConstructor } =
+  vi.hoisted(() => ({
+    mockCliExecute: vi.fn(),
+    mockCliUploadSourceMaps: vi.fn(),
+    mockCliNewDeploy: vi.fn(),
+    mockCliConstructor: vi.fn(),
+  }));
 
 vi.mock("@sentry/cli", () => ({
   default: class {
+    constructor(...args: unknown[]) {
+      mockCliConstructor(...args);
+    }
     execute = mockCliExecute;
     releases = {
       uploadSourceMaps: mockCliUploadSourceMaps,
@@ -640,6 +645,41 @@ describe("createSentryBuildPluginManager", () => {
     });
   });
 
+  describe("telemetry option", () => {
+    it("should not pass sentry-trace or baggage headers to CLI when telemetry is false", async () => {
+      mockCliExecute.mockResolvedValue(undefined);
+
+      const buildPluginManager = createSentryBuildPluginManager(
+        {
+          authToken: "test-token",
+          org: "test-org",
+          project: "test-project",
+          telemetry: false,
+        },
+        {
+          buildTool: "webpack",
+          loggerPrefix: "[sentry-webpack-plugin]",
+        }
+      );
+
+      // Trigger a CLI operation so createCliInstance is called
+      await buildPluginManager.injectDebugIds(["/path/to/bundle"]);
+
+      // Find the CLI constructor call that was made by createCliInstance (not the one from allowedToSendTelemetry)
+      const cliConstructorCalls = mockCliConstructor.mock.calls;
+      expect(cliConstructorCalls.length).toBeGreaterThan(0);
+
+      // Check that none of the CLI instances were created with sentry-trace or baggage headers
+      for (const call of cliConstructorCalls) {
+        const options = call[1] as { headers?: Record<string, string> };
+        if (options?.headers) {
+          expect(options.headers).not.toHaveProperty("sentry-trace");
+          expect(options.headers).not.toHaveProperty("baggage");
+        }
+      }
+    });
+  });
+
   describe("createRelease deploy deduplication", () => {
     beforeEach(() => {
       vi.clearAllMocks();