Merge remote-tracking branch 'origin/develop' into kw/normalize-infinity

Author: krystofwoldrich

.github/actions/install-dependencies/action.yml

@@ -9,11 +9,9 @@ outputs:
 runs:
   using: "composite"
   steps:
-      # we use a hash of yarn.lock as our cache key, because if it hasn't changed, our dependencies haven't changed,
-      # so no need to reinstall them
     - name: Compute dependency cache key
       id: compute_lockfile_hash
-      run: echo "hash=dependencies-${{ hashFiles('yarn.lock', 'packages/*/package.json', 'dev-packages/*/package.json') }}" >> "$GITHUB_OUTPUT"
+      run: node ./scripts/dependency-hash-key.js >> "$GITHUB_OUTPUT"
       shell: bash
 
     - name: Check dependency cache

.github/workflows/build.yml

@@ -127,7 +127,9 @@ jobs:
     runs-on: ubuntu-20.04
     timeout-minutes: 15
     if: |
-      needs.job_get_metadata.outputs.changed_any_code == 'true' &&
+      needs.job_get_metadata.outputs.changed_any_code == 'true' ||
+      needs.job_get_metadata.outputs.is_develop == 'true' ||
+      needs.job_get_metadata.outputs.is_release == 'true' ||
       (needs.job_get_metadata.outputs.is_gitflow_sync == 'false' && needs.job_get_metadata.outputs.has_gitflow_label == 'false')
     steps:
       - name: Check out base commit (${{ github.event.pull_request.base.sha }})
@@ -344,7 +346,7 @@ jobs:
           name: ${{ github.sha }}
           path: |
             ${{ github.workspace }}/packages/browser/build/bundles/**
-            ${{ github.workspace }}/packages/replay/build/bundles/**
+            ${{ github.workspace }}/packages/replay-internal/build/bundles/**
             ${{ github.workspace }}/packages/replay-canvas/build/bundles/**
             ${{ github.workspace }}/packages/feedback/build/bundles/**
             ${{ github.workspace }}/packages/**/*.tgz
@@ -1416,31 +1418,29 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
 
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node }}
+
       - name: Restore dependency cache
         uses: actions/cache/restore@v4
         id: restore-dependencies
         with:
           path: ${{ env.CACHED_DEPENDENCY_PATHS }}
           key: ${{ needs.job_build.outputs.dependency_cache_key }}
           enableCrossOsArchive: true
-          fail-on-cache-miss: true
 
-      - name: Restore build cache
-        uses: actions/cache/restore@v4
-        id: restore-build
-        with:
-          path: ${{ env.CACHED_BUILD_PATHS }}
-          key: ${{ needs.job_build.outputs.dependency_cache_key }}
-          enableCrossOsArchive: true
-          fail-on-cache-miss: true
+      - name: Install dependencies
+        env:
+          SKIP_PLAYWRIGHT_BROWSER_INSTALL: "1"
+        if: steps.restore-dependencies.outputs.cache-hit != 'true'
+        run: yarn install --ignore-engines --frozen-lockfile
 
       - name: Configure safe directory
         run: |
           git config --global --add safe.directory "*"
 
-      - name: Install yarn
-        run: npm i -g [email protected] --force
-
       - name: Increase yarn network timeout on Windows
         if: contains(matrix.os, 'windows')
         run: yarn config set network-timeout 600000 -g
@@ -1452,15 +1452,6 @@ jobs:
         with:
           python-version: '3.8.10'
 
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node }}
-
-      - name: Install Dependencies
-        if: steps.restore-dependencies.outputs.cache-hit != 'true'
-        run: yarn install --frozen-lockfile --ignore-engines --ignore-scripts
-
       - name: Setup (arm64| ${{ contains(matrix.container, 'alpine') && 'musl' || 'glibc'  }})
         if: matrix.arch == 'arm64' && !contains(matrix.container, 'alpine') && matrix.target_platform != 'darwin'
         run: |

dev-packages/browser-integration-tests/package.json

@@ -9,7 +9,7 @@
   "private": true,
   "scripts": {
     "clean": "rimraf -g suites/**/dist loader-suites/**/dist tmp",
-    "install-browsers": "npx playwright install --with-deps",
+    "install-browsers": "[[ -z \"$SKIP_PLAYWRIGHT_BROWSER_INSTALL\" ]] && yarn install-browsers || echo 'Skipping browser installation'",
     "lint": "eslint . --format stylish",
     "fix": "eslint . --format stylish --fix",
     "type-check": "tsc",

dev-packages/browser-integration-tests/suites/feedback/captureFeedbackCsp/init.js

@@ -10,10 +10,3 @@ Sentry.init({
     feedbackIntegration({ tags: { from: 'integration init' }, styleNonce: 'foo1234', scriptNonce: 'foo1234' }),
   ],
 });
-
-document.addEventListener('securitypolicyviolation', () => {
-  const container = document.querySelector('#csp-violation');
-  if (container) {
-    container.innerText = 'CSP Violation';
-  }
-});

dev-packages/browser-integration-tests/suites/feedback/captureFeedbackCsp/subject.js

@@ -0,0 +1,4 @@
+window.__CSPVIOLATION__ = false;
+document.addEventListener('securitypolicyviolation', () => {
+  window.__CSPVIOLATION__ = true;
+});

dev-packages/browser-integration-tests/suites/feedback/captureFeedbackCsp/template.html

@@ -7,7 +7,5 @@
       content="style-src 'nonce-foo1234'; script-src sentry-test.io 'nonce-foo1234';"
     />
   </head>
-  <body>
-    <div id="csp-violation" />
-  </body>
+  <body></body>
 </html>

dev-packages/browser-integration-tests/suites/feedback/captureFeedbackCsp/test.ts

@@ -79,6 +79,6 @@ sentryTest('should capture feedback', async ({ getLocalTestUrl, page }) => {
     },
     platform: 'javascript',
   });
-  const cspContainer = await page.locator('#csp-violation');
-  expect(cspContainer).not.toContainText('CSP Violation');
+  const cspViolation = await page.evaluate<boolean>('window.__CSPVIOLATION__');
+  expect(cspViolation).toBe(false);
 });

dev-packages/e2e-tests/test-applications/tanstack-router/yarn.lock

@@ -150,6 +150,13 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@playwright/test@^1.44.1":
+  version "1.46.1"
+  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.46.1.tgz#a8dfdcd623c4c23bb1b7ea588058aad41055c188"
+  integrity sha512-Fq6SwLujA/DOIvNC2EL/SojJnkKf/rAwJ//APpJJHRyMi1PdKrY3Az+4XNQ51N4RTbItbIByQ0jgd1tayq1aeA==
+  dependencies:
+    playwright "1.46.1"
+
 "@rollup/[email protected]":
   version "4.18.0"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.18.0.tgz#bbd0e616b2078cd2d68afc9824d1fadb2f2ffd27"
@@ -268,6 +275,9 @@
     "@sentry/types" "8.4.0"
     "@sentry/utils" "8.4.0"
 
+"@sentry-internal/test-utils@link:../../../test-utils":
+  version "8.26.0"
+
 "@sentry/[email protected]":
   version "8.4.0"
   resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-8.4.0.tgz#f4aa381eab212432d71366884693a36c2e3a1675"
@@ -398,10 +408,10 @@
   resolved "https://registry.yarnpkg.com/@tanstack/history/-/history-1.31.16.tgz#6b4947e967af3173ce4929d54d9cb97234646e32"
   integrity sha512-rahAZXlR879P7dngDH7BZwGYiODA9D5Hqo6nUHn9GAURcqZU5IW0ZiT54dPtV5EPES7muZZmknReYueDHs7FFQ==
 
-"@tanstack/[email protected].3":
-  version "1.34.3"
-  resolved "https://registry.yarnpkg.com/@tanstack/react-router/-/react-router-1.34.3.tgz#1152ca7deaaec93f519971911a816bc42011b6ba"
-  integrity sha512-0pB+4qnp+5snHu5T93gvFmLcpXuIfSEhXZG7ipf3Rq8kmv4y0DGwcbvgFLiYKSZ/3x58faE8U0MD6F9vR9JUtg==
+"@tanstack/[email protected].5":
+  version "1.34.5"
+  resolved "https://registry.yarnpkg.com/@tanstack/react-router/-/react-router-1.34.5.tgz#2c5bc5cd6b246f830ce586c51a87f95352481957"
+  integrity sha512-mOMbNHSJ1cAgRuJj9W35wteQL7zFiCNJYgg3QHkxj+obO9zQWiAwycFs0hQTRxqzGfC+jhVLJe1+cW93BhqKyA==
   dependencies:
     "@tanstack/history" "1.31.16"
     "@tanstack/react-store" "^0.2.1"
@@ -636,6 +646,11 @@ fill-range@^7.1.1:
   dependencies:
     to-regex-range "^5.0.1"
 
+[email protected]:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
 fsevents@~2.3.2, fsevents@~2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
@@ -712,9 +727,9 @@ merge2@^1.3.0, merge2@^1.4.1:
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
 micromatch@^4.0.4:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5"
-  integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
   dependencies:
     braces "^3.0.3"
     picomatch "^2.3.1"
@@ -756,6 +771,20 @@ picomatch@^2.3.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
+[email protected]:
+  version "1.46.1"
+  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.46.1.tgz#28f3ab35312135dda75b0c92a3e5c0e7edb9cc8b"
+  integrity sha512-h9LqIQaAv+CYvWzsZ+h3RsrqCStkBHlgo6/TJlFst3cOTlLghBQlJwPOZKQJTKNaD3QIB7aAVQ+gfWbN3NXB7A==
+
+[email protected]:
+  version "1.46.1"
+  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.46.1.tgz#ea562bc48373648e10420a10c16842f0b227c218"
+  integrity sha512-oPcr1yqoXLCkgKtD5eNUPLiN40rYEM39odNpIb6VE6S7/15gJmA1NzVv6zJYusV0e7tzvkU/utBFNa/Kpxmwng==
+  dependencies:
+    playwright-core "1.46.1"
+  optionalDependencies:
+    fsevents "2.3.2"
+
 postcss@^8.4.38:
   version "8.4.38"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"

packages/feedback/src/core/sendFeedback.ts

@@ -64,6 +64,12 @@ export const sendFeedback: SendFeedback = (
         );
       }
 
+      if (response && typeof response.statusCode === 'number' && response.statusCode === 403) {
+        return reject(
+          'Unable to send Feedback. This could be because this domain is not in your list of allowed domains.',
+        );
+      }
+
       return reject(
         'Unable to send Feedback. This could be because of network issues, or because you are using an ad-blocker',
       );

scripts/dependency-hash-key.js

@@ -0,0 +1,73 @@
+const crypto = require('crypto');
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * Build a cache key for the dependencies of the monorepo.
+ * In addition to the content of the yarn.lock file, we also include
+ * dependencies of all workspace packages in the cache key.
+ * This ensures that we get a consistent cache key even if a dependency change does not affect
+ * the yarn.lock file.
+ */
+function outputDependencyCacheKey() {
+  const lockfileContent = fs.readFileSync(path.join(process.cwd(), 'yarn.lock'), 'utf8');
+
+  const hashParts = [lockfileContent];
+
+  const packageJson = require(path.join(process.cwd(), 'package.json'));
+
+  const workspacePackages = packageJson.workspaces || [];
+
+  // Get the package name (e.g. @sentry/browser) of all workspace packages
+  // we want to ignore their version numbers later
+  const workspacePackageNames = getWorkspacePackageNames(workspacePackages);
+
+  // Add the dependencies of the workspace itself
+  hashParts.push(getNormalizedDependencies(packageJson, workspacePackageNames));
+
+  // Now for each workspace package, add the dependencies
+  workspacePackages.forEach(workspace => {
+    const packageJsonPath = path.join(process.cwd(), workspace, 'package.json');
+    const packageJson = require(packageJsonPath);
+    hashParts.push(getNormalizedDependencies(packageJson, workspacePackageNames));
+  });
+
+  const hash = crypto.createHash('md5').update(hashParts.join('\n')).digest('hex');
+  // We log the output in a way that the GitHub Actions can append it to the output
+  // We prefix it with `dependencies-` so it is easier to identify in the logs
+  // eslint-disable-next-line no-console
+  console.log(`hash=dependencies-${hash}`);
+}
+
+function getNormalizedDependencies(packageJson, workspacePackageNames) {
+  const { dependencies, devDependencies } = packageJson;
+
+  const mergedDependencies = {
+    ...devDependencies,
+    ...dependencies,
+  };
+
+  const normalizedDependencies = {};
+
+  // Sort the keys to ensure a consistent order
+  Object.keys(mergedDependencies)
+    .sort()
+    .forEach(key => {
+      // If the dependency is a workspace package, ignore the version
+      // No need to invalidate a cache after every release
+      const version = workspacePackageNames.includes(key) ? '**workspace**' : mergedDependencies[key];
+      normalizedDependencies[key] = version;
+    });
+
+  return JSON.stringify(normalizedDependencies);
+}
+
+function getWorkspacePackageNames(workspacePackages) {
+  return workspacePackages.map(workspace => {
+    const packageJsonPath = path.join(process.cwd(), workspace, 'package.json');
+    const packageJson = require(packageJsonPath);
+    return packageJson.name;
+  });
+}
+
+outputDependencyCacheKey();