Skip to content
Snippets Groups Projects
Commit 84a446be authored by Miguel Rincon's avatar Miguel Rincon
Browse files

Force SVG imports to have "?raw" or "?url"

Previously we always loaded all the svg files using the raw-loader but
have since enabled our imports to load the URL as it's usually done
with other images.

This forces our team to decide on a loader when fetching svgs, to they
are more intentional about how they load SVG.
parent edc0731a
No related branches found
No related tags found
1 merge request!119936Force SVG imports to have "?raw" or "?url"
Showing
with 32 additions and 39 deletions
<script>
import scheduleSvg from '@gitlab/svgs/dist/illustrations/schedule-md.svg';
import scheduleSvg from '@gitlab/svgs/dist/illustrations/schedule-md.svg?raw';
import { GlEmptyState, GlLink, GlSprintf } from '@gitlab/ui';
import { helpPagePath } from '~/helpers/help_page_helper';
import { s__ } from '~/locale';
......
import emptySvg from '@gitlab/svgs/dist/illustrations/security-dashboard-empty-state.svg';
import emptySvg from '@gitlab/svgs/dist/illustrations/security-dashboard-empty-state.svg?raw';
import { GlEmptyState } from '@gitlab/ui';
import * as Sentry from '@sentry/browser';
import { __ } from '~/locale';
......
......@@ -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';
import deployBoardSvg from '@gitlab/svgs/dist/illustrations/deploy-boards.svg?raw';
import {
GlIcon,
GlLoadingIcon,
......
<script>
import clusterPopover from '@gitlab/svgs/dist/illustrations/cluster_popover.svg';
import clusterPopover from '@gitlab/svgs/dist/illustrations/cluster_popover.svg?raw';
import { GlPopover, GlSprintf, GlLink, GlButton } from '@gitlab/ui';
import SafeHtml from '~/vue_shared/directives/safe_html';
import { __ } from '~/locale';
......
<script>
import chartEmptyStateIllustration from '@gitlab/svgs/dist/illustrations/chart-empty-state.svg';
import chartEmptyStateIllustration from '@gitlab/svgs/dist/illustrations/chart-empty-state.svg?raw';
import SafeHtml from '~/vue_shared/directives/safe_html';
import { chartHeight } from '../../constants';
......
<script>
import importGroupIllustration from '@gitlab/svgs/dist/illustrations/group-import.svg';
import newGroupIllustration from '@gitlab/svgs/dist/illustrations/group-new.svg';
import importGroupIllustration from '@gitlab/svgs/dist/illustrations/group-import.svg?raw';
import newGroupIllustration from '@gitlab/svgs/dist/illustrations/group-new.svg?raw';
import { s__ } from '~/locale';
import NewNamespacePage from '~/vue_shared/new_namespace/new_namespace_page.vue';
......
<script>
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 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 SafeHtml from '~/vue_shared/directives/safe_html';
import { s__ } from '~/locale';
import NewNamespacePage from '~/vue_shared/new_namespace/new_namespace_page.vue';
......
......@@ -15,9 +15,9 @@ import {
REPORT_TYPE_API_FUZZING,
} from '~/vue_shared/security_reports/constants';
import kontraLogo from 'images/vulnerability/kontra-logo.svg';
import scwLogo from 'images/vulnerability/scw-logo.svg';
import secureflagLogo from 'images/vulnerability/secureflag-logo.svg';
import kontraLogo from 'images/vulnerability/kontra-logo.svg?raw';
import scwLogo from 'images/vulnerability/scw-logo.svg?raw';
import secureflagLogo from 'images/vulnerability/secureflag-logo.svg?raw';
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';
......
......@@ -7,7 +7,7 @@ import {
createUserCountsManager,
userCounts,
} from '~/super_sidebar/user_counts_manager';
import logo from '../../../../views/shared/_logo.svg';
import logo from '../../../../views/shared/_logo.svg?raw';
import { JS_TOGGLE_COLLAPSE_CLASS } from '../constants';
import CreateMenu from './create_menu.vue';
import Counter from './counter.vue';
......
<script>
import { GlButton, GlSprintf, GlTooltipDirective } from '@gitlab/ui';
import gitlabLogo from '@gitlab/svgs/dist/illustrations/gitlab_logo.svg';
import gitlabLogo from '@gitlab/svgs/dist/illustrations/gitlab_logo.svg?raw';
import SafeHtml from '~/vue_shared/directives/safe_html';
import { s__, __ } from '~/locale';
import UserCalloutDismisser from '~/vue_shared/components/user_callout_dismisser.vue';
......
......@@ -11,7 +11,7 @@ import {
GlTooltipDirective,
GlEmptyState,
} from '@gitlab/ui';
import noAccessSvg from '@gitlab/svgs/dist/illustrations/analytics/no-access.svg';
import noAccessSvg from '@gitlab/svgs/dist/illustrations/analytics/no-access.svg?raw';
import * as Sentry from '@sentry/browser';
import { s__ } from '~/locale';
import { getParameterByName, updateHistory, setUrlParams } from '~/lib/utils/url_utility';
......
......@@ -425,19 +425,12 @@ module.exports = {
{
test: /\.svg$/,
exclude: /icons\.svg$/,
oneOf: [
{
resourceQuery: /url/,
loader: 'file-loader',
options: {
name: '[name].[contenthash:8].[ext]',
esModule: false,
},
},
{
loader: 'raw-loader',
},
],
resourceQuery: /url/,
loader: 'file-loader',
options: {
name: '[name].[contenthash:8].[ext]',
esModule: false,
},
},
{
test: /\.(gif|png|mp4)$/,
......
<script>
import chartEmptyStateIllustration from '@gitlab/svgs/dist/illustrations/chart-empty-state.svg';
import chartEmptyStateIllustration from '@gitlab/svgs/dist/illustrations/chart-empty-state.svg?raw';
import { GlCard, GlSprintf, GlSkeletonLoader, GlPopover } from '@gitlab/ui';
import { GlSingleStat, GlAreaChart } from '@gitlab/ui/dist/charts';
import SafeHtml from '~/vue_shared/directives/safe_html';
......
import jiraLogo from '@gitlab/svgs/dist/illustrations/logos/jira.svg';
import jiraLogo from '@gitlab/svgs/dist/illustrations/logos/jira.svg?raw';
import externalIssuesListFactory from 'ee/external_issues_list';
import { s__ } from '~/locale';
import getIssuesQuery from './graphql/queries/get_jira_issues.query.graphql';
......
import externalIssuesListFactory from 'ee/external_issues_list';
import zentaoLogo from 'images/logos/zentao.svg';
import zentaoLogo from 'images/logos/zentao.svg?raw';
import { s__ } from '~/locale';
import getIssuesQuery from './graphql/queries/get_zentao_issues.query.graphql';
import { zentaoIssuesResolver } from './graphql/resolvers/zentao_issues';
......
<script>
import shieldCheckIllustration from '@gitlab/svgs/dist/illustrations/secure-sm.svg';
import magnifyingGlassIllustration from '@gitlab/svgs/dist/illustrations/search-sm.svg';
import shieldCheckIllustration from '@gitlab/svgs/dist/illustrations/secure-sm.svg?raw';
import magnifyingGlassIllustration from '@gitlab/svgs/dist/illustrations/search-sm.svg?raw';
import { GlCard, GlButton } from '@gitlab/ui';
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import SafeHtml from '~/vue_shared/directives/safe_html';
......
<script>
import emptySvg from '@gitlab/svgs/dist/illustrations/security-dashboard-empty-state.svg';
import emptySvg from '@gitlab/svgs/dist/illustrations/security-dashboard-empty-state.svg?raw';
import { GlEmptyState } from '@gitlab/ui';
import * as Sentry from '@sentry/browser';
import { logError } from '~/lib/logger';
......
<script>
import jiraLogo from '@gitlab/svgs/dist/illustrations/logos/jira.svg';
import jiraLogo from '@gitlab/svgs/dist/illustrations/logos/jira.svg?raw';
import { GlIcon, GlLink, GlTooltipDirective, GlSprintf } from '@gitlab/ui';
import { STATUS_CLOSED } from '~/issues/constants';
import SafeHtml from '~/vue_shared/directives/safe_html';
......
<script>
import jiraLogo from '@gitlab/svgs/dist/illustrations/logos/jira.svg';
import jiraLogo from '@gitlab/svgs/dist/illustrations/logos/jira.svg?raw';
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';
......
import jiraLogo from '@gitlab/svgs/dist/illustrations/logos/jira.svg';
import jiraLogo from '@gitlab/svgs/dist/illustrations/logos/jira.svg?raw';
import mockGetJiraIssuesQuery from 'ee/integrations/jira/issues_list/graphql/queries/get_jira_issues.query.graphql';
export const mockProvide = {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment