Merge branch 'master' into fix/res-end-never-called

Author: lobsterkatie

.craft.yml

@@ -3,7 +3,7 @@ changelogPolicy: simple
 preReleaseCommand: bash scripts/craft-pre-release.sh
 targets:
   - name: aws-lambda-layer
-    includeNames: /^sentry-node-serverless-\d+(\.\d+)*\.zip$/
+    includeNames: /^sentry-node-serverless-\d+.\d+.\d+(-(beta|alpha)\.\d+)?\.zip$/
     layerName: SentryNodeServerlessSDK
     compatibleRuntimes:
       - name: node

packages/browser/package.json

@@ -27,7 +27,7 @@
     "chai": "^4.1.2",
     "chokidar": "^3.0.2",
     "jsdom": "^15.0.0",
-    "karma": "^4.1.0",
+    "karma": "^6.3.16",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-firefox-launcher": "^2.1.2",

packages/browser/rollup.config.js

@@ -1,130 +1,37 @@
-import { terser } from 'rollup-plugin-terser';
-import typescript from 'rollup-plugin-typescript2';
+import { makeBaseBundleConfig, makeLicensePlugin, terserPlugin } from '../../rollup.config';
 
-import {
-  baseBundleConfig,
-  makeLicensePlugin,
-  markAsBrowserBuild,
-  nodeResolvePlugin,
-  paths,
-  typescriptPluginES5,
-} from '../../rollup.config';
+const builds = [];
 
 const licensePlugin = makeLicensePlugin();
 
-const terserInstance = terser({
-  compress: {
-    // Tell env.ts that we're building a browser bundle and that we do not
-    // want to have unnecessary debug functionality.
-    global_defs: {
-      __SENTRY_NO_DEBUG__: false,
-    },
-  },
-  mangle: {
-    // captureExceptions and captureMessage are public API methods and they don't need to be listed here
-    // as mangler doesn't touch user-facing thing, however sentryWrapped is not, and it would be mangled into a minified version.
-    // We need those full names to correctly detect our internal frames for stripping.
-    // I listed all of them here just for the clarity's sake, as they are all used in the frame-manipulation process.
-    reserved: ['captureException', 'captureMessage', 'sentryWrapped'],
-    properties: {
-      regex: /^_[^_]/,
-      // This exclusion prevents most of the occurrences of the bug linked below:
-      // https://github.com/getsentry/sentry-javascript/issues/2622
-      // The bug is caused by multiple SDK instances, where one is minified and one is using non-mangled code.
-      // Unfortunatelly we cannot fix it reliably (thus `typeof` check in the `InboundFilters` code),
-      // as we cannot force people using multiple instances in their apps to sync SDK versions.
-      reserved: ['_mergeOptions'],
-    },
-  },
-  output: {
-    comments: false,
-  },
-});
-
-const plugins = [
-  typescriptPluginES5,
-  // replace `__SENTRY_BROWSER_BUNDLE__` with `true` to enable treeshaking of non-browser code
-  markAsBrowserBuild,
-  nodeResolvePlugin,
-];
-
-const bundleConfig = {
-  ...baseBundleConfig,
-  input: 'src/index.ts',
-  output: {
-    ...baseBundleConfig.output,
-    format: 'iife',
-    name: 'Sentry',
-  },
-  context: 'window',
-  plugins: [...plugins, licensePlugin],
-};
+['es5', 'es6'].forEach(jsVersion => {
+  const baseBundleConfig = makeBaseBundleConfig({
+    input: 'src/index.ts',
+    isAddOn: false,
+    jsVersion,
+    outputFileBase: `build/bundle${jsVersion === 'es6' ? '.es6' : ''}`,
+  });
 
-export default [
-  // ES5 Browser Bundle
-  {
-    ...bundleConfig,
-    output: {
-      ...bundleConfig.output,
-      file: 'build/bundle.js',
-    },
-  },
-  {
-    ...bundleConfig,
-    output: {
-      ...bundleConfig.output,
-      file: 'build/bundle.min.js',
-    },
-    // Uglify has to be at the end of compilation, BUT before the license banner
-    plugins: bundleConfig.plugins.slice(0, -1).concat(terserInstance).concat(bundleConfig.plugins.slice(-1)),
-  },
-  // ------------------
-  // ES6 Browser Bundle
-  {
-    ...bundleConfig,
-    output: {
-      ...bundleConfig.output,
-      file: 'build/bundle.es6.js',
-    },
-    plugins: [
-      typescript({
-        tsconfig: 'tsconfig.esm.json',
-        tsconfigOverride: {
-          compilerOptions: {
-            declaration: false,
-            declarationMap: false,
-            paths,
-            baseUrl: '.',
-            target: 'es6',
-          },
+  builds.push(
+    ...[
+      {
+        ...baseBundleConfig,
+        output: {
+          ...baseBundleConfig.output,
+          file: `${baseBundleConfig.output.file}.js`,
         },
-        include: ['*.ts+(|x)', '**/*.ts+(|x)', '../**/*.ts+(|x)'],
-      }),
-      ...plugins.slice(1).concat(bundleConfig.plugins.slice(-1)),
-    ],
-  },
-  {
-    ...bundleConfig,
-    output: {
-      ...bundleConfig.output,
-      file: 'build/bundle.es6.min.js',
-    },
-    plugins: [
-      typescript({
-        tsconfig: 'tsconfig.esm.json',
-        tsconfigOverride: {
-          compilerOptions: {
-            declaration: false,
-            declarationMap: false,
-            paths,
-            baseUrl: '.',
-            target: 'es6',
-          },
+        plugins: [...baseBundleConfig.plugins, licensePlugin],
+      },
+      {
+        ...baseBundleConfig,
+        output: {
+          ...baseBundleConfig.output,
+          file: `${baseBundleConfig.output.file}.min.js`,
         },
-        include: ['*.ts+(|x)', '**/*.ts+(|x)', '../**/*.ts+(|x)'],
-      }),
-      ...plugins.slice(1).slice(0, -1).concat(terserInstance).concat(bundleConfig.plugins.slice(-1)),
+        plugins: [...baseBundleConfig.plugins, terserPlugin, licensePlugin],
+      },
     ],
-  },
-  // ------------------
-];
+  );
+});
+
+export default builds;

packages/browser/src/backend.ts

@@ -40,13 +40,13 @@ export class BrowserBackend extends BaseBackend<BrowserOptions> {
    * @inheritDoc
    */
   public eventFromException(exception: unknown, hint?: EventHint): PromiseLike<Event> {
-    return eventFromException(this._options, exception, hint);
+    return eventFromException(exception, hint, this._options.attachStacktrace);
   }
   /**
    * @inheritDoc
    */
   public eventFromMessage(message: string, level: Severity = Severity.Info, hint?: EventHint): PromiseLike<Event> {
-    return eventFromMessage(this._options, message, level, hint);
+    return eventFromMessage(message, level, hint, this._options.attachStacktrace);
   }
 
   /**