fix: Build for browser

Author: HazAT

packages/browser/package.json

@@ -11,6 +11,7 @@
   },
   "main": "dist/index.js",
   "module": "esm/index.js",
+  "browser": "dist/index.js",
   "types": "dist/index.d.ts",
   "publishConfig": {
     "access": "public"
@@ -41,21 +42,23 @@
     "prettier": "^1.16.4",
     "prettier-check": "^2.0.0",
     "rimraf": "^2.6.3",
-    "rollup": "^1.2.1",
+    "rollup": "^1.4.0",
+    "rollup-plugin-commonjs": "^9.2.1",
     "rollup-plugin-license": "^0.8.1",
-    "rollup-plugin-typescript2": "^0.19.2",
+    "rollup-plugin-node-resolve": "^4.0.1",
     "rollup-plugin-terser": "^4.0.4",
+    "rollup-plugin-typescript2": "^0.19.2",
     "sinon": "^7.2.3",
     "tslint": "^5.12.1",
     "typescript": "^3.3.3",
     "webpack": "^4.29.5"
   },
   "scripts": {
-    "build": "run-p build:esm build:es5",
+    "build": "run-s build:esm build:es5",
     "build:es5": "rollup --config",
     "build:esm": "tsc -p tsconfig.esm.json",
     "build:watch": "rollup --config --watch",
-    "clean": "rimraf dist coverage .rpt2_cache build",
+    "clean": "rimraf dist coverage .rpt2_cache build esm",
     "lint": "run-s lint:prettier lint:tslint",
     "lint:prettier": "prettier-check \"{src,test}/**/*.ts\"",
     "lint:tslint": "tslint -t stylish -p .",

packages/browser/rollup.config.js

@@ -1,6 +1,8 @@
 import { terser } from 'rollup-plugin-terser';
 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';
 
 const commitHash = require('child_process')
   .execSync('git rev-parse --short HEAD', { encoding: 'utf-8' })
@@ -19,6 +21,32 @@ const terserInstance = terser({
   },
 });
 
+const plugins = [
+  typescript({
+    tsconfig: 'tsconfig.build.json',
+    tsconfigOverride: {
+      compilerOptions: {
+        declaration: false,
+        module: 'ES2015',
+        paths: {
+          '@sentry/utils/*': ['../utils/src/*'],
+          '@sentry/core': ['../core/src'],
+          '@sentry/hub': ['../hub/src'],
+          '@sentry/types': ['../types/src'],
+          '@sentry/minimal': ['../minimal/src'],
+        },
+      },
+    },
+    include: ['*.ts+(|x)', '**/*.ts+(|x)', '../**/*.ts+(|x)'],
+  }),
+  resolve({
+    browser: true,
+    module: false,
+    modulesOnly: true,
+  }),
+  commonjs(),
+];
+
 const bundleConfig = {
   input: 'src/index.ts',
   output: {
@@ -28,22 +56,7 @@ const bundleConfig = {
   },
   context: 'window',
   plugins: [
-    typescript({
-      tsconfig: 'tsconfig.build.json',
-      tsconfigOverride: {
-        compilerOptions: {
-          declaration: false,
-          paths: {
-            '@sentry/utils/*': ['../utils/src/*'],
-            '@sentry/core': ['../core/src'],
-            '@sentry/hub': ['../hub/src'],
-            '@sentry/types': ['../types/src'],
-            '@sentry/minimal': ['../minimal/src'],
-          },
-        },
-      },
-      include: ['*.ts+(|x)', '**/*.ts+(|x)', '../**/*.ts+(|x)'],
-    }),
+    ...plugins,
     license({
       sourcemap: true,
       banner: `/*! @sentry/browser <%= pkg.version %> (${commitHash}) | https://github.com/getsentry/sentry-javascript */`,
@@ -61,32 +74,8 @@ export default [
       interop: false,
       sourcemap: true,
     },
-    external: [
-      '@sentry/core',
-      '@sentry/hub',
-      '@sentry/minimal',
-      '@sentry/types',
-      '@sentry/utils/logger',
-      '@sentry/utils/misc',
-      '@sentry/utils/is',
-      '@sentry/utils/supports',
-      '@sentry/utils/syncpromise',
-      '@sentry/utils/object',
-      '@sentry/utils/string',
-      '@sentry/utils/error',
-      '@sentry/utils/promisebuffer',
-      'tslib',
-    ],
-    plugins: [
-      typescript({
-        tsconfig: 'tsconfig.build.json',
-        tsconfigOverride: {
-          compilerOptions: {
-            rootDir: 'src',
-          },
-        },
-      }),
-    ],
+    external: ['tslib'],
+    plugins,
   },
   Object.assign({}, bundleConfig, {
     output: Object.assign({}, bundleConfig.output, {

packages/browser/tsconfig.build.json

@@ -2,9 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "baseUrl": ".",
-    "outDir": "dist",
-    "target": "es6",
-    "module": "es6"
+    "outDir": "dist"
   },
   "include": ["src/**/*"]
 }