From 596d5fa21a9563f9648ee33ca0f1e254114c8c0b Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 9 Apr 2019 00:49:18 -0500 Subject: Revert "Merge branch 'fix-ide-web-worker-relative-url' into 'master'" This reverts merge request !26015 --- 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 } -- cgit v1.2.1