fix(build): Revert rollup-utils changes that broke package builds

The makeStripEsmPlugin and makeStripCjsPlugin additions to rollup-utils
were causing the build output to be incorrectly structured (files going
to browser/nextjs subdirectories instead of root).

Also fix import to use @sentry/react instead of @sentry/browser directly.

Author: BYK

dev-packages/rollup-utils/npmHelpers.mjs

@@ -18,8 +18,6 @@ import {
   makeNodeResolvePlugin,
   makeProductionReplacePlugin,
   makeRrwebBuildPlugin,
-  makeStripCjsPlugin,
-  makeStripEsmPlugin,
   makeSucrasePlugin,
 } from './plugins/index.mjs';
 import { makePackageNodeEsm } from './plugins/make-esm-plugin.mjs';
@@ -123,19 +121,13 @@ export function makeNPMConfigVariants(baseConfig, options = {}) {
 
   if (emitCjs) {
     if (splitDevProd) {
-      variantSpecificConfigs.push({
-        output: { format: 'cjs', dir: path.join(baseConfig.output.dir, 'cjs/dev') },
-        plugins: [makeStripEsmPlugin()],
-      });
+      variantSpecificConfigs.push({ output: { format: 'cjs', dir: path.join(baseConfig.output.dir, 'cjs/dev') } });
       variantSpecificConfigs.push({
         output: { format: 'cjs', dir: path.join(baseConfig.output.dir, 'cjs/prod') },
-        plugins: [makeProductionReplacePlugin(), makeStripEsmPlugin()],
+        plugins: [makeProductionReplacePlugin()],
       });
     } else {
-      variantSpecificConfigs.push({
-        output: { format: 'cjs', dir: path.join(baseConfig.output.dir, 'cjs') },
-        plugins: [makeStripEsmPlugin()],
-      });
+      variantSpecificConfigs.push({ output: { format: 'cjs', dir: path.join(baseConfig.output.dir, 'cjs') } });
     }
   }
 
@@ -145,22 +137,22 @@ export function makeNPMConfigVariants(baseConfig, options = {}) {
         output: {
           format: 'esm',
           dir: path.join(baseConfig.output.dir, 'esm/dev'),
-          plugins: [makeStripCjsPlugin(), makePackageNodeEsm()],
+          plugins: [makePackageNodeEsm()],
         },
       });
       variantSpecificConfigs.push({
         output: {
           format: 'esm',
           dir: path.join(baseConfig.output.dir, 'esm/prod'),
-          plugins: [makeProductionReplacePlugin(), makeStripCjsPlugin(), makePackageNodeEsm()],
+          plugins: [makeProductionReplacePlugin(), makePackageNodeEsm()],
         },
       });
     } else {
       variantSpecificConfigs.push({
         output: {
           format: 'esm',
           dir: path.join(baseConfig.output.dir, 'esm'),
-          plugins: [makeStripCjsPlugin(), makePackageNodeEsm()],
+          plugins: [makePackageNodeEsm()],
         },
       });
     }

dev-packages/rollup-utils/plugins/npmPlugins.mjs

@@ -143,58 +143,6 @@ export function makeProductionReplacePlugin() {
   };
 }
 
-/**
- * Creates a plugin to strip ESM-only code from CJS bundles.
- * ESM-only code should be wrapped in special comments:
- * /* rollup-esm-only *\/ ... /* rollup-esm-only-end *\/
- *
- * This is necessary for code that uses `import.meta` which causes syntax errors in CJS.
- *
- * @returns A rollup plugin that removes ESM-only blocks from CJS bundles.
- */
-export function makeStripEsmPlugin() {
-  const pattern = /\/\* rollup-esm-only \*\/[\s\S]*?\/\* rollup-esm-only-end \*\/\s*/g;
-
-  function stripEsmBlocks(code) {
-    if (!code) return null;
-    if (!code.includes('rollup-esm-only')) return null;
-    const replaced = code.replace(pattern, '');
-    return { code: replaced, map: null };
-  }
-
-  return {
-    name: 'strip-esm-only-blocks',
-    renderChunk(code) {
-      return stripEsmBlocks(code);
-    },
-  };
-}
-
-/**
- * Creates a plugin to strip CJS-only code from ESM bundles.
- * CJS-only code should be wrapped in special comments:
- * /* rollup-cjs-only *\/ ... /* rollup-cjs-only-end *\/
- *
- * @returns A rollup plugin that removes CJS-only blocks from ESM bundles.
- */
-export function makeStripCjsPlugin() {
-  const pattern = /\/\* rollup-cjs-only \*\/[\s\S]*?\/\* rollup-cjs-only-end \*\/\s*/g;
-
-  function stripCjsBlocks(code) {
-    if (!code) return null;
-    if (!code.includes('rollup-cjs-only')) return null;
-    const replaced = code.replace(pattern, '');
-    return { code: replaced, map: null };
-  }
-
-  return {
-    name: 'strip-cjs-only-blocks',
-    renderChunk(code) {
-      return stripCjsBlocks(code);
-    },
-  };
-}
-
 /**
  * Creates a plugin to replace build flags of rrweb with either a constant (if passed true/false) or with a safe statement that:
  * a) evaluates to `true`

packages/nextjs/src/client/index.ts

@@ -11,9 +11,12 @@ import {
   GLOBAL_OBJ,
   resolveSpotlightOptions,
 } from '@sentry/core';
-import { spotlightBrowserIntegration } from '@sentry/browser';
 import type { BrowserOptions } from '@sentry/react';
-import { getDefaultIntegrations as getReactDefaultIntegrations, init as reactInit } from '@sentry/react';
+import {
+  getDefaultIntegrations as getReactDefaultIntegrations,
+  init as reactInit,
+  spotlightBrowserIntegration,
+} from '@sentry/react';
 import { devErrorSymbolicationEventProcessor } from '../common/devErrorSymbolicationEventProcessor';
 import { getVercelEnv } from '../common/getVercelEnv';
 import { isRedirectNavigationError } from '../common/nextNavigationErrorUtils';