Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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' }]);
});
Original file line number Diff line number Diff line change
Expand Up @@ -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' }]);
},
);
Original file line number Diff line number Diff line change
@@ -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, {
webpack: {
treeshake: {
removeDebugLogging: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/** @type {import("next").NextConfig} */
const config = {};

import { withSentryConfig } from '@sentry/nextjs';
const { withSentryConfig } = require('@sentry/nextjs');

export default withSentryConfig(config, {
module.exports = withSentryConfig(config, {
webpack: {
treeshake: {
removeDebugLogging: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "next-orpc",
"version": "0.1.0",
"private": true,
"type": "module",
"scripts": {
"build": "next build",
"dev": "next dev -p 3030",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,9 @@ export default defineConfig({
}),
sveltekit(),
],
build: {
rollupOptions: {
external: ['fsevents'],
},
},
});
2 changes: 1 addition & 1 deletion dev-packages/node-integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
65 changes: 36 additions & 29 deletions dev-packages/rollup-utils/bundleHelpers.mjs
Original file line number Diff line number Diff line change
@@ -1,56 +1,50 @@
/**
* Rollup config docs: https://rollupjs.org/guide/en/#big-list-of-options
* Rolldown config docs: https://rolldown.rs/reference/config-options
*/

import { builtinModules } from 'module';
import * as fs from 'fs';
import * as path from 'path';

import deepMerge from 'deepmerge';

import {
makeBannerOptions,
makeBrowserBuildPlugin,
makeCommonJSPlugin,
makeEsbuildPlugin,
makeIsDebugBuildPlugin,
makeLicensePlugin,
makeNodeResolvePlugin,
makeMinifierOptions,
makeRrwebBuildPlugin,
makeSetSDKSourcePlugin,
makeTerserPlugin,
} from './plugins/index.mjs';
import { mergePlugins } from './utils.mjs';
import { getNodeBuiltIns, mergePlugins, treeShakePreset } from './utils.mjs';
import { makeProductionReplacePlugin } from './plugins/npmPlugins.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, esbuild } = options;
const { bundleType, entrypoints, licenseTitle, outputFileBase, packageSpecificConfig } = options;

const nodeResolvePlugin = makeNodeResolvePlugin();
const transpilePlugin = makeEsbuildPlugin(esbuild);
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)
Expand All @@ -61,7 +55,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 = {};',
Expand All @@ -84,30 +78,41 @@ 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,
external: getNodeBuiltIns(),
};

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,
external: getNodeBuiltIns(),
};

// used by all bundles
const sharedBundleConfig = {
input: entrypoints,

// Point at the package's tsconfig so rolldown picks up its TypeScript & JSX settings.
tsconfig: path.resolve(process.cwd(), './tsconfig.json'),

// ES2020 is our floor: keeps `?.`/`??` native and downlevels everything newer.
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,
Expand All @@ -116,8 +121,8 @@ export function makeBaseBundleConfig(options) {
strict: false,
esModule: false,
},
plugins: [productionReplacePlugin, transpilePlugin, nodeResolvePlugin],
treeshake: 'smallest',
plugins: [productionReplacePlugin],
treeshake: treeShakePreset('smallest'),
};

const bundleTypeConfigMap = {
Expand Down Expand Up @@ -147,7 +152,7 @@ export function makeBundleConfigVariants(baseConfig, options = {}) {

const includeDebuggingPlugin = makeIsDebugBuildPlugin(true);
const stripDebuggingPlugin = makeIsDebugBuildPlugin(false);
const terserPlugin = makeTerserPlugin();
const minify = makeMinifierOptions();
const setSdkSourcePlugin = makeSetSDKSourcePlugin('cdn');

// The additional options to use for each variant we're going to create.
Expand All @@ -162,15 +167,17 @@ export function makeBundleConfigVariants(baseConfig, options = {}) {
'.min.js': {
output: {
entryFileNames: chunkInfo => `${baseConfig.output.entryFileNames(chunkInfo)}.min.js`,
minify,
},
plugins: [stripDebuggingPlugin, setSdkSourcePlugin, terserPlugin],
plugins: [stripDebuggingPlugin, setSdkSourcePlugin],
},

'.debug.min.js': {
output: {
entryFileNames: chunkInfo => `${baseConfig.output.entryFileNames(chunkInfo)}.debug.min.js`,
minify,
},
plugins: [includeDebuggingPlugin, setSdkSourcePlugin, terserPlugin],
plugins: [includeDebuggingPlugin, setSdkSourcePlugin],
},
};

Expand Down
2 changes: 1 addition & 1 deletion dev-packages/rollup-utils/index.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ export { plugins };

export * from './bundleHelpers.mjs';
export * from './npmHelpers.mjs';
export { insertAt } from './utils.mjs';
export { insertAt, treeShakePreset } from './utils.mjs';
56 changes: 32 additions & 24 deletions dev-packages/rollup-utils/npmHelpers.mjs
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
// @ts-check

/**
* Rollup config docs: https://rollupjs.org/guide/en/#big-list-of-options
* Rolldown config docs: https://rolldown.rs/reference/config-options
*/

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 {
makeDebugBuildStatementReplacePlugin,
makeEsbuildPlugin,
makeEsmCjsReplacePlugin,
makeNodeResolvePlugin,
makeProductionReplacePlugin,
makeRrwebBuildPlugin,
} from './plugins/index.mjs';
import { makePackageNodeEsm } from './plugins/make-esm-plugin.mjs';
import { mergeExternals, mergePlugins } from './utils.mjs';
import { getNodeBuiltIns, mergeExternals, mergePlugins } from './utils.mjs';

const __dirname = path.dirname(fileURLToPath(import.meta.url));

Expand All @@ -34,20 +31,17 @@ export function makeBaseNPMConfig(options = {}) {
entrypoints = ['src/index.ts'],
hasBundles = false,
packageSpecificConfig = {},
esbuild = {},
bundledBuiltins = [],
} = options;

const nodeResolvePlugin = makeNodeResolvePlugin();
const transpilePlugin = makeEsbuildPlugin(esbuild);
const debugBuildStatementReplacePlugin = makeDebugBuildStatementReplacePlugin();
const rrwebBuildPlugin = makeRrwebBuildPlugin({
excludeShadowDom: undefined,
excludeIframe: undefined,
});

const deps = [
...builtinModules.filter(m => !bundledBuiltins.includes(m)),
...getNodeBuiltIns(bundledBuiltins),
...Object.keys(packageDotJSON.dependencies || {}),
...Object.keys(packageDotJSON.peerDependencies || {}),
...Object.keys(packageDotJSON.optionalDependencies || {}),
Expand All @@ -56,6 +50,22 @@ export function makeBaseNPMConfig(options = {}) {
const defaultBaseConfig = {
input: entrypoints,

// Point at the package's tsconfig so rolldown picks up its TypeScript & JSX settings.
tsconfig: path.resolve(process.cwd(), './tsconfig.json'),

// NOTE: we deliberately leave `platform` unset so rolldown infers it from the output format
// ('node' for cjs, 'browser' for everything else). Every explicit value breaks something:
// 'node' injects `import "node:module"` into each runtime chunk, which webpack rejects for
// browser targets; 'neutral' rewrites `import.meta` to `{}`, so `createRequire(import.meta.url)`
// gets `undefined`. Node-only packages that need the node platform for both halves set it
// themselves (see server-utils and bundler-plugins).

// ES2020 is our floor: keeps `?.`/`??` native and downlevels everything newer. Packages that
// need more (e.g. top-level await) raise it through `packageSpecificConfig`.
transform: {
target: 'es2020',
},

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',
Expand All @@ -67,6 +77,7 @@ export function makeBaseNPMConfig(options = {}) {

// output individual files rather than one big bundle
preserveModules: true,
preserveModulesRoot: 'src',

// Don't hoist imports into entrypoints
// should be ignored when `preserveModules` is used,
Expand All @@ -89,19 +100,17 @@ 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,

// Assume externals are ESM-shaped (`__esModule` + `.default`), which our own `@sentry/*`
// packages satisfy via `esModule: 'if-default-prop'`. This keeps `import * as x` a live
// reference to the real module rather than an `_interopNamespace` copy — instrumentation code
// relies on that to monkey-patch modules like `fs` in place. Packages that pull in bare-CJS
// third-party deps (no `.default`) override this per-module (see server-utils).
interop: 'esModule',
},

// NOTE: rolldown has no equivalent of rollup's `output.interop`. In the CJS build it wraps
// namespace imports of externals as `x = __toESM(require('x'))`, and `__toESM` returns a copy
// whose properties are getter-only forwarders. Reads pass through to the real module but writes
// do not, so code that monkey-patches a module in place has to default-import it (`import x
// from 'x'`, whose `.default` is the live `require()` result) rather than namespace-import it.
// Rolldown errors on a statically visible `ns.foo = ...` (ASSIGN_TO_IMPORT), but it cannot see a
// write made through a helper, and that one fails silently. See
// `packages/node/src/integrations/fs/vendored/instrumentation.ts`.

treeshake: {
moduleSideEffects: (id, external) => {
if (external === false && ignoreSideEffects.test(id)) {
Expand All @@ -119,7 +128,7 @@ export function makeBaseNPMConfig(options = {}) {
},
},

plugins: [nodeResolvePlugin, transpilePlugin, debugBuildStatementReplacePlugin, rrwebBuildPlugin],
plugins: [debugBuildStatementReplacePlugin, rrwebBuildPlugin],

// don't include imported modules from outside the package in the final output
// also treat subpath exports (e.g. `@sentry/core/browser`) as external
Expand Down Expand Up @@ -181,8 +190,7 @@ export function makeNPMConfigVariants(baseConfig, options = {}) {
}

return variantSpecificConfigs.map(variant =>
// Plugin arrays must be merged in the right order or the build silently misbehaves
// (e.g. esbuild strips dev-mode marker comments before the replace plugin can act).
// Plugin arrays must be merged in the right order or the build silently misbehaves.
deepMerge(baseConfig, variant, {
customMerge: key => (key === 'plugins' ? mergePlugins : undefined),
}),
Expand Down
Loading
Loading