From 719c8e4fc369ae15d4bb8e4fc6ebb2671170063e Mon Sep 17 00:00:00 2001
From: Paul Gascou-Vaillancourt <pgascouvaillancourt@gitlab.com>
Date: Wed, 8 Mar 2023 16:37:44 +0000
Subject: [PATCH] Revert SVG raw imports loader change

This reverts merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112836
The change to Webpack's loaders config broke SVG imports. We are now
seeing ES module export statements as raw string within the product.
Let's revert the change until a solution can be found.
---
 .../components/pipeline_schedules_empty_state.vue         | 2 +-
 app/assets/javascripts/ensure_data.js                     | 2 +-
 .../javascripts/environments/components/deploy_board.vue  | 2 +-
 .../feature_highlight/feature_highlight_popover.vue       | 2 +-
 .../monitoring/components/charts/empty_chart.vue          | 2 +-
 .../javascripts/pages/groups/new/components/app.vue       | 4 ++--
 app/assets/javascripts/projects/new/components/app.vue    | 8 ++++----
 .../security_configuration/components/constants.js        | 4 ++--
 .../javascripts/super_sidebar/components/user_bar.vue     | 2 +-
 .../javascripts/surveys/merge_request_experience/app.vue  | 2 +-
 .../work_items/components/work_item_detail.vue            | 2 +-
 config/webpack.config.js                                  | 1 -
 .../components/test_coverage_summary.vue                  | 2 +-
 .../jira/issues_list/jira_issues_list_bundle.js           | 2 +-
 .../zentao/issues_list/zentao_issues_list_bundle.js       | 2 +-
 .../verification/components/credit_card_verification.vue  | 2 +-
 .../components/policy_editor/policy_selection.vue         | 4 ++--
 .../subscriptions/buy_addons_shared/components/app.vue    | 2 +-
 .../javascripts/vulnerabilities/components/issue_link.vue | 2 +-
 .../vulnerabilities/components/related_jira_issues.vue    | 2 +-
 ee/spec/frontend/external_issues_list/mock_data.js        | 2 +-
 jest.config.base.js                                       | 7 ++++---
 yarn.lock                                                 | 2 +-
 23 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules_empty_state.vue b/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules_empty_state.vue
index 39ac55bb9c558..f633ba053ee4f 100644
--- a/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules_empty_state.vue
+++ b/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules_empty_state.vue
@@ -1,5 +1,5 @@
 <script>
-import scheduleSvg from '@gitlab/svgs/dist/illustrations/schedule-md.svg?raw';
+import scheduleSvg from '@gitlab/svgs/dist/illustrations/schedule-md.svg';
 import { GlEmptyState, GlLink, GlSprintf } from '@gitlab/ui';
 import { helpPagePath } from '~/helpers/help_page_helper';
 import { s__ } from '~/locale';
diff --git a/app/assets/javascripts/ensure_data.js b/app/assets/javascripts/ensure_data.js
index 4566ab2025884..69c81c35bd470 100644
--- a/app/assets/javascripts/ensure_data.js
+++ b/app/assets/javascripts/ensure_data.js
@@ -1,4 +1,4 @@
-import emptySvg from '@gitlab/svgs/dist/illustrations/security-dashboard-empty-state.svg?raw';
+import emptySvg from '@gitlab/svgs/dist/illustrations/security-dashboard-empty-state.svg';
 import { GlEmptyState } from '@gitlab/ui';
 import * as Sentry from '@sentry/browser';
 import { __ } from '~/locale';
diff --git a/app/assets/javascripts/environments/components/deploy_board.vue b/app/assets/javascripts/environments/components/deploy_board.vue
index caf375a16cf4a..31bc462f0b91e 100644
--- a/app/assets/javascripts/environments/components/deploy_board.vue
+++ b/app/assets/javascripts/environments/components/deploy_board.vue
@@ -8,7 +8,7 @@
  * - Button Actions.
  * [Mockup](https://gitlab.com/gitlab-org/gitlab-foss/uploads/2f655655c0eadf655d0ae7467b53002a/environments__deploy-graphic.png)
  */
-import deployBoardSvg from '@gitlab/svgs/dist/illustrations/deploy-boards.svg?raw';
+import deployBoardSvg from '@gitlab/svgs/dist/illustrations/deploy-boards.svg';
 import {
   GlIcon,
   GlLoadingIcon,
diff --git a/app/assets/javascripts/feature_highlight/feature_highlight_popover.vue b/app/assets/javascripts/feature_highlight/feature_highlight_popover.vue
index 24f7d567ea7ba..1c6e6380e764d 100644
--- a/app/assets/javascripts/feature_highlight/feature_highlight_popover.vue
+++ b/app/assets/javascripts/feature_highlight/feature_highlight_popover.vue
@@ -1,5 +1,5 @@
 <script>
-import clusterPopover from '@gitlab/svgs/dist/illustrations/cluster_popover.svg?raw';
+import clusterPopover from '@gitlab/svgs/dist/illustrations/cluster_popover.svg';
 import { GlPopover, GlSprintf, GlLink, GlButton } from '@gitlab/ui';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 import { __ } from '~/locale';
diff --git a/app/assets/javascripts/monitoring/components/charts/empty_chart.vue b/app/assets/javascripts/monitoring/components/charts/empty_chart.vue
index 6419c45c20c95..da4c92df711f5 100644
--- a/app/assets/javascripts/monitoring/components/charts/empty_chart.vue
+++ b/app/assets/javascripts/monitoring/components/charts/empty_chart.vue
@@ -1,5 +1,5 @@
 <script>
-import chartEmptyStateIllustration from '@gitlab/svgs/dist/illustrations/chart-empty-state.svg?raw';
+import chartEmptyStateIllustration from '@gitlab/svgs/dist/illustrations/chart-empty-state.svg';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 import { chartHeight } from '../../constants';
 
diff --git a/app/assets/javascripts/pages/groups/new/components/app.vue b/app/assets/javascripts/pages/groups/new/components/app.vue
index 38fb96d40b7a7..8b68cb5f3bf02 100644
--- a/app/assets/javascripts/pages/groups/new/components/app.vue
+++ b/app/assets/javascripts/pages/groups/new/components/app.vue
@@ -1,6 +1,6 @@
 <script>
-import importGroupIllustration from '@gitlab/svgs/dist/illustrations/group-import.svg?raw';
-import newGroupIllustration from '@gitlab/svgs/dist/illustrations/group-new.svg?raw';
+import importGroupIllustration from '@gitlab/svgs/dist/illustrations/group-import.svg';
+import newGroupIllustration from '@gitlab/svgs/dist/illustrations/group-new.svg';
 
 import { s__ } from '~/locale';
 import NewNamespacePage from '~/vue_shared/new_namespace/new_namespace_page.vue';
diff --git a/app/assets/javascripts/projects/new/components/app.vue b/app/assets/javascripts/projects/new/components/app.vue
index 251db16d8e365..1599661505fba 100644
--- a/app/assets/javascripts/projects/new/components/app.vue
+++ b/app/assets/javascripts/projects/new/components/app.vue
@@ -1,8 +1,8 @@
 <script>
-import createFromTemplateIllustration from '@gitlab/svgs/dist/illustrations/project-create-from-template-sm.svg?raw';
-import blankProjectIllustration from '@gitlab/svgs/dist/illustrations/project-create-new-sm.svg?raw';
-import importProjectIllustration from '@gitlab/svgs/dist/illustrations/project-import-sm.svg?raw';
-import ciCdProjectIllustration from '@gitlab/svgs/dist/illustrations/project-run-CICD-pipelines-sm.svg?raw';
+import createFromTemplateIllustration from '@gitlab/svgs/dist/illustrations/project-create-from-template-sm.svg';
+import blankProjectIllustration from '@gitlab/svgs/dist/illustrations/project-create-new-sm.svg';
+import importProjectIllustration from '@gitlab/svgs/dist/illustrations/project-import-sm.svg';
+import ciCdProjectIllustration from '@gitlab/svgs/dist/illustrations/project-run-CICD-pipelines-sm.svg';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 import { s__ } from '~/locale';
 import NewNamespacePage from '~/vue_shared/new_namespace/new_namespace_page.vue';
diff --git a/app/assets/javascripts/security_configuration/components/constants.js b/app/assets/javascripts/security_configuration/components/constants.js
index 1321624fe7d93..6beb6cd4d3488 100644
--- a/app/assets/javascripts/security_configuration/components/constants.js
+++ b/app/assets/javascripts/security_configuration/components/constants.js
@@ -15,8 +15,8 @@ import {
   REPORT_TYPE_LICENSE_COMPLIANCE,
 } from '~/vue_shared/security_reports/constants';
 
-import kontraLogo from 'images/vulnerability/kontra-logo.svg?raw';
-import scwLogo from 'images/vulnerability/scw-logo.svg?raw';
+import kontraLogo from 'images/vulnerability/kontra-logo.svg';
+import scwLogo from 'images/vulnerability/scw-logo.svg';
 import configureSastMutation from '../graphql/configure_sast.mutation.graphql';
 import configureSastIacMutation from '../graphql/configure_iac.mutation.graphql';
 import configureSecretDetectionMutation from '../graphql/configure_secret_detection.mutation.graphql';
diff --git a/app/assets/javascripts/super_sidebar/components/user_bar.vue b/app/assets/javascripts/super_sidebar/components/user_bar.vue
index 15ba39a9edbc5..2f248729579cf 100644
--- a/app/assets/javascripts/super_sidebar/components/user_bar.vue
+++ b/app/assets/javascripts/super_sidebar/components/user_bar.vue
@@ -2,7 +2,7 @@
 import { GlBadge, GlButton, GlTooltipDirective } from '@gitlab/ui';
 import { __ } from '~/locale';
 import SafeHtml from '~/vue_shared/directives/safe_html';
-import logo from '../../../../views/shared/_logo.svg?raw';
+import logo from '../../../../views/shared/_logo.svg';
 import { toggleSuperSidebarCollapsed } from '../super_sidebar_collapsed_state_manager';
 import CreateMenu from './create_menu.vue';
 import Counter from './counter.vue';
diff --git a/app/assets/javascripts/surveys/merge_request_experience/app.vue b/app/assets/javascripts/surveys/merge_request_experience/app.vue
index 333059b534081..6e90ad2e0fd1d 100644
--- a/app/assets/javascripts/surveys/merge_request_experience/app.vue
+++ b/app/assets/javascripts/surveys/merge_request_experience/app.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlButton, GlSprintf, GlTooltipDirective } from '@gitlab/ui';
-import gitlabLogo from '@gitlab/svgs/dist/illustrations/gitlab_logo.svg?raw';
+import gitlabLogo from '@gitlab/svgs/dist/illustrations/gitlab_logo.svg';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 import { s__, __ } from '~/locale';
 import UserCalloutDismisser from '~/vue_shared/components/user_callout_dismisser.vue';
diff --git a/app/assets/javascripts/work_items/components/work_item_detail.vue b/app/assets/javascripts/work_items/components/work_item_detail.vue
index eb71551845164..d4ee84f0255e8 100644
--- a/app/assets/javascripts/work_items/components/work_item_detail.vue
+++ b/app/assets/javascripts/work_items/components/work_item_detail.vue
@@ -11,7 +11,7 @@ import {
   GlTooltipDirective,
   GlEmptyState,
 } from '@gitlab/ui';
-import noAccessSvg from '@gitlab/svgs/dist/illustrations/analytics/no-access.svg?raw';
+import noAccessSvg from '@gitlab/svgs/dist/illustrations/analytics/no-access.svg';
 import * as Sentry from '@sentry/browser';
 import { s__ } from '~/locale';
 import { parseBoolean } from '~/lib/utils/common_utils';
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 7506b2b494be5..426fd50b98b32 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -393,7 +393,6 @@ module.exports = {
             },
           },
           {
-            resourceQuery: /raw/,
             loader: 'raw-loader',
           },
         ],
diff --git a/ee/app/assets/javascripts/analytics/repository_analytics/components/test_coverage_summary.vue b/ee/app/assets/javascripts/analytics/repository_analytics/components/test_coverage_summary.vue
index fe938a369d18a..d139607dfca1b 100644
--- a/ee/app/assets/javascripts/analytics/repository_analytics/components/test_coverage_summary.vue
+++ b/ee/app/assets/javascripts/analytics/repository_analytics/components/test_coverage_summary.vue
@@ -1,5 +1,5 @@
 <script>
-import chartEmptyStateIllustration from '@gitlab/svgs/dist/illustrations/chart-empty-state.svg?raw';
+import chartEmptyStateIllustration from '@gitlab/svgs/dist/illustrations/chart-empty-state.svg';
 import { GlCard, GlSprintf, GlSkeletonLoader, GlPopover } from '@gitlab/ui';
 import { GlSingleStat, GlAreaChart } from '@gitlab/ui/dist/charts';
 import SafeHtml from '~/vue_shared/directives/safe_html';
diff --git a/ee/app/assets/javascripts/integrations/jira/issues_list/jira_issues_list_bundle.js b/ee/app/assets/javascripts/integrations/jira/issues_list/jira_issues_list_bundle.js
index 490c975808be9..672f03a4cb89b 100644
--- a/ee/app/assets/javascripts/integrations/jira/issues_list/jira_issues_list_bundle.js
+++ b/ee/app/assets/javascripts/integrations/jira/issues_list/jira_issues_list_bundle.js
@@ -1,4 +1,4 @@
-import jiraLogo from '@gitlab/svgs/dist/illustrations/logos/jira.svg?raw';
+import jiraLogo from '@gitlab/svgs/dist/illustrations/logos/jira.svg';
 import externalIssuesListFactory from 'ee/external_issues_list';
 import { s__ } from '~/locale';
 import getIssuesQuery from './graphql/queries/get_jira_issues.query.graphql';
diff --git a/ee/app/assets/javascripts/integrations/zentao/issues_list/zentao_issues_list_bundle.js b/ee/app/assets/javascripts/integrations/zentao/issues_list/zentao_issues_list_bundle.js
index 6904c3e51bcb3..cee3f4eaa992b 100644
--- a/ee/app/assets/javascripts/integrations/zentao/issues_list/zentao_issues_list_bundle.js
+++ b/ee/app/assets/javascripts/integrations/zentao/issues_list/zentao_issues_list_bundle.js
@@ -1,5 +1,5 @@
 import externalIssuesListFactory from 'ee/external_issues_list';
-import zentaoLogo from 'images/logos/zentao.svg?raw';
+import zentaoLogo from 'images/logos/zentao.svg';
 import { s__ } from '~/locale';
 import getIssuesQuery from './graphql/queries/get_zentao_issues.query.graphql';
 import { zentaoIssuesResolver } from './graphql/resolvers/zentao_issues';
diff --git a/ee/app/assets/javascripts/namespaces/verification/components/credit_card_verification.vue b/ee/app/assets/javascripts/namespaces/verification/components/credit_card_verification.vue
index d0dcafa80edab..81240c20f58e8 100644
--- a/ee/app/assets/javascripts/namespaces/verification/components/credit_card_verification.vue
+++ b/ee/app/assets/javascripts/namespaces/verification/components/credit_card_verification.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlBreadcrumb, GlButton } from '@gitlab/ui';
-import newGroupIllustration from '@gitlab/svgs/dist/illustrations/group-new.svg?raw';
+import newGroupIllustration from '@gitlab/svgs/dist/illustrations/group-new.svg';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 import CreateGroupDescriptionDetails from '~/pages/groups/new/components/create_group_description_details.vue';
 import Zuora from 'ee/billings/components/zuora.vue';
diff --git a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/policy_selection.vue b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/policy_selection.vue
index 008e6b2ffe1f6..7708604a1120c 100644
--- a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/policy_selection.vue
+++ b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/policy_selection.vue
@@ -1,6 +1,6 @@
 <script>
-import shieldCheckIllustration from '@gitlab/svgs/dist/illustrations/shield-check.svg?raw';
-import magnifyingGlassIllustration from '@gitlab/svgs/dist/illustrations/magnifying-glass.svg?raw';
+import shieldCheckIllustration from '@gitlab/svgs/dist/illustrations/shield-check.svg';
+import magnifyingGlassIllustration from '@gitlab/svgs/dist/illustrations/magnifying-glass.svg';
 import { GlCard, GlButton } from '@gitlab/ui';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import SafeHtml from '~/vue_shared/directives/safe_html';
diff --git a/ee/app/assets/javascripts/subscriptions/buy_addons_shared/components/app.vue b/ee/app/assets/javascripts/subscriptions/buy_addons_shared/components/app.vue
index 54d8431218734..fde80c2035b20 100644
--- a/ee/app/assets/javascripts/subscriptions/buy_addons_shared/components/app.vue
+++ b/ee/app/assets/javascripts/subscriptions/buy_addons_shared/components/app.vue
@@ -1,5 +1,5 @@
 <script>
-import emptySvg from '@gitlab/svgs/dist/illustrations/security-dashboard-empty-state.svg?raw';
+import emptySvg from '@gitlab/svgs/dist/illustrations/security-dashboard-empty-state.svg';
 import { GlEmptyState } from '@gitlab/ui';
 import * as Sentry from '@sentry/browser';
 import { logError } from '~/lib/logger';
diff --git a/ee/app/assets/javascripts/vulnerabilities/components/issue_link.vue b/ee/app/assets/javascripts/vulnerabilities/components/issue_link.vue
index 62261fcc12082..050592143186f 100644
--- a/ee/app/assets/javascripts/vulnerabilities/components/issue_link.vue
+++ b/ee/app/assets/javascripts/vulnerabilities/components/issue_link.vue
@@ -1,5 +1,5 @@
 <script>
-import jiraLogo from '@gitlab/svgs/dist/illustrations/logos/jira.svg?raw';
+import jiraLogo from '@gitlab/svgs/dist/illustrations/logos/jira.svg';
 import { GlIcon, GlLink, GlTooltipDirective, GlSprintf } from '@gitlab/ui';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 
diff --git a/ee/app/assets/javascripts/vulnerabilities/components/related_jira_issues.vue b/ee/app/assets/javascripts/vulnerabilities/components/related_jira_issues.vue
index 7fdf649b0693b..47e944320ad71 100644
--- a/ee/app/assets/javascripts/vulnerabilities/components/related_jira_issues.vue
+++ b/ee/app/assets/javascripts/vulnerabilities/components/related_jira_issues.vue
@@ -1,5 +1,5 @@
 <script>
-import jiraLogo from '@gitlab/svgs/dist/illustrations/logos/jira.svg?raw';
+import jiraLogo from '@gitlab/svgs/dist/illustrations/logos/jira.svg';
 import { GlAlert, GlCard, GlIcon, GlLink, GlLoadingIcon, GlButton, GlSprintf } from '@gitlab/ui';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 import CreateJiraIssue from 'ee/vue_shared/security_reports/components/create_jira_issue.vue';
diff --git a/ee/spec/frontend/external_issues_list/mock_data.js b/ee/spec/frontend/external_issues_list/mock_data.js
index 3ffe893189eaf..f2f654a51e7df 100644
--- a/ee/spec/frontend/external_issues_list/mock_data.js
+++ b/ee/spec/frontend/external_issues_list/mock_data.js
@@ -1,4 +1,4 @@
-import jiraLogo from '@gitlab/svgs/dist/illustrations/logos/jira.svg?raw';
+import jiraLogo from '@gitlab/svgs/dist/illustrations/logos/jira.svg';
 import mockGetJiraIssuesQuery from 'ee/integrations/jira/issues_list/graphql/queries/get_jira_issues.query.graphql';
 
 export const mockProvide = {
diff --git a/jest.config.base.js b/jest.config.base.js
index 5feca808a7a47..c643879d32ce3 100644
--- a/jest.config.base.js
+++ b/jest.config.base.js
@@ -47,9 +47,6 @@ 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',
@@ -63,6 +60,10 @@ 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',
diff --git a/yarn.lock b/yarn.lock
index 1dc075a3e6238..b02d803a9a3a9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5217,7 +5217,7 @@ dompurify@2.3.8:
   resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.8.tgz#224fe9ae57d7ebd9a1ae1ac18c1c1ca3f532226f"
   integrity sha512-eVhaWoVibIzqdGYjwsBWodIQIaXFSB+cKDf4cfxLMsK0xiud6SE+/WCVx/Xw/UwQsa4cS3T2eITcdtmTg2UKcw==
 
-dompurify@^2.4.4, dompurify@^2.4.5:
+dompurify@^2.4.5:
   version "2.4.5"
   resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.5.tgz#0e89a27601f0bad978f9a924e7a05d5d2cccdd87"
   integrity sha512-jggCCd+8Iqp4Tsz0nIvpcb22InKEBrGz5dw3EQJMs8HPJDsKbFIO3STYtAvCfDx26Muevn1MHVI0XxjgFfmiSA==
-- 
GitLab