@@ -143,20 +143,29 @@ LABKEY.Mothership = (function () {
143
143
// matches: ?_dc=12345 or ?12345
144
144
var _defeatCacheRegex = / \? ( _ d c = ) ? \d + / ;
145
145
146
+ // Issue 52908: Ignore webpack:// source paths
147
+ // Workaround suggested here https://github.com/stacktracejs/stacktrace-gps/issues/65
148
+ function filterRequest ( location , opts ) {
149
+ if ( location . includes ( 'webpack://' ) ) return '' ;
150
+ return fetch ( location , opts ) . then ( ( res ) => res . status === 200 ? res . text ( ) : '' ) ;
151
+ }
152
+
153
+ // Remove stacktrace.js and mothership.js from the stack
154
+ const fileNameFilters = [ '/stacktrace.min.js' , '/mothership.js' ] ;
155
+
146
156
function filterTrace ( stackframe ) {
147
157
"use strict" ;
148
158
149
- var fileName = stackframe . getFileName ( ) ;
159
+ const fileName = stackframe . getFileName ( ) ;
150
160
151
161
// remove stack elements for errors generated from within the Chrome console
152
- if ( ! fileName )
162
+ if ( ! fileName ) {
153
163
return false ;
164
+ }
154
165
155
- // remove stacktrace.js and mothership.js from the stack
156
- if ( _filterStacktrace &&
157
- fileName . indexOf ( "/stacktrace.min.js" ) > - 1 ||
158
- fileName . indexOf ( "/mothership.js" ) != - 1 )
166
+ if ( _filterStacktrace && fileNameFilters . some ( s => fileName . includes ( s ) ) ) {
159
167
return false ;
168
+ }
160
169
161
170
// remove defeat cache and server-session number from URLs
162
171
// so stack doesn't change between server requests.
@@ -383,10 +392,10 @@ LABKEY.Mothership = (function () {
383
392
384
393
if ( window . Promise ) {
385
394
if ( error instanceof Error ) {
386
- promise = StackTrace . fromError ( error , { filter : filterTrace } ) ;
395
+ promise = StackTrace . fromError ( error , { ajax : filterRequest , filter : filterTrace } ) ;
387
396
}
388
397
else if ( _generateStacktrace ) {
389
- promise = StackTrace . get ( { filter : filterTrace } ) ;
398
+ promise = StackTrace . get ( { ajax : filterRequest , filter : filterTrace } ) ;
390
399
}
391
400
}
392
401
0 commit comments