Address review comments.

Author: onurtemizkan

.github/workflows/build.yml

@@ -284,8 +284,8 @@ jobs:
         bundle:
           - esm
           - cjs
-          - bundle
-          - bundle_min
+          - bundle_es5
+          - bundle_es5_min
           - bundle_es6
           - bundle_es6_min
         tracing_only:

packages/integration-tests/README.md

@@ -57,7 +57,7 @@ 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`, `dist`, `bundle`, `bundle_min`, `bundle_es6`, `bundle_es6_min`
+Available options: `esm`, `cjs`, `bundle_es5`, `bundle_es5_min`, `bundle_es6`, `bundle_es6_min`
 
 ### Troubleshooting
 

packages/integration-tests/package.json

@@ -16,8 +16,8 @@
     "type-check": "tsc",
     "pretest": "yarn clean && yarn type-check",
     "test": "playwright test ./suites",
-    "test:bundle": "PW_BUNDLE=bundle yarn test",
-    "test:bundle:min": "PW_BUNDLE=bundle_min yarn test",
+    "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",

packages/integration-tests/utils/generatePlugin.ts

@@ -4,7 +4,7 @@ import HtmlWebpackPlugin, { createHtmlTagObject } from 'html-webpack-plugin';
 import path from 'path';
 import { Compiler } from 'webpack';
 
-const PACKAGE_PATH = '../../packages';
+const PACKAGES_DIR = '../../packages';
 
 const tracingOnly = process.env.PW_TRACING_ONLY === 'true';
 const bundleKey = process.env.PW_BUNDLE;
@@ -19,47 +19,54 @@ const BUNDLE_PATHS: Record<string, Record<string, string>> = {
   browser: {
     cjs: 'dist/index.js',
     esm: 'esm/index.js',
-    bundle: 'build/bundle.js',
-    bundle_min: 'build/bundle.min.js',
+    bundle_es5: 'build/bundle.js',
+    bundle_es5_min: 'build/bundle.min.js',
     bundle_es6: 'build/bundle.es6.js',
     bundle_es6_min: 'build/bundle.es6.min.js',
   },
   tracing: {
     cjs: 'dist/index.js',
     esm: 'esm/index.js',
-    bundle: 'build/bundle.tracing.js',
-    bundle_min: 'build/bundle.tracing.min.js',
-    // `tracing` doesn't have an es6 build
+    bundle_es5: 'build/bundle.tracing.js',
+    bundle_es5_min: 'build/bundle.tracing.min.js',
+    // `tracing` doesn't have an es6 build yet
     bundle_es6: 'build/bundle.tracing.js',
     bundle_es6_min: 'build/bundle.tracing.min.js',
   },
 };
 
-/**
+/*
  * Generate webpack aliases based on packages in monorepo
- * Example of an alias: '@sentry/serverless': 'path/to/sentry-javascript/packages/serverless',
+ *
+ * When using compiled versions of the tracing and browser packages, their aliases look for example like
+ *     '@sentry/browser': 'path/to/sentry-javascript/packages/browser/esm/index.js'
+ * When using bundled versions of the tracing and browser packages, their aliases look for example like
+ *     '@sentry/browser': false
+ * so that the compiled versions aren't included
+ * All other packages are aliased for example like
+ *     '@sentry/serverless': 'path/to/sentry-javascript/packages/serverless'
  */
 function generateSentryAlias(): Record<string, string> {
-  const dirents = readdirSync(PACKAGE_PATH, { withFileTypes: true })
+  const packageNames = readdirSync(PACKAGES_DIR, { withFileTypes: true })
     .filter(dirent => dirent.isDirectory())
     .map(dir => dir.name);
 
   return Object.fromEntries(
-    dirents.map(d => {
+    packageNames.map(packageName => {
       const packageJSON: Package = JSON.parse(
-        readFileSync(path.resolve(PACKAGE_PATH, d, 'package.json'), { encoding: 'utf-8' }).toString(),
+        readFileSync(path.resolve(PACKAGES_DIR, packageName, 'package.json'), { encoding: 'utf-8' }).toString(),
       );
 
-      const modulePath = path.resolve(PACKAGE_PATH, d);
+      const modulePath = path.resolve(PACKAGES_DIR, packageName);
 
-      if (useCompiledModule && bundleKey && BUNDLE_PATHS[d]?.[bundleKey]) {
-        const bundlePath = path.resolve(modulePath, BUNDLE_PATHS[d][bundleKey]);
+      if (useCompiledModule && bundleKey && BUNDLE_PATHS[packageName]?.[bundleKey]) {
+        const bundlePath = path.resolve(modulePath, BUNDLE_PATHS[packageName][bundleKey]);
 
         return [packageJSON['name'], bundlePath];
       }
 
-      if (useBundle && bundleKey && BUNDLE_PATHS[d]?.[bundleKey]) {
-        // If we're injecting a bundle, ignore the webpack import.
+      if (useBundle && bundleKey) {
+        // If we're injecting a bundle, ignore the webpack imports.
         return [packageJSON['name'], false];
       }
 
@@ -99,9 +106,10 @@ class SentryScenarioGenerationPlugin {
     compiler.hooks.compilation.tap(this._name, compilation => {
       HtmlWebpackPlugin.getHooks(compilation).alterAssetTags.tapAsync(this._name, (data, cb) => {
         if (useBundle && bundleKey) {
-          const bundleName = tracingOnly || this.requiresTracing ? 'tracing' : 'browser';
+          const useTracingBundle = tracingOnly || this.requiresTracing;
+          const bundleName = useTracingBundle ? 'tracing' : 'browser';
           const bundleObject = createHtmlTagObject('script', {
-            src: path.resolve(PACKAGE_PATH, bundleName, BUNDLE_PATHS[bundleName][bundleKey]),
+            src: path.resolve(PACKAGES_DIR, bundleName, BUNDLE_PATHS[bundleName][bundleKey]),
           });
 
           data.assetTags.scripts.unshift(bundleObject);