Skip to content
Merged
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
18 changes: 17 additions & 1 deletion web_src/js/bootstrap.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {showGlobalErrorMessage} from './bootstrap.ts';
import {showGlobalErrorMessage, shouldIgnoreError} from './bootstrap.ts';

test('showGlobalErrorMessage', () => {
document.body.innerHTML = '<div class="page-content"></div>';
Expand All @@ -10,3 +10,19 @@ test('showGlobalErrorMessage', () => {
expect(document.body.innerHTML).toContain('>test msg 2<');
expect(document.querySelectorAll('.js-global-error').length).toEqual(2);
});

test('shouldIgnoreError', () => {
for (const url of [
'https://gitea.test/assets/js/monaco.b359ef7e.js',
'https://gitea.test/assets/js/monaco-editor.4a969118.worker.js',
'https://gitea.test/assets/js/vendors-node_modules_pnpm_monaco-editor_0_55_1_node_modules_monaco-editor_esm_vs_base_common_-e11c7c.966a028d.js',
]) {
const err = new Error('test');
err.stack = `Error: test\n at ${url}:1:1`;
expect(shouldIgnoreError(err)).toEqual(true);
}

const otherError = new Error('test');
otherError.stack = 'Error: test\n at https://gitea.test/assets/js/index.js:1:1';
expect(shouldIgnoreError(otherError)).toEqual(false);
});
11 changes: 7 additions & 4 deletions web_src/js/bootstrap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,15 @@ import {html} from './utils/html.ts';
// This file must be imported before any lazy-loading is being attempted.
window.__webpack_public_path__ = `${window.config?.assetUrlPrefix ?? '/assets'}/`;

function shouldIgnoreError(err: Error) {
const ignorePatterns = [
'/assets/js/monaco.', // https://github.com/go-gitea/gitea/issues/30861 , https://github.com/microsoft/monaco-editor/issues/4496
export function shouldIgnoreError(err: Error) {
const ignorePatterns: Array<RegExp> = [
// https://github.com/go-gitea/gitea/issues/30861
// https://github.com/microsoft/monaco-editor/issues/4496
// https://github.com/microsoft/monaco-editor/issues/4679
/\/assets\/js\/.*monaco/,
];
for (const pattern of ignorePatterns) {
if (err.stack?.includes(pattern)) return true;
if (pattern.test(err.stack ?? '')) return true;
}
return false;
}
Expand Down