From 9f38d3db91da83f67758204655a9b03cd027278b Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Tue, 9 Apr 2019 06:57:50 +0000 Subject: [PATCH] Merge branch 'revert-e4b2c3b0' into 'master' Revert "Merge branch 'fix-ide-web-worker-relative-url' into 'master'" Closes #60217 See merge request gitlab-org/gitlab-ce!26066 (cherry picked from commit 5cc1d2f1ef2fd64662e1a1f9b72dd59b0ec98625) 596d5fa2 Revert "Merge branch 'fix-ide-web-worker-relative-url' into 'master'" --- app/assets/javascripts/lib/utils/webpack.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/assets/javascripts/lib/utils/webpack.js b/app/assets/javascripts/lib/utils/webpack.js index a4dad6f1615..37b5409a51d 100644 --- a/app/assets/javascripts/lib/utils/webpack.js +++ b/app/assets/javascripts/lib/utils/webpack.js @@ -6,5 +6,11 @@ export function resetServiceWorkersPublicPath() { // see: https://webpack.js.org/guides/public-path/ const relativeRootPath = (gon && gon.relative_url_root) || ''; const webpackAssetPath = `${relativeRootPath}/assets/webpack/`; + __webpack_public_path__ = webpackAssetPath; // eslint-disable-line camelcase + + // monaco-editor-webpack-plugin currently (incorrectly) references the + // public path as a property of `window`. Once this is fixed upstream we + // can remove this line + // see: https://github.com/Microsoft/monaco-editor-webpack-plugin/pull/63 window.__webpack_public_path__ = webpackAssetPath; // eslint-disable-line } -- GitLab