Merge branch 'main' into cg-vite-type

Author: chargome

.gitignore

@@ -7,4 +7,6 @@ yarn-error.log
 *.tgz
 
 .nxcache
-packages/**/yarn.lock
+packages/**/yarn.lock
+
+.DS_Store

CHANGELOG.md

@@ -4,7 +4,14 @@
 
 - "You know what they say ‘Fool me once, strike one, but fool me twice… strike three.’" — Michael Scott
 
-Work in this release was contributed by @thecodewarrior. Thank you for your contribution!
+## 3.6.1
+
+- fix(core): Observe and handle Sentry CLI sourcemap upload failures ([#763](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/763))
+
+## 3.6.0
+
+- feat(core): Don't add `debugIdUploadPlugin` when sourcemaps option is disabled ([#753](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/753))
+- fix(core): Avoid showing success message if upload was disabled or nothing was uploaded ([#757](https://github.com/getsentry/sentry-javascript-bundler-plugins/pull/757))
 
 ## 3.5.0
 

CONTRIBUTING.md

@@ -81,10 +81,10 @@ _These steps are only relevant to Sentry employees when preparing and publishing
 ### Updating the Changelog
 
 1. Create a new branch.
-2. Run `git log --format="- %s"` and copy everything since the last release.
+2. Run `yarn changelog` and copy all commits in the list.
 3. Create a new section in the changelog, deciding based on the changes whether it should be a minor bump or a patch release.
-4. Paste in the logs you copied earlier.
+4. Paste in the commits you copied earlier.
 5. Delete any which aren't user-facing changes.
 6. Alphabetize the rest.
 7. If any of the PRs are from external contributors, include underneath the commits `Work in this release contributed by <list of external contributors' GitHub usernames>. Thank you for your contributions!`. If there's only one external PR, don't forget to remove the final `s`. If there are three or more, use an Oxford comma. (It's in the Sentry styleguide!)
-8. Commit, push, and open a PR with the title `meta: Update changelog for <fill in relevant version here>`.
+8. Commit, push, and open a PR against `main` with the title `meta: Update changelog for <fill in relevant version here>`.

lerna.json

@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.5.0",
+  "version": "3.6.1",
   "npmClient": "yarn",
   "useWorkspaces": true
 }

package.json

@@ -37,7 +37,7 @@
     "ts-node": "^10.9.2"
   },
   "volta": {
-    "node": "14.21.2",
+    "node": "18.20.8",
     "yarn": "1.22.19"
   }
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/babel-plugin-component-annotate",
-  "version": "3.5.0",
+  "version": "3.6.1",
   "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": "3.5.0",
-    "@sentry-internal/sentry-bundler-plugin-tsconfig": "3.5.0",
+    "@sentry-internal/eslint-config": "3.6.1",
+    "@sentry-internal/sentry-bundler-plugin-tsconfig": "3.6.1",
     "@swc/core": "^1.2.205",
     "@swc/jest": "^0.2.21",
     "@types/jest": "^28.1.3",

packages/bundler-plugin-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/bundler-plugin-core",
-  "version": "3.5.0",
+  "version": "3.6.1",
   "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,8 +53,8 @@
   },
   "dependencies": {
     "@babel/core": "^7.18.5",
-    "@sentry/babel-plugin-component-annotate": "^3.5.0",
-    "@sentry/cli": "^2.46.0",
+    "@sentry/babel-plugin-component-annotate": "3.6.1",
+    "@sentry/cli": "^2.49.0",
     "dotenv": "^16.3.1",
     "find-up": "^5.0.0",
     "glob": "^9.3.2",
@@ -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": "3.5.0",
-    "@sentry-internal/sentry-bundler-plugin-tsconfig": "3.5.0",
+    "@sentry-internal/eslint-config": "3.6.1",
+    "@sentry-internal/sentry-bundler-plugin-tsconfig": "3.6.1",
     "@sentry/core": "8.30.0",
     "@sentry/types": "8.30.0",
     "@sentry/utils": "8.30.0",

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

@@ -455,6 +455,9 @@ export function createSentryBuildPluginManager(
           await cliInstance.releases.uploadSourceMaps(options.release.name, {
             include: normalizedInclude,
             dist: options.release.dist,
+            // We want this promise to throw if the sourcemaps fail to upload so that we know about it.
+            // see: https://github.com/getsentry/sentry-cli/pull/2605
+            live: "rejectOnError",
           });
         }
 
@@ -503,27 +506,8 @@ export function createSentryBuildPluginManager(
      * Uploads sourcemaps using the "Debug ID" method. This function takes a list of build artifact paths that will be uploaded
      */
     async uploadSourcemaps(buildArtifactPaths: string[]) {
-      if (options.sourcemaps?.disable) {
-        logger.debug(
-          "Source map upload was disabled. Will not upload sourcemaps using debug ID process."
-        );
-      } else if (isDevMode) {
-        logger.debug("Running in development mode. Will not upload sourcemaps.");
-      } else if (!options.authToken) {
-        logger.warn(
-          "No auth token provided. Will not upload source maps. Please set the `authToken` option. You can find information on how to generate a Sentry auth token here: https://docs.sentry.io/api/auth/" +
-            getTurborepoEnvPassthroughWarning("SENTRY_AUTH_TOKEN")
-        );
-      } else if (!options.org && !options.authToken.startsWith("sntrys_")) {
-        logger.warn(
-          "No org provided. Will not upload source maps. Please set the `org` option to your Sentry organization slug." +
-            getTurborepoEnvPassthroughWarning("SENTRY_ORG")
-        );
-      } else if (!options.project) {
-        logger.warn(
-          "No project provided. Will not upload source maps. Please set the `project` option to your Sentry project slug." +
-            getTurborepoEnvPassthroughWarning("SENTRY_PROJECT")
-        );
+      if (!canUploadSourceMaps(options, logger, isDevMode)) {
+        return;
       }
 
       await startSpan(
@@ -589,7 +573,7 @@ export function createSentryBuildPluginManager(
                 "Didn't find any matching sources for debug ID upload. Please check the `sourcemaps.assets` option."
               );
             } else {
-              await startSpan(
+              const numUploadedFiles = await startSpan(
                 { name: "prepare-bundles", scope: sentryScope },
                 async (prepBundlesSpan) => {
                   // Preparing the bundles can be a lot of work and doing it all at once has the potential of nuking the heap so
@@ -661,13 +645,20 @@ export function createSentryBuildPluginManager(
                             dist: options.release.dist,
                           },
                         ],
+                        // We want this promise to throw if the sourcemaps fail to upload so that we know about it.
+                        // see: https://github.com/getsentry/sentry-cli/pull/2605
+                        live: "rejectOnError",
                       }
                     );
                   });
+
+                  return files.length;
                 }
               );
 
-              logger.info("Successfully uploaded source maps to Sentry");
+              if (numUploadedFiles > 0) {
+                logger.info("Successfully uploaded source maps to Sentry");
+              }
             }
           } catch (e) {
             sentryScope.captureException('Error in "debugIdUploadPlugin" writeBundle hook');
@@ -732,3 +723,43 @@ export function createSentryBuildPluginManager(
     createDependencyOnBuildArtifacts,
   };
 }
+
+function canUploadSourceMaps(
+  options: NormalizedOptions,
+  logger: Logger,
+  isDevMode: boolean
+): boolean {
+  if (options.sourcemaps?.disable) {
+    logger.debug(
+      "Source map upload was disabled. Will not upload sourcemaps using debug ID process."
+    );
+    return false;
+  }
+  if (isDevMode) {
+    logger.debug("Running in development mode. Will not upload sourcemaps.");
+    return false;
+  }
+  if (!options.authToken) {
+    logger.warn(
+      "No auth token provided. Will not upload source maps. Please set the `authToken` option. You can find information on how to generate a Sentry auth token here: https://docs.sentry.io/api/auth/" +
+        getTurborepoEnvPassthroughWarning("SENTRY_AUTH_TOKEN")
+    );
+    return false;
+  }
+  if (!options.org && !options.authToken.startsWith("sntrys_")) {
+    logger.warn(
+      "No org provided. Will not upload source maps. Please set the `org` option to your Sentry organization slug." +
+        getTurborepoEnvPassthroughWarning("SENTRY_ORG")
+    );
+    return false;
+  }
+  if (!options.project) {
+    logger.warn(
+      "No project provided. Will not upload source maps. Please set the `project` option to your Sentry project slug." +
+        getTurborepoEnvPassthroughWarning("SENTRY_PROJECT")
+    );
+    return false;
+  }
+
+  return true;
+}

packages/dev-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/dev-utils",
-  "version": "3.5.0",
+  "version": "3.6.1",
   "license": "MIT",
   "private": true,
   "files": [

packages/e2e-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundler-plugin-e2e-tests",
-  "version": "3.5.0",
+  "version": "3.6.1",
   "license": "MIT",
   "private": true,
   "scripts": {
@@ -15,15 +15,15 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "@sentry/esbuild-plugin": "3.5.0",
-    "@sentry/rollup-plugin": "3.5.0",
-    "@sentry/vite-plugin": "3.5.0",
-    "@sentry/webpack-plugin": "3.5.0",
+    "@sentry/esbuild-plugin": "3.6.1",
+    "@sentry/rollup-plugin": "3.6.1",
+    "@sentry/vite-plugin": "3.6.1",
+    "@sentry/webpack-plugin": "3.6.1",
     "axios": "^1.1.3"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config": "3.5.0",
-    "@sentry-internal/sentry-bundler-plugin-tsconfig": "3.5.0",
+    "@sentry-internal/eslint-config": "3.6.1",
+    "@sentry-internal/sentry-bundler-plugin-tsconfig": "3.6.1",
     "@swc/jest": "^0.2.21",
     "@types/axios": "^0.14.0",
     "@types/glob": "8.0.0",