Merge branch 'main' into ci/migrate-to-craft-action

BYK · web-flow · commit cd8641b98a39 · 2026-01-15T13:08:16.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@
 
 - "You know what they say ‘Fool me once, strike one, but fool me twice… strike three.’" — Michael Scott
 
+## 4.6.2
+
+- fix(vite): Ensure sentryVitePlugin always returns an array of plugins ([#832](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/832))
+- fix(vite): Skip code injection for HTML facade chunks ([#830](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/830))
+- fix(rollup): Prevent double-injection of debug ID ([#827](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/827))
+- fix(esbuild): fix debug ID injection when moduleMetadata or applicationKey is set ([#828](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/828))
+
 ## 4.6.1
 
 - chore(deps): Update glob to 10.5.0 ([#823](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/823))
diff --git a/RELEASE.md b/RELEASE.md
@@ -0,0 +1,5 @@
+# Release Process
+
+1. Open a PR to update the changelog on `main`
+2. After the changelog PR is merged, go to the **Actions** tab and manually trigger the **"Prepare Release"** workflow, entering the version you want to release
+3. After the workflow completes, go to [getsentry/publish](https://github.com/getsentry/publish), find the corresponding issue created by the workflow, and add the `accepted` label to finalize the release
diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "npmClient": "yarn",
   "useWorkspaces": true
 }
diff --git a/packages/babel-plugin-component-annotate/package.json b/packages/babel-plugin-component-annotate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/babel-plugin-component-annotate",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "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",
@@ -56,8 +56,8 @@
     "@babel/preset-typescript": "7.17.12",
     "@rollup/plugin-babel": "5.3.1",
     "@rollup/plugin-node-resolve": "13.3.0",
-    "@sentry-internal/eslint-config": "4.6.1",
-    "@sentry-internal/sentry-bundler-plugin-tsconfig": "4.6.1",
+    "@sentry-internal/eslint-config": "4.6.2",
+    "@sentry-internal/sentry-bundler-plugin-tsconfig": "4.6.2",
     "@swc/core": "^1.2.205",
     "@swc/jest": "^0.2.21",
     "@types/jest": "^28.1.3",
diff --git a/packages/bundler-plugin-core/package.json b/packages/bundler-plugin-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/bundler-plugin-core",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "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",
@@ -53,7 +53,7 @@
   },
   "dependencies": {
     "@babel/core": "^7.18.5",
-    "@sentry/babel-plugin-component-annotate": "4.6.1",
+    "@sentry/babel-plugin-component-annotate": "4.6.2",
     "@sentry/cli": "^2.57.0",
     "dotenv": "^16.3.1",
     "find-up": "^5.0.0",
@@ -68,8 +68,8 @@
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "13.3.0",
     "@rollup/plugin-replace": "^4.0.0",
-    "@sentry-internal/eslint-config": "4.6.1",
-    "@sentry-internal/sentry-bundler-plugin-tsconfig": "4.6.1",
+    "@sentry-internal/eslint-config": "4.6.2",
+    "@sentry-internal/sentry-bundler-plugin-tsconfig": "4.6.2",
     "@sentry/core": "8.30.0",
     "@sentry/types": "8.30.0",
     "@sentry/utils": "8.30.0",
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/dev-utils",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "license": "MIT",
   "private": true,
   "files": [
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundler-plugin-e2e-tests",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "license": "MIT",
   "private": true,
   "scripts": {
@@ -15,15 +15,15 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "@sentry/esbuild-plugin": "4.6.1",
-    "@sentry/rollup-plugin": "4.6.1",
-    "@sentry/vite-plugin": "4.6.1",
-    "@sentry/webpack-plugin": "4.6.1",
+    "@sentry/esbuild-plugin": "4.6.2",
+    "@sentry/rollup-plugin": "4.6.2",
+    "@sentry/vite-plugin": "4.6.2",
+    "@sentry/webpack-plugin": "4.6.2",
     "axios": "^1.1.3"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config": "4.6.1",
-    "@sentry-internal/sentry-bundler-plugin-tsconfig": "4.6.1",
+    "@sentry-internal/eslint-config": "4.6.2",
+    "@sentry-internal/sentry-bundler-plugin-tsconfig": "4.6.2",
     "@swc/jest": "^0.2.21",
     "@types/axios": "^0.14.0",
     "@types/glob": "8.0.0",
diff --git a/packages/esbuild-plugin/package.json b/packages/esbuild-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/esbuild-plugin",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "description": "Official Sentry esbuild plugin",
   "repository": "git@github.com:getsentry/sentry-javascript-bundler-plugins.git",
   "homepage": "https://github.com/getsentry/sentry-javascript-bundler-plugins/tree/main/packages/esbuild-plugin",
@@ -48,7 +48,7 @@
     "prepack": "ts-node ./src/prepack.ts"
   },
   "dependencies": {
-    "@sentry/bundler-plugin-core": "4.6.1",
+    "@sentry/bundler-plugin-core": "4.6.2",
     "unplugin": "1.0.1",
     "uuid": "^9.0.0"
   },
@@ -58,8 +58,8 @@
     "@babel/preset-typescript": "7.17.12",
     "@rollup/plugin-babel": "5.3.1",
     "@rollup/plugin-node-resolve": "13.3.0",
-    "@sentry-internal/eslint-config": "4.6.1",
-    "@sentry-internal/sentry-bundler-plugin-tsconfig": "4.6.1",
+    "@sentry-internal/eslint-config": "4.6.2",
+    "@sentry-internal/sentry-bundler-plugin-tsconfig": "4.6.2",
     "@swc/core": "^1.2.205",
     "@swc/jest": "^0.2.21",
     "@types/jest": "^28.1.3",
diff --git a/packages/eslint-configs/package.json b/packages/eslint-configs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-config",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "license": "MIT",
   "private": true,
   "peerDependencies": {
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/integration-tests",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "license": "MIT",
   "private": true,
   "scripts": {
@@ -19,13 +19,13 @@
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
-    "@sentry-internal/eslint-config": "4.6.1",
-    "@sentry-internal/sentry-bundler-plugin-tsconfig": "4.6.1",
-    "@sentry/bundler-plugin-core": "4.6.1",
-    "@sentry/esbuild-plugin": "4.6.1",
-    "@sentry/rollup-plugin": "4.6.1",
-    "@sentry/vite-plugin": "4.6.1",
-    "@sentry/webpack-plugin": "4.6.1",
+    "@sentry-internal/eslint-config": "4.6.2",
+    "@sentry-internal/sentry-bundler-plugin-tsconfig": "4.6.2",
+    "@sentry/bundler-plugin-core": "4.6.2",
+    "@sentry/esbuild-plugin": "4.6.2",
+    "@sentry/rollup-plugin": "4.6.2",
+    "@sentry/vite-plugin": "4.6.2",
+    "@sentry/webpack-plugin": "4.6.2",
     "@swc/jest": "^0.2.21",
     "@types/jest": "^28.1.3",
     "@types/react": "^18.2.0",
diff --git a/packages/playground/package.json b/packages/playground/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundler-plugin-playground",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "license": "MIT",
   "private": true,
   "scripts": {
@@ -18,7 +18,7 @@
     "start:proxyLogger": "ts-node scripts/request-logger-proxy.ts"
   },
   "dependencies": {
-    "@sentry/bundler-plugin-core": "4.6.1",
+    "@sentry/bundler-plugin-core": "4.6.2",
     "@sentry/integrations": "7.50",
     "@sentry/node": "7.50",
     "@types/express": "^4.17.13",
diff --git a/packages/rollup-plugin/package.json b/packages/rollup-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/rollup-plugin",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "description": "Official Sentry Rollup plugin",
   "repository": "git://github.com/getsentry/sentry-javascript-bundler-plugins.git",
   "homepage": "https://github.com/getsentry/sentry-javascript-bundler-plugins/tree/main/packages/rollup-plugin",
@@ -49,7 +49,7 @@
     "prepack": "ts-node ./src/prepack.ts"
   },
   "dependencies": {
-    "@sentry/bundler-plugin-core": "4.6.1",
+    "@sentry/bundler-plugin-core": "4.6.2",
     "unplugin": "1.0.1"
   },
   "peerDependencies": {
@@ -61,8 +61,8 @@
     "@babel/preset-typescript": "7.17.12",
     "@rollup/plugin-babel": "5.3.1",
     "@rollup/plugin-node-resolve": "13.3.0",
-    "@sentry-internal/eslint-config": "4.6.1",
-    "@sentry-internal/sentry-bundler-plugin-tsconfig": "4.6.1",
+    "@sentry-internal/eslint-config": "4.6.2",
+    "@sentry-internal/sentry-bundler-plugin-tsconfig": "4.6.2",
     "@swc/core": "^1.2.205",
     "@swc/jest": "^0.2.21",
     "@types/jest": "^28.1.3",
diff --git a/packages/tsconfigs/package.json b/packages/tsconfigs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/sentry-bundler-plugin-tsconfig",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "license": "MIT",
   "private": true
 }
diff --git a/packages/vite-plugin/package.json b/packages/vite-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/vite-plugin",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "description": "Official Sentry Vite plugin",
   "repository": "git://github.com/getsentry/sentry-javascript-bundler-plugins.git",
   "homepage": "https://github.com/getsentry/sentry-javascript-bundler-plugins/tree/main/packages/vite-plugin",
@@ -48,7 +48,7 @@
     "prepack": "ts-node ./src/prepack.ts"
   },
   "dependencies": {
-    "@sentry/bundler-plugin-core": "4.6.1",
+    "@sentry/bundler-plugin-core": "4.6.2",
     "unplugin": "1.0.1"
   },
   "devDependencies": {
@@ -57,8 +57,8 @@
     "@babel/preset-typescript": "7.17.12",
     "@rollup/plugin-babel": "5.3.1",
     "@rollup/plugin-node-resolve": "13.3.0",
-    "@sentry-internal/eslint-config": "4.6.1",
-    "@sentry-internal/sentry-bundler-plugin-tsconfig": "4.6.1",
+    "@sentry-internal/eslint-config": "4.6.2",
+    "@sentry-internal/sentry-bundler-plugin-tsconfig": "4.6.2",
     "@swc/core": "^1.2.205",
     "@swc/jest": "^0.2.21",
     "@types/jest": "^28.1.3",
diff --git a/packages/vite-plugin/src/index.ts b/packages/vite-plugin/src/index.ts
@@ -73,7 +73,11 @@ const sentryUnplugin = sentryUnpluginFactory({
   bundleSizeOptimizationsPlugin: viteBundleSizeOptimizationsPlugin,
 });
 
-export const sentryVitePlugin: (options?: Options) => VitePlugin[] = sentryUnplugin.vite;
+export const sentryVitePlugin = (options?: Options): VitePlugin[] => {
+  const result = sentryUnplugin.vite(options);
+  // unplugin returns a single plugin instead of an array when only one plugin is created, so we normalize this here.
+  return Array.isArray(result) ? result : [result];
+};
 
 export type { Options as SentryVitePluginOptions } from "@sentry/bundler-plugin-core";
 export { sentryCliBinaryExists } from "@sentry/bundler-plugin-core";
diff --git a/packages/vite-plugin/test/public-api.test.ts b/packages/vite-plugin/test/public-api.test.ts
@@ -32,4 +32,17 @@ describe("sentryVitePlugin", () => {
       ])
     );
   });
+
+  it("returns an array of Vite pluginswhen unplugin returns a single plugin", () => {
+    const plugins = sentryVitePlugin({
+      authToken: "test-token",
+      org: "test-org",
+      project: "test-project",
+      disable: true, // This causes unplugin to return only the noop plugin
+    });
+
+    expect(Array.isArray(plugins)).toBe(true);
+    expect(plugins.length).toBeGreaterThanOrEqual(1);
+    expect(plugins[0]).toHaveProperty("name");
+  });
 });
diff --git a/packages/webpack-plugin/package.json b/packages/webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/webpack-plugin",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "description": "Official Sentry Webpack plugin",
   "repository": "git://github.com/getsentry/sentry-javascript-bundler-plugins.git",
   "homepage": "https://github.com/getsentry/sentry-javascript-bundler-plugins/tree/main/packages/webpack-plugin",
@@ -53,7 +53,7 @@
     "prepack": "ts-node ./src/prepack.ts"
   },
   "dependencies": {
-    "@sentry/bundler-plugin-core": "4.6.1",
+    "@sentry/bundler-plugin-core": "4.6.2",
     "unplugin": "1.0.1",
     "uuid": "^9.0.0"
   },
@@ -63,8 +63,8 @@
     "@babel/preset-typescript": "7.17.12",
     "@rollup/plugin-babel": "5.3.1",
     "@rollup/plugin-commonjs": "22.0.1",
-    "@sentry-internal/eslint-config": "4.6.1",
-    "@sentry-internal/sentry-bundler-plugin-tsconfig": "4.6.1",
+    "@sentry-internal/eslint-config": "4.6.2",
+    "@sentry-internal/sentry-bundler-plugin-tsconfig": "4.6.2",
     "@swc/core": "^1.2.205",
     "@swc/jest": "^0.2.21",
     "@types/jest": "^28.1.3",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "node_modules/lerna/schemas/lerna-schema.json",`
`3`		`- "version": "4.6.1",`
	`3`	`+ "version": "4.6.2",`
`4`	`4`	`"npmClient": "yarn",`
`5`	`5`	`"useWorkspaces": true`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@sentry-internal/dev-utils",`
`3`		`- "version": "4.6.1",`
	`3`	`+ "version": "4.6.2",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"private": true,`
`6`	`6`	`"files": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@sentry-internal/eslint-config",`
`3`		`- "version": "4.6.1",`
	`3`	`+ "version": "4.6.2",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"private": true,`
`6`	`6`	`"peerDependencies": {`