Merge branch 'master' into abhi-jest-upgrade

Author: AbhiPrasad

.eslintrc.js

@@ -1,3 +1,6 @@
+// Note: All paths are relative to the directory in which eslint is being run, rather than the directory where this file
+// lives
+
 module.exports = {
   root: true,
   env: {
@@ -7,20 +10,18 @@ module.exports = {
     ecmaVersion: 2018,
   },
   extends: ['@sentry-internal/sdk'],
-  ignorePatterns: [
-    'coverage/**',
-    'build/**',
-    'dist/**',
-    'esm/**',
-    'examples/**',
-    'scripts/**',
-    'test/manual/**',
-  ],
+  ignorePatterns: ['coverage/**', 'build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**', 'test/manual/**'],
   overrides: [
     {
       files: ['*.ts', '*.tsx', '*.d.ts'],
       parserOptions: {
-        project: './tsconfig.json',
+        project: ['tsconfig.json'],
+      },
+    },
+    {
+      files: ['test/**/*.ts', 'test/**/*.tsx'],
+      parserOptions: {
+        project: ['tsconfig.test.json'],
       },
     },
     {

.github/workflows/build.yml

@@ -10,6 +10,7 @@ env:
   CACHED_DEPENDENCY_PATHS: |
     ${{ github.workspace }}/node_modules
     ${{ github.workspace }}/packages/**/node_modules
+    ~/.cache/ms-playwright/
 
   # DEPENDENCY_CACHE_KEY: can't be set here because we don't have access to yarn.lock
 
@@ -269,11 +270,17 @@ jobs:
             ${{ github.workspace }}/packages/serverless/dist-awslambda-layer/*.zip
 
   job_browser_integration_tests:
-    name: Browser Integration Tests
+    name: Browser Integration Tests (${{ matrix.browser }})
     needs: job_build
     runs-on: ubuntu-latest
-    timeout-minutes: 15
+    timeout-minutes: 10
     continue-on-error: true
+    strategy:
+      matrix:
+        browser:
+          - ChromeHeadless
+          - FirefoxHeadless
+          - WebkitHeadless
     steps:
       - name: Check out current commit (${{ github.sha }})
         uses: actions/checkout@v2
@@ -290,7 +297,35 @@ jobs:
           path: ${{ env.CACHED_BUILD_PATHS }}
           key: ${{ env.BUILD_CACHE_KEY }}
       - name: Run integration tests
+        env:
+          KARMA_BROWSER: ${{ matrix.browser }}
         run: |
           cd packages/browser
+          [[ $KARMA_BROWSER == WebkitHeadless ]] && yarn run playwright install-deps webkit
           yarn test:integration
+
+  job_browser_build_tests:
+    name: Browser Build Tests
+    needs: job_build
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    continue-on-error: true
+    steps:
+      - name: Check out current commit (${{ github.sha }})
+        uses: actions/checkout@v2
+      - name: Set up Node
+        uses: actions/setup-node@v1
+      - name: Check dependency cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.CACHED_DEPENDENCY_PATHS }}
+          key: ${{ needs.job_build.outputs.dependency_cache_key }}
+      - name: Check build cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.CACHED_BUILD_PATHS }}
+          key: ${{ env.BUILD_CACHE_KEY }}
+      - name: Run build tests
+        run: |
+          cd packages/browser
           yarn test:package

packages/angular/package.json

@@ -37,13 +37,15 @@
     "typescript": "3.7.5"
   },
   "scripts": {
-    "build": "run-p build:es5 build:esm",
+    "build": "run-p build:cjs build:esm",
+    "build:cjs": "tsc -p tsconfig.cjs.json",
     "build:dev": "run-s build",
-    "build:es5": "tsc -p tsconfig.build.json",
+    "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***",
     "build:esm": "tsc -p tsconfig.esm.json",
-    "build:watch": "run-p build:es5:watch build:esm:watch",
+    "build:watch": "run-p build:cjs:watch build:esm:watch",
+    "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput",
     "build:dev:watch": "run-s build:watch",
-    "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput",
+    "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***",
     "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput",
     "circularDepCheck": "madge --circular src/index.ts",
     "clean": "rimraf dist esm build coverage",

packages/angular/tsconfig.build.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+
+  "compilerOptions": {
+    "module": "commonjs",
+    "outDir": "dist"
+  }
+}

packages/angular/tsconfig.cjs.json

@@ -1,9 +1,8 @@
 {
-  "extends": "../../tsconfig.esm.json",
+  "extends": "./tsconfig.json",
+
   "compilerOptions": {
-    "baseUrl": ".",
-    "outDir": "esm",
-    "experimentalDecorators": true
-  },
-  "include": ["src/**/*"]
+    "module": "es6",
+    "outDir": "esm"
+  }
 }

packages/angular/tsconfig.esm.json

@@ -1,8 +1,10 @@
 {
-  "extends": "./tsconfig.build.json",
-  "include": ["src/**/*.ts"],
-  "exclude": ["dist"],
+  "extends": "../../tsconfig.json",
+
+  "include": ["src/**/*"],
+
   "compilerOptions": {
-    "rootDir": "."
+    // package-specific options
+    "experimentalDecorators": true
   }
 }

packages/angular/tsconfig.json

@@ -0,0 +1,12 @@
+{
+  "extends": "./tsconfig.json",
+
+  "include": ["test/**/*"],
+
+  "compilerOptions": {
+    // should include all types from `./tsconfig.json` plus types for all test frameworks used
+    "types": ["jest"]
+
+    // other package-specific, test-specific options
+  }
+}

packages/angular/tsconfig.test.json

@@ -32,14 +32,17 @@
     "karma": "^4.1.0",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^2.2.0",
+    "karma-firefox-launcher": "^2.1.2",
     "karma-mocha": "^1.3.0",
     "karma-mocha-reporter": "^2.2.5",
     "karma-rollup-preprocessor": "^7.0.0",
     "karma-sinon": "^1.0.5",
     "karma-typescript": "^4.0.0",
     "karma-typescript-es6-transform": "^4.0.0",
+    "karma-webkit-launcher": "^1.0.2",
     "node-fetch": "^2.6.0",
     "npm-run-all": "^4.1.2",
+    "playwright": "^1.17.1",
     "prettier": "1.19.0",
     "rimraf": "^2.6.3",
     "rollup": "^1.10.1",
@@ -53,15 +56,17 @@
     "webpack": "^4.30.0"
   },
   "scripts": {
-    "build": "run-s build:es5 build:esm build:bundle",
+    "build": "run-p build:cjs build:esm build:bundle",
     "build:bundle": "rollup --config",
-    "build:dev": "run-s build:es5 build:esm",
-    "build:es5": "tsc -p tsconfig.build.json",
+    "build:cjs": "tsc -p tsconfig.cjs.json",
+    "build:dev": "run-p build:cjs build:esm",
+    "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***",
     "build:esm": "tsc -p tsconfig.esm.json",
-    "build:watch": "run-p build:es5:watch build:esm:watch build:bundle:watch",
+    "build:watch": "run-p build:cjs:watch build:esm:watch build:bundle:watch",
     "build:bundle:watch": "rollup --config --watch",
-    "build:dev:watch": "run-p build:es5:watch build:esm:watch",
-    "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput",
+    "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput",
+    "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***",
+    "build:dev:watch": "run-p build:cjs:watch build:esm:watch",
     "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput",
     "circularDepCheck": "madge --circular src/index.ts",
     "clean": "rimraf dist esm build coverage .rpt2_cache",

packages/browser/package.json

@@ -37,13 +37,13 @@ const paths = {
 
 const plugins = [
   typescript({
-    tsconfig: 'tsconfig.build.json',
+    tsconfig: 'tsconfig.esm.json',
     tsconfigOverride: {
       compilerOptions: {
         declaration: false,
         declarationMap: false,
-        module: 'ES2015',
         paths,
+        baseUrl: '.',
       },
     },
     include: ['*.ts+(|x)', '**/*.ts+(|x)', '../**/*.ts+(|x)'],
@@ -103,13 +103,13 @@ export default [
     },
     plugins: [
       typescript({
-        tsconfig: 'tsconfig.build.json',
+        tsconfig: 'tsconfig.esm.json',
         tsconfigOverride: {
           compilerOptions: {
             declaration: false,
             declarationMap: false,
-            module: 'ES2015',
             paths,
+            baseUrl: '.',
             target: 'es6',
           },
         },
@@ -126,13 +126,13 @@ export default [
     },
     plugins: [
       typescript({
-        tsconfig: 'tsconfig.build.json',
+        tsconfig: 'tsconfig.esm.json',
         tsconfigOverride: {
           compilerOptions: {
             declaration: false,
             declarationMap: false,
-            module: 'ES2015',
             paths,
+            baseUrl: '.',
             target: 'es6',
           },
         },