Merge branch 'master' into abhi-reset-idletimeout

Author: AbhiPrasad

.github/workflows/build.yml

@@ -276,9 +276,26 @@ jobs:
             ${{ github.workspace }}/packages/serverless/dist-awslambda-layer/*.zip
 
   job_browser_playwright_tests:
-    name: Browser Playwright Tests
+    name: Browser Playwright Tests (${{ matrix.bundle }} - tracing_only = ${{ matrix.tracing_only }})
     needs: job_build
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        bundle:
+          - esm
+          - cjs
+          - bundle_es5
+          - bundle_es5_min
+          - bundle_es6
+          - bundle_es6_min
+        tracing_only:
+          - true
+          - false
+        exclude:
+          - bundle: esm
+            tracing_only: true
+          - bundle: cjs
+            tracing_only: true
     steps:
       - name: Check out current commit (${{ github.sha }})
         uses: actions/checkout@v2
@@ -297,6 +314,9 @@ jobs:
           path: ${{ env.CACHED_BUILD_PATHS }}
           key: ${{ env.BUILD_CACHE_KEY }}
       - name: Run Playwright tests
+        env:
+          PW_BUNDLE: ${{ matrix.bundle }}
+          PW_TRACING_ONLY: ${{ matrix.tracing_only }}
         run: |
           cd packages/integration-tests
           yarn run playwright install-deps webkit

packages/browser/rollup.config.js

@@ -1,12 +1,16 @@
 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 replace from '@rollup/plugin-replace';
 
-const commitHash = require('child_process')
-  .execSync('git rev-parse --short HEAD', { encoding: 'utf-8' })
-  .trim();
+import {
+  baseBundleConfig,
+  makeLicensePlugin,
+  markAsBrowserBuild,
+  nodeResolvePlugin,
+  paths,
+  typescriptPluginES5,
+} from '../../rollup.config';
+
+const licensePlugin = makeLicensePlugin();
 
 const terserInstance = terser({
   compress: {
@@ -37,60 +41,23 @@ const terserInstance = terser({
   },
 });
 
-const paths = {
-  '@sentry/utils': ['../utils/src'],
-  '@sentry/core': ['../core/src'],
-  '@sentry/hub': ['../hub/src'],
-  '@sentry/types': ['../types/src'],
-  '@sentry/minimal': ['../minimal/src'],
-};
-
 const plugins = [
-  typescript({
-    tsconfig: 'tsconfig.esm.json',
-    tsconfigOverride: {
-      compilerOptions: {
-        declaration: false,
-        declarationMap: false,
-        paths,
-        baseUrl: '.',
-      },
-    },
-    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'],
-  }),
+  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',
-    sourcemap: true,
-    strict: false,
-    esModule: false,
   },
   context: 'window',
-  plugins: [
-    ...plugins,
-    license({
-      sourcemap: true,
-      banner: `/*! @sentry/browser <%= pkg.version %> (${commitHash}) | https://github.com/getsentry/sentry-javascript */`,
-    }),
-  ],
-  treeshake: 'smallest',
+  plugins: [...plugins, licensePlugin],
 };
 
 export default [
@@ -109,10 +76,7 @@ export default [
       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)),
+    plugins: bundleConfig.plugins.slice(0, -1).concat(terserInstance).concat(bundleConfig.plugins.slice(-1)),
   },
   // ------------------
   // ES6 Browser Bundle
@@ -159,11 +123,7 @@ export default [
         },
         include: ['*.ts+(|x)', '**/*.ts+(|x)', '../**/*.ts+(|x)'],
       }),
-      ...plugins
-        .slice(1)
-        .slice(0, -1)
-        .concat(terserInstance)
-        .concat(bundleConfig.plugins.slice(-1)),
+      ...plugins.slice(1).slice(0, -1).concat(terserInstance).concat(bundleConfig.plugins.slice(-1)),
     ],
   },
   // ------------------

packages/integration-tests/README.md

@@ -56,6 +56,9 @@ To filter tests by their title:
 
 You can refer to [Playwright documentation](https://playwright.dev/docs/test-cli) for other CLI options.
 
+You can set env variable `PW_BUNDLE` to set specific build or bundle to test against.
+Available options: `esm`, `cjs`, `bundle_es5`, `bundle_es5_min`, `bundle_es6`, `bundle_es6_min`
+
 ### Troubleshooting
 
 Apart from [Playwright-specific issues](https://playwright.dev/docs/troubleshooting), below are common issues that might occur while writing tests for Sentry Browser SDK.

packages/integration-tests/package.json

@@ -13,16 +13,21 @@
     "lint": "run-s lint:prettier lint:eslint",
     "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish",
     "lint:prettier": "prettier --check \"{suites,utils}/**/*.ts\"",
-    "test:ci": "playwright test ./suites --browser='all' --reporter='line'",
     "type-check": "tsc",
     "pretest": "yarn clean && yarn type-check",
-    "test": "playwright test ./suites"
+    "test": "playwright test ./suites",
+    "test:bundle:es5": "PW_BUNDLE=bundle_es5 yarn test",
+    "test:bundle:es5:min": "PW_BUNDLE=bundle_es5_min yarn test",
+    "test:bundle:es6": "PW_BUNDLE=bundle_es6 yarn test",
+    "test:bundle:es6:min": "PW_BUNDLE=bundle_es6_min yarn test",
+    "test:cjs": "PW_BUNDLE=cjs yarn test",
+    "test:esm": "PW_BUNDLE=esm yarn test",
+    "test:ci": "playwright test ./suites --browser='all' --reporter='line'"
   },
   "dependencies": {
     "@babel/preset-typescript": "^7.16.7",
     "@playwright/test": "^1.17.0",
     "babel-loader": "^8.2.2",
-    "handlebars-loader": "^1.7.1",
     "html-webpack-plugin": "^5.5.0",
     "playwright": "^1.17.1",
     "typescript": "^4.5.2",