From a862866ffb11a43b8aa9a1423ad1ee6a352b50c5 Mon Sep 17 00:00:00 2001
From: Stanislav Lashmanov <slashmanov@gitlab.com>
Date: Wed, 30 Nov 2022 06:54:17 +0400
Subject: [PATCH] Use raw resource query for yml imports
---
.../gitlab_pages/components/pages_pipeline_wizard.vue | 2 +-
config/webpack.config.js | 1 +
jest.config.base.js | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/app/assets/javascripts/gitlab_pages/components/pages_pipeline_wizard.vue b/app/assets/javascripts/gitlab_pages/components/pages_pipeline_wizard.vue
index f17a05999b01a..bf71f6820481e 100644
--- a/app/assets/javascripts/gitlab_pages/components/pages_pipeline_wizard.vue
+++ b/app/assets/javascripts/gitlab_pages/components/pages_pipeline_wizard.vue
@@ -2,7 +2,7 @@
import { GlLoadingIcon } from '@gitlab/ui';
import { captureException } from '@sentry/browser';
import PipelineWizard from '~/pipeline_wizard/pipeline_wizard.vue';
-import PagesWizardTemplate from '~/pipeline_wizard/templates/pages.yml';
+import PagesWizardTemplate from '~/pipeline_wizard/templates/pages.yml?raw';
import { logError } from '~/lib/logger';
import { s__ } from '~/locale';
import { redirectTo } from '~/lib/utils/url_utility';
diff --git a/config/webpack.config.js b/config/webpack.config.js
index c8a159605d1bf..4564530120c9e 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -435,6 +435,7 @@ module.exports = {
},
{
test: /\.(yml|yaml)$/,
+ resourceQuery: /raw/,
loader: 'raw-loader',
},
].filter(Boolean),
diff --git a/jest.config.base.js b/jest.config.base.js
index 56473d1643ff6..0f77517a9e3c3 100644
--- a/jest.config.base.js
+++ b/jest.config.base.js
@@ -43,6 +43,8 @@ module.exports = (path, options = {}) => {
const TEST_FIXTURES_PATTERN = 'test_fixtures(/.*)$';
const moduleNameMapper = {
+ '^~(/.*)\\?raw$': '<rootDir>/app/assets/javascripts$1',
+ '^(.*)\\?raw$': '$1',
'^~(/.*)$': '<rootDir>/app/assets/javascripts$1',
'^ee_component(/.*)$':
'<rootDir>/app/assets/javascripts/vue_shared/components/empty_component.js',
--
GitLab