From 11c2f3b08c3bab4718a97360d1502f90793d028b Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 3 Mar 2023 09:12:48 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 jest.config.base.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'jest.config.base.js')

diff --git a/jest.config.base.js b/jest.config.base.js
index 34134d6983b..cc275c3ed0f 100644
--- a/jest.config.base.js
+++ b/jest.config.base.js
@@ -47,6 +47,9 @@ module.exports = (path, options = {}) => {
     // temporary alias until we replace all `flash` imports for `alert`
     // https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109449
     '^~/flash$': '<rootDir>/app/assets/javascripts/alert',
+    [TEST_FIXTURES_PATTERN]: '<rootDir>/tmp/tests/frontend/fixtures$1',
+    '^test_fixtures_static(/.*)$': '<rootDir>/spec/frontend/fixtures/static$1',
+    '\\.(jpg|jpeg|png|svg|css)(\\?\\w+)?$': '<rootDir>/spec/frontend/__mocks__/file_mock.js',
     '^~(/.*)\\?(worker|raw)$': '<rootDir>/app/assets/javascripts$1',
     '^(.*)\\?(worker|raw)$': '$1',
     '^~(/.*)$': '<rootDir>/app/assets/javascripts$1',
@@ -60,10 +63,6 @@ module.exports = (path, options = {}) => {
     '^any_else_ce(/.*)$': '<rootDir>/app/assets/javascripts$1',
     '^helpers(/.*)$': '<rootDir>/spec/frontend/__helpers__$1',
     '^vendor(/.*)$': '<rootDir>/vendor/assets/javascripts$1',
-    [TEST_FIXTURES_PATTERN]: '<rootDir>/tmp/tests/frontend/fixtures$1',
-    '^test_fixtures_static(/.*)$': '<rootDir>/spec/frontend/fixtures/static$1',
-    '\\.(jpg|jpeg|png|svg|css)$': '<rootDir>/spec/frontend/__mocks__/file_mock.js',
-    '\\.svg\\?url$': '<rootDir>/spec/frontend/__mocks__/file_mock.js',
     '^public(/.*)$': '<rootDir>/public$1',
     'emojis(/.*).json': '<rootDir>/fixtures/emojis$1.json',
     '^spec/test_constants$': '<rootDir>/spec/frontend/__helpers__/test_constants',
-- 
cgit v1.2.1