From 71ba8b1f68f33adde8007b9ee2244f679f644e3f Mon Sep 17 00:00:00 2001
From: Lukas 'Eipi' Eipert <leipert@gitlab.com>
Date: Wed, 16 Jun 2021 17:31:51 +0000
Subject: [PATCH] Fix Performance Bar, Sentry and Jira Connect App on relative
urls
---
app/assets/javascripts/jira_connect/index.js | 2 ++
app/assets/javascripts/performance_bar/index.js | 2 ++
app/assets/javascripts/sentry/index.js | 2 ++
app/assets/javascripts/webpack.js | 3 +++
config/webpack.config.js | 9 +++++++++
.../browser_ui/non_devops/performance_bar_spec.rb | 2 +-
6 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/app/assets/javascripts/jira_connect/index.js b/app/assets/javascripts/jira_connect/index.js
index dc8bb3b0c773..bc0d21c6c9af 100644
--- a/app/assets/javascripts/jira_connect/index.js
+++ b/app/assets/javascripts/jira_connect/index.js
@@ -1,3 +1,5 @@
+import '../webpack';
+
import setConfigs from '@gitlab/ui/dist/config';
import Vue from 'vue';
import { getLocation, sizeToParent } from '~/jira_connect/utils';
diff --git a/app/assets/javascripts/performance_bar/index.js b/app/assets/javascripts/performance_bar/index.js
index d8aab25a6a8a..66e999ca43b0 100644
--- a/app/assets/javascripts/performance_bar/index.js
+++ b/app/assets/javascripts/performance_bar/index.js
@@ -1,3 +1,5 @@
+import '../webpack';
+
import Vue from 'vue';
import axios from '~/lib/utils/axios_utils';
import { numberToHumanSize } from '~/lib/utils/number_utils';
diff --git a/app/assets/javascripts/sentry/index.js b/app/assets/javascripts/sentry/index.js
index 06e4e0aa507a..a875ef840888 100644
--- a/app/assets/javascripts/sentry/index.js
+++ b/app/assets/javascripts/sentry/index.js
@@ -1,3 +1,5 @@
+import '../webpack';
+
import SentryConfig from './sentry_config';
const index = function index() {
diff --git a/app/assets/javascripts/webpack.js b/app/assets/javascripts/webpack.js
index 4f5588433571..b901f17790ff 100644
--- a/app/assets/javascripts/webpack.js
+++ b/app/assets/javascripts/webpack.js
@@ -2,6 +2,9 @@
* This is the first script loaded by webpack's runtime. It is used to manually configure
* config.output.publicPath to account for relative_url_root or CDN settings which cannot be
* baked-in to our webpack bundles.
+ *
+ * Note: This file should be at the top of an entry point and _cannot_ be moved to
+ * e.g. the `window` scope, because it needs to be executed in the scope of webpack.
*/
if (gon && gon.webpack_public_path) {
diff --git a/config/webpack.config.js b/config/webpack.config.js
index db5371a7258a..c2af7197f94b 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -103,6 +103,15 @@ function generateEntries() {
autoEntries[entry] = defaultEntries.concat(entryPaths);
});
+ /*
+ If you create manual entries, ensure that these import `app/assets/javascripts/webpack.js` right at
+ the top of the entry in order to ensure that the public path is correctly determined for loading
+ assets async. See: https://webpack.js.org/configuration/output/#outputpublicpath
+
+ Note: WebPack 5 has an 'auto' option for the public path which could allow us to remove this option
+ Note 2: If you are using web-workers, you might need to reset the public path, see:
+ https://gitlab.com/gitlab-org/gitlab/-/issues/321656
+ */
const manualEntries = {
default: defaultEntries,
sentry: './sentry/index.js',
diff --git a/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb b/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb
index de425dde6c0b..a0f613cfda2a 100644
--- a/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb
+++ b/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb
@@ -20,7 +20,7 @@ module QA
end
end
- it 'shows results for the original request and AJAX requests', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/478', quarantine: { only: { pipeline: :main }, issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/323051', type: :bug } do
+ it 'shows results for the original request and AJAX requests', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/478' do
# Issue pages always make AJAX requests
Resource::Issue.fabricate_via_browser_ui! do |issue|
issue.title = 'Performance bar test'
--
GitLab