chore(build): test out preserveModules: false

dev-packages/rollup-utils/npmHelpers.mjs

@@ -64,12 +64,6 @@ 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,
-
-      // output files relative to the src directory
-      preserveModulesRoot: 'src',
-
       // Allow wrappers or helper functions generated by rollup to use any ES2015 features
       generatedCode: {
         preset: 'es2015',

dev-packages/test-utils/rollup.npm.config.mjs

@@ -6,7 +6,6 @@ export default makeNPMConfigVariants(
       output: {
         // set exports to 'named' or 'auto' so that rollup doesn't warn
         exports: 'named',
-        preserveModules: false,
       },
     },
   }),

packages/astro/package.json

@@ -34,9 +34,9 @@
     },
     "./middleware": {
       "types": "./build/types/integration/middleware/index.types.d.ts",
-      "node": "./build/esm/integration/middleware/index.js",
-      "import": "./build/esm/integration/middleware/index.js",
-      "require": "./build/cjs/integration/middleware/index.js"
+      "node": "./build/esm/middleware.js",
+      "import": "./build/esm/middleware.js",
+      "require": "./build/cjs/middleware.js"
     },
     "./import": {
       "import": {

packages/astro/rollup.npm.config.mjs

@@ -2,15 +2,13 @@ import { makeBaseNPMConfig, makeNPMConfigVariants, makeOtelLoaders } from '@sent
 
 const variants = makeNPMConfigVariants(
   makeBaseNPMConfig({
-    entrypoints: ['src/index.server.ts', 'src/index.client.ts', 'src/integration/middleware/index.ts'],
+    entrypoints: ['src/index.server.ts', 'src/index.client.ts', 'src/integration/middleware.ts'],
     packageSpecificConfig: {
       output: {
         dynamicImportInCjs: true,
         exports: 'named',
       },
     },
-    // Astro is Node 18+ no need to add polyfills
-    addPolyfills: false,
   }),
 );
 

packages/astro/src/integration/middleware/index.ts → packages/astro/src/integration/middleware.ts

@@ -1,5 +1,5 @@
 import type { MiddlewareResponseHandler } from 'astro';
-import { handleRequest } from '../../server/middleware';
+import { handleRequest } from '../server/middleware';
 
 /**
  * This export is used by our integration to automatically add the middleware

packages/browser-utils/rollup.npm.config.mjs

@@ -9,7 +9,7 @@ export default makeNPMConfigVariants(
         // set preserveModules to true because we don't want to bundle everything into one file.
         preserveModules:
           process.env.SENTRY_BUILD_PRESERVE_MODULES === undefined
-            ? true
+            ? false
             : Boolean(process.env.SENTRY_BUILD_PRESERVE_MODULES),
       },
     },

packages/browser/rollup.npm.config.mjs

@@ -11,7 +11,7 @@ export default makeNPMConfigVariants(
         // set preserveModules to true because we don't want to bundle everything into one file.
         preserveModules:
           process.env.SENTRY_BUILD_PRESERVE_MODULES === undefined
-            ? true
+            ? false
             : Boolean(process.env.SENTRY_BUILD_PRESERVE_MODULES),
       },
     },

packages/core/rollup.npm.config.mjs

@@ -20,10 +20,9 @@ export default makeNPMConfigVariants(
       output: {
         // set exports to 'named' or 'auto' so that rollup doesn't warn
         exports: 'named',
-        // set preserveModules to true because we don't want to bundle everything into one file.
         preserveModules:
           process.env.SENTRY_BUILD_PRESERVE_MODULES === undefined
-            ? true
+            ? false
             : Boolean(process.env.SENTRY_BUILD_PRESERVE_MODULES),
       },
       plugins: [

packages/nextjs/rollup.npm.config.mjs

@@ -1,4 +1,5 @@
 import { makeBaseNPMConfig, makeNPMConfigVariants, makeOtelLoaders } from '@sentry-internal/rollup-utils';
+import path from 'path';
 
 export default [
   ...makeNPMConfigVariants(
@@ -55,7 +56,7 @@ export default [
 
       packageSpecificConfig: {
         output: {
-          virtualDirname: '_virtual/loaders',
+          virtualDirname: '_virtual/templates',
 
           // this is going to be add-on code, so it doesn't need the trappings of a full module (and in fact actively
           // shouldn't have them, lest they muck with the module to which we're adding it)
@@ -101,22 +102,45 @@ import * as serverComponentModule from "__SENTRY_WRAPPING_TARGET_FILE__";${code.
         ],
       },
     }),
-  ),
+  ).map(v => {
+    // copy the templates into the config/templates directory relative to the esm/cjs build directory
+    return {
+      ...v,
+      output: {
+        ...v.output,
+        dir: path.join(v.output.dir, 'config/templates'),
+      },
+    };
+  }),
   ...makeNPMConfigVariants(
     makeBaseNPMConfig({
-      entrypoints: ['src/config/loaders/index.ts'],
+      entrypoints: [
+        'src/config/loaders/index.ts',
+        'src/config/loaders/valueInjectionLoader.ts',
+        'src/config/loaders/prefixLoader.ts',
+        'src/config/loaders/wrappingLoader.ts',
+      ],
 
       packageSpecificConfig: {
         output: {
-          virtualDirname: '_virtual/polyfills',
+          virtualDirname: '_virtual/loaders',
 
           // make it so Rollup calms down about the fact that we're combining default and named exports
           exports: 'named',
         },
         external: ['@rollup/plugin-commonjs', 'rollup'],
       },
     }),
-  ),
+  ).map(v => {
+    // copy the loaders into the config/loaders directory relative to the esm/cjs build directory
+    return {
+      ...v,
+      output: {
+        ...v.output,
+        dir: path.join(v.output.dir, 'config/loaders'),
+      },
+    };
+  }),
   ...makeNPMConfigVariants(
     makeBaseNPMConfig({
       entrypoints: ['src/config/polyfills/perf_hooks.js'],

packages/node-native/rollup.npm.config.mjs

@@ -8,7 +8,6 @@ export default makeNPMConfigVariants(
         dir: 'build',
         // set exports to 'named' or 'auto' so that rollup doesn't warn
         exports: 'named',
-        preserveModules: true,
       },
     },
   }),

packages/node/rollup.npm.config.mjs

@@ -9,7 +9,6 @@ export default [
         output: {
           // set exports to 'named' or 'auto' so that rollup doesn't warn
           exports: 'named',
-          preserveModules: true,
         },
       },
     }),

packages/vercel-edge/rollup.npm.config.mjs

@@ -35,9 +35,6 @@ const baseConfig = makeBaseNPMConfig({
   bundledBuiltins: ['perf_hooks', 'util'],
   packageSpecificConfig: {
     context: 'globalThis',
-    output: {
-      preserveModules: false,
-    },
     plugins: [
       replacePlugin(
         {