diff options
| author | Paul Slaughter <pslaughter@gitlab.com> | 2019-04-30 19:32:11 +0300 |
|---|---|---|
| committer | Paul Slaughter <pslaughter@gitlab.com> | 2019-04-30 20:21:48 +0300 |
| commit | ec654bc41ac21ba895ae3a56718db63b49db4051 (patch) | |
| tree | 550abc0b75db6ee512e112b13b313239bf7d2099 /app | |
| parent | 2432a540cff461c5d9c0346dd4021229078d674d (diff) | |
Fix webpack asset patch with '/' as relative root
https://gitlab.com/gitlab-org/gitlab-ce/issues/60932
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/lib/utils/webpack.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/lib/utils/webpack.js b/app/assets/javascripts/lib/utils/webpack.js index 37b5409a51d..37b17f0fe23 100644 --- a/app/assets/javascripts/lib/utils/webpack.js +++ b/app/assets/javascripts/lib/utils/webpack.js @@ -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 // eslint-disable-next-line import/prefer-default-export export function resetServiceWorkersPublicPath() { @@ -5,7 +7,7 @@ export function resetServiceWorkersPublicPath() { // the webpack publicPath setting at runtime. // see: https://webpack.js.org/guides/public-path/ 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 // monaco-editor-webpack-plugin currently (incorrectly) references the |