chore(build): test out preserveModules: false

dev-packages/browser-integration-tests/suites/integrations/ContextLines/noAddedLines/test.ts

@@ -16,7 +16,10 @@ sentryTest('should not add source context lines to errors from script files', as
 
   const exception = eventData.exception?.values?.[0];
   const frames = exception?.stacktrace?.frames;
-  expect(frames).toHaveLength(1);
+  expect(frames?.length).toBeGreaterThanOrEqual(1);
+  // Verify the subject.bundle.js frame is present
+  expect(frames?.some(f => f.filename?.includes('subject.bundle.js'))).toBe(true);
+  // Core assertion: no context lines should be added for script files
   frames?.forEach(f => {
     expect(f).not.toHaveProperty('pre_context');
     expect(f).not.toHaveProperty('context_line');

dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadata/test.ts

@@ -7,5 +7,9 @@ sentryTest('should provide module_metadata on stack frames in beforeSend', async
   const url = await getLocalTestUrl({ testDir: __dirname });
 
   const errorEvent = await getFirstSentryEnvelopeRequest<Event>(page, url);
-  expect(errorEvent.extra?.['module_metadata_entries']).toEqual([{ foo: 'bar' }]);
+  // Filter out null entries from internal Sentry frames that don't have module metadata
+  const metadataEntries = (errorEvent.extra?.['module_metadata_entries'] as Array<unknown>)?.filter(
+    entry => entry !== null,
+  );
+  expect(metadataEntries).toEqual([{ foo: 'bar' }]);
 });

dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadataWithRewriteFrames/test.ts

@@ -9,6 +9,10 @@ sentryTest(
     const url = await getLocalTestUrl({ testDir: __dirname });
 
     const errorEvent = await getFirstSentryEnvelopeRequest<Event>(page, url);
-    expect(errorEvent?.extra?.['module_metadata_entries']).toEqual([{ foo: 'baz' }]);
+    // Filter out null entries from internal Sentry frames that don't have module metadata
+    const metadataEntries = (errorEvent?.extra?.['module_metadata_entries'] as Array<unknown>)?.filter(
+      entry => entry !== null,
+    );
+    expect(metadataEntries).toEqual([{ foo: 'baz' }]);
   },
 );

dev-packages/e2e-tests/test-applications/nextjs-orpc/next.config.js

@@ -1,8 +1,8 @@
 /** @type {import("next").NextConfig} */
 const config = {};
 
-import { withSentryConfig } from '@sentry/nextjs';
+const { withSentryConfig } = require('@sentry/nextjs');
 
-export default withSentryConfig(config, {
+module.exports = withSentryConfig(config, {
   disableLogger: true,
 });

dev-packages/e2e-tests/test-applications/nextjs-orpc/package.json

@@ -2,7 +2,6 @@
   "name": "next-orpc",
   "version": "0.1.0",
   "private": true,
-  "type": "module",
   "scripts": {
     "build": "next build",
     "dev": "next dev -p 3030",

dev-packages/e2e-tests/test-applications/nextjs-t3/next.config.js

@@ -1,11 +1,11 @@
-await import('./src/env.js');
+require('./src/env.js');
 
 /** @type {import("next").NextConfig} */
 const config = {};
 
-import { withSentryConfig } from '@sentry/nextjs';
+const { withSentryConfig } = require('@sentry/nextjs');
 
-export default withSentryConfig(config, {
+module.exports = withSentryConfig(config, {
   disableLogger: true,
   silent: true,
 });

dev-packages/e2e-tests/test-applications/nextjs-t3/package.json

@@ -2,7 +2,6 @@
   "name": "t3",
   "version": "0.1.0",
   "private": true,
-  "type": "module",
   "scripts": {
     "build": "next build",
     "clean": "npx rimraf node_modules pnpm-lock.yaml",

dev-packages/e2e-tests/test-applications/sveltekit-2/vite.config.js

@@ -9,4 +9,9 @@ export default defineConfig({
     }),
     sveltekit(),
   ],
+  build: {
+    rollupOptions: {
+      external: ['fsevents'],
+    },
+  },
 });

dev-packages/node-core-integration-tests/package.json

@@ -12,7 +12,7 @@
   "scripts": {
     "build": "run-s build:transpile build:types",
     "build:dev": "yarn build",
-    "build:transpile": "rollup -c rollup.npm.config.mjs",
+    "build:transpile": "rolldown -c rollup.npm.config.mjs",
     "build:types": "tsc -p tsconfig.types.json",
     "clean": "rimraf -g **/node_modules && run-p clean:script",
     "clean:script": "node scripts/clean.js",

dev-packages/node-integration-tests/package.json

@@ -12,7 +12,7 @@
   "scripts": {
     "build": "run-s build:transpile build:types",
     "build:dev": "yarn build",
-    "build:transpile": "rollup -c rollup.npm.config.mjs",
+    "build:transpile": "rolldown -c rollup.npm.config.mjs",
     "build:types": "tsc -p tsconfig.types.json",
     "clean": "rimraf -g suites/**/node_modules suites/**/tmp_* && run-p clean:script",
     "clean:script": "node scripts/clean.js",

dev-packages/rollup-utils/bundleHelpers.mjs

@@ -3,56 +3,46 @@
  */
 
 import { builtinModules } from 'module';
-
+import path from 'node:path';
+import fs from 'node:fs';
 import deepMerge from 'deepmerge';
 
 import {
   makeBrowserBuildPlugin,
-  makeCleanupPlugin,
-  makeCommonJSPlugin,
   makeIsDebugBuildPlugin,
-  makeLicensePlugin,
-  makeNodeResolvePlugin,
   makeRrwebBuildPlugin,
   makeSetSDKSourcePlugin,
-  makeSucrasePlugin,
-  makeTerserPlugin,
+  makeBannerOptions,
+  makeMinifierOptions,
 } from './plugins/index.mjs';
-import { mergePlugins } from './utils.mjs';
-import { makeProductionReplacePlugin } from './plugins/npmPlugins.mjs';
+import { mergePlugins, treeShakePreset } from './utils.mjs';
 
 const BUNDLE_VARIANTS = ['.js', '.min.js', '.debug.min.js'];
 
+const packageDotJSON = JSON.parse(fs.readFileSync(path.resolve(process.cwd(), './package.json'), { encoding: 'utf8' }));
+
 export function makeBaseBundleConfig(options) {
-  const { bundleType, entrypoints, licenseTitle, outputFileBase, packageSpecificConfig, sucrase } = options;
+  const { bundleType, entrypoints, licenseTitle, outputFileBase, packageSpecificConfig } = options;
 
-  const nodeResolvePlugin = makeNodeResolvePlugin();
-  const sucrasePlugin = makeSucrasePlugin({}, sucrase);
-  const cleanupPlugin = makeCleanupPlugin();
   const markAsBrowserBuildPlugin = makeBrowserBuildPlugin(true);
-  const licensePlugin = makeLicensePlugin(licenseTitle);
+  const banner = makeBannerOptions(licenseTitle, packageDotJSON.version);
   const rrwebBuildPlugin = makeRrwebBuildPlugin({
     excludeIframe: false,
     excludeShadowDom: false,
   });
-  const productionReplacePlugin = makeProductionReplacePlugin();
-
-  // The `commonjs` plugin is the `esModuleInterop` of the bundling world. When used with `transformMixedEsModules`, it
-  // will include all dependencies, imported or required, in the final bundle. (Without it, CJS modules aren't included
-  // at all, and without `transformMixedEsModules`, they're only included if they're imported, not if they're required.)
-  const commonJSPlugin = makeCommonJSPlugin({ transformMixedEsModules: true });
 
   // used by `@sentry/browser`
   const standAloneBundleConfig = {
     output: {
+      banner,
       format: 'iife',
       name: 'Sentry',
       intro: () => {
         return 'exports = window.Sentry || {};';
       },
     },
     context: 'window',
-    plugins: [rrwebBuildPlugin, markAsBrowserBuildPlugin, licensePlugin],
+    plugins: [rrwebBuildPlugin, markAsBrowserBuildPlugin],
   };
 
   // used by `@sentry/wasm` & pluggable integrations from core/browser (bundles which need to be combined with a stand-alone SDK bundle)
@@ -63,7 +53,7 @@ export function makeBaseBundleConfig(options) {
       format: 'cjs',
 
       // code to add before the CJS wrapper
-      banner: '(function (__window) {',
+      banner: `${banner}\n(function (__window) {`,
 
       // code to add just inside the CJS wrapper, before any of the wrapped code
       intro: 'var exports = {};',
@@ -86,40 +76,48 @@ export function makeBaseBundleConfig(options) {
       // code to add after the CJS wrapper
       footer: '}(window));',
     },
-    plugins: [rrwebBuildPlugin, markAsBrowserBuildPlugin, licensePlugin],
+    plugins: [rrwebBuildPlugin, markAsBrowserBuildPlugin],
   };
 
   const workerBundleConfig = {
     output: {
+      banner,
       format: 'esm',
+      minify: makeMinifierOptions(),
     },
-    plugins: [commonJSPlugin, makeTerserPlugin(), licensePlugin],
     // Don't bundle any of Node's core modules
     external: builtinModules,
   };
 
   const awsLambdaExtensionBundleConfig = {
     output: {
       format: 'esm',
+      minify: makeMinifierOptions(),
     },
-    plugins: [commonJSPlugin, makeIsDebugBuildPlugin(true), makeTerserPlugin()],
+    plugins: [makeIsDebugBuildPlugin(true)],
     // Don't bundle any of Node's core modules
     external: builtinModules,
   };
 
   // used by all bundles
   const sharedBundleConfig = {
     input: entrypoints,
+    // Point to the package's tsconfig.json so rolldown respects TypeScript & JSX settings
+    tsconfig: path.resolve(process.cwd(), './tsconfig.json'),
+
+    // Enforce ES2020 target for all builds
+    transform: {
+      target: 'es2020',
+    },
+
     output: {
       // a file extension will be added to this base value when we specify either a minified or non-minified build
       entryFileNames: outputFileBase,
       dir: 'build',
       sourcemap: true,
-      strict: false,
       esModule: false,
     },
-    plugins: [productionReplacePlugin, sucrasePlugin, nodeResolvePlugin, cleanupPlugin],
-    treeshake: 'smallest',
+    treeshake: treeShakePreset('smallest'),
   };
 
   const bundleTypeConfigMap = {
@@ -149,7 +147,7 @@ export function makeBundleConfigVariants(baseConfig, options = {}) {
 
   const includeDebuggingPlugin = makeIsDebugBuildPlugin(true);
   const stripDebuggingPlugin = makeIsDebugBuildPlugin(false);
-  const terserPlugin = makeTerserPlugin();
+  const minifierOptions = makeMinifierOptions();
   const setSdkSourcePlugin = makeSetSDKSourcePlugin('cdn');
 
   // The additional options to use for each variant we're going to create.
@@ -164,22 +162,25 @@ export function makeBundleConfigVariants(baseConfig, options = {}) {
     '.min.js': {
       output: {
         entryFileNames: chunkInfo => `${baseConfig.output.entryFileNames(chunkInfo)}.min.js`,
+        minify: minifierOptions,
       },
-      plugins: [stripDebuggingPlugin, setSdkSourcePlugin, terserPlugin],
+      plugins: [stripDebuggingPlugin, setSdkSourcePlugin],
     },
 
     '.debug.min.js': {
       output: {
         entryFileNames: chunkInfo => `${baseConfig.output.entryFileNames(chunkInfo)}.debug.min.js`,
+        minify: minifierOptions,
       },
-      plugins: [includeDebuggingPlugin, setSdkSourcePlugin, terserPlugin],
+      plugins: [includeDebuggingPlugin, setSdkSourcePlugin],
     },
   };
 
   return variants.map(variant => {
     if (!BUNDLE_VARIANTS.includes(variant)) {
       throw new Error(`Unknown bundle variant requested: ${variant}`);
     }
+
     return deepMerge(baseConfig, variantSpecificConfigMap[variant], {
       // Merge the plugin arrays and make sure the end result is in the correct order. Everything else can use the
       // default merge strategy.

dev-packages/rollup-utils/index.mjs

@@ -1,7 +1,4 @@
-// TODO Is this necessary?
-import * as plugins from './plugins/index.mjs';
-export { plugins };
-
+export * from './plugins/index.mjs';
 export * from './bundleHelpers.mjs';
 export * from './npmHelpers.mjs';
-export { insertAt } from './utils.mjs';
+export { insertAt, treeShakePreset } from './utils.mjs';

dev-packages/rollup-utils/npmHelpers.mjs

@@ -8,17 +8,12 @@ import * as fs from 'fs';
 import { builtinModules } from 'module';
 import * as path from 'path';
 import { fileURLToPath } from 'url';
-
 import deepMerge from 'deepmerge';
-
-import { defineConfig } from 'rollup';
+import { defineConfig } from 'rolldown';
 import {
-  makeCleanupPlugin,
   makeDebugBuildStatementReplacePlugin,
-  makeNodeResolvePlugin,
   makeProductionReplacePlugin,
   makeRrwebBuildPlugin,
-  makeSucrasePlugin,
 } from './plugins/index.mjs';
 import { makePackageNodeEsm } from './plugins/make-esm-plugin.mjs';
 import { mergePlugins } from './utils.mjs';
@@ -34,22 +29,32 @@ export function makeBaseNPMConfig(options = {}) {
     entrypoints = ['src/index.ts'],
     hasBundles = false,
     packageSpecificConfig = {},
-    sucrase = {},
     bundledBuiltins = [],
   } = options;
 
-  const nodeResolvePlugin = makeNodeResolvePlugin();
-  const sucrasePlugin = makeSucrasePlugin({}, sucrase);
+  // Make sure subpath imports are also treated as external (e.g., 'solid-js/web' when 'solid-js' is external)
+  const externalWithSubpaths = [
+    ...Object.keys(packageDotJSON.dependencies || {}),
+    ...Object.keys(packageDotJSON.peerDependencies || {}),
+    ...Object.keys(packageDotJSON.optionalDependencies || {}),
+  ].map(dep => new RegExp(`^${dep}(?:/.*)?$`));
+
   const debugBuildStatementReplacePlugin = makeDebugBuildStatementReplacePlugin();
-  const cleanupPlugin = makeCleanupPlugin();
   const rrwebBuildPlugin = makeRrwebBuildPlugin({
     excludeShadowDom: undefined,
     excludeIframe: undefined,
   });
 
-  const defaultBaseConfig = {
+  const defaultBaseConfig = defineConfig({
     input: entrypoints,
 
+    // Point to the package's tsconfig.json so rolldown respects TypeScript & JSX settings
+    tsconfig: path.resolve(process.cwd(), './tsconfig.json'),
+
+    checks: {
+      pluginTimings: true,
+    },
+
     output: {
       // an appropriately-named directory will be added to this base value when we specify either a cjs or esm build
       dir: hasBundles ? 'build/npm' : 'build',
@@ -59,17 +64,11 @@ export function makeBaseNPMConfig(options = {}) {
       // Include __esModule property when there is a default prop
       esModule: 'if-default-prop',
 
-      // output individual files rather than one big bundle
-      preserveModules: true,
-
       // Allow wrappers or helper functions generated by rollup to use any ES2015 features
       generatedCode: {
         preset: 'es2015',
       },
 
-      // don't add `"use strict"` to the top of cjs files
-      strict: false,
-
       // do TS-3.8-style exports
       //     exports.dogs = are.great
       // rather than TS-3.9-style exports
@@ -78,12 +77,6 @@ export function makeBaseNPMConfig(options = {}) {
       //       get: () => are.great,
       //     });
       externalLiveBindings: false,
-
-      // Don't call `Object.freeze` on the results of `import * as someModule from '...'`
-      // (We don't need it, so why waste the bytes?)
-      freeze: false,
-
-      interop: 'esModule',
     },
 
     treeshake: {
@@ -97,16 +90,16 @@ export function makeBaseNPMConfig(options = {}) {
       },
     },
 
-    plugins: [nodeResolvePlugin, sucrasePlugin, debugBuildStatementReplacePlugin, rrwebBuildPlugin, cleanupPlugin],
+    // Enforce ES2020 target for all builds
+    transform: {
+      target: 'es2020',
+    },
+
+    plugins: [debugBuildStatementReplacePlugin, rrwebBuildPlugin],
 
     // don't include imported modules from outside the package in the final output
-    external: [
-      ...builtinModules.filter(m => !bundledBuiltins.includes(m)),
-      ...Object.keys(packageDotJSON.dependencies || {}),
-      ...Object.keys(packageDotJSON.peerDependencies || {}),
-      ...Object.keys(packageDotJSON.optionalDependencies || {}),
-    ],
-  };
+    external: [...builtinModules.filter(m => !bundledBuiltins.includes(m)), ...externalWithSubpaths],
+  });
 
   return deepMerge(defaultBaseConfig, packageSpecificConfig, {
     // Plugins have to be in the correct order or everything breaks, so when merging we have to manually re-order them