resolve merge conflict

Author: 0Calories

.github/workflows/checks.yml

@@ -230,7 +230,7 @@ jobs:
       - name: pack
         run: yarn build:npm
       - name: archive artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ github.sha }}
           path: |

.github/workflows/release.yml

@@ -16,14 +16,20 @@ jobs:
     runs-on: ubuntu-latest
     name: "Release a new version"
     steps:
+      - name: Get auth token
+        id: token
+        uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
+        with:
+          app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
+          private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
       - uses: actions/checkout@v4
         with:
-          token: ${{ secrets.GH_RELEASE_PAT }}
+          token: ${{ steps.token.outputs.token }}
           fetch-depth: 0
       - name: Prepare release
         uses: getsentry/action-prepare-release@v1
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
+          GITHUB_TOKEN: ${{ steps.token.outputs.token }}
         with:
           version: ${{ github.event.inputs.version }}
           force: ${{ github.event.inputs.force }}

.gitignore

@@ -2,6 +2,7 @@ node_modules
 yarn-error.log
 
 .vscode/settings.json
+.idea
 
 *.tgz
 

CHANGELOG.md

@@ -4,6 +4,53 @@
 
 - "You know what they say ‘Fool me once, strike one, but fool me twice… strike three.’" — Michael Scott
 
+## 2.22.7
+
+- deps: Bump `@sentry/cli` to `2.39.1` and require specific version (#632)
+- feat(telemetry): Record if plugin is run in CI (#627)
+
+## 2.22.6
+
+- fix(core): Use sha256 instead of md5 to generate uuids from string (#619)
+
+## 2.22.5
+
+- fix: Ignore stderr output from git command (#613)
+- feat: Update Sentry telemetry to v8 (#604)
+- deps: Update `@sentry/cli` to `2.36.1` (#609)
+
+## 2.22.4
+
+- feat(react-component-annotate): Handle function body returning a ternary (#598)
+- fix: Allow injection plugins to apply to files with query parameters and fragments in their name (#597)
+
+Work in this release contributed by @Thristhart. Thank you for your contribution!
+
+## 2.22.3
+
+- fix(core): Always instantiate global `Error` class in injected code snippets (#594)
+
+## 2.22.2
+
+- fix: Disable debug ID injection when `sourcemaps.disable` is set (#589)
+
+## 2.22.1
+
+- fix: Use `sourcemaps.disable` to disable debug ID upload instead of legacy upload (#587)
+- fix: Escape release string in injection snippet (#585)
+
+## 2.22.0
+
+- deps: Bump `@sentry/cli` to `2.33.1` (#581)
+- feat: Add `bundleSizeOptimizations.excludeTracing` option as alias to deprecated `bundleSizeOptimizations.excludePerformanceMonitoring` (#582)
+- fix(vite-plugin): Ensure `post` order of `sentry-vite-release-injection-plugin` to avoid breaking `@rollup/plugin-commonjs` step (#578)
+
+## 2.21.1
+
+- fix: Do not delete files before all upload tasks executed (#572)
+
+Work in this release contributed by @tyouzu1. Thank you for your contribution!
+
 ## 2.21.0
 
 - fix: Use `sequential` and `post` order for vite artifact deletion (#568)

lerna.json

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

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

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

packages/babel-plugin-component-annotate/src/index.ts

@@ -82,6 +82,7 @@ export default function componentNameAnnotatePlugin({ types: t }: typeof Babel):
       ArrowFunctionExpression(path, state) {
         // We're expecting a `VariableDeclarator` like `const MyComponent =`
         const parent = path.parent;
+
         if (
           !parent ||
           !("id" in parent) ||
@@ -187,6 +188,36 @@ function functionBodyPushAttributes(
       return;
     }
 
+    // Handle the case of a function body returning a ternary operation.
+    // `return (maybeTrue ? '' : (<SubComponent />))`
+    if (arg.isConditionalExpression()) {
+      const consequent = arg.get("consequent");
+      if (consequent.isJSXFragment() || consequent.isJSXElement()) {
+        processJSX(
+          annotateFragments,
+          t,
+          consequent,
+          componentName,
+          sourceFileName,
+          attributeNames,
+          ignoredComponents
+        );
+      }
+      const alternate = arg.get("alternate");
+      if (alternate.isJSXFragment() || alternate.isJSXElement()) {
+        processJSX(
+          annotateFragments,
+          t,
+          alternate,
+          componentName,
+          sourceFileName,
+          attributeNames,
+          ignoredComponents
+        );
+      }
+      return;
+    }
+
     if (!arg.isJSXFragment() && !arg.isJSXElement()) {
       return;
     }
@@ -221,7 +252,6 @@ function processJSX(
   if (!jsxNode) {
     return;
   }
-
   // NOTE: I don't know of a case where `openingElement` would have more than one item,
   // but it's safer to always iterate
   const paths = jsxNode.get("openingElement");

packages/babel-plugin-component-annotate/test/__snapshots__/test-plugin.test.ts.snap

@@ -223,6 +223,16 @@ class componentName extends Component {
 export default componentName;"
 `;
 
+exports[`handles ternary operation returned by function body 1`] = `
+"const maybeTrue = Math.random() > 0.5;
+export default function componentName() {
+  return maybeTrue ? '' : /*#__PURE__*/React.createElement(SubComponent, {
+    \\"data-sentry-element\\": \\"SubComponent\\",
+    \\"data-sentry-component\\": \\"componentName\\"
+  });
+}"
+`;
+
 exports[`nonJSX snapshot matches 1`] = `
 "import React, { Component } from 'react';
 class TestClass extends Component {

packages/babel-plugin-component-annotate/test/test-plugin.test.ts

@@ -1173,3 +1173,45 @@ it("skips components marked in ignoreComponents", () => {
     });"
   `);
 });
+
+it("Bananas incompatible plugin @react-navigation source snapshot matches", () => {
+  const result = transform(BananasStandardInput, {
+    filename: "test/node_modules/@react-navigation/core/filename-test.js",
+    presets: ["@babel/preset-react"],
+    plugins: [[plugin, { native: true }]],
+  });
+  expect(result?.code).toMatchInlineSnapshot(`
+    "import React, { Component } from 'react';
+    import { Image } from 'react-native';
+    class Bananas extends Component {
+      render() {
+        let pic = {
+          uri: 'https://upload.wikimedia.org/wikipedia/commons/d/de/Bananavarieties.jpg'
+        };
+        return /*#__PURE__*/React.createElement(Image, {
+          source: pic,
+          style: {
+            width: 193,
+            height: 110,
+            marginTop: 10
+          },
+          fsClass: \\"test-class\\"
+        });
+      }
+    }"
+  `);
+});
+
+it("handles ternary operation returned by function body", () => {
+  const result = transform(
+    `const maybeTrue = Math.random() > 0.5;
+export default function componentName() {
+  return (maybeTrue ? '' : (<SubComponent />))
+}`,
+    {
+      presets: ["@babel/preset-react"],
+      plugins: [[plugin, { "annotate-fragments": true }]],
+    }
+  );
+  expect(result?.code).toMatchSnapshot();
+});

packages/bundler-plugin-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/bundler-plugin-core",
-  "version": "2.21.0",
+  "version": "2.22.7",
   "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": "2.21.0",
-    "@sentry/cli": "^2.22.3",
+    "@sentry/babel-plugin-component-annotate": "2.22.7",
+    "@sentry/cli": "2.39.1",
     "dotenv": "^16.3.1",
     "find-up": "^5.0.0",
     "glob": "^9.3.2",
@@ -68,10 +68,11 @@
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "13.3.0",
     "@rollup/plugin-replace": "^4.0.0",
-    "@sentry-internal/eslint-config": "2.21.0",
-    "@sentry-internal/sentry-bundler-plugin-tsconfig": "2.21.0",
-    "@sentry/node": "7.102.0",
-    "@sentry/utils": "7.102.0",
+    "@sentry-internal/eslint-config": "2.22.7",
+    "@sentry-internal/sentry-bundler-plugin-tsconfig": "2.22.7",
+    "@sentry/core": "8.30.0",
+    "@sentry/types": "8.30.0",
+    "@sentry/utils": "8.30.0",
     "@swc/core": "^1.2.205",
     "@swc/jest": "^0.2.21",
     "@types/jest": "^28.1.3",