Merge branch 'develop' into feat/tediousIntegration-node

Author: AbhiPrasad

.eslintrc.js

@@ -21,6 +21,7 @@ module.exports = {
     'examples/**',
     'test/manual/**',
     'types/**',
+    'scripts/*.js',
   ],
   reportUnusedDisableDirectives: true,
   overrides: [

.github/ISSUE_TEMPLATE/bug.yml

@@ -78,7 +78,7 @@ body:
       label: Link to Sentry event
       description:
         If applicable, please provide a link to the affected event from your Sentry account. The event will only be
-        viewable by Sentry staff.
+        viewable by Sentry staff; however, the event URL will still appear on your public GitHub issue.
       placeholder: https://sentry.io/organizations/<org-slug>/issues/<issue-id>/events/<event-id>/?project=<project-id>
   - type: textarea
     id: sdk-setup

.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/actions/install-playwright/action.yml

@@ -21,15 +21,6 @@ runs:
             ~/.cache/ms-playwright
           key: playwright-${{ runner.os }}-${{ steps.playwright-version.outputs.version }}
 
-      # Only store cache on develop branch
-      - name: Store cached playwright binaries
-        uses: actions/cache/save@v4
-        if: github.event_name == 'push' && github.ref == 'refs/heads/develop'
-        with:
-          path: |
-            ~/.cache/ms-playwright
-          key: playwright-${{ runner.os }}-${{ steps.playwright-version.outputs.version }}
-
       # We always install all browsers, if uncached
       - name: Install Playwright dependencies (uncached)
         run: npx playwright install chromium webkit firefox --with-deps
@@ -40,3 +31,12 @@ runs:
         run: npx playwright install-deps ${{ inputs.browsers || 'chromium webkit firefox' }}
         if: steps.playwright-cache.outputs.cache-hit == 'true'
         shell: bash
+
+      # Only store cache on develop branch
+      - name: Store cached playwright binaries
+        uses: actions/cache/save@v4
+        if: github.event_name == 'push' && github.ref == 'refs/heads/develop'
+        with:
+          path: |
+            ~/.cache/ms-playwright
+          key: playwright-${{ runner.os }}-${{ steps.playwright-version.outputs.version }}

.github/actions/restore-cache/action.yml

@@ -1,6 +1,14 @@
 name: "Restore dependency & build cache"
 description: "Restore the dependency & build cache."
 
+inputs:
+  dependency_cache_key:
+    description: "The dependency cache key"
+    required: true
+  node_version:
+    description: "If set, temporarily set node version to default one before installing, then revert to this version after."
+    required: false
+
 runs:
   using: "composite"
   steps:
@@ -9,17 +17,26 @@ runs:
         uses: actions/cache/restore@v4
         with:
           path: ${{ env.CACHED_DEPENDENCY_PATHS }}
-          key: ${{ env.DEPENDENCY_CACHE_KEY }}
+          key: ${{ inputs.dependency_cache_key }}
 
-      - name: Check build cache
-        uses: actions/cache/restore@v4
-        id: build-cache
+      - name: Restore build artifacts
+        uses: actions/download-artifact@v4
         with:
-          path: ${{ env.CACHED_BUILD_PATHS }}
-          key: ${{ env.BUILD_CACHE_KEY }}
+          name: build-output
+
+      - name: Use default node version for install
+        if: inputs.node_version && steps.dep-cache.outputs.cache-hit != 'true'
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: 'package.json'
+
+      - name: Install dependencies
+        if: steps.dep-cache.outputs.cache-hit != 'true'
+        run: yarn install --ignore-engines --frozen-lockfile
+        shell: bash
 
-      - name: Check if caches are restored
-        uses: actions/github-script@v6
-        if: steps.dep-cache.outputs.cache-hit != 'true' || steps.build-cache.outputs.cache-hit != 'true'
+      - name: Revert node version to ${{ inputs.node_version }}
+        if: inputs.node_version && steps.dep-cache.outputs.cache-hit != 'true'
+        uses: actions/setup-node@v4
         with:
-          script: core.setFailed('Dependency or build cache could not be restored - please re-run ALL jobs.')
+          node-version: ${{ inputs.node_version }}

.github/dependabot.yml

@@ -13,11 +13,10 @@ updates:
     schedule:
       interval: 'weekly'
     allow:
-      - dependency-name: "@sentry/cli"
-      - dependency-name: "@sentry/vite-plugin"
+      - dependency-name: "@sentry/*"
       - dependency-name: "@opentelemetry/*"
       - dependency-name: "@prisma/instrumentation"
-      - dependency-name: "opentelemetry-instrumentation-fetch-node"
+      - dependency-name: "opentelemetry-instrumentation-remix"
     versioning-strategy: increase
     commit-message:
       prefix: feat

.github/dependency-review-config.yml

@@ -0,0 +1,7 @@
+fail-on-severity: 'high'
+allow-ghsas:
+  # dependency review does not allow specific file exclusions
+  # we use an older version of NextJS in our tests and thus need to 
+  # exclude this
+  # once our minimum supported version is over 14.1.1 this can be removed
+  - GHSA-fr5h-rqp8-mj6g