Merge branch 'develop' into simple-multiplexed-transport

Author: Luca Forstner

.craft.yml

@@ -16,23 +16,31 @@ targets:
   - name: npm
     id: '@sentry/core'
     includeNames: /^sentry-core-\d.*\.tgz$/
-  ## 1.4 Tracing package
+  ## 1.4 Browser Utils package
   - name: npm
-    id: '@sentry-internal/tracing'
-    includeNames: /^sentry-internal-tracing-\d.*\.tgz$/
-  ## 1.5 Replay package (browser only)
+    id: '@sentry-internal/browser-utils'
+    includeNames: /^sentry-internal-browser-utils-\d.*\.tgz$/
+  ## 1.5 Replay Internal package (browser only)
   - name: npm
-    id: '@sentry/replay'
-    includeNames: /^sentry-replay-\d.*\.tgz$/
-  ## 1.6. OpenTelemetry package
+    id: '@sentry-internal/replay'
+    includeNames: /^sentry-internal-replay-\d.*\.tgz$/
+  ## 1.6 OpenTelemetry package
   - name: npm
     id: '@sentry/opentelemetry'
     includeNames: /^sentry-opentelemetry-\d.*\.tgz$/
   ## 1.7 Feedback package (browser only)
   - name: npm
     id: '@sentry-internal/feedback'
     includeNames: /^sentry-internal-feedback-\d.*\.tgz$/
-  ## 1.8 ReplayCanvas package (browser only)
+  ## 1.8 Feedback Modal package (browser only)
+  - name: npm
+    id: '@sentry-internal/feedback-modal'
+    includeNames: /^sentry-internal-feedback-modal-\d.*\.tgz$/
+  ## 1.9 Feedback Screenshot package (browser only)
+  - name: npm
+    id: '@sentry-internal/feedback-screenshot'
+    includeNames: /^sentry-internal-feedback-screenshot-\d.*\.tgz$/
+  ## 1.10 ReplayCanvas package (browser only)
   - name: npm
     id: '@sentry-internal/replay-canvas'
     includeNames: /^sentry-internal-replay-canvas-\d.*\.tgz$/
@@ -125,11 +133,6 @@ targets:
     id: '@sentry-internal/eslint-config-sdk'
     includeNames: /^sentry-internal-eslint-config-sdk-\d.*\.tgz$/
 
-  ## 8. Experimental packages
-  - name: npm
-    id: '@sentry/node-experimental'
-    includeNames: /^sentry-node-experimental-\d.*\.tgz$/
-
   # AWS Lambda Layer target
   - name: aws-lambda-layer
     includeNames: /^sentry-node-serverless-\d+.\d+.\d+(-(beta|alpha)\.\d+)?\.zip$/

.eslintrc.js

@@ -51,13 +51,19 @@ module.exports = {
       },
     },
     {
-      files: ['scenarios/**', 'dev-packages/rollup-utils/**'],
+      files: ['scenarios/**', 'dev-packages/rollup-utils/**', 'dev-packages/bundle-analyzer-scenarios/**'],
       parserOptions: {
         sourceType: 'module',
       },
       rules: {
         'no-console': 'off',
       },
     },
+    {
+      files: ['vite.config.ts'],
+      parserOptions: {
+        project: ['tsconfig.test.json'],
+      },
+    },
   ],
 };

.git-blame-ignore-revs

@@ -13,5 +13,11 @@ ef6b3c7877d5fc8031c08bb28b0ffafaeb01f501
 # chore: Enforce formatting of MD files in repository root #10127
 aecf26f22dbf65ce2c0caadc4ce71b46266c9f45
 
-# chore: Create dev-packages folder #9997 
+# chore: Create dev-packages folder #9997
 35205b4cc5783237e69452c39ea001e461d9c84d
+
+# ref: Move node & node-experimental folders #11309
+# As well as revert and re-revert of this
+971b51d4b8e92aa1b93c51074e28c7cbed63b486
+ebc9b539548953bb9dd81d6a18adcdd91e804563
+c88ff463a5566194a454b58bc555f183cf9ee813

.github/dependabot.yml

@@ -15,6 +15,9 @@ updates:
     allow:
       - dependency-name: "@sentry/cli"
       - dependency-name: "@sentry/vite-plugin"
+      - dependency-name: "@opentelemetry/*"
+      - dependency-name: "@prisma/instrumentation"
+      - dependency-name: "opentelemetry-instrumentation-fetch-node"
     versioning-strategy: increase
     commit-message:
       prefix: feat

.github/workflows/build.yml

@@ -96,16 +96,17 @@ jobs:
               - 'scripts/**'
               - 'packages/core/**'
               - 'packages/rollup-utils/**'
-              - 'packages/tracing/**'
-              - 'packages/tracing-internal/**'
               - 'packages/utils/**'
               - 'packages/types/**'
             browser: &browser
               - *shared
               - 'packages/browser/**'
+              - 'packages/browser-utils/**'
               - 'packages/replay/**'
               - 'packages/replay-canvas/**'
               - 'packages/feedback/**'
+              - 'packages/feedback-modal/**'
+              - 'packages/feedback-screenshot/**'
               - 'packages/wasm/**'
             browser_integration:
               - *shared
@@ -118,7 +119,6 @@ jobs:
             node:
               - *shared
               - 'packages/node/**'
-              - 'packages/node-experimental/**'
               - 'dev-packages/node-integration-tests/**'
             nextjs:
               - *shared
@@ -135,7 +135,6 @@ jobs:
             profiling_node:
               - *shared
               - 'packages/node/**'
-              - 'packages/node-experimental/**'
               - 'packages/profiling-node/**'
               - 'dev-packages/e2e-tests/test-applications/node-profiling/**'
             profiling_node_bindings:
@@ -271,6 +270,9 @@ jobs:
             ${{needs.job_get_metadata.outputs.is_develop == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
 
       - name: Build packages
+        # Set the CODECOV_TOKEN for Bundle Analysis
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         run: yarn build
     outputs:
       # this needs to be passed on, because the `needs` context only looks at direct ancestors (so steps which depend on
@@ -1036,6 +1038,7 @@ jobs:
             'create-remix-app-v2',
             'create-remix-app-express-vite-dev',
             'debug-id-sourcemaps',
+            # 'esm-loader-node-express-app', # This is currently broken for upstream reasons. See https://github.com/getsentry/sentry-javascript/pull/11338#issuecomment-2025450675
             'nextjs-app-dir',
             'nextjs-14',
             'react-create-hash-router',
@@ -1047,8 +1050,12 @@ jobs:
             'node-fastify-app',
             # TODO(v8): Re-enable hapi tests
             # 'node-hapi-app',
+            'node-nestjs-app',
             'node-exports-test-app',
-            'vue-3'
+            'node-koa-app',
+            'vue-3',
+            'webpack-4',
+            'webpack-5'
           ]
         build-command:
           - false

.github/workflows/canary.yml

@@ -12,6 +12,13 @@ on:
 env:
   HEAD_COMMIT: ${{ github.event.inputs.commit || github.sha }}
 
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/packages/*/*.tgz
+    ${{ github.workspace }}/dev-packages/event-proxy-server/build
+    ${{ github.workspace }}/node_modules
+    ${{ github.workspace }}/packages/*/node_modules
+    ${{ github.workspace }}/dev-packages/*/node_modules
+
 permissions:
   contents: read
   issues: write
@@ -33,10 +40,7 @@ jobs:
       - name: Check canary cache
         uses: actions/cache@v4
         with:
-          path: |
-            ${{ github.workspace }}/packages/*/*.tgz
-            ${{ github.workspace }}/node_modules
-            ${{ github.workspace }}/packages/*/node_modules
+          path: ${{ env.CACHED_BUILD_PATHS }}
           key: canary-${{ env.HEAD_COMMIT }}
       - name: Install dependencies
         run: yarn install
@@ -94,24 +98,22 @@ jobs:
       - uses: pnpm/action-setup@v2
         with:
           version: 8.3.1
+
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
-          node-version-file: 'package.json'
+          node-version-file: 'dev-packages/e2e-tests/package.json'
 
       - name: Restore canary cache
         uses: actions/cache/restore@v4
         with:
-          path: |
-            ${{ github.workspace }}/packages/*/*.tgz
-            ${{ github.workspace }}/node_modules
-            ${{ github.workspace }}/packages/*/node_modules
+          path: ${{ env.CACHED_BUILD_PATHS }}
           key: canary-${{ env.HEAD_COMMIT }}
 
       - name: Get node version
         id: versions
         run: |
-          echo "echo node=$(jq -r '.volta.node' package.json)" >> $GITHUB_OUTPUT
+          echo "echo node=$(jq -r '.volta.node' dev-packages/e2e-tests/package.json)" >> $GITHUB_OUTPUT
 
       - name: Validate Verdaccio
         run: yarn test:validate

.github/workflows/flaky-test-detector.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   pull_request:
     paths:
-      - 'dev-packages/browser-integration-tests/suites/**'
+      - 'dev-packages/browser-integration-tests/suites/**/test.ts'
     branches-ignore:
       - master
 

.gitignore

@@ -57,5 +57,4 @@ packages/deno/build-test
 packages/deno/lib.deno.d.ts
 
 # gatsby
-packages/gatsby/gatsby-browser.d.ts
 packages/gatsby/gatsby-node.d.ts