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 39ac55bb9c558478555562b7ec78d8dadb600b04..f633ba053ee4f2250cd6b921a9dd4a8aa30afb8d 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 4566ab202588473af9446e40ecda74020a42c2b2..69c81c35bd4701a2c3f327ec17ef1fab9538c46a 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 caf375a16cf4af14f8e3247f7831c9887ddee8ea..31bc462f0b91edf05eda9369ca452d99f5d46153 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 24f7d567ea7ba91b5fa1e915e1ecb3e653cb52a6..1c6e6380e764d0716e0d85e5da2ddb5e2aa95524 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 6419c45c20c955d074839eeabd76e3b0d4d9e52a..da4c92df711f520d7199cefd8f8e373f5e085fff 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 38fb96d40b7a7b9a36ed4da0dd068ee28fbc3f87..8b68cb5f3bf02001d2676d811dfe307243abdc86 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 251db16d8e3654b25323cb7116334ad711c9573d..1599661505fba5269cb7dce8bf16793c67638bbd 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 1321624fe7d93661f4b1dc98bb7e88648e715f0c..6beb6cd4d348839f26f4568b7068ab35369ba312 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 15ba39a9edbc5e2667fc08d8219895b7a1c6ae4c..2f248729579cf1aadd0518299ad9307f8d6db774 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 333059b5340813f7df8faf02f3bcf4c2d9a9cd68..6e90ad2e0fd1d2d890e0f3c77dd142c0f62f2677 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 eb715518451646da64cd35cfff431fc1b9acce79..d4ee84f0255e846b1f8d0ba457e52603111c7b37 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 7506b2b494be5a1fb3d4ed451faa29d91419b6fc..426fd50b98b325189544d292e2aeabfd999da116 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 fe938a369d18a604141b6a91a9e5ad6b6679ea54..d139607dfca1b3cc11f026a0c4b169844504ce05 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 490c975808be995ee725c89dc568932d49940599..672f03a4cb89b9d9b7061697be29ff238e8667a0 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 6904c3e51bcb368b0cac8d006b05e02e34b5226f..cee3f4eaa992b9cf33275930e3cd545f0abfded3 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 d0dcafa80edabe35bf672421d5f33303a0798290..81240c20f58e8e31c314859238eab48c69032f83 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 008e6b2ffe1f6a84dc67558de3409d054bb58ac4..7708604a1120c2b8186331e5c43162eedd4ca8bc 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 54d8431218734686d4d3bfa9481449e791dcf33f..fde80c2035b20ba641200753a178e14603e35208 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 62261fcc120828bcd774df7572f911f899e49766..050592143186fa250a5d16660e5b4ab6515ef89c 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 7fdf649b0693b479a678065713281050f83a7ffd..47e944320ad71f88a5ba76cac81b4f8481b40c31 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 3ffe893189eaf5815d1fa64b27e6036b5992e1a1..f2f654a51e7df9fa43d5f28400fc62bf5b290d6a 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 5feca808a7a47c411ab8ae82fe18523b6f0f1675..c643879d32ce3d1933e46af8878a1b31c16d4976 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 1dc075a3e623831aedca53b8f85e14c3c1e03d3d..b02d803a9a3a91fd108ebccde90ecce0bdf30d21 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==