kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix webpack asset patch with '/' as relative root

Browse source 
https://gitlab.com/gitlab-org/gitlab-ce/issues/60932
This commit is contained in:
Paul Slaughter 2019-04-30 11:32:11 -05:00
parent 2432a540cf
commit ec654bc41a
No known key found for this signature in database
GPG key ID: DF5690803C68282A
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/lib/utils/webpack.js
View file

@ -1,3 +1,5 @@
import { joinPaths } from '~/lib/utils/url_utility';
// tell webpack to load assets from origin so that web workers don't break // tell webpack to load assets from origin so that web workers don't break
// eslint-disable-next-line import/prefer-default-export // eslint-disable-next-line import/prefer-default-export
export function resetServiceWorkersPublicPath() { export function resetServiceWorkersPublicPath() {
@ -5,7 +7,7 @@ export function resetServiceWorkersPublicPath() {
// the webpack publicPath setting at runtime. // the webpack publicPath setting at runtime.
// see: https://webpack.js.org/guides/public-path/ // see: https://webpack.js.org/guides/public-path/
const relativeRootPath = (gon && gon.relative_url_root) || ''; const relativeRootPath = (gon && gon.relative_url_root) || '';
const webpackAssetPath = `${relativeRootPath}/assets/webpack/`; const webpackAssetPath = joinPaths(relativeRootPath, '/assets/webpack/');
__webpack_public_path__ = webpackAssetPath; // eslint-disable-line camelcase __webpack_public_path__ = webpackAssetPath; // eslint-disable-line camelcase
// monaco-editor-webpack-plugin currently (incorrectly) references the // monaco-editor-webpack-plugin currently (incorrectly) references the

5
changelogs/unreleased/fix-webpack-assets-relative-url-bug.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Fix webpack assets handling when relative url root is '/'
merge_request: 27909
author:
type: fixed