Merge branch 'master' into feat/separate-source-reading

Author: timfish

.size-limit.js

@@ -1,43 +1,58 @@
 module.exports = [
   {
-    name: '@sentry/browser - CDN Bundle (gzipped)',
+    name: '@sentry/browser - ES5 CDN Bundle (gzipped + minified)',
     path: 'packages/browser/build/bundle.min.js',
     gzip: true,
     limit: '100 KB',
   },
   {
-    name: '@sentry/browser - CDN Bundle (minified)',
+    name: '@sentry/browser - ES5 CDN Bundle (minified)',
     path: 'packages/browser/build/bundle.min.js',
     gzip: false,
     limit: '120 KB',
   },
   {
-    name: '@sentry/browser - Webpack',
+    name: '@sentry/browser - ES6 CDN Bundle (gzipped + minified)',
+    path: 'packages/browser/build/bundle.es6.min.js',
+    gzip: true,
+    limit: '100 KB',
+  },
+  {
+    name: '@sentry/browser - ES6 CDN Bundle (minified)',
+    path: 'packages/browser/build/bundle.es6.min.js',
+    gzip: false,
+    limit: '120 KB',
+  },
+  {
+    name: '@sentry/browser - Webpack (gzipped + minified)',
     path: 'packages/browser/esm/index.js',
     import: '{ init }',
+    gzip: true,
     limit: '100 KB',
   },
   {
-    name: '@sentry/browser - Webpack - gzip = false',
+    name: '@sentry/browser - Webpack (minified)',
     path: 'packages/browser/esm/index.js',
     import: '{ init }',
     gzip: false,
     limit: '100 KB',
   },
   {
-    name: '@sentry/react - Webpack',
+    name: '@sentry/react - Webpack (gzipped + minified)',
     path: 'packages/react/esm/index.js',
     import: '{ init }',
+    gzip: true,
     limit: '100 KB',
   },
   {
-    name: '@sentry/nextjs Client - Webpack',
+    name: '@sentry/nextjs Client - Webpack (gzipped + minified)',
     path: 'packages/nextjs/esm/index.client.js',
     import: '{ init }',
+    gzip: true,
     limit: '100 KB',
   },
   {
-    name: '@sentry/browser + @sentry/tracing - CDN Bundle (gzipped)',
+    name: '@sentry/browser + @sentry/tracing - ES5 CDN Bundle (gzipped + minified)',
     path: 'packages/tracing/build/bundle.tracing.min.js',
     gzip: true,
     limit: '100 KB',

CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "lerna": "3.4.0",
-  "version": "6.17.5",
+  "version": "6.17.7",
   "packages": "packages/*",
   "npmClient": "yarn",
   "useWorkspaces": true

lerna.json

@@ -51,6 +51,7 @@
   ],
   "devDependencies": {
     "@google-cloud/storage": "^5.7.0",
+    "@rollup/plugin-replace": "^3.0.1",
     "@size-limit/preset-small-lib": "^4.5.5",
     "@strictsoftware/typedoc-plugin-monorepo": "^0.3.1",
     "@types/chai": "^4.1.3",
@@ -71,6 +72,9 @@
     "prettier": "2.5.1",
     "replace-in-file": "^4.0.0",
     "rimraf": "^3.0.2",
+    "rollup-plugin-license": "^2.6.1",
+    "rollup-plugin-terser": "^7.0.2",
+    "rollup-plugin-typescript2": "^0.31.2",
     "sinon": "^7.3.2",
     "size-limit": "^4.5.5",
     "ts-jest": "^24.3.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "6.17.5",
+  "version": "6.17.7",
   "description": "Official Sentry SDK for Angular",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,9 +21,9 @@
     "@angular/router": "10.x || 11.x || 12.x || 13.x"
   },
   "dependencies": {
-    "@sentry/browser": "6.17.5",
-    "@sentry/types": "6.17.5",
-    "@sentry/utils": "6.17.5",
+    "@sentry/browser": "6.17.7",
+    "@sentry/types": "6.17.7",
+    "@sentry/utils": "6.17.7",
     "rxjs": "^6.6.0",
     "tslib": "^1.9.3"
   },

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "6.17.5",
+  "version": "6.17.7",
   "description": "Official Sentry SDK for browsers",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -16,9 +16,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "6.17.5",
-    "@sentry/types": "6.17.5",
-    "@sentry/utils": "6.17.5",
+    "@sentry/core": "6.17.7",
+    "@sentry/types": "6.17.7",
+    "@sentry/utils": "6.17.7",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
@@ -42,10 +42,7 @@
     "playwright": "^1.17.1",
     "rollup": "^1.10.1",
     "rollup-plugin-commonjs": "^9.3.4",
-    "rollup-plugin-license": "^0.8.1",
     "rollup-plugin-node-resolve": "^4.2.3",
-    "rollup-plugin-terser": "^4.0.4",
-    "rollup-plugin-typescript2": "^0.21.0",
     "sinon": "^7.3.2",
     "webpack": "^4.30.0"
   },

packages/browser/package.json

@@ -3,6 +3,7 @@ import typescript from 'rollup-plugin-typescript2';
 import license from 'rollup-plugin-license';
 import resolve from 'rollup-plugin-node-resolve';
 import commonjs from 'rollup-plugin-commonjs';
+import replace from '@rollup/plugin-replace';
 
 const commitHash = require('child_process')
   .execSync('git rev-parse --short HEAD', { encoding: 'utf-8' })
@@ -13,7 +14,6 @@ const terserInstance = terser({
     // Tell env.ts that we're building a browser bundle and that we do not
     // want to have unnecessary debug functionality.
     global_defs: {
-      __SENTRY_BROWSER_BUNDLE__: true,
       __SENTRY_NO_DEBUG__: false,
     },
   },
@@ -33,6 +33,9 @@ const terserInstance = terser({
       reserved: ['_mergeOptions'],
     },
   },
+  output: {
+    comments: false,
+  },
 });
 
 const paths = {
@@ -56,6 +59,16 @@ const plugins = [
     },
     include: ['*.ts+(|x)', '**/*.ts+(|x)', '../**/*.ts+(|x)'],
   }),
+  replace({
+    // don't replace `__placeholder__` where it's followed immediately by a single `=` (to prevent ending up
+    // with something of the form `let "replacementValue" = "some assigned value"`, which would cause a
+    // syntax error)
+    preventAssignment: true,
+    // the replacements to make
+    values: {
+      __SENTRY_BROWSER_BUNDLE__: true,
+    },
+  }),
   resolve({
     mainFields: ['module'],
   }),
@@ -78,6 +91,7 @@ const bundleConfig = {
       banner: `/*! @sentry/browser <%= pkg.version %> (${commitHash}) | https://github.com/getsentry/sentry-javascript */`,
     }),
   ],
+  treeshake: 'smallest',
 };
 
 export default [

packages/browser/rollup.config.js

@@ -1,7 +1,7 @@
 import { Event, Exception, StackFrame } from '@sentry/types';
 import { extractExceptionKeysForMessage, isEvent, normalizeToSize } from '@sentry/utils';
 
-import { computeStackTrace, StackFrame as TraceKitStackFrame, StackTrace as TraceKitStackTrace } from './tracekit';
+import { computeStackTrace, StackTrace as TraceKitStackTrace } from './tracekit';
 
 const STACKTRACE_LIMIT = 50;
 
@@ -80,15 +80,15 @@ export function eventFromStacktrace(stacktrace: TraceKitStackTrace): Event {
 /**
  * @hidden
  */
-export function prepareFramesForEvent(stack: TraceKitStackFrame[]): StackFrame[] {
-  if (!stack || !stack.length) {
+export function prepareFramesForEvent(stack: StackFrame[]): StackFrame[] {
+  if (!stack.length) {
     return [];
   }
 
   let localStack = stack;
 
-  const firstFrameFunction = localStack[0].func || '';
-  const lastFrameFunction = localStack[localStack.length - 1].func || '';
+  const firstFrameFunction = localStack[0].function || '';
+  const lastFrameFunction = localStack[localStack.length - 1].function || '';
 
   // If stack starts with one of our API calls, remove it (starts, meaning it's the top of the stack - aka last call)
   if (firstFrameFunction.indexOf('captureMessage') !== -1 || firstFrameFunction.indexOf('captureException') !== -1) {
@@ -103,14 +103,12 @@ export function prepareFramesForEvent(stack: TraceKitStackFrame[]): StackFrame[]
   // The frame where the crash happened, should be the last entry in the array
   return localStack
     .slice(0, STACKTRACE_LIMIT)
-    .map(
-      (frame: TraceKitStackFrame): StackFrame => ({
-        colno: frame.column === null ? undefined : frame.column,
-        filename: frame.url || localStack[0].url,
-        function: frame.func || '?',
-        in_app: true,
-        lineno: frame.line === null ? undefined : frame.line,
-      }),
-    )
+    .map(frame => ({
+      filename: frame.filename || localStack[0].filename,
+      function: frame.function || '?',
+      lineno: frame.lineno,
+      colno: frame.colno,
+      in_app: true,
+    }))
     .reverse();
 }