Commit eebe164

Browse files
cursoragentclaude
andcommitted
fix(core): restore patchExpressModule legacy signature compatibility
Add an overload and runtime fallback for the deprecated single-options argument, reintroduce the deprecated ExpressIntegrationOptions.express field, and add a regression test for legacy callers. Co-Authored-By: gpt-5.3-codex-high <noreply@anthropic.com>
1 parent 29b7472 commit eebe164

3 files changed

Lines changed: 74 additions & 6 deletions

File tree

‎packages/core/src/integrations/express/index.ts‎

Lines changed: 50 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ import { setSDKProcessingMetadata } from './set-sdk-processing-metadata';
6060
constgetExpressExport=(express: ExpressModuleExport): ExpressExport=>
6161
hasDefaultProp(express) ? express.default : (expressasExpressExport);
6262

63+
typeLegacyPatchExpressModuleOptions=ExpressIntegrationOptions&{
64+
express: ExpressModuleExport;
65+
};
66+
67+
let_didWarnLegacyPatchExpressModule=false;
68+
6369
/**
6470
* This is a portable instrumentatiton function that works in any environment
6571
* where Express can be loaded, without depending on OpenTelemetry.
@@ -72,7 +78,46 @@ const getExpressExport = (express: ExpressModuleExport): ExpressExport =>
7278
* Sentry.patchExpressModule(express, () => ({}));
7379
* ```
7480
*/
75-
exportconstpatchExpressModule=(moduleExports: ExpressModuleExport,getOptions: ()=>ExpressIntegrationOptions)=>{
81+
exportfunctionpatchExpressModule(
82+
moduleExports: ExpressModuleExport,
83+
getOptions: ()=>ExpressIntegrationOptions,
84+
): ExpressExport;
85+
/**
86+
* @deprecated Pass the Express module export as the first argument and options getter as the second argument.
87+
*/
88+
exportfunctionpatchExpressModule(options: LegacyPatchExpressModuleOptions): ExpressExport;
89+
exportfunctionpatchExpressModule(
90+
moduleExportsOrOptions: ExpressModuleExport|LegacyPatchExpressModuleOptions,
91+
getOptions?: ()=>ExpressIntegrationOptions,
92+
): ExpressExport{
93+
constisLegacyOptionsObject=
94+
!getOptions&&
95+
typeofmoduleExportsOrOptions==='object'&&
96+
moduleExportsOrOptions!==null&&
97+
'express'inmoduleExportsOrOptions;
98+
99+
letmoduleExports: ExpressModuleExport;
100+
letgetExpressOptions: ()=>ExpressIntegrationOptions;
101+
102+
if(isLegacyOptionsObject){
103+
moduleExports=moduleExportsOrOptions.express;
104+
getExpressOptions=()=>moduleExportsOrOptions;
105+
}else{
106+
moduleExports=moduleExportsOrOptions;
107+
if(!getOptions){
108+
thrownewTypeError('`patchExpressModule(moduleExports, getOptions)` requires a `getOptions` callback');
109+
}
110+
getExpressOptions=getOptions;
111+
}
112+
113+
if(isLegacyOptionsObject&&!_didWarnLegacyPatchExpressModule){
114+
_didWarnLegacyPatchExpressModule=true;
115+
DEBUG_BUILD&&
116+
debug.warn(
117+
'[Express] `patchExpressModule(options)` is deprecated. Use `patchExpressModule(moduleExports, getOptions)` instead.',
118+
);
119+
}
120+
76121
// pass in the require() or import() result of express
77122
constexpress=getExpressExport(moduleExports);
78123
constrouterProto: ExpressRouterv4|ExpressRouterv5|undefined=isExpressWithRouterPrototype(express)
@@ -94,7 +139,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
94139
functionrouteTrace(this: ExpressRouter, ...args: Parameters<typeoforiginalRouteMethod>[]){
95140
constroute=originalRouteMethod.apply(this,args);
96141
constlayer=this.stack[this.stack.length-1]asExpressLayer;
97-
patchLayer(getOptions,layer,getLayerPath(args));
142+
patchLayer(getExpressOptions,layer,getLayerPath(args));
98143
returnroute;
99144
},
100145
);
@@ -114,7 +159,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
114159
if(!layer){
115160
returnroute;
116161
}
117-
patchLayer(getOptions,layer,getLayerPath(args));
162+
patchLayer(getExpressOptions,layer,getLayerPath(args));
118163
returnroute;
119164
},
120165
);
@@ -142,7 +187,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
142187
if(router){
143188
constlayer=router.stack[router.stack.length-1];
144189
if(layer){
145-
patchLayer(getOptions,layer,getLayerPath(args));
190+
patchLayer(getExpressOptions,layer,getLayerPath(args));
146191
}
147192
}
148193
returnroute;
@@ -153,7 +198,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
153198
}
154199

155200
returnexpress;
156-
};
201+
}
157202

158203
/**
159204
* An Express-compatible error handler, used by setupExpressErrorHandler

‎packages/core/src/integrations/express/types.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ export type ExpressRouter = {
136136
exporttypeIgnoreMatcher=string|RegExp|((name: string)=>boolean);
137137

138138
exporttypeExpressIntegrationOptions={
139+
/**
140+
* @deprecated Pass the Express module export as the first argument to `patchExpressModule` instead.
141+
*/
142+
express?: ExpressModuleExport;
139143
/** Ignore specific based on their name */
140144
ignoreLayers?: IgnoreMatcher[];
141145
/** Ignore specific layers based on their type */

‎packages/core/test/lib/integrations/express/index.test.ts‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,22 @@ vi.mock('../../../../src/debug-build', () => ({
5252
DEBUG_BUILD: true,
5353
}));
5454
constdebugErrors: [string,Error][]=[];
55+
constdebugWarnings: string[]=[];
5556
vi.mock('../../../../src/utils/debug-logger',()=>({
5657
debug: {
5758
error: (msg: string,er: Error)=>{
5859
debugErrors.push([msg,er]);
5960
},
61+
warn: (msg: string)=>{
62+
debugWarnings.push(msg);
63+
},
6064
},
6165
}));
6266

63-
beforeEach(()=>(patchLayerCalls.length=0));
67+
beforeEach(()=>{
68+
patchLayerCalls.length=0;
69+
debugWarnings.length=0;
70+
});
6471
constpatchLayerCalls: [getOptions: ()=>ExpressIntegrationOptions,layer: ExpressLayer,layerPath?: string][]=[];
6572

6673
vi.mock('../../../../src/integrations/express/patch-layer',()=>({
@@ -129,6 +136,18 @@ function getExpress5(): ExpressExportv5 & { spies: ExpressSpies } {
129136
}
130137

131138
describe('patchExpressModule',()=>{
139+
it('supports deprecated options signature',()=>{
140+
constexpressv4=getExpress4();
141+
constoptions={express: expressv4,ignoreLayers: [/foo/]};
142+
patchExpressModule(options);
143+
expressv4.Router.use('a');
144+
145+
expect(patchLayerCalls[0]?.[0]()).toStrictEqual(options);
146+
expect(debugWarnings).toStrictEqual([
147+
'[Express] `patchExpressModule(options)` is deprecated. Use `patchExpressModule(moduleExports, getOptions)` instead.',
148+
]);
149+
});
150+
132151
it('throws trying to patch/unpatch the wrong thing',()=>{
133152
expect(()=>{
134153
patchExpressModule({}asunknownasExpressModuleExport,()=>({}));

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Commit eebe164

Browse files
cursoragentclaude
andcommitted
fix(core): restore patchExpressModule legacy signature compatibility
Add an overload and runtime fallback for the deprecated single-options argument, reintroduce the deprecated ExpressIntegrationOptions.express field, and add a regression test for legacy callers. Co-Authored-By: gpt-5.3-codex-high <noreply@anthropic.com>
1 parent 29b7472 commit eebe164

3 files changed

Lines changed: 74 additions & 6 deletions

File tree

‎packages/core/src/integrations/express/index.ts‎

Lines changed: 50 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ import { setSDKProcessingMetadata } from './set-sdk-processing-metadata';
6060
constgetExpressExport=(express: ExpressModuleExport): ExpressExport=>
6161
hasDefaultProp(express) ? express.default : (expressasExpressExport);
6262

63+
typeLegacyPatchExpressModuleOptions=ExpressIntegrationOptions&{
64+
express: ExpressModuleExport;
65+
};
66+
67+
let_didWarnLegacyPatchExpressModule=false;
68+
6369
/**
6470
* This is a portable instrumentatiton function that works in any environment
6571
* where Express can be loaded, without depending on OpenTelemetry.
@@ -72,7 +78,46 @@ const getExpressExport = (express: ExpressModuleExport): ExpressExport =>
7278
* Sentry.patchExpressModule(express, () => ({}));
7379
* ```
7480
*/
75-
exportconstpatchExpressModule=(moduleExports: ExpressModuleExport,getOptions: ()=>ExpressIntegrationOptions)=>{
81+
exportfunctionpatchExpressModule(
82+
moduleExports: ExpressModuleExport,
83+
getOptions: ()=>ExpressIntegrationOptions,
84+
): ExpressExport;
85+
/**
86+
* @deprecated Pass the Express module export as the first argument and options getter as the second argument.
87+
*/
88+
exportfunctionpatchExpressModule(options: LegacyPatchExpressModuleOptions): ExpressExport;
89+
exportfunctionpatchExpressModule(
90+
moduleExportsOrOptions: ExpressModuleExport|LegacyPatchExpressModuleOptions,
91+
getOptions?: ()=>ExpressIntegrationOptions,
92+
): ExpressExport{
93+
constisLegacyOptionsObject=
94+
!getOptions&&
95+
typeofmoduleExportsOrOptions==='object'&&
96+
moduleExportsOrOptions!==null&&
97+
'express'inmoduleExportsOrOptions;
98+
99+
letmoduleExports: ExpressModuleExport;
100+
letgetExpressOptions: ()=>ExpressIntegrationOptions;
101+
102+
if(isLegacyOptionsObject){
103+
moduleExports=moduleExportsOrOptions.express;
104+
getExpressOptions=()=>moduleExportsOrOptions;
105+
}else{
106+
moduleExports=moduleExportsOrOptions;
107+
if(!getOptions){
108+
thrownewTypeError('`patchExpressModule(moduleExports, getOptions)` requires a `getOptions` callback');
109+
}
110+
getExpressOptions=getOptions;
111+
}
112+
113+
if(isLegacyOptionsObject&&!_didWarnLegacyPatchExpressModule){
114+
_didWarnLegacyPatchExpressModule=true;
115+
DEBUG_BUILD&&
116+
debug.warn(
117+
'[Express] `patchExpressModule(options)` is deprecated. Use `patchExpressModule(moduleExports, getOptions)` instead.',
118+
);
119+
}
120+
76121
// pass in the require() or import() result of express
77122
constexpress=getExpressExport(moduleExports);
78123
constrouterProto: ExpressRouterv4|ExpressRouterv5|undefined=isExpressWithRouterPrototype(express)
@@ -94,7 +139,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
94139
functionrouteTrace(this: ExpressRouter, ...args: Parameters<typeoforiginalRouteMethod>[]){
95140
constroute=originalRouteMethod.apply(this,args);
96141
constlayer=this.stack[this.stack.length-1]asExpressLayer;
97-
patchLayer(getOptions,layer,getLayerPath(args));
142+
patchLayer(getExpressOptions,layer,getLayerPath(args));
98143
returnroute;
99144
},
100145
);
@@ -114,7 +159,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
114159
if(!layer){
115160
returnroute;
116161
}
117-
patchLayer(getOptions,layer,getLayerPath(args));
162+
patchLayer(getExpressOptions,layer,getLayerPath(args));
118163
returnroute;
119164
},
120165
);
@@ -142,7 +187,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
142187
if(router){
143188
constlayer=router.stack[router.stack.length-1];
144189
if(layer){
145-
patchLayer(getOptions,layer,getLayerPath(args));
190+
patchLayer(getExpressOptions,layer,getLayerPath(args));
146191
}
147192
}
148193
returnroute;
@@ -153,7 +198,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
153198
}
154199

155200
returnexpress;
156-
};
201+
}
157202

158203
/**
159204
* An Express-compatible error handler, used by setupExpressErrorHandler

‎packages/core/src/integrations/express/types.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ export type ExpressRouter = {
136136
exporttypeIgnoreMatcher=string|RegExp|((name: string)=>boolean);
137137

138138
exporttypeExpressIntegrationOptions={
139+
/**
140+
* @deprecated Pass the Express module export as the first argument to `patchExpressModule` instead.
141+
*/
142+
express?: ExpressModuleExport;
139143
/** Ignore specific based on their name */
140144
ignoreLayers?: IgnoreMatcher[];
141145
/** Ignore specific layers based on their type */

‎packages/core/test/lib/integrations/express/index.test.ts‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,22 @@ vi.mock('../../../../src/debug-build', () => ({
5252
DEBUG_BUILD: true,
5353
}));
5454
constdebugErrors: [string,Error][]=[];
55+
constdebugWarnings: string[]=[];
5556
vi.mock('../../../../src/utils/debug-logger',()=>({
5657
debug: {
5758
error: (msg: string,er: Error)=>{
5859
debugErrors.push([msg,er]);
5960
},
61+
warn: (msg: string)=>{
62+
debugWarnings.push(msg);
63+
},
6064
},
6165
}));
6266

63-
beforeEach(()=>(patchLayerCalls.length=0));
67+
beforeEach(()=>{
68+
patchLayerCalls.length=0;
69+
debugWarnings.length=0;
70+
});
6471
constpatchLayerCalls: [getOptions: ()=>ExpressIntegrationOptions,layer: ExpressLayer,layerPath?: string][]=[];
6572

6673
vi.mock('../../../../src/integrations/express/patch-layer',()=>({
@@ -129,6 +136,18 @@ function getExpress5(): ExpressExportv5 & { spies: ExpressSpies } {
129136
}
130137

131138
describe('patchExpressModule',()=>{
139+
it('supports deprecated options signature',()=>{
140+
constexpressv4=getExpress4();
141+
constoptions={express: expressv4,ignoreLayers: [/foo/]};
142+
patchExpressModule(options);
143+
expressv4.Router.use('a');
144+
145+
expect(patchLayerCalls[0]?.[0]()).toStrictEqual(options);
146+
expect(debugWarnings).toStrictEqual([
147+
'[Express] `patchExpressModule(options)` is deprecated. Use `patchExpressModule(moduleExports, getOptions)` instead.',
148+
]);
149+
});
150+
132151
it('throws trying to patch/unpatch the wrong thing',()=>{
133152
expect(()=>{
134153
patchExpressModule({}asunknownasExpressModuleExport,()=>({}));

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit eebe164

Browse files
cursoragentclaude
andcommitted
fix(core): restore patchExpressModule legacy signature compatibility
Add an overload and runtime fallback for the deprecated single-options argument, reintroduce the deprecated ExpressIntegrationOptions.express field, and add a regression test for legacy callers. Co-Authored-By: gpt-5.3-codex-high <noreply@anthropic.com>
1 parent 29b7472 commit eebe164

3 files changed

Lines changed: 74 additions & 6 deletions

File tree

‎packages/core/src/integrations/express/index.ts‎

Lines changed: 50 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ import { setSDKProcessingMetadata } from './set-sdk-processing-metadata';
6060
constgetExpressExport=(express: ExpressModuleExport): ExpressExport=>
6161
hasDefaultProp(express) ? express.default : (expressasExpressExport);
6262

63+
typeLegacyPatchExpressModuleOptions=ExpressIntegrationOptions&{
64+
express: ExpressModuleExport;
65+
};
66+
67+
let_didWarnLegacyPatchExpressModule=false;
68+
6369
/**
6470
* This is a portable instrumentatiton function that works in any environment
6571
* where Express can be loaded, without depending on OpenTelemetry.
@@ -72,7 +78,46 @@ const getExpressExport = (express: ExpressModuleExport): ExpressExport =>
7278
* Sentry.patchExpressModule(express, () => ({}));
7379
* ```
7480
*/
75-
exportconstpatchExpressModule=(moduleExports: ExpressModuleExport,getOptions: ()=>ExpressIntegrationOptions)=>{
81+
exportfunctionpatchExpressModule(
82+
moduleExports: ExpressModuleExport,
83+
getOptions: ()=>ExpressIntegrationOptions,
84+
): ExpressExport;
85+
/**
86+
* @deprecated Pass the Express module export as the first argument and options getter as the second argument.
87+
*/
88+
exportfunctionpatchExpressModule(options: LegacyPatchExpressModuleOptions): ExpressExport;
89+
exportfunctionpatchExpressModule(
90+
moduleExportsOrOptions: ExpressModuleExport|LegacyPatchExpressModuleOptions,
91+
getOptions?: ()=>ExpressIntegrationOptions,
92+
): ExpressExport{
93+
constisLegacyOptionsObject=
94+
!getOptions&&
95+
typeofmoduleExportsOrOptions==='object'&&
96+
moduleExportsOrOptions!==null&&
97+
'express'inmoduleExportsOrOptions;
98+
99+
letmoduleExports: ExpressModuleExport;
100+
letgetExpressOptions: ()=>ExpressIntegrationOptions;
101+
102+
if(isLegacyOptionsObject){
103+
moduleExports=moduleExportsOrOptions.express;
104+
getExpressOptions=()=>moduleExportsOrOptions;
105+
}else{
106+
moduleExports=moduleExportsOrOptions;
107+
if(!getOptions){
108+
thrownewTypeError('`patchExpressModule(moduleExports, getOptions)` requires a `getOptions` callback');
109+
}
110+
getExpressOptions=getOptions;
111+
}
112+
113+
if(isLegacyOptionsObject&&!_didWarnLegacyPatchExpressModule){
114+
_didWarnLegacyPatchExpressModule=true;
115+
DEBUG_BUILD&&
116+
debug.warn(
117+
'[Express] `patchExpressModule(options)` is deprecated. Use `patchExpressModule(moduleExports, getOptions)` instead.',
118+
);
119+
}
120+
76121
// pass in the require() or import() result of express
77122
constexpress=getExpressExport(moduleExports);
78123
constrouterProto: ExpressRouterv4|ExpressRouterv5|undefined=isExpressWithRouterPrototype(express)
@@ -94,7 +139,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
94139
functionrouteTrace(this: ExpressRouter, ...args: Parameters<typeoforiginalRouteMethod>[]){
95140
constroute=originalRouteMethod.apply(this,args);
96141
constlayer=this.stack[this.stack.length-1]asExpressLayer;
97-
patchLayer(getOptions,layer,getLayerPath(args));
142+
patchLayer(getExpressOptions,layer,getLayerPath(args));
98143
returnroute;
99144
},
100145
);
@@ -114,7 +159,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
114159
if(!layer){
115160
returnroute;
116161
}
117-
patchLayer(getOptions,layer,getLayerPath(args));
162+
patchLayer(getExpressOptions,layer,getLayerPath(args));
118163
returnroute;
119164
},
120165
);
@@ -142,7 +187,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
142187
if(router){
143188
constlayer=router.stack[router.stack.length-1];
144189
if(layer){
145-
patchLayer(getOptions,layer,getLayerPath(args));
190+
patchLayer(getExpressOptions,layer,getLayerPath(args));
146191
}
147192
}
148193
returnroute;
@@ -153,7 +198,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
153198
}
154199

155200
returnexpress;
156-
};
201+
}
157202

158203
/**
159204
* An Express-compatible error handler, used by setupExpressErrorHandler

‎packages/core/src/integrations/express/types.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ export type ExpressRouter = {
136136
exporttypeIgnoreMatcher=string|RegExp|((name: string)=>boolean);
137137

138138
exporttypeExpressIntegrationOptions={
139+
/**
140+
* @deprecated Pass the Express module export as the first argument to `patchExpressModule` instead.
141+
*/
142+
express?: ExpressModuleExport;
139143
/** Ignore specific based on their name */
140144
ignoreLayers?: IgnoreMatcher[];
141145
/** Ignore specific layers based on their type */

‎packages/core/test/lib/integrations/express/index.test.ts‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,22 @@ vi.mock('../../../../src/debug-build', () => ({
5252
DEBUG_BUILD: true,
5353
}));
5454
constdebugErrors: [string,Error][]=[];
55+
constdebugWarnings: string[]=[];
5556
vi.mock('../../../../src/utils/debug-logger',()=>({
5657
debug: {
5758
error: (msg: string,er: Error)=>{
5859
debugErrors.push([msg,er]);
5960
},
61+
warn: (msg: string)=>{
62+
debugWarnings.push(msg);
63+
},
6064
},
6165
}));
6266

63-
beforeEach(()=>(patchLayerCalls.length=0));
67+
beforeEach(()=>{
68+
patchLayerCalls.length=0;
69+
debugWarnings.length=0;
70+
});
6471
constpatchLayerCalls: [getOptions: ()=>ExpressIntegrationOptions,layer: ExpressLayer,layerPath?: string][]=[];
6572

6673
vi.mock('../../../../src/integrations/express/patch-layer',()=>({
@@ -129,6 +136,18 @@ function getExpress5(): ExpressExportv5 & { spies: ExpressSpies } {
129136
}
130137

131138
describe('patchExpressModule',()=>{
139+
it('supports deprecated options signature',()=>{
140+
constexpressv4=getExpress4();
141+
constoptions={express: expressv4,ignoreLayers: [/foo/]};
142+
patchExpressModule(options);
143+
expressv4.Router.use('a');
144+
145+
expect(patchLayerCalls[0]?.[0]()).toStrictEqual(options);
146+
expect(debugWarnings).toStrictEqual([
147+
'[Express] `patchExpressModule(options)` is deprecated. Use `patchExpressModule(moduleExports, getOptions)` instead.',
148+
]);
149+
});
150+
132151
it('throws trying to patch/unpatch the wrong thing',()=>{
133152
expect(()=>{
134153
patchExpressModule({}asunknownasExpressModuleExport,()=>({}));

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit eebe164

Browse files
cursoragentclaude
andcommitted
fix(core): restore patchExpressModule legacy signature compatibility
Add an overload and runtime fallback for the deprecated single-options argument, reintroduce the deprecated ExpressIntegrationOptions.express field, and add a regression test for legacy callers. Co-Authored-By: gpt-5.3-codex-high <noreply@anthropic.com>
1 parent 29b7472 commit eebe164

3 files changed

Lines changed: 74 additions & 6 deletions

File tree

‎packages/core/src/integrations/express/index.ts‎

Lines changed: 50 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ import { setSDKProcessingMetadata } from './set-sdk-processing-metadata';
6060
constgetExpressExport=(express: ExpressModuleExport): ExpressExport=>
6161
hasDefaultProp(express) ? express.default : (expressasExpressExport);
6262

63+
typeLegacyPatchExpressModuleOptions=ExpressIntegrationOptions&{
64+
express: ExpressModuleExport;
65+
};
66+
67+
let_didWarnLegacyPatchExpressModule=false;
68+
6369
/**
6470
* This is a portable instrumentatiton function that works in any environment
6571
* where Express can be loaded, without depending on OpenTelemetry.
@@ -72,7 +78,46 @@ const getExpressExport = (express: ExpressModuleExport): ExpressExport =>
7278
* Sentry.patchExpressModule(express, () => ({}));
7379
* ```
7480
*/
75-
exportconstpatchExpressModule=(moduleExports: ExpressModuleExport,getOptions: ()=>ExpressIntegrationOptions)=>{
81+
exportfunctionpatchExpressModule(
82+
moduleExports: ExpressModuleExport,
83+
getOptions: ()=>ExpressIntegrationOptions,
84+
): ExpressExport;
85+
/**
86+
* @deprecated Pass the Express module export as the first argument and options getter as the second argument.
87+
*/
88+
exportfunctionpatchExpressModule(options: LegacyPatchExpressModuleOptions): ExpressExport;
89+
exportfunctionpatchExpressModule(
90+
moduleExportsOrOptions: ExpressModuleExport|LegacyPatchExpressModuleOptions,
91+
getOptions?: ()=>ExpressIntegrationOptions,
92+
): ExpressExport{
93+
constisLegacyOptionsObject=
94+
!getOptions&&
95+
typeofmoduleExportsOrOptions==='object'&&
96+
moduleExportsOrOptions!==null&&
97+
'express'inmoduleExportsOrOptions;
98+
99+
letmoduleExports: ExpressModuleExport;
100+
letgetExpressOptions: ()=>ExpressIntegrationOptions;
101+
102+
if(isLegacyOptionsObject){
103+
moduleExports=moduleExportsOrOptions.express;
104+
getExpressOptions=()=>moduleExportsOrOptions;
105+
}else{
106+
moduleExports=moduleExportsOrOptions;
107+
if(!getOptions){
108+
thrownewTypeError('`patchExpressModule(moduleExports, getOptions)` requires a `getOptions` callback');
109+
}
110+
getExpressOptions=getOptions;
111+
}
112+
113+
if(isLegacyOptionsObject&&!_didWarnLegacyPatchExpressModule){
114+
_didWarnLegacyPatchExpressModule=true;
115+
DEBUG_BUILD&&
116+
debug.warn(
117+
'[Express] `patchExpressModule(options)` is deprecated. Use `patchExpressModule(moduleExports, getOptions)` instead.',
118+
);
119+
}
120+
76121
// pass in the require() or import() result of express
77122
constexpress=getExpressExport(moduleExports);
78123
constrouterProto: ExpressRouterv4|ExpressRouterv5|undefined=isExpressWithRouterPrototype(express)
@@ -94,7 +139,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
94139
functionrouteTrace(this: ExpressRouter, ...args: Parameters<typeoforiginalRouteMethod>[]){
95140
constroute=originalRouteMethod.apply(this,args);
96141
constlayer=this.stack[this.stack.length-1]asExpressLayer;
97-
patchLayer(getOptions,layer,getLayerPath(args));
142+
patchLayer(getExpressOptions,layer,getLayerPath(args));
98143
returnroute;
99144
},
100145
);
@@ -114,7 +159,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
114159
if(!layer){
115160
returnroute;
116161
}
117-
patchLayer(getOptions,layer,getLayerPath(args));
162+
patchLayer(getExpressOptions,layer,getLayerPath(args));
118163
returnroute;
119164
},
120165
);
@@ -142,7 +187,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
142187
if(router){
143188
constlayer=router.stack[router.stack.length-1];
144189
if(layer){
145-
patchLayer(getOptions,layer,getLayerPath(args));
190+
patchLayer(getExpressOptions,layer,getLayerPath(args));
146191
}
147192
}
148193
returnroute;
@@ -153,7 +198,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
153198
}
154199

155200
returnexpress;
156-
};
201+
}
157202

158203
/**
159204
* An Express-compatible error handler, used by setupExpressErrorHandler

‎packages/core/src/integrations/express/types.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ export type ExpressRouter = {
136136
exporttypeIgnoreMatcher=string|RegExp|((name: string)=>boolean);
137137

138138
exporttypeExpressIntegrationOptions={
139+
/**
140+
* @deprecated Pass the Express module export as the first argument to `patchExpressModule` instead.
141+
*/
142+
express?: ExpressModuleExport;
139143
/** Ignore specific based on their name */
140144
ignoreLayers?: IgnoreMatcher[];
141145
/** Ignore specific layers based on their type */

‎packages/core/test/lib/integrations/express/index.test.ts‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,22 @@ vi.mock('../../../../src/debug-build', () => ({
5252
DEBUG_BUILD: true,
5353
}));
5454
constdebugErrors: [string,Error][]=[];
55+
constdebugWarnings: string[]=[];
5556
vi.mock('../../../../src/utils/debug-logger',()=>({
5657
debug: {
5758
error: (msg: string,er: Error)=>{
5859
debugErrors.push([msg,er]);
5960
},
61+
warn: (msg: string)=>{
62+
debugWarnings.push(msg);
63+
},
6064
},
6165
}));
6266

63-
beforeEach(()=>(patchLayerCalls.length=0));
67+
beforeEach(()=>{
68+
patchLayerCalls.length=0;
69+
debugWarnings.length=0;
70+
});
6471
constpatchLayerCalls: [getOptions: ()=>ExpressIntegrationOptions,layer: ExpressLayer,layerPath?: string][]=[];
6572

6673
vi.mock('../../../../src/integrations/express/patch-layer',()=>({
@@ -129,6 +136,18 @@ function getExpress5(): ExpressExportv5 & { spies: ExpressSpies } {
129136
}
130137

131138
describe('patchExpressModule',()=>{
139+
it('supports deprecated options signature',()=>{
140+
constexpressv4=getExpress4();
141+
constoptions={express: expressv4,ignoreLayers: [/foo/]};
142+
patchExpressModule(options);
143+
expressv4.Router.use('a');
144+
145+
expect(patchLayerCalls[0]?.[0]()).toStrictEqual(options);
146+
expect(debugWarnings).toStrictEqual([
147+
'[Express] `patchExpressModule(options)` is deprecated. Use `patchExpressModule(moduleExports, getOptions)` instead.',
148+
]);
149+
});
150+
132151
it('throws trying to patch/unpatch the wrong thing',()=>{
133152
expect(()=>{
134153
patchExpressModule({}asunknownasExpressModuleExport,()=>({}));

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Commit eebe164

Browse files
cursoragentclaude
andcommitted
fix(core): restore patchExpressModule legacy signature compatibility
Add an overload and runtime fallback for the deprecated single-options argument, reintroduce the deprecated ExpressIntegrationOptions.express field, and add a regression test for legacy callers. Co-Authored-By: gpt-5.3-codex-high <noreply@anthropic.com>
1 parent 29b7472 commit eebe164

3 files changed

Lines changed: 74 additions & 6 deletions

File tree

‎packages/core/src/integrations/express/index.ts‎

Lines changed: 50 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ import { setSDKProcessingMetadata } from './set-sdk-processing-metadata';
6060
constgetExpressExport=(express: ExpressModuleExport): ExpressExport=>
6161
hasDefaultProp(express) ? express.default : (expressasExpressExport);
6262

63+
typeLegacyPatchExpressModuleOptions=ExpressIntegrationOptions&{
64+
express: ExpressModuleExport;
65+
};
66+
67+
let_didWarnLegacyPatchExpressModule=false;
68+
6369
/**
6470
* This is a portable instrumentatiton function that works in any environment
6571
* where Express can be loaded, without depending on OpenTelemetry.
@@ -72,7 +78,46 @@ const getExpressExport = (express: ExpressModuleExport): ExpressExport =>
7278
* Sentry.patchExpressModule(express, () => ({}));
7379
* ```
7480
*/
75-
exportconstpatchExpressModule=(moduleExports: ExpressModuleExport,getOptions: ()=>ExpressIntegrationOptions)=>{
81+
exportfunctionpatchExpressModule(
82+
moduleExports: ExpressModuleExport,
83+
getOptions: ()=>ExpressIntegrationOptions,
84+
): ExpressExport;
85+
/**
86+
* @deprecated Pass the Express module export as the first argument and options getter as the second argument.
87+
*/
88+
exportfunctionpatchExpressModule(options: LegacyPatchExpressModuleOptions): ExpressExport;
89+
exportfunctionpatchExpressModule(
90+
moduleExportsOrOptions: ExpressModuleExport|LegacyPatchExpressModuleOptions,
91+
getOptions?: ()=>ExpressIntegrationOptions,
92+
): ExpressExport{
93+
constisLegacyOptionsObject=
94+
!getOptions&&
95+
typeofmoduleExportsOrOptions==='object'&&
96+
moduleExportsOrOptions!==null&&
97+
'express'inmoduleExportsOrOptions;
98+
99+
letmoduleExports: ExpressModuleExport;
100+
letgetExpressOptions: ()=>ExpressIntegrationOptions;
101+
102+
if(isLegacyOptionsObject){
103+
moduleExports=moduleExportsOrOptions.express;
104+
getExpressOptions=()=>moduleExportsOrOptions;
105+
}else{
106+
moduleExports=moduleExportsOrOptions;
107+
if(!getOptions){
108+
thrownewTypeError('`patchExpressModule(moduleExports, getOptions)` requires a `getOptions` callback');
109+
}
110+
getExpressOptions=getOptions;
111+
}
112+
113+
if(isLegacyOptionsObject&&!_didWarnLegacyPatchExpressModule){
114+
_didWarnLegacyPatchExpressModule=true;
115+
DEBUG_BUILD&&
116+
debug.warn(
117+
'[Express] `patchExpressModule(options)` is deprecated. Use `patchExpressModule(moduleExports, getOptions)` instead.',
118+
);
119+
}
120+
76121
// pass in the require() or import() result of express
77122
constexpress=getExpressExport(moduleExports);
78123
constrouterProto: ExpressRouterv4|ExpressRouterv5|undefined=isExpressWithRouterPrototype(express)
@@ -94,7 +139,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
94139
functionrouteTrace(this: ExpressRouter, ...args: Parameters<typeoforiginalRouteMethod>[]){
95140
constroute=originalRouteMethod.apply(this,args);
96141
constlayer=this.stack[this.stack.length-1]asExpressLayer;
97-
patchLayer(getOptions,layer,getLayerPath(args));
142+
patchLayer(getExpressOptions,layer,getLayerPath(args));
98143
returnroute;
99144
},
100145
);
@@ -114,7 +159,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
114159
if(!layer){
115160
returnroute;
116161
}
117-
patchLayer(getOptions,layer,getLayerPath(args));
162+
patchLayer(getExpressOptions,layer,getLayerPath(args));
118163
returnroute;
119164
},
120165
);
@@ -142,7 +187,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
142187
if(router){
143188
constlayer=router.stack[router.stack.length-1];
144189
if(layer){
145-
patchLayer(getOptions,layer,getLayerPath(args));
190+
patchLayer(getExpressOptions,layer,getLayerPath(args));
146191
}
147192
}
148193
returnroute;
@@ -153,7 +198,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
153198
}
154199

155200
returnexpress;
156-
};
201+
}
157202

158203
/**
159204
* An Express-compatible error handler, used by setupExpressErrorHandler

‎packages/core/src/integrations/express/types.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ export type ExpressRouter = {
136136
exporttypeIgnoreMatcher=string|RegExp|((name: string)=>boolean);
137137

138138
exporttypeExpressIntegrationOptions={
139+
/**
140+
* @deprecated Pass the Express module export as the first argument to `patchExpressModule` instead.
141+
*/
142+
express?: ExpressModuleExport;
139143
/** Ignore specific based on their name */
140144
ignoreLayers?: IgnoreMatcher[];
141145
/** Ignore specific layers based on their type */

‎packages/core/test/lib/integrations/express/index.test.ts‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,22 @@ vi.mock('../../../../src/debug-build', () => ({
5252
DEBUG_BUILD: true,
5353
}));
5454
constdebugErrors: [string,Error][]=[];
55+
constdebugWarnings: string[]=[];
5556
vi.mock('../../../../src/utils/debug-logger',()=>({
5657
debug: {
5758
error: (msg: string,er: Error)=>{
5859
debugErrors.push([msg,er]);
5960
},
61+
warn: (msg: string)=>{
62+
debugWarnings.push(msg);
63+
},
6064
},
6165
}));
6266

63-
beforeEach(()=>(patchLayerCalls.length=0));
67+
beforeEach(()=>{
68+
patchLayerCalls.length=0;
69+
debugWarnings.length=0;
70+
});
6471
constpatchLayerCalls: [getOptions: ()=>ExpressIntegrationOptions,layer: ExpressLayer,layerPath?: string][]=[];
6572

6673
vi.mock('../../../../src/integrations/express/patch-layer',()=>({
@@ -129,6 +136,18 @@ function getExpress5(): ExpressExportv5 & { spies: ExpressSpies } {
129136
}
130137

131138
describe('patchExpressModule',()=>{
139+
it('supports deprecated options signature',()=>{
140+
constexpressv4=getExpress4();
141+
constoptions={express: expressv4,ignoreLayers: [/foo/]};
142+
patchExpressModule(options);
143+
expressv4.Router.use('a');
144+
145+
expect(patchLayerCalls[0]?.[0]()).toStrictEqual(options);
146+
expect(debugWarnings).toStrictEqual([
147+
'[Express] `patchExpressModule(options)` is deprecated. Use `patchExpressModule(moduleExports, getOptions)` instead.',
148+
]);
149+
});
150+
132151
it('throws trying to patch/unpatch the wrong thing',()=>{
133152
expect(()=>{
134153
patchExpressModule({}asunknownasExpressModuleExport,()=>({}));

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit eebe164

Browse files
cursoragentclaude
andcommitted
fix(core): restore patchExpressModule legacy signature compatibility
Add an overload and runtime fallback for the deprecated single-options argument, reintroduce the deprecated ExpressIntegrationOptions.express field, and add a regression test for legacy callers. Co-Authored-By: gpt-5.3-codex-high <noreply@anthropic.com>
1 parent 29b7472 commit eebe164

3 files changed

Lines changed: 74 additions & 6 deletions

File tree

‎packages/core/src/integrations/express/index.ts‎

Lines changed: 50 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ import { setSDKProcessingMetadata } from './set-sdk-processing-metadata';
6060
constgetExpressExport=(express: ExpressModuleExport): ExpressExport=>
6161
hasDefaultProp(express) ? express.default : (expressasExpressExport);
6262

63+
typeLegacyPatchExpressModuleOptions=ExpressIntegrationOptions&{
64+
express: ExpressModuleExport;
65+
};
66+
67+
let_didWarnLegacyPatchExpressModule=false;
68+
6369
/**
6470
* This is a portable instrumentatiton function that works in any environment
6571
* where Express can be loaded, without depending on OpenTelemetry.
@@ -72,7 +78,46 @@ const getExpressExport = (express: ExpressModuleExport): ExpressExport =>
7278
* Sentry.patchExpressModule(express, () => ({}));
7379
* ```
7480
*/
75-
exportconstpatchExpressModule=(moduleExports: ExpressModuleExport,getOptions: ()=>ExpressIntegrationOptions)=>{
81+
exportfunctionpatchExpressModule(
82+
moduleExports: ExpressModuleExport,
83+
getOptions: ()=>ExpressIntegrationOptions,
84+
): ExpressExport;
85+
/**
86+
* @deprecated Pass the Express module export as the first argument and options getter as the second argument.
87+
*/
88+
exportfunctionpatchExpressModule(options: LegacyPatchExpressModuleOptions): ExpressExport;
89+
exportfunctionpatchExpressModule(
90+
moduleExportsOrOptions: ExpressModuleExport|LegacyPatchExpressModuleOptions,
91+
getOptions?: ()=>ExpressIntegrationOptions,
92+
): ExpressExport{
93+
constisLegacyOptionsObject=
94+
!getOptions&&
95+
typeofmoduleExportsOrOptions==='object'&&
96+
moduleExportsOrOptions!==null&&
97+
'express'inmoduleExportsOrOptions;
98+
99+
letmoduleExports: ExpressModuleExport;
100+
letgetExpressOptions: ()=>ExpressIntegrationOptions;
101+
102+
if(isLegacyOptionsObject){
103+
moduleExports=moduleExportsOrOptions.express;
104+
getExpressOptions=()=>moduleExportsOrOptions;
105+
}else{
106+
moduleExports=moduleExportsOrOptions;
107+
if(!getOptions){
108+
thrownewTypeError('`patchExpressModule(moduleExports, getOptions)` requires a `getOptions` callback');
109+
}
110+
getExpressOptions=getOptions;
111+
}
112+
113+
if(isLegacyOptionsObject&&!_didWarnLegacyPatchExpressModule){
114+
_didWarnLegacyPatchExpressModule=true;
115+
DEBUG_BUILD&&
116+
debug.warn(
117+
'[Express] `patchExpressModule(options)` is deprecated. Use `patchExpressModule(moduleExports, getOptions)` instead.',
118+
);
119+
}
120+
76121
// pass in the require() or import() result of express
77122
constexpress=getExpressExport(moduleExports);
78123
constrouterProto: ExpressRouterv4|ExpressRouterv5|undefined=isExpressWithRouterPrototype(express)
@@ -94,7 +139,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
94139
functionrouteTrace(this: ExpressRouter, ...args: Parameters<typeoforiginalRouteMethod>[]){
95140
constroute=originalRouteMethod.apply(this,args);
96141
constlayer=this.stack[this.stack.length-1]asExpressLayer;
97-
patchLayer(getOptions,layer,getLayerPath(args));
142+
patchLayer(getExpressOptions,layer,getLayerPath(args));
98143
returnroute;
99144
},
100145
);
@@ -114,7 +159,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
114159
if(!layer){
115160
returnroute;
116161
}
117-
patchLayer(getOptions,layer,getLayerPath(args));
162+
patchLayer(getExpressOptions,layer,getLayerPath(args));
118163
returnroute;
119164
},
120165
);
@@ -142,7 +187,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
142187
if(router){
143188
constlayer=router.stack[router.stack.length-1];
144189
if(layer){
145-
patchLayer(getOptions,layer,getLayerPath(args));
190+
patchLayer(getExpressOptions,layer,getLayerPath(args));
146191
}
147192
}
148193
returnroute;
@@ -153,7 +198,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
153198
}
154199

155200
returnexpress;
156-
};
201+
}
157202

158203
/**
159204
* An Express-compatible error handler, used by setupExpressErrorHandler

‎packages/core/src/integrations/express/types.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ export type ExpressRouter = {
136136
exporttypeIgnoreMatcher=string|RegExp|((name: string)=>boolean);
137137

138138
exporttypeExpressIntegrationOptions={
139+
/**
140+
* @deprecated Pass the Express module export as the first argument to `patchExpressModule` instead.
141+
*/
142+
express?: ExpressModuleExport;
139143
/** Ignore specific based on their name */
140144
ignoreLayers?: IgnoreMatcher[];
141145
/** Ignore specific layers based on their type */

‎packages/core/test/lib/integrations/express/index.test.ts‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,22 @@ vi.mock('../../../../src/debug-build', () => ({
5252
DEBUG_BUILD: true,
5353
}));
5454
constdebugErrors: [string,Error][]=[];
55+
constdebugWarnings: string[]=[];
5556
vi.mock('../../../../src/utils/debug-logger',()=>({
5657
debug: {
5758
error: (msg: string,er: Error)=>{
5859
debugErrors.push([msg,er]);
5960
},
61+
warn: (msg: string)=>{
62+
debugWarnings.push(msg);
63+
},
6064
},
6165
}));
6266

63-
beforeEach(()=>(patchLayerCalls.length=0));
67+
beforeEach(()=>{
68+
patchLayerCalls.length=0;
69+
debugWarnings.length=0;
70+
});
6471
constpatchLayerCalls: [getOptions: ()=>ExpressIntegrationOptions,layer: ExpressLayer,layerPath?: string][]=[];
6572

6673
vi.mock('../../../../src/integrations/express/patch-layer',()=>({
@@ -129,6 +136,18 @@ function getExpress5(): ExpressExportv5 & { spies: ExpressSpies } {
129136
}
130137

131138
describe('patchExpressModule',()=>{
139+
it('supports deprecated options signature',()=>{
140+
constexpressv4=getExpress4();
141+
constoptions={express: expressv4,ignoreLayers: [/foo/]};
142+
patchExpressModule(options);
143+
expressv4.Router.use('a');
144+
145+
expect(patchLayerCalls[0]?.[0]()).toStrictEqual(options);
146+
expect(debugWarnings).toStrictEqual([
147+
'[Express] `patchExpressModule(options)` is deprecated. Use `patchExpressModule(moduleExports, getOptions)` instead.',
148+
]);
149+
});
150+
132151
it('throws trying to patch/unpatch the wrong thing',()=>{
133152
expect(()=>{
134153
patchExpressModule({}asunknownasExpressModuleExport,()=>({}));

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit eebe164

Browse files
cursoragentclaude
andcommitted
fix(core): restore patchExpressModule legacy signature compatibility
Add an overload and runtime fallback for the deprecated single-options argument, reintroduce the deprecated ExpressIntegrationOptions.express field, and add a regression test for legacy callers. Co-Authored-By: gpt-5.3-codex-high <noreply@anthropic.com>
1 parent 29b7472 commit eebe164

3 files changed

Lines changed: 74 additions & 6 deletions

File tree

‎packages/core/src/integrations/express/index.ts‎

Lines changed: 50 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ import { setSDKProcessingMetadata } from './set-sdk-processing-metadata';
6060
constgetExpressExport=(express: ExpressModuleExport): ExpressExport=>
6161
hasDefaultProp(express) ? express.default : (expressasExpressExport);
6262

63+
typeLegacyPatchExpressModuleOptions=ExpressIntegrationOptions&{
64+
express: ExpressModuleExport;
65+
};
66+
67+
let_didWarnLegacyPatchExpressModule=false;
68+
6369
/**
6470
* This is a portable instrumentatiton function that works in any environment
6571
* where Express can be loaded, without depending on OpenTelemetry.
@@ -72,7 +78,46 @@ const getExpressExport = (express: ExpressModuleExport): ExpressExport =>
7278
* Sentry.patchExpressModule(express, () => ({}));
7379
* ```
7480
*/
75-
exportconstpatchExpressModule=(moduleExports: ExpressModuleExport,getOptions: ()=>ExpressIntegrationOptions)=>{
81+
exportfunctionpatchExpressModule(
82+
moduleExports: ExpressModuleExport,
83+
getOptions: ()=>ExpressIntegrationOptions,
84+
): ExpressExport;
85+
/**
86+
* @deprecated Pass the Express module export as the first argument and options getter as the second argument.
87+
*/
88+
exportfunctionpatchExpressModule(options: LegacyPatchExpressModuleOptions): ExpressExport;
89+
exportfunctionpatchExpressModule(
90+
moduleExportsOrOptions: ExpressModuleExport|LegacyPatchExpressModuleOptions,
91+
getOptions?: ()=>ExpressIntegrationOptions,
92+
): ExpressExport{
93+
constisLegacyOptionsObject=
94+
!getOptions&&
95+
typeofmoduleExportsOrOptions==='object'&&
96+
moduleExportsOrOptions!==null&&
97+
'express'inmoduleExportsOrOptions;
98+
99+
letmoduleExports: ExpressModuleExport;
100+
letgetExpressOptions: ()=>ExpressIntegrationOptions;
101+
102+
if(isLegacyOptionsObject){
103+
moduleExports=moduleExportsOrOptions.express;
104+
getExpressOptions=()=>moduleExportsOrOptions;
105+
}else{
106+
moduleExports=moduleExportsOrOptions;
107+
if(!getOptions){
108+
thrownewTypeError('`patchExpressModule(moduleExports, getOptions)` requires a `getOptions` callback');
109+
}
110+
getExpressOptions=getOptions;
111+
}
112+
113+
if(isLegacyOptionsObject&&!_didWarnLegacyPatchExpressModule){
114+
_didWarnLegacyPatchExpressModule=true;
115+
DEBUG_BUILD&&
116+
debug.warn(
117+
'[Express] `patchExpressModule(options)` is deprecated. Use `patchExpressModule(moduleExports, getOptions)` instead.',
118+
);
119+
}
120+
76121
// pass in the require() or import() result of express
77122
constexpress=getExpressExport(moduleExports);
78123
constrouterProto: ExpressRouterv4|ExpressRouterv5|undefined=isExpressWithRouterPrototype(express)
@@ -94,7 +139,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
94139
functionrouteTrace(this: ExpressRouter, ...args: Parameters<typeoforiginalRouteMethod>[]){
95140
constroute=originalRouteMethod.apply(this,args);
96141
constlayer=this.stack[this.stack.length-1]asExpressLayer;
97-
patchLayer(getOptions,layer,getLayerPath(args));
142+
patchLayer(getExpressOptions,layer,getLayerPath(args));
98143
returnroute;
99144
},
100145
);
@@ -114,7 +159,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
114159
if(!layer){
115160
returnroute;
116161
}
117-
patchLayer(getOptions,layer,getLayerPath(args));
162+
patchLayer(getExpressOptions,layer,getLayerPath(args));
118163
returnroute;
119164
},
120165
);
@@ -142,7 +187,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
142187
if(router){
143188
constlayer=router.stack[router.stack.length-1];
144189
if(layer){
145-
patchLayer(getOptions,layer,getLayerPath(args));
190+
patchLayer(getExpressOptions,layer,getLayerPath(args));
146191
}
147192
}
148193
returnroute;
@@ -153,7 +198,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
153198
}
154199

155200
returnexpress;
156-
};
201+
}
157202

158203
/**
159204
* An Express-compatible error handler, used by setupExpressErrorHandler

‎packages/core/src/integrations/express/types.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ export type ExpressRouter = {
136136
exporttypeIgnoreMatcher=string|RegExp|((name: string)=>boolean);
137137

138138
exporttypeExpressIntegrationOptions={
139+
/**
140+
* @deprecated Pass the Express module export as the first argument to `patchExpressModule` instead.
141+
*/
142+
express?: ExpressModuleExport;
139143
/** Ignore specific based on their name */
140144
ignoreLayers?: IgnoreMatcher[];
141145
/** Ignore specific layers based on their type */

‎packages/core/test/lib/integrations/express/index.test.ts‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,22 @@ vi.mock('../../../../src/debug-build', () => ({
5252
DEBUG_BUILD: true,
5353
}));
5454
constdebugErrors: [string,Error][]=[];
55+
constdebugWarnings: string[]=[];
5556
vi.mock('../../../../src/utils/debug-logger',()=>({
5657
debug: {
5758
error: (msg: string,er: Error)=>{
5859
debugErrors.push([msg,er]);
5960
},
61+
warn: (msg: string)=>{
62+
debugWarnings.push(msg);
63+
},
6064
},
6165
}));
6266

63-
beforeEach(()=>(patchLayerCalls.length=0));
67+
beforeEach(()=>{
68+
patchLayerCalls.length=0;
69+
debugWarnings.length=0;
70+
});
6471
constpatchLayerCalls: [getOptions: ()=>ExpressIntegrationOptions,layer: ExpressLayer,layerPath?: string][]=[];
6572

6673
vi.mock('../../../../src/integrations/express/patch-layer',()=>({
@@ -129,6 +136,18 @@ function getExpress5(): ExpressExportv5 & { spies: ExpressSpies } {
129136
}
130137

131138
describe('patchExpressModule',()=>{
139+
it('supports deprecated options signature',()=>{
140+
constexpressv4=getExpress4();
141+
constoptions={express: expressv4,ignoreLayers: [/foo/]};
142+
patchExpressModule(options);
143+
expressv4.Router.use('a');
144+
145+
expect(patchLayerCalls[0]?.[0]()).toStrictEqual(options);
146+
expect(debugWarnings).toStrictEqual([
147+
'[Express] `patchExpressModule(options)` is deprecated. Use `patchExpressModule(moduleExports, getOptions)` instead.',
148+
]);
149+
});
150+
132151
it('throws trying to patch/unpatch the wrong thing',()=>{
133152
expect(()=>{
134153
patchExpressModule({}asunknownasExpressModuleExport,()=>({}));

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Commit eebe164

Browse files
cursoragentclaude
andcommitted
fix(core): restore patchExpressModule legacy signature compatibility
Add an overload and runtime fallback for the deprecated single-options argument, reintroduce the deprecated ExpressIntegrationOptions.express field, and add a regression test for legacy callers. Co-Authored-By: gpt-5.3-codex-high <noreply@anthropic.com>
1 parent 29b7472 commit eebe164

3 files changed

Lines changed: 74 additions & 6 deletions

File tree

‎packages/core/src/integrations/express/index.ts‎

Lines changed: 50 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ import { setSDKProcessingMetadata } from './set-sdk-processing-metadata';
6060
constgetExpressExport=(express: ExpressModuleExport): ExpressExport=>
6161
hasDefaultProp(express) ? express.default : (expressasExpressExport);
6262

63+
typeLegacyPatchExpressModuleOptions=ExpressIntegrationOptions&{
64+
express: ExpressModuleExport;
65+
};
66+
67+
let_didWarnLegacyPatchExpressModule=false;
68+
6369
/**
6470
* This is a portable instrumentatiton function that works in any environment
6571
* where Express can be loaded, without depending on OpenTelemetry.
@@ -72,7 +78,46 @@ const getExpressExport = (express: ExpressModuleExport): ExpressExport =>
7278
* Sentry.patchExpressModule(express, () => ({}));
7379
* ```
7480
*/
75-
exportconstpatchExpressModule=(moduleExports: ExpressModuleExport,getOptions: ()=>ExpressIntegrationOptions)=>{
81+
exportfunctionpatchExpressModule(
82+
moduleExports: ExpressModuleExport,
83+
getOptions: ()=>ExpressIntegrationOptions,
84+
): ExpressExport;
85+
/**
86+
* @deprecated Pass the Express module export as the first argument and options getter as the second argument.
87+
*/
88+
exportfunctionpatchExpressModule(options: LegacyPatchExpressModuleOptions): ExpressExport;
89+
exportfunctionpatchExpressModule(
90+
moduleExportsOrOptions: ExpressModuleExport|LegacyPatchExpressModuleOptions,
91+
getOptions?: ()=>ExpressIntegrationOptions,
92+
): ExpressExport{
93+
constisLegacyOptionsObject=
94+
!getOptions&&
95+
typeofmoduleExportsOrOptions==='object'&&
96+
moduleExportsOrOptions!==null&&
97+
'express'inmoduleExportsOrOptions;
98+
99+
letmoduleExports: ExpressModuleExport;
100+
letgetExpressOptions: ()=>ExpressIntegrationOptions;
101+
102+
if(isLegacyOptionsObject){
103+
moduleExports=moduleExportsOrOptions.express;
104+
getExpressOptions=()=>moduleExportsOrOptions;
105+
}else{
106+
moduleExports=moduleExportsOrOptions;
107+
if(!getOptions){
108+
thrownewTypeError('`patchExpressModule(moduleExports, getOptions)` requires a `getOptions` callback');
109+
}
110+
getExpressOptions=getOptions;
111+
}
112+
113+
if(isLegacyOptionsObject&&!_didWarnLegacyPatchExpressModule){
114+
_didWarnLegacyPatchExpressModule=true;
115+
DEBUG_BUILD&&
116+
debug.warn(
117+
'[Express] `patchExpressModule(options)` is deprecated. Use `patchExpressModule(moduleExports, getOptions)` instead.',
118+
);
119+
}
120+
76121
// pass in the require() or import() result of express
77122
constexpress=getExpressExport(moduleExports);
78123
constrouterProto: ExpressRouterv4|ExpressRouterv5|undefined=isExpressWithRouterPrototype(express)
@@ -94,7 +139,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
94139
functionrouteTrace(this: ExpressRouter, ...args: Parameters<typeoforiginalRouteMethod>[]){
95140
constroute=originalRouteMethod.apply(this,args);
96141
constlayer=this.stack[this.stack.length-1]asExpressLayer;
97-
patchLayer(getOptions,layer,getLayerPath(args));
142+
patchLayer(getExpressOptions,layer,getLayerPath(args));
98143
returnroute;
99144
},
100145
);
@@ -114,7 +159,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
114159
if(!layer){
115160
returnroute;
116161
}
117-
patchLayer(getOptions,layer,getLayerPath(args));
162+
patchLayer(getExpressOptions,layer,getLayerPath(args));
118163
returnroute;
119164
},
120165
);
@@ -142,7 +187,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
142187
if(router){
143188
constlayer=router.stack[router.stack.length-1];
144189
if(layer){
145-
patchLayer(getOptions,layer,getLayerPath(args));
190+
patchLayer(getExpressOptions,layer,getLayerPath(args));
146191
}
147192
}
148193
returnroute;
@@ -153,7 +198,7 @@ export const patchExpressModule = (moduleExports: ExpressModuleExport, getOption
153198
}
154199

155200
returnexpress;
156-
};
201+
}
157202

158203
/**
159204
* An Express-compatible error handler, used by setupExpressErrorHandler

‎packages/core/src/integrations/express/types.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ export type ExpressRouter = {
136136
exporttypeIgnoreMatcher=string|RegExp|((name: string)=>boolean);
137137

138138
exporttypeExpressIntegrationOptions={
139+
/**
140+
* @deprecated Pass the Express module export as the first argument to `patchExpressModule` instead.
141+
*/
142+
express?: ExpressModuleExport;
139143
/** Ignore specific based on their name */
140144
ignoreLayers?: IgnoreMatcher[];
141145
/** Ignore specific layers based on their type */

‎packages/core/test/lib/integrations/express/index.test.ts‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,22 @@ vi.mock('../../../../src/debug-build', () => ({
5252
DEBUG_BUILD: true,
5353
}));
5454
constdebugErrors: [string,Error][]=[];
55+
constdebugWarnings: string[]=[];
5556
vi.mock('../../../../src/utils/debug-logger',()=>({
5657
debug: {
5758
error: (msg: string,er: Error)=>{
5859
debugErrors.push([msg,er]);
5960
},
61+
warn: (msg: string)=>{
62+
debugWarnings.push(msg);
63+
},
6064
},
6165
}));
6266

63-
beforeEach(()=>(patchLayerCalls.length=0));
67+
beforeEach(()=>{
68+
patchLayerCalls.length=0;
69+
debugWarnings.length=0;
70+
});
6471
constpatchLayerCalls: [getOptions: ()=>ExpressIntegrationOptions,layer: ExpressLayer,layerPath?: string][]=[];
6572

6673
vi.mock('../../../../src/integrations/express/patch-layer',()=>({
@@ -129,6 +136,18 @@ function getExpress5(): ExpressExportv5 & { spies: ExpressSpies } {
129136
}
130137

131138
describe('patchExpressModule',()=>{
139+
it('supports deprecated options signature',()=>{
140+
constexpressv4=getExpress4();
141+
constoptions={express: expressv4,ignoreLayers: [/foo/]};
142+
patchExpressModule(options);
143+
expressv4.Router.use('a');
144+
145+
expect(patchLayerCalls[0]?.[0]()).toStrictEqual(options);
146+
expect(debugWarnings).toStrictEqual([
147+
'[Express] `patchExpressModule(options)` is deprecated. Use `patchExpressModule(moduleExports, getOptions)` instead.',
148+
]);
149+
});
150+
132151
it('throws trying to patch/unpatch the wrong thing',()=>{
133152
expect(()=>{
134153
patchExpressModule({}asunknownasExpressModuleExport,()=>({}));

0 commit comments

Comments
 (0)