Merge branch 'develop' into ryan953/feedback-integration-pkg-stubs

Author: ryan953

.craft.yml

@@ -16,10 +16,10 @@ 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$/
+    id: '@sentry-internal/browser-utils'
+    includeNames: /^sentry-internal-browser-utils-\d.*\.tgz$/
   ## 1.5 Replay Internal package (browser only)
   - name: npm
     id: '@sentry-internal/replay'
@@ -133,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,7 +51,7 @@ module.exports = {
       },
     },
     {
-      files: ['scenarios/**', 'dev-packages/rollup-utils/**'],
+      files: ['scenarios/**', 'dev-packages/rollup-utils/**', 'dev-packages/bundle-analyzer-scenarios/**'],
       parserOptions: {
         sourceType: 'module',
       },

.github/workflows/build.yml

@@ -96,13 +96,12 @@ 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/**'
@@ -1039,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',
@@ -1050,7 +1050,9 @@ jobs:
             'node-fastify-app',
             # TODO(v8): Re-enable hapi tests
             # 'node-hapi-app',
+            'node-nestjs-app',
             'node-exports-test-app',
+            'node-koa-app',
             'vue-3',
             'webpack-4',
             'webpack-5'

.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
 

.size-limit.js

@@ -1,32 +1,32 @@
 module.exports = [
-  // Main browser webpack builds
+  // Browser SDK (ESM)
   {
-    name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
+    name: '@sentry/browser',
     path: 'packages/browser/build/npm/esm/index.js',
-    import: '{ init, replayIntegration, browserTracingIntegration, feedbackIntegration }',
+    import: createImport('init'),
     gzip: true,
-    limit: '90 KB',
+    limit: '24 KB',
   },
   {
-    name: '@sentry/browser (incl. Tracing, Replay)',
+    name: '@sentry/browser (incl. Tracing)',
     path: 'packages/browser/build/npm/esm/index.js',
-    import: '{ init, replayIntegration, browserTracingIntegration }',
+    import: createImport('init', 'browserTracingIntegration'),
     gzip: true,
-    limit: '90 KB',
+    limit: '34 KB',
   },
   {
-    name: '@sentry/browser (incl. Tracing, Replay with Canvas)',
+    name: '@sentry/browser (incl. Tracing, Replay)',
     path: 'packages/browser/build/npm/esm/index.js',
-    import: '{ init, replayIntegration, browserTracingIntegration, replayCanvasIntegration }',
+    import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
     gzip: true,
-    limit: '90 KB',
+    limit: '70 KB',
   },
   {
     name: '@sentry/browser (incl. Tracing, Replay) - with treeshaking flags',
     path: 'packages/browser/build/npm/esm/index.js',
-    import: '{ init, replayIntegration, browserTracingIntegration }',
+    import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
     gzip: true,
-    limit: '75 KB',
+    limit: '65 KB',
     modifyWebpackConfig: function (config) {
       const webpack = require('webpack');
       config.plugins.push(
@@ -41,134 +41,181 @@ module.exports = [
     },
   },
   {
-    name: '@sentry/browser (incl. Tracing)',
+    name: '@sentry/browser (incl. Tracing, Replay with Canvas)',
     path: 'packages/browser/build/npm/esm/index.js',
-    import: '{ init, browserTracingIntegration }',
+    import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
     gzip: true,
-    limit: '90 KB',
+    limit: '75 KB',
   },
   {
-    name: '@sentry/browser (incl. browserTracingIntegration)',
+    name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
     path: 'packages/browser/build/npm/esm/index.js',
-    import: '{ init, browserTracingIntegration }',
+    import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'feedbackIntegration'),
     gzip: true,
-    limit: '90 KB',
+    limit: '80 KB',
   },
   {
-    name: '@sentry/browser (incl. feedbackIntegration)',
+    name: '@sentry/browser (incl. Feedback)',
     path: 'packages/browser/build/npm/esm/index.js',
-    import: '{ init, feedbackIntegration }',
+    import: createImport('init', 'feedbackIntegration'),
     gzip: true,
-    limit: '90 KB',
+    limit: '35 KB',
   },
   {
-    name: '@sentry/browser (incl. feedbackModalIntegration)',
+    name: '@sentry/browser (incl. Feedback, Feedback Modal)',
     path: 'packages/browser/build/npm/esm/index.js',
-    import: '{ init, feedbackIntegration, feedbackModalIntegration }',
+    import: createImport('init', 'feedbackIntegration', 'feedbackModalIntegration'),
     gzip: true,
-    limit: '90 KB',
+    limit: '35 KB',
   },
   {
-    name: '@sentry/browser (incl. feedbackScreenshotIntegration)',
+    name: '@sentry/browser (incl. Feedback, Feedback Modal, Feedback Screenshot)',
     path: 'packages/browser/build/npm/esm/index.js',
-    import: '{ init, feedbackIntegration, feedbackModalIntegration, feedbackScreenshotIntegration }',
+    import: createImport('init', 'feedbackIntegration', 'feedbackModalIntegration', 'feedbackScreenshotIntegration'),
     gzip: true,
-    limit: '90 KB',
+    limit: '35 KB',
   },
   {
     name: '@sentry/browser (incl. sendFeedback)',
     path: 'packages/browser/build/npm/esm/index.js',
-    import: '{ init, sendFeedback }',
+    import: createImport('init', 'sendFeedback'),
     gzip: true,
-    limit: '90 KB',
+    limit: '30 KB',
   },
+  // React SDK (ESM)
   {
-    name: '@sentry/browser',
-    path: 'packages/browser/build/npm/esm/index.js',
-    import: '{ init }',
+    name: '@sentry/react',
+    path: 'packages/react/build/esm/index.js',
+    import: createImport('init', 'ErrorBoundary'),
     gzip: true,
-    limit: '90 KB',
+    limit: '27 KB',
   },
-
-  // Browser CDN bundles
   {
-    name: 'CDN Bundle (incl. Tracing, Replay, Feedback)',
-    path: 'packages/browser/build/bundles/bundle.tracing.replay.feedback.min.js',
+    name: '@sentry/react (incl. Tracing)',
+    path: 'packages/react/build/esm/index.js',
+    import: createImport('init', 'ErrorBoundary', 'reactRouterV6BrowserTracingIntegration'),
     gzip: true,
-    limit: '90 KB',
+    limit: '37 KB',
   },
+  // Vue SDK (ESM)
   {
-    name: 'CDN Bundle (incl. Tracing, Replay)',
-    path: 'packages/browser/build/bundles/bundle.tracing.replay.min.js',
+    name: '@sentry/vue',
+    path: 'packages/vue/build/esm/index.js',
+    import: createImport('init'),
     gzip: true,
-    limit: '90 KB',
+    limit: '28 KB',
   },
   {
-    name: 'CDN Bundle (incl. Tracing)',
-    path: 'packages/browser/build/bundles/bundle.tracing.min.js',
+    name: '@sentry/vue (incl. Tracing)',
+    path: 'packages/vue/build/esm/index.js',
+    import: createImport('init', 'browserTracingIntegration'),
+    gzip: true,
+    limit: '38 KB',
+  },
+  // Svelte SDK (ESM)
+  {
+    name: '@sentry/svelte',
+    path: 'packages/svelte/build/esm/index.js',
+    import: createImport('init'),
     gzip: true,
-    limit: '40 KB',
+    limit: '24 KB',
   },
+  // Browser CDN bundles
   {
     name: 'CDN Bundle',
-    path: 'packages/browser/build/bundles/bundle.min.js',
+    path: createCDNPath('bundle.min.js'),
     gzip: true,
-    limit: '30 KB',
+    limit: '26 KB',
+  },
+  {
+    name: 'CDN Bundle (incl. Tracing)',
+    path: createCDNPath('bundle.tracing.min.js'),
+    gzip: true,
+    limit: '36 KB',
+  },
+  {
+    name: 'CDN Bundle (incl. Tracing, Replay)',
+    path: createCDNPath('bundle.tracing.replay.min.js'),
+    gzip: true,
+    limit: '70 KB',
+  },
+  {
+    name: 'CDN Bundle (incl. Tracing, Replay, Feedback)',
+    path: createCDNPath('bundle.tracing.replay.feedback.min.js'),
+    gzip: true,
+    limit: '75 KB',
   },
-
   // browser CDN bundles (non-gzipped)
   {
-    name: 'CDN Bundle (incl. Tracing, Replay) - uncompressed',
-    path: 'packages/browser/build/bundles/bundle.tracing.replay.min.js',
+    name: 'CDN Bundle - uncompressed',
+    path: createCDNPath('bundle.min.js'),
     gzip: false,
     brotli: false,
-    limit: '260 KB',
+    limit: '80 KB',
   },
   {
     name: 'CDN Bundle (incl. Tracing) - uncompressed',
-    path: 'packages/browser/build/bundles/bundle.tracing.min.js',
+    path: createCDNPath('bundle.tracing.min.js'),
     gzip: false,
     brotli: false,
-    limit: '120 KB',
+    limit: '105 KB',
   },
   {
-    name: 'CDN Bundle - uncompressed',
-    path: 'packages/browser/build/bundles/bundle.min.js',
+    name: 'CDN Bundle (incl. Tracing, Replay) - uncompressed',
+    path: createCDNPath('bundle.tracing.replay.min.js'),
     gzip: false,
     brotli: false,
-    limit: '80 KB',
-  },
-
-  // React
-  {
-    name: '@sentry/react (incl. Tracing, Replay)',
-    path: 'packages/react/build/esm/index.js',
-    import: '{ init, browserTracingIntegration, replayIntegration }',
-    gzip: true,
-    limit: '90 KB',
+    limit: '220 KB',
   },
+  // Next.js SDK (ESM)
   {
-    name: '@sentry/react',
-    path: 'packages/react/build/esm/index.js',
-    import: '{ init }',
-    gzip: true,
-    limit: '90 KB',
-  },
-
-  // Next.js
-  // TODO: Re-enable these, when we figure out why they break...
-  /*  {
-    name: '@sentry/nextjs Client (incl. Tracing, Replay)',
+    name: '@sentry/nextjs (client)',
     path: 'packages/nextjs/build/esm/client/index.js',
-    import: '{ init, browserTracingIntegration, replayIntegration }',
-    gzip: true,
-    limit: '110 KB',
+    import: createImport('init'),
+    ignore: ['next/router', 'next/constants'],
+    gzip: true,
+    limit: '37 KB',
+  },
+  // SvelteKit SDK (ESM)
+  {
+    name: '@sentry/sveltekit (client)',
+    path: 'packages/sveltekit/build/esm/client/index.js',
+    import: createImport('init'),
+    ignore: ['$app/stores'],
+    gzip: true,
+    limit: '37 KB',
+  },
+  // Node SDK (ESM)
+  {
+    name: '@sentry/node',
+    path: 'packages/node/build/esm/index.js',
+    import: createImport('init'),
+    ignore: [
+      'node:http',
+      'node:https',
+      'node:diagnostics_channel',
+      'async_hooks',
+      'child_process',
+      'fs',
+      'os',
+      'path',
+      'inspector',
+      'worker_threads',
+      'http',
+      'stream',
+      'zlib',
+      'net',
+      'tls',
+    ],
+    gzip: true,
+    limit: '150 KB',
   },
-  {
-    name: '@sentry/nextjs Client',
-    path: 'packages/nextjs/build/esm/client/index.js',
-    import: '{ init }',
-    gzip: true,
-    limit: '57 KB',
-  }, */
 ];
+
+function createImport(...args) {
+  return `{ ${args.join(', ')} }`;
+}
+
+function createCDNPath(name) {
+  return `packages/browser/build/bundles/${name}`;
+}

.vscode/settings.json

@@ -38,5 +38,8 @@
   "editor.codeActionsOnSave": {
     "source.organizeImports.biome": "explicit",
   },
-  "editor.defaultFormatter": "biomejs.biome"
+  "editor.defaultFormatter": "biomejs.biome",
+  "[typescript]": {
+    "editor.defaultFormatter": "biomejs.biome"
+  }
 }